diff options
2221 files changed, 28372 insertions, 15765 deletions
diff --git a/contrib/oe-stylize.py b/contrib/oe-stylize.py index 30b460e12a..1fb0a5bcc0 100755 --- a/contrib/oe-stylize.py +++ b/contrib/oe-stylize.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """\ Sanitize a bitbake file following the OpenEmbedded style guidelines, @@ -436,8 +436,8 @@ if __name__ == "__main__": # -- dump the sanitized .bb file -- addEmptyLine = False # write comments that are not related to variables nor routines - for l in commentBloc: - olines.append(l) + for c in commentBloc: + olines.append(c) # write variables and routines previourVarPrefix = "unknown" for k in OE_vars: @@ -446,8 +446,8 @@ if __name__ == "__main__": if seen_vars[k] != []: if addEmptyLine and not k.startswith(previourVarPrefix): olines.append("") - for l in seen_vars[k]: - olines.append(l) + for s in seen_vars[k]: + olines.append(s) previourVarPrefix = k.split('_')[0] == '' and "unknown" or k.split('_')[0] for line in olines: print(line) diff --git a/meta-filesystems/README b/meta-filesystems/README.md index 78a4429ce2..78a4429ce2 100644 --- a/meta-filesystems/README +++ b/meta-filesystems/README.md diff --git a/meta-filesystems/recipes-filesystems/burnia/libburn_1.5.6.bb b/meta-filesystems/recipes-filesystems/burnia/libburn_1.5.6.bb new file mode 100644 index 0000000000..e0f6664ab3 --- /dev/null +++ b/meta-filesystems/recipes-filesystems/burnia/libburn_1.5.6.bb @@ -0,0 +1,13 @@ +SUMMARY = "library to write an ISO-9660 file system to physical media" +HOMEPAGE = "https://libburnia-project.org/" + +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 \ + file://COPYRIGHT;md5=a91b9b862895b64e68e5b321873c9111" + +SRC_URI = "http://files.libburnia-project.org/releases/${BP}.tar.gz" +SRC_URI[sha256sum] = "7295491b4be5eeac5e7a3fb2067e236e2955ffdc6bbd45f546466edee321644b" + +inherit autotools pkgconfig lib_package + +BBCLASSEXTEND = "native" diff --git a/meta-filesystems/recipes-filesystems/burnia/libisoburn_1.5.4.bb b/meta-filesystems/recipes-filesystems/burnia/libisoburn_1.5.4.bb new file mode 100644 index 0000000000..f263b51350 --- /dev/null +++ b/meta-filesystems/recipes-filesystems/burnia/libisoburn_1.5.4.bb @@ -0,0 +1,27 @@ +SUMMARY = "library and tool to create and burn ISO-9660 images" +HOMEPAGE = "https://libburnia-project.org/" + +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 \ + file://COPYRIGHT;md5=43cfe25a7e4a65f722d6253fa0649bb1" + +SRC_URI = "http://files.libburnia-project.org/releases/libisoburn-${PV}.tar.gz" +SRC_URI[sha256sum] = "2d89846d43880f17fa591c53b3bea42ffb803628e4e630c680fc2c9184f79132" + +DEPENDS = "libisofs libburn" +# This replaces the xorriso recipe +PROVIDES += "xorriso" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-pkg-check-modules" + +do_install:append() { + # This is a proof-of-concept UI using Tk, don't ship it + rm -f ${D}${bindir}/xorriso-tcltk +} + +PACKAGE_BEFORE_PN = "xorriso" +FILES:xorriso = "${bindir}" + +BBCLASSEXTEND = "native" diff --git a/meta-filesystems/recipes-filesystems/burnia/libisofs_1.5.4.bb b/meta-filesystems/recipes-filesystems/burnia/libisofs_1.5.4.bb new file mode 100644 index 0000000000..1754db7f70 --- /dev/null +++ b/meta-filesystems/recipes-filesystems/burnia/libisofs_1.5.4.bb @@ -0,0 +1,15 @@ +SUMMARY = "library to create an ISO-9660 filesystem" +HOMEPAGE = "https://libburnia-project.org/" + +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 \ + file://COPYRIGHT;md5=1c1e5a960562d65f6449bb1d21e1dffc" + +SRC_URI = "http://files.libburnia-project.org/releases/${BP}.tar.gz" +SRC_URI[sha256sum] = "aaa0ed80a7501979316f505b0b017f29cba0ea5463b751143bad2c360215a88e" + +DEPENDS = "acl zlib" + +inherit autotools + +BBCLASSEXTEND = "native" diff --git a/meta-filesystems/recipes-filesystems/httpfs2-fuse/httpfs2_0.1.5.bb b/meta-filesystems/recipes-filesystems/httpfs2-fuse/httpfs2_0.1.5.bb index 0086551f62..5dc3ea6632 100644 --- a/meta-filesystems/recipes-filesystems/httpfs2-fuse/httpfs2_0.1.5.bb +++ b/meta-filesystems/recipes-filesystems/httpfs2-fuse/httpfs2_0.1.5.bb @@ -8,18 +8,15 @@ inherit pkgconfig DEPENDS += "fuse" RDEPENDS:${PN} += "fuse" -SRC_URI += "https://astuteinternet.dl.sourceforge.net/project/httpfs/httpfs2/httpfs2-${PV}.tar.gz" +SRC_URI += "${SOURCEFORGE_MIRROR}/project/httpfs/httpfs2/httpfs2-${PV}.tar.gz" SRC_URI[sha256sum] = "01cb4bb38deb344f540da6f1464dc7edbdeb51213ad810b8c9c282c1e17e0fc1" S = "${WORKDIR}/httpfs2-${PV}" do_compile() { - cd ${S} - oe_runmake httpfs2 + oe_runmake -C ${S} httpfs2 } do_install() { - cd ${S} - install -d ${D}${bindir} - install -m 0755 httpfs2 ${D}${bindir} + install -Dm 0755 ${S}/httpfs2 ${D}${bindir}/httpfs2 } diff --git a/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-Add-LDFLAGS-to-linker-cmdline.patch b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-Add-LDFLAGS-to-linker-cmdline.patch index 30ad1b8ad6..8d790125e3 100644 --- a/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-Add-LDFLAGS-to-linker-cmdline.patch +++ b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-Add-LDFLAGS-to-linker-cmdline.patch @@ -5,6 +5,8 @@ Subject: [PATCH] Add $(LDFLAGS) to linker cmdline Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-btree-Avoid-conflicts-with-libc-namespace-about-setk.patch b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-btree-Avoid-conflicts-with-libc-namespace-about-setk.patch index dbf7ae0163..73e42df7e4 100644 --- a/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-btree-Avoid-conflicts-with-libc-namespace-about-setk.patch +++ b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-btree-Avoid-conflicts-with-libc-namespace-about-setk.patch @@ -9,6 +9,8 @@ static function Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + btree.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Add-build-rule-for-README.patch b/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Add-build-rule-for-README.patch index e4d52a802b..870d0ef056 100644 --- a/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Add-build-rule-for-README.patch +++ b/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Add-build-rule-for-README.patch @@ -8,6 +8,8 @@ Makefile.am: required file `./README' not found Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-filesystems/recipes-filesystems/packageconfigs/packagegroup-meta-filesystems.bb b/meta-filesystems/recipes-filesystems/packageconfigs/packagegroup-meta-filesystems.bb index 1954b5979c..361972a45b 100644 --- a/meta-filesystems/recipes-filesystems/packageconfigs/packagegroup-meta-filesystems.bb +++ b/meta-filesystems/recipes-filesystems/packageconfigs/packagegroup-meta-filesystems.bb @@ -18,6 +18,9 @@ RDEPENDS:packagegroup-meta-filesystems = "\ RDEPENDS:packagegroup-meta-filesystems = "\ ifuse \ + libisofs \ + libburn \ + libisoburn \ logfsprogs \ fuse-exfat \ owfs \ diff --git a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch index 6d60c9d229..fbdb6cbcd7 100644 --- a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch +++ b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch @@ -6,6 +6,8 @@ Subject: [PATCH] Using PKG_CHECK_MODULES to found headers and libraries of Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> --- +Upstream-Status: Pending + configure.in | 5 +++++ src/Makefile.am | 3 +++ 2 files changed, 8 insertions(+) diff --git a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch index 31892d230d..d5e9040b9a 100644 --- a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch +++ b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ diff --git a/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-define-loff_t-if-not-already-defined.patch b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-define-loff_t-if-not-already-defined.patch index df202c8555..6cedc3cb4e 100644 --- a/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-define-loff_t-if-not-already-defined.patch +++ b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-define-loff_t-if-not-already-defined.patch @@ -7,6 +7,8 @@ Helps to build with musl Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + yaffs_guts.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-filesystems/recipes-filesystems/zfs/zfs/0001-fs-tests-cmd-readmmap-Replace-uint_t-with-uint32_t.patch b/meta-filesystems/recipes-filesystems/zfs/zfs/0001-fs-tests-cmd-readmmap-Replace-uint_t-with-uint32_t.patch new file mode 100644 index 0000000000..f1cfab4daf --- /dev/null +++ b/meta-filesystems/recipes-filesystems/zfs/zfs/0001-fs-tests-cmd-readmmap-Replace-uint_t-with-uint32_t.patch @@ -0,0 +1,46 @@ +From 1f9a5cb860b3509791e59a8cae9d5f265e832ed0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 28 May 2023 16:33:15 -0700 +Subject: [PATCH] fs-tests/cmd/readmmap: Replace uint_t with uint32_t + +Makes it portable across glibc and musl + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tests/zfs-tests/cmd/readmmap.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/tests/zfs-tests/cmd/readmmap.c b/tests/zfs-tests/cmd/readmmap.c +index 704ffd55c8..a2590e0e8d 100644 +--- a/tests/zfs-tests/cmd/readmmap.c ++++ b/tests/zfs-tests/cmd/readmmap.c +@@ -38,6 +38,7 @@ + * 0 : no errors + * -------------------------------------------------------------- + */ ++#include <stdint.h> + #include <stdio.h> + #include <stdlib.h> + #include <unistd.h> +@@ -55,7 +56,7 @@ main(int argc, char **argv) + char *buf = NULL; + char *map = NULL; + int fd = -1, bytes, retval = 0; +- uint_t seed; ++ uint32_t seed; + + if (argc < 2 || optind == argc) { + (void) fprintf(stderr, +@@ -92,7 +93,7 @@ main(int argc, char **argv) + retval = 1; + goto end; + } +- seed = (uint_t)time(NULL); ++ seed = (uint32_t)time(NULL); + srandom(seed); + + idx = random() % size; +-- +2.40.1 + diff --git a/meta-filesystems/recipes-filesystems/zfs/zfs/aaf28a4630af60496c9d33db1d06a7d7d8983422.patch b/meta-filesystems/recipes-filesystems/zfs/zfs/aaf28a4630af60496c9d33db1d06a7d7d8983422.patch new file mode 100644 index 0000000000..f5504b389d --- /dev/null +++ b/meta-filesystems/recipes-filesystems/zfs/zfs/aaf28a4630af60496c9d33db1d06a7d7d8983422.patch @@ -0,0 +1,56 @@ +From aaf28a4630af60496c9d33db1d06a7d7d8983422 Mon Sep 17 00:00:00 2001 +From: Sebastian Gottschall <s.gottschall@dd-wrt.com> +Date: Tue, 23 May 2023 13:50:24 +0600 +Subject: [PATCH] fixes broken aarch64 inline assembly for gcc 13.1 + +fixes the following error + +/mnt/b/yoe/master/build/tmp/work/imx8qm_var_som-yoe-linux/zfs/2.1.9-r0/build/../zfs-2.1.9/module/zfs/vdev_raidz_math_aarch64_neon_common.h:549:24: error: the register specified for 'w7' is not general enough to be used as a register variable + 549 | register unsigned char w7 asm("v7") __attribute__((vector_size(16))); + | ^~ +/mnt/b/yoe/master/build/tmp/work/imx8qm_var_som-yoe-linux/zfs/2.1.9-r0/build/../zfs-2.1.9/module/zfs/vdev_raidz_math_aarch64_neonx2.c:193:9: note: in expansion of macro 'GEN_X_DEFINE_6_7' + 193 | GEN_X_DEFINE_6_7() \ + | ^~~~~~~~~~~~~~~~ +/mnt/b/yoe/master/build/tmp/work/imx8qm_var_som-yoe-linux/zfs/2.1.9-r0/build/../zfs-2.1.9/module/zfs/vdev_raidz_math_impl.h:1360:9: note: in expansion of macro 'REC_PQR_DEFINE' + 1360 | REC_PQR_DEFINE(); + | ^~~~~~~~~~~~~~ +/mnt/b/yoe/master/build/tmp/work/imx8qm_var_som-yoe-linux/zfs/2.1.9-r0/build/../zfs-2.1.9/module/zfs/vdev_raidz_math_aarch64_neon_common.h:551:24: error: the register specified for 'w8' is not general enough to be used as a register variable + 551 | register unsigned char w8 asm("v8") __attribute__((vector_size(16))); \ + | ^~ +/mnt/b/yoe/master/build/tmp/work/imx8qm_var_som-yoe-linux/zfs/2.1.9-r0/build/../zfs-2.1.9/module/zfs/vdev_raidz_math_aarch64_neonx2.c:194:9: note: in expansion of macro 'GEN_X_DEFINE_8_9' + 194 | GEN_X_DEFINE_8_9() \ + | ^~~~~~~~~~~~~~~~ +/mnt/b/yoe/master/build/tmp/work/imx8qm_var_som-yoe-linux/zfs/2.1.9-r0/build/../zfs-2.1.9/module/zfs/vdev_raidz_math_impl.h:1360:9: note: in expansion of macro 'REC_PQR_DEFINE' + 1360 | REC_PQR_DEFINE(); + | ^~~~~~~~~~~~~~ +/mnt/b/yoe/master/build/tmp/work/imx8qm_var_som-yoe-linux/zfs/2.1.9-r0/build/../zfs-2.1.9/module/zfs/vdev_raidz_math_aarch64_neon_common.h:552:24: error: the register specified for 'w9' is not general enough to be used as a register variable + 552 | register unsigned char w9 asm("v9") __attribute__((vector_size(16))); + | ^~ +/mnt/b/yoe/master/build/tmp/work/imx8qm_var_som-yoe-linux/zfs/2.1.9-r0/build/../zfs-2.1.9/module/zfs/vdev_raidz_math_aarch64_neonx2.c:194:9: note: in expansion of macro 'GEN_X_DEFINE_8_9' + 194 | GEN_X_DEFINE_8_9() \ + | ^~~~~~~~~~~~~~~~ +/mnt/b/yoe/master/build/tmp/work/imx8qm_var_som-yoe-linux/zfs/2.1.9-r0/build/../zfs-2.1.9/module/zfs/vdev_raidz_math_impl.h:1360:9: note: in expansion of macro 'REC_PQR_DEFINE' + 1360 | REC_PQR_DEFINE(); + +Upstream-Status: Pending [https://github.com/BrainSlayer/zfs/commit/aaf28a4630af60496c9d33db1d06a7d7d8983422] +Signed-off-by: Sebastian Gottschall <s.gottschall@dd-wrt.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + module/Kbuild.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/module/Kbuild.in ++++ b/module/Kbuild.in +@@ -57,9 +57,9 @@ asflags-y := $(ZFS_MODULE_CFLAGS) $(ZFS_ + ccflags-y := $(ZFS_MODULE_CFLAGS) $(ZFS_MODULE_CPPFLAGS) + + ifeq ($(CONFIG_ARM64),y) +-CFLAGS_REMOVE_zcommon/zfs_fletcher_aarch64_neon.o += -mgeneral-regs-only +-CFLAGS_REMOVE_zfs/vdev_raidz_math_aarch64_neon.o += -mgeneral-regs-only +-CFLAGS_REMOVE_zfs/vdev_raidz_math_aarch64_neonx2.o += -mgeneral-regs-only ++CFLAGS_REMOVE_zcommon/zfs_fletcher_aarch64_neon.o = -mgeneral-regs-only ++CFLAGS_REMOVE_zfs/vdev_raidz_math_aarch64_neon.o = -mgeneral-regs-only ++CFLAGS_REMOVE_zfs/vdev_raidz_math_aarch64_neonx2.o = -mgeneral-regs-only + endif + + # Suppress unused-value warnings in sparc64 architecture headers diff --git a/meta-filesystems/recipes-filesystems/zfs/zfs_2.1.7.bb b/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.0.bb index d328cbc27e..a62a8a39b1 100644 --- a/meta-filesystems/recipes-filesystems/zfs/zfs_2.1.7.bb +++ b/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.0.bb @@ -4,10 +4,14 @@ LICENSE = "CDDL-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7087caaf1dc8a2856585619f4a787faa" HOMEPAGE ="https://github.com/openzfs/zfs" -SRC_URI = "https://github.com/openzfs/zfs/releases/download/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ +SRCREV = "009d3288dea524c7ad373b04b65bee8bb6f0bfea" +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 \ + file://0001-fs-tests-cmd-readmmap-Replace-uint_t-with-uint32_t.patch \ " -SRC_URI[sha256sum] = "6462e63e185de6ff10c64ffa6ed773201a082f9dd13e603d7e8136fcb4aca71b" + +S = "${WORKDIR}/git" # Using both 'module' and 'autotools' classes seems a bit odd, they both # define a do_compile function. @@ -27,12 +31,16 @@ EXTRA_OECONF:append = " \ --with-linux=${STAGING_KERNEL_DIR} --with-linux-obj=${STAGING_KERNEL_BUILDDIR} \ --with-mounthelperdir=${base_sbin} \ --with-udevdir=${base_libdir}/udev \ + --with-systemdunitdir=${systemd_system_unitdir} \ + --with-systemdgeneratordir=${nonarch_base_libdir}/systemd/system-generators \ + --with-systemdpresetdir=${nonarch_base_libdir}/systemd/system-preset \ + --with-systemdmodulesloaddir=${sysconfdir}/module-load.d \ --without-dracutdir \ - " +" EXTRA_OEMAKE:append = " \ INSTALL_MOD_PATH=${D}${root_prefix} \ - " +" do_install:append() { # /usr/share/zfs contains the zfs-tests folder which we do not need: @@ -42,20 +50,28 @@ do_install:append() { } FILES:${PN} += "\ - ${base_sbindir}/* \ - ${base_libdir}/* \ - ${sysconfdir}/* \ - ${sbindir}/* \ - ${bindir}/* \ - ${libexecdir}/${BPN}/* \ - ${libdir}/* \ - " + ${nonarch_base_libdir}/modules \ + ${systemd_system_unitdir} \ + ${nonarch_base_libdir}/systemd/system-generators \ + ${nonarch_base_libdir}/systemd/system-preset \ + ${sysconfdir}/modules-load.d/${BPN}.conf \ + ${sysconfdir}/default/${BPN} \ + ${sysconfdir}/sudoers.d/${BPN} \ + ${sysconfdir}/${BPN} \ + ${base_libdir}/udev \ + ${sbindir} \ + ${bindir} \ + ${libexecdir}/${BPN} \ + ${libdir} \ +" FILES:${PN}-dev += "\ - ${prefix}/src/zfs-${PV}/* \ - ${prefix}/src/spl-${PV}/* \ - " + ${prefix}/src/zfs-${PV} \ + ${prefix}/src/spl-${PV} \ +" # Not yet ported to rv32 COMPATIBLE_HOST:riscv32 = "null" # conflicting definition of ABS macro from asm/asm.h from kernel COMPATIBLE_HOST:mips = "null" +# FTBFS on aarch64 with 6.2+ kernel see https://github.com/openzfs/zfs/issues/14555 +COMPATIBLE_HOST:aarch64 = "null" diff --git a/meta-filesystems/recipes-support/fuse/files/fuse2-0007-util-ulockmgr_server.c-conditionally-define-closefro.patch b/meta-filesystems/recipes-support/fuse/files/fuse2-0007-util-ulockmgr_server.c-conditionally-define-closefro.patch index 3607304e05..7b548b4cde 100644 --- a/meta-filesystems/recipes-support/fuse/files/fuse2-0007-util-ulockmgr_server.c-conditionally-define-closefro.patch +++ b/meta-filesystems/recipes-support/fuse/files/fuse2-0007-util-ulockmgr_server.c-conditionally-define-closefro.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + From: Sam James <sam@gentoo.org> Date: Sat, 24 Jul 2021 22:02:45 +0100 Subject: [PATCH] util/ulockmgr_server.c: conditionally define closefrom (fix diff --git a/meta-filesystems/recipes-support/fuse/fuse3_3.12.0.bb b/meta-filesystems/recipes-support/fuse/fuse3_3.14.1.bb index b886effc85..c8a820a09d 100644 --- a/meta-filesystems/recipes-support/fuse/fuse3_3.12.0.bb +++ b/meta-filesystems/recipes-support/fuse/fuse3_3.14.1.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://GPL2.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.xz \ " -SRC_URI[sha256sum] = "33b8a92d6f7a88e6a889f0009206933482f48f3eb85d88cf09ef551313ac7373" +SRC_URI[sha256sum] = "126919d72b46b3e0eb58a9c6933a2a50c36f2ea69f61fe9e78bdba9f463ffa20" S = "${WORKDIR}/fuse-${PV}" diff --git a/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.bb b/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.bb index a4573cf596..5761844f81 100644 --- a/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.bb +++ b/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.bb @@ -38,9 +38,9 @@ do_install() { ${D}${systemd_system_unitdir} install -Dm0644 ${S}/btrfsmaintenance-functions \ - ${D}${datadir}/${PN}/btrfsmaintenance-functions + ${D}${datadir}/${BPN}/btrfsmaintenance-functions install -Dm0755 ${S}/*.sh \ - ${D}${datadir}/${PN} + ${D}${datadir}/${BPN} install -Dm0644 ${S}/sysconfig.btrfsmaintenance \ ${D}${sysconfdir}/default/btrfsmaintenance diff --git a/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.3.0.bb b/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.3.0.bb deleted file mode 100644 index abb8fece3a..0000000000 --- a/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.3.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "utilities to create, check, label and dump exFAT filesystem" -DESCRIPTION = "Utilities to manage extended file allocation table filesystem. \ -This package provides tools to create, check and label the filesystem. It \ -contains \ - - dumpexfat to dump properties of the filesystem \ - - exfatfsck / fsck.exfat to report errors found on a exFAT filesystem \ - - exfatlabel to label a exFAT filesystem \ - - mkexfatfs / mkfs.exfat to create a exFAT filesystem. \ -" -HOMEPAGE = "https://github.com/relan/exfat" -SECTION = "universe/otherosfs" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRC_URI = "https://github.com/relan/exfat/releases/download/v${PV}/${BP}.tar.gz" - -UPSTREAM_CHECK_URI = "https://github.com/relan/exfat/releases" - -DEPENDS = "virtual/libc" - -inherit pkgconfig autotools - -SRC_URI[md5sum] = "f8928571b152455e828ca0bd42af8b73" -SRC_URI[sha256sum] = "dfebd07a7b907e2d603d3a9626e6440bd43ec6c4e8c07ccfc57ce9502b724835" diff --git a/meta-filesystems/recipes-utils/exfatprogs/exfatprogs_1.2.1.bb b/meta-filesystems/recipes-utils/exfatprogs/exfatprogs_1.2.1.bb new file mode 100644 index 0000000000..3767ec48f5 --- /dev/null +++ b/meta-filesystems/recipes-utils/exfatprogs/exfatprogs_1.2.1.bb @@ -0,0 +1,24 @@ +SUMMARY = "exFAT filesystem userspace utilities" +DESCRIPTION = "\ +As new exfat filesystem is merged into linux-5.7 kernel, exfatprogs is \ +created as an official userspace utilities that contain all of the standard \ +utilities for creating and fixing and debugging exfat filesystem in linux \ +system. The goal of exfatprogs is to provide high performance and quality \ +at the level of exfat utilities in windows. And this software is licensed \ +under the GNU General Public License Version 2." +HOMEPAGE = "https://github.com/${BPN}/${BPN}" +SECTION = "universe/otherosfs" +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] = "a6f3b1fb4bd37835c8f8cb421aac4eb75b880a51342b29850c4063973162227b" + +UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" +UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)" + +inherit autotools + +RPROVIDES:${PN} = "exfat-utils" +RCONFLICTS:${PN} = "exfat-utils" +RREPLACES:${PN} = "exfat-utils" diff --git a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs_io-Fix-out-of-tree-builds.patch b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs_io-Fix-out-of-tree-builds.patch deleted file mode 100644 index aa243bd9c0..0000000000 --- a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs_io-Fix-out-of-tree-builds.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f110e34d7a4929cdea647b98fa177cf1bccf8b1e Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 21 Dec 2022 18:21:42 -0800 -Subject: [PATCH] f2fs_io: Fix out of tree builds - -Relative path does not work when searching for include files -when srcdir != builddir - -Upstream-Status: Submitted [https://lore.kernel.org/linux-f2fs-devel/20221222022830.976309-1-raj.khem@gmail.com/T/#t] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - tools/f2fs_io/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/f2fs_io/Makefile.am b/tools/f2fs_io/Makefile.am -index 6c17db1..bc4f9d0 100644 ---- a/tools/f2fs_io/Makefile.am -+++ b/tools/f2fs_io/Makefile.am -@@ -1,7 +1,7 @@ - ## Makefile.am - - if LINUX --AM_CPPFLAGS = -I../../include -+AM_CPPFLAGS = -I$(top_srcdir)/include - AM_CFLAGS = -Wall - sbin_PROGRAMS = f2fs_io - f2fs_io_SOURCES = f2fs_io.c diff --git a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.15.0.bb b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.16.0.bb index 5da059f738..997fa1240a 100644 --- a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.15.0.bb +++ b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.16.0.bb @@ -7,9 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=362b4b2594cd362b874a97718faa51d3" # to provide libuuid DEPENDS = "util-linux" -SRCREV = "64f2596142800c215cb40a658ebd5793ed37c936" +SRCREV = "06c027abc6153c4a97cba5317844e8dcaaee3cf7" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git;branch=master \ - file://0001-f2fs_io-Fix-out-of-tree-builds.patch \ file://0002-f2fs_io-Define-_FILE_OFFSET_BITS-64.patch \ " UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" diff --git a/meta-filesystems/recipes-utils/fatresize/fatresize/0001-build-Do-not-build-.sgml-file.patch b/meta-filesystems/recipes-utils/fatresize/fatresize/0001-build-Do-not-build-.sgml-file.patch index c754f21d0d..ac16766f6f 100644 --- a/meta-filesystems/recipes-utils/fatresize/fatresize/0001-build-Do-not-build-.sgml-file.patch +++ b/meta-filesystems/recipes-utils/fatresize/fatresize/0001-build-Do-not-build-.sgml-file.patch @@ -5,7 +5,7 @@ Subject: [PATCH] build: Do not build .sgml file It needs docbook-to-man tool which we do not have recipe for -Upstream-Status: OE-Specific [needs native docbook-to-man tool] +Upstream-Status: Inappropriate [needs native docbook-to-man tool] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- diff --git a/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs/0001-Makefile-proper-location-of-LDFLAGS.patch b/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs/0001-Makefile-proper-location-of-LDFLAGS.patch index d9f285d947..2c001834b6 100644 --- a/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs/0001-Makefile-proper-location-of-LDFLAGS.patch +++ b/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs/0001-Makefile-proper-location-of-LDFLAGS.patch @@ -5,6 +5,8 @@ Subject: [PATCH] Makefile: proper location of LDFLAGS Signed-off-by: Vyacheslav Yurkov <Vyacheslav.Yurkov@bruker.com> --- +Upstream-Status: Pending + Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0001-Fixed-includes-so-that-it-compiles-on-Ubuntu-20.04.patch b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0001-Fixed-includes-so-that-it-compiles-on-Ubuntu-20.04.patch index f7490ebcec..ed84d92c7c 100644 --- a/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0001-Fixed-includes-so-that-it-compiles-on-Ubuntu-20.04.patch +++ b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0001-Fixed-includes-so-that-it-compiles-on-Ubuntu-20.04.patch @@ -4,6 +4,8 @@ Date: Fri, 19 Mar 2021 08:18:58 +0100 Subject: [PATCH] Fixed includes so that it compiles on Ubuntu 20.04 --- +Upstream-Status: Pending + logic.c | 3 +-- main.c | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0002-makefile-fix-linking-flags.patch b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0002-makefile-fix-linking-flags.patch index cf4de18a79..8fbb250f04 100644 --- a/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0002-makefile-fix-linking-flags.patch +++ b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0002-makefile-fix-linking-flags.patch @@ -8,6 +8,8 @@ https://www.gnu.org/software/make/manual/html_node/Catalogue-of-Rules.html Signed-off-by: Vyacheslav Yurkov <Vyacheslav.Yurkov@bruker.com> --- +Upstream-Status: Pending + makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-filesystems/recipes-utils/udevil/files/0001-udevil-0.4.3-fix-compile-with-gcc6.patch b/meta-filesystems/recipes-utils/udevil/files/0001-udevil-0.4.3-fix-compile-with-gcc6.patch index 355e93a37b..6e3a6ecb1f 100644 --- a/meta-filesystems/recipes-utils/udevil/files/0001-udevil-0.4.3-fix-compile-with-gcc6.patch +++ b/meta-filesystems/recipes-utils/udevil/files/0001-udevil-0.4.3-fix-compile-with-gcc6.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Fix compilation with GCC6 --- a/src/device-info.c 2013-12-09 14:59:27.000000000 +0100 diff --git a/meta-filesystems/recipes-utils/udevil/files/0002-etc-Makefile.am-Use-systemd_unitdir-instead-of-libdi.patch b/meta-filesystems/recipes-utils/udevil/files/0002-etc-Makefile.am-Use-systemd_unitdir-instead-of-libdi.patch index f014a0f537..a65c0218ce 100644 --- a/meta-filesystems/recipes-utils/udevil/files/0002-etc-Makefile.am-Use-systemd_unitdir-instead-of-libdi.patch +++ b/meta-filesystems/recipes-utils/udevil/files/0002-etc-Makefile.am-Use-systemd_unitdir-instead-of-libdi.patch @@ -8,6 +8,8 @@ libdir. Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> --- +Upstream-Status: Pending + etc/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-filesystems/recipes-utils/ufs-utils/ufs-utils/0001-Use-asm-type.h-for-kernel-types.patch b/meta-filesystems/recipes-utils/ufs-utils/ufs-utils/0001-Use-asm-type.h-for-kernel-types.patch deleted file mode 100644 index 08cf870169..0000000000 --- a/meta-filesystems/recipes-utils/ufs-utils/ufs-utils/0001-Use-asm-type.h-for-kernel-types.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 517f841ccac59b0579e706dd768d6c7b1a7e7552 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 12 Mar 2021 10:37:21 -0800 -Subject: [PATCH] Use asm/type.h for kernel types - -This ensures that right headers for types is included otherwise it can -conflict for some platforms e.g. ppc64 where it includes the underlying -files conditionally - -asm/types.h is - -if !defined(__SANE_USERSPACE_TYPES__) && defined(__powerpc64__) && !defined(__KERNEL__) - include <asm-generic/int-l64.h> -else - include <asm-generic/int-ll64.h> -endif - -Upstream-Status: Submitted [https://github.com/westerndigitalcorporation/ufs-utils/pull/29] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - ufs.h | 1 - - ufs_cmds.h | 2 +- - ufs_ffu.c | 1 - - 3 files changed, 1 insertion(+), 3 deletions(-) - -diff --git a/ufs.h b/ufs.h -index dc51367..0321c54 100644 ---- a/ufs.h -+++ b/ufs.h -@@ -4,7 +4,6 @@ - - #ifndef UFS_H_ - #define UFS_H_ --#include <asm-generic/int-ll64.h> - #include "ioctl.h" - #include "scsi_bsg_util.h" - -diff --git a/ufs_cmds.h b/ufs_cmds.h -index 1e7e24d..5c5b045 100644 ---- a/ufs_cmds.h -+++ b/ufs_cmds.h -@@ -5,7 +5,7 @@ - #define UFS_CMNDS_H_ - - #include "options.h" --#include <asm-generic/int-ll64.h> -+#include <asm/types.h> - - - enum field_width { -diff --git a/ufs_ffu.c b/ufs_ffu.c -index 2bcec44..99b479c 100644 ---- a/ufs_ffu.c -+++ b/ufs_ffu.c -@@ -12,7 +12,6 @@ - #include <unistd.h> - #include <stdint.h> - #include <errno.h> --#include <asm-generic/int-ll64.h> - - #include "ufs.h" - #include "ufs_cmds.h" --- -2.30.2 - diff --git a/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_1.9.bb b/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_3.12.3.bb index f6aa872fde..342661c9a5 100644 --- a/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_1.9.bb +++ b/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_3.12.3.bb @@ -4,11 +4,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" BRANCH ?= "dev" -SRCREV = "517c0b01e47d4441cc45be351509fb4c96843d5a" +SRCREV = "40c0bdfa7f4e922a4bcdf431ef72b321648d2d9f" SRC_URI = "git://github.com/westerndigitalcorporation/ufs-utils.git;protocol=https;branch=${BRANCH} \ - file://0001-Use-asm-type.h-for-kernel-types.patch \ -" + " UPSTREAM_CHECK_COMMITS = "1" diff --git a/meta-filesystems/recipes-utils/xfsprogs/files/remove_flags_from_build_flags.patch b/meta-filesystems/recipes-utils/xfsprogs/files/remove_flags_from_build_flags.patch index bd2d025635..5bab162c85 100644 --- a/meta-filesystems/recipes-utils/xfsprogs/files/remove_flags_from_build_flags.patch +++ b/meta-filesystems/recipes-utils/xfsprogs/files/remove_flags_from_build_flags.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: xfsprogs-4.14.0/include/builddefs.in =================================================================== --- xfsprogs-4.14.0.orig/include/builddefs.in diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests/0001-m4-Check-for-FTW_ACTIONRETVAL-along-with-nftw.patch b/meta-filesystems/recipes-utils/xfstests/xfstests/0001-m4-Check-for-FTW_ACTIONRETVAL-along-with-nftw.patch new file mode 100644 index 0000000000..fd34989fdf --- /dev/null +++ b/meta-filesystems/recipes-utils/xfstests/xfstests/0001-m4-Check-for-FTW_ACTIONRETVAL-along-with-nftw.patch @@ -0,0 +1,34 @@ +From 2a4fed8331f996421e65db446559991a854e2ad3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 24 Mar 2023 18:23:01 -0700 +Subject: [PATCH] m4: Check for FTW_ACTIONRETVAL along with nftw + +FTW_ACTIONRETVAL is glibc specific extention which is used to implement +xfsfind but it may not be available on other C library implementations on Linux +e.g. musl. Therefore ensure that these defines are available before declaring +nftw() to be usable + +Upstream-Status: Submitted [https://lore.kernel.org/fstests/20230325012858.587801-1-raj.khem@gmail.com/T/#u] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Cc: Darrick J. Wong <djwong@kernel.org> +Cc: Zorro Lang <zlang@redhat.com> +--- + m4/package_libcdev.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/package_libcdev.m4 b/m4/package_libcdev.m4 +index b41c087b..7f731044 100644 +--- a/m4/package_libcdev.m4 ++++ b/m4/package_libcdev.m4 +@@ -132,7 +132,7 @@ AC_DEFUN([AC_HAVE_NFTW], + #include <stddef.h> + #include <ftw.h> + ]], [[ +- nftw("/", (int (*)(const char *, const struct stat *, int, struct FTW *))1, 0, 0); ++ nftw("/", (int (*)(const char *, const struct stat *, int, struct FTW *))1, 0, FTW_ACTIONRETVAL); + ]])],[have_nftw=yes + AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)]) + AC_SUBST(have_nftw) +-- +2.40.0 + diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests_2023.01.01.bb b/meta-filesystems/recipes-utils/xfstests/xfstests_2023.03.05.bb index defa11c929..fdfe045749 100644 --- a/meta-filesystems/recipes-utils/xfstests/xfstests_2023.01.01.bb +++ b/meta-filesystems/recipes-utils/xfstests/xfstests_2023.03.05.bb @@ -8,9 +8,10 @@ SRC_URI = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git;branch=master;na git://github.com/amir73il/unionmount-testsuite.git;branch=master;protocol=https;name=unionmount;destsuffix=unionmount-testsuite \ file://0001-Add-a-return-type-to-aio_rw.patch \ file://0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch \ + file://0001-m4-Check-for-FTW_ACTIONRETVAL-along-with-nftw.patch \ " -SRCREV_xfstests = "fbd489798b31e32f0eaefcd754326a06aa5b166f" +SRCREV_xfstests = "f7765774a1b5cb98c2f21a892e82b3421f40e791" SRCREV_unionmount = "e3825b16b46f4c4574a1a69909944c059835f914" S = "${WORKDIR}/git" diff --git a/meta-filesystems/recipes-utils/xorriso/xorriso_1.5.5.bb b/meta-filesystems/recipes-utils/xorriso/xorriso_1.5.5.bb deleted file mode 100644 index a83950db82..0000000000 --- a/meta-filesystems/recipes-utils/xorriso/xorriso_1.5.5.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "xorriso copies file objects from POSIX compliant filesystems \ -into Rock Ridge enhanced ISO 9660 filesystems and allows session-wise \ -manipulation of such filesystems" - -LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -SRC_URI = "http://www.gnu.org/software/${BPN}/${BPN}-${PV}.tar.gz" - -SRC_URI[md5sum] = "a5e3dc4e0b92be6837f9ed6cbf7f9df5" -SRC_URI[sha256sum] = "91663d61bee61ff790b3f6861fdf57c54af0e238ab14f297b55bae8ab5d17684" - -PACKAGECONFIG ??= "acl attr zlib bzip2 readline" -PACKAGECONFIG[acl] = "--enable-libacl,--disable-libacl,acl," -PACKAGECONFIG[attr] = "--enable-xattr,--disable-xattr,attr," -PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib," -PACKAGECONFIG[bzip2] = "--enable-libbz2,--disable-libbz2,bzip2," -PACKAGECONFIG[readline] = "--enable-libreadline,--disable-libreadline,readline," - -inherit autotools-brokensep pkgconfig features_check - -do_configure:prepend () { - touch NEWS -} - -RDEPENDS:${PN} = "tk" -REQUIRED_DISTRO_FEATURES = "x11" - -BBCLASSEXTEND = "native" diff --git a/meta-gnome/README b/meta-gnome/README.md index fbb0d72476..fbb0d72476 100644 --- a/meta-gnome/README +++ b/meta-gnome/README.md diff --git a/meta-gnome/recipes-connectivity/folks/folks_0.15.5.bb b/meta-gnome/recipes-connectivity/folks/folks_0.15.6.bb index ad61ee610c..c94a9590fe 100644 --- a/meta-gnome/recipes-connectivity/folks/folks_0.15.5.bb +++ b/meta-gnome/recipes-connectivity/folks/folks_0.15.6.bb @@ -26,4 +26,4 @@ PACKAGECONFIG ??= "" inherit pkgconfig gnomebase gettext gobject-introspection vala features_check -SRC_URI[archive.sha256sum] = "0fff8a896330cd82aee4598324f7e541c884d0337536212723b4beb38c759086" +SRC_URI[archive.sha256sum] = "c866630c553f29ce9be1c7a60267cb4080a6bccf4b8d551dc4c7e6234d840248" diff --git a/meta-gnome/recipes-connectivity/geary/geary/0001-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch b/meta-gnome/recipes-connectivity/geary/geary/0001-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch deleted file mode 100644 index 22af4f5bea..0000000000 --- a/meta-gnome/recipes-connectivity/geary/geary/0001-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 166198735e9f4fbe91557df1351b3481bcf79e78 Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz <ricotz@ubuntu.com> -Date: Sun, 30 Jan 2022 19:54:11 +0100 -Subject: [PATCH 1/2] Util.Cache.Lru: Workaround missing generic type argument - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/geary/-/commit/0f75e7a84a39492d0748cec2ba6028e08cae3644] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/client/util/util-cache.vala | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/client/util/util-cache.vala b/src/client/util/util-cache.vala -index f054e32e..ecc275e8 100644 ---- a/src/client/util/util-cache.vala -+++ b/src/client/util/util-cache.vala -@@ -12,7 +12,7 @@ public class Util.Cache.Lru<T> : Geary.BaseObject { - private class CacheEntry<T> { - - -- public static int lru_compare(CacheEntry<T> a, CacheEntry<T> b) { -+ public static int lru_compare(CacheEntry a, CacheEntry b) { - if (a.key == b.key) { - return 0; - } --- -2.35.1 - diff --git a/meta-gnome/recipes-connectivity/geary/geary/0001-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch b/meta-gnome/recipes-connectivity/geary/geary/0001-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch new file mode 100644 index 0000000000..1e0640a666 --- /dev/null +++ b/meta-gnome/recipes-connectivity/geary/geary/0001-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch @@ -0,0 +1,51 @@ +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-gnome/recipes-connectivity/geary/geary/0002-Fix-accessibility-issues-with-initializer-of-constan.patch b/meta-gnome/recipes-connectivity/geary/geary/0002-Fix-accessibility-issues-with-initializer-of-constan.patch deleted file mode 100644 index 76315f3a0e..0000000000 --- a/meta-gnome/recipes-connectivity/geary/geary/0002-Fix-accessibility-issues-with-initializer-of-constan.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 64b56e75a54a9fa3f37c7686be97a5c8818413a4 Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz <ricotz@ubuntu.com> -Date: Tue, 30 Nov 2021 15:31:31 +0100 -Subject: [PATCH 2/2] Fix accessibility issues with initializer of constants - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/geary/-/commit/9bd4c82952a0a2c3308c5cc86c0b85650c1fb484] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/client/application/application-client.vala | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/client/application/application-client.vala b/src/client/application/application-client.vala -index 6ce19ce2..e6ba8533 100644 ---- a/src/client/application/application-client.vala -+++ b/src/client/application/application-client.vala -@@ -8,16 +8,16 @@ - - // Defined by CMake build script. - extern const string GETTEXT_PACKAGE; --extern const string _APP_ID; --extern const string _BUILD_ROOT_DIR; --extern const string _GSETTINGS_DIR; --extern const string _INSTALL_PREFIX; --extern const string _NAME_SUFFIX; -+public extern const string _APP_ID; -+public extern const string _BUILD_ROOT_DIR; -+public extern const string _GSETTINGS_DIR; -+public extern const string _INSTALL_PREFIX; -+public extern const string _NAME_SUFFIX; - extern const string _PLUGINS_DIR; - extern const string _PROFILE; - extern const string _REVNO; --extern const string _SOURCE_ROOT_DIR; --extern const string _VERSION; -+public extern const string _SOURCE_ROOT_DIR; -+public extern const string _VERSION; - extern const string _WEB_EXTENSIONS_DIR; - - --- -2.35.1 - diff --git a/meta-gnome/recipes-connectivity/geary/geary_43.0.bb b/meta-gnome/recipes-connectivity/geary/geary_44.0.bb index 08899fd4a1..a585929092 100644 --- a/meta-gnome/recipes-connectivity/geary/geary_43.0.bb +++ b/meta-gnome/recipes-connectivity/geary/geary_44.0.bb @@ -26,7 +26,7 @@ DEPENDS = " \ libstemmer \ libxml2 \ sqlite3 \ - webkitgtk \ + webkitgtk3 \ " RDEPENDS:${PN} = "gnome-keyring" @@ -35,10 +35,11 @@ inherit meson pkgconfig mime-xdg gtk-icon-cache gobject-introspection vala featu 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 \ " S = "${WORKDIR}/git" -SRCREV = "94d6bec861daffb27efea85a296f347db7a5af6d" +SRCREV = "b72db2a5e87f2269e6359af434a4fc02fca9e9df" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" REQUIRED_DISTRO_FEATURES = "gobject-introspection-data opengl" diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.30.0.bb b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.32.0.bb index 8c7564a8e3..cc37291c8a 100644 --- a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.30.0.bb +++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.32.0.bb @@ -9,7 +9,7 @@ inherit features_check gnomebase gsettings gtk-icon-cache gettext REQUIRED_DISTRO_FEATURES = "x11 opengl" -SRC_URI[archive.sha256sum] = "9516b84e9d9f100db89a0c67cbfe57cedb0562310d45caafb6332e27bbeb5cd3" +SRC_URI[archive.sha256sum] = "a2b5affa1505ad43902959fdbe09e5bcec57b11ed333fa60458ffb9c62efba38" # We don't not have ubuntu's appindicator (yet?) EXTRA_OEMESON = "-Dappindicator=no" diff --git a/meta-gnome/recipes-extended/gparted/files/0001-Do-not-use-NULL-where-boolean-is-expected.patch b/meta-gnome/recipes-extended/gparted/files/0001-Do-not-use-NULL-where-boolean-is-expected.patch deleted file mode 100644 index 1b0d24024b..0000000000 --- a/meta-gnome/recipes-extended/gparted/files/0001-Do-not-use-NULL-where-boolean-is-expected.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 9af84e1c08a2159c10baf13244e2c8a7d7e837e9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 27 Jan 2022 23:02:20 -0800 -Subject: [PATCH] Do not use NULL where boolean is expected - -Fixes -src/GParted_Core.cc:73:57: error: static_cast from 'nullptr_t' to 'PedPartitionFlag' (aka '_PedPartitionFlag') is not allowed -| for ( PedPartitionFlag flag = ped_partition_flag_next( static_cast<PedPartitionFlag>( NULL ) ) ; -| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -| 1 error generated. - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/GParted_Core.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/GParted_Core.cc b/src/GParted_Core.cc -index f7ac970..3290c66 100644 ---- a/src/GParted_Core.cc -+++ b/src/GParted_Core.cc -@@ -70,7 +70,7 @@ GParted_Core::GParted_Core() - ped_exception_set_handler( ped_exception_handler ) ; - - //get valid flags ... -- for ( PedPartitionFlag flag = ped_partition_flag_next( static_cast<PedPartitionFlag>( NULL ) ) ; -+ for ( PedPartitionFlag flag = ped_partition_flag_next( static_cast<PedPartitionFlag>( false ) ) ; - flag ; - flag = ped_partition_flag_next( flag ) ) - flags .push_back( flag ) ; --- -2.35.0 - diff --git a/meta-gnome/recipes-extended/gparted/files/0001-use-posix-basename.patch b/meta-gnome/recipes-extended/gparted/files/0001-use-posix-basename.patch deleted file mode 100644 index aae200e27e..0000000000 --- a/meta-gnome/recipes-extended/gparted/files/0001-use-posix-basename.patch +++ /dev/null @@ -1,30 +0,0 @@ -Subject: [PATCH] BCache_Info.cc: use posix basename - -gnu 'basename' is undeclared for cplusplus if using musl. Use posix basename instead. - -fdebug-prefix-map=TOPDIR/build/tmp/work/cortexa57-yoe-linux-musl/gparted/1.4.0-r0/ -recipe-sysroot-native=-fvisibility-inlines-hidden -c -o Dialog_Disklabel.o ../../ -gparted-1.4.0/src/Dialog_Disklabel.cc ../../gparted-1.4.0/src/BCache_Info.cc:52:33: - -error: use of undeclared identifier 'basename'; did you mean 'g_basename'? - return "/dev/" + Glib::ustring(basename(buf)); - ^~~~~~~~ - g_basename - -Signed-off-by: Markus Volk <f_l_k@t-online.de> - -Upstream-Status: Submitted - -https://gitlab.gnome.org/GNOME/gparted/-/merge_requests/99 - ---- a/src/BCache_Info.cc 2022-03-02 22:04:17.000000000 +0100 -+++ b/src/BCache_Info.cc 2022-04-09 15:02:56.932218665 +0200 -@@ -17,7 +17,7 @@ - - #include "BCache_Info.h" - --#include <string.h> // GNU version of basename() -+#include <libgen.h> // POSIX version of basename() - #include <unistd.h> - #include <glibmm/ustring.h> - #include <glibmm/fileutils.h> diff --git a/meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb b/meta-gnome/recipes-extended/gparted/gparted_1.5.0.bb index dde5a02abb..fdfb1ef47f 100644 --- a/meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb +++ b/meta-gnome/recipes-extended/gparted/gparted_1.5.0.bb @@ -3,17 +3,15 @@ HOMEPAGE = "http://gparted.org/index.php" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -inherit autotools pkgconfig python3native gnome-help gtk-icon-cache features_check +inherit autotools pkgconfig python3native gettext gnome-help gtk-icon-cache features_check ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ - file://0001-Install-polkit-action-unconditionally-executable-pke.patch \ - file://0001-Do-not-use-NULL-where-boolean-is-expected.patch \ - file://0001-use-posix-basename.patch \ + ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'file://0001-Install-polkit-action-unconditionally-executable-pke.patch', '', d)} \ " -SRC_URI[sha256sum] = "e5293a792e53fdbeba29c4a834113cd9603d0d639330da931a468bf3687887be" +SRC_URI[sha256sum] = "3c95ea26a944083ff1d9b17639b1e2ad9758df225dc751ff407b2a6aa092a8de" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/gparted/files/gparted/" UPSTREAM_CHECK_REGEX = "gparted-(?P<pver>\d+\.(\d+)+(\.\d+)+)" @@ -27,6 +25,9 @@ DEPENDS += " \ parted \ " +PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)}" +PACKAGECONFIG[polkit] = ",,polkit" + FILES:${PN} += " \ ${datadir}/appdata \ ${datadir}/icons \ diff --git a/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/0001-Select-the-current-user-to-authenticate-with-by-defa.patch b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/0001-Select-the-current-user-to-authenticate-with-by-defa.patch new file mode 100644 index 0000000000..f8f7ec34f9 --- /dev/null +++ b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/0001-Select-the-current-user-to-authenticate-with-by-defa.patch @@ -0,0 +1,80 @@ +From: Utopia Maintenance Team + <pkg-utopia-maintainers@lists.alioth.debian.org> +Date: Mon, 30 Apr 2018 17:56:52 +0000 +Subject: Select the current user to authenticate with by default + +Bug: http://bugzilla.gnome.org/show_bug.cgi?id=596188 +Bug-Ubuntu: https://launchpad.net/bugs/435227 +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/polkitgnomeauthenticationdialog.c | 23 ++++++++++++++--------- + 1 file changed, 14 insertions(+), 9 deletions(-) + +diff --git a/src/polkitgnomeauthenticationdialog.c b/src/polkitgnomeauthenticationdialog.c +index 743cc96..d307516 100644 +--- a/src/polkitgnomeauthenticationdialog.c ++++ b/src/polkitgnomeauthenticationdialog.c +@@ -138,7 +138,7 @@ user_combobox_changed (GtkComboBox *widget, + static void + create_user_combobox (PolkitGnomeAuthenticationDialog *dialog) + { +- int n; ++ int n, i, selected_index = 0; + GtkComboBox *combo; + GtkTreeIter iter; + GtkCellRenderer *renderer; +@@ -162,7 +162,7 @@ create_user_combobox (PolkitGnomeAuthenticationDialog *dialog) + + + /* For each user */ +- for (n = 0; dialog->priv->users[n] != NULL; n++) ++ for (i = 0, n = 0; dialog->priv->users[n] != NULL; n++) + { + gchar *gecos; + gchar *real_name; +@@ -224,6 +224,14 @@ create_user_combobox (PolkitGnomeAuthenticationDialog *dialog) + USERNAME_COL, dialog->priv->users[n], + -1); + ++ i++; ++ if (passwd->pw_uid == getuid ()) ++ { ++ selected_index = i; ++ g_free (dialog->priv->selected_user); ++ dialog->priv->selected_user = g_strdup (dialog->priv->users[n]); ++ } ++ + g_free (real_name); + g_object_unref (pixbuf); + } +@@ -252,8 +260,8 @@ create_user_combobox (PolkitGnomeAuthenticationDialog *dialog) + user_combobox_set_sensitive, + NULL, NULL); + +- /* Initially select the "Select user..." ... */ +- gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0); ++ /* Select the default user */ ++ gtk_combo_box_set_active (GTK_COMBO_BOX (combo), selected_index); + + /* Listen when a new user is selected */ + g_signal_connect (GTK_WIDGET (combo), +@@ -719,16 +727,13 @@ polkit_gnome_authentication_dialog_constructed (GObject *object) + gtk_widget_set_tooltip_markup (label, s); + g_free (s); + +- if (have_user_combobox) ++ /* Disable password entry and authenticate until have a user selected */ ++ if (have_user_combobox && gtk_combo_box_get_active (GTK_COMBO_BOX (dialog->priv->user_combobox)) == 0) + { +- /* ... and make the password entry and "Authenticate" button insensitive */ + gtk_widget_set_sensitive (dialog->priv->prompt_label, FALSE); + gtk_widget_set_sensitive (dialog->priv->password_entry, FALSE); + gtk_widget_set_sensitive (dialog->priv->auth_button, FALSE); + } +- else +- { +- } + + gtk_widget_realize (GTK_WIDGET (dialog)); + diff --git a/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/0002-Auth-dialog-Make-the-label-wrap-at-70-chars.patch b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/0002-Auth-dialog-Make-the-label-wrap-at-70-chars.patch new file mode 100644 index 0000000000..011fe6ef25 --- /dev/null +++ b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/0002-Auth-dialog-Make-the-label-wrap-at-70-chars.patch @@ -0,0 +1,34 @@ +From: Lars Uebernickel <lars@uebernic.de> +Date: Fri, 17 Oct 2014 15:35:25 +0200 +Subject: Auth dialog: Make the label wrap at 70 chars + +Because GtkWindow doesn't have a default width anymore. + +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=738688 +Bug-Ubuntu: https://launchpad.net/bugs/1382566 +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/polkitgnomeauthenticationdialog.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/polkitgnomeauthenticationdialog.c b/src/polkitgnomeauthenticationdialog.c +index d307516..efd4185 100644 +--- a/src/polkitgnomeauthenticationdialog.c ++++ b/src/polkitgnomeauthenticationdialog.c +@@ -574,6 +574,7 @@ polkit_gnome_authentication_dialog_constructed (GObject *object) + g_free (s); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); ++ gtk_label_set_max_width_chars (GTK_LABEL (label), 70); + gtk_box_pack_start (GTK_BOX (main_vbox), label, FALSE, FALSE, 0); + + /* secondary message */ +@@ -601,6 +602,7 @@ polkit_gnome_authentication_dialog_constructed (GObject *object) + } + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); ++ gtk_label_set_max_width_chars (GTK_LABEL (label), 70); + gtk_box_pack_start (GTK_BOX (main_vbox), label, FALSE, FALSE, 0); + + /* user combobox */ diff --git a/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/0003-Get-user-icon-from-accountsservice-instead-of-lookin.patch b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/0003-Get-user-icon-from-accountsservice-instead-of-lookin.patch new file mode 100644 index 0000000000..a3759c4dcf --- /dev/null +++ b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/0003-Get-user-icon-from-accountsservice-instead-of-lookin.patch @@ -0,0 +1,138 @@ +From: Marc Deslauriers <marc.deslauriers@canonical.com> +Date: Mon, 30 Apr 2018 18:03:22 +0000 +Subject: Get user icon from accountsservice instead of looking in ~/.face + +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=669857 +Bug-Ubuntu: https://launchpad.net/bugs/928249 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/polkitgnomeauthenticationdialog.c | 107 ++++++++++++++++++++++++++++++---- + 1 file changed, 97 insertions(+), 10 deletions(-) + +diff --git a/src/polkitgnomeauthenticationdialog.c b/src/polkitgnomeauthenticationdialog.c +index efd4185..565da87 100644 +--- a/src/polkitgnomeauthenticationdialog.c ++++ b/src/polkitgnomeauthenticationdialog.c +@@ -135,6 +135,102 @@ user_combobox_changed (GtkComboBox *widget, + } + } + ++static GdkPixbuf * ++get_user_icon (char *username) ++{ ++ GError *error; ++ GDBusConnection *connection; ++ GVariant *find_user_result; ++ GVariant *get_icon_result; ++ GVariant *icon_result_variant; ++ const gchar *user_path; ++ const gchar *icon_filename; ++ GdkPixbuf *pixbuf; ++ ++ error = NULL; ++ connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error); ++ ++ if (connection == NULL) ++ { ++ g_warning ("Unable to connect to system bus: %s", error->message); ++ g_error_free (error); ++ return NULL; ++ } ++ ++ find_user_result = g_dbus_connection_call_sync (connection, ++ "org.freedesktop.Accounts", ++ "/org/freedesktop/Accounts", ++ "org.freedesktop.Accounts", ++ "FindUserByName", ++ g_variant_new ("(s)", ++ username), ++ G_VARIANT_TYPE ("(o)"), ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, ++ NULL, ++ &error); ++ ++ if (find_user_result == NULL) ++ { ++ g_warning ("Accounts couldn't find user: %s", error->message); ++ g_error_free (error); ++ return NULL; ++ } ++ ++ user_path = g_variant_get_string (g_variant_get_child_value (find_user_result, 0), ++ NULL); ++ ++ get_icon_result = g_dbus_connection_call_sync (connection, ++ "org.freedesktop.Accounts", ++ user_path, ++ "org.freedesktop.DBus.Properties", ++ "Get", ++ g_variant_new ("(ss)", ++ "org.freedesktop.Accounts.User", ++ "IconFile"), ++ G_VARIANT_TYPE ("(v)"), ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, ++ NULL, ++ &error); ++ ++ g_variant_unref (find_user_result); ++ ++ if (get_icon_result == NULL) ++ { ++ g_warning ("Accounts couldn't find user icon: %s", error->message); ++ g_error_free (error); ++ return NULL; ++ } ++ ++ g_variant_get_child (get_icon_result, 0, "v", &icon_result_variant); ++ icon_filename = g_variant_get_string (icon_result_variant, NULL); ++ ++ if (icon_filename == NULL) ++ { ++ g_warning ("Accounts didn't return a valid filename for user icon"); ++ pixbuf = NULL; ++ } ++ else ++ { ++ /* TODO: we probably shouldn't hard-code the size to 16x16 */ ++ pixbuf = gdk_pixbuf_new_from_file_at_size (icon_filename, ++ 16, ++ 16, ++ &error); ++ if (pixbuf == NULL) ++ { ++ g_warning ("Couldn't open user icon: %s", error->message); ++ g_error_free (error); ++ } ++ } ++ ++ g_variant_unref (icon_result_variant); ++ g_variant_unref (get_icon_result); ++ ++ return pixbuf; ++} ++ + static void + create_user_combobox (PolkitGnomeAuthenticationDialog *dialog) + { +@@ -197,16 +293,7 @@ create_user_combobox (PolkitGnomeAuthenticationDialog *dialog) + g_free (gecos); + + /* Load users face */ +- pixbuf = NULL; +- if (passwd->pw_dir != NULL) +- { +- gchar *path; +- path = g_strdup_printf ("%s/.face", passwd->pw_dir); +- /* TODO: we probably shouldn't hard-code the size to 16x16 */ +- pixbuf = gdk_pixbuf_new_from_file_at_scale (path, 16, 16, TRUE, NULL); +- g_free (path); +- } +- ++ pixbuf = get_user_icon (dialog->priv->users[n]); + /* fall back to avatar-default icon */ + if (pixbuf == NULL) + { diff --git a/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/0004-Use-fresh-X11-timestamps-when-displaying-authenticat.patch b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/0004-Use-fresh-X11-timestamps-when-displaying-authenticat.patch new file mode 100644 index 0000000000..2c9c5bb16b --- /dev/null +++ b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/0004-Use-fresh-X11-timestamps-when-displaying-authenticat.patch @@ -0,0 +1,48 @@ +From: Jeffrey Knockel <jeff250@gmail.com> +Date: Mon, 30 Apr 2018 18:05:20 +0000 +Subject: Use fresh X11 timestamps when displaying authentication dialog + +This circumvents focus-stealing prevention. + +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=676076 +Bug-Debian: https://bugs.debian.org/684300 +Bug-Ubuntu: https://launchpad.net/bugs/946171 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/polkitgnomeauthenticator.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/polkitgnomeauthenticator.c b/src/polkitgnomeauthenticator.c +index 23163b4..e57d76e 100644 +--- a/src/polkitgnomeauthenticator.c ++++ b/src/polkitgnomeauthenticator.c +@@ -26,6 +26,7 @@ + #include <sys/types.h> + #include <pwd.h> + #include <glib/gi18n.h> ++#include <gdk/gdkx.h> + + #include <polkit/polkit.h> + #include <polkitagent/polkitagent.h> +@@ -306,7 +307,17 @@ session_request (PolkitAgentSession *session, + } + + gtk_widget_show_all (GTK_WIDGET (authenticator->dialog)); +- gtk_window_present (GTK_WINDOW (authenticator->dialog)); ++ GdkWindow *window = gtk_widget_get_window (GTK_WIDGET (authenticator->dialog)); ++ ++ if (GDK_IS_X11_WINDOW (window)) ++ { ++ gtk_window_present_with_time (GTK_WINDOW (authenticator->dialog), gdk_x11_get_server_time (window)); ++ } ++ else ++ { ++ gtk_window_present (GTK_WINDOW (authenticator->dialog)); ++ } ++ + password = polkit_gnome_authentication_dialog_run_until_response_for_prompt (POLKIT_GNOME_AUTHENTICATION_DIALOG (authenticator->dialog), + modified_request, + echo_on, + diff --git a/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/0005-configure.ac-disable-gnome-tools-that-are-not-provid.patch b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/0005-configure.ac-disable-gnome-tools-that-are-not-provid.patch new file mode 100644 index 0000000000..7eee12a920 --- /dev/null +++ b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/0005-configure.ac-disable-gnome-tools-that-are-not-provid.patch @@ -0,0 +1,29 @@ +From 334abb04ff953dabec63a91094de43e3cf064d7d Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Fri, 24 Feb 2023 17:29:24 +0100 +Subject: [PATCH] configure.ac: disable gnome-tools that are not provided + +Upstream-Status: Inappropriate [OE-specific] +Signed-off-by: Markus Volk <f_l_k@t-online.de> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 24eb724..02fccbd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -33,8 +33,8 @@ LT_INIT + # GNOME + # ***** + +-GNOME_DEBUG_CHECK +-GNOME_COMPILE_WARNINGS([maximum]) ++#GNOME_DEBUG_CHECK ++#GNOME_COMPILE_WARNINGS([maximum]) + + #### gcc warning flags + +-- +2.34.1 + diff --git a/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/polkit-gnome-authentication-agent-1.desktop b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/polkit-gnome-authentication-agent-1.desktop new file mode 100644 index 0000000000..c45acfa543 --- /dev/null +++ b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/polkit-gnome-authentication-agent-1.desktop @@ -0,0 +1,87 @@ +[Desktop Entry] +Name=PolicyKit Authentication Agent +Name[ar]=مدير الاستيثاق PolicyKit +Name[be]=PolicyKit - аґент аўтэнтыфікацыі +Name[bn_IN]=PolicyKit অনুমোদনের এজেন্ট +Name[ca]=Agent d'autenticació del PolicyKit +Name[cs]=Ověřovací agent PolicyKit +Name[da]=Godkendelsesprogrammet PolicyKit +Name[de]=Legitimationsdienst von PolicyKit +Name[el]=Πράκτορας πιστοποίησης PolicyKit +Name[en_GB]=PolicyKit Authentication Agent +Name[es]=Agente de autenticación de PolicyKit +Name[eu]=PolicyKit autentifikatzeko agentea +Name[fi]=PolicytKit-tunnistautumisohjelma +Name[fr]=Agent d'authentification de PolicyKit +Name[gl]=Axente de autenticación PolicyKit +Name[gu]=PolicyKit સત્તાધિકરણ એજન્ટ +Name[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि +Name[hu]=PolicyKit hitelesítési ügynök +Name[it]=Agente di autenticazione per PolicyKit +Name[ja]=PolicyKit 認証エージェント +Name[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ +Name[lt]=PolicyKit tapatybės nustatymo agentas +Name[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന് ഏജന്റ് +Name[mr]=PolicyKit ऑथेंटीकेशन एजेंट +Name[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ +Name[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ +Name[pl]=Agent uwierzytelniania PolicyKit +Name[pt]=Agente de Autenticação PolicyKit +Name[pt_BR]=Agente de autenticação PolicyKit +Name[ro]=Agent de autentificare PolicyKit +Name[sk]=Agent PolicyKit na overovanie totožnosti +Name[sl]=PolicyKit program overjanja +Name[sv]=Autentiseringsagent för PolicyKit +Name[ta]=PolicyKit அங்கீகார முகவர் +Name[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి +Name[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit +Name[uk]=Агент автентифікації PolicyKit +Name[zh_CN]=PolicyKit 认证代理 +Name[zh_HK]=PolicyKit 驗證代理程式 +Name[zh_TW]=PolicyKit 驗證代理程式 +Comment=PolicyKit Authentication Agent +Comment[ar]=مدير الاستيثاق PolicyKit +Comment[be]=PolicyKit - аґент аўтэнтыфікацыі +Comment[bn_IN]=PolicyKit অনুমোদনের এজেন্ট +Comment[ca]=Agent d'autenticació del PolicyKit +Comment[cs]=Ověřovací agent PolicyKit +Comment[da]=Godkendelsesprogrammet PolicyKit +Comment[de]=Legitimationsdienst von PolicyKit +Comment[el]=Πράκτορας πιστοποίησης PolicyKit +Comment[en_GB]=PolicyKit Authentication Agent +Comment[es]=Agente de autenticación de PolicyKit +Comment[eu]=PolicyKit autentifikatzeko agentea +Comment[fi]=PolicytKit-tunnistautumisohjelma +Comment[fr]=Agent d'authentification de PolicyKit +Comment[gl]=Axente de autenticación PolicyKit +Comment[gu]=PolicyKit સત્તાધિકરણ એજન્ટ +Comment[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि +Comment[hu]=PolicyKit hitelesítési ügynök +Comment[it]=Agente di autenticazione per PolicyKit +Comment[ja]=PolicyKit 認証エージェント +Comment[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ +Comment[lt]=PolicyKit tapatybės nustatymo agentas +Comment[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന് ഏജന്റ് +Comment[mr]=PolicyKit ऑथेंटीकेशन एजेंट +Comment[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ +Comment[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ +Comment[pl]=Agent uwierzytelniania PolicyKit +Comment[pt]=Agente de Autenticação PolicyKit +Comment[pt_BR]=Agente de autenticação PolicyKit +Comment[ro]=Agent de autentificare PolicyKit +Comment[sk]=Agent PolicyKit na overovanie totožnosti +Comment[sl]=PolicyKit program overjanja +Comment[sv]=Autentiseringsagent för PolicyKit +Comment[ta]=PolicyKit அங்கீகார முகவர் +Comment[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి +Comment[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit +Comment[uk]=Агент автентифікації PolicyKit +Comment[zh_CN]=PolicyKit 认证代理 +Comment[zh_HK]=PolicyKit 驗證代理程式 +Comment[zh_TW]=PolicyKit 驗證代理程式 +Exec=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 +Terminal=false +Type=Application +Categories= +NoDisplay=true +OnlyShowIn=GNOME; diff --git a/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome_0.105.bb b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome_0.105.bb new file mode 100644 index 0000000000..e0e4a59d24 --- /dev/null +++ b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome_0.105.bb @@ -0,0 +1,29 @@ +SUMMARY = "PolicyKit-gnome provides an Authentication Agent for PolicyKit" +HOMEPAGE = "https://gitlab.gnome.org/Archive/policykit-gnome" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=74579fab173e4c5e12aac0cd83ee98ec" + +DEPENDS = "glib-2.0-native glib-2.0 gtk+3 polkit intltool-native" + +inherit autotools pkgconfig features_check + +REQUIRED_DISTRO_FEATURES = "polkit" + +SRC_URI = " \ + git://gitlab.gnome.org/Archive/policykit-gnome.git;protocol=https;branch=master \ + file://0001-Select-the-current-user-to-authenticate-with-by-defa.patch \ + file://0002-Auth-dialog-Make-the-label-wrap-at-70-chars.patch \ + file://0003-Get-user-icon-from-accountsservice-instead-of-lookin.patch \ + file://0004-Use-fresh-X11-timestamps-when-displaying-authenticat.patch \ + file://0005-configure.ac-disable-gnome-tools-that-are-not-provid.patch \ + file://polkit-gnome-authentication-agent-1.desktop \ +" +SRCREV = "a0763a246a81188f60b0f9810143e49224dc752f" +S = "${WORKDIR}/git" + + +do_install:append() { + install -d ${D}${datadir}/applications + install -m644 ${WORKDIR}/polkit-gnome-authentication-agent-1.desktop \ + ${D}${datadir}/applications +} diff --git a/meta-gnome/recipes-gimp/babl/babl_0.1.98.bb b/meta-gnome/recipes-gimp/babl/babl_0.1.106.bb index a9e192b753..5a5f4f5e7c 100644 --- a/meta-gnome/recipes-gimp/babl/babl_0.1.98.bb +++ b/meta-gnome/recipes-gimp/babl/babl_0.1.106.bb @@ -10,11 +10,9 @@ inherit setuptools3 gnomebase gobject-introspection vala DEPENDS += "lcms" -# https://bugs.llvm.org/show_bug.cgi?id=45555 -CFLAGS:append:toolchain-clang:mipsarch = " -ffp-exception-behavior=ignore " -CFLAGS:append:toolchain-clang:riscv64 = " -ffp-exception-behavior=ignore " - SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz" -SRC_URI[sha256sum] = "f3b222f84e462735de63fa9c3651942f2b78fd314c73a22e05ff7c73afd23af1" +SRC_URI[sha256sum] = "d325135d3304f088c134cc620013acf035de2e5d125a50a2d91054e7377c415f" + +FILES:${PN} += "${libdir}/${BPN}-${@gnome_verdir("${PV}")}" BBCLASSEXTEND = "native" diff --git a/meta-gnome/recipes-gimp/gegl/gegl_0.4.40.bb b/meta-gnome/recipes-gimp/gegl/gegl_0.4.46.bb index 335ce24aa9..3a9478785d 100644 --- a/meta-gnome/recipes-gimp/gegl/gegl_0.4.40.bb +++ b/meta-gnome/recipes-gimp/gegl/gegl_0.4.46.bb @@ -13,6 +13,10 @@ DEPENDS = " \ json-glib \ " +DEPENDS:append:toolchain-clang = " openmp" +DEPENDS:remove:toolchain-clang:riscv32 = "openmp" +DEPENDS:remove:toolchain-clang:powerpc = "openmp" + GNOMEBASEBUILDCLASS = "meson" inherit features_check gnomebase vala gobject-introspection @@ -22,7 +26,7 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" SHPV = "${@gnome_verdir("${PV}")}" SRC_URI = "https://download.gimp.org/pub/${BPN}/${SHPV}/${BP}.tar.xz" -SRC_URI[sha256sum] = "cdde80d15a49dab9a614ef98f804c8ce6e4cfe1339a3c240c34f3fb45436b85d" +SRC_URI[sha256sum] = "d0b3b2481bc8774c5f3d0a487611910166d18eef823a859fb91e781ab7b1e892" PACKAGECONFIG ??= "gexiv2 jpeg libpng libraw librsvg pango poppler sdl2" PACKAGECONFIG:class-native = "libpng librsvg" diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0001-configure-Keep-first-line-of-compiler-version-string.patch b/meta-gnome/recipes-gimp/gimp/gimp/0001-configure-Keep-first-line-of-compiler-version-string.patch new file mode 100644 index 0000000000..618b4cc7a7 --- /dev/null +++ b/meta-gnome/recipes-gimp/gimp/gimp/0001-configure-Keep-first-line-of-compiler-version-string.patch @@ -0,0 +1,30 @@ +From 5711ccfab40e304ced7f5be39a4083e3fcecff91 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 24 May 2023 22:22:41 -0700 +Subject: [PATCH] configure: Keep first line of compiler version string + +Full output of cc -v may contain additional information which could +contain build path information, which is unnessasary + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gimp/-/merge_requests/926] +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 c25415d..68707a0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -599,7 +599,7 @@ fi + for CC_VERSION_OPT in $CC_VERSION_OPTS; do + # We run $CC, and escape and format its output, in a single step, + # since some shells expand escape sequences in "echo" arguments. +- CC_VERSION="`$CC $CC_VERSION_OPT 2>&1 | sed -e 's/\\\\/\\\\\\\\\\\\\\\\/g;s/^/\\\\t/;s/$/\\\\n/' | tr -d '\n'`" ++ CC_VERSION="`$CC $CC_VERSION_OPT 2>&1 | head -1 | sed -e 's/\\\\/\\\\\\\\\\\\\\\\/g;s/^/\\\\t/;s/$/\\\\n/' | tr -d '\n'`" + if test $? -eq 0; then + break + fi +-- +2.40.1 + diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0001-libtool-Do-not-add-build-time-library-paths-to-LD_LI.patch b/meta-gnome/recipes-gimp/gimp/gimp/0001-libtool-Do-not-add-build-time-library-paths-to-LD_LI.patch new file mode 100644 index 0000000000..cec0055284 --- /dev/null +++ b/meta-gnome/recipes-gimp/gimp/gimp/0001-libtool-Do-not-add-build-time-library-paths-to-LD_LI.patch @@ -0,0 +1,34 @@ +From c720df90dfe3a3e92e34bfb36a04cc792064a501 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 24 May 2023 22:39:02 -0700 +Subject: [PATCH] libtool: Do not add build time library paths to + LD_LIBRARY_PATH + +This does not serve much purpose on cross builds as it will add build +time paths which are only useful when trying to run these tools from +build area but when they are cross built this is not possible to run +them like this. + +Upstream-Status: Inappropriate [Cross-compile specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + ltmain.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ltmain.sh b/ltmain.sh +index 134902c..068d74a 100644 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -5748,7 +5748,7 @@ func_exec_program () + if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + $ECHO "\ + # Add our own library path to $shlibpath_var +- $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" ++ $shlibpath_var=\"$shlibpath_var\" + + # Some systems cannot cope with colon-terminated $shlibpath_var + # The second colon is a workaround for a bug in BeOS R4 sed +-- +2.40.1 + diff --git a/meta-gnome/recipes-gimp/gimp/gimp_2.10.30.bb b/meta-gnome/recipes-gimp/gimp/gimp_2.10.34.bb index a73de1e3ff..7343036807 100644 --- a/meta-gnome/recipes-gimp/gimp/gimp_2.10.30.bb +++ b/meta-gnome/recipes-gimp/gimp/gimp_2.10.34.bb @@ -43,8 +43,10 @@ REQUIRED_DISTRO_FEATURES = "x11" SHPV = "${@gnome_verdir("${PV}")}" -SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2" -SRC_URI[sha256sum] = "88815daa76ed7d4277eeb353358bafa116cd2fcd2c861d95b95135c1d52b67dc" +SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2 \ + file://0001-configure-Keep-first-line-of-compiler-version-string.patch \ + file://0001-libtool-Do-not-add-build-time-library-paths-to-LD_LI.patch" +SRC_URI[sha256sum] = "84004642d351b398a4293cd7fd3592044a944f05bb52850ee6068f247c657aa3" EXTRA_OECONF = "--disable-python \ --without-webkit \ diff --git a/meta-gnome/recipes-gnome/eog/eog_43.2.bb b/meta-gnome/recipes-gnome/eog/eog_44.3.bb index 7dbc0ecf2a..06203fbbe0 100644 --- a/meta-gnome/recipes-gnome/eog/eog_43.2.bb +++ b/meta-gnome/recipes-gnome/eog/eog_44.3.bb @@ -19,9 +19,10 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase pkgconfig gsettings gobject-introspection gettext mime-xdg features_check gtk-icon-cache -REQUIRED_DISTRO_FEATURES = "opengl" +# 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] = "9dcfdce5585a90e2bb1cf57e377cb1eb12d41bd9bcb9bbacdf506bc1b1354ef9" +SRC_URI[archive.sha256sum] = "d6b2d70f4b432ff8cf494c8f9029b2621d08e7817938317d64063ae6c4da9d8c" GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-gnome/recipes-gnome/evince/evince_43.1.bb b/meta-gnome/recipes-gnome/evince/evince_44.2.bb index b83c411923..00d1079103 100644 --- a/meta-gnome/recipes-gnome/evince/evince_43.1.bb +++ b/meta-gnome/recipes-gnome/evince/evince_44.2.bb @@ -6,6 +6,7 @@ DEPENDS = " \ adwaita-icon-theme \ appstream-glib \ cairo \ + desktop-file-utils-native \ dbus \ gdk-pixbuf \ glib-2.0 \ @@ -33,7 +34,7 @@ REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'open def gnome_verdir(v): return oe.utils.trim_version(v, 1) -SRC_URI[archive.sha256sum] = "6d75ca62b73bfbb600f718a098103dc6b813f9050b9594be929e29b4589d2335" +SRC_URI[archive.sha256sum] = "9a75c7ff8f599218d070e09fb4082cb26f9b86370a9bfae98e1aacb564d675dd" GTKDOC_MESON_OPTION = "gtk_doc" @@ -45,6 +46,11 @@ RRECOMMENDS:${PN} = "adwaita-icon-theme" PACKAGES =+ "${PN}-nautilus-extension" +do_install:prepend() { + sed -i -e 's|${B}/../${PN}-${PV}|/usr/src/debug/${PN}/${PV}-${PR}|g' ${B}/libview/ev-view-type-builtins.c + sed -i -e 's|${B}/../${PN}-${PV}|/usr/src/debug/${PN}/${PV}-${PR}|g' ${B}/libdocument/ev-document-type-builtins.c +} + FILES:${PN} += "${datadir}/dbus-1 \ ${datadir}/metainfo \ ${datadir}/thumbnailers \ diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb index a271152678..edbe30ff87 100644 --- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb +++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb @@ -37,8 +37,7 @@ EXTRA_OECMAKE:append:class-target = " -DG_IR_SCANNER=${STAGING_BINDIR}/g-ir-scan PACKAGECONFIG ?= "oauth" PACKAGECONFIG[canberra] = "-DENABLE_CANBERRA=ON,-DENABLE_CANBERRA=OFF,libcanberra" -# ENABLE_OAUTH2_WEBKITGTK4 would require webkit to be built with gtk4 -PACKAGECONFIG[oauth] = "-DENABLE_OAUTH2_WEBKITGTK=ON -DENABLE_OAUTH2_WEBKITGTK4=OFF,-DENABLE_OAUTH2_WEBKITGTK=OFF,webkitgtk json-glib" +PACKAGECONFIG[oauth] = "-DENABLE_OAUTH2_WEBKITGTK=ON -DENABLE_OAUTH2_WEBKITGTK4=OFF,-DENABLE_OAUTH2_WEBKITGTK4=OFF -DENABLE_OAUTH2_WEBKITGTK=OFF,webkitgtk3 json-glib" PACKAGECONFIG[goa] = "-DENABLE_GOA=ON,-DENABLE_GOA=OFF,gnome-online-accounts" PACKAGECONFIG[kerberos] = "-DWITH_KRB5=ON,-DWITH_KRB5=OFF,krb5" # BROKEN: due missing pkg-config in openldap eds' cmake finds host-libs when diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc index 2b74b2e605..5452a2e793 100644 --- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc +++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc @@ -9,5 +9,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \ inherit gnomebase upstream-version-is-even -SRC_URI[archive.sha256sum] = "0938e2279e5cfbc2204766ca9d3fea570911699b07c10cbe01aca62a7e8b2bee" -PV = "3.46.3" +SRC_URI[archive.sha256sum] = "b71e412e52f567c83394b5926df92b4f4f6d2cddebad384a517c720671fad996" +PV = "3.48.3" diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-cmake-Do-not-export-CC-into-gir-compiler.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-cmake-Do-not-export-CC-into-gir-compiler.patch index fda84acae7..118d93a72a 100644 --- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-cmake-Do-not-export-CC-into-gir-compiler.patch +++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-cmake-Do-not-export-CC-into-gir-compiler.patch @@ -1,3 +1,7 @@ +Use G_IR_SCANNER without passing additional environment + +Upstream-Status: Inappropriate [OE-specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> --- a/cmake/modules/GObjectIntrospection.cmake +++ b/cmake/modules/GObjectIntrospection.cmake @@ -122,9 +122,7 @@ macro(gir_add_introspection gir) diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch index 23c3a96d43..51eaf7cfef 100644 --- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch +++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch @@ -9,6 +9,7 @@ Content-Transfer-Encoding: 8bit * TRY_RUN: does not work for OE * HAVE_LKSTRFTIME is set by recipe as configure option +Upstream-Status: Inappropriate [Cross-compile specific] Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- CMakeLists.txt | 23 ----------------------- diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-call-native-helpers.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-call-native-helpers.patch index e320f6342d..82f6972501 100644 --- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-call-native-helpers.patch +++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-call-native-helpers.patch @@ -6,7 +6,7 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Upstream-Status: Inappropriate[oe-specific] +Upstream-Status: Inappropriate [oe-specific] Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- diff --git a/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb b/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb index 5ed3375eb0..12d344bff5 100644 --- a/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb +++ b/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb @@ -8,8 +8,7 @@ inherit allarch gtk-icon-cache S = "${WORKDIR}" -SRC_URI = "http://faenza-icon-theme.googlecode.com/files/${BPN}_${PV}.zip" -SRC_URI[md5sum] = "e9bd6106d13017ce06d24b586259ae9c" +SRC_URI = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${BPN}/${BPN}_${PV}.zip" SRC_URI[sha256sum] = "d4486fda0413f8a81a87e0dd2329f50f2a8a7cb4147b48cf147f0160add8174a" do_install() { diff --git a/meta-gnome/recipes-gnome/file-roller/file-roller_43.0.bb b/meta-gnome/recipes-gnome/file-roller/file-roller_43.0.bb index 6d0f1f7463..f9b6841d6b 100644 --- a/meta-gnome/recipes-gnome/file-roller/file-roller_43.0.bb +++ b/meta-gnome/recipes-gnome/file-roller/file-roller_43.0.bb @@ -33,3 +33,12 @@ FILES:${PN} += " \ ${datadir}/metainfo \ ${libdir}/nautilus \ " + +EXTRA_OEMESON += "--cross-file=${WORKDIR}/meson-${PN}.cross" + +do_write_config:append() { + cat >${WORKDIR}/meson-${PN}.cross <<EOF +[binaries] +cpio = '${bindir}/cpio' +EOF +} diff --git a/meta-gnome/recipes-gnome/gdm/gdm_43.0.bb b/meta-gnome/recipes-gnome/gdm/gdm_44.1.bb index 1b09c20d4c..cd9013312d 100644 --- a/meta-gnome/recipes-gnome/gdm/gdm_43.0.bb +++ b/meta-gnome/recipes-gnome/gdm/gdm_44.1.bb @@ -21,7 +21,7 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings pkgconfig gobject-introspection gettext systemd useradd itstool gnome-help features_check -SRC_URI[archive.sha256sum] = "94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294" +SRC_URI[archive.sha256sum] = "68266b3abe7d28fc469d0067aac9c5dabb0ca7952cc1f7c238a04951f3dc5b0d" EXTRA_OEMESON = " \ -Dplymouth=disabled \ @@ -29,6 +29,13 @@ EXTRA_OEMESON = " \ -Dpam-mod-dir=${base_libdir}/security \ " +do_install:prepend() { + sed -i -e 's|${B}/||g' ${B}/daemon/gdm-session-worker-enum-types.c + sed -i -e 's|${B}/||g' ${B}/daemon/gdm-session-worker-enum-types.h + sed -i -e 's|${B}/||g' ${B}/daemon/gdm-session-enum-types.c + sed -i -e 's|${B}/||g' ${B}/daemon/gdm-session-enum-types.h +} + do_install:append() { rm -rf ${D}/run ${D}${localstatedir}/run } diff --git a/meta-gnome/recipes-gnome/gedit/gedit_43.2.bb b/meta-gnome/recipes-gnome/gedit/gedit_44.2.bb index 1c1803d5e7..34c782297c 100644 --- a/meta-gnome/recipes-gnome/gedit/gedit_43.2.bb +++ b/meta-gnome/recipes-gnome/gedit/gedit_44.2.bb @@ -21,7 +21,7 @@ inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc val def gnome_verdir(v): return oe.utils.trim_version(v, 1) -SRC_URI[archive.sha256sum] = "f950d2d35c594bb6c8dbc9f5440cad7788ca0a8688e2b07846f83de9a4e3fc25" +SRC_URI[archive.sha256sum] = "3bbb1b3775d4c277daf54aaab44b0eb83a4eb1f09f0391800041c9e56893ec11" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" diff --git a/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch b/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch index 0c45e60957..c46f85b7dc 100644 --- a/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch +++ b/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch @@ -9,7 +9,7 @@ Content-Transfer-Encoding: 8bit * Do not build/run mozjs-linked program * Do not try to run test applications -Upstream-Status: Submitted[https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/690] +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/690] Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- diff --git a/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch b/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch index 6e7b5504e8..e281717ea1 100644 --- a/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch +++ b/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch @@ -7,7 +7,7 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Upstream-Status: Submitted[https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/690] +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/690] Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- diff --git a/meta-gnome/recipes-gnome/gjs/gjs_1.75.1.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.76.1.bb index b2c2b583b0..93711bc3bb 100644 --- a/meta-gnome/recipes-gnome/gjs/gjs_1.75.1.bb +++ b/meta-gnome/recipes-gnome/gjs/gjs_1.76.1.bb @@ -8,7 +8,7 @@ DEPENDS = "mozjs-102 cairo" inherit gnomebase gsettings gobject-introspection vala gettext features_check upstream-version-is-even pkgconfig -SRC_URI[archive.sha256sum] = "81dcdf49d2665d08fa7e251700ea36466d77877418e9186d3a7e7efcd31aa960" +SRC_URI[archive.sha256sum] = "7b867c18a9b30333ebbcff9ad3f20299f0372ffad439d49b87d40a1d1798b78d" SRC_URI += " \ file://0001-Support-cross-builds-a-bit-better.patch \ file://0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch \ diff --git a/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.3.bb b/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.4.bb index 017d67b5a6..29aeef1ad9 100644 --- a/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.3.bb +++ b/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.4.bb @@ -14,7 +14,7 @@ GTKDOC_MESON_OPTION = "gtk_doc" inherit gnomebase gobject-introspection gtk-doc vala -SRC_URI[archive.sha256sum] = "7bdf0789553496abddc3c963b0ce7363805c0c02c025feddebcaacc787249e88" +SRC_URI[archive.sha256sum] = "c0afbe333bcf3cb1441a1f574cc8ec7b1b8197779145d4edeee2896fdacfc3c2" do_compile:prepend() { export GIR_EXTRA_LIBS_PATH="${B}/gnome-autoar/.libs" diff --git a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_43.bb b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_44.0.bb index 9f94378d8c..2934b7398b 100644 --- a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_43.bb +++ b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_44.0.bb @@ -8,7 +8,7 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gettext allarch -SRC_URI[archive.sha256sum] = "19f749d8c37f872f155bb69a2bbe7aca381175e6929f1998047d775cbc637244" +SRC_URI[archive.sha256sum] = "4a8393b387135f2a6a424a1a0c3ac94e0742b62b8235a0923c929f51e04be04e" FILES:${PN} += " \ ${datadir}/backgrounds \ diff --git a/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_43.0.1.bb b/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_44.0.bb index 3459b6d5f0..53dafba184 100644 --- a/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_43.0.1.bb +++ b/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_44.0.bb @@ -29,7 +29,7 @@ def gnome_verdir(v): REQUIRED_DISTRO_FEATURES = "x11 opengl" -SRC_URI[archive.sha256sum] = "02c12ded3cf5053d17537d95ec69587f4b919899d7726eceecdb4b47ffb1c90f" +SRC_URI[archive.sha256sum] = "14e763329f88309a7e152780d57361b543100e323906b34e0655fdc315b71043" FILES:${PN} += " \ ${datadir}/dbus-1 \ diff --git a/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_43.1.bb b/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_44.0.bb index 06e06e9bd3..dcf5ba7d6d 100644 --- a/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_43.1.bb +++ b/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_44.0.bb @@ -23,7 +23,7 @@ inherit gnomebase gsettings gtk-icon-cache gettext features_check upstream-versi REQUIRED_DISTRO_FEATURES = "x11 opengl" -SRC_URI[archive.sha256sum] = "afa5fc66e2f691553cc7d517db2363cff2d62cd1b5df455e5f4f7133139d21f2" +SRC_URI[archive.sha256sum] = "96acd74cbf45652934515cc3447a3b895e933f86324ca92436f67ddd63c3a802" FILES:${PN} += " \ ${datadir}/gnome-shell \ diff --git a/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_43.1.bb b/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_43.2.bb index 643e6befeb..343135bfa8 100644 --- a/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_43.1.bb +++ b/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_43.2.bb @@ -29,7 +29,6 @@ inherit meson pkgconfig gobject-introspection gtk-icon-cache vala features_check GIR_MESON_OPTION = "" S = "${WORKDIR}/git" -PV = "43.1" -SRCREV = "95c7fb91daf36014fc1c2a7ec20b7400a21cd316" +SRCREV = "de47d07ec6fc828b2668ca6ee59fe9bdfa9dc1d6" FILES:${PN} += "${datadir}" diff --git a/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.14.3.bb b/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.14.3.bb deleted file mode 100644 index b16400cf38..0000000000 --- a/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.14.3.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "A light and fast file manager" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -DEPENDS = " \ - glib-2.0-native \ - gtk+ \ -" - -inherit gnomebase itstool gettext gnome-help features_check -ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" - -SRC_URI[archive.sha256sum] = "78d8dce70fb922b2909cf767783053b0811213a4d6a49b3875510cf3a84efd7b" - -PACKAGECONFIG ??= "exiv2 taglib libgsf poppler" -PACKAGECONFIG[exiv2] = "--with-exiv2,--without-exiv2,exiv2" -PACKAGECONFIG[taglib] = "--with-taglib,--without-taglib,taglib" -PACKAGECONFIG[libgsf] = "--with-libgsf,--without-libgsf,libgsf" -PACKAGECONFIG[poppler] = "--with-poppler,--without-poppler,poppler" - -FILES:${PN} += "${datadir}/metainfo" -FILES:${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV}" diff --git a/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.16.1.bb b/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.16.1.bb new file mode 100644 index 0000000000..6aa28fc00f --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.16.1.bb @@ -0,0 +1,31 @@ +SUMMARY = "A light and fast file manager" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +DEPENDS += " \ + desktop-file-utils-native \ + glib-2.0-native \ + gtk+ \ +" + +CXXFLAGS += "-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR" + +inherit gnomebase itstool gettext gnome-help features_check meson gtk-icon-cache mime-xdg +ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" + +GNOMEBASEBUILDCLASS = "meson" +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' + +SRC_URI[archive.sha256sum] = "3f1d00c4a650fe7902167648286b32c9ca4ef86e31a5d8ccca0139f12d10d0b3" + +PACKAGECONFIG ??= "exiv2 taglib libgsf poppler" +PACKAGECONFIG[exiv2] = "-Dexiv2=enabled,-Dexiv2=disabled,exiv2" +PACKAGECONFIG[taglib] = "-Dtaglib=enabled,-Dtaglib=disabled,taglib" +PACKAGECONFIG[libgsf] = "-Dlibgsf=enabled,-Dlibgsf=disabled,libgsf" +PACKAGECONFIG[poppler] = "-Dpoppler=enabled,-Dpoppler=disabled,poppler" +PACKAGECONFIG[samba] = "-Dsamba=enabled,-Dsamba=disabled,samba" +PACKAGECONFIG[tests] = "-Dtests=enabled,-Dtests=disabled," + +FILES:${PN} += "${datadir}/metainfo" +FILES:${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV}" diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch index 11ad30eda6..5c0eee5764 100644 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch @@ -28,10 +28,10 @@ index dbca723..af0f871 100644 option('ibus', type: 'boolean', value: true, description: 'build with IBus support') option('privileged_group', type: 'string', value: 'wheel', description: 'name of group that has elevated permissions') diff --git a/panels/background/meson.build b/panels/background/meson.build -index 3634c47..459ccfe 100644 +index 69af0cfea..6edcaa5ff 100644 --- a/panels/background/meson.build +++ b/panels/background/meson.build -@@ -25,7 +25,7 @@ common_sources = [] +@@ -19,7 +19,7 @@ common_sources = [] enums = 'gdesktop-enums-types' enums_header = files( @@ -40,5 +40,18 @@ index 3634c47..459ccfe 100644 'cc-background-item.h' ) +diff --git a/panels/datetime/meson.build b/panels/datetime/meson.build +index 3b6f5e197..30b207882 100644 +--- a/panels/datetime/meson.build ++++ b/panels/datetime/meson.build +@@ -45,7 +45,7 @@ sources = files( + + enums = 'gdesktop-enums-types' + enums_header = files( +- gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', ++ get_option('oe_sysroot') + gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', + 'cc-datetime-panel.h' + ) + -- 2.34.1 diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_43.2.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_44.3.bb index 830f3ec684..0066f5885f 100644 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_43.2.bb +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_44.3.bb @@ -37,9 +37,10 @@ inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext upstream-version-is REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11" SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" -SRC_URI[archive.sha256sum] = "d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563" +SRC_URI[archive.sha256sum] = "066a65052fc3ecfae860025e85f797e6ab2b87a58c4f8ab9c66ec20718a80c7a" PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" +PACKAGECONFIG[cups] = ",,cups,cups" PACKAGECONFIG[ibus] = "-Dibus=true, -Dibus=false, ibus" PACKAGECONFIG[wayland] = "-Dwayland=true, -Dwayland=false, wayland" diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson-Add-riscv32-to-seccomp-unsupported-list.patch b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson-Add-riscv32-to-seccomp-unsupported-list.patch new file mode 100644 index 0000000000..65e06dafcb --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson-Add-riscv32-to-seccomp-unsupported-list.patch @@ -0,0 +1,29 @@ +From 6937685426aff8059b68b2941a0fe549eca21ce5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 3 Mar 2023 23:04:56 -0800 +Subject: [PATCH] meson: Add riscv32 to seccomp unsupported list + +rv32 needs to upstream the libseccomp support + +Upstream-Status: Pending +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 6a888b8..a87c419 100644 +--- a/meson.build ++++ b/meson.build +@@ -65,7 +65,7 @@ udev_dep = dependency('libudev', required: get_option('udev')) + host_os = host_machine.system() + host_cpu = host_machine.cpu() + supported_os = ['linux'] +-unsupported_cpus = ['alpha', 'ia64', 'm68k', 'sh4', 'sparc', 'sparc64'] ++unsupported_cpus = ['alpha', 'ia64', 'm68k', 'riscv32', 'sh4', 'sparc', 'sparc64'] + if supported_os.contains(host_os) and not unsupported_cpus.contains(host_cpu) + seccomp_dep = dependency('libseccomp') + else +-- +2.39.2 + diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_43.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.0.bb index 7695056eaa..03411c88d9 100644 --- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_43.bb +++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.0.bb @@ -11,13 +11,12 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase itstool pkgconfig upstream-version-is-even gobject-introspection features_check gtk-doc REQUIRED_DISTRO_FEATURES = "x11 opengl" -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" GIR_MESON_OPTION = "" -SRC_URI += "file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch" -SRC_URI[archive.sha256sum] = "3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69" +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" DEPENDS += " \ fontconfig \ @@ -34,6 +33,8 @@ DEPENDS += " \ xrandr \ " +DEPENDS:remove:riscv32 = "libseccomp" + GTKDOC_MESON_OPTION = "gtk_doc" EXTRA_OEMESON = "-Ddesktop_docs=false" diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_43.0.bb b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_44.0.bb index 247bf141c5..d8674fca24 100644 --- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_43.0.bb +++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_44.0.bb @@ -30,7 +30,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] = "7afca9805a6b92db6933dd7efcec4af8386c01bbc1f871e2dae4def7e192a2c5" +SRC_URI[archive.sha256sum] = "02031097896cdb37d8717a5823f93e3723d4dfce7fdc4002c9dfcb16b7e7a3ef" EXTRA_OEMESON = "-Dman=false" diff --git a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_43.0.bb b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_44.0.bb index 130c26924d..ff5e1e2c8c 100644 --- a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_43.0.bb +++ b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_44.0.bb @@ -16,7 +16,7 @@ inherit gnomebase gtk-icon-cache gettext features_check mime-xdg REQUIRED_DISTRO_FEATURES = "x11 opengl" -SRC_URI[archive.sha256sum] = "81c6bffb06d5332346e00eaecaec1bdcfd617c51dfd95bcd058d6c76c76dd2b9" +SRC_URI[archive.sha256sum] = "a1511df30b228cc2ef1175dd9d2b93438ea912e25913404b263cf3d457bb9f97" FILES:${PN} += " \ ${datadir}/dbus-1 \ diff --git a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_3.36.0.bb b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_3.36.0.bb index dbc6e962eb..fa162510cb 100644 --- a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_3.36.0.bb +++ b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_3.36.0.bb @@ -4,11 +4,9 @@ LICENSE = "GPL-2.0-only & LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" -DEPENDS = "python3 libxml2 popt gtk+3 gnome-common-native" +DEPENDS = "glib-2.0" -inherit features_check gnomebase gettext pkgconfig gobject-introspection upstream-version-is-even - -REQUIRED_DISTRO_FEATURES = "x11" +inherit gnomebase gettext pkgconfig gobject-introspection upstream-version-is-even SRC_URI[archive.md5sum] = "a8fd71fcf31a87fc799d80396a526829" SRC_URI[archive.sha256sum] = "d9348f38bde956fc32753b28c1cde19c175bfdbf1f4d5b06003b3aa09153bb1f" diff --git a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts/0001-Replace-filename-with-basename.patch b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts/0001-Replace-filename-with-basename.patch new file mode 100644 index 0000000000..9bb1d6bb59 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts/0001-Replace-filename-with-basename.patch @@ -0,0 +1,104 @@ +From c4a2951f8a75c4151f009e42b26639e4f456d5a2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 27 May 2023 14:41:28 -0700 +Subject: [PATCH] Replace filename with basename + +This avoids emitting absolute paths into generated sourcecode, it +improves reproducibility. See [1] + +[1] https://developer-old.gnome.org/gobject/stable/glib-mkenums.html + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/merge_requests/125] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/goa/goaenumtypes.c.template | 2 +- + src/goa/goaenumtypes.h.template | 2 +- + src/goabackend/goabackendenumtypes.c.template | 2 +- + src/goabackend/goabackendenumtypes.h.template | 2 +- + src/goaidentity/goaidentityenumtypes.c.in | 4 ++-- + src/goaidentity/goaidentityenumtypes.h.in | 2 +- + 6 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/goa/goaenumtypes.c.template b/src/goa/goaenumtypes.c.template +index 3150fa71..c2bc4b0a 100644 +--- a/src/goa/goaenumtypes.c.template ++++ b/src/goa/goaenumtypes.c.template +@@ -5,7 +5,7 @@ + /*** END file-header ***/ + + /*** BEGIN file-production ***/ +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +diff --git a/src/goa/goaenumtypes.h.template b/src/goa/goaenumtypes.h.template +index 040428c3..14548cb4 100644 +--- a/src/goa/goaenumtypes.h.template ++++ b/src/goa/goaenumtypes.h.template +@@ -9,7 +9,7 @@ G_BEGIN_DECLS + + /*** BEGIN file-production ***/ + +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +diff --git a/src/goabackend/goabackendenumtypes.c.template b/src/goabackend/goabackendenumtypes.c.template +index 6d2651da..05156bdd 100644 +--- a/src/goabackend/goabackendenumtypes.c.template ++++ b/src/goabackend/goabackendenumtypes.c.template +@@ -5,7 +5,7 @@ + /*** END file-header ***/ + + /*** BEGIN file-production ***/ +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +diff --git a/src/goabackend/goabackendenumtypes.h.template b/src/goabackend/goabackendenumtypes.h.template +index 7321076e..51ce84bd 100644 +--- a/src/goabackend/goabackendenumtypes.h.template ++++ b/src/goabackend/goabackendenumtypes.h.template +@@ -9,7 +9,7 @@ G_BEGIN_DECLS + + /*** BEGIN file-production ***/ + +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +diff --git a/src/goaidentity/goaidentityenumtypes.c.in b/src/goaidentity/goaidentityenumtypes.c.in +index c0286907..8aad7ae4 100644 +--- a/src/goaidentity/goaidentityenumtypes.c.in ++++ b/src/goaidentity/goaidentityenumtypes.c.in +@@ -5,8 +5,8 @@ + /*** END file-header ***/ + + /*** BEGIN file-production ***/ +-#include "@filename@" +-/* enumerations from "@filename@" */ ++#include "@basename@" ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +diff --git a/src/goaidentity/goaidentityenumtypes.h.in b/src/goaidentity/goaidentityenumtypes.h.in +index 35d4d5c5..8719282a 100644 +--- a/src/goaidentity/goaidentityenumtypes.h.in ++++ b/src/goaidentity/goaidentityenumtypes.h.in +@@ -9,7 +9,7 @@ G_BEGIN_DECLS + + /*** BEGIN file-production ***/ + +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +-- +2.40.1 + diff --git a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts/0001-build-Use-the-appropriate-dependency-object.patch b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts/0001-build-Use-the-appropriate-dependency-object.patch deleted file mode 100644 index 838ca1a7d4..0000000000 --- a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts/0001-build-Use-the-appropriate-dependency-object.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 06240574626eb21af37cf7dde5bf81e892dff467 Mon Sep 17 00:00:00 2001 -From: Emmanuele Bassi <ebassi@gnome.org> -Date: Wed, 5 Oct 2022 22:15:37 +0100 -Subject: [PATCH] build: Use the appropriate dependency object - -Just using `link_with` will not ensure that the GOA web extension shared -module is properly built against libgoa-backend and libgoa; the -generated headers must be transitively available by the time we build -the shared module. - -Fixes: #226 -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/commit/fe86bfb0271735c8130367c46536b08dad5c20d8] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/goabackend/meson.build | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/goabackend/meson.build b/src/goabackend/meson.build -index f5382b3..865b2d2 100644 ---- a/src/goabackend/meson.build -+++ b/src/goabackend/meson.build -@@ -157,9 +157,8 @@ libgoa_web_extension = shared_module( - 'goawebextension', - libgoawebextension_sources, - include_directories: common_incs + [goa_inc], -- dependencies: deps, -+ dependencies: [deps, libgoa_backend_dep], - c_args: cflags, -- link_with: libgoa_backend, - install: true, - install_dir: join_paths(goa_pkglibdir, 'web-extensions') - ) --- -2.39.0 - diff --git a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.46.0.bb b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.48.0.bb index ce02a507da..cd14b48508 100644 --- a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.46.0.bb +++ b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.48.0.bb @@ -6,22 +6,21 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gobject-introspection gtk-icon-cache vala features_check -DEPENDS = "gtk+3 gtk+3-native gdk-pixbuf dbus json-glib libxml2 webkitgtk glib-2.0 rest libsecret" +DEPENDS = "gdk-pixbuf dbus glib-2.0" -SRC_URI += "file://0001-build-Use-the-appropriate-dependency-object.patch" -SRC_URI[archive.sha256sum] = "5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa" +SRC_URI += "file://0001-Replace-filename-with-basename.patch" +SRC_URI[archive.sha256sum] = "418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf" -PACKAGECONFIG_SOUP ?= "soup3" -PACKAGECONFIG ?= "kerberos owncloud lastfm google windows_live ${PACKAGECONFIG_SOUP}" +PACKAGECONFIG ?= "goabackend kerberos owncloud lastfm google windows_live" +# goabackend requires webkitgtk to be built with gtk+3 and gcr3 +PACKAGECONFIG[goabackend] = "-Dgoabackend=true,-Dgoabackend=false,gtk+3 gtk+3-native json-glib libxml2 libsoup rest libsecret webkitgtk3" PACKAGECONFIG[kerberos] = "-Dkerberos=true, -Dkerberos=false,krb5 gcr3" PACKAGECONFIG[exchange] = "-Dexchange=true, -Dexchange=false" PACKAGECONFIG[google] = "-Dgoogle=true, -Dgoogle=false" PACKAGECONFIG[owncloud] = "-Downcloud=true, -Downcloud=false" PACKAGECONFIG[windows_live] = "-Dwindows_live=true, -Dwindows_live=false" PACKAGECONFIG[lastfm] = "-Dlastfm=true, -Dlastfm=false" -PACKAGECONFIG[soup2] = ",,libsoup-2.4,,,soup3" -PACKAGECONFIG[soup3] = ",,libsoup-3.0,,,soup2" FILES:${PN} += " \ ${datadir}/dbus-1 \ diff --git a/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_43.0.bb b/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_44.0.bb index 72ab2eaaf8..066a50e525 100644 --- a/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_43.0.bb +++ b/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_44.0.bb @@ -31,12 +31,12 @@ inherit gnomebase gettext gnome-help features_check def gnome_verdir(v): return oe.utils.trim_version(v, 1) -REQUIRED_DISTRO_FEATURES = "x11 opengl" +REQUIRED_DISTRO_FEATURES = "x11 opengl gobject-introspection-data" PACKAGECONFIG ?= "" PACKAGECONFIG[doc] = "-Dmanuals=true,-Dmanuals=false,libxslt-native docbook-xsl-stylesheets-native" -SRC_URI[archive.sha256sum] = "c7ac7458d533f29d955011c74b76224d79ea31bcc12e9d6d0ce7b6c3704d08e1" +SRC_URI[archive.sha256sum] = "e78e210397d3c62809c6cd5521da6eccb4a11ddea5bf2af8632a47f4da5c829e" do_install:append() { # make gnome-photos available on all desktops diff --git a/meta-gnome/recipes-gnome/gnome-session/gnome-session_43.0.bb b/meta-gnome/recipes-gnome/gnome-session/gnome-session_44.0.bb index 12f48bc823..3f642f401f 100644 --- a/meta-gnome/recipes-gnome/gnome-session/gnome-session_43.0.bb +++ b/meta-gnome/recipes-gnome/gnome-session/gnome-session_44.0.bb @@ -22,7 +22,7 @@ inherit gnomebase gettext gsettings upstream-version-is-even features_check REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam gobject-introspection-data" -SRC_URI[archive.sha256sum] = "3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2" +SRC_URI[archive.sha256sum] = "ccf829a96526135e9e9f917526515d36a5092bdfa316f3737dd8c5a524dbf2c6" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit',d)}" diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_43.0.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_44.1.bb index fe246953fe..104f4a6677 100644 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_43.0.bb +++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_44.1.bb @@ -25,7 +25,7 @@ DEPENDS = " \ REQUIRED_DISTRO_FEATURES = "x11 polkit pulseaudio systemd gobject-introspection-data" GIR_MESON_OPTION = "" -SRC_URI[archive.sha256sum] = "3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0" +SRC_URI[archive.sha256sum] = "12653b72d81f151300a47d700ac9410ac1bcce38e83f1bdd19cded2932943989" PACKAGECONFIG ??= " \ cups nm \ @@ -42,5 +42,5 @@ PACKAGECONFIG[wayland] = "-Dwayland=true,-Dwayland=false,wayland" FILES:${PN} += " \ ${systemd_user_unitdir} \ - /usr/lib/gnome-settings-daemon-43/libgsd.so \ + /usr/lib/gnome-settings-daemon-44/libgsd.so \ " diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_43.1.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_44.1.bb index 93d791a6b6..126e5ef3f7 100644 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_43.1.bb +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_44.1.bb @@ -8,7 +8,7 @@ inherit gnomebase gettext gsettings features_check REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam gobject-introspection-data" -SRC_URI[archive.sha256sum] = "adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17" +SRC_URI[archive.sha256sum] = "8c345e72f31a1e37f55063e0b15997301b01194ed698772fd87aeb50cbb101ab" EXTRA_OEMESON += " \ -Dextension_set=all \ diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_43.2.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_44.3.bb index d3bd357d5e..e1aa051ef4 100644 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_43.2.bb +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_44.3.bb @@ -32,7 +32,7 @@ GIR_MESON_OPTION = "" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" -SRC_URI[archive.sha256sum] = "e76fd4be9342410ee9fbdcdd6b2d81c6ff060e7c8cc5a0f1cae6a7aba25d1860" +SRC_URI[archive.sha256sum] = "55694b71c2ee4eaef60d93428003f2eaa4cf00186848f5e36b45cfe506fc31bf" SRC_URI += "file://0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch" PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" diff --git a/meta-gnome/recipes-gnome/gnome-software/gnome-software_43.2.bb b/meta-gnome/recipes-gnome/gnome-software/gnome-software_44.3.bb index 183a2d107a..a7807c34b1 100644 --- a/meta-gnome/recipes-gnome/gnome-software/gnome-software_43.2.bb +++ b/meta-gnome/recipes-gnome/gnome-software/gnome-software_44.3.bb @@ -29,7 +29,7 @@ RDEPENDS:${PN} = "iso-codes" EXTRA_OEMESON += "-Dtests=false -Dsoup2=false" -SRC_URI[archive.sha256sum] = "22aa7f0a317c770f68b897e9e512b2cbedb181b695ffdb0b658d99bbd64f368d" +SRC_URI[archive.sha256sum] = "325abb722cab20b6aa67f158ea2ff2ea899830ca0a883e24594d9def85fd1622" PACKAGECONFIG ?= "flatpak" PACKAGECONFIG[flatpak] = "-Dflatpak=true,-Dflatpak=false,flatpak ostree" diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_42.0.bb b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_44.0.bb index 32ecc90eb7..dfbfd7882e 100644 --- a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_42.0.bb +++ b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_44.0.bb @@ -23,7 +23,7 @@ REQUIRED_DISTRO_FEATURES = "polkit" def gnome_verdir(v): return oe.utils.trim_version(v, 1) -SRC_URI[archive.sha256sum] = "13239d22032201a22bd29833c575b684816700d2de168a1530223577c5c075dc" +SRC_URI[archive.sha256sum] = "c2bab7eddba92827c4c8de44293e7e3c84c9e5076f31985887ff8969cec45e6e" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd" diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-build-Fix-for-newer-meson.patch b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-build-Fix-for-newer-meson.patch deleted file mode 100644 index 12520b177c..0000000000 --- a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-build-Fix-for-newer-meson.patch +++ /dev/null @@ -1,46 +0,0 @@ -From f88447850e162c8d514be367db574c6fa2fec2a5 Mon Sep 17 00:00:00 2001 -From: Christian Persch <chpe@src.gnome.org> -Date: Fri, 14 Jan 2022 11:33:32 +0100 -Subject: [PATCH] build: Fix for newer meson - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - data/meson.build | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index 79d97e5..e0bcbb9 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -18,7 +18,6 @@ - metainfodir = gt_datadir / 'metainfo' - - i18n.merge_file( -- gt_dns_name + '.metainfo.xml', - input: gt_dns_name + '.metainfo.xml.in', - output: '@BASENAME@', - po_dir: po_dir, -@@ -27,7 +26,6 @@ i18n.merge_file( - ) - - i18n.merge_file( -- gt_dns_name + '.Nautilus.metainfo.xml', - input: gt_dns_name + '.Nautilus.metainfo.xml.in', - output: '@BASENAME@', - po_dir: po_dir, -@@ -40,7 +38,6 @@ i18n.merge_file( - desktopdatadir = gt_datadir / 'applications' - - i18n.merge_file( -- gt_dns_name + '.desktop', - input: gt_dns_name + '.desktop.in', - output: '@BASENAME@', - type: 'desktop', -@@ -57,4 +54,4 @@ meson.add_install_script( - - # Subdirs - --subdir('icons') -\ No newline at end of file -+subdir('icons') diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.46.7.bb b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.48.1.bb index d9afeec46a..13b440dfec 100644 --- a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.46.7.bb +++ b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.48.1.bb @@ -20,9 +20,10 @@ DEPENDS = " \ libpcre2 \ " -SRC_URI = "git://gitlab.gnome.org/GNOME/gnome-terminal.git;protocol=https;nobranch=1" -SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch" -SRCREV = "816edf80cd7bf7f253366099ea9fcaf361676139" +SRC_URI = "git://gitlab.gnome.org/GNOME/gnome-terminal.git;protocol=https;nobranch=1 \ + file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch \ + " +SRCREV = "1446ff0abc478bdd03c6665b718214d075729024" S = "${WORKDIR}/git" PACKAGECONFIG ?= "" diff --git a/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_43.1.bb b/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_44.0.bb index a2ac710a01..40bcd27d2b 100644 --- a/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_43.1.bb +++ b/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_44.0.bb @@ -19,7 +19,7 @@ inherit gnomebase gtk-icon-cache itstool gnome-help mime-xdg features_check REQUIRED_DISTRO_FEATURES = "opengl" -SRC_URI[archive.sha256sum] = "973a4b0deb68f9f91a54a4dd415b6afde9b5ae3ee684bc761471f94290f9f6cb" +SRC_URI[archive.sha256sum] = "f67bc3780734ffa815fcc4c5daa7b555d24e459f81ea2b548e6a85c1612a31ca" FILES:${PN} += " \ ${datadir}/metainfo \ diff --git a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch b/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch index dfa4615a3d..bd7e76f208 100644 --- a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch +++ b/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch @@ -3,7 +3,7 @@ From: Mae Dartmann <hello@maedartmann.name> Date: Wed, 16 Feb 2022 06:08:41 +0000 Subject: [PATCH] meson: fix invalid positional argument -Upstream-Status: Accepted[https://gitlab.gnome.org/GNOME/gnome-tweaks/-/commit/dc9701e18775c01d0b69fabaa350147f70096da8] +Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/gnome-tweaks/-/commit/dc9701e18775c01d0b69fabaa350147f70096da8] --- data/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-gnome/recipes-gnome/grilo/grilo-plugins/0001-Avoid-running-trackertestutils.patch b/meta-gnome/recipes-gnome/grilo/grilo-plugins/0001-Avoid-running-trackertestutils.patch index a07cd49fdf..6e565e60d5 100644 --- a/meta-gnome/recipes-gnome/grilo/grilo-plugins/0001-Avoid-running-trackertestutils.patch +++ b/meta-gnome/recipes-gnome/grilo/grilo-plugins/0001-Avoid-running-trackertestutils.patch @@ -1,4 +1,4 @@ -From 9deaed70221a12e26f968be26233b75fa5669476 Mon Sep 17 00:00:00 2001 +From a76c5c40f95b2961bed8f6427080f0fcf6ec00d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> Date: Sat, 15 May 2021 23:25:09 +0200 Subject: [PATCH] Avoid running trackertestutils @@ -12,23 +12,21 @@ It breaks configuration: Upstream-Status: Inappropriate [OE-Specific] Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> + --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 6a03778..17ef1e1 100644 +index fca5f98..3c1aa06 100644 --- a/meson.build +++ b/meson.build -@@ -78,7 +78,7 @@ totem_plparser_dep = dependency('totem-plparser', version: '>= 3.4.1', required: +@@ -98,7 +98,7 @@ totem_plparser_dep = dependency('totem-plparser', version: '>= 3.4.1', required: totem_plparser_mini_dep = dependency('totem-plparser-mini', version: '>= 3.4.1', required: false) tracker_sparql_dep = dependency('tracker-sparql-2.0', version: '>= 2.3.0', required: false) tracker3_dep = dependency('tracker-sparql-3.0', required: false) -tracker3_testutils_dep = dependency('tracker-testutils-3.0', required: false) +tracker3_testutils_dep = dependency('tracker-testutils-3.0-avoid-find', required: false) - lua_dep = dependency('lua', version: '>= 5.3.0', required: false) - if not lua_dep.found() --- -2.31.1 - + lua_pkg = [ + 'lua', diff --git a/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.15.bb b/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.16.bb index b96194dec5..91cbe82ea9 100644 --- a/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.15.bb +++ b/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.16.bb @@ -7,7 +7,6 @@ DEPENDS = " \ gperf-native \ itstool-native \ grilo \ - tracker \ lua \ liboauth \ " @@ -17,6 +16,9 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gnome-help vala SRC_URI += "file://0001-Avoid-running-trackertestutils.patch" -SRC_URI[archive.sha256sum] = "8518c3d954f93095d955624a044ce16a7345532f811d299dbfa1e114cfebab33" +SRC_URI[archive.sha256sum] = "fe6f4dbe586c6b8ba2406394e202f22d009d642a96eb3a54f32f6a21d084cdcb" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection-data', 'tracker', '', d)}" +PACKAGECONFIG[tracker] = "-Denable-tracker3=yes,-Denable-tracker3=no,tracker" FILES:${PN} += "${libdir}/grilo-0.3" diff --git a/meta-gnome/recipes-gnome/grilo/grilo_0.3.15.bb b/meta-gnome/recipes-gnome/grilo/grilo_0.3.16.bb index d51a27f01a..e86f75f0c8 100644 --- a/meta-gnome/recipes-gnome/grilo/grilo_0.3.15.bb +++ b/meta-gnome/recipes-gnome/grilo/grilo_0.3.16.bb @@ -11,7 +11,7 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gobject-introspection gtk-doc gettext vala -SRC_URI[archive.sha256sum] = "f352acf73665669934270636fede66b52da6801fe20f638c4048ab2678577b2d" +SRC_URI[archive.sha256sum] = "884580e8c5ece280df23aa63ff5234b7d48988a404df7d6bfccd1e77b473bd96" GIR_MESON_OPTION = "enable-introspection" GTKDOC_MESON_OPTION = "enable-gtk-doc" @@ -26,3 +26,6 @@ PACKAGECONFIG[test-ui] = "-Denable-test-ui=true, -Denable-test-ui=false, gtk+3 l # Once we have a recipe for 'totem-plparser' this can turn into a PACKAGECONFIG EXTRA_OEMESON = "-Denable-grl-pls=false" +do_compile:append() { + sed -i -e 's,${B}/../,,' ${B}/src/grl-type-builtins.h +} diff --git a/meta-gnome/recipes-gnome/gspell/gspell_1.12.0.bb b/meta-gnome/recipes-gnome/gspell/gspell_1.12.1.bb index b7e4954964..6b65af3bb4 100644 --- a/meta-gnome/recipes-gnome/gspell/gspell_1.12.0.bb +++ b/meta-gnome/recipes-gnome/gspell/gspell_1.12.1.bb @@ -7,4 +7,4 @@ DEPENDS = "gtk+3 iso-codes enchant2" inherit gnomebase gettext gobject-introspection vala -SRC_URI[archive.sha256sum] = "40d2850f1bb6e8775246fa1e39438b36caafbdbada1d28a19fa1ca07e1ff82ad" +SRC_URI[archive.sha256sum] = "8ec44f32052e896fcdd4926eb814a326e39a5047e251eec7b9056fbd9444b0f1" diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.6.1.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.7.1.bb index 2fb64325ce..99826c5944 100644 --- a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.6.1.bb +++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.7.1.bb @@ -25,8 +25,8 @@ inherit gnomebase lib_package gettext features_check gtk-doc gtk-icon-cache gobj REQUIRED_DISTRO_FEATURES = "opengl" -SRC_URI = "https://download.gnome.org/sources/gtksourceview/5.6/${PNAME}-${PV}.tar.xz" -SRC_URI[sha256sum] = "659d9cc9d034a114f07e7e134ee80d77dec0497cb1516ae5369119c2fcb9da16" +SRC_URI = "https://download.gnome.org/sources/gtksourceview/5.7/${PNAME}-${PV}.tar.xz" +SRC_URI[sha256sum] = "3b42541964db9c2fa50a9658d4886bdf77d023fe4e96c5b17bce51c9f58c48e6" GIR_MESON_ENABLE_FLAG = 'enabled' GIR_MESON_DISABLE_FLAG = 'disabled' diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.50.3.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.51.1.bb index 073c05af28..32d47efd16 100644 --- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.50.3.bb +++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.51.1.bb @@ -20,15 +20,12 @@ RDEPENDS:${PN} += "gsettings-desktop-schemas" SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" -SRC_URI[archive.sha256sum] = "6897119e97bb16029d2778e1a5a54a6a6592631f8b2f3a2a1dea4ef2b01803fd" +SRC_URI[archive.sha256sum] = "5baaf0cc81e2c690a726f7d5eb59eed48a33ea220fd5378df93c556173a3c143" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" EXTRA_OEMESON = " \ -Dbluray=false \ - -Dgoa=false \ - -Dgoogle=false \ - -Dnfs=false \ " PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash" @@ -62,11 +59,15 @@ PACKAGECONFIG[admin] = "-Dadmin=true, -Dadmin=false, libcap polkit" PACKAGECONFIG[afc] = "-Dafc=true, -Dafc=false, libimobiledevice libplist" PACKAGECONFIG[archive] = "-Darchive=true, -Darchive=false, libarchive" PACKAGECONFIG[dnssd] = "-Ddnssd=true, -Ddnssd=false, avahi" -PACKAGECONFIG[gcr] = "-Dgcr=true, -Dgcr=false, gcr3" +PACKAGECONFIG[gcr] = "-Dgcr=true, -Dgcr=false, gcr3, gnome-keyring" +PACKAGECONFIG[gcrypt] = "-Dgcrypt=true, -Dgcrypt=false, libgcrypt" +PACKAGECONFIG[goa] = "-Dgoa=true, -Dgoa=false, gnome-online-accounts" +PACKAGECONFIG[google] = "-Dgoogle=true, -Dgoogle=false, libgdata" PACKAGECONFIG[http] = "-Dhttp=true, -Dhttp=false, libsoup-3.0" PACKAGECONFIG[libmtp] = "-Dmtp=true, -Dmtp=false, libmtp" PACKAGECONFIG[logind] = "-Dlogind=true, -Dlogind=false, systemd" PACKAGECONFIG[libgphoto2] = "-Dgphoto2=true, -Dgphoto2=false, libgphoto2" +PACKAGECONFIG[nfs] = "-Dnfs=true, -Dnfs=false,libnfs" PACKAGECONFIG[samba] = "-Dsmb=true, -Dsmb=false, samba" PACKAGECONFIG[systemd] = "-Dsystemduserunitdir=${systemd_user_unitdir} -Dtmpfilesdir=${libdir}/tmpfiles.d, -Dsystemduserunitdir=no -Dtmpfilesdir=no, systemd" diff --git a/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.2.1.bb b/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.2.1.bb deleted file mode 100644 index 3a95766348..0000000000 --- a/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.2.1.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Building blocks for modern GNOME applications" -LICENSE="LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -GNOMEBASEBUILDCLASS = "meson" - -DEPENDS = " \ - gtk4 \ -" - -inherit gnomebase gobject-introspection gtk-doc vala features_check - -SRC_URI[archive.sha256sum] = "326f142a4f0f3de5a63f0d5e7a9de66ea85348a4726cbfd13930dcf666d22779" - -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -REQUIRED_DISTRO_FEATURES = "opengl" - -GIR_MESON_ENABLE_FLAG = 'enabled' -GIR_MESON_DISABLE_FLAG = 'disabled' -GTKDOC_MESON_OPTION = 'gtk_doc' - -PACKAGECONFIG[examples] = "-Dexamples=true,-Dexamples=false" - -FILES:${PN} += "${datadir}/metainfo" diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop/0001-Pass-correct-parameter.patch b/meta-gnome/recipes-gnome/libgtop/libgtop/0001-Pass-correct-parameter.patch deleted file mode 100644 index 5ea8eed516..0000000000 --- a/meta-gnome/recipes-gnome/libgtop/libgtop/0001-Pass-correct-parameter.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e969ac59335d3fb1cd228f8e7c4f6c2dda4fa536 Mon Sep 17 00:00:00 2001 -From: Avinash Sonawane <rootkea@gmail.com> -Date: Mon, 20 Dec 2021 13:33:42 +0530 -Subject: [PATCH] Pass correct parameter - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libgtop/-/merge_requests/35] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/daemon/main.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/daemon/main.c b/src/daemon/main.c -index b51addf..eaee3b3 100644 ---- a/src/daemon/main.c -+++ b/src/daemon/main.c -@@ -222,8 +222,9 @@ handle_parent_connection (int s) - 0, NULL); - break; - case GLIBTOP_CMND_PROC_IO: -+ memcpy (&pid, parameter, sizeof (pid_t)); - glibtop_get_proc_io_l -- (server, &resp->u.data.proc_io, parameter); -+ (server, &resp->u.data.proc_io, pid); - do_output (s, resp, _offset_data (proc_io), - 0, NULL); - break; --- -2.37.2 - diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop/0001-fix-compile-error-for-cross-compile.patch b/meta-gnome/recipes-gnome/libgtop/libgtop/0001-fix-compile-error-for-cross-compile.patch deleted file mode 100644 index 1bd6e101b5..0000000000 --- a/meta-gnome/recipes-gnome/libgtop/libgtop/0001-fix-compile-error-for-cross-compile.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e865a93000913b4597607289356114cd159f4e28 Mon Sep 17 00:00:00 2001 -From: Your Name <you@example.com> -Date: Fri, 21 May 2021 03:02:29 +0000 -Subject: [PATCH] fix compile error for cross compile - -On some distros, such as fedora32, cross compile failed with following -error since host library is used. undefined reference to -`stat64@GLIBC_2.33' - -According doc of ld, set searchdir begins with "=", but not hardcoded -locations. - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libgtop/-/merge_requests/26] - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 472f44b..ed6a4d7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -270,8 +270,8 @@ AC_ARG_ENABLE(fatal-warnings, - [Define to enable fatal warnings])) - - dnl These definitions are expanded in make. --LIBGTOP_LIBS='-L$(libdir)' --LIBGTOP_INCS='-I$(includedir)/libgtop-2.0' -+LIBGTOP_LIBS='-L=$(libdir)' -+LIBGTOP_INCS='-I=$(includedir)/libgtop-2.0' - - if test x$libgtop_have_sysinfo = xyes ; then - LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_LIBGTOP_SYSINFO" --- -2.26.2 - diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop/0001-netload-Include-libc-net-headers-unconditionally.patch b/meta-gnome/recipes-gnome/libgtop/libgtop/0001-netload-Include-libc-net-headers-unconditionally.patch deleted file mode 100644 index c4f7da4bf6..0000000000 --- a/meta-gnome/recipes-gnome/libgtop/libgtop/0001-netload-Include-libc-net-headers-unconditionally.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 3c6f70e50cb586ac4add4dea627c316242691040 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 13 Jul 2017 09:17:29 -0700 -Subject: [PATCH] netload: Include libc net headers unconditionally - -This fixes compile with musl, and this conditional -is not needed now a days if we are still using glibc < 1.0 -we have other bigger problems - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - sysdeps/linux/netload.c | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git a/sysdeps/linux/netload.c b/sysdeps/linux/netload.c -index c275db2..446bddd 100644 ---- a/sysdeps/linux/netload.c -+++ b/sysdeps/linux/netload.c -@@ -34,8 +34,6 @@ - #include <sys/socket.h> - #include <sys/ioctl.h> - --#if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1 --/* GNU LibC */ - #include <net/if.h> - #include <netinet/ip_icmp.h> - #include <netinet/in.h> -@@ -43,15 +41,6 @@ - #include <netinet/tcp.h> - #include <netinet/udp.h> - #include <net/if.h> --#else /* Libc 5 */ --#include <linux/if.h> --#include <linux/in.h> --#include <linux/ip.h> --#include <linux/icmp.h> --#include <linux/tcp.h> --#include <linux/udp.h> --#endif -- - - #ifdef HAVE_IFADDRS_H - /* needed for IPV6 support */ --- -2.13.2 - diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb b/meta-gnome/recipes-gnome/libgtop/libgtop_2.41.1.bb index fa95e0bee0..9a50b5e826 100644 --- a/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb +++ b/meta-gnome/recipes-gnome/libgtop/libgtop_2.41.1.bb @@ -6,10 +6,6 @@ inherit gnomebase lib_package gtk-doc gobject-introspection gettext upstream-ver ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI += "file://0001-fix-compile-error-for-cross-compile.patch \ - file://0001-Pass-correct-parameter.patch \ - " - -SRC_URI[archive.sha256sum] = "78f3274c0c79c434c03655c1b35edf7b95ec0421430897fb1345a98a265ed2d4" +SRC_URI[archive.sha256sum] = "43ea9ad13f7caf98303e64172b191be9b96bab340b019deeec72251ee140fe3b" DEPENDS = "glib-2.0 libxau" diff --git a/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb b/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb index d633b0621d..bafe7af040 100644 --- a/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb +++ b/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb @@ -4,8 +4,7 @@ SECTION = "devel/lib" LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/main/libt/${BPN}/${BPN}_${PV}.tar.gz" -SRC_URI[md5sum] = "f85a21994a397fb1ff2d3ec404bdd592" +SRC_URI = "${DEBIAN_MIRROR}/main/libt/${BPN}/${BPN}_${PV}.orig.tar.gz;downloadfilename=${BP}.tar.gz" SRC_URI[sha256sum] = "0d634cc2476d8f57d1ee1864bd4f442180ae4bf040a9ae4bf73b66bbd85d7195" DEPENDS = "gtk+3 gdk-pixbuf libsoup-2.4 json-glib gnome-common-native" diff --git a/meta-gnome/recipes-gnome/libxklavier/libxklavier/fix-do_installe-failure.patch b/meta-gnome/recipes-gnome/libxklavier/libxklavier/fix-do_installe-failure.patch index 29eeef3d50..6c32bfa14f 100644 --- a/meta-gnome/recipes-gnome/libxklavier/libxklavier/fix-do_installe-failure.patch +++ b/meta-gnome/recipes-gnome/libxklavier/libxklavier/fix-do_installe-failure.patch @@ -12,7 +12,7 @@ libxklavier.vapi': No such file or directory | 21 make[3]: *** [install-vapiDATA] Error 1 | 22 make[3]: *** Waiting for unfinished jobs.... -Upstream-Stauts: Pending +Upstream-Status: Pending Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- diff --git a/meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch b/meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch index 315d4e4366..6bebaaba8f 100644 --- a/meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch +++ b/meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch @@ -5,7 +5,7 @@ Subject: [PATCH] drop zenity detection OE does not support zenity -Upstream-Status: inappropriate [OE specific] +Upstream-Status: Inappropriate [OE specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- diff --git a/meta-gnome/recipes-gnome/mutter/mutter_43.1.bb b/meta-gnome/recipes-gnome/mutter/mutter_44.3.bb index 9b764c666b..6bd8a7b08e 100644 --- a/meta-gnome/recipes-gnome/mutter/mutter_43.1.bb +++ b/meta-gnome/recipes-gnome/mutter/mutter_44.3.bb @@ -25,7 +25,7 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gobject-introspection gettext features_check -SRC_URI[archive.sha256sum] = "f2f08b252783948a5ecc82f00e9e935a61ebbf8564844bdd92788ab44aa78264" +SRC_URI[archive.sha256sum] = "185cbebf2150d3e450550e371bdb13a8b4db096978b14f99521e966eacc70551" # x11 is still manadatory - see meson.build REQUIRED_DISTRO_FEATURES = "wayland x11 polkit" @@ -60,7 +60,13 @@ PACKAGECONFIG[sm] = "-Dsm=true, -Dsm=false, libsm" PACKAGECONFIG[profiler] = "-Dprofiler=true,-Dprofiler=false,sysprof" PACKAGECONFIG[startup-notification] = "-Dstartup_notification=true, -Dstartup_notification=false, startup-notification, startup-notification" -MUTTER_API_NAME = "mutter-11" +MUTTER_API_NAME = "mutter-12" + +do_install:prepend() { + sed -i -e 's|${B}/||g' ${B}/clutter/clutter/clutter-enum-types.c + sed -i -e 's|${B}/||g' ${B}/src/meta-private-enum-types.c + sed -i -e 's|${B}/||g' ${B}/src/meta/meta-enum-types.c +} do_install:append() { # Add gir links in standard paths. That makes dependents life much easier diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Provide-parameter-prototype-for-functions-without-pa.patch b/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Provide-parameter-prototype-for-functions-without-pa.patch deleted file mode 100644 index 6c743d8ce7..0000000000 --- a/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Provide-parameter-prototype-for-functions-without-pa.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 76f1625bae95212ec6d4bc1bd1c8ff1232150c48 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 29 Aug 2022 13:14:09 -0700 -Subject: [PATCH] Provide parameter prototype for functions without parameter - -Fixes build with clang-15 with -Wstrict-prototypes - -src/nautilus-toolbar.c:1205:22: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes] -nautilus_toolbar_new () - ^ - void - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/nautilus/-/commit/95d35aedf68f0398a6ee9e0b0af9ce80528fdc22] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/nautilus-file-undo-manager.c | 4 ++-- - src/nautilus-list-model.c | 2 +- - src/nautilus-starred-directory.c | 2 +- - src/nautilus-toolbar.c | 2 +- - src/nautilus-view-model.c | 2 +- - 5 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/nautilus-file-undo-manager.c b/src/nautilus-file-undo-manager.c -index 2a886176f..f2d1eebcf 100644 ---- a/src/nautilus-file-undo-manager.c -+++ b/src/nautilus-file-undo-manager.c -@@ -258,13 +258,13 @@ nautilus_file_undo_manager_get_state (void) - - - gboolean --nautilus_file_undo_manager_is_operating () -+nautilus_file_undo_manager_is_operating (void) - { - return undo_singleton->is_operating; - } - - NautilusFileUndoManager * --nautilus_file_undo_manager_get () -+nautilus_file_undo_manager_get (void) - { - return undo_singleton; - } -diff --git a/src/nautilus-list-model.c b/src/nautilus-list-model.c -index 7e2aeeeee..741007105 100644 ---- a/src/nautilus-list-model.c -+++ b/src/nautilus-list-model.c -@@ -1625,7 +1625,7 @@ nautilus_list_model_get_drag_view (NautilusListModel *model, - } - - GtkTargetList * --nautilus_list_model_get_drag_target_list () -+nautilus_list_model_get_drag_target_list (void) - { - GtkTargetList *target_list; - -diff --git a/src/nautilus-starred-directory.c b/src/nautilus-starred-directory.c -index fd41418a4..07ed62693 100644 ---- a/src/nautilus-starred-directory.c -+++ b/src/nautilus-starred-directory.c -@@ -556,7 +556,7 @@ nautilus_starred_directory_class_init (NautilusFavoriteDirectoryClass *klass) - } - - NautilusFavoriteDirectory * --nautilus_starred_directory_new () -+nautilus_starred_directory_new (void) - { - NautilusFavoriteDirectory *self; - -diff --git a/src/nautilus-toolbar.c b/src/nautilus-toolbar.c -index 5fe4e63a4..15a696827 100644 ---- a/src/nautilus-toolbar.c -+++ b/src/nautilus-toolbar.c -@@ -1202,7 +1202,7 @@ nautilus_toolbar_class_init (NautilusToolbarClass *klass) - } - - GtkWidget * --nautilus_toolbar_new () -+nautilus_toolbar_new (void) - { - return g_object_new (NAUTILUS_TYPE_TOOLBAR, - NULL); -diff --git a/src/nautilus-view-model.c b/src/nautilus-view-model.c -index 84c40302d..2935809ae 100644 ---- a/src/nautilus-view-model.c -+++ b/src/nautilus-view-model.c -@@ -190,7 +190,7 @@ compare_data_func (gconstpointer a, - } - - NautilusViewModel * --nautilus_view_model_new () -+nautilus_view_model_new (void) - { - return g_object_new (NAUTILUS_TYPE_VIEW_MODEL, NULL); - } diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Replace-filename-with-basename.patch b/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Replace-filename-with-basename.patch new file mode 100644 index 0000000000..dbf42a9ab9 --- /dev/null +++ b/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Replace-filename-with-basename.patch @@ -0,0 +1,46 @@ +From 4ec1f99f170033138036d6547dce9b7dcf541338 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 24 May 2023 07:56:33 -0700 +Subject: [PATCH] Replace filename with basename + +This avoids emitting absolute paths into generated sourcecode, it +improves reproducibility. See [1] + +[1] https://developer-old.gnome.org/gobject/stable/glib-mkenums.html + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/1211] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/nautilus-enum-types.c.template | 2 +- + src/nautilus-enum-types.h.template | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/nautilus-enum-types.c.template b/src/nautilus-enum-types.c.template +index 9d8ac83..a757949 100644 +--- a/src/nautilus-enum-types.c.template ++++ b/src/nautilus-enum-types.c.template +@@ -4,7 +4,7 @@ + /*** END file-header ***/ + + /*** BEGIN file-production ***/ +-/* Enumerations from "@filename@" */ ++/* Enumerations from "@basename@" */ + #include "@filename@" + + /*** END file-production ***/ +diff --git a/src/nautilus-enum-types.h.template b/src/nautilus-enum-types.h.template +index 399bbca..7eb6c54 100644 +--- a/src/nautilus-enum-types.h.template ++++ b/src/nautilus-enum-types.h.template +@@ -8,7 +8,7 @@ G_BEGIN_DECLS + /*** END file-header ***/ + + /*** BEGIN file-production ***/ +-/* Enumerations from "@filename@" */ ++/* Enumerations from "@basename@" */ + + /*** END file-production ***/ + +-- +2.40.1 + diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_43.2.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_44.2.1.bb index 4b54d6a676..362629fce0 100644 --- a/meta-gnome/recipes-gnome/nautilus/nautilus_43.2.bb +++ b/meta-gnome/recipes-gnome/nautilus/nautilus_44.2.1.bb @@ -26,9 +26,10 @@ inherit gnomebase gsettings gobject-introspection gtk-doc gettext features_check def gnome_verdir(v): return oe.utils.trim_version(v, 1) -SRC_URI[archive.sha256sum] = "a86a9aa7a455511b029ce49a1d8b4659c3c355b5d81d7360bb4d0de637afede0" +SRC_URI += "file://0001-Replace-filename-with-basename.patch" +SRC_URI[archive.sha256sum] = "d9c62f024727f7a76fc6a5da788a2b0247df01a71c2a601143c62aac0ff41e4c" -REQUIRED_DISTRO_FEATURES = "x11 opengl" +REQUIRED_DISTRO_FEATURES = "x11 opengl gobject-introspection-data" EXTRA_OEMESON += " \ -Dtests=none \ diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch b/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch index 1332a95827..7a40ae338c 100644 --- a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch +++ b/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch @@ -7,22 +7,8 @@ Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> --- - src/libtracker-miner/tracker-miner-enum-types.c.template | 2 +- - .../tracker-miners-enum-types.c.template | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/libtracker-miner/tracker-miner-enum-types.c.template b/src/libtracker-miner/tracker-miner-enum-types.c.template -index 7be7a01..46a4dc9 100644 ---- a/src/libtracker-miner/tracker-miner-enum-types.c.template -+++ b/src/libtracker-miner/tracker-miner-enum-types.c.template -@@ -7,7 +7,7 @@ - - /*** BEGIN file-production ***/ - /* enumerations from "@basename@" */ --#include "@filename@" -+#include "tracker-miner-enums.h" - /*** END file-production ***/ - + src/libtracker-miners-common/tracker-miner-enum-types.c.template | 1 +- + 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/libtracker-miners-common/tracker-miners-enum-types.c.template b/src/libtracker-miners-common/tracker-miners-enum-types.c.template index c712dda..cb449e2 100644 diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners_3.4.2.bb b/meta-gnome/recipes-gnome/tracker/tracker-miners_3.5.0.bb index cbd1d0ddb4..d093697c13 100644 --- a/meta-gnome/recipes-gnome/tracker/tracker-miners_3.4.2.bb +++ b/meta-gnome/recipes-gnome/tracker/tracker-miners_3.5.0.bb @@ -16,10 +16,9 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gobject-introspection vala bash-completion features_check SRC_URI += "file://0001-meson.build-Just-warn-if-we-build-without-libseccomp.patch \ - file://0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch \ + file://0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch \ " - -SRC_URI[archive.sha256sum] = "101e3608f1c28bfed8ae25522f7a720b559f889a76e280afbe50a4d8b064f92c" +SRC_URI[archive.sha256sum] = "17966603dc432a98526b490586a48acd7f9f59935f7895dfc51729a46a6901a3" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" @@ -36,25 +35,31 @@ PACKAGECONFIG ??= " \ pdf \ png \ tiff \ + raw \ xml \ ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)} \ + battery \ + networkmanager \ " PACKAGECONFIG[battery] = "-Dbattery_detection=upower,-Dbattery_detection=none,upower" -PACKAGECONFIG[ffmpeg] = ",,ffmpeg" +PACKAGECONFIG[cue] = "-Dcue=enabled,-Dcue=disabled,libcue" +PACKAGECONFIG[ffmpeg] = "-Dgeneric_media_extractor=libav,,ffmpeg" PACKAGECONFIG[gexiv2] = ",,gexiv2" -PACKAGECONFIG[gstreamer] = ",,gstreamer1.0 gstreamer1.0-plugins-base" -PACKAGECONFIG[gupnp] = ",,gupnp-dlna" +PACKAGECONFIG[gstreamer] = "-Dgeneric_media_extractor=gstreamer,,gstreamer1.0 gstreamer1.0-plugins-base" +PACKAGECONFIG[gupnp] = "-Dgstreamer_backend=gupnp,,gupnp-dlna" PACKAGECONFIG[gif] = "-Dgif=enabled,-Dgif=disabled,giflib" -PACKAGECONFIG[icu] = ",,icu" +PACKAGECONFIG[icu] = "-Dcharset_detection=icu,,icu" +PACKAGECONFIG[iso] = "-Diso=enabled,-Diso=disabled,libosinfo" PACKAGECONFIG[jpeg] = "-Djpeg=enabled,-Djpeg=disabled,jpeg" PACKAGECONFIG[libexif] = "-Dexif=enabled,-Dexif=disabled,libexif" PACKAGECONFIG[libgsf] = "-Dgsf=enabled,-Dgsf=disabled,libgsf" PACKAGECONFIG[pdf] = "-Dpdf=enabled,-Dpdf=disabled,poppler" PACKAGECONFIG[png] = "-Dpng=enabled,-Dpng=disabled,libpng" PACKAGECONFIG[tiff] = "-Dtiff=enabled,-Dtiff=disabled,tiff" +PACKAGECONFIG[raw] = "-Draw=enabled,-Draw=disabled,libraw" PACKAGECONFIG[xml] = "-Dxml=enabled,-Dxml=disabled,libxml2" -PACKAGECONFIG[networkmanager] = "-Dnetwork_manager=enabled,-Dnetwork_manager=disabled,networkmanger" +PACKAGECONFIG[networkmanager] = "-Dnetwork_manager=enabled,-Dnetwork_manager=disabled,networkmanager" # For security reasons it is strongly recommended to set add meta-security in # your layers and 'libseccomp' to PACKAGECONFIG". diff --git a/meta-gnome/recipes-gnome/tracker/tracker/0001-meson-Do-not-define-TOP_SRCDIR.patch b/meta-gnome/recipes-gnome/tracker/tracker/0001-meson-Do-not-define-TOP_SRCDIR.patch new file mode 100644 index 0000000000..5c6ab71a9f --- /dev/null +++ b/meta-gnome/recipes-gnome/tracker/tracker/0001-meson-Do-not-define-TOP_SRCDIR.patch @@ -0,0 +1,24 @@ +From 3e262192ffebf5d6fec92d5b7ba08348a94df1ae Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 25 May 2023 20:54:47 -0700 +Subject: [PATCH] meson: Do not define TOP_SRCDIR + +This is passed from build env + +Upstream-Status: Inappropriate [Cross compile specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + meson.build | 1 - + 1 file changed, 1 deletion(-) + +--- a/meson.build ++++ b/meson.build +@@ -353,7 +353,7 @@ subdir('utils') + + test_c_args = tracker_c_args + [ + '-DTOP_BUILDDIR="@0@"'.format(build_root), +- '-DTOP_SRCDIR="@0@"'.format(source_root), ++ '-DTOP_SRCDIR="@0@"'.format('/usr/src/debug/tracker'), + ] + + tracker_uninstalled_cli_dir = join_paths(meson.current_build_dir(), 'src', 'tracker') diff --git a/meta-gnome/recipes-gnome/tracker/tracker_3.4.2.bb b/meta-gnome/recipes-gnome/tracker/tracker_3.5.1.bb index 0cc6089ae4..6dd8af2390 100644 --- a/meta-gnome/recipes-gnome/tracker/tracker_3.4.2.bb +++ b/meta-gnome/recipes-gnome/tracker/tracker_3.5.1.bb @@ -22,7 +22,8 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gobject-introspection vala gtk-doc manpages bash-completion features_check python3native -SRC_URI[archive.sha256sum] = "4e6df142a4f704878fca98ebb5a224750e5ea546aa2aaabaa726a73540bd1731" +SRC_URI += "file://0001-meson-Do-not-define-TOP_SRCDIR.patch" +SRC_URI[archive.sha256sum] = "f972d50ac7bafdccf113b1eb99dcae35404685a99e55bfef16f3ac83b4de974d" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" diff --git a/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb b/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb index 200ed0f709..51d51ee0ab 100644 --- a/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb +++ b/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb @@ -19,7 +19,7 @@ DEPENDS += " \ libxslt \ sqlite3 \ libhandy \ - webkitgtk \ + webkitgtk3 \ yelp-xsl \ " PACKAGECONFIG_SOUP ?= "soup3" diff --git a/meta-gnome/recipes-gnome/zenity/zenity_3.43.0.bb b/meta-gnome/recipes-gnome/zenity/zenity_3.44.0.bb index 195e139e5f..3548cc5bbe 100644 --- a/meta-gnome/recipes-gnome/zenity/zenity_3.43.0.bb +++ b/meta-gnome/recipes-gnome/zenity/zenity_3.44.0.bb @@ -5,21 +5,24 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase pkgconfig itstool gnome-help features_check gettext +inherit gnomebase pkgconfig itstool gtk-icon-cache features_check gettext DEPENDS = " \ - yelp-tools-native \ + desktop-file-utils-native \ + hicolor-icon-theme \ gtk+3 \ + gtk+3-native \ " ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI[archive.sha256sum] = "b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833" +SRC_URI[archive.sha256sum] = "c15582301ed90b9d42ce521dbccf99a989f22f12041bdd5279c6636da99ebf65" SRC_URI += "file://0001-Harcode-shebang-to-avoid-pointing-to-build-system-s-.patch" -PACKAGECONFIG[libnotify] = "-Dlibnotify=true,-Dlibnotify=false,libnotify" -PACKAGECONFIG[webkitgtk] = "-Dwebkitgtk=true,-Dwebkitgtk=false,webkitgtk" +PACKAGECONFIG ?= "webkitgtk" +PACKAGECONFIG[webkitgtk] = "-Dwebkitgtk=true,-Dwebkitgtk=false,webkitgtk3" PACKAGES =+ "${PN}-gdialog" FILES:${PN}-gdialog = "${bindir}/gdialog" +FILES:${PN}-doc = "${datadir}/man ${datadir}/help" RDEPENDS:${PN}-gdialog += "perl" diff --git a/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch b/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch index 99bd09a6c3..944d2f9165 100644 --- a/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch +++ b/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch @@ -3,6 +3,8 @@ From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> Date: Sun, 8 Dec 2019 23:42:00 +0100 Subject: [PATCH] musl: Hack to fix configure +Upstream-Status: Inappropriate [Musl Specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meson.build | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/meta-gnome/recipes-support/ibus/ibus.bb b/meta-gnome/recipes-support/ibus/ibus.bb index 7156081499..141341e341 100644 --- a/meta-gnome/recipes-support/ibus/ibus.bb +++ b/meta-gnome/recipes-support/ibus/ibus.bb @@ -38,4 +38,4 @@ FILES:${PN} += " \ FILES:${PN}-dev += " \ ${datadir}/gettext \ " - +RDEPENDS:${PN} += "python3-core" diff --git a/meta-gnome/recipes-support/ibus/ibus.inc b/meta-gnome/recipes-support/ibus/ibus.inc index bb662f2ec9..9579404b3e 100644 --- a/meta-gnome/recipes-support/ibus/ibus.inc +++ b/meta-gnome/recipes-support/ibus/ibus.inc @@ -31,6 +31,9 @@ EXTRA_OECONF = " \ --disable-emoji-dict \ --disable-python2 \ " +EXTRA_OECONF:append:class-target = "\ + --with-python=${bindir}/python3 \ +" do_configure:prepend() { touch ${S}/ChangeLog diff --git a/meta-gnome/recipes-support/libuser/libuser/0003-python-Compilation-warnings-update.patch b/meta-gnome/recipes-support/libuser/libuser/0003-python-Compilation-warnings-update.patch deleted file mode 100644 index 45d6952150..0000000000 --- a/meta-gnome/recipes-support/libuser/libuser/0003-python-Compilation-warnings-update.patch +++ /dev/null @@ -1,84 +0,0 @@ -From acd7b051993d501f4b5e3a593e0f18d1336ba2de Mon Sep 17 00:00:00 2001 -From: Tomas Halman <thalman@redhat.com> -Date: Wed, 21 Jul 2021 15:36:59 +0200 -Subject: [PATCH] python: Compilation warnings update - -The compilation produces few warnings about discard const qualifier -and pointer to int conversion. This patch fixes the const qualifiers -and replaces the tp_print inicialization in PyTypeObject with 0 instead -of NULL - -Upstream-Status: Backport [https://pagure.io/libuser/c/3cb7ea54e7b50da6ea313a0e7c7187c8aa5e6ee9?branch=master] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - python/admin.c | 2 +- - python/ent.c | 8 ++++---- - python/misc.c | 2 +- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/python/admin.c b/python/admin.c -index 83595af..e92fca4 100644 ---- a/python/admin.c -+++ b/python/admin.c -@@ -1512,7 +1512,7 @@ PyTypeObject AdminType = { - sizeof(struct libuser_admin), /* tp_basicsize */ - 0, /* tp_itemsize */ - libuser_admin_destroy, /* tp_dealloc */ -- NULL, /* tp_print */ -+ 0, /* tp_print */ - NULL, /* tp_getattr */ - NULL, /* tp_setattr */ - NULL, /* tp_compare */ -diff --git a/python/ent.c b/python/ent.c -index ee712d2..fc3d654 100644 ---- a/python/ent.c -+++ b/python/ent.c -@@ -255,7 +255,7 @@ libuser_convert_to_value(PyObject *item, GValue *value) - static int - libuser_entity_setattro(PyObject *self, PyObject *attr_name, PyObject *value) - { -- char *name; -+ const char *name; - struct libuser_entity *me; - PyObject *list; - struct lu_ent *copy; -@@ -616,7 +616,7 @@ static PyObject * - libuser_entity_get_item(PyObject *self, PyObject *item) - { - struct libuser_entity *me; -- char *attr; -+ const char *attr; - - DEBUG_ENTRY; - me = (struct libuser_entity *)self; -@@ -664,7 +664,7 @@ static int - libuser_entity_set_item(PyObject *self, PyObject *item, PyObject *args) - { - struct libuser_entity *me; -- char *attr = NULL; -+ const char *attr = NULL; - Py_ssize_t i, size; - int ret; - GValue value; -@@ -800,7 +800,7 @@ PyTypeObject EntityType = { - sizeof(struct libuser_entity), /* tp_basicsize */ - 0, /* tp_itemsize */ - libuser_entity_destroy, /* tp_dealloc */ -- NULL, /* tp_print */ -+ 0, /* tp_print */ - NULL, /* tp_getattr */ - NULL, /* tp_setattr */ - NULL, /* tp_compare */ -diff --git a/python/misc.c b/python/misc.c -index c4ce819..810a846 100644 ---- a/python/misc.c -+++ b/python/misc.c -@@ -488,7 +488,7 @@ PyTypeObject PromptType = { - sizeof(struct libuser_prompt), /* tp_basicsize */ - 0, /* tp_itemsize */ - libuser_prompt_destroy, /* tp_dealloc */ -- NULL, /* tp_print */ -+ 0, /* tp_print */ - NULL, /* tp_getattr */ - NULL, /* tp_setattr */ - NULL, /* tp_compare */ diff --git a/meta-gnome/recipes-support/libuser/libuser_0.63.bb b/meta-gnome/recipes-support/libuser/libuser_0.64.bb index e191e115a3..d86a577b10 100644 --- a/meta-gnome/recipes-support/libuser/libuser_0.63.bb +++ b/meta-gnome/recipes-support/libuser/libuser_0.64.bb @@ -11,13 +11,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ SECTION = "base" -SRC_URI = "https://releases.pagure.org/libuser/libuser-${PV}.tar.xz \ +SRC_URI = "https://releases.pagure.org/libuser/libuser-${PV}.tar.gz \ file://0001-docs-Disable-building.patch \ file://0002-remove-unused-execinfo.h.patch \ - file://0003-python-Compilation-warnings-update.patch \ " -SRC_URI[sha256sum] = "8dc377255452a68e82c4837ba22c3ee4ae3658971bf0f2ef67ed0b77fc497f91" +SRC_URI[sha256sum] = "ea6094c72cb9e60a42fb53509dc98d124a340f1c9222783b503208adc16a0a8f" DEPENDS = "bison-native popt libpam glib-2.0 python3" diff --git a/meta-gnome/recipes-support/libwacom/libwacom_2.5.0.bb b/meta-gnome/recipes-support/libwacom/libwacom_2.6.0.bb index a290d95b71..d960262416 100644 --- a/meta-gnome/recipes-support/libwacom/libwacom_2.5.0.bb +++ b/meta-gnome/recipes-support/libwacom/libwacom_2.6.0.bb @@ -8,7 +8,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=40a21fffb367c82f39fd91a3b137c36e" SRC_URI = "git://github.com/linuxwacom/libwacom.git;branch=master;protocol=https" -SRCREV = "c6c1b26ad149a88b22ff790dae377fcc935b7e08" +SRCREV = "cb36c462763a321454d5c08fe974a3d7dec4ed1a" DEPENDS = " \ libxml2-native \ diff --git a/meta-gnome/recipes-support/usermode/usermode/0001-Makefile.am-Link-with-libm-for-powl-API.patch b/meta-gnome/recipes-support/usermode/usermode/0001-Makefile.am-Link-with-libm-for-powl-API.patch index 8ea34cf239..7a052b23b9 100644 --- a/meta-gnome/recipes-support/usermode/usermode/0001-Makefile.am-Link-with-libm-for-powl-API.patch +++ b/meta-gnome/recipes-support/usermode/usermode/0001-Makefile.am-Link-with-libm-for-powl-API.patch @@ -3,6 +3,7 @@ From: Khem Raj <raj.khem@gmail.com> Date: Tue, 25 Jul 2017 18:28:15 -0700 Subject: [PATCH] Makefile.am: Link with libm for powl() API +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- Makefile.am | 2 +- diff --git a/meta-gnome/recipes-support/webp-pixbuf-loader/webp-pixbuf-loader_0.7.bb b/meta-gnome/recipes-support/webp-pixbuf-loader/webp-pixbuf-loader_0.2.4.bb index 17a3436741..71c5244f16 100644 --- a/meta-gnome/recipes-support/webp-pixbuf-loader/webp-pixbuf-loader_0.7.bb +++ b/meta-gnome/recipes-support/webp-pixbuf-loader/webp-pixbuf-loader_0.2.4.bb @@ -1,6 +1,6 @@ SUMMARY = "WebP GDK Pixbuf Loader library" HOMEPAGE = "https://github.com/aruiz/webp-pixbuf-loader" -LICENSE = "LGPL-2.1-or-later" +LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE.LGPL-2;md5=0d90e6d44bcf69014bfae649c75aa6ca" DEPENDS = " \ @@ -15,7 +15,7 @@ EXTRA_OEMESON = "-Dupdate_cache=true" SRC_URI = "git://github.com/aruiz/webp-pixbuf-loader.git;protocol=https;nobranch=1" S = "${WORKDIR}/git" -SRCREV = "f91f79c05ff90b41774eda613dc10a2a0d996bc8" +SRCREV = "a35014104a226265e44fe30fcdb4df9305af3466" FILES:${PN} = " \ ${datadir}/thumbnailers/webp-pixbuf.thumbnailer \ diff --git a/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_43.1.bb b/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_44.1.bb index 050ce1a04c..d6bc0e9c8b 100644 --- a/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_43.1.bb +++ b/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_44.1.bb @@ -24,10 +24,11 @@ REQUIRED_DISTRO_FEATURES = "polkit" SRC_URI = "git://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome.git;protocol=https;nobranch=1" S = "${WORKDIR}/git" -SRCREV = "4fd5a8bf16b01c78ed19764415cb26d29aaf7eab" +SRCREV = "89203bf3522556965fc225782d1a635afdac611e" -PACKAGECONFIG ?= "" +PACKAGECONFIG ?= "screenshot screencast ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" +PACKAGECONFIG[wayland] = ",,wayland-native" PACKAGECONFIG[screenshot] = ",,,gnome-shell" PACKAGECONFIG[screencast] = ",,,mutter" diff --git a/meta-initramfs/README b/meta-initramfs/README.md index 119293a741..119293a741 100644 --- a/meta-initramfs/README +++ b/meta-initramfs/README.md diff --git a/meta-initramfs/recipes-bsp/kexecboot/files/0001-make-Add-compiler-includes-in-cflags.patch b/meta-initramfs/recipes-bsp/kexecboot/files/0001-make-Add-compiler-includes-in-cflags.patch index 931d0fa584..abfd8b77ee 100644 --- a/meta-initramfs/recipes-bsp/kexecboot/files/0001-make-Add-compiler-includes-in-cflags.patch +++ b/meta-initramfs/recipes-bsp/kexecboot/files/0001-make-Add-compiler-includes-in-cflags.patch @@ -11,6 +11,8 @@ Fixes Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb b/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb index 9f7a214d8b..62d1effccc 100644 --- a/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb +++ b/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb @@ -1,6 +1,6 @@ SUMMARY = "kexecboot linux-as-bootloader" DESCRIPTION = "kexecboot is a graphical linux-as-bootloader implementation based on kexec." -HOMEPAGE = "http://kexecboot.org" +HOMEPAGE = "https://github.com/kexecboot/kexecboot/wiki" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" PV = "0.6+git${SRCPV}" diff --git a/meta-initramfs/recipes-core/images/initramfs-debug-image.bb b/meta-initramfs/recipes-core/images/initramfs-debug-image.bb index 601056b7e5..fc9e81e5de 100644 --- a/meta-initramfs/recipes-core/images/initramfs-debug-image.bb +++ b/meta-initramfs/recipes-core/images/initramfs-debug-image.bb @@ -11,7 +11,7 @@ IMAGE_FEATURES = "" export IMAGE_BASENAME = "initramfs-debug-image" IMAGE_LINGUAS = "" -# Some BSPs use IMAGE_FSTYPES_<machine override> which would override +# Some BSPs use IMAGE_FSTYPES:<machine override> which would override # an assignment to IMAGE_FSTYPES so we need anon python python () { d.setVar("IMAGE_FSTYPES", d.getVar("INITRAMFS_FSTYPES")) diff --git a/meta-initramfs/recipes-core/images/initramfs-kexecboot-image.bb b/meta-initramfs/recipes-core/images/initramfs-kexecboot-image.bb index dd082ba529..7e6e03d8e7 100644 --- a/meta-initramfs/recipes-core/images/initramfs-kexecboot-image.bb +++ b/meta-initramfs/recipes-core/images/initramfs-kexecboot-image.bb @@ -1,7 +1,7 @@ SUMMARY = "Initramfs image for kexecboot kernel" DESCRIPTION = "This image provides kexecboot (linux as bootloader) and helpers." -# Some BSPs use IMAGE_FSTYPES_<machine override> which would override +# Some BSPs use IMAGE_FSTYPES:<machine override> which would override # an assignment to IMAGE_FSTYPES so we need anon python python () { d.setVar("IMAGE_FSTYPES", d.getVar("INITRAMFS_FSTYPES")) diff --git a/meta-initramfs/recipes-devtools/dracut/dracut/0001-util.h-include-sys-reg.h-when-libc-glibc.patch b/meta-initramfs/recipes-devtools/dracut/dracut/0001-util.h-include-sys-reg.h-when-libc-glibc.patch index aa2ea723b5..68ec2b8fdb 100644 --- a/meta-initramfs/recipes-devtools/dracut/dracut/0001-util.h-include-sys-reg.h-when-libc-glibc.patch +++ b/meta-initramfs/recipes-devtools/dracut/dracut/0001-util.h-include-sys-reg.h-when-libc-glibc.patch @@ -11,6 +11,8 @@ https://github.com/voidlinux/void-packages/blob/master/srcpkgs/dracut/patches/mu Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/install/util.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-initramfs/recipes-devtools/dracut/dracut_056.bb b/meta-initramfs/recipes-devtools/dracut/dracut_056.bb index 364beec5d8..db08fffe9a 100644 --- a/meta-initramfs/recipes-devtools/dracut/dracut_056.bb +++ b/meta-initramfs/recipes-devtools/dracut/dracut_056.bb @@ -65,9 +65,7 @@ RDEPENDS:${PN} = "findutils cpio util-linux-blkid util-linux-getopt util-linux b # This could be optimized a bit, but let's avoid non-booting systems :) RRECOMMENDS:${PN} = " \ kernel-modules \ - busybox \ coreutils \ " -# CVE-2010-4176 affects only Fedora -CVE_CHECK_IGNORE += "CVE-2010-4176" +CVE_STATUS[CVE-2010-4176] = "not-applicable-platform: Applies only to Fedora" diff --git a/meta-initramfs/recipes-devtools/klibc/files/0001-Define-in_-structs-for-non-glibc-system-libs.patch b/meta-initramfs/recipes-devtools/klibc/files/0001-Define-in_-structs-for-non-glibc-system-libs.patch index 29873cf7b5..c782cf03c8 100644 --- a/meta-initramfs/recipes-devtools/klibc/files/0001-Define-in_-structs-for-non-glibc-system-libs.patch +++ b/meta-initramfs/recipes-devtools/klibc/files/0001-Define-in_-structs-for-non-glibc-system-libs.patch @@ -12,6 +12,8 @@ to infer that these structs should be defined in linux/in.h Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + usr/include/net/if.h | 11 +++++++++++ usr/include/netinet/in.h | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/meta-initramfs/recipes-devtools/klibc/files/0001-always-use-bfd-linker.patch b/meta-initramfs/recipes-devtools/klibc/files/0001-always-use-bfd-linker.patch index de04d691fe..895254889c 100644 --- a/meta-initramfs/recipes-devtools/klibc/files/0001-always-use-bfd-linker.patch +++ b/meta-initramfs/recipes-devtools/klibc/files/0001-always-use-bfd-linker.patch @@ -10,6 +10,8 @@ linking issues on such distros Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-initramfs/recipes-devtools/klibc/files/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch b/meta-initramfs/recipes-devtools/klibc/files/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch index ea14c49f0d..5ac0d4596a 100644 --- a/meta-initramfs/recipes-devtools/klibc/files/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch +++ b/meta-initramfs/recipes-devtools/klibc/files/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch @@ -11,6 +11,8 @@ which is a bit harder in OE Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + usr/klibc/arch/arm/MCONFIG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-initramfs/recipes-devtools/klibc/files/0001-include-linux-sysinfo.h-directly.patch b/meta-initramfs/recipes-devtools/klibc/files/0001-include-linux-sysinfo.h-directly.patch index d58229681d..d49dfc1924 100644 --- a/meta-initramfs/recipes-devtools/klibc/files/0001-include-linux-sysinfo.h-directly.patch +++ b/meta-initramfs/recipes-devtools/klibc/files/0001-include-linux-sysinfo.h-directly.patch @@ -12,6 +12,8 @@ override to avoid this assumption Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + usr/include/sys/sysinfo.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-add-getrandom-syscall.patch b/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-add-getrandom-syscall.patch index f096486d0b..80e6c6b11c 100644 --- a/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-add-getrandom-syscall.patch +++ b/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-add-getrandom-syscall.patch @@ -7,6 +7,8 @@ needed by latest kexec-tools for qemuarm64 (kashan) Signed-off-by: Andrea Adami <andrea.adami@gmail.com> --- +Upstream-Status: Pending + usr/klibc/SYSCALLS.def | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-initramfs/recipes-devtools/klibc/files/0001-klibc_2.0.4-add-kexec_file_load-syscall.patch b/meta-initramfs/recipes-devtools/klibc/files/0001-klibc_2.0.4-add-kexec_file_load-syscall.patch index b03fb91265..16885488e4 100644 --- a/meta-initramfs/recipes-devtools/klibc/files/0001-klibc_2.0.4-add-kexec_file_load-syscall.patch +++ b/meta-initramfs/recipes-devtools/klibc/files/0001-klibc_2.0.4-add-kexec_file_load-syscall.patch @@ -7,6 +7,8 @@ for supported archs only (matched in kexec-tools) Signed-off-by: Andrea Adami <andrea.adami@gmail.com> --- +Upstream-Status: Pending + usr/klibc/SYSCALLS.def | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-initramfs/recipes-devtools/klibc/files/0001-mkfifo-Implement-mkfifo.patch b/meta-initramfs/recipes-devtools/klibc/files/0001-mkfifo-Implement-mkfifo.patch index 3bc081d4e9..4378ca5610 100644 --- a/meta-initramfs/recipes-devtools/klibc/files/0001-mkfifo-Implement-mkfifo.patch +++ b/meta-initramfs/recipes-devtools/klibc/files/0001-mkfifo-Implement-mkfifo.patch @@ -6,6 +6,8 @@ Subject: [PATCH] mkfifo: Implement mkfifo Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + usr/utils/mkfifo.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta-initramfs/recipes-devtools/klibc/files/armv4-fix-v4bx.patch b/meta-initramfs/recipes-devtools/klibc/files/armv4-fix-v4bx.patch index 6c734dfd6e..585fb2d439 100644 --- a/meta-initramfs/recipes-devtools/klibc/files/armv4-fix-v4bx.patch +++ b/meta-initramfs/recipes-devtools/klibc/files/armv4-fix-v4bx.patch @@ -9,6 +9,8 @@ which is "" in case of armv5 or thumbs. Signed-off-by: Andrea Adami <andrea.adami@gmail.com> --- +Upstream-Status: Pending + usr/klibc/arch/arm/MCONFIG | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-initramfs/recipes-devtools/klibc/files/cross-clang.patch b/meta-initramfs/recipes-devtools/klibc/files/cross-clang.patch index 41936c9fe3..f39701a65e 100644 --- a/meta-initramfs/recipes-devtools/klibc/files/cross-clang.patch +++ b/meta-initramfs/recipes-devtools/klibc/files/cross-clang.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/scripts/Kbuild.klibc +++ b/scripts/Kbuild.klibc @@ -113,10 +113,8 @@ KLIBCCPPFLAGS := -nostdinc -iwithpref diff --git a/meta-initramfs/recipes-devtools/klibc/files/klcc-consider-sysroot.patch b/meta-initramfs/recipes-devtools/klibc/files/klcc-consider-sysroot.patch index 5f47d3f20a..af76564901 100644 --- a/meta-initramfs/recipes-devtools/klibc/files/klcc-consider-sysroot.patch +++ b/meta-initramfs/recipes-devtools/klibc/files/klcc-consider-sysroot.patch @@ -3,6 +3,8 @@ From: Andrea Adami <andrea.adami@gmail.com> Date: Fri, 19 Sep 2014 23:09:29 +0200 --- +Upstream-Status: Pending + klcc/klcc.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-initramfs/recipes-devtools/klibc/files/use-env-for-perl.patch b/meta-initramfs/recipes-devtools/klibc/files/use-env-for-perl.patch index 5973824885..d2a19909f0 100644 --- a/meta-initramfs/recipes-devtools/klibc/files/use-env-for-perl.patch +++ b/meta-initramfs/recipes-devtools/klibc/files/use-env-for-perl.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Patch was imported from the OpenEmbedded git server (git://git.openembedded.org/openembedded) as of commit id 676cbb54d42c89a4832871064cfcb7ee2ad372ee diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0014-add-if_nameindex-from-musl.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0014-add-if_nameindex-from-musl.patch index f4d0d5d942..eca01b956c 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0014-add-if_nameindex-from-musl.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0014-add-if_nameindex-from-musl.patch @@ -22,6 +22,8 @@ to fix : Signed-off-by: Andrea Adami <andrea.adami@gmail.com> --- +Upstream-Status: Pending + kexec/Makefile | 2 +- kexec/if_nameindex.c | 64 ++++++++++++++++++++++++++++++++++++++++++++ kexec/if_nameindex.h | 15 +++++++++++ diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0015-vmcore-dmesg-fix-warning.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0015-vmcore-dmesg-fix-warning.patch index 9b8107aedc..044a70d93b 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0015-vmcore-dmesg-fix-warning.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0015-vmcore-dmesg-fix-warning.patch @@ -8,6 +8,8 @@ Subject: [PATCH] vmcore-dmesg: fix warning Signed-off-by: Andrea Adami <andrea.adami@gmail.com> --- +Upstream-Status: Pending + vmcore-dmesg/vmcore-dmesg.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/140-mips_disable_devicetree_support.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/140-mips_disable_devicetree_support.patch index 6e347c048e..031efb6275 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/140-mips_disable_devicetree_support.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/140-mips_disable_devicetree_support.patch @@ -16,6 +16,8 @@ Signed-off-by: Konstantin Kuzov <master.nosferatu@gmail.com> Signed-off-by: Andrea Adami <andrea.adami@gmail.com> --- +Upstream-Status: Pending + kexec/arch/mips/include/arch/options.h | 4 +- kexec/arch/mips/kexec-elf-mips.c | 58 ++++++++++++++------------ kexec/arch/mips/kexec-mips.c | 4 ++ diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64-crashdump-arm64.c-fix-warning.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64-crashdump-arm64.c-fix-warning.patch index c2418d8fa0..a3b7789eba 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64-crashdump-arm64.c-fix-warning.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64-crashdump-arm64.c-fix-warning.patch @@ -13,6 +13,8 @@ ng: "__bitwise" redefined Signed-off-by: Andrea Adami <andrea.adami@gmail.com> --- +Upstream-Status: Pending + kexec/arch/arm64/crashdump-arm64.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm_crashdump-fix-buffer-align.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm_crashdump-fix-buffer-align.patch index 5323a81e6b..89a5d34c83 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm_crashdump-fix-buffer-align.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm_crashdump-fix-buffer-align.patch @@ -6,6 +6,8 @@ Subject: [PATCH] arm- backport from oe-core Signed-off-by: Andrea Adami <andrea.adami@gmail.com> --- +Upstream-Status: Pending + kexec/arch/arm/crashdump-arm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/include_next.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/include_next.patch index d4fbd1436f..29ea1d9f18 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/include_next.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/include_next.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/kexec/Makefile +++ b/kexec/Makefile @@ -110,7 +110,7 @@ $(KEXEC): $(KEXEC_OBJS) $(UTIL_LIB) diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/klibc-reboot.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/klibc-reboot.patch index 6497fb4160..1c58e92b35 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/klibc-reboot.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/klibc-reboot.patch @@ -3,6 +3,8 @@ From: Khem Raj <raj.khem@gmail.com> Date: Fri, 15 Mar 2019 00:22:40 -0700 --- +Upstream-Status: Pending + kexec/kexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-multimedia/README b/meta-multimedia/README.md index 235c34331b..235c34331b 100644 --- a/meta-multimedia/README +++ b/meta-multimedia/README.md diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-av/0001-all-Drop-xmlRecoverMemory.patch b/meta-multimedia/recipes-connectivity/gupnp/gupnp-av/0001-all-Drop-xmlRecoverMemory.patch new file mode 100644 index 0000000000..92b52ad98a --- /dev/null +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-av/0001-all-Drop-xmlRecoverMemory.patch @@ -0,0 +1,44 @@ +From d99f71a4a52da7582d5e26992a1ab303b280d28a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 30 Jun 2023 03:23:12 -0700 +Subject: [PATCH] Drop xmlRecoverMemory + +newer libxml has deprecated xmlRecoverMemory therefore replace it with xmlReadMemory + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gupnp/-/commit/80e68995b745a5900eaaa1d0c424d3a9d354e42d] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gupnp-didl-lite-parser.c | 2 +- + gupnp-feature-list-parser.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gupnp-didl-lite-parser.c b/gupnp-didl-lite-parser.c +index 3a5727f..840d718 100644 +--- a/libgupnp-av/gupnp-didl-lite-parser.c ++++ b/libgupnp-av/gupnp-didl-lite-parser.c +@@ -230,7 +230,7 @@ gupnp_didl_lite_parser_parse_didl_recursive (GUPnPDIDLLiteParser *parser, + GUPnPAVXMLDoc *xml_doc = NULL; + gboolean result; + +- doc = xmlRecoverMemory (didl, strlen (didl)); ++ doc = xmlReadMemory (didl, strlen (didl), NULL, NULL, XML_PARSE_NONET | XML_PARSE_RECOVER); + if (doc == NULL) { + g_set_error (error, + G_MARKUP_ERROR, +diff --git a/gupnp-feature-list-parser.c b/gupnp-feature-list-parser.c +index 16208b5..f804fe7 100644 +--- a/libgupnp-av/gupnp-feature-list-parser.c ++++ b/libgupnp-av/gupnp-feature-list-parser.c +@@ -114,7 +114,7 @@ gupnp_feature_list_parser_parse_text + xmlNode *element; + GList *feature_list = NULL; + +- doc = xmlRecoverMemory (text, strlen (text)); ++ doc = xmlReadMemory (text, strlen (text), NULL, NULL, XML_PARSE_NONET | XML_PARSE_RECOVER); + if (doc == NULL) { + g_set_error (error, + G_MARKUP_ERROR, +-- +2.41.0 + diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.14.0.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.14.0.bb index b253c54d92..48de5868de 100644 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.14.0.bb +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.14.0.bb @@ -8,5 +8,7 @@ DEPENDS = "gupnp" inherit meson pkgconfig gobject-introspection vala -SRC_URI = "${GNOME_MIRROR}/${BPN}/0.14/${BPN}-${PV}.tar.xz" +SRC_URI = "${GNOME_MIRROR}/${BPN}/0.14/${BPN}-${PV}.tar.xz \ + file://0001-all-Drop-xmlRecoverMemory.patch \ + " SRC_URI[sha256sum] = "20aed546fc882e78a3f186a0c8bce5c841cc3a44b7ea528298fbdc82596fb156" diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-all-Drop-xmlRecoverMemory.patch b/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-all-Drop-xmlRecoverMemory.patch new file mode 100644 index 0000000000..a3941f345f --- /dev/null +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-all-Drop-xmlRecoverMemory.patch @@ -0,0 +1,107 @@ +From 46f13d9929c81ec2340a1a5d48f596b1892c5a81 Mon Sep 17 00:00:00 2001 +From: Jens Georg <mail@jensge.org> +Date: Thu, 4 May 2023 19:14:29 +0200 +Subject: [PATCH] all: Drop xmlRecoverMemory + +use xmlReadMemory, also use NONET flat + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Upstream-Status: Backport [https://github.com/GNOME/gupnp/commit/80e68995b745a5900eaaa1d0c424d3a9d354e42d] +--- + libgupnp/gupnp-control-point.c | 7 +++++-- + libgupnp/gupnp-service-info.c | 7 +++++-- + libgupnp/gupnp-service-proxy-action.c | 7 +++++-- + libgupnp/gupnp-service-proxy.c | 7 +++++-- + libgupnp/gupnp-service.c | 7 +++++-- + 5 files changed, 25 insertions(+), 10 deletions(-) + +diff --git a/libgupnp/gupnp-control-point.c b/libgupnp/gupnp-control-point.c +index dc04732..99ebda5 100644 +--- a/libgupnp/gupnp-control-point.c ++++ b/libgupnp/gupnp-control-point.c +@@ -608,8 +608,11 @@ got_description_url (SoupSession *session, + xmlDoc *xml_doc; + + /* Parse response */ +- xml_doc = xmlRecoverMemory (msg->response_body->data, +- msg->response_body->length); ++ xml_doc = xmlReadMemory (msg->response_body->data, ++ msg->response_body->length, ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); + if (xml_doc) { + doc = gupnp_xml_doc_new (xml_doc); + +diff --git a/libgupnp/gupnp-service-info.c b/libgupnp/gupnp-service-info.c +index 9a9f4de..d468801 100644 +--- a/libgupnp/gupnp-service-info.c ++++ b/libgupnp/gupnp-service-info.c +@@ -592,8 +592,11 @@ got_scpd_url (G_GNUC_UNUSED SoupSession *session, + if (SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) { + xmlDoc *scpd; + +- scpd = xmlRecoverMemory (msg->response_body->data, +- msg->response_body->length); ++ scpd = xmlReadMemory (msg->response_body->data, ++ msg->response_body->length, ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); + if (scpd) { + introspection = gupnp_service_introspection_new (scpd); + +diff --git a/libgupnp/gupnp-service-proxy-action.c b/libgupnp/gupnp-service-proxy-action.c +index 4d9336c..ef8a808 100644 +--- a/libgupnp/gupnp-service-proxy-action.c ++++ b/libgupnp/gupnp-service-proxy-action.c +@@ -86,8 +86,11 @@ check_action_response (G_GNUC_UNUSED GUPnPServiceProxy *proxy, + } + + /* Parse response */ +- response = xmlRecoverMemory (action->msg->response_body->data, +- action->msg->response_body->length); ++ response = xmlReadMemory (action->msg->response_body->data, ++ action->msg->response_body->length, ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); + + if (!response) { + if (action->msg->status_code == SOUP_STATUS_OK) { +diff --git a/libgupnp/gupnp-service-proxy.c b/libgupnp/gupnp-service-proxy.c +index 25d5ef6..af2fd46 100644 +--- a/libgupnp/gupnp-service-proxy.c ++++ b/libgupnp/gupnp-service-proxy.c +@@ -1560,8 +1560,11 @@ server_handler (G_GNUC_UNUSED SoupServer *soup_server, + } + + /* Parse the actual XML message content */ +- doc = xmlRecoverMemory (msg->request_body->data, +- msg->request_body->length); ++ doc = xmlReadMemory (msg->request_body->data, ++ msg->request_body->length, ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); + if (doc == NULL) { + /* Failed */ + g_warning ("Failed to parse NOTIFY message body"); +diff --git a/libgupnp/gupnp-service.c b/libgupnp/gupnp-service.c +index 67b3d43..0ebfb26 100644 +--- a/libgupnp/gupnp-service.c ++++ b/libgupnp/gupnp-service.c +@@ -985,8 +985,11 @@ control_server_handler (SoupServer *server, + *end = '\0'; + + /* Parse action_node */ +- doc = xmlRecoverMemory (msg->request_body->data, +- msg->request_body->length); ++ doc = xmlReadMemory (msg->request_body->data, ++ msg->request_body->length, ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); + if (doc == NULL) { + soup_message_set_status (msg, SOUP_STATUS_BAD_REQUEST); + diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb index 708e3844ff..c21e7a05bf 100644 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb @@ -7,7 +7,9 @@ DEPENDS = "e2fsprogs gssdp libsoup-2.4 libxml2" inherit meson pkgconfig vala gobject-introspection -SRC_URI = "${GNOME_MIRROR}/${BPN}/1.4/${BPN}-${PV}.tar.xz" +SRC_URI = "${GNOME_MIRROR}/${BPN}/1.4/${BPN}-${PV}.tar.xz \ + file://0001-all-Drop-xmlRecoverMemory.patch \ +" SRC_URI[sha256sum] = "899196b5e66f03b8e25f046a7a658cd2a6851becb83f2d55345ab3281655dc0c" SYSROOT_PREPROCESS_FUNCS += "gupnp_sysroot_preprocess" diff --git a/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb b/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb index 7c09e39d66..bd2df5d8d6 100644 --- a/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb +++ b/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb @@ -8,7 +8,7 @@ DEPENDS = "libusb1 openssl pcsc-lite" SRC_URI = "svn://www.streamboard.tv/svn/oscam;module=trunk;protocol=http \ " -SRCREV = "11491" +SRCREV = "11718" PV = "1.10+${SRCPV}" S = "${WORKDIR}/trunk" @@ -17,3 +17,6 @@ inherit cmake EXTRA_OECMAKE = "-DDEFAULT_CS_CONFDIR=${sysconfdir} -DCMAKE_BUILD_TYPE=Debug" +do_configure:append() { + sed -i -e '1 s|${TOPDIR}|<TOPDIR>|g' ${B}/config.c +} diff --git a/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb b/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb index b3e5e78c7c..d64ee96f78 100644 --- a/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb +++ b/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb @@ -30,3 +30,7 @@ EXTRA_OECONF:append:libc-musl = " --disable-execinfo" EXTRA_OEMAKE = "CFLAGS_NO_WERROR=yes" CLEANBROKEN = "1" + +do_configure:append() { + sed -i -e "s|${WORKDIR}|<TOPDIR>|g" ${B}/build.linux/build.c +} diff --git a/meta-multimedia/recipes-mkv/libmatroska/libmatroska/0001-Makefile-Use-LINKFLAGS-during-link-step.patch b/meta-multimedia/recipes-mkv/libmatroska/libmatroska/0001-Makefile-Use-LINKFLAGS-during-link-step.patch index 90e997561a..f7656913b5 100644 --- a/meta-multimedia/recipes-mkv/libmatroska/libmatroska/0001-Makefile-Use-LINKFLAGS-during-link-step.patch +++ b/meta-multimedia/recipes-mkv/libmatroska/libmatroska/0001-Makefile-Use-LINKFLAGS-during-link-step.patch @@ -5,6 +5,7 @@ Subject: [PATCH] Makefile: Use LINKFLAGS during link step Adds much needed GNU_HASH section into the .so +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- make/linux/Makefile | 2 +- diff --git a/meta-multimedia/recipes-multimedia/aom/aom/0001-subpel_variance_neon-Provide-prototypes-for-missing-.patch b/meta-multimedia/recipes-multimedia/aom/aom/0001-subpel_variance_neon-Provide-prototypes-for-missing-.patch index 100507cdec..8a8350ec57 100644 --- a/meta-multimedia/recipes-multimedia/aom/aom/0001-subpel_variance_neon-Provide-prototypes-for-missing-.patch +++ b/meta-multimedia/recipes-multimedia/aom/aom/0001-subpel_variance_neon-Provide-prototypes-for-missing-.patch @@ -1,6 +1,6 @@ -From c33e07f78982acfb0574a84fb523f8591e55c50e Mon Sep 17 00:00:00 2001 +From 35c1ed84a158354c37e329bad0e236b156836ac7 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 11 Sep 2022 19:46:28 -0700 +Date: Tue, 23 May 2023 14:59:26 -0700 Subject: [PATCH] subpel_variance_neon: Provide prototypes for missing functions @@ -11,18 +11,19 @@ larations [-Wimplicit-function-declaration] | ^ Upstream-Status: Pending + Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - aom_dsp/arm/subpel_variance_neon.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) + aom_dsp/arm/subpel_variance_neon.c | 76 ++++++++++++++++++++++++++++++ + 1 file changed, 76 insertions(+) diff --git a/aom_dsp/arm/subpel_variance_neon.c b/aom_dsp/arm/subpel_variance_neon.c -index 4ecf891cbeb..859168ea0c5 100644 +index a05886066c4..ea6bada224d 100644 --- a/aom_dsp/arm/subpel_variance_neon.c +++ b/aom_dsp/arm/subpel_variance_neon.c -@@ -20,6 +20,22 @@ - #include "aom_dsp/aom_filter.h" +@@ -20,6 +20,82 @@ #include "aom_dsp/variance.h" + #include "aom_dsp/arm/mem_neon.h" +extern unsigned int aom_variance8x8_neon(const uint8_t *a, int a_stride, + const uint8_t *b, int b_stride, @@ -32,17 +33,77 @@ index 4ecf891cbeb..859168ea0c5 100644 + const uint8_t *b, int b_stride, + unsigned int *sse); + ++extern unsigned int aom_variance16x32_neon(const uint8_t *a, int a_stride, ++ const uint8_t *b, int b_stride, ++ unsigned int *sse); ++ ++extern unsigned int aom_variance16x64_neon(const uint8_t *a, int a_stride, ++ const uint8_t *b, int b_stride, ++ unsigned int *sse); ++ ++extern unsigned int aom_variance32x8_neon(const uint8_t *a, int a_stride, ++ const uint8_t *b, int b_stride, ++ unsigned int *sse); ++ ++extern unsigned int aom_variance32x16_neon(const uint8_t *a, int a_stride, ++ const uint8_t *b, int b_stride, ++ unsigned int *sse); ++ +extern unsigned int aom_variance32x32_neon(const uint8_t *a, int a_stride, + const uint8_t *b, int b_stride, + unsigned int *sse); + ++extern unsigned int aom_variance32x64_neon(const uint8_t *a, int a_stride, ++ const uint8_t *b, int b_stride, ++ unsigned int *sse); ++ ++extern unsigned int aom_variance32x128_neon(const uint8_t *a, int a_stride, ++ const uint8_t *b, int b_stride, ++ unsigned int *sse); ++ ++extern unsigned int aom_variance64x8_neon(const uint8_t *a, int a_stride, ++ const uint8_t *b, int b_stride, ++ unsigned int *sse); ++ ++extern unsigned int aom_variance64x16_neon(const uint8_t *a, int a_stride, ++ const uint8_t *b, int b_stride, ++ unsigned int *sse); ++ ++extern unsigned int aom_variance64x32_neon(const uint8_t *a, int a_stride, ++ const uint8_t *b, int b_stride, ++ unsigned int *sse); ++ +extern unsigned int aom_variance64x64_neon(const uint8_t *a, int a_stride, + const uint8_t *b, int b_stride, + unsigned int *sse); + - // Load 2 sets of 4 bytes when alignment is not guaranteed. - static INLINE uint8x8_t load_unaligned_u8(const uint8_t *buf, int stride) { - uint32_t a; ++extern unsigned int aom_variance64x128_neon(const uint8_t *a, int a_stride, ++ const uint8_t *b, int b_stride, ++ unsigned int *sse); ++ ++extern unsigned int aom_variance128x8_neon(const uint8_t *a, int a_stride, ++ const uint8_t *b, int b_stride, ++ unsigned int *sse); ++ ++extern unsigned int aom_variance128x16_neon(const uint8_t *a, int a_stride, ++ const uint8_t *b, int b_stride, ++ unsigned int *sse); ++ ++extern unsigned int aom_variance128x32_neon(const uint8_t *a, int a_stride, ++ const uint8_t *b, int b_stride, ++ unsigned int *sse); ++ ++extern unsigned int aom_variance128x64_neon(const uint8_t *a, int a_stride, ++ const uint8_t *b, int b_stride, ++ unsigned int *sse); ++ ++extern unsigned int aom_variance128x128_neon(const uint8_t *a, int a_stride, ++ const uint8_t *b, int b_stride, ++ unsigned int *sse); ++ + static void var_filter_block2d_bil_w4(const uint8_t *src_ptr, uint8_t *dst_ptr, + int src_stride, int pixel_step, + int dst_height, int filter_offset) { -- -2.37.3 +2.40.1 diff --git a/meta-multimedia/recipes-multimedia/aom/aom_3.4.0.bb b/meta-multimedia/recipes-multimedia/aom/aom_3.6.1.bb index 9cd6f7a9e9..45dd487f30 100644 --- a/meta-multimedia/recipes-multimedia/aom/aom_3.4.0.bb +++ b/meta-multimedia/recipes-multimedia/aom/aom_3.6.1.bb @@ -3,23 +3,25 @@ DESCRIPTION = "Alliance for Open Media AV1 codec library" LICENSE = "BSD-2-Clause & AOM-Patent-License-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=6ea91368c1bbdf877159435572b931f5 \ - file://PATENTS;md5=e69ad12202bd20da3c76a5d3648cfa83 \ + file://PATENTS;md5=a111d47497d3bb49e04eef71377eb8ba \ " - +SRCREV = "7ade96172b95adc91a5d85bf80c90989cd543ee8" SRC_URI = "git://aomedia.googlesource.com/aom;protocol=https;branch=main \ - file://0001-subpel_variance_neon-Provide-prototypes-for-missing-.patch \ - " - -SRCREV = "fd0c9275d36930a6eea6d3c35972e7cf9c512944" + file://0001-subpel_variance_neon-Provide-prototypes-for-missing-.patch" S = "${WORKDIR}/git" inherit cmake pkgconfig -DEPENDS = " yasm-native" -EXTRA_OECMAKE = " -DBUILD_SHARED_LIBS=1 -DENABLE_TESTS=0 \ - -DPERL_EXECUTABLE=${HOSTTOOLS_DIR}/perl \ - " +DEPENDS = " nasm-native" +EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=1 -DENABLE_TESTS=0 \ + -DPERL_EXECUTABLE=${HOSTTOOLS_DIR}/perl \ + " +CMAKE_VERBOSE = "VERBOSE=1" CFLAGS:append:libc-musl = " -D_GNU_SOURCE" EXTRA_OECMAKE:append:arm = " ${@bb.utils.contains("TUNE_FEATURES","neon","-DENABLE_NEON=ON","-DENABLE_NEON=OFF",d)}" + +do_generate_toolchain_file:append() { + echo "set(AOM_AS_FLAGS --debug-prefix-map ${S}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR})" >> ${WORKDIR}/toolchain.cmake +} diff --git a/meta-multimedia/recipes-multimedia/caps/caps/0001-basic.h-Use-c99-supported-stdint-types.patch b/meta-multimedia/recipes-multimedia/caps/caps/0001-basic.h-Use-c99-supported-stdint-types.patch index 1087b0e79c..528bd153dd 100644 --- a/meta-multimedia/recipes-multimedia/caps/caps/0001-basic.h-Use-c99-supported-stdint-types.patch +++ b/meta-multimedia/recipes-multimedia/caps/caps/0001-basic.h-Use-c99-supported-stdint-types.patch @@ -5,6 +5,7 @@ Subject: [PATCH] basic.h: Use c99 supported stdint types include stdint.h for getting the definitions for int types +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- basics.h | 17 +++++++++-------- diff --git a/meta-multimedia/recipes-multimedia/caps/caps/append_ldflags.patch b/meta-multimedia/recipes-multimedia/caps/caps/append_ldflags.patch index 3abd381891..6e34a8a984 100644 --- a/meta-multimedia/recipes-multimedia/caps/caps/append_ldflags.patch +++ b/meta-multimedia/recipes-multimedia/caps/caps/append_ldflags.patch @@ -1,7 +1,8 @@ Change the order of linker flags such that -shared is appearig after -pie/-fpie this helps in building the package when secuiry flags are enabled --Khem +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> Index: caps-0.9.24/Makefile =================================================================== diff --git a/meta-multimedia/recipes-multimedia/cdparanoia/files/0001-check-for-null-buffer-before-trying-a-byteswap.patch b/meta-multimedia/recipes-multimedia/cdparanoia/files/0001-check-for-null-buffer-before-trying-a-byteswap.patch index 682cf6e033..0451a453a3 100644 --- a/meta-multimedia/recipes-multimedia/cdparanoia/files/0001-check-for-null-buffer-before-trying-a-byteswap.patch +++ b/meta-multimedia/recipes-multimedia/cdparanoia/files/0001-check-for-null-buffer-before-trying-a-byteswap.patch @@ -8,6 +8,7 @@ Author: Monty <paranoia@xiph.org> Patch from debian http://sources.debian.net/src/cdparanoia/3.10.2%2Bdebian-11/debian/patches/04-endian.patch +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- interface/interface.c | 2 +- diff --git a/meta-multimedia/recipes-multimedia/cdparanoia/files/0001-utils-Use-c99-compiler-independent-types.patch b/meta-multimedia/recipes-multimedia/cdparanoia/files/0001-utils-Use-c99-compiler-independent-types.patch index 7699017f77..b364a3b2a7 100644 --- a/meta-multimedia/recipes-multimedia/cdparanoia/files/0001-utils-Use-c99-compiler-independent-types.patch +++ b/meta-multimedia/recipes-multimedia/cdparanoia/files/0001-utils-Use-c99-compiler-independent-types.patch @@ -5,6 +5,7 @@ Subject: [PATCH] utils: Use c99 compiler independent types Make it portable across different platforms +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- utils.h | 13 +++++++------ diff --git a/meta-multimedia/recipes-multimedia/cdparanoia/files/0002-Fix-printf-format-errors.patch b/meta-multimedia/recipes-multimedia/cdparanoia/files/0002-Fix-printf-format-errors.patch index 024479ca7d..ea30559384 100644 --- a/meta-multimedia/recipes-multimedia/cdparanoia/files/0002-Fix-printf-format-errors.patch +++ b/meta-multimedia/recipes-multimedia/cdparanoia/files/0002-Fix-printf-format-errors.patch @@ -5,6 +5,7 @@ Subject: [PATCH 2/2] Fix printf format errors error: format not a string literal and no format arguments +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- main.c | 4 ++-- diff --git a/meta-multimedia/recipes-multimedia/cdparanoia/files/dont-use-internal-configs.patch b/meta-multimedia/recipes-multimedia/cdparanoia/files/dont-use-internal-configs.patch index 9b268b7ed6..2738ba70e8 100644 --- a/meta-multimedia/recipes-multimedia/cdparanoia/files/dont-use-internal-configs.patch +++ b/meta-multimedia/recipes-multimedia/cdparanoia/files/dont-use-internal-configs.patch @@ -1,3 +1,8 @@ +Fix build on aarch64 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + Index: cdparanoia-III-10.2/configure.in =================================================================== --- cdparanoia-III-10.2.orig/configure.in diff --git a/meta-multimedia/recipes-multimedia/cdparanoia/files/out-of-tree-build.patch b/meta-multimedia/recipes-multimedia/cdparanoia/files/out-of-tree-build.patch index 06ee82099d..96c5dda31c 100644 --- a/meta-multimedia/recipes-multimedia/cdparanoia/files/out-of-tree-build.patch +++ b/meta-multimedia/recipes-multimedia/cdparanoia/files/out-of-tree-build.patch @@ -1,3 +1,8 @@ +Fix build out of tree builds + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + Index: cdparanoia-III-10.2/Makefile.in =================================================================== --- cdparanoia-III-10.2.orig/Makefile.in diff --git a/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.2.0.bb b/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.2.0.bb new file mode 100644 index 0000000000..5d43921b03 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.2.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "dav1d AV1 decoder" +DESCRIPTION = "Targeted to be small, portable and fast." +HOMEPAGE = "https://code.videolan.org/videolan/dav1d" +SECTION = "multimedia" +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 = "676a864a11af2c0522e1f992e770589543894686" + +S = "${WORKDIR}/git" + +DEPENDS:append:x86 = " nasm-native" +DEPENDS:append:x86-64 = " nasm-native" + +inherit meson diff --git a/meta-multimedia/recipes-multimedia/dleyna/dleyna-renderer_0.6.0.bb b/meta-multimedia/recipes-multimedia/dleyna/dleyna-renderer_0.6.0.bb index 3e43c0d2a7..e7f918333a 100644 --- a/meta-multimedia/recipes-multimedia/dleyna/dleyna-renderer_0.6.0.bb +++ b/meta-multimedia/recipes-multimedia/dleyna/dleyna-renderer_0.6.0.bb @@ -22,4 +22,4 @@ inherit autotools pkgconfig CFLAGS += " -I${S}" FILES:${PN} += "${datadir}/dbus-1" -FILES:${PN}-dev += "${libdir}/${PN}/*.so" +FILES:${PN}-dev += "${libdir}/${BPN}/*.so" diff --git a/meta-multimedia/recipes-multimedia/dleyna/dleyna-server_0.6.0.bb b/meta-multimedia/recipes-multimedia/dleyna/dleyna-server_0.6.0.bb index b25e446c41..071379758c 100644 --- a/meta-multimedia/recipes-multimedia/dleyna/dleyna-server_0.6.0.bb +++ b/meta-multimedia/recipes-multimedia/dleyna/dleyna-server_0.6.0.bb @@ -19,4 +19,4 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig FILES:${PN} += "${datadir}/dbus-1" -FILES:${PN}-dev += "${libdir}/${PN}/*.so" +FILES:${PN}-dev += "${libdir}/${BPN}/*.so" diff --git a/meta-multimedia/recipes-multimedia/dvb-apps/files/0001-Fix-generate-keynames.patch b/meta-multimedia/recipes-multimedia/dvb-apps/files/0001-Fix-generate-keynames.patch index 498607d97d..f3d14354b4 100644 --- a/meta-multimedia/recipes-multimedia/dvb-apps/files/0001-Fix-generate-keynames.patch +++ b/meta-multimedia/recipes-multimedia/dvb-apps/files/0001-Fix-generate-keynames.patch @@ -5,6 +5,7 @@ symbols. However, when cross-compiling, the include path points somewhere else. Allow the user to pass CROSS_ROOT to point to the root of the cross-compilation environment. +Upstream-Status: Inappropriate [Cross-compile specific] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> --- diff -rup dvb-apps-83c746462ccb.orig/util/av7110_loadkeys/generate-keynames.sh dvb-apps-83c746462ccb/util/av7110_loadkeys/generate-keynames.sh diff --git a/meta-multimedia/recipes-multimedia/dvb-apps/files/0001-dvbdate-Remove-Obsoleted-stime-API-calls.patch b/meta-multimedia/recipes-multimedia/dvb-apps/files/0001-dvbdate-Remove-Obsoleted-stime-API-calls.patch index e89f9a3cdc..8ff1e029b0 100644 --- a/meta-multimedia/recipes-multimedia/dvb-apps/files/0001-dvbdate-Remove-Obsoleted-stime-API-calls.patch +++ b/meta-multimedia/recipes-multimedia/dvb-apps/files/0001-dvbdate-Remove-Obsoleted-stime-API-calls.patch @@ -6,6 +6,7 @@ Subject: [PATCH] dvbdate: Remove Obsoleted stime API calls stime() has been deprecated in glibc 2.31+ its recommended to replaced with clock_settime() +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- util/dvbdate/dvbdate.c | 5 ++++- diff --git a/meta-multimedia/recipes-multimedia/dvb-apps/files/0003-handle-static-shared-only-build.patch b/meta-multimedia/recipes-multimedia/dvb-apps/files/0003-handle-static-shared-only-build.patch index 4dc7c68ac2..ce51084c97 100644 --- a/meta-multimedia/recipes-multimedia/dvb-apps/files/0003-handle-static-shared-only-build.patch +++ b/meta-multimedia/recipes-multimedia/dvb-apps/files/0003-handle-static-shared-only-build.patch @@ -6,6 +6,7 @@ Subject: [PATCH] Make.rules: Handle static/shared only build Do not build .a library when enable_static is set to "no" Do not build .so library when enable_shared is set to "no" +Upstream-Status: Pending Signed-off-by: Romain Naour <romain.naour@openwide.fr> --- Make.rules | 10 ++++++++-- diff --git a/meta-multimedia/recipes-multimedia/dvb-apps/files/0004-Makefile-remove-test.patch b/meta-multimedia/recipes-multimedia/dvb-apps/files/0004-Makefile-remove-test.patch index 45bfad914c..6ec5b08ccc 100644 --- a/meta-multimedia/recipes-multimedia/dvb-apps/files/0004-Makefile-remove-test.patch +++ b/meta-multimedia/recipes-multimedia/dvb-apps/files/0004-Makefile-remove-test.patch @@ -5,6 +5,7 @@ Subject: [PATCH] Makefile: remove test Tests needs static libraries, remove them for shared only build. +Upstream-Status: Inappropriate [Cross-compile specific] Signed-off-by: Romain Naour <romain.naour@openwide.fr> --- Makefile | 1 - diff --git a/meta-multimedia/recipes-multimedia/dvb-apps/files/0005-libucsi-optimization-removal.patch b/meta-multimedia/recipes-multimedia/dvb-apps/files/0005-libucsi-optimization-removal.patch index f12d35bc7e..dbb848c72c 100644 --- a/meta-multimedia/recipes-multimedia/dvb-apps/files/0005-libucsi-optimization-removal.patch +++ b/meta-multimedia/recipes-multimedia/dvb-apps/files/0005-libucsi-optimization-removal.patch @@ -1,3 +1,8 @@ +Use -O1 with gcc > 6 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + diff -r 3d43b280298c lib/libucsi/endianops.h --- a/lib/libucsi/endianops.h Fri Mar 21 20:26:36 2014 +0100 +++ b/lib/libucsi/endianops.h Fri Jan 19 06:56:15 2018 +0000 diff --git a/meta-multimedia/recipes-multimedia/dvb-apps/files/0006-CA_SET_PID.patch b/meta-multimedia/recipes-multimedia/dvb-apps/files/0006-CA_SET_PID.patch index e100c659e7..59abd32a01 100644 --- a/meta-multimedia/recipes-multimedia/dvb-apps/files/0006-CA_SET_PID.patch +++ b/meta-multimedia/recipes-multimedia/dvb-apps/files/0006-CA_SET_PID.patch @@ -1,3 +1,7 @@ +Fix build with newer than 4.14 kernels + +Upstream-Status: Inappropriate [OE-specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> Index: dvb-apps/util/dst-utils/dst_test.c =================================================================== --- dvb-apps.orig/util/dst-utils/dst_test.c diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth-native_git.bb b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth-native_git.bb deleted file mode 100644 index a95c4c42a8..0000000000 --- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth-native_git.bb +++ /dev/null @@ -1,10 +0,0 @@ -require ${BPN}.inc - -inherit native - -OECMAKE_SOURCEPATH = "${S}/src/gentables" - -do_install() { - install -d ${D}/${bindir} - install -m 755 ${B}/make_tables.exe ${D}/${bindir}/ -} diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc deleted file mode 100644 index a4590d61a9..0000000000 --- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "Fluidsynth is a software synthesizer" -HOMEPAGE = "http://www.fluidsynth.org/" -SECTION = "libs/multimedia" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594" - -SRC_URI = "git://github.com/FluidSynth/fluidsynth.git;branch=master;protocol=https" -SRCREV = "8b00644751578ba67b709a827cbe5133d849d339" -S = "${WORKDIR}/git" -PV = "2.2.6" - -inherit cmake pkgconfig lib_package diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth/0001-Do-not-build-gentables-helper-we-have-to-use-native-.patch b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth/0001-Do-not-build-gentables-helper-we-have-to-use-native-.patch deleted file mode 100644 index cc73bdb1d9..0000000000 --- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth/0001-Do-not-build-gentables-helper-we-have-to-use-native-.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 81ea820b155e887b13ea5986c3407cf93b2737f6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Wed, 2 Jan 2019 18:42:46 +0100 -Subject: [PATCH] Do not build gentables helper - we have to use native variant -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - src/CMakeLists.txt | 23 +---------------------- - 1 file changed, 1 insertion(+), 22 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 356bb734..58ff7635 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -399,25 +399,4 @@ else ( MACOSX_FRAMEWORK ) - install ( FILES ${public_main_HEADER} DESTINATION ${INCLUDE_INSTALL_DIR} ) - endif ( MACOSX_FRAMEWORK ) - --# ******* Auto Generated Lookup Tables ****** -- --include(ExternalProject) -- --set (GENTAB_SDIR ${CMAKE_CURRENT_SOURCE_DIR}/gentables) --set (GENTAB_BDIR ${CMAKE_CURRENT_BINARY_DIR}/gentables) -- --# Use external project to ensure that cmake uses the host compiler when building make_tables.exe --# To fix cross-compiling fluidsynth from Win32 to ARM (using vcpkg), we need to pass the current generator --# on to the external project, otherwise (for some unknown reason) the target compiler will be used rather --# than the host compiler. --ExternalProject_Add(gentables -- DOWNLOAD_COMMAND "" -- SOURCE_DIR ${GENTAB_SDIR} -- BINARY_DIR ${GENTAB_BDIR} -- CONFIGURE_COMMAND -- "${CMAKE_COMMAND}" -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE} -G "${CMAKE_GENERATOR}" -B "${GENTAB_BDIR}" "${GENTAB_SDIR}" -- BUILD_COMMAND -- "${CMAKE_COMMAND}" --build "${GENTAB_BDIR}" -- INSTALL_COMMAND ${GENTAB_BDIR}/make_tables.exe "${CMAKE_BINARY_DIR}/" --) --add_dependencies(libfluidsynth-OBJ gentables) -+ --- -2.21.1 - diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_git.bb b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_git.bb index 984f37b756..a1083af56d 100644 --- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_git.bb +++ b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_git.bb @@ -1,23 +1,40 @@ -require ${BPN}.inc +SUMMARY = "Fluidsynth is a software synthesizer" +HOMEPAGE = "http://www.fluidsynth.org/" +SECTION = "libs/multimedia" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594" -DEPENDS = "${BPN}-native alsa-lib ncurses glib-2.0" +SRC_URI = "git://github.com/FluidSynth/fluidsynth.git;branch=master;protocol=https" +SRCREV = "4d8fe638e1a48660a4c843d493f69a86579e12f0" +S = "${WORKDIR}/git" +PV = "2.3.2" + +inherit cmake pkgconfig lib_package + +DEPENDS = "glib-2.0" SRC_URI += " \ - file://0001-Do-not-build-gentables-helper-we-have-to-use-native-.patch \ file://0002-fluid_synth_nwrite_float-Allow-zero-pointer-for-left.patch \ file://0003-Use-ARM-NEON-accelaration-for-float-multithreaded-se.patch \ " EXTRA_OECMAKE = "-Denable-floats=ON -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" -do_configure:append() { - make_tables.exe ${B}/ +do_install:append() { + sed -i -e 's|${STAGING_LIBDIR}|${libdir}|g' ${D}${libdir}/pkgconfig/fluidsynth.pc + sed -i -e 's|${STAGING_LIBDIR}|${libdir}|g' ${D}${libdir}/cmake/fluidsynth/FluidSynthTargets.cmake } -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)}" -PACKAGECONFIG[sndfile] = "-Denable-libsndfile=ON,-Denable-libsndfile=OFF,libsndfile1" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio pipewire systemd alsa dbus', d)}" +PACKAGECONFIG[alsa] = "-Denable-alsa=ON,-Denable-alsa=OFF,alsa-lib" +PACKAGECONFIG[dbus] = "-Denable-dbus=ON,-Denable-dbus=OFF,dbus" PACKAGECONFIG[jack] = "-Denable-jack=ON,-Denable-jack=OFF,jack" -PACKAGECONFIG[pulseaudio] = "-Denable-pulseaudio=ON,-Denable-pulseaudio=OFF,pulseaudio" +PACKAGECONFIG[oss] = "-Denable-oss=ON,-Denable-oss=OFF" +PACKAGECONFIG[pipewire] = "-Denable-pipewire=ON,-Denable-pipewire=OFF,pipewire" PACKAGECONFIG[portaudio] = "-Denable-portaudio=ON,-Denable-portaudio=OFF,portaudio-v19" PACKAGECONFIG[profiling] = "-Denable-profiling=ON,-Denable-profiling=OFF" +PACKAGECONFIG[pulseaudio] = "-Denable-pulseaudio=ON,-Denable-pulseaudio=OFF,pulseaudio" PACKAGECONFIG[readline] = "-Denable-readline=ON,-Denable-readline=OFF,readline" +PACKAGECONFIG[sdl] = "-Denable-sdl2=ON,-Denable-sdl2=OFF,libsdl2" +PACKAGECONFIG[sndfile] = "-Denable-libsndfile=ON,-Denable-libsndfile=OFF,libsndfile1" +PACKAGECONFIG[systemd] = "-Denable-systemd=ON,-Denable-systemd=OFF,systemd" diff --git a/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-Fix-build-against-fmt-10.patch b/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-Fix-build-against-fmt-10.patch new file mode 100644 index 0000000000..2da98cfcfb --- /dev/null +++ b/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-Fix-build-against-fmt-10.patch @@ -0,0 +1,168 @@ +From 2c08724e8a7e3a0ee8cdd91246a714a17f2ba5c1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 17 May 2023 17:31:56 -0700 +Subject: [PATCH] Fix build against fmt 10+ + +Fixes +git/src/config/setup/config_setup_vector.cc:191:9: required from here +| /home/hains/openpli-dm920-python3/build/tmp/work/cortexa15hf-neon-vfpv4-oe-linux-gnueabi/gerbera/1.11.0-r0/ +recipe-sysroot/usr/include/fmt/core.h:1691:7: error: static assertion failed: Cannot format an argument. To make type T formattable provide a formatter<T> specialization: https://fmt.dev/latest/api.html#udt +| 1691 | formattable, +| | ^~~~~~~~~~~ + +Source: https://github.com/Hains/openpli-dm920-python3/commit/688ae121bd3928925a8656bd4aaf3857d8e8a8ed + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/config/setup/config_setup_array.cc | 6 +++--- + src/config/setup/config_setup_autoscan.cc | 2 +- + src/config/setup/config_setup_client.cc | 2 +- + src/config/setup/config_setup_dictionary.cc | 6 +++--- + src/config/setup/config_setup_dynamic.cc | 2 +- + src/config/setup/config_setup_transcoding.cc | 2 +- + src/config/setup/config_setup_tweak.cc | 2 +- + src/config/setup/config_setup_vector.cc | 4 ++-- + 8 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/src/config/setup/config_setup_array.cc b/src/config/setup/config_setup_array.cc +index 8f3cf1db..efc9b501 100644 +--- a/src/config/setup/config_setup_array.cc ++++ b/src/config/setup/config_setup_array.cc +@@ -136,11 +136,11 @@ std::vector<std::string> ConfigArraySetup::getXmlContent(const pugi::xml_node& o + std::vector<std::string> result; + if (initArray) { + if (!initArray(optValue, result, ConfigDefinition::mapConfigOption(nodeOption))) { +- throw_std_runtime_error("Invalid {} array value '{}'", xpath, optValue); ++ throw_std_runtime_error("Invalid {} array value '{}'", xpath, optValue.value()); + } + } else { + if (!createOptionFromNode(optValue, result)) { +- throw_std_runtime_error("Invalid {} array value '{}'", xpath, optValue); ++ throw_std_runtime_error("Invalid {} array value '{}'", xpath, optValue.value()); + } + } + if (result.empty()) { +@@ -149,7 +149,7 @@ std::vector<std::string> ConfigArraySetup::getXmlContent(const pugi::xml_node& o + result = defaultEntries; + } + if (notEmpty && result.empty()) { +- throw_std_runtime_error("Invalid array {} empty '{}'", xpath, optValue); ++ throw_std_runtime_error("Invalid array {} empty '{}'", xpath, optValue.value()); + } + return result; + } +diff --git a/src/config/setup/config_setup_autoscan.cc b/src/config/setup/config_setup_autoscan.cc +index e882ca3e..d773419b 100644 +--- a/src/config/setup/config_setup_autoscan.cc ++++ b/src/config/setup/config_setup_autoscan.cc +@@ -203,7 +203,7 @@ std::shared_ptr<ConfigOption> ConfigAutoscanSetup::newOption(const pugi::xml_nod + { + auto result = std::vector<AutoscanDirectory>(); + if (!createOptionFromNode(optValue, result)) { +- throw_std_runtime_error("Init {} autoscan failed '{}'", xpath, optValue); ++ throw_std_runtime_error("Init {} autoscan failed '{}'", xpath, optValue.value()); + } + optionValue = std::make_shared<AutoscanListOption>(result); + return optionValue; +diff --git a/src/config/setup/config_setup_client.cc b/src/config/setup/config_setup_client.cc +index 30bb98cb..56be9c53 100644 +--- a/src/config/setup/config_setup_client.cc ++++ b/src/config/setup/config_setup_client.cc +@@ -163,7 +163,7 @@ std::shared_ptr<ConfigOption> ConfigClientSetup::newOption(const pugi::xml_node& + auto result = std::make_shared<ClientConfigList>(); + + if (!createOptionFromNode(isEnabled ? optValue : pugi::xml_node(nullptr), result)) { +- throw_std_runtime_error("Init {} client config failed '{}'", xpath, optValue); ++ throw_std_runtime_error("Init {} client config failed '{}'", xpath, optValue.value()); + } + optionValue = std::make_shared<ClientConfigListOption>(result); + return optionValue; +diff --git a/src/config/setup/config_setup_dictionary.cc b/src/config/setup/config_setup_dictionary.cc +index eb91c694..ea2aaa05 100644 +--- a/src/config/setup/config_setup_dictionary.cc ++++ b/src/config/setup/config_setup_dictionary.cc +@@ -162,11 +162,11 @@ std::map<std::string, std::string> ConfigDictionarySetup::getXmlContent(const pu + std::map<std::string, std::string> result; + if (initDict) { + if (!initDict(optValue, result)) { +- throw_std_runtime_error("Init {} dictionary failed '{}'", xpath, optValue); ++ throw_std_runtime_error("Init {} dictionary failed '{}'", xpath, optValue.value()); + } + } else { + if (!createOptionFromNode(optValue, result) && required) { +- throw_std_runtime_error("Init {} dictionary failed '{}'", xpath, optValue); ++ throw_std_runtime_error("Init {} dictionary failed '{}'", xpath, optValue.value()); + } + } + if (result.empty()) { +@@ -175,7 +175,7 @@ std::map<std::string, std::string> ConfigDictionarySetup::getXmlContent(const pu + result = defaultEntries; + } + if (notEmpty && result.empty()) { +- throw_std_runtime_error("Invalid dictionary {} empty '{}'", xpath, optValue); ++ throw_std_runtime_error("Invalid dictionary {} empty '{}'", xpath, optValue.value()); + } + return result; + } +diff --git a/src/config/setup/config_setup_dynamic.cc b/src/config/setup/config_setup_dynamic.cc +index 6a43b820..93030b85 100644 +--- a/src/config/setup/config_setup_dynamic.cc ++++ b/src/config/setup/config_setup_dynamic.cc +@@ -179,7 +179,7 @@ std::shared_ptr<ConfigOption> ConfigDynamicContentSetup::newOption(const pugi::x + auto result = std::make_shared<DynamicContentList>(); + + if (!createOptionFromNode(optValue, result)) { +- throw_std_runtime_error("Init {} DynamicContentList failed '{}'", xpath, optValue); ++ throw_std_runtime_error("Init {} DynamicContentList failed '{}'", xpath, optValue.value()); + } + optionValue = std::make_shared<DynamicContentListOption>(result); + return optionValue; +diff --git a/src/config/setup/config_setup_transcoding.cc b/src/config/setup/config_setup_transcoding.cc +index 4827f109..c353ce1f 100644 +--- a/src/config/setup/config_setup_transcoding.cc ++++ b/src/config/setup/config_setup_transcoding.cc +@@ -492,7 +492,7 @@ std::shared_ptr<ConfigOption> ConfigTranscodingSetup::newOption(const pugi::xml_ + auto result = std::make_shared<TranscodingProfileList>(); + + if (!createOptionFromNode(isEnabled ? optValue : pugi::xml_node(nullptr), result)) { +- throw_std_runtime_error("Init {} transcoding failed '{}'", xpath, optValue); ++ throw_std_runtime_error("Init {} transcoding failed '{}'", xpath, optValue.value()); + } + optionValue = std::make_shared<TranscodingProfileListOption>(result); + return optionValue; +diff --git a/src/config/setup/config_setup_tweak.cc b/src/config/setup/config_setup_tweak.cc +index d7692c09..72c2beb2 100644 +--- a/src/config/setup/config_setup_tweak.cc ++++ b/src/config/setup/config_setup_tweak.cc +@@ -242,7 +242,7 @@ std::shared_ptr<ConfigOption> ConfigDirectorySetup::newOption(const pugi::xml_no + auto result = std::make_shared<DirectoryConfigList>(); + + if (!createOptionFromNode(optValue, result)) { +- throw_std_runtime_error("Init {} DirectoryConfigList failed '{}'", xpath, optValue); ++ throw_std_runtime_error("Init {} DirectoryConfigList failed '{}'", xpath, optValue.value()); + } + optionValue = std::make_shared<DirectoryTweakOption>(result); + return optionValue; +diff --git a/src/config/setup/config_setup_vector.cc b/src/config/setup/config_setup_vector.cc +index c8ff853d..91f99ca4 100644 +--- a/src/config/setup/config_setup_vector.cc ++++ b/src/config/setup/config_setup_vector.cc +@@ -180,7 +180,7 @@ std::vector<std::vector<std::pair<std::string, std::string>>> ConfigVectorSetup: + { + std::vector<std::vector<std::pair<std::string, std::string>>> result; + if (!createOptionFromNode(optValue, result) && required) { +- throw_std_runtime_error("Init {} vector failed '{}'", xpath, optValue); ++ throw_std_runtime_error("Init {} vector failed '{}'", xpath, optValue.value()); + } + if (result.empty()) { + log_debug("{} assigning {} default values", xpath, defaultEntries.size()); +@@ -188,7 +188,7 @@ std::vector<std::vector<std::pair<std::string, std::string>>> ConfigVectorSetup: + result = defaultEntries; + } + if (notEmpty && result.empty()) { +- throw_std_runtime_error("Invalid vector {} empty '{}'", xpath, optValue); ++ throw_std_runtime_error("Invalid vector {} empty '{}'", xpath, optValue.value()); + } + return result; + } diff --git a/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-Fix-build-with-fmt-9.0.patch b/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-Fix-build-with-fmt-9.0.patch index 9de0e4f28e..bb8e438304 100644 --- a/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-Fix-build-with-fmt-9.0.patch +++ b/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-Fix-build-with-fmt-9.0.patch @@ -4,6 +4,8 @@ Date: Fri, 19 Aug 2022 15:22:10 +0300 Subject: [PATCH] Fix build with fmt 9.0 Fixes #2681 +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> --- src/database/sql_format.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.11.0.bb b/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.11.0.bb index 9f2f1b093e..2a6d328711 100644 --- a/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.11.0.bb +++ b/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.11.0.bb @@ -5,7 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=25cdec9afe3f1f26212ead6bd2f7fac8" SRC_URI = "git://github.com/gerbera/gerbera.git;protocol=https;branch=master \ file://0001-Fix-build-with-fmt-9.0.patch \ - " + file://0001-Fix-build-against-fmt-10.patch \ + " SRCREV = "d73d8c1346213d784753c02ea771970500e0df2a" diff --git a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch index c1c88999a5..64fd578a96 100644 --- a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch +++ b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch @@ -3,6 +3,8 @@ From: Carlos <carlos.rodriguez@ridgerun.com> Date: Fri, 15 Dec 2017 10:14:05 -0600 Subject: [PATCH] gstd:yocto compatibility +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> --- gstd/Makefile.am | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/libavif/libavif_0.11.1.bb b/meta-multimedia/recipes-multimedia/libavif/libavif_0.11.1.bb new file mode 100644 index 0000000000..f01024e8aa --- /dev/null +++ b/meta-multimedia/recipes-multimedia/libavif/libavif_0.11.1.bb @@ -0,0 +1,16 @@ +SUMMARY = "This library aims to be a friendly, portable C implementation of the AV1 Image File Format" +HOMEPAGE = "https://github.com/AOMediaCodec/libavif" +SECTION = "libs" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c528b75b07425b5c1d2e34de98c397b5" + +SRC_URI = "git://github.com/AOMediaCodec/libavif.git;protocol=https;branch=main" + +S = "${WORKDIR}/git" +SRCREV = "6ab53189045e7a6fe0bd93d14977b2a4f8efa5e9" + +DEPENDS = "dav1d" + +inherit cmake + +EXTRA_OECMAKE += "-DAVIF_CODEC_DAV1D=ON" diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-file_sink.cpp-Avoid-dangling-reference.patch b/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-file_sink.cpp-Avoid-dangling-reference.patch deleted file mode 100644 index 5aa6ee8d3c..0000000000 --- a/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-file_sink.cpp-Avoid-dangling-reference.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0e97896e6a09957f27125957d00b5150ec90b2e9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 24 Jan 2023 01:18:25 -0800 -Subject: [PATCH] file_sink.cpp: Avoid dangling-reference - -Fixes following errors with gcc-13 - -../git/src/cam/file_sink.cpp:92:45: error: possibly dangling reference to a temporary [-Werror=dangling-reference] - 92 | const FrameMetadata::Plane &meta = buffer->metadata().planes()[i]; - | ^~~~ -../git/src/cam/file_sink.cpp:92:81: note: the temporary was destroyed at the end of the full expression '(& buffer->libcamera::FrameBuffer::metadata())->libcamera::FrameMetadata::planes().libcamera::Span<const libcamera::FrameMetadata::Plane>::operator[](i)' - 92 | const FrameMetadata::Plane &meta = buffer->metadata().planes()[i]; - | ^ -cc1plus: all warnings being treated as errors - -Upstream-Status: Submitted [https://lists.libcamera.org/pipermail/libcamera-devel/2023-January/036575.html] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/cam/file_sink.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/cam/file_sink.cpp b/src/cam/file_sink.cpp -index 45213d4a..897c4b37 100644 ---- a/src/cam/file_sink.cpp -+++ b/src/cam/file_sink.cpp -@@ -89,13 +89,13 @@ void FileSink::writeBuffer(const Stream *stream, FrameBuffer *buffer) - Image *image = mappedBuffers_[buffer].get(); - - for (unsigned int i = 0; i < buffer->planes().size(); ++i) { -- const FrameMetadata::Plane &meta = buffer->metadata().planes()[i]; -+ unsigned int bytesused = buffer->metadata().planes()[i].bytesused; - - Span<uint8_t> data = image->data(i); -- unsigned int length = std::min<unsigned int>(meta.bytesused, data.size()); -+ unsigned int length = std::min<unsigned int>(bytesused, data.size()); - -- if (meta.bytesused > data.size()) -- std::cerr << "payload size " << meta.bytesused -+ if (bytesused > data.size()) -+ std::cerr << "payload size " << bytesused - << " larger than plane size " << data.size() - << std::endl; - --- -2.39.1 - diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.0.1.bb b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb index 46f058f2ea..e770200e28 100644 --- a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.0.1.bb +++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb @@ -10,10 +10,9 @@ LIC_FILES_CHKSUM = "\ SRC_URI = " \ git://git.libcamera.org/libcamera/libcamera.git;protocol=https;branch=master \ - file://0001-file_sink.cpp-Avoid-dangling-reference.patch \ " -SRCREV = "a83aed77df1258e469c0eb42d9cb4f1938db53f2" +SRCREV = "9e3a83c03bab65b745eea2482be78077b409a2b5" PE = "1" @@ -27,9 +26,10 @@ PACKAGES =+ "${PN}-gst" PACKAGECONFIG ??= "" PACKAGECONFIG[gst] = "-Dgstreamer=enabled,-Dgstreamer=disabled,gstreamer1.0 gstreamer1.0-plugins-base" +LIBCAMERA_PIPELINES ??= "auto" + EXTRA_OEMESON = " \ - -Dpipelines=uvcvideo,simple,vimc \ - -Dipas=vimc \ + -Dpipelines=${LIBCAMERA_PIPELINES} \ -Dv4l2=true \ -Dcam=enabled \ -Dlc-compliance=disabled \ @@ -47,7 +47,7 @@ do_configure:prepend() { do_install:append() { chrpath -d ${D}${libdir}/libcamera.so - chrpath -d ${D}${libdir}/v4l2-compat.so + chrpath -d ${D}${libexecdir}/libcamera/v4l2-compat.so } addtask do_recalculate_ipa_signatures_package after do_package before do_packagedata @@ -63,7 +63,7 @@ do_recalculate_ipa_signatures_package() { ${S}/src/ipa/ipa-sign-install.sh ${B}/src/ipa-priv-key.pem "${modules}" } -FILES:${PN} += " ${libdir}/v4l2-compat.so" +FILES:${PN} += " ${libexecdir}/libcamera/v4l2-compat.so" FILES:${PN}-gst = "${libdir}/gstreamer-1.0" # libcamera-v4l2 explicitly sets _FILE_OFFSET_BITS=32 to get access to diff --git a/meta-multimedia/recipes-multimedia/libdc1394/files/install_examples.patch b/meta-multimedia/recipes-multimedia/libdc1394/files/install_examples.patch index df0c2355d0..51761eb8c9 100755 --- a/meta-multimedia/recipes-multimedia/libdc1394/files/install_examples.patch +++ b/meta-multimedia/recipes-multimedia/libdc1394/files/install_examples.patch @@ -1,3 +1,8 @@ +Install all examples + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + Index: libdc1394/examples/Makefile.am =================================================================== --- libdc1394.orig/examples/Makefile.am diff --git a/meta-multimedia/recipes-multimedia/libsquish/libsquish/0001-makefile-Add-LIBDIR.patch b/meta-multimedia/recipes-multimedia/libsquish/libsquish/0001-makefile-Add-LIBDIR.patch deleted file mode 100644 index c6eb7ac576..0000000000 --- a/meta-multimedia/recipes-multimedia/libsquish/libsquish/0001-makefile-Add-LIBDIR.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4fd08c0446ca02917014b63f9080c4205958a130 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 20 Mar 2022 01:15:32 -0700 -Subject: [PATCH] makefile: Add LIBDIR - -Avoid hardcoding /lib - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - Makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index 1c01f89..2b1df5b 100644 ---- a/Makefile -+++ b/Makefile -@@ -11,12 +11,12 @@ all : $(LIB) squish.pc - - install : $(LIB) squish.pc - install squish.h $(INSTALL_DIR)/include -- install libsquish.a $(INSTALL_DIR)/lib -- install squish.pc $(INSTALL_DIR)/lib/pkgconfig -+ install libsquish.a $(INSTALL_DIR)/$(LIBDIR) -+ install squish.pc $(INSTALL_DIR)/$(LIBDIR)/pkgconfig - - uninstall: - $(RM) $(INSTALL_DIR)/include/squish.h -- $(RM) $(INSTALL_DIR)/lib/libsquish.a -+ $(RM) $(INSTALL_DIR)/$(LIBDIR)/libsquish.a - - $(LIB) : $(OBJ) - $(AR) cr $@ $? --- -2.35.1 - diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-SndfileDecoderPlugin-Fix-type-mismatch-for-std-span.patch b/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-SndfileDecoderPlugin-Fix-type-mismatch-for-std-span.patch new file mode 100644 index 0000000000..37aa448e95 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-SndfileDecoderPlugin-Fix-type-mismatch-for-std-span.patch @@ -0,0 +1,28 @@ +From f2fbfeeb9c4ff7aa9ba4b95604ee0fb14ecec763 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 17 May 2023 17:54:09 -0700 +Subject: [PATCH] SndfileDecoderPlugin: Fix type mismatch for std::span + +Fixes +../git/src/decoder/plugins/SndfileDecoderPlugin.cxx:231:25: error: non-constant-expression cannot be narrowed from type 'sf_count_t' (aka 'long long') to 'size_type' (aka 'unsigned int') in initializer list [-Wc++11-narrowing] + std::span{buffer, num_frames * frame_size}, + ^~~~~~~~~~~~~~~~~~~~~~~ +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/decoder/plugins/SndfileDecoderPlugin.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/decoder/plugins/SndfileDecoderPlugin.cxx b/src/decoder/plugins/SndfileDecoderPlugin.cxx +index ad3908847..a3cb87ca9 100644 +--- a/src/decoder/plugins/SndfileDecoderPlugin.cxx ++++ b/src/decoder/plugins/SndfileDecoderPlugin.cxx +@@ -228,7 +228,7 @@ sndfile_stream_decode(DecoderClient &client, InputStream &is) + break; + + cmd = client.SubmitAudio(is, +- std::span{buffer, num_frames * frame_size}, ++ std::span{buffer, static_cast<std::size_t>(num_frames * frame_size)}, + 0); + if (cmd == DecoderCommand::SEEK) { + sf_count_t c = client.GetSeekFrame(); diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd/fix-build-error-when-fmt-updated.patch b/meta-multimedia/recipes-multimedia/musicpd/mpd/fix-build-error-when-fmt-updated.patch new file mode 100644 index 0000000000..ebbea2b358 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/musicpd/mpd/fix-build-error-when-fmt-updated.patch @@ -0,0 +1,71 @@ +Upstream-Status: Backport [https://github.com/MusicPlayerDaemon/MPD/commit/181b96dd2d71bc8f2668776719d344466f258b5d] + +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> + +From 181b96dd2d71bc8f2668776719d344466f258b5d Mon Sep 17 00:00:00 2001 +From: Max Kellermann <max.kellermann@gmail.com> +Date: Mon, 15 May 2023 20:52:21 +0200 +Subject: [PATCH] command/player, SongPrint: use AudioFormatFormatter() + +libfmt version 10 apparently doesn't know how to format a +`StringBuffer`, failing the MPD build. Since we have a formatter +specialization for `AudioFormat`, let's use that - it's better and +easier to use. + +Closes https://github.com/MusicPlayerDaemon/MPD/issues/1807 +--- + src/SongPrint.cxx | 5 +++-- + src/command/PlayerCommands.cxx | 3 ++- + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/SongPrint.cxx b/src/SongPrint.cxx +index 98d544cc38..835669d276 100644 +--- a/src/SongPrint.cxx ++++ b/src/SongPrint.cxx +@@ -8,6 +8,7 @@ + #include "TagPrint.hxx" + #include "client/Response.hxx" + #include "fs/Traits.hxx" ++#include "lib/fmt/AudioFormatFormatter.hxx" + #include "time/ChronoUtil.hxx" + #include "util/StringBuffer.hxx" + #include "util/UriUtil.hxx" +@@ -77,7 +78,7 @@ song_print_info(Response &r, const LightSong &song, bool base) noexcept + time_print(r, "Last-Modified", song.mtime); + + if (song.audio_format.IsDefined()) +- r.Fmt(FMT_STRING("Format: {}\n"), ToString(song.audio_format)); ++ r.Fmt(FMT_STRING("Format: {}\n"), song.audio_format); + + tag_print_values(r, song.tag); + +@@ -100,7 +101,7 @@ song_print_info(Response &r, const DetachedSong &song, bool base) noexcept + time_print(r, "Last-Modified", song.GetLastModified()); + + if (const auto &f = song.GetAudioFormat(); f.IsDefined()) +- r.Fmt(FMT_STRING("Format: {}\n"), ToString(f)); ++ r.Fmt(FMT_STRING("Format: {}\n"), f); + + tag_print_values(r, song.GetTag()); + +diff --git a/src/command/PlayerCommands.cxx b/src/command/PlayerCommands.cxx +index 5108b9d3c4..0b5a917020 100644 +--- a/src/command/PlayerCommands.cxx ++++ b/src/command/PlayerCommands.cxx +@@ -13,6 +13,7 @@ + #include "Partition.hxx" + #include "Instance.hxx" + #include "IdleFlags.hxx" ++#include "lib/fmt/AudioFormatFormatter.hxx" + #include "util/StringBuffer.hxx" + #include "util/ScopeExit.hxx" + #include "util/Exception.hxx" +@@ -170,7 +171,7 @@ handle_status(Client &client, [[maybe_unused]] Request args, Response &r) + + if (player_status.audio_format.IsDefined()) + r.Fmt(FMT_STRING(COMMAND_STATUS_AUDIO ": {}\n"), +- ToString(player_status.audio_format)); ++ player_status.audio_format); + } + + #ifdef ENABLE_DATABASE diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd/minor-fixup-for-libfmt10.patch b/meta-multimedia/recipes-multimedia/musicpd/mpd/minor-fixup-for-libfmt10.patch new file mode 100644 index 0000000000..0c9d979107 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/musicpd/mpd/minor-fixup-for-libfmt10.patch @@ -0,0 +1,27 @@ +Upstream-Status: Backport +[https://github.com/MusicPlayerDaemon/MPD/commit/f869593ac8913e52c711e974257bd6dc0d5dbf26] + +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> + +From f869593ac8913e52c711e974257bd6dc0d5dbf26 Mon Sep 17 00:00:00 2001 +From: Max Kellermann <max.kellermann@gmail.com> +Date: Mon, 15 May 2023 20:59:58 +0200 +Subject: [PATCH] TimePrint: minor fixup for libfmt 10 + +libfmt version 10 has difficulties formatting a `StringBuffer`, and we +need to help it by explicitly invoking the `c_str()` method. +--- + src/TimePrint.cxx | 2 +- + 1 files changed, 1 insertions(+), 1 deletion(-) + +diff --git a/src/TimePrint.cxx b/src/TimePrint.cxx +index 5bf05f6238..d47f3178bb 100644 +--- a/src/TimePrint.cxx ++++ b/src/TimePrint.cxx +@@ -20,5 +20,5 @@ time_print(Response &r, const char *name, + return; + } + +- r.Fmt(FMT_STRING("{}: {}\n"), name, s); ++ r.Fmt(FMT_STRING("{}: {}\n"), name, s.c_str()); + } diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.12.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.12.bb index 13938444c8..0c309ded00 100644 --- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.12.bb +++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.12.bb @@ -18,10 +18,13 @@ DEPENDS += " \ fmt \ " -SRC_URI = "git://github.com/MusicPlayerDaemon/MPD;branch=v0.23.x;protocol=https \ +SRC_URI = "git://github.com/MusicPlayerDaemon/MPD;branch=master;protocol=https \ file://mpd.conf.in \ + file://minor-fixup-for-libfmt10.patch \ + file://fix-build-error-when-fmt-updated.patch \ + file://0001-SndfileDecoderPlugin-Fix-type-mismatch-for-std-span.patch \ " -SRCREV = "d91da9679801224847c30147f5914785b6f8f240" +SRCREV = "b1422fbda40a1831d397fb161e7a555443c2a072" 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)}" diff --git a/meta-multimedia/recipes-multimedia/nv-codec-headers/nv-codec-headers/0001-Makefile-add-clean-target.patch b/meta-multimedia/recipes-multimedia/nv-codec-headers/nv-codec-headers/0001-Makefile-add-clean-target.patch new file mode 100644 index 0000000000..ac9e70a718 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/nv-codec-headers/nv-codec-headers/0001-Makefile-add-clean-target.patch @@ -0,0 +1,27 @@ +From 3b74181d626f7dedb47377450ca7c43457a66cda Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_L_K@t-online.de> +Date: Sat, 1 Apr 2023 04:42:32 +0200 +Subject: [PATCH] Makefile: add clean target + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index a51c2c9..fbe2aec 100644 +--- a/Makefile ++++ b/Makefile +@@ -19,5 +19,7 @@ install: all + uninstall: + rm -rf '$(DESTDIR)$(PREFIX)/include/ffnvcodec' '$(DESTDIR)$(PREFIX)/$(LIBDIR)/pkgconfig/ffnvcodec.pc' + +-.PHONY: all install uninstall ++clean: uninstall ++ ++.PHONY: all clean install uninstall + +-- +2.34.1 + diff --git a/meta-multimedia/recipes-multimedia/nv-codec-headers/nv-codec-headers_11.1.5.2.bb b/meta-multimedia/recipes-multimedia/nv-codec-headers/nv-codec-headers_11.1.5.2.bb deleted file mode 100644 index c1d8073353..0000000000 --- a/meta-multimedia/recipes-multimedia/nv-codec-headers/nv-codec-headers_11.1.5.2.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "FFmpeg nvidia headers" -HOMEPAGE = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${S}/include/ffnvcodec/dynlink_cuda.h;beginline=1;endline=26;md5=bb54a418154445b0aa99e15f640eacf4" - -SRC_URI = "git://git.videolan.org/git/ffmpeg/nv-codec-headers.git;branch=master;protocol=https" -SRCREV = "f8ae7a49bfef2f99d2c931a791dc3863fda67bf3" -S = "${WORKDIR}/git" - -do_install() { - install -d ${D}${includedir}/ffnvcodec ${D}${libdir}/pkgconfig - for file in include/ffnvcodec/*.h; do - install -m 644 "$file" ${D}${includedir}/ffnvcodec - done - install -m 644 ffnvcodec.pc.in ${D}${libdir}/pkgconfig/ffnvcodec.pc - sed -i "s|@@PREFIX@@|${prefix}|" ${D}${libdir}/pkgconfig/ffnvcodec.pc -} diff --git a/meta-multimedia/recipes-multimedia/nv-codec-headers/nv-codec-headers_12.0.16.0.bb b/meta-multimedia/recipes-multimedia/nv-codec-headers/nv-codec-headers_12.0.16.0.bb new file mode 100644 index 0000000000..4bff4f24b7 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/nv-codec-headers/nv-codec-headers_12.0.16.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "FFmpeg nvidia headers" +HOMEPAGE = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${S}/include/ffnvcodec/dynlink_cuda.h;beginline=1;endline=26;md5=bb54a418154445b0aa99e15f640eacf4" + +SRC_URI = " \ + git://git.videolan.org/git/ffmpeg/nv-codec-headers.git;branch=master;protocol=https \ + file://0001-Makefile-add-clean-target.patch \ +" +SRCREV = "c5e4af74850a616c42d39ed45b9b8568b71bf8bf" +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = "PREFIX=${prefix} DESTDIR=${D} LIBDIR=${baselib}" + +do_install() { + oe_runmake install +} diff --git a/meta-multimedia/recipes-multimedia/openh264/openh264_2.1.1.bb b/meta-multimedia/recipes-multimedia/openh264/openh264_2.3.1.bb index aababb6684..3fa87d05f5 100644 --- a/meta-multimedia/recipes-multimedia/openh264/openh264_2.1.1.bb +++ b/meta-multimedia/recipes-multimedia/openh264/openh264_2.3.1.bb @@ -1,3 +1,4 @@ +SUMMARY = "Open Source H.264 Codec" DESCRIPTION = "OpenH264 is a codec library which supports H.264 encoding and \ decoding. It is suitable for use in real time applications such as WebRTC." HOMEPAGE = "http://www.openh264.org/" @@ -11,8 +12,8 @@ LICENSE_FLAGS = "commercial" LIC_FILES_CHKSUM = "file://LICENSE;md5=bb6d3771da6a07d33fd50d4d9aa73bcf" S = "${WORKDIR}/git" -SRCREV = "50a1fcf70fafe962c526749991cb4646406933ba" -BRANCH = "openh264v2.1.1" +SRCREV = "0a48f4d2e9be2abb4fb01b4c3be83cf44ce91a6e" +BRANCH = "openh264v${PV}" SRC_URI = "git://github.com/cisco/openh264.git;protocol=https;branch=${BRANCH} \ file://0001-Makefile-Use-cp-options-to-preserve-file-mode.patch \ " diff --git a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb index 2b7a43b93d..c520653761 100644 --- a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb +++ b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb @@ -25,67 +25,45 @@ RDEPENDS:packagegroup-meta-multimedia = "\ bluealsa \ caps \ cdparanoia \ - dcadec \ dleyna-connector-dbus \ - dleyna-core \ dleyna-renderer \ dleyna-server \ dvb-apps \ - ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "faac fdk-aac mpd", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "faac mpd", "", d)} \ gerbera \ - libao \ libavc1394 \ - libdc1394 \ - libdvbpsi \ - libdvdnav \ libiec61883 \ - fluidsynth \ libmusicbrainz \ - libmpdclient \ mpc \ ncmpc \ - libmpd \ - ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "opencore-amr vo-aacenc vo-amrwbenc", "", d)} \ - gst-shark \ + ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "opencore-amr", "", d)} \ gstd \ rtmpdump \ bigbuckbunny-1080p \ bigbuckbunny-480p \ bigbuckbunny-720p \ tearsofsteel-1080p \ - schroedinger \ pipewire \ ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "projucer", "", d)} \ libcamera \ - ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "libde265 openh264", "", d)} \ vorbis-tools \ - libdvbcsa \ libopenmpt \ - libuvc \ mimic \ ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "minidlna", "", d)} \ - mycroft \ + ${@bb.utils.contains("DISTRO_FEATURES", "pulseaudio", "mycroft", "", d)} \ openal-soft \ opusfile \ opus-tools \ - libdvdcss \ ${@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 \ - tremor \ - webrtc-audio-processing \ ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 i686 x86-64", "x265", "", d), "", d)} \ " RDEPENDS:packagegroup-meta-multimedia:remove:libc-musl = "projucer" -RDEPENDS:packagegroup-meta-multimedia:remove:powerpc64le = "openh264" RDEPENDS:packagegroup-meta-multimedia-connectivity = "\ - gssdp \ - gupnp-av \ gupnp-dlna \ - gupnp-igd \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gupnp-tools", "", d)} \ - gupnp \ libupnp \ ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "rygel", "", d)} \ " @@ -94,17 +72,9 @@ RDEPENDS:packagegroup-meta-multimedia-dvb = "\ tvheadend \ " -RDEPENDS:packagegroup-meta-multimedia-mkv = "\ - libebml \ - libmatroska \ -" - RDEPENDS:packagegroup-meta-multimedia-support = "\ crossguid \ - ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "libmediaart-2.0", "", d)} \ gst-instruments \ - libsrtp \ - srt \ " # devel headers/libraries only packages # libsquish diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire-media-session_0.4.1.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire-media-session_0.4.2.bb index da8d1d7ad6..8ae0624135 100644 --- a/meta-multimedia/recipes-multimedia/pipewire/pipewire-media-session_0.4.1.bb +++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire-media-session_0.4.2.bb @@ -13,7 +13,7 @@ DEPENDS = " \ SRC_URI = "git://gitlab.freedesktop.org/pipewire/media-session.git;protocol=https;branch=master" S = "${WORKDIR}/git" -SRCREV = "e5d5cf2404786af8bcc40bdb8a2962bef4ec18b6" +SRCREV = "80dae7e24bec02b2befe09a72fbac6e2b38ccb5c" inherit meson pkgconfig # https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2952 diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.64.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.75.bb index 91945ca7d2..72533310cb 100644 --- a/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.64.bb +++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.75.bb @@ -13,12 +13,12 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "dbus ncurses" -SRCREV = "bba452695eb673461c5cf626eec57728991eadf7" +SRCREV = "a3bd0f7a0a8dec9045deeb5eb3eb92b09ff75d57" SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=master;protocol=https" S = "${WORKDIR}/git" -inherit gsettings meson pkgconfig systemd gettext useradd +inherit meson pkgconfig systemd gettext useradd USERADD_PACKAGES = "${PN}" @@ -48,7 +48,7 @@ SYSTEMD_PACKAGES = "${PN}" # it just prevents this subproject feature. # # AptX and LDAC are not available in OE. Currently, neither -# are lv2 and ROC. +# are lv2, ROC, and libmysofa. # # The RTKit module is deprecated in favor of the newer RT module. # It still exists for legacy setups that still include it in @@ -66,6 +66,7 @@ EXTRA_OEMESON += " \ -Dbluez5-codec-aptx=disabled \ -Dbluez5-codec-ldac=disabled \ -Dlegacy-rtkit=false \ + -Dlibmysofa=disabled \ " # spa alsa plugin code uses typedef redefinition, which is officially a C11 feature. @@ -85,10 +86,9 @@ PACKAGECONFIG:class-target ??= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez bluez-opus ${BLUETOOTH_AAC}', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-system-service systemd-user-service', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio gtk', 'gsettings', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'alsa vulkan pulseaudio', d)} \ ${PIPEWIRE_SESSION_MANAGER} \ - ${FFMPEG_AVAILABLE} avahi flatpak gstreamer gsettings jack libusb pw-cat raop sndfile v4l2 udev volume webrtc-echo-cancelling libcamera \ + ${FFMPEG_AVAILABLE} avahi flatpak gstreamer gsettings jack libusb pw-cat raop sndfile v4l2 udev volume webrtc-echo-cancelling libcamera readline \ " # "jack" and "pipewire-jack" packageconfigs cannot be both enabled, @@ -101,6 +101,10 @@ PACKAGECONFIG[avahi] = "-Davahi=enabled,-Davahi=disabled,avahi" PACKAGECONFIG[bluez] = "-Dbluez5=enabled,-Dbluez5=disabled,bluez5 sbc" PACKAGECONFIG[bluez-aac] = "-Dbluez5-codec-aac=enabled,-Dbluez5-codec-aac=disabled,fdk-aac" PACKAGECONFIG[bluez-opus] = "-Dbluez5-codec-opus=enabled,-Dbluez5-codec-opus=disabled,libopus" +# From the pipewire git log: +# "Some Linux phones doesn't use oFono but ModemManager to control the modem." +# This packageconfig enables modemmanager specific code in the BlueZ backend. +PACKAGECONFIG[bluez-backend-native-mm] = "-Dbluez5-backend-native-mm=enabled,-Dbluez5-backend-native-mm=disabled,modemmanager" PACKAGECONFIG[docs] = "-Ddocs=enabled,-Ddocs=disabled,doxygen-native graphviz-native" PACKAGECONFIG[ffmpeg] = "-Dffmpeg=enabled,-Dffmpeg=disabled,ffmpeg" PACKAGECONFIG[flatpak] = "-Dflatpak=enabled,-Dflatpak=disabled,glib-2.0" @@ -116,6 +120,9 @@ PACKAGECONFIG[pipewire-alsa] = "-Dpipewire-alsa=enabled,-Dpipewire-alsa=disabled PACKAGECONFIG[pipewire-jack] = "-Dpipewire-jack=enabled -Dlibjack-path=${libdir}/${PW_MODULE_SUBDIR}/jack,-Dpipewire-jack=disabled,jack,,pipewire-jack,jack" PACKAGECONFIG[pw-cat] = "-Dpw-cat=enabled,-Dpw-cat=disabled" PACKAGECONFIG[raop] = "-Draop=enabled,-Draop=disabled,openssl" +# Starting with version 0.3.60, readline usage can be turned off in pw-cli. +# If it is disabled, getline() is used as a fallback. +PACKAGECONFIG[readline] = "-Dreadline=enabled,-Dreadline=disabled,readline" PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,libsdl2" PACKAGECONFIG[sndfile] = "-Dsndfile=enabled,-Dsndfile=disabled,libsndfile1" PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd" @@ -168,6 +175,9 @@ python set_dynamic_metapkg_rdepends () { import os import oe.utils + if bb.data.inherits_class('nativesdk', d) or bb.data.inherits_class('native', d): + return + # Go through all generated SPA plugin and PipeWire module packages # (excluding the main package and the -meta package itself) and # add them to the -meta package as RDEPENDS. @@ -239,10 +249,12 @@ PACKAGES =+ "\ ${PN}-modules-meta \ ${PN}-alsa-card-profile \ ${PN}-v4l2 \ + ${PN}-aes67 \ gstreamer1.0-pipewire \ " PACKAGES_DYNAMIC = "^${PN}-spa-plugins.* ^${PN}-modules.*" +PACKAGES_DYNAMIC:class-native = "" SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd-system-service', 'pipewire.service', '', d)}" CONFFILES:${PN} += "${datadir}/pipewire/pipewire.conf" @@ -279,9 +291,11 @@ RDEPENDS:libpipewire += " \ FILES:${PN}-tools = " \ ${bindir}/pw-cat \ ${bindir}/pw-cli \ + ${bindir}/pw-config \ ${bindir}/pw-dot \ ${bindir}/pw-dsdplay \ ${bindir}/pw-dump \ + ${bindir}/pw-encplay \ ${bindir}/pw-link \ ${bindir}/pw-loopback \ ${bindir}/pw-metadata \ @@ -343,6 +357,7 @@ RRECOMMENDS:${PN}-modules += "${PN}-modules-meta" CONFFILES:${PN}-modules-rt = "${datadir}/pipewire/client-rt.conf" FILES:${PN}-modules-rt += " \ ${datadir}/pipewire/client-rt.conf \ + ${sysconfdir}/security/limits.d/* \ " CONFFILES:${PN}-modules-filter-chain = "${datadir}/pipewire/filter-chain/*" @@ -361,6 +376,11 @@ FILES:${PN}-v4l2 += " \ ${libdir}/${PW_MODULE_SUBDIR}/v4l2/libpw-v4l2.so \ " +# AES67 is a standard for audio over IP, from the Audio Engineering Society (AES). +FILES:${PN}-aes67 += " \ + ${bindir}/pipewire-aes67 \ +" + FILES:gstreamer1.0-pipewire = " \ ${libdir}/gstreamer-1.0/* \ " diff --git a/meta-multimedia/recipes-multimedia/schroedinger/schroedinger/0001-testsuite-Add-tmp-orc.c-for-missing-_orc_code_orc_de.patch b/meta-multimedia/recipes-multimedia/schroedinger/schroedinger/0001-testsuite-Add-tmp-orc.c-for-missing-_orc_code_orc_de.patch new file mode 100644 index 0000000000..498630c638 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/schroedinger/schroedinger/0001-testsuite-Add-tmp-orc.c-for-missing-_orc_code_orc_de.patch @@ -0,0 +1,43 @@ +From 7c998657c1787fcad8f0a502063adff71d78a140 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 12 Jun 2023 09:37:10 -0700 +Subject: [PATCH] testsuite: Add tmp-orc.c for missing + _orc_code_orc_deinterleave2_s16 + +Fixes +| aarch64-yoe-linux-ld.lld: error: undefined symbol: _orc_code_orc_deinterleave2_s16 +| >>> referenced by schroorc.h:1312 (../schroedinger/schroorc.h:1312) +| >>> wavelet_max_gain.o:(iwt_ref) +| >>> referenced by schroorc.h:1312 (../schroedinger/schroorc.h:1312) +| >>> wavelet_max_gain.o:(iwt_ref) +| +| aarch64-yoe-linux-ld.lld: error: undefined symbol: _orc_code_orc_interleave2_s16 +| >>> referenced by wavelet_max_gain.c:281 (/usr/src/debug/schroedinger/1.0.11-r0/testsuite/wavelet_max_gain.c:281) +| >>> wavelet_max_gain.o:(iiwt_ref) +| >>> referenced by wavelet_max_gain.c:281 (/usr/src/debug/schroedinger/1.0.11-r0/testsuite/wavelet_max_gain.c:281) +| >>> wavelet_max_gain.o:(iiwt_ref) +| clang-16: error: linker command failed with exit code 1 (use -v to see invocation) +| make[3]: *** [Makefile:1147: wavelet_max_gain] Error 1 + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + testsuite/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am +index 6ee1130..762ecf2 100644 +--- a/testsuite/Makefile.am ++++ b/testsuite/Makefile.am +@@ -100,6 +100,7 @@ wavelet_2d_SOURCES = wavelet_2d.c + nodist_wavelet_2d_SOURCES = $(top_srcdir)/schroedinger/tmp-orc.c + + wavelet_max_gain_SOURCES = wavelet_max_gain.c ++nodist_wavelet_max_gain_SOURCES = $(top_srcdir)/schroedinger/tmp-orc.c + + wavelet_noise_2d_SOURCES = wavelet_noise_2d.c + +-- +2.41.0 + diff --git a/meta-multimedia/recipes-multimedia/schroedinger/schroedinger_1.0.11.bb b/meta-multimedia/recipes-multimedia/schroedinger/schroedinger_1.0.11.bb index c9d98a2da1..c78e008007 100644 --- a/meta-multimedia/recipes-multimedia/schroedinger/schroedinger_1.0.11.bb +++ b/meta-multimedia/recipes-multimedia/schroedinger/schroedinger_1.0.11.bb @@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d91a46405fc074b88c963cc4f2a0aae9 \ DEPENDS = "orc-native orc" SRC_URI = "https://download.videolan.org/contrib/${BPN}/${BP}.tar.gz \ + file://0001-testsuite-Add-tmp-orc.c-for-missing-_orc_code_orc_de.patch \ file://configure.ac.patch" SRC_URI[md5sum] = "da6af08e564ca1157348fb8d92efc891" diff --git a/meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch b/meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch index 4f02a66fcc..3085bd495c 100644 --- a/meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch +++ b/meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch @@ -1,11 +1,11 @@ From d0313be5fb947df399a4db24a5f9244510d2ce87 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 12 Jul 2017 16:36:06 -0700 -Subject: [PATCH] remove the #error line and live without file-type detection - with pipes +Subject: [PATCH] remove the #error line and live without file-type detection with pipes this fallback is executed with musl +Upstream-Status: Inappropriate [musl specific] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- src/formats.c | 1 - diff --git a/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb b/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb index ace8743f3a..011cbc2a9d 100644 --- a/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb +++ b/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb @@ -4,7 +4,7 @@ and can apply different effects and filters to the audio data." HOMEPAGE = "http://sox.sourceforge.net" SECTION = "audio" -DEPENDS = "libpng ffmpeg libsndfile1 libtool" +DEPENDS = "libpng libsndfile1 libtool" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio', d)} \ magic \ diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0001-include-limits-header.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0001-include-limits-header.patch deleted file mode 100644 index e1383c826c..0000000000 --- a/meta-multimedia/recipes-multimedia/vlc/vlc/0001-include-limits-header.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 1068c7451855c3f9acde9af265b5a790073b1641 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 2 Mar 2021 14:28:27 -0800 -Subject: [PATCH] include <limits> header - -Fixes -SegmentInformation.cpp:397:49: error: '::max' has not been declared; d -id you mean 'std::max'? - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - modules/demux/adaptive/playlist/SegmentInformation.cpp | 1 + - modules/demux/hls/playlist/Parser.cpp | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/modules/demux/adaptive/playlist/SegmentInformation.cpp b/modules/demux/adaptive/playlist/SegmentInformation.cpp -index 344e155..8eeb054 100644 ---- a/modules/demux/adaptive/playlist/SegmentInformation.cpp -+++ b/modules/demux/adaptive/playlist/SegmentInformation.cpp -@@ -34,6 +34,7 @@ - - #include <algorithm> - #include <cassert> -+#include <limits> - - using namespace adaptive::playlist; - -diff --git a/modules/demux/hls/playlist/Parser.cpp b/modules/demux/hls/playlist/Parser.cpp -index 67110e4..7439699 100644 ---- a/modules/demux/hls/playlist/Parser.cpp -+++ b/modules/demux/hls/playlist/Parser.cpp -@@ -42,6 +42,7 @@ - #include <map> - #include <cctype> - #include <algorithm> -+#include <limits> - - using namespace adaptive; - using namespace adaptive::playlist; --- -2.30.1 - diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0001-make-opencv-configurable.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0001-make-opencv-configurable.patch index 950c09b8ae..cc65af009b 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc/0001-make-opencv-configurable.patch +++ b/meta-multimedia/recipes-multimedia/vlc/vlc/0001-make-opencv-configurable.patch @@ -5,11 +5,9 @@ Upstream-Status: Inappropriate [configuration] Signed-off-by: Tim Orling <TicoTimo@gmail.com> -Index: vlc-2.1.4/configure.ac -=================================================================== ---- vlc-2.1.4.orig/configure.ac -+++ vlc-2.1.4/configure.ac -@@ -1693,7 +1693,16 @@ PKG_ENABLE_MODULES_VLC([BLURAY], [libblu +--- a/configure.ac ++++ b/configure.ac +@@ -1892,7 +1892,16 @@ PKG_ENABLE_MODULES_VLC([BLURAY], [libblu dnl dnl OpenCV wrapper and example filters dnl diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0002-use-vorbisidec.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0002-use-vorbisidec.patch index b174ec127e..8ecddd33c6 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc/0002-use-vorbisidec.patch +++ b/meta-multimedia/recipes-multimedia/vlc/vlc/0002-use-vorbisidec.patch @@ -4,11 +4,9 @@ Upstream-Status: Pending Signed-off-by: Tim Orling <TicoTimo@gmail.com> -Index: vlc-2.2.1/modules/codec/Makefile.am -=================================================================== ---- vlc-2.2.1.orig/modules/codec/Makefile.am -+++ vlc-2.2.1/modules/codec/Makefile.am -@@ -234,7 +234,7 @@ codec_LTLIBRARIES += $(LTLIBtheora) +--- a/modules/codec/Makefile.am ++++ b/modules/codec/Makefile.am +@@ -321,7 +321,7 @@ codec_LTLIBRARIES += $(LTLIBdaala) libtremor_plugin_la_SOURCES = codec/vorbis.c libtremor_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_tremor libtremor_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0004-Use-packageconfig-to-detect-mmal-support.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0004-Use-packageconfig-to-detect-mmal-support.patch index 424aaa2815..b9f5ad591c 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc/0004-Use-packageconfig-to-detect-mmal-support.patch +++ b/meta-multimedia/recipes-multimedia/vlc/vlc/0004-Use-packageconfig-to-detect-mmal-support.patch @@ -8,16 +8,15 @@ in different locations, therefore its best to rely on pkgconf to find the libs and header locations instead of assuming /opt/vc which might work on some distros ( like raspbian ) but not everywhere +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- configure.ac | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) -diff --git a/configure.ac b/configure.ac -index d7cf692..f81b99d 100644 --- a/configure.ac +++ b/configure.ac -@@ -3427,27 +3427,18 @@ AC_ARG_ENABLE(mmal, +@@ -3461,27 +3461,18 @@ AC_ARG_ENABLE(mmal, AS_HELP_STRING([--enable-mmal], [Multi-Media Abstraction Layer (MMAL) hardware plugin (default enable)])) if test "${enable_mmal}" != "no"; then @@ -56,6 +55,3 @@ index d7cf692..f81b99d 100644 dnl dnl evas plugin --- -2.26.1 - diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0005-ioctl-does-not-have-same-signature-between-glibc-and.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0005-ioctl-does-not-have-same-signature-between-glibc-and.patch new file mode 100644 index 0000000000..cbf4f2b911 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/vlc/vlc/0005-ioctl-does-not-have-same-signature-between-glibc-and.patch @@ -0,0 +1,47 @@ +From a46cee56d05884b8020ace6f67ef8389ac1845da Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 5 Mar 2023 13:50:40 -0800 +Subject: [PATCH 1/3] ioctl does not have same signature between glibc and musl + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + modules/access/v4l2/lib.c | 4 ++++ + modules/access/v4l2/v4l2.h | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/modules/access/v4l2/lib.c b/modules/access/v4l2/lib.c +index b212e1bc5f..ff7c66bf35 100644 +--- a/modules/access/v4l2/lib.c ++++ b/modules/access/v4l2/lib.c +@@ -43,7 +43,11 @@ int (*v4l2_fd_open) (int, int) = fd_open; + //int (*v4l2_open) (const char *, int, ...) = open; + //int (*v4l2_dup) (const char *, int, ...) = dup; + int (*v4l2_close) (int) = close; ++#ifdef __GLIBC__ + int (*v4l2_ioctl) (int, unsigned long int, ...) = ioctl; ++#else ++int (*v4l2_ioctl) (int, int, ...) = ioctl; ++#endif + ssize_t (*v4l2_read) (int, void *, size_t) = read; + //ssize_t (*v4l2_write) (int, const void *, size_t) = write; + void * (*v4l2_mmap) (void *, size_t, int, int, int, int64_t) = mmap; +diff --git a/modules/access/v4l2/v4l2.h b/modules/access/v4l2/v4l2.h +index ac4562e269..727e83e9b1 100644 +--- a/modules/access/v4l2/v4l2.h ++++ b/modules/access/v4l2/v4l2.h +@@ -23,7 +23,11 @@ + /* libv4l2 functions */ + extern int (*v4l2_fd_open) (int, int); + extern int (*v4l2_close) (int); ++#ifdef __GLIBC__ + extern int (*v4l2_ioctl) (int, unsigned long int, ...); ++#else ++extern int (*v4l2_ioctl) (int, int, ...); ++#endif + extern ssize_t (*v4l2_read) (int, void *, size_t); + extern void * (*v4l2_mmap) (void *, size_t, int, int, int, int64_t); + extern int (*v4l2_munmap) (void *, size_t); +-- +2.39.2 + diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0005-linux-thread-Use-SYS_futex-instead-of-__NR_futex.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0005-linux-thread-Use-SYS_futex-instead-of-__NR_futex.patch deleted file mode 100644 index 405490dcfc..0000000000 --- a/meta-multimedia/recipes-multimedia/vlc/vlc/0005-linux-thread-Use-SYS_futex-instead-of-__NR_futex.patch +++ /dev/null @@ -1,46 +0,0 @@ -From f7957c35654222e5bd1038341612bbb40a88e98b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 16 Nov 2020 12:08:43 -0800 -Subject: [PATCH] linux/thread: Use SYS_futex instead of __NR_futex - -SYS_futex it expected from system C library. -in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex) -some newer 32bit architectures e.g. riscv32 are using 64bit time_t from -get go unlike other 32bit architectures in glibc, therefore it wont have -NR_futex defined but just NR_futex_time64 this aliases it to NR_futex so -that SYS_futex is then defined for rv32 - -Upstream-Status: Submitted [https://github.com/videolan/vlc/pull/117] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/linux/thread.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/linux/thread.c b/src/linux/thread.c -index 20da296..30639a3 100644 ---- a/src/linux/thread.c -+++ b/src/linux/thread.c -@@ -30,6 +30,11 @@ - #include <sys/syscall.h> - #include <linux/futex.h> - -+/* 32bit architectures with 64bit time_t do not define __NR_futex syscall */ -+#if !defined(SYS_futex) && defined(SYS_futex_time64) -+#define SYS_futex SYS_futex_time64 -+#endif -+ - #ifndef FUTEX_PRIVATE_FLAG - #define FUTEX_WAKE_PRIVATE FUTEX_WAKE - #define FUTEX_WAIT_PRIVATE FUTEX_WAIT -@@ -50,7 +55,7 @@ unsigned long vlc_thread_id(void) - static int sys_futex(void *addr, int op, unsigned val, - const struct timespec *to, void *addr2, int val3) - { -- return syscall(__NR_futex, addr, op, val, to, addr2, val3); -+ return syscall(SYS_futex, addr, op, val, to, addr2, val3); - } - - static int vlc_futex_wake(void *addr, int nr) --- -2.29.2 - diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0006-configure-Disable-incompatible-function-pointer-type.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0006-configure-Disable-incompatible-function-pointer-type.patch new file mode 100644 index 0000000000..4128db1aea --- /dev/null +++ b/meta-multimedia/recipes-multimedia/vlc/vlc/0006-configure-Disable-incompatible-function-pointer-type.patch @@ -0,0 +1,31 @@ +From 048e4fdd08ac588feb27b03e3ec1824e24f77d62 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 5 Mar 2023 14:13:25 -0800 +Subject: [PATCH 3/3] configure: Disable incompatible-function-pointer-types + warning + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 9f1c099e13..8e45a05808 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -98,6 +98,11 @@ AS_IF([test -n "${with_binary_version}"],[ + dnl Prevent clang from accepting unknown flags with a mere warning + AX_APPEND_COMPILE_FLAGS([-Werror=unknown-warning-option -Werror=invalid-command-line-argument], [CFLAGS]) + AX_APPEND_COMPILE_FLAGS([-Werror=unknown-warning-option -Werror=invalid-command-line-argument], [CXXFLAGS]) ++dnl disable clang from erroring on function pointer protype mismatch, vlc seems to rely on that ++dnl especially in modules/video_filter/deinterlace/algo_yadif.c how it interpolates 'filter` variable ++dnl between different functions yadif_filter_line_c_16bit() and yadif_filter_line_c() ++AX_APPEND_COMPILE_FLAGS([-Wno-error=incompatible-function-pointer-types -Wno-error=incompatible-function-pointer-types], [CFLAGS]) ++AX_APPEND_COMPILE_FLAGS([-Wno-error=incompatible-function-pointer-types -Wno-error=incompatible-function-pointer-types], [CXXFLAGS]) + + dnl + dnl Check the operating system +-- +2.39.2 + diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.17-1.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.18.bb index 9b85cb5374..92f05544dd 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.17-1.bb +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.18.bb @@ -21,9 +21,10 @@ SRC_URI = "git://github.com/videolan/vlc.git;protocol=https;branch=3.0.x \ file://0002-use-vorbisidec.patch \ file://0003-fix-luaL-checkint.patch \ file://0004-Use-packageconfig-to-detect-mmal-support.patch \ - file://0005-linux-thread-Use-SYS_futex-instead-of-__NR_futex.patch \ + file://0005-ioctl-does-not-have-same-signature-between-glibc-and.patch \ + file://0006-configure-Disable-incompatible-function-pointer-type.patch \ " -SRCREV = "aa76328c572d93f1d99c867a94ecad1dc3259733" +SRCREV = "e9eceaed4d838dbd84638bfb2e4bdd08294163b1" S = "${WORKDIR}/git" inherit autotools-brokensep features_check gettext pkgconfig mime-xdg @@ -100,6 +101,7 @@ do_configure:append() { for qtpath in adapters components/epg components/playlist components/sout dialogs managers styles util/buttons; do mkdir -p "${B}/modules/gui/qt/$qtpath" done + sed -i -e 's|${WORKDIR}||g' ${B}/config.h } # This recipe packages vlc as a library as well, so qt4 dependencies diff --git a/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.4.13.bb b/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.4.14.bb index 0203f8bf50..6f93b443d2 100644 --- a/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.4.13.bb +++ b/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.4.14.bb @@ -11,7 +11,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 = "7cb1b8b92e96ebd1b7e632cda32715fed713d333" +SRCREV = "6d0c7f7b7f484b3cd2aaf2e2b3cc902c095b4946" 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-multimedia/recipes-multimedia/x265/x265_3.2.1.bb b/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb index d786afe81e..250af58e17 100644 --- a/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb +++ b/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb @@ -17,6 +17,10 @@ SRC_URI[sha256sum] = "fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b5 inherit lib_package pkgconfig cmake +do_generate_toolchain_file:append() { + echo "set(CMAKE_ASM_NASM_FLAGS --debug-prefix-map ${S}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR})" >> ${WORKDIR}/toolchain.cmake +} + EXTRA_OECMAKE:append:x86 = " -DENABLE_ASSEMBLY=OFF" EXTRA_OECMAKE:append:aarch64 = " -DENABLE_PIC=ON" diff --git a/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr/0001-screencast-Fix-build-with-older-mesa.patch b/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr/0001-screencast-Fix-build-with-older-mesa.patch new file mode 100644 index 0000000000..ff4fcc292a --- /dev/null +++ b/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr/0001-screencast-Fix-build-with-older-mesa.patch @@ -0,0 +1,53 @@ +From ef60a76e2a21b7649632dcf71d125039604a56b5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 18 Jun 2023 10:42:19 -0700 +Subject: [PATCH] screencast: Fix build with older mesa + +gbm_bo_create_with_modifiers2() is quite new and there are still distros +that ship 21.2 and older. e.g. powerVR mesa implementation + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/screencast/pipewire_screencast.c | 8 ++++++-- + src/screencast/screencast_common.c | 4 ++-- + 2 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/src/screencast/pipewire_screencast.c b/src/screencast/pipewire_screencast.c +index 0611fd5..7d66810 100644 +--- a/src/screencast/pipewire_screencast.c ++++ b/src/screencast/pipewire_screencast.c +@@ -234,9 +234,13 @@ static void pwr_handle_stream_param_changed(void *data, uint32_t id, + uint32_t n_params; + struct spa_pod_builder *builder[2] = {&b[0].b, &b[1].b}; + +- struct gbm_bo *bo = gbm_bo_create_with_modifiers2(cast->ctx->gbm, ++ struct gbm_bo *bo = gbm_bo_create_with_modifiers(cast->ctx->gbm, + cast->screencopy_frame_info[cast->buffer_type].width, cast->screencopy_frame_info[cast->buffer_type].height, +- cast->screencopy_frame_info[cast->buffer_type].format, modifiers, n_modifiers, flags); ++ cast->screencopy_frame_info[cast->buffer_type].format, modifiers, n_modifiers); ++ if(!bo) ++ bo = gbm_bo_create(cast->ctx->gbm, ++ cast->screencopy_frame_info[cast->buffer_type].width, cast->screencopy_frame_info[cast->buffer_type].height, ++ cast->screencopy_frame_info[cast->buffer_type].format, GBM_BO_USE_RENDERING); + if (bo) { + modifier = gbm_bo_get_modifier(bo); + gbm_bo_destroy(bo); +diff --git a/src/screencast/screencast_common.c b/src/screencast/screencast_common.c +index d6d13db..2e4fc18 100644 +--- a/src/screencast/screencast_common.c ++++ b/src/screencast/screencast_common.c +@@ -143,8 +143,8 @@ struct xdpw_buffer *xdpw_buffer_create(struct xdpw_screencast_instance *cast, + uint32_t flags = GBM_BO_USE_RENDERING; + if (cast->pwr_format.modifier != DRM_FORMAT_MOD_INVALID) { + uint64_t *modifiers = (uint64_t*)&cast->pwr_format.modifier; +- buffer->bo = gbm_bo_create_with_modifiers2(cast->ctx->gbm, frame_info->width, frame_info->height, +- frame_info->format, modifiers, 1, flags); ++ buffer->bo = gbm_bo_create_with_modifiers(cast->ctx->gbm, frame_info->width, frame_info->height, ++ frame_info->format, modifiers, 1); + } else { + if (cast->ctx->state->config->screencast_conf.force_mod_linear) { + flags |= GBM_BO_USE_LINEAR; +-- +2.41.0 + diff --git a/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.6.0.bb b/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.7.0.bb index a72116154c..b845c5f792 100644 --- a/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.6.0.bb +++ b/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.7.0.bb @@ -16,10 +16,11 @@ DEPENDS = " \ inherit meson pkgconfig features_check REQUIRED_DISTRO_FEATURES = "opengl wayland" -SRC_URI = "git://github.com/emersion/xdg-desktop-portal-wlr.git;protocol=https;nobranch=1" +SRC_URI = "git://github.com/emersion/xdg-desktop-portal-wlr.git;protocol=https;nobranch=1 \ + file://0001-screencast-Fix-build-with-older-mesa.patch" S = "${WORKDIR}/git" -SRCREV = "0a8bfa14607022a080f8b6eabc4757d1918d3cd9" +SRCREV = "776113a4f014639c29d8de8fcb513493ef7b491f" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'basu', d)}" diff --git a/meta-networking/README b/meta-networking/README.md index 34e11a96dd..34e11a96dd 100644 --- a/meta-networking/README +++ b/meta-networking/README.md diff --git a/meta-networking/conf/layer.conf b/meta-networking/conf/layer.conf index c643e889c0..5716eb3f22 100644 --- a/meta-networking/conf/layer.conf +++ b/meta-networking/conf/layer.conf @@ -22,7 +22,6 @@ LICENSE_PATH += "${LAYERDIR}/licenses" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ wireguard-tools->wireguard-module \ - wireless-regdb->crda \ " BBFILES_DYNAMIC += " \ meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bb \ diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Make-alpha2-to-be-3-characters-long.patch b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Make-alpha2-to-be-3-characters-long.patch deleted file mode 100644 index f1d2cbc5a3..0000000000 --- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Make-alpha2-to-be-3-characters-long.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 078e962d345fd0536fe7ba797485ee1a4159c032 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 4 Feb 2022 09:18:30 -0800 -Subject: [PATCH] Make alpha2 to be 3 characters long - -Fixes buffer overflow -reglib.c:969:9: error: 'sscanf' may overflow; destination buffer in argument 3 has size 2, but the corresponding specifier may require size 3 [-Werror,-Wfortify-source] - alpha2, - ^ -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - reglib.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/reglib.c b/reglib.c -index e00e9b8..8565a0b 100644 ---- a/reglib.c -+++ b/reglib.c -@@ -958,7 +958,7 @@ reglib_parse_rules(FILE *fp, struct ieee80211_regdomain *trd) - static int reglib_parse_country_dfs(char *line, struct ieee80211_regdomain *rd) - { - char dfs_region_alpha[9]; -- char alpha2[2]; -+ char alpha2[3]; - int hits; - - memset(rd, 0, sizeof(*rd)); --- -2.35.1 - diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch deleted file mode 100644 index d61ea8069e..0000000000 --- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 1e1a78b7b4fa1662b4447aa19c15b1e839b7e9db Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20M=C3=BCller-Klieser?= <s.mueller-klieser@phytec.de> -Date: Wed, 24 Aug 2016 10:58:45 +0200 -Subject: [PATCH] Makefile: respect LDFLAGS for libreg -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de> - -Rebase for crda 4.15. - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 528a14e..31f1b5e 100644 ---- a/Makefile -+++ b/Makefile -@@ -116,7 +116,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) - - $(LIBREG): reglib.c regdb.h reglib.h - $(NQ) ' CC ' $@ -- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $< $(LIBREGLDLIBS) -+ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $< $(LDFLAGS) $(LIBREGLDLIBS) - - install-libreg-headers: - $(NQ) ' INSTALL libreg-headers' --- -1.9.1 - diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-reglib-Remove-unused-variables.patch b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-reglib-Remove-unused-variables.patch deleted file mode 100644 index c6c3c53f19..0000000000 --- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-reglib-Remove-unused-variables.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 1bd6ff9d10c83afbc9954fc38b953e9167e6d4a9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 28 Aug 2022 14:01:55 -0700 -Subject: [PATCH] reglib: Remove unused variables - -These counters are not used anywhere therefore delete them -Fixes -reglib.c:1015:15: error: variable 'i' set but not used [-Werror,-Wunused-but-set-variable] - unsigned int i = 0; - ^ -reglib.c:1062:15: error: variable 'lines' set but not used [-Werror,-Wunused-but-set-variable] - unsigned int lines = 0; - ^ - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - reglib.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/reglib.c b/reglib.c -index 8565a0b..6c62c2c 100644 ---- a/reglib.c -+++ b/reglib.c -@@ -1012,7 +1012,6 @@ static int reglib_find_next_country_stream(FILE *fp) - { - fpos_t prev_pos; - int r; -- unsigned int i = 0; - - while(1) { - char line[1024]; -@@ -1030,7 +1029,6 @@ static int reglib_find_next_country_stream(FILE *fp) - line_p = fgets(line, sizeof(line), fp); - if (line_p == line) { - if (strspn(line, "\n") == strlen(line)) { -- i++; - continue; - } - if (strncmp(line, "country", 7) != 0) -@@ -1059,7 +1057,6 @@ struct ieee80211_regdomain *reglib_parse_country(FILE *fp) - - FILE *reglib_create_parse_stream(FILE *f) - { -- unsigned int lines = 0; - FILE *fp; - - fp = tmpfile(); -@@ -1076,7 +1073,6 @@ FILE *reglib_create_parse_stream(FILE *f) - if (line_p == line) { - if (strchr(line, '#') == NULL) { - fputs(line, fp); -- lines++; - } - continue; - } else --- -2.37.2 - diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/crda-4.14-python-3.patch b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/crda-4.14-python-3.patch deleted file mode 100644 index 6c209dc375..0000000000 --- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/crda-4.14-python-3.patch +++ /dev/null @@ -1,110 +0,0 @@ -Imported from Gentoo -https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c50acec16bc7c33d6dc122c007d713e7fbecf9c - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Rebase for crda 4.15. - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - - utils/key2pub.py | 28 +++++++++++++++------------- - 1 file changed, 15 insertions(+), 13 deletions(-) - -diff --git a/utils/key2pub.py b/utils/key2pub.py -index 22fda55..2a4980b 100755 ---- a/utils/key2pub.py -+++ b/utils/key2pub.py -@@ -1,22 +1,22 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - import sys - try: - from M2Crypto import RSA --except ImportError, e: -+except ImportError as e: - sys.stderr.write('ERROR: Failed to import the "M2Crypto" module: %s\n' % e.message) - sys.stderr.write('Please install the "M2Crypto" Python module.\n') - sys.stderr.write('On Debian GNU/Linux the package is called "python-m2crypto".\n') - sys.exit(1) - - def print_ssl_64(output, name, val): -- while val[0] == '\0': -+ while val[0:1] == b'\0': - val = val[1:] - while len(val) % 8: -- val = '\0' + val -+ val = b'\0' + val - vnew = [] - while len(val): -- vnew.append((val[0], val[1], val[2], val[3], val[4], val[5], val[6], val[7])) -+ vnew.append((val[0:1], val[1:2], val[2:3], val[3:4], val[4:5], val[5:6], val[6:7], val[7:8])) - val = val[8:] - vnew.reverse() - output.write('static BN_ULONG %s[%d] = {\n' % (name, len(vnew))) -@@ -34,13 +34,13 @@ def print_ssl_64(output, name, val): - output.write('};\n\n') - - def print_ssl_32(output, name, val): -- while val[0] == '\0': -+ while val[0:1] == b'\0': - val = val[1:] - while len(val) % 4: -- val = '\0' + val -+ val = b'\0' + val - vnew = [] - while len(val): -- vnew.append((val[0], val[1], val[2], val[3], )) -+ vnew.append((val[0:1], val[1:2], val[2:3], val[3:4])) - val = val[4:] - vnew.reverse() - output.write('static BN_ULONG %s[%d] = {\n' % (name, len(vnew))) -@@ -81,21 +81,21 @@ struct pubkey { - - static struct pubkey keys[] __attribute__((unused))= { - ''') -- for n in xrange(n + 1): -+ for n in range(n + 1): - output.write(' KEYS(e_%d, n_%d),\n' % (n, n)) - output.write('};\n') - pass - - def print_gcrypt(output, name, val): - output.write('#include <stdint.h>\n') -- while val[0] == '\0': -+ while val[0:1] == b'\0': - val = val[1:] - output.write('static const uint8_t %s[%d] = {\n' % (name, len(val))) - idx = 0 - for v in val: - if not idx: - output.write('\t') -- output.write('0x%.2x, ' % ord(v)) -+ output.write('0x%.2x, ' % (v if sys.version_info[0] >=3 else ord(v))) - idx += 1 - if idx == 8: - idx = 0 -@@ -118,7 +118,7 @@ struct key_params { - - static const struct key_params __attribute__ ((unused)) keys[] = { - ''') -- for n in xrange(n + 1): -+ for n in range(n + 1): - output.write(' KEYS(e_%d, n_%d),\n' % (n, n)) - output.write('};\n') - -@@ -136,7 +136,7 @@ except IndexError: - mode = None - - if not mode in modes: -- print 'Usage: %s [%s] input-file... output-file' % (sys.argv[0], '|'.join(modes.keys())) -+ print('Usage: %s [%s] input-file... output-file' % (sys.argv[0], '|'.join(modes.keys()))) - sys.exit(2) - - output = open(outfile, 'w') -@@ -154,3 +154,5 @@ for f in files: - idx += 1 - - modes[mode][1](output, idx - 1) -+ -+output.close() diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch deleted file mode 100644 index b5bce40a9c..0000000000 --- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Ben Hutchings <ben@decadent.org.uk> -Date: Sat, 23 Aug 2014 12:27:34 -0700 -Subject: crda: Do not run ldconfig if DESTDIR is set - -Upstream-Status: Backport [http://www.spinics.net/lists/linux-wireless/msg126028.html] - -Signed-off-by: Ben Hutchings <ben@decadent.org.uk> -Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> - -Rebase patch for crda 4.15. - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - - Makefile | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Makefile b/Makefile -index 6ca26f3..528a14e 100644 ---- a/Makefile -+++ b/Makefile -@@ -127,7 +127,9 @@ install-libreg: - $(NQ) ' INSTALL libreg' - $(Q)mkdir -p $(DESTDIR)/$(LIBDIR) - $(Q)$(INSTALL) -m 644 $(LIBREG) $(DESTDIR)/$(LIBDIR)/ -+ifndef DESTDIR - $(Q)ldconfig -+endif - - %.o: %.c regdb.h $(LIBREG) - $(NQ) ' CC ' $@ diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-issues-when-USE_OPENSSL-1.patch b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-issues-when-USE_OPENSSL-1.patch deleted file mode 100644 index 1bb5c638f0..0000000000 --- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-issues-when-USE_OPENSSL-1.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 8d2164a090f17286ea8291f30a123595cf447dc3 Mon Sep 17 00:00:00 2001 -From: Haiqing Bai <Haiqing.Bai@windriver.com> -Date: Wed, 30 Nov 2016 10:27:36 +0800 -Subject: [PATCH] crda: fix issues when 'USE_OPENSSL=1'. - -Fxed the below issues if configured with 'USE_OPENSSL=1': -a. keys-ssl.c uses BN_ULONG but doesn't include the openssl headers leading - to build failures: - keys-ssl.c:2:8: error: unknown type name 'BN_ULONG' - static BN_ULONG e_0[1] = { - -b. The large unqualified constants also break building: - keys-ssl.c:8:2: warning: overflow in implicit constant conversion [-Woverflow] - 0x63a2705416a0d8e1, 0xdc9fca11c8ba757b, - -c. keys-ssl.c: error: 'keys' defined but not used [-Werror=unused-variable] - static struct pubkey keys[] = { - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> -Upstream-Status: Pending -Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com> ---- - utils/key2pub.py | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/utils/key2pub.py b/utils/key2pub.py -index 401d58a..3ae00b8 100755 ---- a/utils/key2pub.py -+++ b/utils/key2pub.py -@@ -24,7 +24,7 @@ def print_ssl_64(output, name, val): - for v1, v2, v3, v4, v5, v6, v7, v8 in vnew: - if not idx: - output.write('\t') -- output.write('0x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x, ' % (ord(v1), ord(v2), ord(v3), ord(v4), ord(v5), ord(v6), ord(v7), ord(v8))) -+ output.write('0x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2xULL, ' % (ord(v1), ord(v2), ord(v3), ord(v4), ord(v5), ord(v6), ord(v7), ord(v8))) - idx += 1 - if idx == 2: - idx = 0 -@@ -60,6 +60,7 @@ def print_ssl_32(output, name, val): - def print_ssl(output, name, val): - import os - output.write('#include <stdint.h>\n') -+ output.write('#include <openssl/bn.h>\n') - if os.getenv('TARGET_BITS') == '64': - return print_ssl_64(output, name, val) - else: -@@ -78,7 +79,7 @@ struct pubkey { - - #define KEYS(e,n) { KEY(e), KEY(n), } - --static struct pubkey keys[] = { -+static struct pubkey keys[] __attribute__((unused))= { - ''') - for n in xrange(n + 1): - output.write(' KEYS(e_%d, n_%d),\n' % (n, n)) --- -1.9.1 - diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch deleted file mode 100644 index a7fb22a727..0000000000 --- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 890f5bf2654b695a866262d72bfa9750af921a3b Mon Sep 17 00:00:00 2001 -From: Ben Hutchings <ben@decadent.org.uk> -Date: Sat, 23 Aug 2014 12:26:37 -0700 -Subject: [PATCH] Fix linking of libraries used by libreg - -The math and crypto libraries are called by and need to be linked to -libreg.so, not to the executables. - -Upstream-Status: Backport [http://www.spinics.net/lists/linux-wireless/msg126027.html] - -Signed-off-by: Ben Hutchings <ben@decadent.org.uk> -Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> ---- - Makefile | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index 528a14e..acd818b 100644 ---- a/Makefile -+++ b/Makefile -@@ -30,7 +30,7 @@ CFLAGS += -std=gnu99 -Wall -Werror -pedantic - CFLAGS += -Wall -g - LDLIBREG += -lreg - LDLIBS += $(LDLIBREG) --LDLIBS += -lm -+LIBREGLDLIBS += -lm - LIBREG += libreg.so - LDFLAGS += -L ./ - -@@ -40,13 +40,13 @@ all_noverify: $(LIBREG) crda intersect regdbdump db2rd optimize - - ifeq ($(USE_OPENSSL),1) - CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `pkg-config --cflags openssl` --LDLIBS += `pkg-config --libs openssl` -+LIBREGLDLIBS += `pkg-config --libs openssl` - - $(LIBREG): keys-ssl.c - - else - CFLAGS += -DUSE_GCRYPT --LDLIBS += -lgcrypt -+LIBREGLDLIBS += -lgcrypt - - $(LIBREG): keys-gcrypt.c - -@@ -116,7 +116,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) - - $(LIBREG): reglib.c regdb.h reglib.h - $(NQ) ' CC ' $@ -- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $< -+ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $< $(LIBREGLDLIBS) - - install-libreg-headers: - $(NQ) ' INSTALL libreg-headers' --- -2.7.4 - diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/use-target-word-size-instead-of-host-s.patch b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/use-target-word-size-instead-of-host-s.patch deleted file mode 100644 index 100b765f2d..0000000000 --- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/use-target-word-size-instead-of-host-s.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c1c42513edd27c97341f2033af77c13a4724eb8f Mon Sep 17 00:00:00 2001 -From: Haiqing Bai <Haiqing.Bai@windriver.com> -Date: Fri, 25 Nov 2016 16:48:01 +0800 -Subject: [PATCH] crda: Use target word size instead of host's. - -In key2pub.py, the codes check the wordsize -of the host machine but not the target's, this fix -fetches the wordsize of target from the build system. - -Upstream-Status: Pending -Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com> ---- - utils/key2pub.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/utils/key2pub.py b/utils/key2pub.py -index 3e84cd2..401d58a 100755 ---- a/utils/key2pub.py -+++ b/utils/key2pub.py -@@ -58,9 +58,9 @@ def print_ssl_32(output, name, val): - output.write('};\n\n') - - def print_ssl(output, name, val): -- import struct -+ import os - output.write('#include <stdint.h>\n') -- if len(struct.pack('@L', 0)) == 8: -+ if os.getenv('TARGET_BITS') == '64': - return print_ssl_64(output, name, val) - else: - return print_ssl_32(output, name, val) --- -1.9.1 - diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda_4.15.bb b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda_4.15.bb deleted file mode 100644 index dd2df32225..0000000000 --- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda_4.15.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Wireless Central Regulatory Domain Agent" -HOMEPAGE = "http://wireless.kernel.org/en/developers/Regulatory/CRDA" -SECTION = "net" -LICENSE = "copyleft-next-0.3.0" -LIC_FILES_CHKSUM = "file://copyleft-next-0.3.0;md5=8743a2c359037d4d329a31e79eabeffe" - -DEPENDS = "python3-m2crypto-native libnl libgcrypt" - -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git;branch=master \ - file://do-not-run-ldconfig-if-destdir-is-set.patch \ - file://fix-linking-of-libraries-used-by-reglib.patch \ - file://0001-Makefile-respect-LDFLAGS-for-libreg.patch \ - file://use-target-word-size-instead-of-host-s.patch \ - file://fix-issues-when-USE_OPENSSL-1.patch \ - file://crda-4.14-python-3.patch \ - file://0001-Make-alpha2-to-be-3-characters-long.patch \ - file://0001-reglib-Remove-unused-variables.patch \ -" -SRCREV = "6aeea99ceeec85dd7a9202ee39c7f3b2a8f5195d" - -S = "${WORKDIR}/git" - -inherit pkgconfig python3-dir python3native siteinfo - -# Recursive make problem -EXTRA_OEMAKE = "MAKEFLAGS= DESTDIR=${D} LIBDIR=${libdir}/crda LDLIBREG='-Wl,-rpath,${libdir}/crda -lreg' \ - UDEV_RULE_DIR=${nonarch_base_libdir}/udev/rules.d/" -TARGET_BITS = "${SITEINFO_BITS}" -export TARGET_BITS - -do_compile() { - oe_runmake all_noverify -} - -do_install() { - oe_runmake SBINDIR=${sbindir}/ install -} - -RDEPENDS:${PN} = "udev wireless-regdb" diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.2.0.bb b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.3.2.bb index 987cc640e1..52157cf9a8 100644 --- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.2.0.bb +++ b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.3.2.bb @@ -6,16 +6,18 @@ LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "\ - https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ + https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \ file://firewalld.init \ file://run-ptest \ " -SRC_URI[sha256sum] = "28fd90e88bda0dfd460f370f353474811b2e295d7eb27f0d7d18ffa3d786eeb7" +SRC_URI[sha256sum] = "aba0d8ce9617b906ea4866bf0bdfb2c2d5312f53b8e9e8e9e4d49bf330da5b5e" # glib-2.0-native is needed for GSETTINGS_RULES autoconf macro from gsettings.m4 DEPENDS = "intltool-native glib-2.0-native nftables" -inherit gettext autotools-brokensep bash-completion pkgconfig python3native python3-dir gsettings systemd update-rc.d ptest +inherit gettext autotools-brokensep bash-completion pkgconfig python3native python3-dir gsettings systemd update-rc.d ptest features_check + +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd" diff --git a/meta-networking/dynamic-layers/meta-python/recipes-printing/system-config-printer/system-config-printer_1.5.18.bb b/meta-networking/dynamic-layers/meta-python/recipes-printing/system-config-printer/system-config-printer_1.5.18.bb new file mode 100644 index 0000000000..f0ff24f376 --- /dev/null +++ b/meta-networking/dynamic-layers/meta-python/recipes-printing/system-config-printer/system-config-printer_1.5.18.bb @@ -0,0 +1,45 @@ +DESCRIPTION = "a graphical user interface that allows the user to change print settings" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "git://github.com/OpenPrinting/system-config-printer.git;protocol=https;branch=master" + +SRCREV = "895d3dec50c93bfd4f142bac9bfcc13051bf84cb" +S = "${WORKDIR}/git" + +inherit autotools gettext pkgconfig python3native features_check + +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" + +DEPENDS = "cups glib-2.0 libusb xmlto-native desktop-file-utils-native autoconf-archive-native" + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = ",--without-systemdsystemunitdir,systemd" + +do_configure:prepend() { + # This file is not provided if fetching from git but required for configure + touch ${S}/ChangeLog +} + +do_install:append() { + for f in __init__.cpython-311.pyc cupshelpers.cpython-311.pyc \ + config.cpython-311.pyc ppds.cpython-311.pyc \ + installdriver.cpython-311.pyc openprinting.cpython-311.pyc \ + xmldriverprefs.cpython-311.pyc; do + rm -rf ${D}${PYTHON_SITEPACKAGES_DIR}/cupshelpers/__pycache__/$f + done +} + +FILES:${PN} += "${libdir} ${datadir}" + +RDEPENDS:${PN} = " \ + dbus-x11 \ + gtk+3 \ + libnotify \ + python3-core \ + python3-dbus \ + python3-firewall \ + python3-pycups \ + python3-pycurl \ + python3-pygobject \ +" diff --git a/meta-networking/licenses/netperf b/meta-networking/licenses/netperf deleted file mode 100644 index 3f3ceb2fc2..0000000000 --- a/meta-networking/licenses/netperf +++ /dev/null @@ -1,43 +0,0 @@ - - - Copyright (C) 1993 Hewlett-Packard Company - ALL RIGHTS RESERVED. - - The enclosed software and documentation includes copyrighted works - of Hewlett-Packard Co. For as long as you comply with the following - limitations, you are hereby authorized to (i) use, reproduce, and - modify the software and documentation, and to (ii) distribute the - software and documentation, including modifications, for - non-commercial purposes only. - - 1. The enclosed software and documentation is made available at no - charge in order to advance the general development of - high-performance networking products. - - 2. You may not delete any copyright notices contained in the - software or documentation. All hard copies, and copies in - source code or object code form, of the software or - documentation (including modifications) must contain at least - one of the copyright notices. - - 3. The enclosed software and documentation has not been subjected - to testing and quality control and is not a Hewlett-Packard Co. - product. At a future time, Hewlett-Packard Co. may or may not - offer a version of the software and documentation as a product. - - 4. THE SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS". - HEWLETT-PACKARD COMPANY DOES NOT WARRANT THAT THE USE, - REPRODUCTION, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR - DOCUMENTATION WILL NOT INFRINGE A THIRD PARTY'S INTELLECTUAL - PROPERTY RIGHTS. HP DOES NOT WARRANT THAT THE SOFTWARE OR - DOCUMENTATION IS ERROR FREE. HP DISCLAIMS ALL WARRANTIES, - EXPRESS AND IMPLIED, WITH REGARD TO THE SOFTWARE AND THE - DOCUMENTATION. HP SPECIFICALLY DISCLAIMS ALL WARRANTIES OF - MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - - 5. HEWLETT-PACKARD COMPANY WILL NOT IN ANY EVENT BE LIABLE FOR ANY - DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES - (INCLUDING LOST PROFITS) RELATED TO ANY USE, REPRODUCTION, - MODIFICATION, OR DISTRIBUTION OF THE SOFTWARE OR DOCUMENTATION. - - diff --git a/meta-networking/recipes-connectivity/adcli/adcli_0.9.0.bb b/meta-networking/recipes-connectivity/adcli/adcli_0.9.2.bb index b9fefa8589..6092823944 100644 --- a/meta-networking/recipes-connectivity/adcli/adcli_0.9.0.bb +++ b/meta-networking/recipes-connectivity/adcli/adcli_0.9.2.bb @@ -4,12 +4,9 @@ DESCRIPTION = "A helper library and tools for Active Directory client operations HOMEPAGE = "http://cgit.freedesktop.org/realmd/adcli" SECTION = "net" -SRCREV = "1b1528038e084a9f81ea108cffca9c2707623b9c" +SRCREV = "8e88e3590a19006362ea8b8dfdc18bb88b3cb3b5" -SRC_URI = "git://gitlab.freedesktop.org/realmd/adcli;branch=master \ - file://Fixed-build-error-on-musl.patch \ - file://0001-configure-check-for-ns_get16-and-ns_get32-as-well.patch \ - " +SRC_URI = "git://gitlab.freedesktop.org/realmd/adcli;branch=master" S = "${WORKDIR}/git" diff --git a/meta-networking/recipes-connectivity/adcli/files/0001-configure-check-for-ns_get16-and-ns_get32-as-well.patch b/meta-networking/recipes-connectivity/adcli/files/0001-configure-check-for-ns_get16-and-ns_get32-as-well.patch deleted file mode 100644 index 8cc859318c..0000000000 --- a/meta-networking/recipes-connectivity/adcli/files/0001-configure-check-for-ns_get16-and-ns_get32-as-well.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 98660f57a98f45dbf55414cfde46338019adcc33 Mon Sep 17 00:00:00 2001 -From: Sumit Bose <sbose@redhat.com> -Date: Wed, 28 Jul 2021 12:55:16 +0200 -Subject: [PATCH] configure: check for ns_get16 and ns_get32 as well - -With newer versions of glibc res_query() might ba already available in -glibc with ns_get16() and ns_get32() still requires libresolv. - -Upstream-Status: Backport [https://gitlab.freedesktop.org/realmd/adcli/-/commit/e841ba7513f3f8b6393183d2dea9adcbf7ba2e44] -Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1984891 -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.ac | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index ebc6cb4..e8775d0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -98,13 +98,15 @@ AC_SUBST(LDAP_CFLAGS) - # ------------------------------------------------------------------- - # resolv - --AC_MSG_CHECKING(for which library has res_query) -+AC_MSG_CHECKING([for which library has res_query, ns_get16 and ns_get32]) - for lib in "" "-lresolv"; do - saved_LIBS="$LIBS" - LIBS="$LIBS $lib" - AC_LINK_IFELSE([ - AC_LANG_PROGRAM([#include <resolv.h>], -- [res_query (0, 0, 0, 0, 0)]) -+ [res_query (0, 0, 0, 0, 0); -+ ns_get32 (NULL); -+ ns_get16 (NULL);]) - ], - [ AC_MSG_RESULT(${lib:-libc}); have_res_query="yes"; break; ], - [ LIBS="$saved_LIBS" ]) --- -2.32.0 diff --git a/meta-networking/recipes-connectivity/adcli/files/Fixed-build-error-on-musl.patch b/meta-networking/recipes-connectivity/adcli/files/Fixed-build-error-on-musl.patch deleted file mode 100644 index 87bcdfebd7..0000000000 --- a/meta-networking/recipes-connectivity/adcli/files/Fixed-build-error-on-musl.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0e64782a45cba9753d1210ee7d7c9dbd42f74ceb Mon Sep 17 00:00:00 2001 -From: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> -Date: Fri, 12 Jul 2019 12:46:54 +0800 -Subject: [PATCH] Fixed build error on musl. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> ---- - library/adutil.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/library/adutil.c b/library/adutil.c -index 9b0c47f..b673edd 100644 ---- a/library/adutil.c -+++ b/library/adutil.c -@@ -30,6 +30,7 @@ - #include <assert.h> - #include <ctype.h> - #include <errno.h> -+#include <endian.h> - #include <stdio.h> - #include <stdlib.h> - #include <string.h> --- -2.20.1 - diff --git a/meta-networking/recipes-connectivity/autossh/autossh_1.4g.bb b/meta-networking/recipes-connectivity/autossh/autossh_1.4g.bb index 3dc304b23c..de7e2d3e01 100644 --- a/meta-networking/recipes-connectivity/autossh/autossh_1.4g.bb +++ b/meta-networking/recipes-connectivity/autossh/autossh_1.4g.bb @@ -2,9 +2,8 @@ DESCRIPTION = "autossh is a program to start a copy of ssh and monitor it, resta HOMEPAGE = "https://www.harding.motd.ca/autossh/" LICENSE = "BSD-1-Clause & BSD-4-Clause" -LIC_FILES_CHKSUM = "file://autossh.spec;md5=80a6701134723fd3420e733b46a0eb97 \ - file://autossh.c;md5=76c37acd40ac45050a4ced145b1e2707;startline=7;endline=23 \ - file://daemon.h;md5=6bbeaac616b9bc8de7b40049004f4289;startline=7;endline=39" +LIC_FILES_CHKSUM = "file://autossh.c;beginline=7;endline=22;md5=9ae0c9b04856148d77984ef58536732b \ + file://daemon.h;beginline=7;endline=36;md5=839bb7bf781ff48da4a3fec2a62a1a47" SRC_URI = "https://www.harding.motd.ca/autossh/${BP}.tgz" SRC_URI[md5sum] = "2b804bc1bf6d2f2afaa526d02df7c0a2" diff --git a/meta-networking/recipes-connectivity/bearssl/bearssl/0002-test-test_x509.c-fix-potential-overflow-issue.patch b/meta-networking/recipes-connectivity/bearssl/bearssl/0002-test-test_x509.c-fix-potential-overflow-issue.patch index 94abd27faf..e0e5c13588 100644 --- a/meta-networking/recipes-connectivity/bearssl/bearssl/0002-test-test_x509.c-fix-potential-overflow-issue.patch +++ b/meta-networking/recipes-connectivity/bearssl/bearssl/0002-test-test_x509.c-fix-potential-overflow-issue.patch @@ -19,6 +19,8 @@ Fixes: Signed-off-by: Jens Rehsack <sno@netbsd.org> --- +Upstream-Status: Pending + test/test_x509.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-networking/recipes-connectivity/blueman/blueman_2.3.5.bb b/meta-networking/recipes-connectivity/blueman/blueman_2.3.5.bb index 2343cec71a..0374d23f0c 100644 --- a/meta-networking/recipes-connectivity/blueman/blueman_2.3.5.bb +++ b/meta-networking/recipes-connectivity/blueman/blueman_2.3.5.bb @@ -4,7 +4,9 @@ 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 +inherit meson gettext systemd gsettings pkgconfig python3native gtk-icon-cache useradd features_check + +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" SRC_URI = " \ git://github.com/blueman-project/blueman.git;protocol=https;branch=2-3-stable \ @@ -23,6 +25,7 @@ SYSTEMD_AUTO_ENABLE:${PN} = "disable" RRECOMMENDS:${PN} += "adwaita-icon-theme" RDEPENDS:${PN} += " \ python3-core \ + python3-ctypes \ python3-dbus \ python3-pygobject \ python3-terminal \ @@ -58,3 +61,28 @@ do_install:append() { ${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-networking/recipes-connectivity/daq/daq_2.0.7.bb b/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb index 14d809f518..c5499ffeeb 100644 --- a/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb +++ b/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f9ce51a65dd738dc1ae631d8b21c40e0" PARALLEL_MAKE = "" -DEPENDS = "libpcap libpcre libdnet bison-native" +DEPENDS = "libpcap libpcre libdnet bison-native libnetfilter-queue" SRC_URI = "http://fossies.org/linux/misc/daq-${PV}.tar.gz \ file://disable-run-test-program-while-cross-compiling.patch \ @@ -19,7 +19,7 @@ SRC_URI[sha256sum] = "bdc4e5a24d1ea492c39ee213a63c55466a2e8114b6a9abed609927ae13 # # never look to /usr/local lib while cross compiling -EXTRA_OECONF = "--disable-nfq-module --disable-ipq-module --includedir=${includedir} \ +EXTRA_OECONF = "--enable-nfq-module --disable-ipq-module --includedir=${includedir} \ --with-libpcap-includes=${STAGING_INCDIR} --with-dnet-includes=${STAGING_LIBDIR}" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" diff --git a/meta-networking/recipes-connectivity/daq/files/0001-correct-the-location-of-unistd.h.patch b/meta-networking/recipes-connectivity/daq/files/0001-correct-the-location-of-unistd.h.patch index 4798a77f55..7587d44336 100644 --- a/meta-networking/recipes-connectivity/daq/files/0001-correct-the-location-of-unistd.h.patch +++ b/meta-networking/recipes-connectivity/daq/files/0001-correct-the-location-of-unistd.h.patch @@ -1,12 +1,15 @@ -From 10e7d4e4bfcb70344d18f0d4ce36068475747f25 Mon Sep 17 00:00:00 2001 +From b7d54de51553f6d09906c355bd0dd326890c8fe4 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 29 Mar 2017 15:59:43 -0700 Subject: [PATCH] correct the location of unistd.h +Upstream-Status: Pending + Signed-off-by: Khem Raj <raj.khem@gmail.com> --- os-daq-modules/daq_ipfw.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + os-daq-modules/daq_nfq.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/os-daq-modules/daq_ipfw.c b/os-daq-modules/daq_ipfw.c index 016beb0..c2a4175 100644 @@ -24,6 +27,22 @@ index 016beb0..c2a4175 100644 #include <netinet/in.h> #include <sys/socket.h> +diff --git a/os-daq-modules/daq_nfq.c b/os-daq-modules/daq_nfq.c +index 33021c0..4de94b6 100644 +--- a/os-daq-modules/daq_nfq.c ++++ b/os-daq-modules/daq_nfq.c +@@ -24,10 +24,10 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#include <unistd.h> + + #include <sys/types.h> + #include <sys/time.h> +-#include <sys/unistd.h> + + #include <netinet/ip.h> + -- -2.12.1 +2.25.1 diff --git a/meta-networking/recipes-connectivity/daq/files/disable-run-test-program-while-cross-compiling.patch b/meta-networking/recipes-connectivity/daq/files/disable-run-test-program-while-cross-compiling.patch index a100b7cb83..cb986b85da 100644 --- a/meta-networking/recipes-connectivity/daq/files/disable-run-test-program-while-cross-compiling.patch +++ b/meta-networking/recipes-connectivity/daq/files/disable-run-test-program-while-cross-compiling.patch @@ -1,4 +1,4 @@ -Upstream-Status:Inappropriate [embedded specific] +Upstream-Status: Inappropriate [embedded specific] fix the below error: configure: error: cannot run test program while cross compiling diff --git a/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3p1.bb b/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3p1.bb index 2fd86bc28a..e5f7e0334f 100644 --- a/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3p1.bb +++ b/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3p1.bb @@ -34,7 +34,14 @@ SYSTEMD_AUTO_ENABLE:${PN} = "disable" CFLAGS += "-D_GNU_SOURCE -fcommon" LDFLAGS:append = " -pthread" -EXTRA_OECONF = "--enable-paranoia \ +BIND_EXTRA_CONFIG = "\ + --build=${BUILD_SYS} \ + --host=${HOST_SYS} \ + --target=${TARGET_SYS} \ +" + +EXTRA_OECONF = "--with-bind-extra-config="${BIND_EXTRA_CONFIG}" \ + --enable-paranoia \ --disable-static \ --enable-libtool \ --with-randomdev=/dev/random \ @@ -60,3 +67,6 @@ do_install:append () { } PARALLEL_MAKE = "" + +# dhcp-relay contains a bundled "bind", thus their dev packages conflict each other +RCONFLICTS:${PN}-dev = "bind-dev" diff --git a/meta-networking/recipes-connectivity/dibbler/dibbler/0001-port-linux-Re-order-header-includes.patch b/meta-networking/recipes-connectivity/dibbler/dibbler/0001-port-linux-Re-order-header-includes.patch index 27a562bf22..884be404b5 100644 --- a/meta-networking/recipes-connectivity/dibbler/dibbler/0001-port-linux-Re-order-header-includes.patch +++ b/meta-networking/recipes-connectivity/dibbler/dibbler/0001-port-linux-Re-order-header-includes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] port-linux: Re-order header includes linux/if.h when included before net/if.h casues duplicate definitions -Upstream-Status: Iappropriate [Upstream is Dead] +Upstream-Status: Inappropriate [Upstream is Dead] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- Port-linux/interface.c | 2 +- diff --git a/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch b/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch index 42d2627a1a..439ef1177d 100644 --- a/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch +++ b/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: git/ClntMessages/ClntMsgRequest.cpp =================================================================== --- git.orig/ClntMessages/ClntMsgRequest.cpp diff --git a/meta-networking/recipes-connectivity/ez-ipupdate/files/Makefile.am.patch b/meta-networking/recipes-connectivity/ez-ipupdate/files/Makefile.am.patch index d80ed3e29d..dde233121a 100644 --- a/meta-networking/recipes-connectivity/ez-ipupdate/files/Makefile.am.patch +++ b/meta-networking/recipes-connectivity/ez-ipupdate/files/Makefile.am.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Remove EXTRASRC and EXTRAOBJ from obj list --- ez-ipupdate-3.0.11b7/Makefile.am.orig 2014-07-02 13:47:50.758034983 -0600 diff --git a/meta-networking/recipes-connectivity/ez-ipupdate/files/cache_file.c.patch b/meta-networking/recipes-connectivity/ez-ipupdate/files/cache_file.c.patch index de5eb3a6d1..0199cb1278 100644 --- a/meta-networking/recipes-connectivity/ez-ipupdate/files/cache_file.c.patch +++ b/meta-networking/recipes-connectivity/ez-ipupdate/files/cache_file.c.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Dont assume errno type --- ez-ipupdate-3.0.11b7/cache_file.c.orig 2014-07-02 14:01:07.126029412 -0600 diff --git a/meta-networking/recipes-connectivity/ez-ipupdate/files/conf_file.c.patch b/meta-networking/recipes-connectivity/ez-ipupdate/files/conf_file.c.patch index 02218a39ea..6325c1873f 100644 --- a/meta-networking/recipes-connectivity/ez-ipupdate/files/conf_file.c.patch +++ b/meta-networking/recipes-connectivity/ez-ipupdate/files/conf_file.c.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Dont assume errno type --- ez-ipupdate-3.0.11b7/conf_file.c.orig 2014-07-02 14:01:19.174029328 -0600 diff --git a/meta-networking/recipes-connectivity/ez-ipupdate/files/wformat.patch b/meta-networking/recipes-connectivity/ez-ipupdate/files/wformat.patch index 1de267f083..3b791559d5 100644 --- a/meta-networking/recipes-connectivity/ez-ipupdate/files/wformat.patch +++ b/meta-networking/recipes-connectivity/ez-ipupdate/files/wformat.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: ez-ipupdate-3.0.11b7/ez-ipupdate.c =================================================================== --- ez-ipupdate-3.0.11b7.orig/ez-ipupdate.c diff --git a/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.26.bb b/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.26.bb index 4a23c9d906..35733c5307 100644 --- a/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.26.bb +++ b/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.26.bb @@ -41,10 +41,10 @@ raddbdir = "${sysconfdir}/${MLPREFIX}raddb" SRCREV = "d956f683d37ea40e7977cc5907361f3e6988a439" -CVE_CHECK_IGNORE = "\ - CVE-2002-0318 \ - CVE-2011-4966 \ -" +UPSTREAM_CHECK_GITTAGREGEX = "release_(?P<pver>\d+(\_\d+)+)" + +CVE_CHECK_STATUS[CVE-2002-0318] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." +CVE_CHECK_STATUS[CVE-2011-4966] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." PARALLEL_MAKE = "" diff --git a/meta-networking/recipes-connectivity/libdnet/libdnet/0001-configure-Replace-use-of-AC_EGREP_CPP.patch b/meta-networking/recipes-connectivity/libdnet/libdnet/0001-configure-Replace-use-of-AC_EGREP_CPP.patch new file mode 100644 index 0000000000..133ccc46b2 --- /dev/null +++ b/meta-networking/recipes-connectivity/libdnet/libdnet/0001-configure-Replace-use-of-AC_EGREP_CPP.patch @@ -0,0 +1,39 @@ +From b0c98f93a7f427d18206c79bf2a0350dc81172f6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 6 Apr 2023 10:44:08 -0700 +Subject: [PATCH] configure: Replace use of AC_EGREP_CPP + +Use AC_COMPILE_IFELSE instead to compute platform support for arp ioctls +AC_EGREP_CPP does not work as used with upcoming autoconf 2.72 + +Upstream-Status: Submitted [https://github.com/ofalk/libdnet/pull/85] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + m4/acinclude.m4 | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 +index d6350a2..3699bf1 100644 +--- a/m4/acinclude.m4 ++++ b/m4/acinclude.m4 +@@ -196,12 +196,11 @@ dnl + AC_DEFUN([AC_DNET_IOCTL_ARP], + [AC_MSG_CHECKING(for arp(7) ioctls) + AC_CACHE_VAL(ac_cv_dnet_ioctl_arp, +- AC_EGREP_CPP(werd,[#include <sys/types.h> +- #define BSD_COMP +- #include <sys/ioctl.h> +- #ifdef SIOCGARP +- werd +- #endif], ++ AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM([[#include <sys/types.h> ++ #define BSD_COMP ++ #include <sys/ioctl.h>]], ++ [[int foo = SIOCGARP;]])], + ac_cv_dnet_ioctl_arp=yes, + ac_cv_dnet_ioctl_arp=no)) + case "$host_os" in +-- +2.40.0 + diff --git a/meta-networking/recipes-connectivity/libdnet/libdnet/0001-configure-Use-pkg-config-variable-to-find-check-incl.patch b/meta-networking/recipes-connectivity/libdnet/libdnet/0001-configure-Use-pkg-config-variable-to-find-check-incl.patch new file mode 100644 index 0000000000..8a78e7ac28 --- /dev/null +++ b/meta-networking/recipes-connectivity/libdnet/libdnet/0001-configure-Use-pkg-config-variable-to-find-check-incl.patch @@ -0,0 +1,27 @@ +From 85d8338a3ebc01a3ea7600aa602139c4eac3be07 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 6 Apr 2023 12:13:09 -0700 +Subject: [PATCH] configure: Use pkg-config variable to find check include paths + +Upstream-Status: Submitted [https://github.com/ofalk/libdnet/pull/85] +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 3f0c404..553b487 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -153,7 +153,7 @@ AC_ARG_WITH(check, + esac ], + [ PKG_CHECK_MODULES([CHECK], [check]) + if test -n "${CHECK_LIBS}"; then +- CHECKINC="-I${prefix}/include" ++ CHECKINC="${CHECK_CFLAGS}" + CHECKLIB="${CHECK_LIBS}" + AC_MSG_RESULT(yes) + else +-- +2.40.0 + diff --git a/meta-networking/recipes-connectivity/libdnet/libdnet_1.14.bb b/meta-networking/recipes-connectivity/libdnet/libdnet_1.14.bb deleted file mode 100644 index 9f2ff51576..0000000000 --- a/meta-networking/recipes-connectivity/libdnet/libdnet_1.14.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "dumb networking library" -HOMEPAGE = "http://code.google.com/p/libdnet/" -SECTION = "libs" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0036c1b155f4e999f3e0a373490b5db9" - -SRC_URI = "git://github.com/dugsong/libdnet.git;nobranch=1;protocol=https" -SRCREV = "3e782472d2a58d5e1b94d04eda4a364c2d257600" - -UPSTREAM_CHECK_GITTAGREGEX = "libdnet-(?P<pver>\d+(\.\d+)+)" - -S = "${WORKDIR}/git" - -inherit autotools multilib_script - -acpaths = "-I ./config/" - -BBCLASSEXTEND = "native" - -MULTILIB_SCRIPTS = "${PN}:${bindir}/dnet-config" diff --git a/meta-networking/recipes-connectivity/libdnet/libdnet_1.16.3.bb b/meta-networking/recipes-connectivity/libdnet/libdnet_1.16.3.bb new file mode 100644 index 0000000000..05c8fb309f --- /dev/null +++ b/meta-networking/recipes-connectivity/libdnet/libdnet_1.16.3.bb @@ -0,0 +1,23 @@ +SUMMARY = "dumb networking library" +HOMEPAGE = "https://github.com/ofalk/libdnet" +SECTION = "libs" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0036c1b155f4e999f3e0a373490b5db9" + +SRC_URI = "git://github.com/ofalk/libdnet.git;nobranch=1;protocol=https \ + file://0001-configure-Replace-use-of-AC_EGREP_CPP.patch \ + file://0001-configure-Use-pkg-config-variable-to-find-check-incl.patch" +SRCREV = "a03043bec8e66b240a45555e37147b22db182c21" + +UPSTREAM_CHECK_GITTAGREGEX = "libdnet-(?P<pver>\d+(\.\d+)+)" + +S = "${WORKDIR}/git" + +inherit autotools multilib_script pkgconfig + +DEPENDS += "libcheck" + +EXTRA_AUTORECONF += "-I ./config" +BBCLASSEXTEND = "native" + +MULTILIB_SCRIPTS = "${PN}:${bindir}/dnet-config" diff --git a/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch b/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch index 2168a0713c..3f0490cb80 100644 --- a/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch +++ b/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch @@ -8,6 +8,8 @@ https://stackoverflow.com/questions/1242904/finding-python-site-packages-directo Signed-off-by: Romain Naour <romain.naour@smile.fr> --- +Upstream-Status: Pending + pyiec61850/CMakeLists.txt | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls/0001-aesce-do-not-specify-an-arch-version-when-enabling-c.patch b/meta-networking/recipes-connectivity/mbedtls/mbedtls/0001-aesce-do-not-specify-an-arch-version-when-enabling-c.patch new file mode 100644 index 0000000000..d98d8fa575 --- /dev/null +++ b/meta-networking/recipes-connectivity/mbedtls/mbedtls/0001-aesce-do-not-specify-an-arch-version-when-enabling-c.patch @@ -0,0 +1,33 @@ +From 2246925e3cb16183e25d4e2cfd13fb800df86270 Mon Sep 17 00:00:00 2001 +From: Beniamin Sandu <beniaminsandu@gmail.com> +Date: Sun, 25 Jun 2023 19:58:08 +0300 +Subject: [PATCH] aesce: do not specify an arch version when enabling crypto + instructions + +Building mbedtls with different aarch64 tuning variations revealed +that we should use the crypto extensions without forcing a particular +architecture version or core, as that can create issues. + +Upstream-Status: Submitted [https://github.com/Mbed-TLS/mbedtls/pull/7834] + +Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com> +--- + library/aesce.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/library/aesce.c b/library/aesce.c +index fe056dc4c..843de3973 100644 +--- a/library/aesce.c ++++ b/library/aesce.c +@@ -60,7 +60,7 @@ + # error "A more recent GCC is required for MBEDTLS_AESCE_C" + # endif + # pragma GCC push_options +-# pragma GCC target ("arch=armv8-a+crypto") ++# pragma GCC target ("+crypto") + # define MBEDTLS_POP_TARGET_PRAGMA + # else + # error "Only GCC and Clang supported for MBEDTLS_AESCE_C" +-- +2.25.1 + diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls/0002-aesce-use-correct-target-attribute-when-building-wit.patch b/meta-networking/recipes-connectivity/mbedtls/mbedtls/0002-aesce-use-correct-target-attribute-when-building-wit.patch new file mode 100644 index 0000000000..4775c8ddb7 --- /dev/null +++ b/meta-networking/recipes-connectivity/mbedtls/mbedtls/0002-aesce-use-correct-target-attribute-when-building-wit.patch @@ -0,0 +1,34 @@ +From 03d3523f974536f2358047382aadb0d4cc762f8a Mon Sep 17 00:00:00 2001 +From: Beniamin Sandu <beniaminsandu@gmail.com> +Date: Mon, 26 Jun 2023 12:07:21 +0300 +Subject: [PATCH] aesce: use correct target attribute when building with clang + +Seems clang has its own issues when it comes to crypto extensions, +and right now the best way to avoid them is to accurately enable +the needed instructions instead of the broad crypto feature. + +E.g.: https://github.com/llvm/llvm-project/issues/61645 + +Upstream-Status: Pending + +Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com> +--- + library/aesce.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/library/aesce.c b/library/aesce.c +index 843de3973..7bea088ba 100644 +--- a/library/aesce.c ++++ b/library/aesce.c +@@ -53,7 +53,7 @@ + # if __clang_major__ < 4 + # error "A more recent Clang is required for MBEDTLS_AESCE_C" + # endif +-# pragma clang attribute push (__attribute__((target("crypto"))), apply_to=function) ++# pragma clang attribute push (__attribute__((target("aes"))), apply_to=function) + # define MBEDTLS_POP_TARGET_PRAGMA + # elif defined(__GNUC__) + # if __GNUC__ < 6 +-- +2.25.1 + diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls/run-ptest b/meta-networking/recipes-connectivity/mbedtls/mbedtls/run-ptest new file mode 100644 index 0000000000..059ab4ecbb --- /dev/null +++ b/meta-networking/recipes-connectivity/mbedtls/mbedtls/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +ptestdir=$(dirname "$(readlink -f "$0")") +cd "$ptestdir"/tests || exit + +tests=$(find * -type f -name 'test_suite_*') + +for f in $tests +do + if test -x ./"$f"; then + if ./"$f" > ./"$f".out 2> ./"$f".err; then + echo "PASS: $f" + else + echo "FAIL: $f" + fi + fi +done diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.3.bb b/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.3.bb new file mode 100644 index 0000000000..fff320afd8 --- /dev/null +++ b/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.3.bb @@ -0,0 +1,80 @@ +SUMMARY = "Lightweight crypto and SSL/TLS library" +DESCRIPTION = "mbedtls is a lean open source crypto library \ +for providing SSL and TLS support in your programs. It offers \ +an intuitive API and documented header files, so you can actually \ +understand what the code does. It features: \ + \ + - Symmetric algorithms, like AES, Blowfish, Triple-DES, DES, ARC4, \ + Camellia and XTEA \ + - Hash algorithms, like SHA-1, SHA-2, RIPEMD-160 and MD5 \ + - Entropy pool and random generators, like CTR-DRBG and HMAC-DRBG \ + - Public key algorithms, like RSA, Elliptic Curves, Diffie-Hellman, \ + ECDSA and ECDH \ + - SSL v3 and TLS 1.0, 1.1 and 1.2 \ + - Abstraction layers for ciphers, hashes, public key operations, \ + platform abstraction and threading \ +" + +HOMEPAGE = "https://tls.mbed.org/" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SECTION = "libs" + +S = "${WORKDIR}/git" +SRCREV = "981743de6fcdbe672e482b6fd724d31d0a0d2476" +SRC_URI = "git://github.com/ARMmbed/mbedtls.git;protocol=https;branch=mbedtls-2.28 \ + file://run-ptest \ + " + +inherit cmake update-alternatives ptest + +PACKAGECONFIG ??= "shared-libs programs ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" +PACKAGECONFIG[shared-libs] = "-DUSE_SHARED_MBEDTLS_LIBRARY=ON,-DUSE_SHARED_MBEDTLS_LIBRARY=OFF" +PACKAGECONFIG[programs] = "-DENABLE_PROGRAMS=ON,-DENABLE_PROGRAMS=OFF" +PACKAGECONFIG[werror] = "-DMBEDTLS_FATAL_WARNINGS=ON,-DMBEDTLS_FATAL_WARNINGS=OFF" +# Make X.509 and TLS calls use PSA +# https://github.com/Mbed-TLS/mbedtls/blob/development/docs/use-psa-crypto.md +PACKAGECONFIG[psa] = "" +PACKAGECONFIG[tests] = "-DENABLE_TESTING=ON,-DENABLE_TESTING=OFF" + +EXTRA_OECMAKE = "-DLIB_INSTALL_DIR:STRING=${libdir}" + +# For now the only way to enable PSA is to explicitly pass a -D via CFLAGS +CFLAGS:append = "${@bb.utils.contains('PACKAGECONFIG', 'psa', ' -DMBEDTLS_USE_PSA_CRYPTO', '', d)}" + +PROVIDES += "polarssl" +RPROVIDES:${PN} = "polarssl" + +PACKAGES =+ "${PN}-programs" +FILES:${PN}-programs = "${bindir}/" + +ALTERNATIVE:${PN}-programs = "hello" +ALTERNATIVE_LINK_NAME[hello] = "${bindir}/hello" + +BBCLASSEXTEND = "native nativesdk" + +CVE_PRODUCT = "mbed_tls" + +CVE_STATUS[CVE-2021-43666] = "backported-patch: Fix merged upstream https://github.com/Mbed-TLS/mbedtls/pull/5310" +CVE_STATUS[CVE-2021-43666] = "backported-patch: Fix merged upstream https://github.com/Mbed-TLS/mbedtls/commit/9a4a9c66a48edfe9ece03c7e4a53310adf73a86c" + +# Strip host paths from autogenerated test files +do_compile:append() { + sed -i 's+${S}/++g' ${B}/tests/*.c 2>/dev/null || : + sed -i 's+${B}/++g' ${B}/tests/*.c 2>/dev/null || : +} + +# Export source files/headers needed by Arm Trusted Firmware +sysroot_stage_all:append() { + sysroot_stage_dir "${S}/library" "${SYSROOT_DESTDIR}/usr/share/mbedtls-source/library" + sysroot_stage_dir "${S}/include" "${SYSROOT_DESTDIR}/usr/share/mbedtls-source/include" +} + +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + 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/ +} diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.2.bb b/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.4.0.bb index f5f1236f18..10fb7de8ca 100644 --- a/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.2.bb +++ b/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.4.0.bb @@ -23,20 +23,24 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SECTION = "libs" S = "${WORKDIR}/git" -SRCREV = "89f040a5c938985c5f30728baed21e49d0846a53" -SRC_URI = "git://github.com/ARMmbed/mbedtls.git;protocol=https;branch=mbedtls-2.28" +SRCREV = "1873d3bfc2da771672bd8e7e8f41f57e0af77f33" +SRC_URI = "git://github.com/ARMmbed/mbedtls.git;protocol=https;branch=master \ + file://0001-aesce-do-not-specify-an-arch-version-when-enabling-c.patch \ + file://0002-aesce-use-correct-target-attribute-when-building-wit.patch \ + file://run-ptest" -inherit cmake +inherit cmake update-alternatives ptest -PACKAGECONFIG ??= "shared-libs programs" +PACKAGECONFIG ??= "shared-libs programs ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" PACKAGECONFIG[shared-libs] = "-DUSE_SHARED_MBEDTLS_LIBRARY=ON,-DUSE_SHARED_MBEDTLS_LIBRARY=OFF" PACKAGECONFIG[programs] = "-DENABLE_PROGRAMS=ON,-DENABLE_PROGRAMS=OFF" PACKAGECONFIG[werror] = "-DMBEDTLS_FATAL_WARNINGS=ON,-DMBEDTLS_FATAL_WARNINGS=OFF" # Make X.509 and TLS calls use PSA # https://github.com/Mbed-TLS/mbedtls/blob/development/docs/use-psa-crypto.md PACKAGECONFIG[psa] = "" +PACKAGECONFIG[tests] = "-DENABLE_TESTING=ON,-DENABLE_TESTING=OFF" -EXTRA_OECMAKE = "-DENABLE_TESTING=OFF -DLIB_INSTALL_DIR:STRING=${libdir}" +EXTRA_OECMAKE = "-DLIB_INSTALL_DIR:STRING=${libdir}" # For now the only way to enable PSA is to explicitly pass a -D via CFLAGS CFLAGS:append = "${@bb.utils.contains('PACKAGECONFIG', 'psa', ' -DMBEDTLS_USE_PSA_CRYPTO', '', d)}" @@ -47,17 +51,28 @@ RPROVIDES:${PN} = "polarssl" PACKAGES =+ "${PN}-programs" FILES:${PN}-programs = "${bindir}/" +ALTERNATIVE:${PN}-programs = "hello" +ALTERNATIVE_LINK_NAME[hello] = "${bindir}/hello" + BBCLASSEXTEND = "native nativesdk" CVE_PRODUCT = "mbed_tls" -# Fix merged upstream https://github.com/Mbed-TLS/mbedtls/pull/5310 -CVE_CHECK_IGNORE += "CVE-2021-43666" -# Fix merged upstream https://github.com/Mbed-TLS/mbedtls/commit/9a4a9c66a48edfe9ece03c7e4a53310adf73a86c -CVE_CHECK_IGNORE += "CVE-2021-45451" +# Strip host paths from autogenerated test files +do_compile:append() { + sed -i 's+${S}/++g' ${B}/tests/*.c 2>/dev/null || : + sed -i 's+${B}/++g' ${B}/tests/*.c 2>/dev/null || : +} # Export source files/headers needed by Arm Trusted Firmware sysroot_stage_all:append() { sysroot_stage_dir "${S}/library" "${SYSROOT_DESTDIR}/usr/share/mbedtls-source/library" sysroot_stage_dir "${S}/include" "${SYSROOT_DESTDIR}/usr/share/mbedtls-source/include" } + +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + 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/ +} diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0001-fix-ppp-2.5.0-build.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0001-fix-ppp-2.5.0-build.patch new file mode 100644 index 0000000000..0a568fa23c --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0001-fix-ppp-2.5.0-build.patch @@ -0,0 +1,306 @@ +From 084ef529c5fb816927ca54866f66b340265aa9f6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Eivind=20N=C3=A6ss?= <eivnaes@yahoo.com> +Date: Sat, 4 Mar 2023 21:20:43 +0000 +Subject: [PATCH] Adding support for compiling against pppd-2.5.0 (or master + branch) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Accepted +Signed-off-by: Eivind Næss <eivnaes@yahoo.com> +--- + Makefile.am | 5 +- + configure.ac | 37 +++++++- + src/nm-fortisslvpn-pppd-compat.h | 93 +++++++++++++++++++ + src/nm-fortisslvpn-pppd-plugin.c | 24 ++--- + ...-status.h => nm-fortisslvpn-pppd-status.h} | 0 + src/nm-fortisslvpn-service.c | 2 +- + 6 files changed, 145 insertions(+), 16 deletions(-) + create mode 100644 src/nm-fortisslvpn-pppd-compat.h + rename src/{nm-ppp-status.h => nm-fortisslvpn-pppd-status.h} (100%) + +diff --git a/Makefile.am b/Makefile.am +index b2e5533..e1e5ec9 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -81,7 +81,7 @@ libexec_PROGRAMS += src/nm-fortisslvpn-service + src_nm_fortisslvpn_service_SOURCES = \ + shared/nm-utils/nm-shared-utils.c \ + shared/nm-utils/nm-shared-utils.h \ +- src/nm-ppp-status.h \ ++ src/nm-fortisslvpn-pppd-status.h \ + src/nm-fortisslvpn-service.h \ + src/nm-fortisslvpn-service.c \ + shared/nm-fortissl-properties.c \ +@@ -106,7 +106,8 @@ src_nm_fortisslvpn_pppd_plugin_la_SOURCES = \ + shared/nm-utils/nm-shared-utils.c \ + shared/nm-utils/nm-shared-utils.h \ + src/nm-fortisslvpn-pppd-plugin.c \ +- src/nm-ppp-status.h ++ src/nm-fortisslvpn-pppd-compat.h \ ++ src/nm-fortisslvpn-pppd-status.h + nodist_src_nm_fortisslvpn_pppd_plugin_la_SOURCES = \ + src/nm-fortisslvpn-pppd-service-dbus.h + src_nm_fortisslvpn_pppd_plugin_la_CPPFLAGS = $(src_cppflags) +diff --git a/configure.ac b/configure.ac +index a998707..877493e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -19,7 +19,10 @@ AC_PROG_CC + AM_PROG_CC_C_O + AC_PROG_INSTALL + AC_PROG_LIBTOOL ++AC_PROG_CPP ++AC_PROG_EGREP + AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources) ++PKG_PROG_PKG_CONFIG() + + AC_GNU_SOURCE + +@@ -37,20 +40,50 @@ dnl + dnl Required headers + dnl + AC_HEADER_STDC +-AC_CHECK_HEADERS(fcntl.h paths.h sys/ioctl.h sys/time.h syslog.h unistd.h) ++AC_CHECK_HEADERS(fcntl.h paths.h stdarg.h stdbool.h sys/ioctl.h sys/time.h syslog.h unistd.h) + + AC_CHECK_HEADERS(pppd/pppd.h,, + AC_MSG_ERROR(couldn't find pppd.h. pppd development headers are required.)) + ++dnl ++dnl Check the presense of other pppd/*.h files ++AC_CHECK_HEADERS([ ++ pppd/chap.h ++ pppd/chap-new.h ++ pppd/chap_ms.h ++ ]) ++ ++dnl ++dnl Versions >= 2.5.0 will have pkg-config support ++PKG_CHECK_EXISTS([pppd], ++ [AS_VAR_SET([pppd_pkgconfig_support],[yes])]) ++ ++dnl ++dnl Get the version of pppd using pkg-config, assume 2.4.9 if not present ++PPPD_VERSION=2.4.5 ++if test x"$pppd_pkgconfig_support" = xyes; then ++ PPPD_VERSION=`$PKG_CONFIG --modversion pppd` ++fi ++ ++ + AC_ARG_WITH([pppd-plugin-dir], AS_HELP_STRING([--with-pppd-plugin-dir=DIR], [path to the pppd plugins directory])) + + if test -n "$with_pppd_plugin_dir" ; then + PPPD_PLUGIN_DIR="$with_pppd_plugin_dir" + else +- PPPD_PLUGIN_DIR="${libdir}/pppd/2.4.5" ++ PPPD_PLUGIN_DIR="${libdir}/pppd/$PPPD_VERSION" + fi + AC_SUBST(PPPD_PLUGIN_DIR) + ++dnl The version of pppd dictates what code can be included, i.e. enable use of ++dnl #if WITH_PPP_VERSION >= PPP_VERSION(2,5,0) in the code ++AC_DEFINE_UNQUOTED([PPP_VERSION(x,y,z)], ++ [((x & 0xFF) << 16 | (y & 0xFF) << 8 | (z & 0xFF) << 0)], ++ [Macro to help determine the particular version of pppd]) ++PPP_VERSION=$(echo $PPPD_VERSION | sed -e "s/\./\,/g") ++AC_DEFINE_UNQUOTED(WITH_PPP_VERSION, PPP_VERSION($PPP_VERSION), ++ [The real version of pppd represented as an int]) ++ + dnl + dnl Checks for typedefs, structures, and compiler characteristics. + dnl +diff --git a/src/nm-fortisslvpn-pppd-compat.h b/src/nm-fortisslvpn-pppd-compat.h +new file mode 100644 +index 0000000..9a02908 +--- /dev/null ++++ b/src/nm-fortisslvpn-pppd-compat.h +@@ -0,0 +1,93 @@ ++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ ++/* nm-sstp-service - sstp (and other pppd) integration with NetworkManager ++ * ++ * Copyright (C) Eivind Næss, eivnaes@yahoo.com ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; 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 ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ */ ++ ++#ifndef __NM_FORTISSLVPN_PPPD_COMPAT_H__ ++#define __NM_FORTISSLVPN_PPPD_COMPAT_H__ ++ ++#define INET6 1 ++ ++// PPP < 2.5.0 defines and exports VERSION which overlaps with current package VERSION define. ++// this silly macro magic is to work around that. ++ ++#undef VERSION ++#include <pppd/pppd.h> ++ ++#ifndef PPPD_VERSION ++#define PPPD_VERSION VERSION ++#endif ++ ++#include <pppd/fsm.h> ++#include <pppd/ccp.h> ++#include <pppd/eui64.h> ++#include <pppd/ipcp.h> ++#include <pppd/ipv6cp.h> ++#include <pppd/eap.h> ++#include <pppd/upap.h> ++ ++#ifdef HAVE_PPPD_CHAP_H ++ #include <pppd/chap.h> ++#endif ++ ++#ifdef HAVE_PPPD_CHAP_NEW_H ++ #include <pppd/chap-new.h> ++#endif ++ ++#ifdef HAVE_PPPD_CHAP_MS_H ++ #include <pppd/chap_ms.h> ++#endif ++ ++#ifndef PPP_PROTO_CHAP ++#define PPP_PROTO_CHAP 0xc223 ++#endif ++ ++#ifndef PPP_PROTO_EAP ++#define PPP_PROTO_EAP 0xc227 ++#endif ++ ++#if WITH_PPP_VERSION < PPP_VERSION(2,5,0) ++ ++static inline bool debug_on(void) ++{ ++ return debug; ++} ++ ++static inline const char *ppp_ipparam(void) ++{ ++ return ipparam; ++} ++ ++static inline int ppp_ifunit(void) ++{ ++ return ifunit; ++} ++ ++static inline const char *ppp_ifname(void) ++{ ++ return ifname; ++} ++ ++static inline int ppp_get_mtu(int idx) ++{ ++ return netif_get_mtu(idx); ++} ++ ++#endif // #if WITH_PPP_VERSION < PPP_VERSION(2,5,0) ++#endif // #ifdef __NM_FORTISSLVPN_PPPD_COMPAT_H__ +diff --git a/src/nm-fortisslvpn-pppd-plugin.c b/src/nm-fortisslvpn-pppd-plugin.c +index f2ad262..c2efb9a 100644 +--- a/src/nm-fortisslvpn-pppd-plugin.c ++++ b/src/nm-fortisslvpn-pppd-plugin.c +@@ -23,12 +23,6 @@ + #define ___CONFIG_H__ + #include <config.h> + +-#include <pppd/pppd.h> +-#include <pppd/fsm.h> +-#include <pppd/ipcp.h> +- +-#include "nm-default.h" +- + #include <sys/types.h> + #include <string.h> + #include <sys/socket.h> +@@ -42,10 +36,12 @@ + #include <grp.h> + #include <glib/gstdio.h> + ++#include "nm-fortisslvpn-pppd-status.h" ++#include "nm-fortisslvpn-pppd-compat.h" + #include "nm-fortisslvpn-pppd-service-dbus.h" +-#include "nm-fortisslvpn-service.h" +-#include "nm-ppp-status.h" + ++#include "nm-default.h" ++#include "nm-fortisslvpn-service.h" + #include "nm-utils/nm-shared-utils.h" + #include "nm-utils/nm-vpn-plugin-macros.h" + +@@ -80,7 +76,7 @@ static struct { + + int plugin_init (void); + +-char pppd_version[] = VERSION; ++char pppd_version[] = PPPD_VERSION; + + static void + chroot_sandbox (void) +@@ -296,7 +292,7 @@ get_ip4_routes (in_addr_t ouraddr) + static void + nm_ip_up (void *data, int arg) + { +- guint32 pppd_made_up_address = htonl (0x0a404040 + ifunit); ++ guint32 pppd_made_up_address = htonl (0x0a404040 + ppp_ifunit()); + ipcp_options opts = ipcp_gotoptions[0]; + ipcp_options peer_opts = ipcp_hisoptions[0]; + GVariantBuilder builder; +@@ -317,7 +313,7 @@ nm_ip_up (void *data, int arg) + + g_variant_builder_add (&builder, "{sv}", + NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV, +- g_variant_new_string (ifname)); ++ g_variant_new_string (ppp_ifname())); + + str = g_getenv ("VPN_GATEWAY"); + if (str) { +@@ -442,8 +438,14 @@ plugin_init (void) + return -1; + } + ++#if WITH_PPP_VERSION < PPP_VERSION(2,5,0) + add_notifier (&phasechange, nm_phasechange, NULL); + add_notifier (&ip_up_notifier, nm_ip_up, NULL); + add_notifier (&exitnotify, nm_exit_notify, NULL); ++#else ++ ppp_add_notify (NF_PHASE_CHANGE, nm_phasechange, NULL); ++ ppp_add_notify (NF_IP_UP, nm_ip_up, NULL); ++ ppp_add_notify (NF_EXIT, nm_exit_notify, NULL); ++#endif + return 0; + } +diff --git a/src/nm-ppp-status.h b/src/nm-fortisslvpn-pppd-status.h +similarity index 100% +rename from src/nm-ppp-status.h +rename to src/nm-fortisslvpn-pppd-status.h +diff --git a/src/nm-fortisslvpn-service.c b/src/nm-fortisslvpn-service.c +index 6c340d0..a8483c2 100644 +--- a/src/nm-fortisslvpn-service.c ++++ b/src/nm-fortisslvpn-service.c +@@ -40,7 +40,7 @@ + #include <glib/gstdio.h> + + #include "nm-fortissl-properties.h" +-#include "nm-ppp-status.h" ++#include "nm-fortisslvpn-pppd-status.h" + #include "nm-fortisslvpn-pppd-service-dbus.h" + #include "nm-utils/nm-shared-utils.h" + #include "nm-utils/nm-vpn-plugin-macros.h" +-- +GitLab + diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0002-fix-ppp-2.5.0-build.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0002-fix-ppp-2.5.0-build.patch new file mode 100644 index 0000000000..798a57b0da --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0002-fix-ppp-2.5.0-build.patch @@ -0,0 +1,34 @@ +From 8773f772d39f8eee6edc1fd2e5437c754ed41e1e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Eivind=20N=C3=A6ss?= <eivnaes@yahoo.com> +Date: Sat, 4 Mar 2023 21:29:54 +0000 +Subject: [PATCH] Fixing configure.ac from previous change +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Accepted +Signed-off-by: Eivind Næss <eivnaes@yahoo.com> +--- + configure.ac | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 877493e..a5b4abb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -47,11 +47,7 @@ AC_CHECK_HEADERS(pppd/pppd.h,, + + dnl + dnl Check the presense of other pppd/*.h files +-AC_CHECK_HEADERS([ +- pppd/chap.h +- pppd/chap-new.h +- pppd/chap_ms.h +- ]) ++AC_CHECK_HEADERS(pppd/chap.h pppd/chap-new.h pppd/chap_ms.h) + + dnl + dnl Versions >= 2.5.0 will have pkg-config support +-- +GitLab + diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn_1.4.0.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn_1.4.0.bb new file mode 100644 index 0000000000..a251e8bf3d --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn_1.4.0.bb @@ -0,0 +1,70 @@ +SUMMARY = "Fortinet SSLVPN support for NetworkManager" +SECTION = "net/misc" + +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +DEPENDS = "glib-2.0-native libxml2-native networkmanager ppp" + +inherit gnomebase gettext useradd + +SRC_URI = " \ + ${GNOME_MIRROR}/NetworkManager-fortisslvpn/${@gnome_verdir("${PV}")}/NetworkManager-fortisslvpn-${PV}.tar.xz \ + file://0001-fix-ppp-2.5.0-build.patch \ + file://0002-fix-ppp-2.5.0-build.patch \ +" +SRC_URI[sha256sum] = "b055e26349b516b23585798ab3ef57b436b014800e92a8ac732cfc8e76c5dafa" + +S = "${WORKDIR}/NetworkManager-fortisslvpn-${PV}" + +# meta-gnome in layers is required using gnome: +PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome,gtk+3 libnma libsecret," +PACKAGECONFIG[gtk4] = "--with-gtk4,--without-gtk4,gtk4," + +EXTRA_OECONF = "--with-pppd-plugin-dir=${libdir}/pppd/${@get_ppp_version(d)}" + +def get_ppp_version(d): + import re + + pppd_plugin = d.expand('${STAGING_LIBDIR}/pppd') + if not os.path.isdir(pppd_plugin): + return None + + bb.debug(1, "pppd plugin dir %s" % pppd_plugin) + r = re.compile(r"\d*\.\d*\.\d*") + for f in os.listdir(pppd_plugin): + if os.path.isdir(os.path.join(pppd_plugin, f)): + ma = r.match(f) + if ma: + bb.debug(1, "pppd version dir %s" % f) + return f + else: + bb.debug(1, "under pppd plugin dir %s" % f) + + return None + +# gdbus-codegen requires target directories to exist +do_configure:append() { + mkdir -p ${B}/properties + mkdir -p ${B}/src +} + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system nm-fortisslvpn" + +FILES:${PN} += " \ + ${libdir}/NetworkManager/*.so \ + ${libdir}/pppd/*/*.so \ + ${nonarch_libdir}/NetworkManager/VPN/nm-fortisslvpn-service.name \ +" + +FILES:${PN}-staticdev += " \ + ${libdir}/NetworkManager/*.a \ + ${libdir}/pppd/*/*.a \ +" + +RDEPENDS:${PN} = " \ + networkmanager \ + openfortivpn \ + ppp \ +" diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openconnect_1.2.8.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openconnect_1.2.8.bb new file mode 100644 index 0000000000..c978defbbf --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openconnect_1.2.8.bb @@ -0,0 +1,46 @@ +SUMMARY = "OpenConnect VPN client for NetworkManager" +SECTION = "net/misc" + +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=186e8b54342da4f753a62b7748c947db" + +DEPENDS = "glib-2.0-native intltool-native libxml2 networkmanager openconnect" + +inherit gnomebase useradd + +SRC_URI = "${GNOME_MIRROR}/NetworkManager-openconnect/${@gnome_verdir("${PV}")}/NetworkManager-openconnect-${PV}.tar.xz" + +SRC_URI[sha256sum] = "5dedaa785d82d8e239ddd082bfac5250c691e964464be1807b6827263633cdcc" + +S = "${WORKDIR}/NetworkManager-openconnect-${PV}" + +# meta-gnome in layers is required using gnome: +PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome,gtk+3 gcr3 libnma libsecret," +PACKAGECONFIG[gtk4] = "--with-gtk4,--without-gtk4,gtk4," + +do_configure:append() { + # network-manager-openconnect.metainfo.xml is created in source folder but + # compile expects it in build folder. As long as nobody comes up with a + # better solution just support build: + if [ -e ${S}/appdata/network-manager-openconnect.metainfo.xml ]; then + mkdir -p ${B}/appdata + cp -f ${S}/appdata/network-manager-openconnect.metainfo.xml ${B}/appdata/ + fi +} + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system nm-openconnect" + +FILES:${PN} += " \ + ${libdir}/NetworkManager/*.so \ + ${nonarch_libdir}/NetworkManager/VPN/nm-openconnect-service.name \ +" + +FILES:${PN}-staticdev += " \ + ${libdir}/NetworkManager/*.a \ +" + +RDEPENDS:${PN} = " \ + networkmanager \ + openconnect \ +" diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.40.10.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.42.8.bb index 0463bd487d..5d9c6f4274 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.40.10.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.42.8.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ " DEPENDS = " \ + python3-pygobject-native \ coreutils-native \ intltool-native \ libxslt-native \ @@ -30,7 +31,8 @@ SRC_URI = " \ file://enable-dhcpcd.conf \ file://enable-iwd.conf \ " -SRC_URI[sha256sum] = "fa251455df3c38e2bf1e1ff806b4bc4346938dd135a3568bd250e92caa85eaf7" + +SRC_URI[sha256sum] = "0337e7583d2ec5ade2ba2e8c625d2f09eeccda1d22836ee29aa72925d399c353" S = "${WORKDIR}/NetworkManager-${PV}" @@ -72,7 +74,7 @@ do_compile:prepend() { PACKAGECONFIG ??= "readline nss ifupdown dnsmasq nmcli vala \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'wifi polkit', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'wifi polkit ppp', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit', '', d)} \ " diff --git a/meta-networking/recipes-connectivity/openfortivpn/openfortivpn_1.20.5.bb b/meta-networking/recipes-connectivity/openfortivpn/openfortivpn_1.20.5.bb new file mode 100644 index 0000000000..bcfe646913 --- /dev/null +++ b/meta-networking/recipes-connectivity/openfortivpn/openfortivpn_1.20.5.bb @@ -0,0 +1,26 @@ +SUMMARY = "Client for PPP+SSL VPN tunnel services" +LICENSE = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3d575262a651a6f1a17210ce41bf907d" + +SRC_URI = "git://github.com/adrienverge/openfortivpn.git;protocol=https;branch=master" +SRCREV = "1ccb8ee682af255ae85fecd5fcbab6497ccb6b38" + +DEPENDS = "openssl" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" + +PACKAGECONFIG[resolvconf] = "--with-resolvconf=${base_sbindir}/resolvconf --enable-resolvconf,--with-resolvconf=DISABLED,," +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir,," + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig systemd + +EXTRA_OECONF = " \ + --with-pppd=${sbindir}/pppd \ + --disable-proc \ +" + +SYSTEMD_SERVICE:${PN} = "openfortivpn@.service" + +RDEPENDS:${PN} = "ppp" diff --git a/meta-networking/recipes-connectivity/openthread/ot-br-posix/mbedtls.patch b/meta-networking/recipes-connectivity/openthread/ot-br-posix/mbedtls.patch index 91b3046484..23e4368d27 100644 --- a/meta-networking/recipes-connectivity/openthread/ot-br-posix/mbedtls.patch +++ b/meta-networking/recipes-connectivity/openthread/ot-br-posix/mbedtls.patch @@ -17,19 +17,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> void mpi_mul_hlp( size_t i, mbedtls_mpi_uint *s, mbedtls_mpi_uint *d, mbedtls_mpi_uint b ) { - mbedtls_mpi_uint c = 0, t = 0; -+ mbedtls_mpi_uint c = 0; ++ mbedtls_mpi_uint c = 0, t __attribute__ ((unused)) = 0; #if defined(MULADDC_HUIT) for( ; i >= 8; i -= 8 ) -@@ -1595,8 +1595,6 @@ void mpi_mul_hlp( size_t i, mbedtls_mpi_ - } - #endif /* MULADDC_HUIT */ - -- t++; -- - do { - *d += c; c = ( *d < c ); d++; - } --- a/third_party/openthread/repo/third_party/mbedtls/repo/CMakeLists.txt +++ b/third_party/openthread/repo/third_party/mbedtls/repo/CMakeLists.txt @@ -192,7 +192,7 @@ if(CMAKE_COMPILER_IS_GNU) diff --git a/meta-networking/recipes-connectivity/openthread/ot-br-posix/unused_var.patch b/meta-networking/recipes-connectivity/openthread/ot-br-posix/unused_var.patch index 9727cbafd8..f10cec2d6c 100644 --- a/meta-networking/recipes-connectivity/openthread/ot-br-posix/unused_var.patch +++ b/meta-networking/recipes-connectivity/openthread/ot-br-posix/unused_var.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/third_party/openthread/repo/src/cli/cli.cpp +++ b/third_party/openthread/repo/src/cli/cli.cpp @@ -1785,6 +1785,7 @@ template <> otError Interpreter::Process diff --git a/meta-networking/recipes-connectivity/openthread/ot-daemon/mbedtls.patch b/meta-networking/recipes-connectivity/openthread/ot-daemon/mbedtls.patch index be26a20dad..ffaff48dd4 100644 --- a/meta-networking/recipes-connectivity/openthread/ot-daemon/mbedtls.patch +++ b/meta-networking/recipes-connectivity/openthread/ot-daemon/mbedtls.patch @@ -17,19 +17,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> void mpi_mul_hlp( size_t i, mbedtls_mpi_uint *s, mbedtls_mpi_uint *d, mbedtls_mpi_uint b ) { - mbedtls_mpi_uint c = 0, t = 0; -+ mbedtls_mpi_uint c = 0; ++ mbedtls_mpi_uint c = 0, t __attribute__ ((unused)) = 0; #if defined(MULADDC_HUIT) for( ; i >= 8; i -= 8 ) -@@ -1595,8 +1595,6 @@ void mpi_mul_hlp( size_t i, mbedtls_mpi_ - } - #endif /* MULADDC_HUIT */ - -- t++; -- - do { - *d += c; c = ( *d < c ); d++; - } --- a/third_party/mbedtls/repo/CMakeLists.txt +++ b/third_party/mbedtls/repo/CMakeLists.txt @@ -192,7 +192,7 @@ if(CMAKE_COMPILER_IS_GNU) diff --git a/meta-networking/recipes-connectivity/openthread/wpantund_git.bb b/meta-networking/recipes-connectivity/openthread/wpantund_git.bb index a7fcc202a4..ebb3fc3c1c 100644 --- a/meta-networking/recipes-connectivity/openthread/wpantund_git.bb +++ b/meta-networking/recipes-connectivity/openthread/wpantund_git.bb @@ -22,11 +22,8 @@ S = "${WORKDIR}/git" inherit pkgconfig perlnative autotools -# CVE-2020-8916 has been fixed in commit -# 3f108441e23e033b936e85be5b6877dd0a1fbf1c which is included in the SRCREV -# CVE-2021-33889 has been fixed in commit -# a8f3f761f6753b567d1e5ad22cbe6b0ceb6f2649 which is included in the SRCREV # There has not been a wpantund release as of yet that includes these fixes. # That means cve-check can not match them. Once a new release comes we can -# remove the ignore statement. -CVE_CHECK_IGNORE = "CVE-2020-8916 CVE-2021-33889" +# remove the statement. +CVE_STATUS[CVE-2020-8916] = "backported-patch: fixed via 3f108441e23e033b936e85be5b6877dd0a1fbf1c" +CVE_STATUS[CVE-2021-33889] = "backported-patch: fixed via 3f108441e23e033b936e85be5b6877dd0a1fbf1c" diff --git a/meta-networking/recipes-connectivity/rdate/rdate/0001-rdate-define-logwtmp-on-libc-glibc.patch b/meta-networking/recipes-connectivity/rdate/rdate/0001-rdate-define-logwtmp-on-libc-glibc.patch index 08ba2c31e9..5fc21808f9 100644 --- a/meta-networking/recipes-connectivity/rdate/rdate/0001-rdate-define-logwtmp-on-libc-glibc.patch +++ b/meta-networking/recipes-connectivity/rdate/rdate/0001-rdate-define-logwtmp-on-libc-glibc.patch @@ -5,6 +5,8 @@ Subject: [PATCH] rdate: define logwtmp on libc != glibc Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/rdate.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/meta-networking/recipes-connectivity/restinio/restinio_0.6.13.bb b/meta-networking/recipes-connectivity/restinio/restinio_0.6.13.bb index e715135dc3..03eff43dd2 100644 --- a/meta-networking/recipes-connectivity/restinio/restinio_0.6.13.bb +++ b/meta-networking/recipes-connectivity/restinio/restinio_0.6.13.bb @@ -9,11 +9,11 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://../LICENSE;md5=f399b62ce0a152525d1589a5a40c0ff6" DEPENDS = "asio fmt http-parser" -SRC_URI = "https://github.com/Stiffstream/restinio/releases/download/v.${PV}/restinio-${PV}.tar.bz2" +SRC_URI = "https://github.com/Stiffstream/restinio/releases/download/v.${PV}/${BP}.tar.bz2" SRC_URI[md5sum] = "37a4310e98912030a74bdd4ed789f33c" SRC_URI[sha256sum] = "b35d696e6fafd4563ca708fcecf9d0cf6705c846d417b5000f5252e0188848e7" -S = "${WORKDIR}/${PN}-${PV}/dev" +S = "${WORKDIR}/${BP}/dev" inherit cmake diff --git a/meta-networking/recipes-connectivity/samba/samba/0002-do-not-import-target-module-while-cross-compile.patch b/meta-networking/recipes-connectivity/samba/samba/0002-do-not-import-target-module-while-cross-compile.patch index 186ee553a2..3b02690926 100644 --- a/meta-networking/recipes-connectivity/samba/samba/0002-do-not-import-target-module-while-cross-compile.patch +++ b/meta-networking/recipes-connectivity/samba/samba/0002-do-not-import-target-module-while-cross-compile.patch @@ -11,6 +11,8 @@ Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> update to version 4.10.5, and switch to python3 Signed-off-by: Changqing Li <changqing.li@windriver.com> --- +Upstream-Status: Pending + buildtools/wafsamba/samba_bundled.py | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/meta-networking/recipes-connectivity/samba/samba/0008-Deleted-settiong-of-python-to-fix-the-install-confli.patch b/meta-networking/recipes-connectivity/samba/samba/0007-Deleted-settiong-of-python-to-fix-the-install-confli.patch index 45a7c82d80..45a7c82d80 100644 --- a/meta-networking/recipes-connectivity/samba/samba/0008-Deleted-settiong-of-python-to-fix-the-install-confli.patch +++ b/meta-networking/recipes-connectivity/samba/samba/0007-Deleted-settiong-of-python-to-fix-the-install-confli.patch diff --git a/meta-networking/recipes-connectivity/samba/samba/0007-waf-Fix-errors-with-Werror-implicit-function-declara.patch b/meta-networking/recipes-connectivity/samba/samba/0007-waf-Fix-errors-with-Werror-implicit-function-declara.patch deleted file mode 100644 index 91eb22967a..0000000000 --- a/meta-networking/recipes-connectivity/samba/samba/0007-waf-Fix-errors-with-Werror-implicit-function-declara.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 95946ce8b6317f68c51338d19d237ce6da61d1c3 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 27 Aug 2022 13:05:26 -0700 -Subject: [PATCH] waf: Fix errors with Werror=implicit-function-declaration - turned on - -Clang-15 turns this option into errors by default, and it results in -rpath check failures - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - buildtools/wafsamba/samba_waf18.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/buildtools/wafsamba/samba_waf18.py b/buildtools/wafsamba/samba_waf18.py -index e2a078b..e145c77 100644 ---- a/buildtools/wafsamba/samba_waf18.py -+++ b/buildtools/wafsamba/samba_waf18.py -@@ -209,7 +209,7 @@ def CHECK_LIBRARY_SUPPORT(conf, rpath=False, version_script=False, msg=None): - lib_node.parent.mkdir() - lib_node.write('int lib_func(void) { return 42; }\n', 'w') - main_node = bld.srcnode.make_node('main.c') -- main_node.write('int main(void) {return !(lib_func() == 42);}', 'w') -+ main_node.write('int lib_func(void); int main(void) {return !(lib_func() == 42);}', 'w') - linkflags = [] - if version_script: - script = bld.srcnode.make_node('ldscript') --- -2.25.1 - diff --git a/meta-networking/recipes-connectivity/samba/samba/samba-4.3.9-remove-getpwent_r.patch b/meta-networking/recipes-connectivity/samba/samba/samba-4.3.9-remove-getpwent_r.patch index 22451a2d11..9a83574e66 100644 --- a/meta-networking/recipes-connectivity/samba/samba/samba-4.3.9-remove-getpwent_r.patch +++ b/meta-networking/recipes-connectivity/samba/samba/samba-4.3.9-remove-getpwent_r.patch @@ -9,6 +9,8 @@ http://data.gpo.zugaina.org/musl/net-fs/samba/files/samba-4.3.9-remove-getpwent_ Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + source4/torture/local/nss_tests.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch b/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch index 9e45459931..9bf1f9757c 100644 --- a/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch +++ b/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch @@ -7,6 +7,8 @@ http://data.gpo.zugaina.org/musl/net-fs/samba/files/samba-4.2.7-pam.patch Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + source3/wscript | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-connectivity/samba/samba_4.17.4.bb b/meta-networking/recipes-connectivity/samba/samba_4.18.5.bb index 966eaf9bf9..9d8802ff54 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.17.4.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.18.5.bb @@ -23,8 +23,7 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ file://0004-Add-options-to-configure-the-use-of-libbsd.patch \ file://0005-Fix-pyext_PATTERN-for-cross-compilation.patch \ file://0006-smbtorture-skip-test-case-tfork_cmd_send.patch \ - file://0007-waf-Fix-errors-with-Werror-implicit-function-declara.patch \ - file://0008-Deleted-settiong-of-python-to-fix-the-install-confli.patch \ + file://0007-Deleted-settiong-of-python-to-fix-the-install-confli.patch \ " SRC_URI:append:libc-musl = " \ @@ -33,18 +32,13 @@ SRC_URI:append:libc-musl = " \ file://cmocka-uintptr_t.patch \ " -SRC_URI[sha256sum] = "c0512079db4cac707ccea4c18aebbd6b2eb3acf6e90735e7f645a326be1f4537" +SRC_URI[sha256sum] = "095256ac332e1d9fbf9b7ff7823f92a3233d3ed658ce7fc9b33905c2243f447f" -UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.17(\.\d+)+).tar.gz" +UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.18(\.\d+)+).tar.gz" inherit systemd waf-samba cpan-base perlnative update-rc.d perl-version pkgconfig -# CVE-2011-2411 is valnerble only on HP NonStop Servers. -CVE_CHECK_IGNORE += "CVE-2011-2411" -# Patch for CVE-2018-1050 is applied in version 4.5.15, 4.6.13, 4.7.5. -CVE_CHECK_IGNORE += "CVE-2018-1050" -# Patch for CVE-2018-1057 is applied in version 4.3.13, 4.4.16. -CVE_CHECK_IGNORE += "CVE-2018-1057" +CVE_STATUS[CVE-2011-2411] = "not-applicable-platform: vulnerable only on HP NonStop Servers" # remove default added RDEPENDS on perl RDEPENDS:${PN}:remove = "perl" @@ -211,8 +205,8 @@ do_install:append() { fi oe_runmake -C ${S}/pidl DESTDIR=${D} install_vendor - find ${D}${libdir}/ -type f -name "perllocal.pod" | xargs rm -f - rm -rf ${D}${libdir}/perl5/vendor_perl/${PERLVERSION}/${BUILD_SYS}/auto/Parse/Pidl/.packlist + find ${D}${libdir}/perl5/ -type f -name "perllocal.pod" -delete + find ${D}${libdir}/perl5/ -type f -name ".packlist" -delete sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${bindir}/pidl } @@ -330,12 +324,12 @@ FILES:smbclient = "${bindir}/cifsdd \ ${bindir}/smbspool \ ${bindir}/smbtar \ ${bindir}/smbtree \ - ${libdir}/samba/smbspool_krb5_wrapper" + ${libexecdir}/samba/smbspool_krb5_wrapper" FILES:${PN}-pidl = "${bindir}/pidl \ ${libdir}/perl5 \ " -RDEPENDS:${PN}-pidl:append = " perl libparse-yapp-perl" +RDEPENDS:${PN}-pidl += "perl perl-modules libparse-yapp-perl" RDEPENDS:${PN}-client = "\ smbclient \ diff --git a/meta-networking/recipes-connectivity/snort/snort/disable-run-test-program-while-cross-compiling.patch b/meta-networking/recipes-connectivity/snort/snort/disable-run-test-program-while-cross-compiling.patch index 30ec174395..98c20b6ecf 100644 --- a/meta-networking/recipes-connectivity/snort/snort/disable-run-test-program-while-cross-compiling.patch +++ b/meta-networking/recipes-connectivity/snort/snort/disable-run-test-program-while-cross-compiling.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Disable run test program while cross compiling fix configure error: configure: error: cannot run test program while cross compiling -Upstream-Status:Inappropriate [embedded specific] +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- diff --git a/meta-networking/recipes-connectivity/snort/snort/snort.default b/meta-networking/recipes-connectivity/snort/snort/snort.default new file mode 100644 index 0000000000..f1f67c55c0 --- /dev/null +++ b/meta-networking/recipes-connectivity/snort/snort/snort.default @@ -0,0 +1 @@ +INTERFACES="eth0" diff --git a/meta-networking/recipes-connectivity/snort/snort/snort.service b/meta-networking/recipes-connectivity/snort/snort/snort.service new file mode 100644 index 0000000000..487328c1b0 --- /dev/null +++ b/meta-networking/recipes-connectivity/snort/snort/snort.service @@ -0,0 +1,12 @@ +[Unit] +Description=Snort NIDS Daemon +After=syslog.target network.target + +[Service] +Type=simple +EnvironmentFile=/etc/default/snort +ExecStartPre=/bin/mkdir -p /var/log/snort +ExecStart=/usr/bin/snort -q -c /etc/snort/snort.conf -l /var/log/snort -i $INTERFACES + +[Install] +WantedBy=multi-user.target diff --git a/meta-networking/recipes-connectivity/snort/snort_2.9.20.bb b/meta-networking/recipes-connectivity/snort/snort_2.9.20.bb index c15c20443d..8b9092b418 100644 --- a/meta-networking/recipes-connectivity/snort/snort_2.9.20.bb +++ b/meta-networking/recipes-connectivity/snort/snort_2.9.20.bb @@ -8,6 +8,8 @@ DEPENDS = "xz libpcap libpcre daq libdnet util-linux daq-native libtirpc bison-n SRC_URI = "https://www.snort.org/downloads/archive/snort/${BP}.tar.gz \ file://snort.init \ + file://snort.service \ + file://snort.default \ file://volatiles.99_snort \ file://0001-libpcap-search-sysroot-for-headers.patch \ file://fix-host-contamination-when-enable-static-daq.patch \ @@ -19,11 +21,15 @@ SRC_URI[sha256sum] = "29400e13f53b1831e0b8b10ec1224a1cbaa6dc1533a5322a20dd80bb84 UPSTREAM_CHECK_URI = "https://www.snort.org/downloads" UPSTREAM_CHECK_REGEX = "snort-(?P<pver>\d+(\.\d+)+)\.tar" -inherit autotools gettext update-rc.d pkgconfig +inherit autotools gettext update-rc.d pkgconfig systemd INITSCRIPT_NAME = "snort" INITSCRIPT_PARAMS = "defaults" +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "snort.service" +SYSTEMD_AUTO_ENABLE = "disable" + EXTRA_OECONF = " \ --enable-gre \ --enable-linux-smp-stats \ @@ -69,8 +75,17 @@ do_install:append() { ${D}${sysconfdir}/snort/snort.conf cp ${S}/preproc_rules/*.rules ${D}${sysconfdir}/snort/preproc_rules/ - install -m 755 ${WORKDIR}/snort.init ${D}${sysconfdir}/init.d/snort + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -m 755 ${WORKDIR}/snort.init ${D}${sysconfdir}/init.d/snort + fi + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}/${systemd_system_unitdir} + install -m 644 ${WORKDIR}/snort.service ${D}/${systemd_system_unitdir} + # Install default environment file + install -d ${D}/${sysconfdir}/default + install -m 0644 ${WORKDIR}/snort.default ${D}${sysconfdir}/default/snort + fi install -d ${D}${sysconfdir}/default/volatiles install -m 0644 ${WORKDIR}/volatiles.99_snort ${D}${sysconfdir}/default/volatiles/99_snort @@ -87,6 +102,7 @@ FILES:${PN} += " \ ${libdir}/snort_dynamicengine/*.so.* \ ${libdir}/snort_dynamicpreprocessor/*.so.* \ ${libdir}/snort_dynamicrules/*.so.* \ + ${systemd_system_unitdir}/snort.service \ " FILES:${PN}-dbg += " \ ${libdir}/snort_dynamicengine/.debug \ diff --git a/meta-networking/recipes-connectivity/sshpass/sshpass_1.09.bb b/meta-networking/recipes-connectivity/sshpass/sshpass_1.10.bb index ad7b083100..81c5e48008 100644 --- a/meta-networking/recipes-connectivity/sshpass/sshpass_1.09.bb +++ b/meta-networking/recipes-connectivity/sshpass/sshpass_1.10.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz" -SRC_URI[sha256sum] = "71746e5e057ffe9b00b44ac40453bf47091930cba96bbea8dc48717dedc49fb7" +SRC_URI[sha256sum] = "ad1106c203cbb56185ca3bad8c6ccafca3b4064696194da879f81c8d7bdfeeda" inherit autotools diff --git a/meta-networking/recipes-connectivity/vlan/vlan-1.9/no-HOME-includes.patch b/meta-networking/recipes-connectivity/vlan/vlan-1.9/no-HOME-includes.patch index b7ab7d97c8..fd7a14adc9 100644 --- a/meta-networking/recipes-connectivity/vlan/vlan-1.9/no-HOME-includes.patch +++ b/meta-networking/recipes-connectivity/vlan/vlan-1.9/no-HOME-includes.patch @@ -5,7 +5,7 @@ Subject: vlan: do not include ${HOME}/linux/include dir in front of sanitized kernel headers in OE chroot. Drop this include option. -Upstream-Status: not-applicable +Upstream-Status: Inappropriate [embedded specific] Index: vlan/MakeInclude =================================================================== diff --git a/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb b/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb index 035d4946f1..b478692e39 100644 --- a/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb +++ b/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb @@ -28,7 +28,7 @@ do_configure:append () { # ignore strip to avoid yocto errors in stripping do_compile () { - oe_runmake PLATFORM=ARM 'STRIP=echo' all + oe_runmake PLATFORM=ARM 'STRIP=echo' CCFLAGS="${CFLAGS}" all } do_install () { diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0001-search-for-log-help-in-build-dir.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0001-search-for-log-help-in-build-dir.patch index 184c7943b5..735edb582e 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc/0001-search-for-log-help-in-build-dir.patch +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0001-search-for-log-help-in-build-dir.patch @@ -5,6 +5,8 @@ Subject: [PATCH 1/8] search for log-help in build dir Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + makeman.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0002-Fix-vpnc-install-for-cross-compile.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0002-Fix-vpnc-install-for-cross-compile.patch index 6f00d3b894..6380804368 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc/0002-Fix-vpnc-install-for-cross-compile.patch +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0002-Fix-vpnc-install-for-cross-compile.patch @@ -4,6 +4,8 @@ Date: Sun, 2 Dec 2012 02:16:54 +0100 Subject: [PATCH 2/8] Fix vpnc install for cross compile --- +Upstream-Status: Pending + Makefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0003-error.h-is-specific-to-glibc-on-linux.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0003-error.h-is-specific-to-glibc-on-linux.patch index bb7730647b..60c28cef31 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc/0003-error.h-is-specific-to-glibc-on-linux.patch +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0003-error.h-is-specific-to-glibc-on-linux.patch @@ -5,6 +5,8 @@ Subject: [PATCH 3/8] error.h is specific to glibc on linux Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + sysdep.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0004-Use-pkgconfig-instead-of-libgcrypt-config.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0004-Use-pkgconfig-instead-of-libgcrypt-config.patch index f70a13898f..305e9aabb1 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc/0004-Use-pkgconfig-instead-of-libgcrypt-config.patch +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0004-Use-pkgconfig-instead-of-libgcrypt-config.patch @@ -5,6 +5,8 @@ Subject: [PATCH 4/8] Use pkgconfig instead of libgcrypt-config Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0005-include-sys-ttydefaults.h-for-CEOT-definition.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0005-include-sys-ttydefaults.h-for-CEOT-definition.patch index 01783f45b7..af63433c0f 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc/0005-include-sys-ttydefaults.h-for-CEOT-definition.patch +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0005-include-sys-ttydefaults.h-for-CEOT-definition.patch @@ -10,6 +10,8 @@ config.c:146:25: error: use of undeclared identifier 'CEOT' Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + config.c | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch index fa89df2796..664c73a713 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc/0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch @@ -4,6 +4,8 @@ Date: Wed, 29 Mar 2017 23:09:47 -0700 Subject: [PATCH 6/8] sysdep: Add header include sequence to adjust for musl --- +Upstream-Status: Pending + sysdep.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0007-add-error-API-when-error.h-is-not-on-platform.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0007-add-error-API-when-error.h-is-not-on-platform.patch index de67b47a43..f7d7b0aec3 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc/0007-add-error-API-when-error.h-is-not-on-platform.patch +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0007-add-error-API-when-error.h-is-not-on-platform.patch @@ -5,6 +5,8 @@ Subject: [PATCH 7/8] add error() API when error.h is not on platform sign-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + sysdep.c | 24 ++++++++++++++++++++++++ sysdep.h | 2 ++ 2 files changed, 26 insertions(+) diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0008-include-sysdep.h-before-net-if_tun.h.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0008-include-sysdep.h-before-net-if_tun.h.patch index 62ffdb7c9f..6c63011997 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc/0008-include-sysdep.h-before-net-if_tun.h.patch +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0008-include-sysdep.h-before-net-if_tun.h.patch @@ -7,6 +7,8 @@ Fixes duplicate defines in header errors Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + sysdep.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0009-reduce-lifetime-value.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0009-reduce-lifetime-value.patch index 2bed550415..3da2efe479 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc/0009-reduce-lifetime-value.patch +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0009-reduce-lifetime-value.patch @@ -12,6 +12,8 @@ don't. Reducing the lifetime from its current value to 28800 (exactly 8 hours) causes it to start working with fortigate devices. --- +Upstream-Status: Pending + vpnc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb index 11437e2238..7be8261164 100644 --- a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb +++ b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb @@ -1,5 +1,6 @@ SUMMARY = "Meta-networking packagegroups" +PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup PROVIDES = "${PACKAGES}" @@ -152,13 +153,13 @@ RDEPENDS:packagegroup-meta-networking-protocols = "\ babeld \ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "dante", "", d)} \ freediameter \ + frr \ net-snmp \ openflow \ openflow \ openl2tp \ mdns \ nopoll \ - quagga \ radiusclient-ng \ tsocks \ openlldp \ @@ -214,7 +215,7 @@ RDEPENDS:packagegroup-meta-networking-support = "\ yp-tools \ mtr \ netsniff-ng \ - ntp ntpdate sntp ntpdc ntpq ntp-tickadj ntp-utils \ + ntp sntp ntpdc ntpq ntp-tickadj ntp-utils \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "ntpsec", "", d)} \ nbd-client \ nbd-server \ @@ -259,6 +260,7 @@ RDEPENDS:packagegroup-meta-networking-support = "\ ettercap \ " RDEPENDS:packagegroup-meta-networking-support:remove:mipsarch = "memcached" +RDEPENDS:packagegroup-meta-networking-support:remove:riscv64 = "memcached" RDEPENDS:packagegroup-meta-networking-support:remove:libc-musl = "ypbind-mt" EXCLUDE_FROM_WORLD = "1" diff --git a/meta-networking/recipes-daemons/atftp/atftp_0.7.5.bb b/meta-networking/recipes-daemons/atftp/atftp_0.8.0.bb index f893a4d6dc..507621795f 100644 --- a/meta-networking/recipes-daemons/atftp/atftp_0.7.5.bb +++ b/meta-networking/recipes-daemons/atftp/atftp_0.8.0.bb @@ -4,9 +4,9 @@ HOMEPAGE = "http://packages.debian.org/atftp" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=f65159f73e603f89d6867d43191900e5" -SRCREV = "00921e75728e3681b051c2e48c59e36c6cfa2e97" +SRCREV = "d5c27eb7a9695d83569767e27ef69674173db39a" -SRC_URI = "git://git.code.sf.net/p/atftp/code;branch=master \ +SRC_URI = "git://git.code.sf.net/p/atftp/code;branch=master;protocol=https \ file://atftpd.init \ file://atftpd.service \ " diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch index 87159718b2..6128f3d0ed 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch @@ -9,6 +9,8 @@ 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/meta-networking/recipes-daemons/autofs/autofs/0001-autofs-5.1.8-add-autofs_strerror_r-helper-for-musl.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-autofs-5.1.8-add-autofs_strerror_r-helper-for-musl.patch index 5fd9a8d129..caf0105118 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/0001-autofs-5.1.8-add-autofs_strerror_r-helper-for-musl.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/0001-autofs-5.1.8-add-autofs_strerror_r-helper-for-musl.patch @@ -11,6 +11,8 @@ 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/meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch index 32293dd09f..8eec3014a0 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch @@ -9,6 +9,8 @@ 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/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch b/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch index 1a2eb4fc21..d67f6300c8 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch @@ -12,6 +12,8 @@ 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(-) diff --git a/meta-networking/recipes-daemons/autofs/autofs/cross.patch b/meta-networking/recipes-daemons/autofs/autofs/cross.patch index b25c43f747..2a4f4fd0dd 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/cross.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/cross.patch @@ -3,6 +3,8 @@ 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/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch b/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch index 8ad3b22de5..fd736296a5 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch @@ -19,6 +19,8 @@ This lead to a race when compile amd_tok.o, the header file maybe rewritten. Signed-off-by: Roy Li <rongqing.li@windriver.com> --- +Upstream-Status: Pending + lib/Makefile | 6 ++++-- modules/Makefile | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch b/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch index 21396dd6f6..1fc500319e 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch @@ -8,6 +8,8 @@ otherwise the generate file will be stripped Signed-off-by: Roy Li <rongqing.li@windriver.com> --- +Upstream-Status: Pending + Makefile.rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch b/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch index c46c0e5ad2..f91c307d34 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch @@ -3,6 +3,8 @@ From: Khem Raj <raj.khem@gmail.com> Date: Sat, 5 Jan 2013 19:53:10 -0800 --- +Upstream-Status: Pending + samples/auto.net | 2 +- samples/auto.smb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-daemons/ippool/ippool/0001-Respect-flags-from-env.patch b/meta-networking/recipes-daemons/ippool/ippool/0001-Respect-flags-from-env.patch index e967621259..5555d464c1 100644 --- a/meta-networking/recipes-daemons/ippool/ippool/0001-Respect-flags-from-env.patch +++ b/meta-networking/recipes-daemons/ippool/ippool/0001-Respect-flags-from-env.patch @@ -5,6 +5,8 @@ Subject: [PATCH 1/3] Respect flags from env Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + Makefile | 4 ++-- cli/Makefile | 2 +- pppd/Makefile | 2 +- diff --git a/meta-networking/recipes-daemons/ippool/ippool/0001-ippool-Port-to-ppp-2.5-APIs.patch b/meta-networking/recipes-daemons/ippool/ippool/0001-ippool-Port-to-ppp-2.5-APIs.patch new file mode 100644 index 0000000000..59d7b1e847 --- /dev/null +++ b/meta-networking/recipes-daemons/ippool/ippool/0001-ippool-Port-to-ppp-2.5-APIs.patch @@ -0,0 +1,60 @@ +From e1b93db6a13d955c6bab6358a7fa27fecb59479f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 11 May 2023 17:24:46 -0700 +Subject: [PATCH] ippool: Port to ppp 2.5 APIs + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + pppd/ippool.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/pppd/ippool.c b/pppd/ippool.c +index 88cb901..d4b5c97 100644 +--- a/pppd/ippool.c ++++ b/pppd/ippool.c +@@ -6,7 +6,7 @@ + #include <stdlib.h> + #include <errno.h> + #include "pppd.h" +-#include "pathnames.h" ++#include "options.h" + #include "fsm.h" /* Needed for lcp.h to include cleanly */ + #include "lcp.h" + #include "ccp.h" +@@ -23,7 +23,7 @@ + + #include "ippool_rpc.h" + +-const char pppd_version[] = VERSION; ++const char pppd_version[] = PPPD_VERSION; + + static char *ippool_pool_name = NULL; + static char *ippool_pool_name2 = NULL; +@@ -205,13 +205,13 @@ void plugin_init(void) + { + #if defined(__linux__) + extern int new_style_driver; /* From sys-linux.c */ +- if (!ppp_available() && !new_style_driver) ++ if (!ppp_check_kernel_support() && !new_style_driver) + fatal("Kernel doesn't support ppp_generic - " + "needed for Ippool"); + #else + fatal("No IP pool support on this OS"); + #endif +- add_options(ippool_options); ++ ppp_add_options(ippool_options); + + memset(&ippool_addr, 0, sizeof(ippool_addr)); + +@@ -219,6 +219,6 @@ void plugin_init(void) + ip_down_hook = ippool_release_ip; + + /* brute force, just in case ip_down_hook doesn't get called */ +- add_notifier(&exitnotify, ippool_cleanup, 0); ++ ppp_add_notify(NF_EXIT, ippool_cleanup, 0); + } + +-- +2.40.1 + diff --git a/meta-networking/recipes-daemons/ippool/ippool/0001-read-returns-ssize_t.patch b/meta-networking/recipes-daemons/ippool/ippool/0001-read-returns-ssize_t.patch index 7d3f9acb65..1b8de349cf 100644 --- a/meta-networking/recipes-daemons/ippool/ippool/0001-read-returns-ssize_t.patch +++ b/meta-networking/recipes-daemons/ippool/ippool/0001-read-returns-ssize_t.patch @@ -10,6 +10,8 @@ usl_fd.c:284:10: error: comparison of unsigned expression < 0 is always false [- Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + usl/usl_fd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-daemons/ippool/ippool/0001-usl_timer-Check-for-return-value-of-write-API.patch b/meta-networking/recipes-daemons/ippool/ippool/0001-usl_timer-Check-for-return-value-of-write-API.patch index 6fb7cc5c46..2c612e42fe 100644 --- a/meta-networking/recipes-daemons/ippool/ippool/0001-usl_timer-Check-for-return-value-of-write-API.patch +++ b/meta-networking/recipes-daemons/ippool/ippool/0001-usl_timer-Check-for-return-value-of-write-API.patch @@ -5,6 +5,8 @@ Subject: [PATCH] usl_timer: Check for return value of write() API Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + usl/usl_timer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-daemons/ippool/ippool/0002-Mark-first-element-of-a-string-as-null.patch b/meta-networking/recipes-daemons/ippool/ippool/0002-Mark-first-element-of-a-string-as-null.patch index 6e2bd523da..f21c68f0d1 100644 --- a/meta-networking/recipes-daemons/ippool/ippool/0002-Mark-first-element-of-a-string-as-null.patch +++ b/meta-networking/recipes-daemons/ippool/ippool/0002-Mark-first-element-of-a-string-as-null.patch @@ -10,6 +10,8 @@ cli_lib.c:427:20: error: expression which evaluates to zero treated as a null po Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + cli/cli_lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-daemons/ippool/ippool/0002-link-with-libtirpc.patch b/meta-networking/recipes-daemons/ippool/ippool/0002-link-with-libtirpc.patch index d80f7b4362..75bb825302 100644 --- a/meta-networking/recipes-daemons/ippool/ippool/0002-link-with-libtirpc.patch +++ b/meta-networking/recipes-daemons/ippool/ippool/0002-link-with-libtirpc.patch @@ -7,6 +7,8 @@ musl needs it Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-daemons/ippool/ippool/0003-cli-Mark-return-of-strtol-as-long-int.patch b/meta-networking/recipes-daemons/ippool/ippool/0003-cli-Mark-return-of-strtol-as-long-int.patch index 3854b1133c..f6a8d62b98 100644 --- a/meta-networking/recipes-daemons/ippool/ippool/0003-cli-Mark-return-of-strtol-as-long-int.patch +++ b/meta-networking/recipes-daemons/ippool/ippool/0003-cli-Mark-return-of-strtol-as-long-int.patch @@ -10,6 +10,8 @@ error: taking the absolute value of unsigned type 'unsigned long' has no effect Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + cli/cli_lib.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-networking/recipes-daemons/ippool/ippool/0003-musl-fixes.patch b/meta-networking/recipes-daemons/ippool/ippool/0003-musl-fixes.patch index 952e4f0d04..8c42ebe30b 100644 --- a/meta-networking/recipes-daemons/ippool/ippool/0003-musl-fixes.patch +++ b/meta-networking/recipes-daemons/ippool/ippool/0003-musl-fixes.patch @@ -5,6 +5,8 @@ Subject: [PATCH 3/3] musl fixes Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + cli/cli_readline.c | 7 +- ippool_api.c | 9 ++- net/ppp_defs.h | 194 +++++++++++++++++++++++++++++++++++++++++++++++++++++ diff --git a/meta-networking/recipes-daemons/ippool/ippool/ippool.service b/meta-networking/recipes-daemons/ippool/ippool/ippool.service index 281ae5fd19..f168e4ccb6 100644 --- a/meta-networking/recipes-daemons/ippool/ippool/ippool.service +++ b/meta-networking/recipes-daemons/ippool/ippool/ippool.service @@ -5,8 +5,8 @@ After=rpcbind.service [Service] Type=simple -# Start ippoold in the foreground! -ExecStart=@SBINDIR@/ippoold -f +# Start ippoold in the foreground! and enable RPC +ExecStart=@SBINDIR@/ippoold -R -f # Normal output will go to syslog, so suppress stdout. StandardOutput=null # ExecStop is not needed. systemd will send SIGTERM diff --git a/meta-networking/recipes-daemons/ippool/ippool_1.3.bb b/meta-networking/recipes-daemons/ippool/ippool_1.3.bb index 26b03814d6..36ea289945 100644 --- a/meta-networking/recipes-daemons/ippool/ippool_1.3.bb +++ b/meta-networking/recipes-daemons/ippool/ippool_1.3.bb @@ -30,6 +30,7 @@ SRC_URI = "https://sourceforge.net/projects/openl2tp/files/${BPN}/${PV}/${BPN}-$ file://0001-pppd-ippool.c-Fix-type-casting-issues-between-in_add.patch \ file://0002-ippool_rpc_server.c-Add-missing-prototype-for-ippool.patch \ file://0001-Use-unsigned-int-type-for-1-bit-integer-bitfield.patch \ + file://0001-ippool-Port-to-ppp-2.5-APIs.patch \ " LIC_FILES_CHKSUM = "file://LICENSE;md5=4c59283b82fc2b166455e0fc23c71c6f" @@ -49,8 +50,6 @@ EXTRA_OEMAKE += "IPPOOL_TEST=y" CPPFLAGS += "${SELECTED_OPTIMIZATION} -I${STAGING_INCDIR}/tirpc" SYSTEMD_SERVICE:${PN} = "ippool.service" -SYSTEMD_AUTO_ENABLE = "disable" - do_compile:prepend() { # fix the CFLAGS= and CPPFLAGS= in main Makefile, to have the extra CFLAGS in env diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Makefile-Do-not-set-Werror.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Makefile-Do-not-set-Werror.patch index ab6ff6e131..d720a1adb0 100644 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Makefile-Do-not-set-Werror.patch +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Makefile-Do-not-set-Werror.patch @@ -9,13 +9,12 @@ warning as errors Upstream-Status: Inappropriate [OE-Specific] Signed-off-by: Khem Raj <raj.khem@gmail.com> - --- usr/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/Makefile b/usr/Makefile -index 3fc2248..2b5a234 100644 +index 84f33bc..9e7b839 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -44,7 +44,7 @@ HOMEDIR ?= $(etcdir)/iscsi @@ -25,5 +24,8 @@ index 3fc2248..2b5a234 100644 -WARNFLAGS ?= -Wall -Wextra -Werror -Wstrict-prototypes -fno-common +WARNFLAGS ?= -Wall -Wextra -Wstrict-prototypes -fno-common CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \ - -I$(TOPDIR)/libopeniscsiusr - CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod) + -I$(TOPDIR)/libopeniscsiusr \ + -DISCSI_VERSION_STR=\"$(ISCSI_VERSION_STR)\" +-- +2.34.1 + diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-iscsiuio-Use-pthread_t-for-INVALID_THREAD.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-iscsiuio-Use-pthread_t-for-INVALID_THREAD.patch deleted file mode 100644 index 02669e9c80..0000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-iscsiuio-Use-pthread_t-for-INVALID_THREAD.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ef54a6f4a81da8ab653d352bfbd3b2521ce9eb7c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 29 Aug 2022 15:55:32 -0700 -Subject: [PATCH] iscsiuio: Use pthread_t for INVALID_THREAD - -pthread_t is opaque, therefore avoid compiler errors on musl when -compiling since pthread_t is not a plain old data type, like glibc - -Upstream-Status: Submitted [https://github.com/open-iscsi/open-iscsi/pull/363] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - iscsiuio/src/unix/options.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/iscsiuio/src/unix/options.h b/iscsiuio/src/unix/options.h -index 63b8635..873a98a 100644 ---- a/iscsiuio/src/unix/options.h -+++ b/iscsiuio/src/unix/options.h -@@ -86,7 +86,7 @@ - #define DEBUG_ON 0x2 - - #define INVALID_FD -1 --#define INVALID_THREAD -1 -+#define INVALID_THREAD (pthread_t)-1 - #define INVALID_HOST_NO -1 - - struct options { diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.7.bb b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.8.bb index 3ed55d65a0..2caddbb54a 100644 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.7.bb +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.8.bb @@ -12,7 +12,7 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d) LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV = "7b53fcc502da8617110fd64d675b476772c28a6f" +SRCREV = "543ba0f15d340b97f30782308cec424a6738fec3" SRC_URI = "git://github.com/open-iscsi/open-iscsi;branch=master;protocol=https \ file://0001-Makefile-Do-not-set-Werror.patch \ @@ -22,7 +22,6 @@ SRC_URI = "git://github.com/open-iscsi/open-iscsi;branch=master;protocol=https \ file://iscsi-initiator.service \ file://iscsi-initiator-targets.service \ file://set_initiatorname \ - file://0002-iscsiuio-Use-pthread_t-for-INVALID_THREAD.patch \ " S = "${WORKDIR}/git" diff --git a/meta-networking/recipes-daemons/keepalived/keepalived/0001-layer4-Change-order-of-include-files.patch b/meta-networking/recipes-daemons/keepalived/keepalived/0001-layer4-Change-order-of-include-files.patch index f9cadbc26d..678a208ac3 100644 --- a/meta-networking/recipes-daemons/keepalived/keepalived/0001-layer4-Change-order-of-include-files.patch +++ b/meta-networking/recipes-daemons/keepalived/keepalived/0001-layer4-Change-order-of-include-files.patch @@ -14,6 +14,8 @@ amicably, and I think this is right order too Upsteam-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + keepalived/core/layer4.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/meta-networking/recipes-daemons/lldpd/lldpd_1.0.16.bb b/meta-networking/recipes-daemons/lldpd/lldpd_1.0.17.bb index 7992705108..aa29f41582 100644 --- a/meta-networking/recipes-daemons/lldpd/lldpd_1.0.16.bb +++ b/meta-networking/recipes-daemons/lldpd/lldpd_1.0.17.bb @@ -12,7 +12,7 @@ SRC_URI = "\ file://run-ptest \ " -SRC_URI[sha256sum] = "e3b391650c7ba67cea2fe84d67fdb4d7fc8aa1ec5cf86eb8bb984711df8465a9" +SRC_URI[sha256sum] = "9343177f145d2bca66ef03d59528079d3f1663c624b1e2b9d08268efdc6127ce" inherit autotools update-rc.d useradd systemd pkgconfig bash-completion github-releases ptest diff --git a/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.1.bb b/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.1.bb index e929534c3f..a83dad350f 100644 --- a/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.1.bb +++ b/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.1.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" inherit features_check systemd RDEPENDS:${PN} = "python3-pygobject python3-dbus" -REQUIRED_DISTRO_FEATURES = "systemd" +REQUIRED_DISTRO_FEATURES = "systemd gobject-introspection-data" SRCREV = "30e278e50749a60a930ceaa0971207c6436b8a0c" SRC_URI = "git://gitlab.com/craftyguy/networkd-dispatcher;protocol=https;nobranch=1" diff --git a/meta-networking/recipes-daemons/openhpi/files/fix-narrowing-warning.patch b/meta-networking/recipes-daemons/openhpi/files/fix-narrowing-warning.patch index 4c545708fc..eabffa7d9c 100644 --- a/meta-networking/recipes-daemons/openhpi/files/fix-narrowing-warning.patch +++ b/meta-networking/recipes-daemons/openhpi/files/fix-narrowing-warning.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Fix sensor_factors_000.cpp:66:5: error: non-constant-expression cannot be narrowed from type 'int' to 'unsigned char' in initializer list [-Wc++11-narrowing] diff --git a/meta-networking/recipes-daemons/openhpi/files/openhpi-3.6.1-ssl.patch b/meta-networking/recipes-daemons/openhpi/files/openhpi-3.6.1-ssl.patch index ca522bcc67..68f972fc51 100644 --- a/meta-networking/recipes-daemons/openhpi/files/openhpi-3.6.1-ssl.patch +++ b/meta-networking/recipes-daemons/openhpi/files/openhpi-3.6.1-ssl.patch @@ -6,7 +6,7 @@ Taken from Fedora https://src.fedoraproject.org/rpms/openhpi/c/be77f5484b0206f8946a85b29424ea10bf863063 Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Unknown +Upstream-Status: Pending [Unknown] diff -up openhpi-3.6.1/ssl/Makefile.am.than openhpi-3.6.1/ssl/Makefile.am --- openhpi-3.6.1/ssl/Makefile.am.than 2017-02-21 12:21:12.114814698 -0500 diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Disable-format-overflow-if-supported-by-gc.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Disable-format-overflow-if-supported-by-gc.patch index be0a587679..c5264e5e7a 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Disable-format-overflow-if-supported-by-gc.patch +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Disable-format-overflow-if-supported-by-gc.patch @@ -6,6 +6,8 @@ Subject: [PATCH] configure: Disable format-overflow if supported by gcc Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + Makefile.am | 6 +-- configure.ac | 2 + m4/ax_check_compile_flag.m4 | 74 +++++++++++++++++++++++++++++++++++++ diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Pass-linker-specific-options-with-Wl.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Pass-linker-specific-options-with-Wl.patch index e4bbb4c3cd..daf06d38fb 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Pass-linker-specific-options-with-Wl.patch +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Pass-linker-specific-options-with-Wl.patch @@ -9,6 +9,8 @@ and we can use non-gcc compilers Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch index e40d2b3198..99fab3b034 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch @@ -9,6 +9,8 @@ redirecting incorrect #include <wait.h> to <sys/wait.h> Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/imm/common/immpbe_dump.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch index e4a3975da6..2521839c73 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch @@ -9,6 +9,8 @@ Do not use the deprecated headers under include/sys Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/base/os_defs.h | 5 +++-- src/mds/mds_dt_tcp.c | 1 - src/mds/mds_dt_tcp_disc.h | 2 +- diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-Werror-enum-int-mismatch-with-gcc13.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-Werror-enum-int-mismatch-with-gcc13.patch index e3288431eb..a6aa2c3d07 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-Werror-enum-int-mismatch-with-gcc13.patch +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-Werror-enum-int-mismatch-with-gcc13.patch @@ -5,6 +5,8 @@ Subject: [PATCH 2/2] Fix -Werror=enum-int-mismatch with gcc13 Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/evt/agent/eda_hdl.h | 5 +++-- src/evt/evtd/eds_mds.h | 3 +-- src/smf/smfnd/smfnd.h | 8 ++++---- diff --git a/meta-networking/recipes-daemons/postfix/files/0001-Fix-makedefs.patch b/meta-networking/recipes-daemons/postfix/files/0001-Fix-makedefs.patch index e83085d20d..8c9c13b1c4 100644 --- a/meta-networking/recipes-daemons/postfix/files/0001-Fix-makedefs.patch +++ b/meta-networking/recipes-daemons/postfix/files/0001-Fix-makedefs.patch @@ -11,7 +11,7 @@ for Linux2 and Linux3 systems. native build, search host library path for nsl and resolv library which comes from libc -Upstreamstatus: Inappropriate [embedded specific] +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Yao Zhao <yao.zhao@windriver.com> --- diff --git a/meta-networking/recipes-daemons/postfix/files/0002-Change-fixed-postconf-to-a-variable-for-cross-compil.patch b/meta-networking/recipes-daemons/postfix/files/0002-Change-fixed-postconf-to-a-variable-for-cross-compil.patch index 347b9de0a3..28199ccdd2 100644 --- a/meta-networking/recipes-daemons/postfix/files/0002-Change-fixed-postconf-to-a-variable-for-cross-compil.patch +++ b/meta-networking/recipes-daemons/postfix/files/0002-Change-fixed-postconf-to-a-variable-for-cross-compil.patch @@ -3,7 +3,7 @@ From: Li xin <lixin.fnst@cn.fujitsu.com> Date: Fri, 19 Jun 2015 17:14:58 +0900 Subject: [PATCH] Change fixed postconf to a variable for cross-compiling -Upstreamstatus: Inappropriate [embedded specific] +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Yao Zhao <yao.zhao@windriver.com> --- diff --git a/meta-networking/recipes-daemons/postfix/files/0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch b/meta-networking/recipes-daemons/postfix/files/0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch index 0fc938e13d..1545f21637 100644 --- a/meta-networking/recipes-daemons/postfix/files/0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch +++ b/meta-networking/recipes-daemons/postfix/files/0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch @@ -7,6 +7,8 @@ Its a binary used during build Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + makedefs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-networking/recipes-daemons/postfix/files/0004-Fix-icu-config.patch b/meta-networking/recipes-daemons/postfix/files/0004-Fix-icu-config.patch index 6b4a5f7a0c..a38e783309 100644 --- a/meta-networking/recipes-daemons/postfix/files/0004-Fix-icu-config.patch +++ b/meta-networking/recipes-daemons/postfix/files/0004-Fix-icu-config.patch @@ -12,6 +12,8 @@ entertained. Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + makedefs | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch b/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch index d888dd8263..8126b3619a 100644 --- a/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch +++ b/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch @@ -6,7 +6,7 @@ make, move-pidfile-to-var-run, move-runfile-to-var-run move pidfile to /var/run redefine PR_RUN_DIR as ${localstatedir}/run -Signed-off-By: Armin Kuster <akuster808@gmail.com> +Signed-off-by: Armin Kuster <akuster808@gmail.com> diff --git a/Make.rules.in b/Make.rules.in diff --git a/meta-networking/recipes-daemons/squid/files/0001-configure-Check-for-Wno-error-format-truncation-comp.patch b/meta-networking/recipes-daemons/squid/files/0001-configure-Check-for-Wno-error-format-truncation-comp.patch index 302136a03c..acebd6dce5 100644 --- a/meta-networking/recipes-daemons/squid/files/0001-configure-Check-for-Wno-error-format-truncation-comp.patch +++ b/meta-networking/recipes-daemons/squid/files/0001-configure-Check-for-Wno-error-format-truncation-comp.patch @@ -11,6 +11,8 @@ client.c:834:23: error: '%s' directive output may be truncated writing up to 102 Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + acinclude/ax_check_compile_flag.m4 | 74 ++++++++++++++++++++++++++++++++++++++ configure.ac | 2 ++ 2 files changed, 76 insertions(+) diff --git a/meta-networking/recipes-daemons/squid/files/Fix-flawed-dynamic-ldb-link-test-in-configure.patch b/meta-networking/recipes-daemons/squid/files/Fix-flawed-dynamic-ldb-link-test-in-configure.patch index a429b7b2db..738e609c05 100644 --- a/meta-networking/recipes-daemons/squid/files/Fix-flawed-dynamic-ldb-link-test-in-configure.patch +++ b/meta-networking/recipes-daemons/squid/files/Fix-flawed-dynamic-ldb-link-test-in-configure.patch @@ -12,6 +12,8 @@ about why and setting the need for -ldb incorrectly. Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com> --- +Upstream-Status: Pending + configure.ac | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/meta-networking/recipes-daemons/squid/files/Set-up-for-cross-compilation.patch b/meta-networking/recipes-daemons/squid/files/Set-up-for-cross-compilation.patch index 3852f7c255..ffb7371640 100644 --- a/meta-networking/recipes-daemons/squid/files/Set-up-for-cross-compilation.patch +++ b/meta-networking/recipes-daemons/squid/files/Set-up-for-cross-compilation.patch @@ -11,6 +11,8 @@ proper cross compilation can occur. Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com> --- +Upstream-Status: Pending + configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-networking/recipes-daemons/squid/squid_5.7.bb b/meta-networking/recipes-daemons/squid/squid_5.7.bb index a208a2a88f..2a5de1872d 100644 --- a/meta-networking/recipes-daemons/squid/squid_5.7.bb +++ b/meta-networking/recipes-daemons/squid/squid_5.7.bb @@ -69,6 +69,10 @@ do_configure:prepend() { export SYSROOT=$PKG_CONFIG_SYSROOT_DIR } +do_configure:append() { + sed -i -e 's|${WORKDIR}||g' ${B}/include/autoconf.h +} + do_compile_ptest() { oe_runmake -C ${TESTDIR} buildtest-TESTS } diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/0001-__progname-is-provided-by-libc.patch b/meta-networking/recipes-daemons/tftp-hpa/files/0001-__progname-is-provided-by-libc.patch index cead977e28..66c15b5f8b 100644 --- a/meta-networking/recipes-daemons/tftp-hpa/files/0001-__progname-is-provided-by-libc.patch +++ b/meta-networking/recipes-daemons/tftp-hpa/files/0001-__progname-is-provided-by-libc.patch @@ -12,6 +12,8 @@ global symbols and work around Debian bug #519006 (Closes: #564052). Signed-off-by: Ron Lee <ron@debian.org> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> --- +Upstream-Status: Pending + tftpd/tftpd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/fix-writing-emtpy-file.patch b/meta-networking/recipes-daemons/tftp-hpa/files/fix-writing-emtpy-file.patch index 452aa05f81..4f3dcd7767 100644 --- a/meta-networking/recipes-daemons/tftp-hpa/files/fix-writing-emtpy-file.patch +++ b/meta-networking/recipes-daemons/tftp-hpa/files/fix-writing-emtpy-file.patch @@ -1,6 +1,6 @@ [PATCH] fix the empty file writting -Upstream-Status: pending +Upstream-Status: Pending With the feature that checking the disk filled up, the return value of function write_behind was checked and used to detect diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-separated-CR-and-LF.patch b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-separated-CR-and-LF.patch index 3e220ec385..e994f28402 100644 --- a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-separated-CR-and-LF.patch +++ b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-separated-CR-and-LF.patch @@ -7,7 +7,7 @@ In ascii mode, if the CR and LF was separated into different transfer blocks, LF will be just dropped instead of replacing the previous CR. Add a checking on the first character to fix it. -Upstream-Status: pending +Upstream-Status: Pending Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com> --- diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch index d81c94a4aa..6c68989d3b 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch @@ -6,6 +6,8 @@ Subject: [PATCH] sysdeputil.c: Fix with musl which does not have utmpx Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + sysdeputil.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-devtools/libcoap/libcoap_4.3.1.bb b/meta-networking/recipes-devtools/libcoap/libcoap_4.3.1.bb index 0fc342560a..efea3fab74 100644 --- a/meta-networking/recipes-devtools/libcoap/libcoap_4.3.1.bb +++ b/meta-networking/recipes-devtools/libcoap/libcoap_4.3.1.bb @@ -16,6 +16,8 @@ S = "${WORKDIR}/git" inherit autotools manpages pkgconfig ptest +DEPENDS += "ctags-native" + PACKAGECONFIG ?= "\ async openssl tcp \ ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ @@ -42,6 +44,10 @@ python () { export SGML_CATALOG_FILES="file://${STAGING_ETCDIR_NATIVE}/xml/catalog" +do_compile:prepend() { + oe_runmake update-map-file +} + do_install_ptest () { install -d ${D}${PTEST_PATH} install -m 0755 ${WORKDIR}/run-ptest ${D}${PTEST_PATH}/run-ptest diff --git a/meta-networking/recipes-devtools/python/python3-scapy/run-ptest b/meta-networking/recipes-devtools/python/python3-scapy/run-ptest index 797d8ecf78..417e21053c 100644 --- a/meta-networking/recipes-devtools/python/python3-scapy/run-ptest +++ b/meta-networking/recipes-devtools/python/python3-scapy/run-ptest @@ -1,4 +1,4 @@ #!/bin/sh -UTscapy3 -t regression.uts -f text -l -C \ +python3 UTscapy.py -t regression.uts -f text -l -C \ -o @PTEST_PATH@/scapy_ptest_$(date +%Y%m%d-%H%M%S).log \ 2>&1 | sed -e 's/^passed None/PASS:/' -e 's/^failed None/FAIL:/' diff --git a/meta-networking/recipes-devtools/python/python3-scapy_2.4.5.bb b/meta-networking/recipes-devtools/python/python3-scapy_2.5.0.bb index 0f66dfd784..cc3f2ee1dd 100644 --- a/meta-networking/recipes-devtools/python/python3-scapy_2.4.5.bb +++ b/meta-networking/recipes-devtools/python/python3-scapy_2.5.0.bb @@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" # If you want ptest support, use the git repo # UTscapy does not exist in the pypi pkg # -SRCREV = "32cd7eb0f620d9adf171c48d55514e8326a538d7" +SRCREV = "9473f77d8b548c8e478e52838bdd4c12f5d4f4ff" SRC_URI = "git://github.com/secdev/scapy.git;branch=master;protocol=https \ file://run-ptest" @@ -28,14 +28,14 @@ inherit setuptools3 ptest do_install:append() { mv ${D}${bindir}/scapy ${D}${bindir}/scapy3 - mv ${D}${bindir}/UTscapy ${D}${bindir}/UTscapy3 } do_install_ptest() { + install -m 0644 ${S}/scapy/tools/UTscapy.py ${D}${PTEST_PATH} install -m 0644 ${S}/test/regression.uts ${D}${PTEST_PATH} sed -i 's,@PTEST_PATH@,${PTEST_PATH},' ${D}${PTEST_PATH}/run-ptest } RDEPENDS:${PN} = "tcpdump ${PYTHON_PN}-compression ${PYTHON_PN}-cryptography ${PYTHON_PN}-netclient \ ${PYTHON_PN}-netserver ${PYTHON_PN}-pydoc ${PYTHON_PN}-pkgutil ${PYTHON_PN}-shell \ - ${PYTHON_PN}-threading ${PYTHON_PN}-numbers" + ${PYTHON_PN}-threading ${PYTHON_PN}-numbers ${PYTHON_PN}-fcntl" diff --git a/meta-networking/recipes-extended/dlm/dlm/0001-Disable-annobin-plugin.patch b/meta-networking/recipes-extended/dlm/dlm/0001-Disable-annobin-plugin.patch new file mode 100644 index 0000000000..6302829267 --- /dev/null +++ b/meta-networking/recipes-extended/dlm/dlm/0001-Disable-annobin-plugin.patch @@ -0,0 +1,31 @@ +From 5a0799d0bacc0cf93e15febdac7d8c50b21e7234 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 15 Jul 2023 13:13:12 -0700 +Subject: [PATCH] Disable annobin plugin + +OE gcc does not build this plugin, moreover there are non gcc compilers +which can be used with OE as well e.g. clang which might not have it +either + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + dlm_controld/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dlm_controld/Makefile b/dlm_controld/Makefile +index 8802d88..0380ec9 100644 +--- a/dlm_controld/Makefile ++++ b/dlm_controld/Makefile +@@ -47,7 +47,7 @@ CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ + + BIN_CFLAGS += $(CFLAGS) -fPIE -DPIE + BIN_CFLAGS += -I../include -I../libdlm +-LIB_CFLAGS += $(CFLAGS) -fPIC -fplugin=annobin ++LIB_CFLAGS += $(CFLAGS) -fPIC + + BIN_LDFLAGS += $(LDFLAGS) -Wl,-z,relro -Wl,-z,now -pie + BIN_LDFLAGS += -lpthread -lrt -lcpg -lcmap -lcfg -lquorum -luuid +-- +2.41.0 + diff --git a/meta-networking/recipes-extended/dlm/dlm/0001-Remove-fcf-protection-full.patch b/meta-networking/recipes-extended/dlm/dlm/0001-Remove-fcf-protection-full.patch new file mode 100644 index 0000000000..6290aa4c7a --- /dev/null +++ b/meta-networking/recipes-extended/dlm/dlm/0001-Remove-fcf-protection-full.patch @@ -0,0 +1,64 @@ +From e4ae70ae71f88d48cf1ab63810c9f7b4177af3a5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 15 Jul 2023 19:05:54 -0700 +Subject: [PATCH] Remove -fcf-protection=full + +This option is not available on all architectures e.g. RISC-V +Fixes +| cc1: error: '-fcf-protection=full' is not supported for this target + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + dlm_controld/Makefile | 1 - + dlm_tool/Makefile | 1 - + fence/Makefile | 1 - + libdlm/Makefile | 4 ++-- + 4 files changed, 2 insertions(+), 5 deletions(-) + +--- a/dlm_controld/Makefile ++++ b/dlm_controld/Makefile +@@ -43,7 +43,7 @@ CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ + -Wno-sign-compare -Wno-unused-parameter -Wp,-D_FORTIFY_SOURCE=2 \ + -fexceptions -fasynchronous-unwind-tables -fdiagnostics-show-option \ + -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong \ +- -fstack-clash-protection -fcf-protection=full ++ -fstack-clash-protection + + BIN_CFLAGS += $(CFLAGS) -fPIE -DPIE + BIN_CFLAGS += -I../include -I../libdlm +--- a/dlm_tool/Makefile ++++ b/dlm_tool/Makefile +@@ -15,7 +15,7 @@ CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ + -Wno-sign-compare -Wno-unused-parameter -Wp,-D_FORTIFY_SOURCE=2 \ + -fexceptions -fasynchronous-unwind-tables -fdiagnostics-show-option \ + -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong \ +- -fstack-clash-protection -fcf-protection=full ++ -fstack-clash-protection + + CFLAGS += -fPIE -DPIE + CFLAGS += -I../include -I../libdlm -I../dlm_controld +--- a/fence/Makefile ++++ b/fence/Makefile +@@ -15,7 +15,7 @@ CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ + -Wno-sign-compare -Wno-unused-parameter -Wp,-D_FORTIFY_SOURCE=2 \ + -fexceptions -fasynchronous-unwind-tables -fdiagnostics-show-option \ + -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong \ +- -fstack-clash-protection -fcf-protection=full ++ -fstack-clash-protection + + CFLAGS += -fPIE -DPIE + CFLAGS += -I../include +--- a/libdlm/Makefile ++++ b/libdlm/Makefile +@@ -80,8 +80,8 @@ CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ + -fdiagnostics-show-option \ + -fPIC + +-LIB_CFLAGS += $(CFLAGS) -D_REENTRANT -fcf-protection=full +-LLT_CFLAGS += $(CFLAGS) -fcf-protection=full ++LIB_CFLAGS += $(CFLAGS) -D_REENTRANT ++LLT_CFLAGS += $(CFLAGS) + + LIB_LDFLAGS += $(LDFLAGS) -lpthread -Wl,-z,now + LLT_LDFLAGS += $(LDFLAGS) -Wl,-z,now diff --git a/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-compile-error-since-xml2-config-should-not-b.patch b/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-compile-error-since-xml2-config-should-not-b.patch deleted file mode 100644 index 3d1551574e..0000000000 --- a/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-compile-error-since-xml2-config-should-not-b.patch +++ /dev/null @@ -1,35 +0,0 @@ -From da08f5ec5e553bd43f92a0b0f7476179b0b74502 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Wed, 26 Jun 2019 11:49:33 +0800 -Subject: [PATCH] dlm: fix compile error since xml2-config should not be used - -xml2-config is disabled, so change Makefile to use pkgconfig -to find libxml2. - -Upstream-Status: Inappropriate [oe-specific] - -Signed-off-by: Changqing Li <changqing.li@windriver.com> - ---- - fence/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/fence/Makefile b/fence/Makefile -index 2b080468..ff2eda3f 100644 ---- a/fence/Makefile -+++ b/fence/Makefile -@@ -18,12 +18,12 @@ CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ - -fstack-clash-protection -Wl,-z,now - - CFLAGS += -fPIE -DPIE --CFLAGS += `xml2-config --cflags` -+CFLAGS += `pkg-config libxml-2.0 --cflags` - CFLAGS += -I../include - CFLAGS += $(shell pkg-config --cflags pacemaker-fencing) - - LDFLAGS += -Wl,-z,relro -Wl,-z,defs -pie --LDFLAGS += `xml2-config --libs` -+LDFLAGS += `pkg-config libxml-2.0 --libs` - LDFLAGS += -ldl - - all: $(BIN_TARGET) diff --git a/meta-networking/recipes-extended/dlm/dlm/0001-dlm_controld-remove-unnecessary-header-include.patch b/meta-networking/recipes-extended/dlm/dlm/0001-dlm_controld-remove-unnecessary-header-include.patch new file mode 100644 index 0000000000..55efcea184 --- /dev/null +++ b/meta-networking/recipes-extended/dlm/dlm/0001-dlm_controld-remove-unnecessary-header-include.patch @@ -0,0 +1,35 @@ +From 4c40289eb9e47cfd272a8cc402fd2ddb29e2a3dc Mon Sep 17 00:00:00 2001 +From: Alexander Aring <aahringo@redhat.com> +Date: Wed, 24 May 2023 13:50:59 +0000 +Subject: [PATCH] dlm_controld: remove unnecessary header include + +The timewarn netlink functionality got dropped and will be removed by +kernel v6.4. The user space part was already dropped by commit 34ea31e7 +("controld: remove timewarn handling"). This is just a left over of this +commit. Recent builds fails now because the UAPI header in the Linux +kernel was removed. This means older dlm sources cannot be build with +newer kernel-headers, however it is not recommended to use older dlm +sources and all existing users should upgrade anyway. + +Upstream-Status: Backport [https://pagure.io/dlm/c/ddbba6608896f81bfce8f8edf3d0f507714cfc43?branch=main] +Reported-by: Fabio M. Di Nitto <fdinitto@redhat.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + dlm_controld/main.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/dlm_controld/main.c b/dlm_controld/main.c +index 7cf6348..e70e96a 100644 +--- a/dlm_controld/main.c ++++ b/dlm_controld/main.c +@@ -12,7 +12,6 @@ + #include <pthread.h> + #include <linux/netlink.h> + #include <linux/genetlink.h> +-#include <linux/dlm_netlink.h> + #include <uuid/uuid.h> + + #ifdef USE_SD_NOTIFY +-- +2.41.0 + diff --git a/meta-networking/recipes-extended/dlm/dlm/0004-include-string.h-for-memset-prototype.patch b/meta-networking/recipes-extended/dlm/dlm/0004-include-string.h-for-memset-prototype.patch deleted file mode 100644 index 257c5d02ff..0000000000 --- a/meta-networking/recipes-extended/dlm/dlm/0004-include-string.h-for-memset-prototype.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 9652e6b3c43b4c051f2ff0e000d7ebf5fbab418e Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 29 Aug 2022 10:54:51 -0700 -Subject: [PATCH] include string.h for memset prototype - -Upstream-Status: Submitted [https://pagure.io/dlm/pull-request/3] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - dlm_controld/lib.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dlm_controld/lib.c b/dlm_controld/lib.c -index 8cbdd27f..a7502fcd 100644 ---- a/dlm_controld/lib.c -+++ b/dlm_controld/lib.c -@@ -10,6 +10,7 @@ - #include <stdlib.h> - #include <unistd.h> - #include <stdint.h> -+#include <string.h> - #include <errno.h> - #include <time.h> - #include <sys/types.h> diff --git a/meta-networking/recipes-extended/dlm/dlm_4.1.1.bb b/meta-networking/recipes-extended/dlm/dlm_4.2.0.bb index bb33890ec9..ee006efe28 100644 --- a/meta-networking/recipes-extended/dlm/dlm_4.1.1.bb +++ b/meta-networking/recipes-extended/dlm/dlm_4.2.0.bb @@ -6,13 +6,14 @@ HOMEPAGE = "https://fedorahosted.org/cluster/wiki/HomePage" REQUIRED_DISTRO_FEATURES = "systemd" SRC_URI = "https://pagure.io/dlm/archive/dlm-${PV}/dlm-dlm-${PV}.tar.gz \ - file://0001-dlm-fix-compile-error-since-xml2-config-should-not-b.patch \ file://0001-Include-sys-sysmacros.h-for-major-minor-macros-in-gl.patch \ file://0001-make-Replace-cp-a-with-mode-preserving-options.patch \ - file://0004-include-string.h-for-memset-prototype.patch \ + file://0001-dlm_controld-remove-unnecessary-header-include.patch \ + file://0001-Disable-annobin-plugin.patch \ + file://0001-Remove-fcf-protection-full.patch \ " -SRC_URI[sha256sum] = "f12c0056b9196dfcecbec2fa8930feb87c605a86ef0f3d7bd6fb0b77cd7f45ca" +SRC_URI[sha256sum] = "90237e18af7422ac15fc756899b3bb6932597b13342296de8e0e120e6d8729ab" UPSTREAM_CHECK_URI = "https://pagure.io/dlm/releases" UPSTREAM_CHECK_REGEX = "dlm-(?P<pver>\d+(\.\d+)+)" @@ -35,11 +36,16 @@ SYSTEMD_AUTO_ENABLE = "enable" export EXTRA_OEMAKE = "" -DONTBUILD = "${@bb.utils.contains('PACKAGECONFIG', 'pacemaker', '', 'fence', d)}" +CFPROTECTION ?= "-fcf-protection=full" +CFPROTECTION:riscv64 = "" +CFPROTECTION:arm = "" +CFPROTECTION:aarch64 = "" -do_compile:prepend:toolchain-clang() { - sed -i -e "s/-fstack-clash-protection//g" ${S}/*/Makefile -} +CFLAGS += "${CFPROTECTION}" + +PARALLEL_MAKE = "" + +DONTBUILD = "${@bb.utils.contains('PACKAGECONFIG', 'pacemaker', '', 'fence', d)}" do_compile() { sed -i "s/libsystemd-daemon/libsystemd/g" ${S}/dlm_controld/Makefile @@ -57,4 +63,3 @@ do_install() { install -Dm 0644 ${S}/init/dlm.service ${D}${systemd_unitdir}/system/dlm.service fi } - diff --git a/meta-networking/recipes-extended/kronosnet/kronosnet/0001-links.c-Fix-build-with-gcc-12.patch b/meta-networking/recipes-extended/kronosnet/kronosnet/0001-links.c-Fix-build-with-gcc-12.patch index e59501cc49..d57d0e61b5 100644 --- a/meta-networking/recipes-extended/kronosnet/kronosnet/0001-links.c-Fix-build-with-gcc-12.patch +++ b/meta-networking/recipes-extended/kronosnet/kronosnet/0001-links.c-Fix-build-with-gcc-12.patch @@ -15,7 +15,7 @@ Fixes: | | ^~~~ | cc1: all warnings being treated as errors -Upstream-Status: Submitted[https://github.com/kronosnet/kronosnet/pull/382] +Upstream-Status: Submitted [https://github.com/kronosnet/kronosnet/pull/382] Signed-off-by: Mingli Yu <mingli.yu@windriver.com> --- diff --git a/meta-networking/recipes-extended/tgt/files/0001-usr-Makefile-WARNING-fix.patch b/meta-networking/recipes-extended/tgt/files/0001-usr-Makefile-WARNING-fix.patch index 078ba9ef50..a3ea604086 100644 --- a/meta-networking/recipes-extended/tgt/files/0001-usr-Makefile-WARNING-fix.patch +++ b/meta-networking/recipes-extended/tgt/files/0001-usr-Makefile-WARNING-fix.patch @@ -6,7 +6,7 @@ Subject: [PATCH] usr/Makefile: WARNING fix WARNING: QA Issue: tgt: packages-split/tgt/usr/sbin/tgtd contains probably-redundant RPATH /usr/lib [useless-rpaths] -Upstream-Status: pending +Upstream-Status: Pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> diff --git a/meta-networking/recipes-extended/tgt/files/usr-Makefile-apply-LDFLAGS-to-all-executables.patch b/meta-networking/recipes-extended/tgt/files/usr-Makefile-apply-LDFLAGS-to-all-executables.patch index d480ef786e..b6c674bd9d 100644 --- a/meta-networking/recipes-extended/tgt/files/usr-Makefile-apply-LDFLAGS-to-all-executables.patch +++ b/meta-networking/recipes-extended/tgt/files/usr-Makefile-apply-LDFLAGS-to-all-executables.patch @@ -5,6 +5,8 @@ Subject: [PATCH] usr/Makefile: apply LDFLAGS to all executables Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> --- +Upstream-Status: Pending + usr/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.7.bb b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.7.bb index 8b47ceb1c0..0c6fd90d34 100644 --- a/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.7.bb +++ b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.7.bb @@ -11,6 +11,7 @@ EXTRA_OECONF += "LIBS=-ltirpc CPPFLAGS=-I${STAGING_INCDIR}/tirpc" SRC_URI = "http://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-${PV}.tar.bz2 \ file://conntrack-failover \ file://init \ + file://conntrackd.service \ " SRC_URI[sha256sum] = "099debcf57e81690ced57f516b493588a73518f48c14d656f823b29b4fc24b5d" @@ -25,6 +26,10 @@ PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" INITSCRIPT_NAME = "conntrackd" +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "conntrackd.service" +SYSTEMD_AUTO_ENABLE = "disable" + do_install:append() { install -d ${D}/${sysconfdir}/conntrackd install -d ${D}/${sysconfdir}/init.d @@ -37,6 +42,11 @@ do_install:append() { sed -i 's!/etc/!${sysconfdir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd sed -i 's!/var/!${localstatedir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd ${D}/${sysconfdir}/conntrackd/conntrackd.conf.sample sed -i 's!^export PATH=.*!export PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}/${sysconfdir}/init.d/conntrackd + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}/${systemd_system_unitdir} + install -m 644 ${WORKDIR}/conntrackd.service ${D}/${systemd_system_unitdir} + fi } # fix error message: Do not forget that you need *root* or CAP_NET_ADMIN capabilities ;-) @@ -44,3 +54,7 @@ pkg_postinst:${PN} () { setcap cap_net_admin+ep "$D/${sbindir}/conntrack" } PACKAGE_WRITE_DEPS += "libcap-native" + +RRECOMMENDS:${PN} = "kernel-module-nf-conntrack kernel-module-nfnetlink \ + kernel-module-nf-conntrack-netlink \ + " diff --git a/meta-networking/recipes-filter/conntrack-tools/files/conntrackd.service b/meta-networking/recipes-filter/conntrack-tools/files/conntrackd.service new file mode 100644 index 0000000000..b3b0f1d216 --- /dev/null +++ b/meta-networking/recipes-filter/conntrack-tools/files/conntrackd.service @@ -0,0 +1,11 @@ +[Unit] +Description=Conntrack Daemon +Documentation=man:conntrackd(8) man:conntrackd.conf(5) + +[Service] +Type=notify +ExecStartPre=-/bin/rm -f /var/lock/conntrackd.lock +ExecStart=/usr/sbin/conntrackd -C /etc/conntrackd/conntrackd.conf + +[Install] +WantedBy=multi-user.target diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/0010-Adjust-header-include-sequence.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/0010-Adjust-header-include-sequence.patch index 1f3fcfe370..dd8ad969c0 100644 --- a/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/0010-Adjust-header-include-sequence.patch +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/0010-Adjust-header-include-sequence.patch @@ -8,6 +8,8 @@ This fixes the build with musl Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + extensions/ebt_among.c | 2 +- extensions/ebt_arpreply.c | 2 +- extensions/ebt_nat.c | 2 +- diff --git a/meta-networking/recipes-filter/libnetfilter/files/0001-libnetfilter-acct-Declare-the-define-visivility-attribute-together.patch b/meta-networking/recipes-filter/libnetfilter/files/0001-libnetfilter-acct-Declare-the-define-visivility-attribute-together.patch index 9e0b420e0a..92e178efb7 100644 --- a/meta-networking/recipes-filter/libnetfilter/files/0001-libnetfilter-acct-Declare-the-define-visivility-attribute-together.patch +++ b/meta-networking/recipes-filter/libnetfilter/files/0001-libnetfilter-acct-Declare-the-define-visivility-attribute-together.patch @@ -10,6 +10,8 @@ fail to link due to these missing symbols Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + doxygen.cfg.in | 2 +- src/internal.h | 5 ++--- src/libnetfilter_acct.c | 41 ++++++++++++++--------------------------- diff --git a/meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cthelper-visibility-hidden.patch b/meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cthelper-visibility-hidden.patch deleted file mode 100644 index e717d5b0e3..0000000000 --- a/meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cthelper-visibility-hidden.patch +++ /dev/null @@ -1,382 +0,0 @@ -From f58c5b09fb59baf07c942d373fc4d522b27e73c6 Mon Sep 17 00:00:00 2001 -From: Kevin Cernekee <cernekee@chromium.org> -Date: Wed, 4 Jan 2017 14:30:26 -0800 -Subject: Use __EXPORTED rather than EXPORT_SYMBOL - -clang is sensitive to the ordering of -__attribute__((visibility("default"))) relative to the function -body. gcc is not. So if we try to re-declare an existing function -with default visibility, clang prints a warning and generates -a broken .so file in which nfct_helper_* are not exported to library -callers. - -Move the attribute up into the function definition to make clang happy. - -Signed-off-by: Kevin Cernekee <cernekee@chromium.org> -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ---- - doxygen.cfg.in | 2 +- - src/internal.h | 5 ++- - src/libnetfilter_cthelper.c | 83 ++++++++++++++++++--------------------------- - 3 files changed, 36 insertions(+), 54 deletions(-) - -Index: libnetfilter_cthelper-1.0.0/doxygen.cfg.in -=================================================================== ---- libnetfilter_cthelper-1.0.0.orig/doxygen.cfg.in -+++ libnetfilter_cthelper-1.0.0/doxygen.cfg.in -@@ -72,7 +72,7 @@ RECURSIVE = YES - EXCLUDE = - EXCLUDE_SYMLINKS = NO - EXCLUDE_PATTERNS = */.git/* .*.d --EXCLUDE_SYMBOLS = EXPORT_SYMBOL -+EXCLUDE_SYMBOLS = - EXAMPLE_PATH = - EXAMPLE_PATTERNS = - EXAMPLE_RECURSIVE = NO -Index: libnetfilter_cthelper-1.0.0/src/internal.h -=================================================================== ---- libnetfilter_cthelper-1.0.0.orig/src/internal.h -+++ libnetfilter_cthelper-1.0.0/src/internal.h -@@ -3,10 +3,9 @@ - - #include "config.h" - #ifdef HAVE_VISIBILITY_HIDDEN --# define __visible __attribute__((visibility("default"))) --# define EXPORT_SYMBOL(x) typeof(x) (x) __visible -+# define __EXPORTED __attribute__((visibility("default"))) - #else --# define EXPORT_SYMBOL -+# define __EXPORTED - #endif - - #endif -Index: libnetfilter_cthelper-1.0.0/src/libnetfilter_cthelper.c -=================================================================== ---- libnetfilter_cthelper-1.0.0.orig/src/libnetfilter_cthelper.c -+++ libnetfilter_cthelper-1.0.0/src/libnetfilter_cthelper.c -@@ -99,17 +99,16 @@ struct nfct_helper { - * In case of success, this function returns a valid pointer, otherwise NULL - * s returned and errno is appropriately set. - */ --struct nfct_helper *nfct_helper_alloc(void) -+struct nfct_helper __EXPORTED *nfct_helper_alloc(void) - { - return calloc(1, sizeof(struct nfct_helper)); - } --EXPORT_SYMBOL(nfct_helper_alloc); - - /** - * nfct_helper_free - release one helper object - * \param nfct_helper pointer to the helper object - */ --void nfct_helper_free(struct nfct_helper *h) -+void __EXPORTED nfct_helper_free(struct nfct_helper *h) - { - int i; - -@@ -119,7 +118,6 @@ void nfct_helper_free(struct nfct_helper - free(h->expect_policy[i]); - } - } --EXPORT_SYMBOL(nfct_helper_free); - - /** - * nfct_helper_policy_alloc - allocate a new helper policy object -@@ -127,21 +125,19 @@ EXPORT_SYMBOL(nfct_helper_free); - * In case of success, this function returns a valid pointer, otherwise NULL - * s returned and errno is appropriately set. - */ --struct nfct_helper_policy *nfct_helper_policy_alloc(void) -+struct nfct_helper_policy __EXPORTED *nfct_helper_policy_alloc(void) - { - return calloc(1, sizeof(struct nfct_helper_policy)); - } --EXPORT_SYMBOL(nfct_helper_policy_alloc); - - /** - * nfct_helper_free - release one helper policy object - * \param nfct_helper pointer to the helper object - */ --void nfct_helper_policy_free(struct nfct_helper_policy *p) -+void __EXPORTED nfct_helper_policy_free(struct nfct_helper_policy *p) - { - free(p); - } --EXPORT_SYMBOL(nfct_helper_policy_free); - - /** - * nfct_helper_policy_attr_set - set one attribute of the helper object -@@ -149,7 +145,7 @@ EXPORT_SYMBOL(nfct_helper_policy_free); - * \param type attribute type you want to set - * \param data pointer to data that will be used to set this attribute - */ --void -+void __EXPORTED - nfct_helper_policy_attr_set(struct nfct_helper_policy *p, - enum nfct_helper_policy_attr_type type, - const void *data) -@@ -170,7 +166,6 @@ nfct_helper_policy_attr_set(struct nfct_ - break; - } - } --EXPORT_SYMBOL(nfct_helper_policy_attr_set); - - /** - * nfct_helper_attr_set_str - set one attribute the helper object -@@ -178,23 +173,21 @@ EXPORT_SYMBOL(nfct_helper_policy_attr_se - * \param type attribute type you want to set - * \param name string that will be used to set this attribute - */ --void -+void __EXPORTED - nfct_helper_policy_attr_set_str(struct nfct_helper_policy *p, - enum nfct_helper_policy_attr_type type, - const char *name) - { - nfct_helper_policy_attr_set(p, type, name); - } --EXPORT_SYMBOL(nfct_helper_policy_attr_set_str); - --void -+void __EXPORTED - nfct_helper_policy_attr_set_u32(struct nfct_helper_policy *p, - enum nfct_helper_policy_attr_type type, - uint32_t value) - { - nfct_helper_policy_attr_set(p, type, &value); - } --EXPORT_SYMBOL(nfct_helper_policy_attr_set_u32); - - /** - * nfct_helper_attr_set - set one attribute of the helper object -@@ -202,7 +195,7 @@ EXPORT_SYMBOL(nfct_helper_policy_attr_se - * \param type attribute type you want to set - * \param data pointer to data that will be used to set this attribute - */ --void -+void __EXPORTED - nfct_helper_attr_set(struct nfct_helper *h, - enum nfct_helper_attr_type type, const void *data) - { -@@ -250,7 +243,6 @@ nfct_helper_attr_set(struct nfct_helper - break; - } - } --EXPORT_SYMBOL(nfct_helper_attr_set); - - /** - * nfct_helper_attr_set_str - set one attribute the helper object -@@ -258,44 +250,40 @@ EXPORT_SYMBOL(nfct_helper_attr_set); - * \param type attribute type you want to set - * \param name string that will be used to set this attribute - */ --void -+void __EXPORTED - nfct_helper_attr_set_str(struct nfct_helper *nfct_helper, enum nfct_helper_attr_type type, - const char *name) - { - nfct_helper_attr_set(nfct_helper, type, name); - } --EXPORT_SYMBOL(nfct_helper_attr_set_str); - --void -+void __EXPORTED - nfct_helper_attr_set_u8(struct nfct_helper *nfct_helper, - enum nfct_helper_attr_type type, uint8_t value) - { - nfct_helper_attr_set(nfct_helper, type, &value); - } --EXPORT_SYMBOL(nfct_helper_attr_set_u8); - --void -+void __EXPORTED - nfct_helper_attr_set_u16(struct nfct_helper *nfct_helper, - enum nfct_helper_attr_type type, uint16_t value) - { - nfct_helper_attr_set(nfct_helper, type, &value); - } --EXPORT_SYMBOL(nfct_helper_attr_set_u16); - --void -+void __EXPORTED - nfct_helper_attr_set_u32(struct nfct_helper *nfct_helper, - enum nfct_helper_attr_type type, uint32_t value) - { - nfct_helper_attr_set(nfct_helper, type, &value); - } --EXPORT_SYMBOL(nfct_helper_attr_set_u32); - - /** - * nfct_helper_attr_unset - unset one attribute the helper object - * \param nfct_helper pointer to the helper object - * \param type attribute type you want to set - */ --void -+void __EXPORTED - nfct_helper_attr_unset(struct nfct_helper *nfct_helper, enum nfct_helper_attr_type type) - { - switch(type) { -@@ -307,7 +295,6 @@ nfct_helper_attr_unset(struct nfct_helpe - break; - } - } --EXPORT_SYMBOL(nfct_helper_attr_unset); - - /** - * nfct_helper_attr_get - get one attribute the helper object -@@ -317,8 +304,9 @@ EXPORT_SYMBOL(nfct_helper_attr_unset); - * This function returns a valid pointer to the attribute data. If a - * unsupported attribute is used, this returns NULL. - */ --const void *nfct_helper_attr_get(struct nfct_helper *helper, -- enum nfct_helper_attr_type type) -+const void __EXPORTED * -+nfct_helper_attr_get(struct nfct_helper *helper, -+ enum nfct_helper_attr_type type) - { - const void *ret = NULL; - -@@ -358,7 +346,6 @@ const void *nfct_helper_attr_get(struct - } - return ret; - } --EXPORT_SYMBOL(nfct_helper_attr_get); - - /** - * nfct_helper_attr_get_str - get one attribute the helper object -@@ -368,13 +355,12 @@ EXPORT_SYMBOL(nfct_helper_attr_get); - * This function returns a valid pointer to the beginning of the string. - * If the attribute is unsupported, this returns NULL. - */ --const char * -+const char __EXPORTED * - nfct_helper_attr_get_str(struct nfct_helper *nfct_helper, - enum nfct_helper_attr_type type) - { - return (const char *)nfct_helper_attr_get(nfct_helper, type); - } --EXPORT_SYMBOL(nfct_helper_attr_get_str); - - /** - * nfct_helper_attr_get_u8 - get one attribute the helper object -@@ -384,12 +370,12 @@ EXPORT_SYMBOL(nfct_helper_attr_get_str); - * This function returns a unsigned 8-bits integer. If the attribute is - * unsupported, this returns NULL. - */ --uint8_t nfct_helper_attr_get_u8(struct nfct_helper *nfct_helper, -- enum nfct_helper_attr_type type) -+uint8_t __EXPORTED -+nfct_helper_attr_get_u8(struct nfct_helper *nfct_helper, -+ enum nfct_helper_attr_type type) - { - return *((uint8_t *)nfct_helper_attr_get(nfct_helper, type)); - } --EXPORT_SYMBOL(nfct_helper_attr_get_u8); - - /** - * nfct_helper_attr_get_u16 - get one attribute the helper object -@@ -399,12 +385,12 @@ EXPORT_SYMBOL(nfct_helper_attr_get_u8); - * This function returns a unsigned 16-bits integer. If the attribute is - * unsupported, this returns NULL. - */ --uint16_t nfct_helper_attr_get_u16(struct nfct_helper *nfct_helper, -- enum nfct_helper_attr_type type) -+uint16_t __EXPORTED -+nfct_helper_attr_get_u16(struct nfct_helper *nfct_helper, -+ enum nfct_helper_attr_type type) - { - return *((uint16_t *)nfct_helper_attr_get(nfct_helper, type)); - } --EXPORT_SYMBOL(nfct_helper_attr_get_u16); - - /** - * nfct_helper_attr_get_u32 - get one attribute the helper object -@@ -414,12 +400,12 @@ EXPORT_SYMBOL(nfct_helper_attr_get_u16); - * This function returns a unsigned 32-bits integer. If the attribute is - * unsupported, this returns NULL. - */ --uint32_t nfct_helper_attr_get_u32(struct nfct_helper *nfct_helper, -- enum nfct_helper_attr_type type) -+uint32_t __EXPORTED -+nfct_helper_attr_get_u32(struct nfct_helper *nfct_helper, -+ enum nfct_helper_attr_type type) - { - return *((uint32_t *)nfct_helper_attr_get(nfct_helper, type)); - } --EXPORT_SYMBOL(nfct_helper_attr_get_u32); - - /** - * nfct_helper_snprintf - print helper object into one buffer -@@ -431,9 +417,10 @@ EXPORT_SYMBOL(nfct_helper_attr_get_u32); - * This function returns -1 in case that some mandatory attributes are - * missing. On sucess, it returns 0. - */ --int nfct_helper_snprintf(char *buf, size_t size, -- struct nfct_helper *helper, -- unsigned int type, unsigned int flags) -+int __EXPORTED -+nfct_helper_snprintf(char *buf, size_t size, -+ struct nfct_helper *helper, -+ unsigned int type, unsigned int flags) - { - int ret; - -@@ -454,7 +441,6 @@ int nfct_helper_snprintf(char *buf, size - - return ret; - } --EXPORT_SYMBOL(nfct_helper_snprintf); - - /** - * @} -@@ -490,7 +476,7 @@ EXPORT_SYMBOL(nfct_helper_snprintf); - * - Command NFNL_MSG_ACCT_DEL, to delete one specific nfct_helper object (if - * unused, otherwise you hit EBUSY). - */ --struct nlmsghdr * -+struct nlmsghdr __EXPORTED * - nfct_helper_nlmsg_build_hdr(char *buf, uint8_t cmd, - uint16_t flags, uint32_t seq) - { -@@ -509,7 +495,6 @@ nfct_helper_nlmsg_build_hdr(char *buf, u - - return nlh; - } --EXPORT_SYMBOL(nfct_helper_nlmsg_build_hdr); - - static void - nfct_helper_nlmsg_build_policy(struct nlmsghdr *nlh, -@@ -530,7 +515,7 @@ nfct_helper_nlmsg_build_policy(struct nl - * \param nlh: netlink message that you want to use to add the payload. - * \param nfct_helper: pointer to a helper object - */ --void -+void __EXPORTED - nfct_helper_nlmsg_build_payload(struct nlmsghdr *nlh, struct nfct_helper *h) - { - struct nlattr *nest; -@@ -593,7 +578,6 @@ nfct_helper_nlmsg_build_payload(struct n - if (h->bitset & (1 << NFCTH_ATTR_STATUS)) - mnl_attr_put_u32(nlh, NFCTH_STATUS, ntohl(h->status)); - } --EXPORT_SYMBOL(nfct_helper_nlmsg_build_payload); - - static int - nfct_helper_nlmsg_parse_tuple_cb(const struct nlattr *attr, void *data) -@@ -795,7 +779,7 @@ nfct_helper_nlmsg_parse_attr_cb(const st - * This function returns -1 in case that some mandatory attributes are - * missing. On sucess, it returns 0. - */ --int -+int __EXPORTED - nfct_helper_nlmsg_parse_payload(const struct nlmsghdr *nlh, - struct nfct_helper *h) - { -@@ -832,7 +816,6 @@ nfct_helper_nlmsg_parse_payload(const st - } - return 0; - } --EXPORT_SYMBOL(nfct_helper_nlmsg_parse_payload); - - /** - * @} diff --git a/meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cttimeout-visibility-hidden.patch b/meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cttimeout-visibility-hidden.patch deleted file mode 100644 index 2c606c832d..0000000000 --- a/meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cttimeout-visibility-hidden.patch +++ /dev/null @@ -1,264 +0,0 @@ -From d0c4e39d12f903e06db262656cff2e24d267bed7 Mon Sep 17 00:00:00 2001 -From: Kevin Cernekee <cernekee@chromium.org> -Date: Wed, 4 Jan 2017 14:30:25 -0800 -Subject: Use __EXPORTED rather than EXPORT_SYMBOL - -clang is sensitive to the ordering of -__attribute__((visibility("default"))) relative to the function -body. gcc is not. So if we try to re-declare an existing function -with default visibility, clang prints a warning and generates -a broken .so file in which nfct_timeout_* are not exported to library -callers. - -Move the attribute up into the function definition to make clang happy. - -Signed-off-by: Kevin Cernekee <cernekee@chromium.org> -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ---- - doxygen.cfg.in | 2 +- - src/internal.h | 5 ++--- - src/libnetfilter_cttimeout.c | 44 +++++++++++++++++--------------------------- - 3 files changed, 20 insertions(+), 31 deletions(-) - -diff --git a/doxygen.cfg.in b/doxygen.cfg.in -index 8e5d449..09c3ce0 100644 ---- a/doxygen.cfg.in -+++ b/doxygen.cfg.in -@@ -72,7 +72,7 @@ RECURSIVE = YES - EXCLUDE = - EXCLUDE_SYMLINKS = NO - EXCLUDE_PATTERNS = */.git/* .*.d --EXCLUDE_SYMBOLS = EXPORT_SYMBOL nfct_timeout _container_policy_cb -+EXCLUDE_SYMBOLS = nfct_timeout _container_policy_cb - EXAMPLE_PATH = - EXAMPLE_PATTERNS = - EXAMPLE_RECURSIVE = NO -diff --git a/src/internal.h b/src/internal.h -index 3a88d1a..5d78171 100644 ---- a/src/internal.h -+++ b/src/internal.h -@@ -3,10 +3,9 @@ - - #include "config.h" - #ifdef HAVE_VISIBILITY_HIDDEN --# define __visible __attribute__((visibility("default"))) --# define EXPORT_SYMBOL(x) typeof(x) (x) __visible -+# define __EXPORTED __attribute__((visibility("default"))) - #else --# define EXPORT_SYMBOL -+# define __EXPORTED - #endif - - #endif -diff --git a/src/libnetfilter_cttimeout.c b/src/libnetfilter_cttimeout.c -index 7844a1f..a0a7185 100644 ---- a/src/libnetfilter_cttimeout.c -+++ b/src/libnetfilter_cttimeout.c -@@ -187,7 +187,7 @@ struct nfct_timeout { - * In case of success, this function returns a valid pointer, otherwise NULL - * s returned and errno is appropriately set. - */ --struct nfct_timeout *nfct_timeout_alloc(void) -+struct nfct_timeout __EXPORTED *nfct_timeout_alloc(void) - { - struct nfct_timeout *t; - -@@ -197,19 +197,17 @@ struct nfct_timeout *nfct_timeout_alloc(void) - - return t; - } --EXPORT_SYMBOL(nfct_timeout_alloc); - - /** - * nfct_timeout_free - release one conntrack timeout object - * \param t pointer to the conntrack timeout object - */ --void nfct_timeout_free(struct nfct_timeout *t) -+void __EXPORTED nfct_timeout_free(struct nfct_timeout *t) - { - if (t->timeout) - free(t->timeout); - free(t); - } --EXPORT_SYMBOL(nfct_timeout_free); - - /** - * nfct_timeout_attr_set - set one attribute of the conntrack timeout object -@@ -217,7 +215,7 @@ EXPORT_SYMBOL(nfct_timeout_free); - * \param type attribute type you want to set - * \param data pointer to data that will be used to set this attribute - */ --int -+int __EXPORTED - nfct_timeout_attr_set(struct nfct_timeout *t, uint32_t type, const void *data) - { - switch(type) { -@@ -236,7 +234,6 @@ nfct_timeout_attr_set(struct nfct_timeout *t, uint32_t type, const void *data) - t->attrset |= (1 << type); - return 0; - } --EXPORT_SYMBOL(nfct_timeout_attr_set); - - /** - * nfct_timeout_attr_set_u8 - set one attribute of the conntrack timeout object -@@ -244,12 +241,11 @@ EXPORT_SYMBOL(nfct_timeout_attr_set); - * \param type attribute type you want to set - * \param data pointer to data that will be used to set this attribute - */ --int -+int __EXPORTED - nfct_timeout_attr_set_u8(struct nfct_timeout *t, uint32_t type, uint8_t data) - { - return nfct_timeout_attr_set(t, type, &data); - } --EXPORT_SYMBOL(nfct_timeout_attr_set_u8); - - /** - * nfct_timeout_attr_set_u16 - set one attribute of the conntrack timeout object -@@ -257,23 +253,21 @@ EXPORT_SYMBOL(nfct_timeout_attr_set_u8); - * \param type attribute type you want to set - * \param data pointer to data that will be used to set this attribute - */ --int -+int __EXPORTED - nfct_timeout_attr_set_u16(struct nfct_timeout *t, uint32_t type, uint16_t data) - { - return nfct_timeout_attr_set(t, type, &data); - } --EXPORT_SYMBOL(nfct_timeout_attr_set_u16); - - /** - * nfct_timeout_attr_unset - unset one attribute of the conntrack timeout object - * \param t pointer to the conntrack timeout object - * \param type attribute type you want to set - */ --void nfct_timeout_attr_unset(struct nfct_timeout *t, uint32_t type) -+void __EXPORTED nfct_timeout_attr_unset(struct nfct_timeout *t, uint32_t type) - { - t->attrset &= ~(1 << type); - } --EXPORT_SYMBOL(nfct_timeout_attr_unset); - - /** - * nfct_timeout_policy_attr_set_u32 - set one attribute of the policy -@@ -281,7 +275,7 @@ EXPORT_SYMBOL(nfct_timeout_attr_unset); - * \param type attribute type you want to set - * \param data data that will be used to set this attribute - */ --int -+int __EXPORTED - nfct_timeout_policy_attr_set_u32(struct nfct_timeout *t, - uint32_t type, uint32_t data) - { -@@ -319,18 +313,17 @@ nfct_timeout_policy_attr_set_u32(struct nfct_timeout *t, - - return 0; - } --EXPORT_SYMBOL(nfct_timeout_policy_attr_set_u32); - - /** - * nfct_timeout_policy_attr_unset - unset one attribute of the policy - * \param t pointer to the conntrack timeout object - * \param type attribute type you want to set - */ --void nfct_timeout_policy_attr_unset(struct nfct_timeout *t, uint32_t type) -+void __EXPORTED -+nfct_timeout_policy_attr_unset(struct nfct_timeout *t, uint32_t type) - { - t->attrset &= ~(1 << type); - } --EXPORT_SYMBOL(nfct_timeout_policy_attr_unset); - - /** - * nfct_timeout_policy_attr_to_name - get state name from protocol state number -@@ -340,7 +333,8 @@ EXPORT_SYMBOL(nfct_timeout_policy_attr_unset); - * This function returns NULL if unsupported protocol or state number is passed. - * Otherwise, a pointer to valid string is returned. - */ --const char *nfct_timeout_policy_attr_to_name(uint8_t l4proto, uint32_t state) -+const char __EXPORTED * -+nfct_timeout_policy_attr_to_name(uint8_t l4proto, uint32_t state) - { - if (timeout_protocol[l4proto].state_to_name == NULL) { - printf("no array state name\n"); -@@ -354,7 +348,6 @@ const char *nfct_timeout_policy_attr_to_name(uint8_t l4proto, uint32_t state) - - return timeout_protocol[l4proto].state_to_name[state]; - } --EXPORT_SYMBOL(nfct_timeout_policy_attr_to_name); - - /** - * @} -@@ -438,8 +431,9 @@ nfct_timeout_snprintf_default(char *buf, size_t size, - * This function returns -1 in case that some mandatory attributes are - * missing. On sucess, it returns 0. - */ --int nfct_timeout_snprintf(char *buf, size_t size, const struct nfct_timeout *t, -- unsigned int type, unsigned int flags) -+int __EXPORTED -+nfct_timeout_snprintf(char *buf, size_t size, const struct nfct_timeout *t, -+ unsigned int type, unsigned int flags) - { - int ret = 0; - -@@ -454,7 +448,6 @@ int nfct_timeout_snprintf(char *buf, size_t size, const struct nfct_timeout *t, - - return ret; - } --EXPORT_SYMBOL(nfct_timeout_snprintf); - - /** - * @} -@@ -477,7 +470,7 @@ EXPORT_SYMBOL(nfct_timeout_snprintf); - * - CTNL_MSG_TIMEOUT_GET: get conntrack timeout object. - * - CTNL_MSG_TIMEOUT_DEL: delete conntrack timeout object. - */ --struct nlmsghdr * -+struct nlmsghdr __EXPORTED * - nfct_timeout_nlmsg_build_hdr(char *buf, uint8_t cmd, - uint16_t flags, uint32_t seq) - { -@@ -496,14 +489,13 @@ nfct_timeout_nlmsg_build_hdr(char *buf, uint8_t cmd, - - return nlh; - } --EXPORT_SYMBOL(nfct_timeout_nlmsg_build_hdr); - - /** - * nfct_timeout_nlmsg_build_payload - build payload from ct timeout object - * \param nlh: netlink message that you want to use to add the payload. - * \param t: pointer to a conntrack timeout object - */ --void -+void __EXPORTED - nfct_timeout_nlmsg_build_payload(struct nlmsghdr *nlh, - const struct nfct_timeout *t) - { -@@ -532,7 +524,6 @@ nfct_timeout_nlmsg_build_payload(struct nlmsghdr *nlh, - } - - } --EXPORT_SYMBOL(nfct_timeout_nlmsg_build_payload); - - static int - timeout_nlmsg_parse_attr_cb(const struct nlattr *attr, void *data) -@@ -629,7 +620,7 @@ timeout_parse_attr_data(struct nfct_timeout *t, const struct nlattr *nest) - * This function returns -1 in case that some mandatory attributes are - * missing. On sucess, it returns 0. - */ --int -+int __EXPORTED - nfct_timeout_nlmsg_parse_payload(const struct nlmsghdr *nlh, - struct nfct_timeout *t) - { -@@ -654,7 +645,6 @@ nfct_timeout_nlmsg_parse_payload(const struct nlmsghdr *nlh, - } - return 0; - } --EXPORT_SYMBOL(nfct_timeout_nlmsg_parse_payload); - - /** - * @} --- -cgit v1.1 - diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.0.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.0.bb deleted file mode 100644 index fea520d439..0000000000 --- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Netfilter connection tracking helper library" -DESCRIPTION = "Userspace library providing a programming interface (API) to the Linux kernel netfilter user-space helper infrastructure" -HOMEPAGE = "http://www.netfilter.org/projects/libnetfilter_cthelper/index.html" -SECTION = "libs" -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -DEPENDS = "libmnl" - -SRC_URI = "http://www.netfilter.org/projects/libnetfilter_cthelper/files/libnetfilter_cthelper-${PV}.tar.bz2;name=tar \ - file://libnetfilter-cthelper-visibility-hidden.patch \ -" -SRC_URI[tar.md5sum] = "b2efab1a3a198a5add448960ba011acd" -SRC_URI[tar.sha256sum] = "07618e71c4d9a6b6b3dc1986540486ee310a9838ba754926c7d14a17d8fccf3d" - -S = "${WORKDIR}/libnetfilter_cthelper-${PV}" - -inherit autotools pkgconfig diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.1.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.1.bb new file mode 100644 index 0000000000..ebb0eb2329 --- /dev/null +++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.1.bb @@ -0,0 +1,17 @@ +SUMMARY = "Netfilter connection tracking helper library" +DESCRIPTION = "Userspace library providing a programming interface (API) to the Linux kernel netfilter user-space helper infrastructure" +HOMEPAGE = "https://www.netfilter.org/projects/libnetfilter_cthelper/index.html" +SECTION = "libs" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" +DEPENDS = "libmnl" + +SRC_URI = "https://www.netfilter.org/projects/libnetfilter_cthelper/files/libnetfilter_cthelper-${PV}.tar.bz2 \ + " + +SRC_URI[md5sum] = "e59279645fe65d40dd7dfc82a797ca5b" +SRC_URI[sha256sum] = "14073d5487233897355d3ff04ddc1c8d03cc5ba8d2356236aa88161a9f2dc912" + +S = "${WORKDIR}/libnetfilter_cthelper-${PV}" + +inherit autotools pkgconfig diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.0.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.1.bb index dc87d9b123..5349e6e4b8 100644 --- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.0.bb +++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.1.bb @@ -5,11 +5,11 @@ LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" DEPENDS = "libmnl" -SRC_URI = "http://www.netfilter.org/projects/libnetfilter_cttimeout/files/libnetfilter_cttimeout-${PV}.tar.bz2;name=tar \ - file://libnetfilter-cttimeout-visibility-hidden.patch \ -" -SRC_URI[tar.md5sum] = "7697437fc9ebb6f6b83df56a633db7f9" -SRC_URI[tar.sha256sum] = "aeab12754f557cba3ce2950a2029963d817490df7edb49880008b34d7ff8feba" +SRC_URI = "https://www.netfilter.org/projects/libnetfilter_cttimeout/files/libnetfilter_cttimeout-${PV}.tar.bz2 \ + " + +SRC_URI[md5sum] = "ac64b55952b79cb9910db95ce8883940" +SRC_URI[sha256sum] = "0b59da2f3204e1c80cb85d1f6d72285fc07b01a2f5678abf5dccfbbefd650325" S = "${WORKDIR}/libnetfilter_cttimeout-${PV}" diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.5.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.5.bb index 580c29e1ae..301dd86cf3 100644 --- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.5.bb +++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.5.bb @@ -14,3 +14,5 @@ SRC_URI = "git://git.netfilter.org/libnetfilter_queue;branch=master \ S = "${WORKDIR}/git" inherit autotools pkgconfig + +BBCLASSEXTEND = "native" diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch deleted file mode 100644 index 00d95cd79e..0000000000 --- a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2e5f2b81fb8cbe0d1cd33e58caa19ac308e1f847 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt <jengelh@inai.de> -Date: Tue, 9 Oct 2012 15:59:48 +0200 -Subject: [PATCH 1/6] build: resolve automake-1.12 warnings - -am/ltlibrary.am: warning: 'libnfnetlink.la': linking libtool libraries -using a non-POSIX archiver requires 'AM_PROG_AR' in 'configure.ac' - -Signed-off-by: Jan Engelhardt <jengelh@inai.de> ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index ed549df..0926a1c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -7,6 +7,7 @@ AC_CANONICAL_HOST - - AM_INIT_AUTOMAKE([-Wall foreign subdir-objects - tar-pax no-dist-gzip dist-bzip2 1.6]) -+m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) - - dnl kernel style compile messages - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) --- -2.12.1 - diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch deleted file mode 100644 index c2fb5e05a7..0000000000 --- a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 5e6b6e23a8b04475c5a9de7eddb4c18103932fe5 Mon Sep 17 00:00:00 2001 -From: Pablo Neira Ayuso <pablo@netfilter.org> -Date: Wed, 7 Aug 2013 20:53:57 +0200 -Subject: [PATCH 2/6] src: get source code license header in sync with current - licensing terms - -Since (3956761 license: upgrade to GPLv2+), we upgraded to GPLv2+, -propagate that changes to src/iftable.c and src/rtnl.c - -Reported-by: Thomas Woerner <twoerner@redhat.com> -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ---- - src/iftable.c | 2 +- - src/rtnl.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/iftable.c b/src/iftable.c -index 0325335..5976ed8 100644 ---- a/src/iftable.c -+++ b/src/iftable.c -@@ -3,7 +3,7 @@ - * (C) 2004 by Astaro AG, written by Harald Welte <hwelte@astaro.com> - * (C) 2008 by Pablo Neira Ayuso <pablo@netfilter.org> - * -- * This software is Free Software and licensed under GNU GPLv2. -+ * This software is Free Software and licensed under GNU GPLv2+. - */ - - /* IFINDEX handling */ -diff --git a/src/rtnl.c b/src/rtnl.c -index 5ccb272..7b4ac7d 100644 ---- a/src/rtnl.c -+++ b/src/rtnl.c -@@ -1,10 +1,10 @@ - /* rtnl - rtnetlink utility functions - * - * (C) 2004 by Astaro AG, written by Harald Welte <hwelte@astaro.com> -- * -+ * - * Adapted to nfnetlink by Eric Leblond <eric@inl.fr> - * -- * This software is free software and licensed under GNU GPLv2. -+ * This software is free software and licensed under GNU GPLv2+. - * - */ - --- -2.12.1 - diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0003-configure-uclinux-is-also-linux.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0003-configure-uclinux-is-also-linux.patch deleted file mode 100644 index 6cb7ed6fa9..0000000000 --- a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0003-configure-uclinux-is-also-linux.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b259fe13826414c1bd5328a25c8d6d60e20e65f2 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias <gustavo@zacarias.com.ar> -Date: Tue, 10 Sep 2013 16:23:29 -0300 -Subject: [PATCH 3/6] configure: uclinux is also linux - -Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 0926a1c..b979772 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -18,7 +18,7 @@ AC_DISABLE_STATIC - AM_PROG_LIBTOOL - - case "$host" in --*-*-linux*) ;; -+*-*-linux* | *-*-uclinux*) ;; - *) AC_MSG_ERROR([Linux only, dude!]);; - esac - --- -2.12.1 - diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch deleted file mode 100644 index cf3a841356..0000000000 --- a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b142da8d2c9e2e2dfbe4e89e680dd124f6064ac8 Mon Sep 17 00:00:00 2001 -From: Pablo Neira Ayuso <pablo@netfilter.org> -Date: Mon, 3 Feb 2014 12:09:29 +0100 -Subject: [PATCH 4/6] libnfnetlink: initialize attribute padding to resolve - valgrind warnings - -==12195== Syscall param socketcall.sendto(msg) points to uninitialised byte(s) -==12195== at 0x51209C3: __sendto_nocancel (syscall-template.S:81) -==12195== by 0x53E4D12: nfnl_send (libnfnetlink.c:391) -==12195== by 0x53E6952: nfnl_query (libnfnetlink.c:1569) -==12195== by 0x4E344AF: __build_send_cfg_msg.isra.1 (libnetfilter_log.c:143) -==12195== by 0x4E34710: nflog_bind_group (libnetfilter_log.c:413) -==12195== by 0x400CB1: main (nfulnl_test.c:77) -==12195== Address 0x7fefff3e9 is on thread 1's stack - -This patch sets to zero the padding that is included to align the -attribute payload. - -Reported-by: Ivan Homoliak <xhomol11@gmail.com> -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ---- - src/libnfnetlink.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/libnfnetlink.c b/src/libnfnetlink.c -index 4b2bcd0..398b7d7 100644 ---- a/src/libnfnetlink.c -+++ b/src/libnfnetlink.c -@@ -809,6 +809,7 @@ int nfnl_addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data, - nfa->nfa_type = type; - nfa->nfa_len = len; - memcpy(NFA_DATA(nfa), data, alen); -+ memset((uint8_t *)nfa + nfa->nfa_len, 0, NFA_ALIGN(alen) - alen); - n->nlmsg_len = (NLMSG_ALIGN(n->nlmsg_len) + NFA_ALIGN(len)); - return 0; - } --- -2.12.1 - diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0005-include-Sync-with-kernel-headers.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0005-include-Sync-with-kernel-headers.patch deleted file mode 100644 index 383f0e8b3d..0000000000 --- a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0005-include-Sync-with-kernel-headers.patch +++ /dev/null @@ -1,110 +0,0 @@ -From b10c90a61a5fc46f2be5aeecb9c96e84178f7717 Mon Sep 17 00:00:00 2001 -From: Felix Janda <felix.janda@posteo.de> -Date: Sat, 16 May 2015 14:49:07 +0200 -Subject: [PATCH 5/6] include: Sync with kernel headers - -Signed-off-by: Felix Janda <felix.janda@posteo.de> -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ---- - include/libnfnetlink/linux_nfnetlink.h | 44 ++++----------------------- - include/libnfnetlink/linux_nfnetlink_compat.h | 12 ++++---- - 2 files changed, 12 insertions(+), 44 deletions(-) - -diff --git a/include/libnfnetlink/linux_nfnetlink.h b/include/libnfnetlink/linux_nfnetlink.h -index 76a8550..44a38d6 100644 ---- a/include/libnfnetlink/linux_nfnetlink.h -+++ b/include/libnfnetlink/linux_nfnetlink.h -@@ -25,9 +25,9 @@ enum nfnetlink_groups { - /* General form of address family dependent message. - */ - struct nfgenmsg { -- u_int8_t nfgen_family; /* AF_xxx */ -- u_int8_t version; /* nfnetlink version */ -- u_int16_t res_id; /* resource id */ -+ __u8 nfgen_family; /* AF_xxx */ -+ __u8 version; /* nfnetlink version */ -+ __be16 res_id; /* resource id */ - }; - - #define NFNETLINK_V0 0 -@@ -46,40 +46,8 @@ struct nfgenmsg { - #define NFNL_SUBSYS_CTNETLINK_EXP 2 - #define NFNL_SUBSYS_QUEUE 3 - #define NFNL_SUBSYS_ULOG 4 --#define NFNL_SUBSYS_COUNT 5 -+#define NFNL_SUBSYS_OSF 5 -+#define NFNL_SUBSYS_IPSET 6 -+#define NFNL_SUBSYS_COUNT 7 - --#ifdef __KERNEL__ -- --#include <linux/netlink.h> --#include <linux/capability.h> --#include <net/netlink.h> -- --struct nfnl_callback --{ -- int (*call)(struct sock *nl, struct sk_buff *skb, -- struct nlmsghdr *nlh, struct nlattr *cda[]); -- const struct nla_policy *policy; /* netlink attribute policy */ -- const u_int16_t attr_count; /* number of nlattr's */ --}; -- --struct nfnetlink_subsystem --{ -- const char *name; -- __u8 subsys_id; /* nfnetlink subsystem ID */ -- __u8 cb_count; /* number of callbacks */ -- const struct nfnl_callback *cb; /* callback for individual types */ --}; -- --extern int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n); --extern int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n); -- --extern int nfnetlink_has_listeners(unsigned int group); --extern int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group, -- int echo); --extern int nfnetlink_unicast(struct sk_buff *skb, u_int32_t pid, int flags); -- --#define MODULE_ALIAS_NFNL_SUBSYS(subsys) \ -- MODULE_ALIAS("nfnetlink-subsys-" __stringify(subsys)) -- --#endif /* __KERNEL__ */ - #endif /* _NFNETLINK_H */ -diff --git a/include/libnfnetlink/linux_nfnetlink_compat.h b/include/libnfnetlink/linux_nfnetlink_compat.h -index e145176..74b9e55 100644 ---- a/include/libnfnetlink/linux_nfnetlink_compat.h -+++ b/include/libnfnetlink/linux_nfnetlink_compat.h -@@ -1,6 +1,8 @@ - #ifndef _NFNETLINK_COMPAT_H - #define _NFNETLINK_COMPAT_H --#ifndef __KERNEL__ -+ -+#include <linux/types.h> -+ - /* Old nfnetlink macros for userspace */ - - /* nfnetlink groups: Up to 32 maximum */ -@@ -18,10 +20,9 @@ - * ! nfnetlink use the same attributes methods. - J. Schulist. - */ - --struct nfattr --{ -- u_int16_t nfa_len; -- u_int16_t nfa_type; /* we use 15 bits for the type, and the highest -+struct nfattr { -+ __u16 nfa_len; -+ __u16 nfa_type; /* we use 15 bits for the type, and the highest - * bit to indicate whether the payload is nested */ - }; - -@@ -57,5 +58,4 @@ struct nfattr - + NLMSG_ALIGN(sizeof(struct nfgenmsg)))) - #define NFM_PAYLOAD(n) NLMSG_PAYLOAD(n, sizeof(struct nfgenmsg)) - --#endif /* ! __KERNEL__ */ - #endif /* _NFNETLINK_COMPAT_H */ --- -2.12.1 - diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch deleted file mode 100644 index 72c9987d1e..0000000000 --- a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch +++ /dev/null @@ -1,403 +0,0 @@ -From 5cb589e246c91331ee6b3926b15f5e6cfc8ad95e Mon Sep 17 00:00:00 2001 -From: Felix Janda <felix.janda@posteo.de> -Date: Sat, 16 May 2015 14:59:57 +0200 -Subject: [PATCH 6/6] src: Use stdint types everywhere - -Signed-off-by: Felix Janda <felix.janda@posteo.de> -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ---- - include/libnfnetlink/libnfnetlink.h | 25 ++++++------- - src/iftable.c | 8 ++--- - src/iftable.h | 4 +-- - src/libnfnetlink.c | 72 ++++++++++++++++++------------------- - src/rtnl.c | 4 +-- - src/rtnl.h | 2 +- - 6 files changed, 58 insertions(+), 57 deletions(-) - -diff --git a/include/libnfnetlink/libnfnetlink.h b/include/libnfnetlink/libnfnetlink.h -index 1d8c49d..cd0be3d 100644 ---- a/include/libnfnetlink/libnfnetlink.h -+++ b/include/libnfnetlink/libnfnetlink.h -@@ -15,6 +15,7 @@ - #define aligned_u64 unsigned long long __attribute__((aligned(8))) - #endif - -+#include <stdint.h> - #include <sys/socket.h> /* for sa_family_t */ - #include <linux/netlink.h> - #include <libnfnetlink/linux_nfnetlink.h> -@@ -55,7 +56,7 @@ struct nfnlhdr { - struct nfnl_callback { - int (*call)(struct nlmsghdr *nlh, struct nfattr *nfa[], void *data); - void *data; -- u_int16_t attr_count; -+ uint16_t attr_count; - }; - - struct nfnl_handle; -@@ -69,7 +70,7 @@ extern struct nfnl_handle *nfnl_open(void); - extern int nfnl_close(struct nfnl_handle *); - - extern struct nfnl_subsys_handle *nfnl_subsys_open(struct nfnl_handle *, -- u_int8_t, u_int8_t, -+ uint8_t, uint8_t, - unsigned int); - extern void nfnl_subsys_close(struct nfnl_subsys_handle *); - -@@ -88,8 +89,8 @@ extern int nfnl_sendiov(const struct nfnl_handle *nfnlh, - const struct iovec *iov, unsigned int num, - unsigned int flags); - extern void nfnl_fill_hdr(struct nfnl_subsys_handle *, struct nlmsghdr *, -- unsigned int, u_int8_t, u_int16_t, u_int16_t, -- u_int16_t); -+ unsigned int, uint8_t, uint16_t, uint16_t, -+ uint16_t); - extern __attribute__((deprecated)) int - nfnl_talk(struct nfnl_handle *, struct nlmsghdr *, pid_t, - unsigned, struct nlmsghdr *, -@@ -103,8 +104,8 @@ nfnl_listen(struct nfnl_handle *, - /* receiving */ - extern ssize_t nfnl_recv(const struct nfnl_handle *h, unsigned char *buf, size_t len); - extern int nfnl_callback_register(struct nfnl_subsys_handle *, -- u_int8_t type, struct nfnl_callback *cb); --extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, u_int8_t type); -+ uint8_t type, struct nfnl_callback *cb); -+extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, uint8_t type); - extern int nfnl_handle_packet(struct nfnl_handle *, char *buf, int len); - - /* parsing */ -@@ -180,12 +181,12 @@ extern int nfnl_query(struct nfnl_handle *h, struct nlmsghdr *nlh); - - /* nfnl attribute handling functions */ - extern int nfnl_addattr_l(struct nlmsghdr *, int, int, const void *, int); --extern int nfnl_addattr8(struct nlmsghdr *, int, int, u_int8_t); --extern int nfnl_addattr16(struct nlmsghdr *, int, int, u_int16_t); --extern int nfnl_addattr32(struct nlmsghdr *, int, int, u_int32_t); -+extern int nfnl_addattr8(struct nlmsghdr *, int, int, uint8_t); -+extern int nfnl_addattr16(struct nlmsghdr *, int, int, uint16_t); -+extern int nfnl_addattr32(struct nlmsghdr *, int, int, uint32_t); - extern int nfnl_nfa_addattr_l(struct nfattr *, int, int, const void *, int); --extern int nfnl_nfa_addattr16(struct nfattr *, int, int, u_int16_t); --extern int nfnl_nfa_addattr32(struct nfattr *, int, int, u_int32_t); -+extern int nfnl_nfa_addattr16(struct nfattr *, int, int, uint16_t); -+extern int nfnl_nfa_addattr32(struct nfattr *, int, int, uint32_t); - extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int); - #define nfnl_parse_nested(tb, max, nfa) \ - nfnl_parse_attr((tb), (max), NFA_DATA((nfa)), NFA_PAYLOAD((nfa))) -@@ -197,7 +198,7 @@ extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int); - ({ (tail)->nfa_len = (void *) NLMSG_TAIL(nlh) - (void *) tail; }) - - extern void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, -- u_int16_t type, u_int32_t len, -+ uint16_t type, uint32_t len, - unsigned char *val); - extern unsigned int nfnl_rcvbufsiz(const struct nfnl_handle *h, - unsigned int size); -diff --git a/src/iftable.c b/src/iftable.c -index 5976ed8..157f97b 100644 ---- a/src/iftable.c -+++ b/src/iftable.c -@@ -27,10 +27,10 @@ - struct ifindex_node { - struct list_head head; - -- u_int32_t index; -- u_int32_t type; -- u_int32_t alen; -- u_int32_t flags; -+ uint32_t index; -+ uint32_t type; -+ uint32_t alen; -+ uint32_t flags; - char addr[8]; - char name[16]; - }; -diff --git a/src/iftable.h b/src/iftable.h -index 8df7f24..655df6b 100644 ---- a/src/iftable.h -+++ b/src/iftable.h -@@ -1,8 +1,8 @@ - #ifndef _IFTABLE_H - #define _IFTABLE_H - --int iftable_delete(u_int32_t dst, u_int32_t mask, u_int32_t gw, u_int32_t oif); --int iftable_insert(u_int32_t dst, u_int32_t mask, u_int32_t gw, u_int32_t oif); -+int iftable_delete(uint32_t dst, uint32_t mask, uint32_t gw, uint32_t oif); -+int iftable_insert(uint32_t dst, uint32_t mask, uint32_t gw, uint32_t oif); - - int iftable_init(void); - void iftable_fini(void); -diff --git a/src/libnfnetlink.c b/src/libnfnetlink.c -index 398b7d7..df57533 100644 ---- a/src/libnfnetlink.c -+++ b/src/libnfnetlink.c -@@ -72,9 +72,9 @@ - - struct nfnl_subsys_handle { - struct nfnl_handle *nfnlh; -- u_int32_t subscriptions; -- u_int8_t subsys_id; -- u_int8_t cb_count; -+ uint32_t subscriptions; -+ uint8_t subsys_id; -+ uint8_t cb_count; - struct nfnl_callback *cb; /* array of callbacks */ - }; - -@@ -86,11 +86,11 @@ struct nfnl_handle { - int fd; - struct sockaddr_nl local; - struct sockaddr_nl peer; -- u_int32_t subscriptions; -- u_int32_t seq; -- u_int32_t dump; -- u_int32_t rcv_buffer_size; /* for nfnl_catch */ -- u_int32_t flags; -+ uint32_t subscriptions; -+ uint32_t seq; -+ uint32_t dump; -+ uint32_t rcv_buffer_size; /* for nfnl_catch */ -+ uint32_t flags; - struct nlmsghdr *last_nlhdr; - struct nfnl_subsys_handle subsys[NFNL_MAX_SUBSYS+1]; - }; -@@ -145,7 +145,7 @@ unsigned int nfnl_portid(const struct nfnl_handle *h) - static int recalc_rebind_subscriptions(struct nfnl_handle *nfnlh) - { - int i, err; -- u_int32_t new_subscriptions = nfnlh->subscriptions; -+ uint32_t new_subscriptions = nfnlh->subscriptions; - - for (i = 0; i < NFNL_MAX_SUBSYS; i++) - new_subscriptions |= nfnlh->subsys[i].subscriptions; -@@ -273,8 +273,8 @@ void nfnl_set_rcv_buffer_size(struct nfnl_handle *h, unsigned int size) - * a valid address that points to a nfnl_subsys_handle structure is returned. - */ - struct nfnl_subsys_handle * --nfnl_subsys_open(struct nfnl_handle *nfnlh, u_int8_t subsys_id, -- u_int8_t cb_count, u_int32_t subscriptions) -+nfnl_subsys_open(struct nfnl_handle *nfnlh, uint8_t subsys_id, -+ uint8_t cb_count, uint32_t subscriptions) - { - struct nfnl_subsys_handle *ssh; - -@@ -435,10 +435,10 @@ int nfnl_sendiov(const struct nfnl_handle *nfnlh, const struct iovec *iov, - */ - void nfnl_fill_hdr(struct nfnl_subsys_handle *ssh, - struct nlmsghdr *nlh, unsigned int len, -- u_int8_t family, -- u_int16_t res_id, -- u_int16_t msg_type, -- u_int16_t msg_flags) -+ uint8_t family, -+ uint16_t res_id, -+ uint16_t msg_type, -+ uint16_t msg_flags) - { - assert(ssh); - assert(nlh); -@@ -815,7 +815,7 @@ int nfnl_addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data, - } - - /** -- * nfnl_nfa_addattr_l - Add variable length attribute to struct nfattr -+ * nfnl_nfa_addattr_l - Add variable length attribute to struct nfattr - * - * @nfa: struct nfattr - * @maxlen: maximal length of nfattr buffer -@@ -849,14 +849,14 @@ int nfnl_nfa_addattr_l(struct nfattr *nfa, int maxlen, int type, - } - - /** -- * nfnl_addattr8 - Add u_int8_t attribute to nlmsghdr -+ * nfnl_addattr8 - Add uint8_t attribute to nlmsghdr - * - * @n: netlink message header to which attribute is to be added - * @maxlen: maximum length of netlink message header - * @type: type of new attribute - * @data: content of new attribute - */ --int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) -+int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, uint8_t data) - { - assert(n); - assert(maxlen > 0); -@@ -866,7 +866,7 @@ int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) - } - - /** -- * nfnl_nfa_addattr16 - Add u_int16_t attribute to struct nfattr -+ * nfnl_nfa_addattr16 - Add uint16_t attribute to struct nfattr - * - * @nfa: struct nfattr - * @maxlen: maximal length of nfattr buffer -@@ -875,7 +875,7 @@ int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) - * - */ - int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, -- u_int16_t data) -+ uint16_t data) - { - assert(nfa); - assert(maxlen > 0); -@@ -885,7 +885,7 @@ int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, - } - - /** -- * nfnl_addattr16 - Add u_int16_t attribute to nlmsghdr -+ * nfnl_addattr16 - Add uint16_t attribute to nlmsghdr - * - * @n: netlink message header to which attribute is to be added - * @maxlen: maximum length of netlink message header -@@ -894,7 +894,7 @@ int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, - * - */ - int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, -- u_int16_t data) -+ uint16_t data) - { - assert(n); - assert(maxlen > 0); -@@ -904,7 +904,7 @@ int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, - } - - /** -- * nfnl_nfa_addattr32 - Add u_int32_t attribute to struct nfattr -+ * nfnl_nfa_addattr32 - Add uint32_t attribute to struct nfattr - * - * @nfa: struct nfattr - * @maxlen: maximal length of nfattr buffer -@@ -913,7 +913,7 @@ int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, - * - */ - int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, -- u_int32_t data) -+ uint32_t data) - { - assert(nfa); - assert(maxlen > 0); -@@ -923,7 +923,7 @@ int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, - } - - /** -- * nfnl_addattr32 - Add u_int32_t attribute to nlmsghdr -+ * nfnl_addattr32 - Add uint32_t attribute to nlmsghdr - * - * @n: netlink message header to which attribute is to be added - * @maxlen: maximum length of netlink message header -@@ -932,7 +932,7 @@ int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, - * - */ - int nfnl_addattr32(struct nlmsghdr *n, int maxlen, int type, -- u_int32_t data) -+ uint32_t data) - { - assert(n); - assert(maxlen > 0); -@@ -980,7 +980,7 @@ int nfnl_parse_attr(struct nfattr *tb[], int max, struct nfattr *nfa, int len) - * - */ - void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, -- u_int16_t type, u_int32_t len, unsigned char *val) -+ uint16_t type, uint32_t len, unsigned char *val) - { - assert(iov); - assert(nfa); -@@ -1115,7 +1115,7 @@ struct nlmsghdr *nfnl_get_msg_next(struct nfnl_handle *h, - * appropiately. - */ - int nfnl_callback_register(struct nfnl_subsys_handle *ssh, -- u_int8_t type, struct nfnl_callback *cb) -+ uint8_t type, struct nfnl_callback *cb) - { - assert(ssh); - assert(cb); -@@ -1138,7 +1138,7 @@ int nfnl_callback_register(struct nfnl_subsys_handle *ssh, - * On sucess, 0 is returned. On error, -1 is returned and errno is - * set appropiately. - */ --int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, u_int8_t type) -+int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, uint8_t type) - { - assert(ssh); - -@@ -1161,8 +1161,8 @@ int nfnl_check_attributes(const struct nfnl_handle *h, - assert(nfa); - - int min_len; -- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); -- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); -+ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); -+ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); - const struct nfnl_subsys_handle *ssh; - struct nfnl_callback *cb; - -@@ -1212,8 +1212,8 @@ static int __nfnl_handle_msg(struct nfnl_handle *h, struct nlmsghdr *nlh, - int len) - { - struct nfnl_subsys_handle *ssh; -- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); -- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); -+ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); -+ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); - int err = 0; - - if (subsys_id > NFNL_MAX_SUBSYS) -@@ -1243,7 +1243,7 @@ int nfnl_handle_packet(struct nfnl_handle *h, char *buf, int len) - { - - while (len >= NLMSG_SPACE(0)) { -- u_int32_t rlen; -+ uint32_t rlen; - struct nlmsghdr *nlh = (struct nlmsghdr *)buf; - - if (nlh->nlmsg_len < sizeof(struct nlmsghdr) -@@ -1285,8 +1285,8 @@ static int nfnl_is_error(struct nfnl_handle *h, struct nlmsghdr *nlh) - static int nfnl_step(struct nfnl_handle *h, struct nlmsghdr *nlh) - { - struct nfnl_subsys_handle *ssh; -- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); -- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); -+ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); -+ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); - - /* Is this an error message? */ - if (nfnl_is_error(h, nlh)) { -diff --git a/src/rtnl.c b/src/rtnl.c -index 7b4ac7d..284eecd 100644 ---- a/src/rtnl.c -+++ b/src/rtnl.c -@@ -30,7 +30,7 @@ - #define rtnl_log(x, ...) - - static inline struct rtnl_handler * --find_handler(struct rtnl_handle *rtnl_handle, u_int16_t type) -+find_handler(struct rtnl_handle *rtnl_handle, uint16_t type) - { - struct rtnl_handler *h; - for (h = rtnl_handle->handlers; h; h = h->next) { -@@ -41,7 +41,7 @@ find_handler(struct rtnl_handle *rtnl_handle, u_int16_t type) - } - - static int call_handler(struct rtnl_handle *rtnl_handle, -- u_int16_t type, -+ uint16_t type, - struct nlmsghdr *hdr) - { - struct rtnl_handler *h = find_handler(rtnl_handle, type); -diff --git a/src/rtnl.h b/src/rtnl.h -index 0c403dc..2cb22a8 100644 ---- a/src/rtnl.h -+++ b/src/rtnl.h -@@ -7,7 +7,7 @@ - struct rtnl_handler { - struct rtnl_handler *next; - -- u_int16_t nlmsg_type; -+ uint16_t nlmsg_type; - int (*handlefn)(struct nlmsghdr *h, void *arg); - void *arg; - }; --- -2.12.1 - diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb deleted file mode 100644 index 64271c74d3..0000000000 --- a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Low-level library for netfilter related kernel/userspace communication" -DESCRIPTION = "libnfnetlink is the low-level library for netfilter related \ -kernel/userspace communication. It provides a generic messaging \ -infrastructure for in-kernel netfilter subsystems (such as nfnetlink_log, \ -nfnetlink_queue, nfnetlink_conntrack) and their respective users and/or \ -management tools in userspace." -HOMEPAGE = "http://www.netfilter.org/projects/libnfnetlink/index.html" -SECTION = "libs" -LICENSE = "GPL-2.0-or-later" - - -LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" - -SRC_URI = "http://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-${PV}.tar.bz2;name=tar \ - file://0001-build-resolve-automake-1.12-warnings.patch \ - file://0002-src-get-source-code-license-header-in-sync-with-curr.patch \ - file://0003-configure-uclinux-is-also-linux.patch \ - file://0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch \ - file://0005-include-Sync-with-kernel-headers.patch \ - file://0006-src-Use-stdint-types-everywhere.patch \ - " -SRC_URI[tar.md5sum] = "98927583d2016a9fb1936fed992e2c5e" -SRC_URI[tar.sha256sum] = "f270e19de9127642d2a11589ef2ec97ef90a649a74f56cf9a96306b04817b51a" - -inherit autotools pkgconfig diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.2.bb b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.2.bb new file mode 100644 index 0000000000..2778185618 --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.2.bb @@ -0,0 +1,22 @@ +SUMMARY = "Low-level library for netfilter related kernel/userspace communication" +DESCRIPTION = "libnfnetlink is the low-level library for netfilter related \ +kernel/userspace communication. It provides a generic messaging \ +infrastructure for in-kernel netfilter subsystems (such as nfnetlink_log, \ +nfnetlink_queue, nfnetlink_conntrack) and their respective users and/or \ +management tools in userspace." +HOMEPAGE = "https://www.netfilter.org/projects/libnfnetlink/index.html" +SECTION = "libs" +LICENSE = "GPL-2.0-or-later" + + +LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" + +SRC_URI = "https://www.netfilter.org/projects/libnfnetlink/files/${BPN}-${PV}.tar.bz2 \ + " + +SRC_URI[md5sum] = "39d65185e2990562c64de05a08de8771" +SRC_URI[sha256sum] = "b064c7c3d426efb4786e60a8e6859b82ee2f2c5e49ffeea640cfe4fe33cbc376" + +inherit autotools pkgconfig + +BBCLASSEXTEND = "native" diff --git a/meta-networking/recipes-filter/libnftnl/libnftnl/0001-configure.ac-Add-serial-tests.patch b/meta-networking/recipes-filter/libnftnl/libnftnl/0001-configure.ac-Add-serial-tests.patch index 049ad2d39a..abeca6579c 100644 --- a/meta-networking/recipes-filter/libnftnl/libnftnl/0001-configure.ac-Add-serial-tests.patch +++ b/meta-networking/recipes-filter/libnftnl/libnftnl/0001-configure.ac-Add-serial-tests.patch @@ -1,4 +1,4 @@ -From 1cb59c1fed33607e4fb2bee9144ce45276e9cc96 Mon Sep 17 00:00:00 2001 +From 801a4dd42449fb5f09fb9cb99714ed137278ca24 Mon Sep 17 00:00:00 2001 From: Trevor Gamblin <trevor.gamblin@windriver.com> Date: Tue, 14 Dec 2021 12:31:12 -0500 Subject: [PATCH] configure.ac: Add serial-tests @@ -14,13 +14,13 @@ Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 8e68035..2704214 100644 +index d5c6bd0..d90048e 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,9 @@ AC_CONFIG_HEADERS([config.h]) m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) - AM_INIT_AUTOMAKE([-Wall foreign tar-pax no-dist-gzip dist-bzip2 + AM_INIT_AUTOMAKE([-Wall foreign tar-pax no-dist-gzip dist-xz - 1.6 subdir-objects]) + 1.6 subdir-objects serial-tests]) + @@ -29,5 +29,5 @@ index 8e68035..2704214 100644 dnl kernel style compile messages m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -- -2.33.1 +2.25.1 diff --git a/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.4.bb b/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.6.bb index ede35e7624..841a7267b8 100644 --- a/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.4.bb +++ b/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.6.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 = "141cc997755dd91e94dd64c5497f2a23bd9a894c" +SRCREV = "83dd4dc316b4189d16ead54cd30bfc89e5160cfd" S = "${WORKDIR}/git" diff --git a/meta-networking/recipes-filter/nfacct/nfacct_1.0.2.bb b/meta-networking/recipes-filter/nfacct/nfacct_1.0.2.bb index 20a84121ee..9b938beae3 100644 --- a/meta-networking/recipes-filter/nfacct/nfacct_1.0.2.bb +++ b/meta-networking/recipes-filter/nfacct/nfacct_1.0.2.bb @@ -3,12 +3,10 @@ HOMEPAGE = "http://netfilter.org/projects/nfacct/" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -UPSTREAM_CHECK_URI = "ftp://ftp.netfilter.org/pub/nfacct/" - -SRC_URI = "ftp://ftp.netfilter.org/pub/${BPN}/${BP}.tar.bz2" - -SRC_URI[md5sum] = "94faafdaaed85ca9220c5692be8a408e" +UPSTREAM_CHECK_URI = "https://www.netfilter.org/pub/nfacct" +SRC_URI = "https://www.netfilter.org/pub/${BPN}/${BP}.tar.bz2" SRC_URI[sha256sum] = "ecff2218754be318bce3c3a5d1775bab93bf4168b2c4aac465785de5655fbd69" + DEPENDS = "libnfnetlink libmnl libnetfilter-acct" EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"' diff --git a/meta-networking/recipes-filter/nftables/nftables_1.0.6.bb b/meta-networking/recipes-filter/nftables/nftables_1.0.7.bb index f43a223ac9..8380bbd73d 100644 --- a/meta-networking/recipes-filter/nftables/nftables_1.0.6.bb +++ b/meta-networking/recipes-filter/nftables/nftables_1.0.7.bb @@ -1,7 +1,7 @@ SUMMARY = "Netfilter Tables userspace utillites" SECTION = "net" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=d1a78fdd879a263a5e0b42d1fc565e79" +LIC_FILES_CHKSUM = "file://COPYING;md5=81ec33bb3e47b460fc993ac768c74b62" DEPENDS = "libmnl libnftnl bison-native \ ${@bb.utils.contains('PACKAGECONFIG', 'mini-gmp', '', 'gmp', d)}" @@ -9,7 +9,7 @@ DEPENDS = "libmnl libnftnl bison-native \ SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.xz \ file://run-ptest \ " -SRC_URI[sha256sum] = "2407430ddd82987670e48dc2fda9e280baa8307abec04ab18d609df3db005e4c" +SRC_URI[sha256sum] = "c12ac941fff9adaedf17367d5ce213789b98a0d314277bc22b3d71e10891f412" inherit autotools manpages pkgconfig ptest @@ -19,31 +19,53 @@ 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] = "--enable-python --with-python-bin=${PYTHON}, --disable-python, python3-setuptools-native" +PACKAGECONFIG[python] = ",, python3-setuptools-native" 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)}" +# Disable the python via autoconf so we can build it separately via setuptools3 +EXTRA_OECONF = "--disable-python \ + ${@bb.utils.contains_any('PACKAGECONFIG', 'editline linenoise readline', '', '--without-cli', d)}" -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} +SETUPTOOLS_SETUP_PATH = "${S}/py" + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'setuptools3', '', d)} RRECOMMENDS:${PN} += "kernel-module-nf-tables" PACKAGES =+ "${PN}-python" -FILES:${PN}-python = "${nonarch_libdir}/${PYTHON_DIR}" +FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" RDEPENDS:${PN}-python = "python3-core python3-json ${PN}" +# Explicitly define do_configure, do_compile and do_install because both autotools and setuptools3 +# have EXPORT_FUNCTIONS do_configure do_compile do_install +do_configure() { + autotools_do_configure + if ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then + setuptools3_do_configure + fi +} + +do_compile() { + autotools_do_compile + if ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then + setuptools3_do_compile + fi +} + +do_install() { + autotools_do_install + if ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then + setuptools3_do_install + fi +} + RDEPENDS:${PN}-ptest += " ${PN}-python bash make iproute2 iputils-ping procps python3-core python3-ctypes python3-json python3-misc sed util-linux" TESTDIR = "tests" PRIVATE_LIBS:${PN}-ptest:append = " libnftables.so.1" -do_install:append() { - # Avoid "contains reference to TMPDIR" warning - find ${D} -name *.pyc -delete -} - do_install_ptest() { cp -rf ${S}/build-aux ${D}${PTEST_PATH} cp -rf ${S}/src ${D}${PTEST_PATH} diff --git a/meta-networking/recipes-irc/weechat/weechat_3.8.bb b/meta-networking/recipes-irc/weechat/weechat_4.0.2.bb index 8c770938af..8f1e06f390 100644 --- a/meta-networking/recipes-irc/weechat/weechat_3.8.bb +++ b/meta-networking/recipes-irc/weechat/weechat_4.0.2.bb @@ -10,7 +10,7 @@ SRC_URI = "https://weechat.org/files/src/weechat-${PV}.tar.xz \ file://0001-use-pkg-config-for-gcrypt-instead.patch \ " -SRC_URI[sha256sum] = "f7cb65c200f8c090c56f2cf98c0b184051e516e5f7099a4308cacf86f174bf28" +SRC_URI[sha256sum] = "0e648ee0d024c8099425ee60d41b272924ec8e19800ee8f1441090708834023c" inherit cmake pkgconfig diff --git a/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/0001-ftp-include-sys-types.h-for-u_long.patch b/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/0001-ftp-include-sys-types.h-for-u_long.patch index 8376603ead..2cd639ee92 100644 --- a/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/0001-ftp-include-sys-types.h-for-u_long.patch +++ b/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/0001-ftp-include-sys-types.h-for-u_long.patch @@ -10,6 +10,8 @@ ftp.c:1091:2: error: unknown type name 'u_long'; did you mean 'long'? Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + ftp/ftp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/Add_ARG_MAX_define.patch b/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/Add_ARG_MAX_define.patch index 5a47fd9175..5db004865f 100644 --- a/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/Add_ARG_MAX_define.patch +++ b/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/Add_ARG_MAX_define.patch @@ -1,7 +1,6 @@ This adds ARG_MAX define to be _SC_ARG_MAX -Upstream-Status: Inappropriate. -Most distros have their own verion for this fix. +Upstream-Status: Inappropriate [Most distros have their own verion for this fix] Signed-off-by: Armin Kuster <akuster808@gmail.com> diff --git a/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb b/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb index 1ba0dd46a7..31fdd9e4d8 100644 --- a/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb +++ b/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb @@ -6,15 +6,12 @@ LICENSE = "BSD-4-Clause" LIC_FILES_CHKSUM = "file://ftp/ftp.c;beginline=2;endline=3;md5=2d40a75a50d83b8f6317b3f53db72bfa" SRC_URI = "${DEBIAN_MIRROR}/main/n/netkit-ftp/netkit-ftp_${PV}.orig.tar.gz;name=archive \ - ${DEBIAN_MIRROR}/main/n/netkit-ftp/netkit-ftp_${PV}-31.debian.tar.xz;name=patch31 \ + ${DEBIAN_MIRROR}/main/n/netkit-ftp/netkit-ftp_${PV}-34.debian.tar.xz;name=patch34 \ file://Add_ARG_MAX_define.patch \ file://0001-ftp-include-sys-types.h-for-u_long.patch \ " - -SRC_URI[archive.md5sum] = "94441610c9b86ef45c4c6ec609444060" SRC_URI[archive.sha256sum] = "61c913299b81a4671ff089aac821329f7db9bc111aa812993dd585798b700349" -SRC_URI[patch31.md5sum] = "93d71e28ce70df69e080c7f90da63cac" -SRC_URI[patch31.sha256sum] = "4edd46a32d70daa7ba00f0ebf0118dc5d17dff23d6e46aa21a2722be2e22d1c1" +SRC_URI[patch34.sha256sum] = "716b984bc6926ed98345fa4e68adcee2efcf08d0f7315d6be8ad6de76f255748" inherit autotools-brokensep update-alternatives diff --git a/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc/0001-rpcgen-Fix-printf-formats.patch b/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc/0001-rpcgen-Fix-printf-formats.patch index 8bd77d2e47..508db6aadf 100644 --- a/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc/0001-rpcgen-Fix-printf-formats.patch +++ b/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc/0001-rpcgen-Fix-printf-formats.patch @@ -7,6 +7,8 @@ Fixes build with hardening flags Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + rpcgen/rpc_hout.c | 2 +- rpcgen/rpc_tblout.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc/gcc4.patch b/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc/gcc4.patch index 715ddb7b68..83bcc4b490 100644 --- a/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc/gcc4.patch +++ b/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc/gcc4.patch @@ -2,9 +2,9 @@ This fixes an issue when building with gcc 4.x https://github.com/openembedded/openembedded/tree/master/recipes/netkit-rpc/netkit-rpc -Upstream-Status: Backported +Upstream-Status: Backport -Signed-off-By: Armin Kuster <akuster808@gmail.com> +Signed-off-by: Armin Kuster <akuster808@gmail.com> --- netkit-rpc-0.17/rpcgen/rpc_cout.c~gcc4 +++ netkit-rpc-0.17/rpcgen/rpc_cout.c diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/fixup_wait3_api_change.patch b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/fixup_wait3_api_change.patch index cd6df62fb3..c6e2e60624 100644 --- a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/fixup_wait3_api_change.patch +++ b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/fixup_wait3_api_change.patch @@ -8,7 +8,7 @@ https://sourceware.org/ml/libc-alpha/2016-02/msg00342.html Upstream-Status: Inappropriate [ no upstream maintaner ] -Signed-off-by Armin Kuster <akuster@mvista.com> +Signed-off-by: Armin Kuster <akuster@mvista.com> Index: netkit-rsh-0.17/rlogin/rlogin.c =================================================================== diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh-redone_link_order_file.patch b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh-redone_link_order_file.patch index c12ee9b465..ab0b9b64bc 100644 --- a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh-redone_link_order_file.patch +++ b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh-redone_link_order_file.patch @@ -8,7 +8,7 @@ Most distos have there own verison of this fix. This was derived by -- Colin Watson <cjwatson@ubuntu.com> Tue, 13 Sep 2011 10:07:08 +0100 -signed-off-by: Armin Kuster <akuster808@gmail.com> +Signed-off-by: Armin Kuster <akuster808@gmail.com> Index: netkit-rsh-0.17/rsh/Makefile =================================================================== diff --git a/meta-networking/recipes-netkit/netkit-telnet/files/0001-telnet-telnetd-Fix-deadlock-on-cleanup.patch b/meta-networking/recipes-netkit/netkit-telnet/files/0001-telnet-telnetd-Fix-deadlock-on-cleanup.patch index 945785d3ce..afcc66dada 100644 --- a/meta-networking/recipes-netkit/netkit-telnet/files/0001-telnet-telnetd-Fix-deadlock-on-cleanup.patch +++ b/meta-networking/recipes-netkit/netkit-telnet/files/0001-telnet-telnetd-Fix-deadlock-on-cleanup.patch @@ -47,6 +47,8 @@ in upstream. Signed-off-by: Seiichi Ishitsuka <ishitsuka.sc@ncos.nec.co.jp> --- +Upstream-Status: Pending + telnetd/ext.h | 1 + telnetd/sys_term.c | 17 ++++++++++++++++- telnetd/telnetd.c | 2 +- diff --git a/meta-networking/recipes-netkit/netkit-telnet/files/0001-telnet-telnetd-Fix-print-format-strings.patch b/meta-networking/recipes-netkit/netkit-telnet/files/0001-telnet-telnetd-Fix-print-format-strings.patch index f2f1b12e28..755b882b67 100644 --- a/meta-networking/recipes-netkit/netkit-telnet/files/0001-telnet-telnetd-Fix-print-format-strings.patch +++ b/meta-networking/recipes-netkit/netkit-telnet/files/0001-telnet-telnetd-Fix-print-format-strings.patch @@ -7,6 +7,8 @@ Fixes build with hardening flags Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + telnet/utilities.cc | 6 +++--- telnetd/utility.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-networking/recipes-netkit/netkit-telnet/files/To-aviod-buffer-overflow-in-telnet.patch b/meta-networking/recipes-netkit/netkit-telnet/files/To-aviod-buffer-overflow-in-telnet.patch index 7fff8cffc4..34a6479790 100644 --- a/meta-networking/recipes-netkit/netkit-telnet/files/To-aviod-buffer-overflow-in-telnet.patch +++ b/meta-networking/recipes-netkit/netkit-telnet/files/To-aviod-buffer-overflow-in-telnet.patch @@ -5,7 +5,7 @@ Subject: [PATCH 1/2] To aviod buffer overflow in telnet This patch is from Fedora. -Upstream-Status: pending +Upstream-Status: Pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- diff --git a/meta-networking/recipes-netkit/netkit-telnet/files/Warning-fix-in-the-step-of-install.patch b/meta-networking/recipes-netkit/netkit-telnet/files/Warning-fix-in-the-step-of-install.patch index b9a98f1d6f..9ac75439da 100644 --- a/meta-networking/recipes-netkit/netkit-telnet/files/Warning-fix-in-the-step-of-install.patch +++ b/meta-networking/recipes-netkit/netkit-telnet/files/Warning-fix-in-the-step-of-install.patch @@ -6,7 +6,7 @@ Subject: [PATCH 2/2] WARNING Fix and modify "CFLAGS" WARNING: QA Issue: File '/usr/sbin/in.telnetd' from netkit-telnet was already stripped, this will prevent future debugging! [already-stripped] -Upstream-Status: pending +Upstream-Status: Pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- diff --git a/meta-networking/recipes-protocols/babeld/babeld_1.12.1.bb b/meta-networking/recipes-protocols/babeld/babeld_1.12.2.bb index 71bd93785c..03db5fc0bf 100644 --- a/meta-networking/recipes-protocols/babeld/babeld_1.12.1.bb +++ b/meta-networking/recipes-protocols/babeld/babeld_1.12.2.bb @@ -13,12 +13,14 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENCE;md5=411a48ac3c2e9e0911b8dd9aed26f754" SRC_URI = "gitsm://github.com/jech/babeld.git;protocol=https;branch=master" -SRCREV = "916d3d9aa65683ddf8b96f7f0b466b24cb9d7087" +SRCREV = "a9fba0e19ebde96cdc4edd35c5363f9e8139ab35" UPSTREAM_CHECK_GITTAGREGEX = "babeld-(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" +EXTRA_OEMAKE += "CFLAGS='${CFLAGS}'" + do_compile () { oe_runmake babeld } diff --git a/meta-networking/recipes-protocols/dante/dante_1.4.3.bb b/meta-networking/recipes-protocols/dante/dante_1.4.3.bb index 746c08be6e..4badff8bbd 100644 --- a/meta-networking/recipes-protocols/dante/dante_1.4.3.bb +++ b/meta-networking/recipes-protocols/dante/dante_1.4.3.bb @@ -25,6 +25,7 @@ EXTRA_OECONF += "--without-gssapi --sbindir=${bindir}" DEPENDS += "flex-native bison-native libpam libtirpc" inherit autotools-brokensep features_check +CPPFLAGS += "-P" CFLAGS += "-I${STAGING_INCDIR}/tirpc" LIBS += "-ltirpc" diff --git a/meta-networking/recipes-protocols/freediameter/freediameter_1.4.0.bb b/meta-networking/recipes-protocols/freediameter/freediameter_1.4.0.bb index 93a607d3ce..44fc46e3a8 100644 --- a/meta-networking/recipes-protocols/freediameter/freediameter_1.4.0.bb +++ b/meta-networking/recipes-protocols/freediameter/freediameter_1.4.0.bb @@ -132,7 +132,7 @@ RDEPENDS:${PN}-ptest = "cmake" INITSCRIPT_PACKAGES = "${PN}" INITSCRIPT_NAME:${PN} = "${BPN}" -INITSCRIPT_PARAMS$_${PN} = "start 30 . stop 70 0 1 2 3 4 5 6 ." +INITSCRIPT_PARAMS:${PN} = "start 30 . stop 70 0 1 2 3 4 5 6 ." SYSTEMD_SERVICE:${PN} = "freediameter.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-networking/recipes-protocols/frr/frr/frr.pam b/meta-networking/recipes-protocols/frr/frr/frr.pam index 83c403c2ba..a9ec35dd69 100644 --- a/meta-networking/recipes-protocols/frr/frr/frr.pam +++ b/meta-networking/recipes-protocols/frr/frr/frr.pam @@ -5,6 +5,7 @@ # This allows root to change user infomation without being # prompted for a password auth sufficient pam_rootok.so +account sufficient pam_rootok.so # The standard Unix authentication modules, used with # NIS (man nsswitch) as well as normal /etc/passwd and diff --git a/meta-networking/recipes-protocols/frr/frr_8.4.1.bb b/meta-networking/recipes-protocols/frr/frr_8.4.4.bb index d3c86e7d75..b87c3e78b0 100644 --- a/meta-networking/recipes-protocols/frr/frr_8.4.1.bb +++ b/meta-networking/recipes-protocols/frr/frr_8.4.4.bb @@ -14,18 +14,13 @@ SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/8.4 \ file://0001-m4-ax_python.m4-check-for-python-x.y-emded.pc-not-py.patch \ " -SRCREV = "70151e264bbb697a10fed711aa8c937d4f0009b1" +SRCREV = "45e36c0c00a517ad1606135b18c5753e210cfc0d" -S = "${WORKDIR}/git" +UPSTREAM_CHECK_GITTAGREGEX = "frr-(?P<pver>\d+(\.\d+)+)$" -# Due to libyang not supported on these arches: -COMPATIBLE_HOST:riscv32 = "null" -COMPATIBLE_HOST:riscv64 = "null" -COMPATIBLE_HOST:armv5 = "null" +CVE_PRODUCT = "frrouting" -# Fail to build on mips64 with error: -# Error: PC-relative reference to a different section -COMPATIBLE_HOST:mips64 = "null" +S = "${WORKDIR}/git" inherit autotools-brokensep python3native pkgconfig useradd systemd @@ -69,6 +64,7 @@ CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" LDFLAGS:append:mips = " -latomic" LDFLAGS:append:mipsel = " -latomic" LDFLAGS:append:powerpc = " -latomic" +LDFLAGS:append:riscv32 = " -latomic" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} = "frr.service" diff --git a/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch b/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch index 6553f6b983..39e67cdf48 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch @@ -5,6 +5,8 @@ Subject: [PATCH 5/6] mDNSCore: Fix broken debug parameter Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> --- +Upstream-Status: Pending + mDNSCore/mDNS.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch new file mode 100644 index 0000000000..74d387368c --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch @@ -0,0 +1,33 @@ +From 1d7e71e72c597ffcc19c04373a477d1fbd3ad955 Mon Sep 17 00:00:00 2001 +From: Beniamin Sandu <beniaminsandu@gmail.com> +Date: Thu, 15 Jun 2023 17:02:58 +0000 +Subject: [PATCH] remove unneeded headers + +From a quick look, these seem to not be needed and having them +breaks the build with mbedtls 3.x. Without them it builds fine +on both 2.x and 3.x versions. + +Upstream-Status: Pending + +Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com> +--- + mDNSPosix/mbedtls.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/mDNSPosix/mbedtls.c b/mDNSPosix/mbedtls.c +index a73681b..ab8f8c7 100644 +--- a/mDNSPosix/mbedtls.c ++++ b/mDNSPosix/mbedtls.c +@@ -38,10 +38,8 @@ + #include <mbedtls/sha256.h> + #include <mbedtls/base64.h> + +-#include <mbedtls/certs.h> + #include <mbedtls/x509.h> + #include <mbedtls/ssl.h> +-#include <mbedtls/config.h> + + // Posix TLS server context + struct TLSContext_struct { +-- +2.34.1 diff --git a/meta-networking/recipes-protocols/mdns/mdns_1790.60.25.bb b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb index 96eb4e50c7..aff7954f50 100644 --- a/meta-networking/recipes-protocols/mdns/mdns_1790.60.25.bb +++ b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb @@ -21,9 +21,10 @@ SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https file://0006-Handle-noisy-netlink-sockets.patch \ file://0007-Mark-deleted-interfaces-as-being-changed.patch \ file://0008-Handle-errors-from-socket-calls.patch \ + file://0009-remove-unneeded-headers.patch \ file://mdns.service \ " -SRCREV = "e48e3a58b763a0d7b76a14f7f309e24d7502e796" +SRCREV = "8769ab51605e465425d33d757f602ce5905ca639" # 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 @@ -45,18 +46,16 @@ PACKAGECONFIG[tls] = ",tls=no,mbedtls" CVE_PRODUCT = "apple:mdnsresponder" -# CVE-2007-0613 is not applicable as it only affects Apple products -# i.e. ichat,mdnsresponder, instant message framework and MacOS. -# Also, https://www.exploit-db.com/exploits/3230 shows the part of code -# affected by CVE-2007-0613 which is not preset in upstream source code. -# Hence, CVE-2007-0613 does not affect other Yocto implementations and -# is not reported for other distros can be marked whitelisted. -# Links: -# https://vulmon.com/vulnerabilitydetails?qid=CVE-2007-0613 -# https://www.incibe-cert.es/en/early-warning/vulnerabilities/cve-2007-0613 -# https://security-tracker.debian.org/tracker/CVE-2007-0613 -# https://vulmon.com/vulnerabilitydetails?qid=CVE-2007-0613 -CVE_CHECK_IGNORE += "CVE-2007-0613" +CVE_STATUS[CVE-2007-0613] = "not-applicable-platform: Issue affects Apple products \ +i.e. ichat,mdnsresponder, instant message framework and MacOS. Also, \ +https://www.exploit-db.com/exploits/3230 shows the part of code \ +affected by CVE-2007-0613 which is not preset in upstream source code. \ +Hence, CVE-2007-0613 does not affect other Yocto implementations and \ +is not reported for other distros can be marked whitelisted. \ +Links: https://vulmon.com/vulnerabilitydetails?qid=CVE-2007-0613 \ +https://www.incibe-cert.es/en/early-warning/vulnerabilities/cve-2007-0613 \ +https://security-tracker.debian.org/tracker/CVE-2007-0613 \ +https://vulmon.com/vulnerabilitydetails?qid=CVE-2007-0613" PARALLEL_MAKE = "" diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch index f8a52a63f5..5aea52788c 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch @@ -10,7 +10,7 @@ conftest.c:168:17: fatal error: pkg.h: No such file or directory #include <pkg.h> ^ -Upstream-Status: pending +Upstream-Status: Pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch index af6334f726..6450c1cc92 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch @@ -13,6 +13,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> --- +Upstream-Status: Pending + snmplib/keytools.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/CVE-2022-44792-CVE-2022-44793.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/CVE-2022-44792-CVE-2022-44793.patch new file mode 100644 index 0000000000..b18d4dc292 --- /dev/null +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/CVE-2022-44792-CVE-2022-44793.patch @@ -0,0 +1,121 @@ +From d13302656d9ff0807c5defe18623adc947f43a2b Mon Sep 17 00:00:00 2001 +From: Narpat Mali <narpat.mali@windriver.com> +Date: Wed, 8 Feb 2023 13:15:39 +0000 +Subject: [PATCH] agent: Disallow SET requests with any NULL varbind Merge pull + request #490 from fenner/set-null + +fixes: #474 and #475 + +CVE: CVE-2022-44792, CVE-2022-44793 + +Upstream-Status: Backport [https://github.com/net-snmp/net-snmp/commit/be804106fd0771a7d05236cff36e199af077af57] + +Signed-off-by: Narpat Mali <narpat.mali@windriver.com> +--- + agent/snmp_agent.c | 32 +++++++++++++++++++ + apps/snmpset.c | 1 + + .../default/T0142snmpv2csetnull_simple | 31 ++++++++++++++++++ + 3 files changed, 64 insertions(+) + create mode 100644 testing/fulltests/default/T0142snmpv2csetnull_simple + +diff --git a/agent/snmp_agent.c b/agent/snmp_agent.c +index 867d0c1..3f678fe 100644 +--- a/agent/snmp_agent.c ++++ b/agent/snmp_agent.c +@@ -3719,12 +3719,44 @@ netsnmp_handle_request(netsnmp_agent_session *asp, int status) + return 1; + } + ++static int ++check_set_pdu_for_null_varbind(netsnmp_agent_session *asp) ++{ ++ int i; ++ netsnmp_variable_list *v = NULL; ++ ++ for (i = 1, v = asp->pdu->variables; v != NULL; i++, v = v->next_variable) { ++ if (v->type == ASN_NULL) { ++ /* ++ * Protect SET implementations that do not protect themselves ++ * against wrong type. ++ */ ++ DEBUGMSGTL(("snmp_agent", "disallowing SET with NULL var for varbind %d\n", i)); ++ asp->index = i; ++ return SNMP_ERR_WRONGTYPE; ++ } ++ } ++ return SNMP_ERR_NOERROR; ++} ++ + int + handle_pdu(netsnmp_agent_session *asp) + { + int status, inclusives = 0; + netsnmp_variable_list *v = NULL; + ++#ifndef NETSNMP_NO_WRITE_SUPPORT ++ /* ++ * Check for ASN_NULL in SET request ++ */ ++ if (asp->pdu->command == SNMP_MSG_SET) { ++ status = check_set_pdu_for_null_varbind(asp); ++ if (status != SNMP_ERR_NOERROR) { ++ return status; ++ } ++ } ++#endif /* NETSNMP_NO_WRITE_SUPPORT */ ++ + /* + * for illegal requests, mark all nodes as ASN_NULL + */ +diff --git a/apps/snmpset.c b/apps/snmpset.c +index 48e14bd..d542713 100644 +--- a/apps/snmpset.c ++++ b/apps/snmpset.c +@@ -182,6 +182,7 @@ main(int argc, char *argv[]) + case 'x': + case 'd': + case 'b': ++ case 'n': /* undocumented */ + #ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES + case 'I': + case 'U': +diff --git a/testing/fulltests/default/T0142snmpv2csetnull_simple b/testing/fulltests/default/T0142snmpv2csetnull_simple +new file mode 100644 +index 0000000..0f1b8f3 +--- /dev/null ++++ b/testing/fulltests/default/T0142snmpv2csetnull_simple +@@ -0,0 +1,31 @@ ++#!/bin/sh ++ ++. ../support/simple_eval_tools.sh ++ ++HEADER SNMPv2c set of system.sysContact.0 with NULL varbind ++ ++SKIPIF NETSNMP_DISABLE_SET_SUPPORT ++SKIPIF NETSNMP_NO_WRITE_SUPPORT ++SKIPIF NETSNMP_DISABLE_SNMPV2C ++SKIPIFNOT USING_MIBII_SYSTEM_MIB_MODULE ++ ++# ++# Begin test ++# ++ ++# standard V2C configuration: testcomunnity ++snmp_write_access='all' ++. ./Sv2cconfig ++STARTAGENT ++ ++CAPTURE "snmpget -On $SNMP_FLAGS -c testcommunity -v 2c $SNMP_TRANSPORT_SPEC:$SNMP_TEST_DEST$SNMP_SNMPD_PORT .1.3.6.1.2.1.1.4.0" ++ ++CHECK ".1.3.6.1.2.1.1.4.0 = STRING:" ++ ++CAPTURE "snmpset -On $SNMP_FLAGS -c testcommunity -v 2c $SNMP_TRANSPORT_SPEC:$SNMP_TEST_DEST$SNMP_SNMPD_PORT .1.3.6.1.2.1.1.4.0 n x" ++ ++CHECK "Reason: wrongType" ++ ++STOPAGENT ++ ++FINISHED +-- +2.34.1 + diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/reproducibility-have-printcap.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/reproducibility-have-printcap.patch index c0b51c51e3..5fbb411a5f 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/reproducibility-have-printcap.patch +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/reproducibility-have-printcap.patch @@ -9,6 +9,8 @@ ac_cv_file__etc_printcap instead. When cross-compiling, this variable should be set in the environment to "yes" or "no" as appropriate for the target platform. --- +Upstream-Status: Pending + configure.d/config_os_misc4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb index 78d711fbfd..f40fb8bbd6 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb @@ -27,6 +27,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ file://reproducibility-have-printcap.patch \ file://0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch \ file://0001-Add-noreturn-attribute-to-netsnmp_pci_error.patch \ + file://CVE-2022-44792-CVE-2022-44793.patch \ " SRC_URI[sha256sum] = "2097f29b7e1bf3f1300b4bae52fa2308d0bb8d5d3998dbe02f9462a413a2ef0a" diff --git a/meta-networking/recipes-protocols/opcua/open62541/0001-fix-build-do-not-install-git-files.patch b/meta-networking/recipes-protocols/opcua/open62541/0001-fix-build-do-not-install-git-files.patch index 44ee7b92c5..a84290218d 100644 --- a/meta-networking/recipes-protocols/opcua/open62541/0001-fix-build-do-not-install-git-files.patch +++ b/meta-networking/recipes-protocols/opcua/open62541/0001-fix-build-do-not-install-git-files.patch @@ -5,6 +5,8 @@ Subject: [PATCH] fix(build): do not install git files Signed-off-by: Vyacheslav Yurkov <v.yurkov@precitec.de> --- +Upstream-Status: Pending + CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-networking/recipes-protocols/opcua/open62541_1.3.3.bb b/meta-networking/recipes-protocols/opcua/open62541_1.3.6.bb index 5af856ad34..c7437eb9ed 100644 --- a/meta-networking/recipes-protocols/opcua/open62541_1.3.3.bb +++ b/meta-networking/recipes-protocols/opcua/open62541_1.3.6.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "\ " SRCREV_FORMAT = "opcua_mdnsd_ua-nodeset_mqtt-c" -SRCREV_opcua = "ff73268829359639531ff02905c889f73a77b408" +SRCREV_opcua = "1b7e2b5d669661c568fda5577ee92011a029cf75" SRCREV_mdnsd = "3151afe5899dba5125dffa9f4cf3ae1fe2edc0f0" SRCREV_ua-nodeset = "f71b3f411d5cb16097c3ae0c744f67ad45535ffb" SRCREV_mqtt-c = "f69ce1e7fd54f3b1834c9c9137ce0ec5d703cb4d" @@ -29,13 +29,19 @@ EXTRA_OECMAKE += "\ -DBUILD_SHARED_LIBS=ON \ -DUA_NAMESPACE_ZERO=FULL \ -DUA_LOGLEVEL=600 \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ " -PACKAGECONFIG ?= "encryption pubsub pubsub-eth" +PACKAGECONFIG ?= "encryption-mbedtls pubsub pubsub-eth subscriptions subscriptions-events" PACKAGECONFIG[amalgamation] = "-DUA_ENABLE_AMALGAMATION=ON, -DUA_ENABLE_AMALGAMATION=OFF" -PACKAGECONFIG[encryption] = "-DUA_ENABLE_ENCRYPTION=ON, -DUA_ENABLE_ENCRYPTION=OFF, mbedtls" +PACKAGECONFIG[encryption-mbedtls] = "-DUA_ENABLE_ENCRYPTION=MBEDTLS, , mbedtls, , , encryption-openssl" +PACKAGECONFIG[encryption-openssl] = "-DUA_ENABLE_ENCRYPTION=OPENSSL, , openssl, , , encryption-mbedtls" +PACKAGECONFIG[multithreading] = "-DUA_MULTITHREADING=100, -DUA_MULTITHREADING=0" PACKAGECONFIG[pubsub] = "-DUA_ENABLE_PUBSUB=ON, -DUA_ENABLE_PUBSUB=OFF" PACKAGECONFIG[pubsub-eth] = "-DUA_ENABLE_PUBSUB_ETH_UADP=ON, -DUA_ENABLE_PUBSUB_ETH_UADP=OFF" +PACKAGECONFIG[subscriptions] = "-DUA_ENABLE_SUBSCRIPTIONS=ON, -DUA_ENABLE_SUBSCRIPTIONS=OFF" +PACKAGECONFIG[subscriptions-events] = "-DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON, -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=OFF" +PACKAGECONFIG[werror] = "-DUA_FORCE_WERROR=ON, -DUA_FORCE_WERROR=OFF" do_configure:prepend:toolchain-clang:riscv64() { sed -i -e 's/set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)/set(CMAKE_INTERPROCEDURAL_OPTIMIZATION OFF)/' ${S}/CMakeLists.txt diff --git a/meta-networking/recipes-protocols/openflow/openflow.inc b/meta-networking/recipes-protocols/openflow/openflow.inc index aaad0e00e1..7062d21462 100644 --- a/meta-networking/recipes-protocols/openflow/openflow.inc +++ b/meta-networking/recipes-protocols/openflow/openflow.inc @@ -13,10 +13,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e870c934e2c3d6ccf085fd7cf0a1e2e2" SRC_URI = "git://gitosis.stanford.edu/openflow.git;protocol=git;branch=master" -CVE_CHECK_IGNORE = "\ - CVE-2015-1611 \ - CVE-2015-1612 \ -" +CVE_STATUS[CVE-2015-1611] = "not-applicable-config: Not referred to our implementation of openflow" +CVE_STATUS[CVE-2015-1612] = "not-applicable-config: Not referred to our implementation of openflow" +CVE_STATUS[CVE-2018-1078] = "cpe-incorrect: This CVE is not for this product but cve-check assumes it is \ +because two CPE collides when checking the NVD database" DEPENDS = "virtual/libc" @@ -58,7 +58,3 @@ do_install:append() { } FILES:${PN} += "${nonarch_libdir}/tmpfiles.d" - -# This CVE is not for this product but cve-check assumes it is -# because two CPE collides when checking the NVD database -CVE_CHECK_IGNORE = "CVE-2018-1078" diff --git a/meta-networking/recipes-protocols/openflow/openflow/0001-Check-and-use-strlcpy-from-libc-before-defining-own.patch b/meta-networking/recipes-protocols/openflow/openflow/0001-Check-and-use-strlcpy-from-libc-before-defining-own.patch index 952274bb97..2175a20b90 100644 --- a/meta-networking/recipes-protocols/openflow/openflow/0001-Check-and-use-strlcpy-from-libc-before-defining-own.patch +++ b/meta-networking/recipes-protocols/openflow/openflow/0001-Check-and-use-strlcpy-from-libc-before-defining-own.patch @@ -9,6 +9,8 @@ failures. Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + configure.ac | 2 +- lib/util.c | 2 ++ lib/util.h | 1 + diff --git a/meta-networking/recipes-protocols/openflow/openflow/0002-lib-netdev-Adjust-header-include-sequence.patch b/meta-networking/recipes-protocols/openflow/openflow/0002-lib-netdev-Adjust-header-include-sequence.patch index 75180fe32f..9a49f4ef39 100644 --- a/meta-networking/recipes-protocols/openflow/openflow/0002-lib-netdev-Adjust-header-include-sequence.patch +++ b/meta-networking/recipes-protocols/openflow/openflow/0002-lib-netdev-Adjust-header-include-sequence.patch @@ -10,6 +10,8 @@ about double definition in libc headers Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + lib/netdev.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch index d1ee3c5916..8314b5d964 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch @@ -8,6 +8,8 @@ e.g. musl do not define this. Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + usl/usl_pid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api-Included-needed-headers.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api-Included-needed-headers.patch index c50f68e65d..4bdbf458cd 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api-Included-needed-headers.patch +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api-Included-needed-headers.patch @@ -7,6 +7,8 @@ These are flagged by musl Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + l2tp_api.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-test-pppd_dummy.c-Fix-return-value.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-test-pppd_dummy.c-Fix-return-value.patch index 1f576fa710..42d6f58007 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-test-pppd_dummy.c-Fix-return-value.patch +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-test-pppd_dummy.c-Fix-return-value.patch @@ -9,6 +9,8 @@ declaration Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + test/pppd_dummy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-cli-include-fcntl.h-for-O_CREAT-define.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-cli-include-fcntl.h-for-O_CREAT-define.patch index 9df32658a0..bad1007e04 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-cli-include-fcntl.h-for-O_CREAT-define.patch +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-cli-include-fcntl.h-for-O_CREAT-define.patch @@ -5,6 +5,8 @@ Subject: [PATCH 2/4] cli: include fcntl.h for O_CREAT define Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + cli/cli_readline.c | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch index bd9bcb8f27..6574ba22f0 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch @@ -8,6 +8,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> Update for ipv6 address compare Signed-off-by: Changqing Li <changqing.li@windriver.com> --- +Upstream-Status: Pending + l2tp_api.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch index e05be1bbb4..5d0c29cb42 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp/0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch @@ -5,6 +5,8 @@ Subject: [PATCH 3/4] cli: Define _GNU_SOURCE for getting sighandler_t Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + cli/cli_readline.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/Makefile-modify-CFLAGS-to-aviod-build-error.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/Makefile-modify-CFLAGS-to-aviod-build-error.patch index 96dbc7551d..8e9bd1e9ee 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp/Makefile-modify-CFLAGS-to-aviod-build-error.patch +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/Makefile-modify-CFLAGS-to-aviod-build-error.patch @@ -3,7 +3,7 @@ From: Li xin <lixin.fnst@cn.fujitsu.com> Date: Mon, 1 Dec 2014 01:53:41 +0900 Subject: [PATCH] Makefile:modify CFLAGS to aviod build error. -Upstream-Status: pending +Upstream-Status: Pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tp-simplify-gcc-warning-hack.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tp-simplify-gcc-warning-hack.patch index c9cf15c1db..2a7435963e 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tp-simplify-gcc-warning-hack.patch +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tp-simplify-gcc-warning-hack.patch @@ -10,7 +10,7 @@ it in place but remove the #if guard since it is only there to ensure that the l2tp_private.h file is updated if the rpc source file is changed and the two get out of sync. -Upstream-Status: pending +Upstream-Status: Pending Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> --- diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-enable-tests.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-enable-tests.patch index 0bece2f4d7..ad60083d1c 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-enable-tests.patch +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-enable-tests.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + commit 3e96a6c41bdd26417265a45ed685138d8eed564e Author: Aws Ismail <aws.ismail@windriver.com> Date: Fri Sep 14 02:32:53 2012 -0400 diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix-sysconfig.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix-sysconfig.patch index 3119425e69..c094e3859b 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix-sysconfig.patch +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix-sysconfig.patch @@ -2,17 +2,17 @@ commit 6ea3125e2bec15004f312814022335d94cdf7e94 Author: Aws Ismail <aws.ismail@windriver.com> Date: Wed Sep 19 11:34:48 2012 -0400 - Fix openl2tp config script location +Fix openl2tp config script location - Correct the location of the sysconfig - script. Use /etc/default/ instead of - /etc/sysconfig/ +Correct the location of the sysconfig +script. Use /etc/default/ instead of +/etc/sysconfig/ - Signed-off-by: Aws Ismail <aws.ismail@windriver.com> +Signed-off-by: Aws Ismail <aws.ismail@windriver.com> - Upstream-Status: Inappropriate [configuration] +Upstream-Status: Inappropriate [configuration] - Signed-off-by: Jackie Huang <jackie.huang@windriver.com> +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> diff --git a/etc/rc.d/init.d/openl2tpd b/etc/rc.d/init.d/openl2tpd index 7f27bb7..4194f63 100755 diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix.patch index 9ecd4b072f..51bddb8942 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix.patch +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix.patch @@ -2,16 +2,16 @@ commit 7c58a1e244ea83a9e7bbd51a6d354cee25cdbd33 Author: Aws Ismail <aws.ismail@windriver.com> Date: Wed Sep 12 23:35:40 2012 -0400 - Fix openl2tpd initscript - - - Correct the location of the retval statement. - - use start-stop-daemon instead of daemon. - - Signed-off-by: Aws Ismail <aws.ismail@windriver.com> +Fix openl2tpd initscript - Upstream-Status: Inappropriate [OE specific] +- Correct the location of the retval statement. +- use start-stop-daemon instead of daemon. - Signed-off-by: Jackie Huang <jackie.huang@windriver.com> +Signed-off-by: Aws Ismail <aws.ismail@windriver.com> + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> diff --git a/etc/rc.d/init.d/openl2tpd b/etc/rc.d/init.d/openl2tpd index ce21b50..7f27bb7 100755 diff --git a/meta-networking/recipes-protocols/openlldp/files/0001-Fix-musl-libc-build-issue.patch b/meta-networking/recipes-protocols/openlldp/files/0001-Fix-musl-libc-build-issue.patch index 40b082e77a..04ceb6b572 100644 --- a/meta-networking/recipes-protocols/openlldp/files/0001-Fix-musl-libc-build-issue.patch +++ b/meta-networking/recipes-protocols/openlldp/files/0001-Fix-musl-libc-build-issue.patch @@ -9,6 +9,8 @@ to compile when using musl libc. Signed-off-by: Jonathan Richardson <jonathan.richardson@broadcom.com> --- +Upstream-Status: Pending + include/clif.h | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-include-path-to-generated-version.h.patch b/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-include-path-to-generated-version.h.patch index b58fc104d2..f1a3ac3ad2 100644 --- a/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-include-path-to-generated-version.h.patch +++ b/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-include-path-to-generated-version.h.patch @@ -10,6 +10,8 @@ dir. Include the path to it in AM_CPPFLAGS. Signed-off-by: Jonathan Richardson <jonathan.richardson@broadcom.com> --- +Upstream-Status: Pending + Makefile.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-option-to-disable-installation-of-syst.patch b/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-option-to-disable-installation-of-syst.patch index a26a5299ab..98ecd38642 100644 --- a/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-option-to-disable-installation-of-syst.patch +++ b/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-option-to-disable-installation-of-syst.patch @@ -16,6 +16,8 @@ to a hard coded path that couldn't be changed. Signed-off-by: Jonathan Richardson <jonathan.richardson@broadcom.com> --- +Upstream-Status: Pending + Makefile.am | 3 ++- configure.ac | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-protocols/quagga/files/0001-configure-Check-for-readline-instead-of-main-in-libr.patch b/meta-networking/recipes-protocols/quagga/files/0001-configure-Check-for-readline-instead-of-main-in-libr.patch deleted file mode 100644 index 776c0958fa..0000000000 --- a/meta-networking/recipes-protocols/quagga/files/0001-configure-Check-for-readline-instead-of-main-in-libr.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 675b35b7ed416c837267e493b157167319e8f5fa Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 1 Sep 2022 11:01:53 -0700 -Subject: [PATCH] configure: Check for readline() instead of main() in - libreadline - -while checking for presense of libreadline, poke for a function which is -provided by libreadline, main is not provided by it, so modern compiler -toolchains may complain about it. - -Upstream-Status: Submitted [https://github.com/Quagga/quagga/pull/9] -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 ed279f48..d444ab4a 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -754,7 +754,7 @@ dnl [TODO] on Linux, and in [TODO] on Solaris. - )] - )] - ) -- AC_CHECK_LIB(readline, main, LIBREADLINE="-lreadline $LIBREADLINE",, -+ AC_CHECK_LIB(readline, readline, LIBREADLINE="-lreadline $LIBREADLINE",, - "$LIBREADLINE") - if test $ac_cv_lib_readline_main = no; then - AC_MSG_ERROR([vtysh needs libreadline but was not found and usable on your system.]) --- -2.37.3 - diff --git a/meta-networking/recipes-protocols/quagga/files/bgpd.service b/meta-networking/recipes-protocols/quagga/files/bgpd.service deleted file mode 100644 index 818b59cb27..0000000000 --- a/meta-networking/recipes-protocols/quagga/files/bgpd.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=BGP routing daemon -BindTo=zebra.service -After=zebra.service -ConditionPathExists=@SYSCONFDIR@/quagga/bgpd.conf - -[Service] -Type=forking -EnvironmentFile=-@SYSCONFDIR@/default/quagga -ExecStart=@SBINDIR@/bgpd -d $bgpd_options -f @SYSCONFDIR@/quagga/bgpd.conf -ExecStopPost=@base_bindir@/rm -rf /run/quagga/bgpd.pid -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/meta-networking/recipes-protocols/quagga/files/isisd.service b/meta-networking/recipes-protocols/quagga/files/isisd.service deleted file mode 100644 index 9bfe7b65ef..0000000000 --- a/meta-networking/recipes-protocols/quagga/files/isisd.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=IS-IS routing daemon -BindTo=zebra.service -After=zebra.service -ConditionPathExists=@SYSCONFDIR@/quagga/isisd.conf - -[Service] -Type=forking -EnvironmentFile=-@SYSCONFDIR@/default/quagga -ExecStart=@SBINDIR@/isisd -d $isisd_options -f /etc/quagga/isisd.conf -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/meta-networking/recipes-protocols/quagga/files/ospf6d.service b/meta-networking/recipes-protocols/quagga/files/ospf6d.service deleted file mode 100644 index 50645fe2a9..0000000000 --- a/meta-networking/recipes-protocols/quagga/files/ospf6d.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=OSPF routing daemon for IPv6 -BindTo=zebra.service -After=zebra.service -ConditionPathExists=@SYSCONFDIR@/quagga/ospf6d.conf - -[Service] -Type=forking -EnvironmentFile=-@SYSCONFDIR@/default/quagga -ExecStart=@SBINDIR@/ospf6d -d $ospf6d_options -f @SYSCONFDIR@/quagga/ospf6d.conf -ExecStopPost=@base_bindir@/rm -rf /run/quagga/ospf6d.pid -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/meta-networking/recipes-protocols/quagga/files/ospfd.service b/meta-networking/recipes-protocols/quagga/files/ospfd.service deleted file mode 100644 index 2cab1cd147..0000000000 --- a/meta-networking/recipes-protocols/quagga/files/ospfd.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=OSPF routing daemon -BindTo=zebra.service -After=zebra.service -ConditionPathExists=@SYSCONFDIR@/quagga/ospfd.conf - -[Service] -Type=forking -EnvironmentFile=-@SYSCONFDIR@/default/quagga -ExecStart=@SBINDIR@/ospfd -d $ospfd_options -f @SYSCONFDIR@/quagga/ospfd.conf -ExecStopPost=@base_bindir@/rm -rf /run/quagga/ospfd.pid -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/meta-networking/recipes-protocols/quagga/files/quagga.default b/meta-networking/recipes-protocols/quagga/files/quagga.default deleted file mode 100644 index 4c4bc23071..0000000000 --- a/meta-networking/recipes-protocols/quagga/files/quagga.default +++ /dev/null @@ -1,12 +0,0 @@ -# If this option is set the /etc/init.d/quagga script automatically loads -# the config via "vtysh -b" when the servers are started. -vtysh_enable=yes - -# Bind all daemons to loopback only by default -zebra_options=" --daemon -A 127.0.0.1" -bgpd_options=" --daemon -A 127.0.0.1" -ospfd_options=" --daemon -A 127.0.0.1" -ospf6d_options="--daemon -A ::1" -ripd_options=" --daemon -A 127.0.0.1" -ripngd_options="--daemon -A ::1" -isisd_options=" --daemon -A 127.0.0.1" diff --git a/meta-networking/recipes-protocols/quagga/files/quagga.init b/meta-networking/recipes-protocols/quagga/files/quagga.init deleted file mode 100644 index df1beb7123..0000000000 --- a/meta-networking/recipes-protocols/quagga/files/quagga.init +++ /dev/null @@ -1,200 +0,0 @@ -#!/bin/sh -# -# /etc/init.d/quagga -- start/stop the Quagga routing daemons -# -# Based on debian version by Endre Hirling <endre@mail.elte.hu> and -# Christian Hammers <ch@debian.org>. -# - -### BEGIN INIT INFO -# Provides: quagga -# Required-Start: $local_fs $network $remote_fs $syslog -# Required-Stop: $local_fs $network $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: start and stop the Quagga routing suite -# Description: Quagga is a routing suite for IP routing protocols like -# BGP, OSPF, RIP and others. This script contols the main -# daemon "quagga" as well as the individual protocol daemons. -### END INIT INFO - -# NOTE: sbin must be before bin so we get the iproute2 ip and not the -# busybox ip command. The busybox one flushes all routes instead of just -# the dynamic routes -PATH=/sbin:/usr/sbin:/bin:/usr/bin:/sbin -D_PATH=/usr/sbin -C_PATH=/etc/quagga - -# Keep zebra first and do not list watchquagga! -DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd" - -# Print the name of the pidfile. -pidfile() -{ - echo "/var/run/quagga/$1.pid" -} - -# Check if daemon is started by using the pidfile. -started() -{ - [ -e `pidfile $1` ] && kill -0 `cat \`pidfile $1\`` 2> /dev/null && return 0 - return 1 -} - -# Loads the config via vtysh -b if configured to do so. -vtysh_b () -{ - # Rember, that all variables have been incremented by 1 in convert_daemon_prios() - if [ "$vtysh_enable" = 2 -a -f $C_PATH/Quagga.conf ]; then - /usr/bin/vtysh -b - fi -} - -# Check if the daemon is activated and if its executable and config files -# are in place. -# params: daemon name -# returns: 0=ok, 1=error -check_daemon() -{ - # If the integrated config file is used the others are not checked. - if [ -r "$C_PATH/Quagga.conf" ]; then - return 0 - fi - - # check for config file - if [ ! -r "$C_PATH/$1.conf" ]; then - return 1 - fi - return 0 -} - -# Starts the server if it's not alrady running according to the pid file. -# The Quagga daemons creates the pidfile when starting. -start() -{ - if ! check_daemon $1; then echo -n " (!$1)"; return; fi - echo -n " $1" - start-stop-daemon \ - --start \ - --pidfile=`pidfile $1` \ - --exec "$D_PATH/$1" \ - -- \ - `eval echo "$""$1""_options"` - -} - -# Stop the daemon given in the parameter, printing its name to the terminal. -stop() -{ - if ! started "$1" ; then - echo -n " (!$1)" - return 0 - else - PIDFILE=`pidfile $1` - PID=`cat $PIDFILE 2>/dev/null` - start-stop-daemon --stop --quiet --exec "$D_PATH/$1" - # - # Now we have to wait until $DAEMON has _really_ stopped. - # - if test -n "$PID" && kill -0 $PID 2>/dev/null; then - echo -n " (waiting) ." - cnt=0 - while kill -0 $PID 2>/dev/null; do - cnt=`expr $cnt + 1` - if [ $cnt -gt 60 ]; then - # Waited 120 secs now, fail. - echo -n "Failed.. " - break - fi - sleep 2 - echo -n "." - done - fi - echo -n " $1" - rm -f `pidfile $1` - fi -} - -stop_all() -{ - local daemon_list - daemon_list=${1:-$DAEMONS} - - echo -n "Stopping Quagga daemons:" - for daemon_name in $daemon_list; do - stop "$daemon_name" - done - echo "." -} - -start_all() -{ - local daemon_list - daemon_list=${1:-$DAEMONS} - - echo -n "Starting Quagga daemons:" - for daemon_name in $daemon_list; do - start "$daemon_name" - done - echo "." -} - -status_all() -{ - local daemon_list - daemon_list=${1:-$DAEMONS} - res=1 - - echo -n "quagga: " - for daemon_name in $daemon_list; do - if started "$daemon_name" ; then - id=`cat \`pidfile $daemon_name\`` - echo -n "$daemon_name (pid $id) " - res=0 - fi - done - if [ $res -eq 0 ]; then - echo "is running..." - else - echo "is stopped..." - fi - exit $res -} - -######################################################### -# Main program # -######################################################### - -# Load configuration -test -f /etc/default/quagga && . /etc/default/quagga - -case "$1" in - start) - cd $C_PATH/ - start_all $2 - vtysh_b - ;; - - stop) - stop_all $2 - echo "Removing all routes made by zebra." - ip route flush proto zebra - ;; - - status) - status_all $2 - ;; - - restart|force-reload) - $0 stop $2 - sleep 1 - $0 start $2 - ;; - - *) - echo "Usage: /etc/init.d/quagga {start|stop|restart|status|force-reload} [daemon]" - exit 1 - ;; -esac - -exit 0 diff --git a/meta-networking/recipes-protocols/quagga/files/quagga.pam b/meta-networking/recipes-protocols/quagga/files/quagga.pam deleted file mode 100644 index 3541a975ae..0000000000 --- a/meta-networking/recipes-protocols/quagga/files/quagga.pam +++ /dev/null @@ -1,13 +0,0 @@ -# -# The PAM configuration file for the quagga `vtysh' service -# - -# This allows root to change user infomation without being -# prompted for a password -auth sufficient pam_rootok.so - -# The standard Unix authentication modules, used with -# NIS (man nsswitch) as well as normal /etc/passwd and -# /etc/shadow entries. -auth include common-auth - diff --git a/meta-networking/recipes-protocols/quagga/files/ripd.service b/meta-networking/recipes-protocols/quagga/files/ripd.service deleted file mode 100644 index 2c824318a1..0000000000 --- a/meta-networking/recipes-protocols/quagga/files/ripd.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=RIP routing daemon -BindTo=zebra.service -After=zebra.service -ConditionPathExists=@SYSCONFDIR@/quagga/ripd.conf - -[Service] -Type=forking -EnvironmentFile=-@SYSCONFDIR@/default/quagga -ExecStart=@SBINDIR@/ripd -d $ripd_options -f @SYSCONFDIR@/quagga/ripd.conf -ExecStopPost=@base_bindir@/rm -rf /run/quagga/ripd.pid -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/meta-networking/recipes-protocols/quagga/files/ripngd.service b/meta-networking/recipes-protocols/quagga/files/ripngd.service deleted file mode 100644 index c3555b345b..0000000000 --- a/meta-networking/recipes-protocols/quagga/files/ripngd.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=RIP routing daemon for IPv6 -BindTo=zebra.service -After=zebra.service -ConditionPathExists=@SYSCONFDIR@/quagga/ripngd.conf - -[Service] -Type=forking -EnvironmentFile=-@SYSCONFDIR@/default/quagga -ExecStart=@SBINDIR@/ripngd -d $ripngd_options -f @SYSCONFDIR@/quagga/ripngd.conf -ExecStopPost=@base_bindir@/rm -rf /run/quagga/ripngd.pid -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/meta-networking/recipes-protocols/quagga/files/volatiles.03_quagga b/meta-networking/recipes-protocols/quagga/files/volatiles.03_quagga deleted file mode 100644 index 1f28c0b24d..0000000000 --- a/meta-networking/recipes-protocols/quagga/files/volatiles.03_quagga +++ /dev/null @@ -1,3 +0,0 @@ -# <type> <owner> <group> <mode> <path> <linksource> -d quagga quagga 0755 /var/run/quagga none -d quagga quagga 0755 /var/log/quagga none diff --git a/meta-networking/recipes-protocols/quagga/files/watchquagga.default b/meta-networking/recipes-protocols/quagga/files/watchquagga.default deleted file mode 100644 index 2d601ec97d..0000000000 --- a/meta-networking/recipes-protocols/quagga/files/watchquagga.default +++ /dev/null @@ -1,12 +0,0 @@ -# Watchquagga configuration -#watch_daemons="zebra bgpd ospfd ospf6d ripd ripngd" -watch_daemons="zebra" - -# To enable restarts when multiple daemons are being used, uncomment this line (but first be sure to edit -# the WATCH_DAEMONS line to reflect the daemons you are actually using): -#watch_options="-Az -b_ -r/etc/init.d/quagga_restart_%s -s/etc/init.d/quagga_start_%s -k/etc/init.d/quagga_stop_%s" - -# Since we are using one quagga daemon for now, use the following line. If using -# multiple daemons, comment the line below and uncoment the line mentioned -# above. -watch_options="-z -b_ -r/etc/init.d/quagga_restart_%s" diff --git a/meta-networking/recipes-protocols/quagga/files/watchquagga.init b/meta-networking/recipes-protocols/quagga/files/watchquagga.init deleted file mode 100644 index 5ddd94a3d6..0000000000 --- a/meta-networking/recipes-protocols/quagga/files/watchquagga.init +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -# -### BEGIN INIT INFO -# Provides: watchquagga -# Required-Start: $local_fs $network $remote_fs $syslog -# Required-Stop: $local_fs $network $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: start and stop the Quagga watchdog -### END INIT INFO - -PATH=/bin:/usr/bin:/sbin:/usr/sbin - -# Load configuration -test -f /etc/default/watchquagga && . /etc/default/watchquagga - -# Check that there are daemons to be monitored. -[ -z "$watch_daemons" ] && exit 0 - -pidfile="/var/run/quagga/watchquagga.pid" - -case "$1" in - start) - echo -n "Starting quagga watchdog daemon: watchquagga" - start-stop-daemon --start \ - --pidfile $pidfile \ - --exec /usr/sbin/watchquagga \ - -- -d $watch_options $watch_daemons - echo "." - ;; - - stop) - echo -n "Stopping quagga watchdog daemon: watchquagga" - start-stop-daemon --stop --quiet \ - --pidfile $pidfile - echo "." - ;; - - status) - echo -n "watchquagga " - res=1 - [ -e $pidfile ] && kill -0 `cat $pidfile` 2> /dev/null - if [ $? -eq 0 ]; then - echo "(pid `cat $pidfile`) is running..." - res=0 - else - echo "is stopped..." - fi - exit $res - ;; - - restart|force-reload) - $0 stop $2 - sleep 1 - $0 start $2 - ;; - - *) - echo "Usage: /etc/init.d/watchquagga {start|stop|restart|force-reload}" - exit 1 - ;; -esac - -exit 0 diff --git a/meta-networking/recipes-protocols/quagga/files/zebra.service b/meta-networking/recipes-protocols/quagga/files/zebra.service deleted file mode 100644 index 9186041ae6..0000000000 --- a/meta-networking/recipes-protocols/quagga/files/zebra.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=GNU Zebra routing manager -Wants=network.target -Before=network.target -ConditionPathExists=@SYSCONFDIR@/quagga/zebra.conf - -[Service] -Type=forking -EnvironmentFile=-@SYSCONFDIR@/default/quagga -ExecStartPre=@BASE_SBINDIR@/ip route flush proto zebra -ExecStart=@SBINDIR@/zebra -d $zebra_options -f @SYSCONFDIR@/quagga/zebra.conf -ExecStopPost=@base_bindir@/rm -rf /run/quagga/zebra.pid -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc deleted file mode 100644 index d368311d13..0000000000 --- a/meta-networking/recipes-protocols/quagga/quagga.inc +++ /dev/null @@ -1,243 +0,0 @@ -SUMMARY = "BGP/OSPF/RIP routing daemon" -DESCRIPTION = "Quagga is a routing software suite, providing \ -implementations of OSPFv2, OSPFv3, RIP v1 and v2, RIPv3 and BGPv4 for \ -Unix platforms, particularly FreeBSD, Linux, Solaris and NetBSD. \ -Quagga is a fork of GNU Zebra which was developed by Kunihiro \ -Ishiguro. The Quagga tree aims to build a more involved community \ -around Quagga than the current centralised model of GNU Zebra." -HOMEPAGE = "http://www.nongnu.org/quagga/" -SECTION = "net" - - -LICENSE = "GPL-2.0-only & LGPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=81bcece21748c91ba9992349a91ec11d \ - file://COPYING.LIB;md5=01ef24401ded36cd8e5d18bfe947240c" - -DEPENDS = "readline ncurses perl-native c-ares" -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'snmp', 'net-snmp', '', d)}" -SNMP_CONF="${@bb.utils.contains('DISTRO_FEATURES', 'snmp', '--enable-snmp', '', d)}" - -# the "ip" command from busybox is not sufficient (flush by protocol flushes all routes) -RDEPENDS:${PN} += "iproute2" - -SRC_URI = "https://github.com/Quagga/quagga/releases/download/quagga-${PV}/quagga-${PV}.tar.gz \ - file://quagga.init \ - file://quagga.default \ - file://watchquagga.init \ - file://watchquagga.default \ - file://volatiles.03_quagga \ - file://quagga.pam \ - file://bgpd.service \ - file://isisd.service \ - file://ospf6d.service \ - file://ospfd.service \ - file://ripd.service \ - file://ripngd.service \ - file://zebra.service \ - " - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" -PACKAGECONFIG[cap] = "--enable-capabilities,--disable-capabilities,libcap" -PACKAGECONFIG[pam] = "--with-libpam, --without-libpam, libpam" - -inherit autotools update-rc.d useradd systemd pkgconfig multilib_header update-alternatives - -CFLAGS += "-fcommon" - -SYSTEMD_PACKAGES = "${PN} ${PN}-bgpd ${PN}-isisd ${PN}-ospf6d ${PN}-ospfd ${PN}-ripd ${PN}-ripngd" -SYSTEMD_SERVICE:${PN}-bgpd = "bgpd.service" -SYSTEMD_SERVICE:${PN}-isisd = "isisd.service" -SYSTEMD_SERVICE:${PN}-ospf6d = "ospf6d.service" -SYSTEMD_SERVICE:${PN}-ospfd = "ospfd.service" -SYSTEMD_SERVICE:${PN}-ripd = "ripd.service" -SYSTEMD_SERVICE:${PN}-ripngd = "ripngd.service" -SYSTEMD_SERVICE:${PN} = "zebra.service" - -EXTRA_OECONF = "--sysconfdir=${sysconfdir}/quagga \ - --localstatedir=${localstatedir}/run/quagga \ - --enable-exampledir=${docdir}/quagga/examples/ \ - --enable-vtysh \ - --enable-isisd \ - ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '--enable-watchquagga', '--disable-watchquagga', d)} \ - --enable-ospfclient=yes \ - --enable-multipath=64 \ - --enable-user=quagga \ - --enable-group=quagga \ - --enable-vty-group=quaggavty \ - --enable-configfile-mask=0640 \ - --enable-logfile-mask=0640 \ - --enable-rtadv \ - --enable-linux24-tcp-md5 \ - ap_cv_cc_pie=no \ - ${SNMP_CONF}" - -CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" - -do_install () { - # Install init script and default settings - install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d \ - ${D}${sysconfdir}/quagga ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/quagga.default ${D}${sysconfdir}/default/quagga - install -m 0644 ${WORKDIR}/watchquagga.default ${D}${sysconfdir}/default/watchquagga - install -m 0755 ${WORKDIR}/quagga.init ${D}${sysconfdir}/init.d/quagga - install -m 0755 ${WORKDIR}/watchquagga.init ${D}${sysconfdir}/init.d/watchquagga - install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/03_quagga - - # Install sample configurations for the daemons - for f in bgpd vtysh isisd ospfd ripngd zebra ripd ospf6d; do - install -m 0640 ${S}/$f/$f.conf.sample ${D}${sysconfdir}/quagga/$f.conf.sample - done - - for f in bgpd vtysh isisd ospfd ripngd zebra ripd ospf6d; do - touch ${D}${sysconfdir}/quagga/$f.conf - done - chown quagga:quaggavty ${D}${sysconfdir}/quagga - chown quagga:quagga ${D}${sysconfdir}/quagga/*.conf - chmod 750 ${D}${sysconfdir}/quagga - chmod 640 ${D}${sysconfdir}/quagga/*.conf - - # Install quagga - oe_runmake install DESTDIR=${D} prefix=${prefix} \ - sbindir=${sbindir} \ - sysconfdir=${sysconfdir}/quagga \ - localstatedir=${localstatedir}/run/quagga - - # Fix hardcoded paths - sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/* - sed -i 's!/usr/bin/!${bindir}/!g' ${D}${sysconfdir}/init.d/quagga - sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/watchquagga - sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/03_quagga - sed -i 's!^PATH=.*!PATH=${base_sbindir}:${sbindir}:${base_bindir}:${bindir}!' ${D}${sysconfdir}/init.d/* - sed -i 's!--with-libtool-sysroot=[^ "]*!!' ${D}${includedir}/quagga/version.h - - oe_multilib_header quagga/version.h - - # For PAM - for feature in ${DISTRO_FEATURES}; do - if [ "$feature" = "pam" ]; then - install -D -m 644 ${WORKDIR}/quagga.pam ${D}/${sysconfdir}/pam.d/quagga - break - fi - done - - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${nonarch_libdir}/tmpfiles.d - echo "d /run/quagga 0755 quagga quagga -" \ - > ${D}${nonarch_libdir}/tmpfiles.d/${BPN}.conf - fi - - # Remove sysinit script if sysvinit is not in DISTRO_FEATURES - if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'false', 'true', d)}; then - rm -rf ${D}${sysconfdir}/init.d/ - rm -f ${D}${sysconfdir}/default/watchquagga - fi - - install -d ${D}${systemd_unitdir}/system - for i in bgpd isisd ospf6d ospfd ripd ripngd zebra; do - install -m 0644 ${WORKDIR}/$i.service ${D}${systemd_unitdir}/system - done - sed -e 's,@BASE_SBINDIR@,${base_sbindir},g' \ - -e 's,@SYSCONFDIR@,${sysconfdir},g' \ - -e 's,@SBINDIR@,${sbindir},g' \ - -e 's,@base_bindir@,${base_bindir},g' \ - -e 's,@localstatedir@,${localstatedir},g' \ - -i ${D}${systemd_unitdir}/system/*.service -} - -DEPENDS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-systemctl-native', '', d)}" -pkg_postinst:${PN} () { - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd sysvinit', 'true', 'false', d)}; then - if [ -n "$D" ]; then - OPTS="--root=$D" - fi - systemctl $OPTS mask quagga.service - fi -} - -# Split into a main package and separate per-protocol packages -PACKAGE_BEFORE_PN = "${PN}-ospfd ${PN}-ospf6d ${PN}-bgpd \ - ${PN}-ripd ${PN}-ripngd ${PN}-isisd \ - ${PN}-ospfclient ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${PN}-watchquagga', '', d)}" - -RDEPENDS:${PN} += "${PN}-bgpd ${PN}-isisd ${PN}-ospf6d ${PN}-ospfd ${PN}-ripd ${PN}-ripngd" - -FILES:${PN}-ospfd = "${sbindir}/ospfd ${libdir}/libospf.so.*" -FILES:${PN}-ospf6d = "${sbindir}/ospf6d" -FILES:${PN}-bgpd = "${sbindir}/bgpd" -FILES:${PN}-ripd = "${sbindir}/ripd" -FILES:${PN}-ripngd = "${sbindir}/ripngd" -FILES:${PN}-isisd = "${sbindir}/isisd" -FILES:${PN}-ospfclient = "${sbindir}/ospfclient ${libdir}/libospfapiclient.so.*" -FILES:${PN}-watchquagga = "${sbindir}/watchquagga ${sysconfdir}/default/watchquagga \ - ${sysconfdir}/init.d/watchquagga" - -FILES:${PN} += "${nonarch_libdir}/tmpfiles.d/*.conf" - -# Indicate that the default files are configuration files -CONFFILES:${PN} = "${sysconfdir}/default/quagga \ - ${sysconfdir}/quagga/bgpd.conf \ - ${sysconfdir}/quagga/vtysh.conf \ - ${sysconfdir}/quagga/isisd.conf \ - ${sysconfdir}/quagga/ospfd.conf \ - ${sysconfdir}/quagga/ripngd.conf \ - ${sysconfdir}/quagga/zebra.conf \ - ${sysconfdir}/quagga/ripd.conf \ - ${sysconfdir}/quagga/ospf6d.conf \ - " -CONFFILES:${PN}-watchquagga = "${sysconfdir}/default/watchquagga" - -# Stop the names being rewritten due to the internal shared libraries -DEBIAN_NOAUTONAME:${PN}-ospfd = "1" -DEBIAN_NOAUTONAME:${PN}-ospfclient = "1" - -# Main init script starts all deamons -# Seperate init script for watchquagga -INITSCRIPT_PACKAGES = "${PN} ${PN}-watchquagga" -INITSCRIPT_NAME:${PN} = "quagga" -INITSCRIPT_PARAMS:${PN} = "defaults 15 85" -INITSCRIPT_NAME:${PN}-watchquagga = "watchquagga" -INITSCRIPT_PARAMS:${PN}-watchquagga = "defaults 90 10" - -# Add quagga's user and group -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM:${PN} = "--system quagga ; --system quaggavty" -USERADD_PARAM:${PN} = "--system --home ${localstatedir}/run/quagga/ -M -g quagga -G quaggavty --shell /bin/false quagga" - -pkg_postinst:${PN} () { - if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then - ${sysconfdir}/init.d/populate-volatile.sh update - fi -} - -# Stop apps before uninstall -pkg_prerm:${PN} () { - ${sysconfdir}/init.d/quagga stop -} - -pkg_prerm:${PN}-ospfd () { - ${sysconfdir}/init.d/quagga stop ospfd -} - -pkg_prerm:${PN}-ospf6d () { - ${sysconfdir}/init.d/quagga stop ospf6d -} - -pkg_prerm:${PN}-bgpd () { - ${sysconfdir}/init.d/quagga stop bgpd -} - -pkg_prerm:${PN}-ripd () { - ${sysconfdir}/init.d/quagga stop ripd -} - -pkg_prerm:${PN}-ripngd () { - ${sysconfdir}/init.d/quagga stop ripngd -} - -pkg_prerm:${PN}-isisd () { - ${sysconfdir}/init.d/quagga stop isisd -} - -ALTERNATIVE:${PN} = "pimd" -ALTERNATIVE_LINK_NAME[pimd] = "${sbindir}/pimd" - diff --git a/meta-networking/recipes-protocols/quagga/quagga_1.2.4.bb b/meta-networking/recipes-protocols/quagga/quagga_1.2.4.bb deleted file mode 100644 index 37cfc131c2..0000000000 --- a/meta-networking/recipes-protocols/quagga/quagga_1.2.4.bb +++ /dev/null @@ -1,10 +0,0 @@ -require quagga.inc - -SRC_URI += "file://0001-configure-Check-for-readline-instead-of-main-in-libr.patch" - -SRC_URI[md5sum] = "eced21b054d71c9e1b7c6ac43286a166" -SRC_URI[sha256sum] = "e364c082c3309910e1eb7b068bf39ee298e2f2f3f31a6431a5c115193bd653d3" - -CVE_CHECK_IGNORE += "\ - CVE-2016-4049 \ -" diff --git a/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng/Modify-configure.in-and-etc-Makefile.am.patch b/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng/Modify-configure.in-and-etc-Makefile.am.patch index ecc2d74e74..fd9961b9e8 100644 --- a/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng/Modify-configure.in-and-etc-Makefile.am.patch +++ b/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng/Modify-configure.in-and-etc-Makefile.am.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Modify configure.in and etc/Makefile.am this patch is from Fedora to fix error: "conftest.c:26:9: error: unknown type name 'not'" -Upstream-Status: pending +Upstream-Status: Pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- diff --git a/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng_0.5.6.bb b/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng_0.5.6.bb index 4696c3baeb..6baa83e83e 100644 --- a/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng_0.5.6.bb +++ b/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng_0.5.6.bb @@ -5,11 +5,10 @@ protocol (RFCs 2128 and 2139)." HOMEPAGE = "http://sourceforge.net/projects/radiusclient-ng.berlios/" SECTION = "net" -SRC_URI = "${DEBIAN_MIRROR}/main/r/${BPN}/${BPN}_${PV}.orig.tar.gz \ +SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/universe/r/${BPN}/${BPN}_${PV}.orig.tar.gz \ file://Modify-configure.in-and-etc-Makefile.am.patch \ file://config-site.radiusclient-ng-${PV}" -SRC_URI[md5sum] = "6fb7d4d0aefafaee7385831ac46a8e9c" SRC_URI[sha256sum] = "282a9f1355f190efbb06c0d7c4e062eaa652caf342ed3ad361ac595f72f09f14" LICENSE = "BSD-3-Clause & BSD-2-Clause & HPND" diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/0001-ppoe-Dont-include-linux-if_ether.h.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/0001-ppoe-Dont-include-linux-if_ether.h.patch index 7601f0d325..572886a26c 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/0001-ppoe-Dont-include-linux-if_ether.h.patch +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/0001-ppoe-Dont-include-linux-if_ether.h.patch @@ -8,6 +8,8 @@ Fixes build with musl Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/pppoe.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/0002-Enable-support-for-the-kernel-module.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/0002-Enable-support-for-the-kernel-module.patch index 2103b38888..cd9e40d5eb 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/0002-Enable-support-for-the-kernel-module.patch +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/0002-Enable-support-for-the-kernel-module.patch @@ -6,6 +6,8 @@ Subject: [PATCH] Enable support for the kernel module Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/configure.in | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/configure.in-Error-fix.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/configure.in-Error-fix.patch deleted file mode 100644 index bbd516fde9..0000000000 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/configure.in-Error-fix.patch +++ /dev/null @@ -1,57 +0,0 @@ -From bdd20b7a584a20504dfabb409a41ee2b9ae41657 Mon Sep 17 00:00:00 2001 -From: Lei Maohui <leimaohui@cn.fujitsu.com> -Date: Wed, 19 Aug 2015 13:52:57 +0900 -Subject: [PATCH] configure.in: Error fix. - -the error is: conftest.c:9:28: fatal error: ac_nonexistent.h: -No such file or directory #include <ac_nonexistent.h> - -Upstream-Status: pending - -Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> - ---- - src/configure.in | 30 ------------------------------ - 1 file changed, 30 deletions(-) - -diff --git a/src/configure.in b/src/configure.in -index 1714e69..cae0976 100644 ---- a/src/configure.in -+++ b/src/configure.in -@@ -195,36 +195,6 @@ if test "$GCC" = yes; then - CFLAGS="$CFLAGS -fno-strict-aliasing -Wall -Wstrict-prototypes" - fi - --dnl Figure out packing order of structures --AC_CACHE_CHECK([packing order of bit fields],rpppoe_cv_pack_bitfields,[ --if test "${rpppoe_cv_pack_bitfields+set}" != set ; then --AC_TRY_RUN([ --union foo { -- struct bar { -- unsigned int ver:4; -- unsigned int type:4; -- } bb; -- unsigned char baz; --}; -- --int --main(void) --{ -- union foo x; -- x.bb.ver = 1; -- x.bb.type = 2; -- if (x.baz == 0x21) { -- return 1; -- } else if (x.baz == 0x12) { -- return 0; -- } else { -- return 2; -- } --}], rpppoe_cv_pack_bitfields=normal, rpppoe_cv_pack_bitfields=rev, --$ECHO "no defaults for cross-compiling"; exit 1) --fi --]) -- - if test "$rpppoe_cv_pack_bitfields" = "rev" ; then - AC_MSG_RESULT(reversed) - AC_DEFINE([PACK_BITFIELDS_REVERSED], [], [Reversed bitfields]) diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/configure.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/configure.patch index be892803e6..c486716b97 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/configure.patch +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/configure.patch @@ -3,6 +3,8 @@ From: Richard Purdie <richard.purdie@linuxfoundation.org> Date: Fri, 18 Jul 2014 08:25:16 +0000 --- +Upstream-Status: Pending + configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/configure_in_cross.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/configure_in_cross.patch index 3b945934f6..6e859a354c 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/configure_in_cross.patch +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/configure_in_cross.patch @@ -8,13 +8,12 @@ a few target paths, reworks a few tests to be more friendly for cross and drops other tests. Upstream-Status: Inappropriate [build system specific changes] - --- - src/configure.in | 66 ++++++++++++++------------------------------------------ - 1 file changed, 16 insertions(+), 50 deletions(-) + src/configure.in | 62 ++++++++++-------------------------------------- + 1 file changed, 12 insertions(+), 50 deletions(-) diff --git a/src/configure.in b/src/configure.in -index 90a07df..1d30243 100644 +index 4add50c..9dff457 100644 --- a/src/configure.in +++ b/src/configure.in @@ -5,6 +5,13 @@ AC_INIT(pppoe.c) @@ -67,13 +66,15 @@ index 90a07df..1d30243 100644 fi AC_SUBST(LINUX_KERNELMODE_PLUGIN) -@@ -142,15 +149,8 @@ AC_CHECK_SIZEOF(unsigned short) +@@ -142,17 +149,8 @@ AC_CHECK_SIZEOF(unsigned short) AC_CHECK_SIZEOF(unsigned int) AC_CHECK_SIZEOF(unsigned long) +-dnl Check for location of ip +-AC_PATH_PROG(IP, ip, NOTFOUND, $PATH:/bin:/sbin:/usr/bin:/usr/sbin) +- -dnl Check for location of pppd -AC_PATH_PROG(PPPD, pppd, NOTFOUND, $PATH:/sbin:/usr/sbin:/usr/local/sbin) --AC_PATH_PROG(ECHO, echo, echo) - -dnl Check for setsid (probably Linux-specific) -AC_PATH_PROG(SETSID, setsid, "", $PATH:/sbin:/usr/sbin:/usr/local/sbin) @@ -84,7 +85,7 @@ index 90a07df..1d30243 100644 dnl Check for Linux-specific kernel support for PPPoE AC_MSG_CHECKING(for Linux 2.4.X kernel-mode PPPoE support) -@@ -195,44 +195,8 @@ if test "$GCC" = yes; then +@@ -195,42 +193,6 @@ if test "$GCC" = yes; then CFLAGS="$CFLAGS -fno-strict-aliasing -Wall -Wstrict-prototypes" fi @@ -124,30 +125,9 @@ index 90a07df..1d30243 100644 - ;; -esac - - dnl Figure out packing order of structures --AC_MSG_CHECKING([packing order of bit fields]) -+AC_CACHE_CHECK([packing order of bit fields],rpppoe_cv_pack_bitfields,[ - if test "${rpppoe_cv_pack_bitfields+set}" != set ; then - AC_TRY_RUN([ - union foo { -@@ -259,10 +223,11 @@ main(void) - }], rpppoe_cv_pack_bitfields=normal, rpppoe_cv_pack_bitfields=rev, - $ECHO "no defaults for cross-compiling"; exit 0) - fi -+]) - - if test "$rpppoe_cv_pack_bitfields" = "rev" ; then - AC_MSG_RESULT(reversed) -- AC_DEFINE(PACK_BITFIELDS_REVERSED) -+ AC_DEFINE([PACK_BITFIELDS_REVERSED], [], [Reversed bitfields]) - else - AC_MSG_RESULT(normal) - fi -@@ -326,6 +291,7 @@ AC_SUBST(PPPOE_SERVER_DEPS) - AC_SUBST(RDYNAMIC) - AC_SUBST(LIBEVENT) - AC_SUBST(ECHO) -+AC_SUBST(HAVE_STRUCT_SOCKADDR_LL) - AC_SUBST(LDFLAGS) - - datadir_evaluated=`eval echo $datadir` + # Sigh... got to fix this up for tcl + test "x$prefix" = xNONE && prefix=$ac_default_prefix + # Let make expand exec_prefix. +-- +2.34.1 + diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/discard-use-of-dnl-in-Makefile.am.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/discard-use-of-dnl-in-Makefile.am.patch index 9801f6e277..57301f430d 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/discard-use-of-dnl-in-Makefile.am.patch +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/discard-use-of-dnl-in-Makefile.am.patch @@ -9,6 +9,8 @@ not introduce a comment. Signed-off-by: Ting Liu <b28495@freescale.com> --- +Upstream-Status: Pending + Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/dont-swallow-errors.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/dont-swallow-errors.patch deleted file mode 100644 index 8a857888b3..0000000000 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/dont-swallow-errors.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a9a7322273c51882af58c35ba288a0fae00ba841 Mon Sep 17 00:00:00 2001 -From: Lei Maohui <leimaohui@cn.fujitsu.com> -Date: Wed, 19 Aug 2015 12:33:41 +0900 -Subject: [PATCH] don't swallow errors - -Further fixup to the configure scripts to not swallow errors - -Upstream-Status: Pending - ---- - src/configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/configure.in b/src/configure.in -index 1d30243..1714e69 100644 ---- a/src/configure.in -+++ b/src/configure.in -@@ -221,7 +221,7 @@ main(void) - return 2; - } - }], rpppoe_cv_pack_bitfields=normal, rpppoe_cv_pack_bitfields=rev, --$ECHO "no defaults for cross-compiling"; exit 0) -+$ECHO "no defaults for cross-compiling"; exit 1) - fi - ]) - diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.13.bb b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.15.bb index 846abca032..c19f7d847f 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.13.bb +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.15.bb @@ -4,30 +4,30 @@ SECTION = "net" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=a194eaefae2be54ee3221339b10d0581" -PR = "r10" +PR = "r11" -SRC_URI = "https://dianne.skoll.ca/projects/rp-pppoe/download/rp-pppoe-${PV}.tar.gz \ +SRC_URI = "https://dianne.skoll.ca/projects/rp-pppoe/download/OLD/rp-pppoe-${PV}.tar.gz \ file://top-autoconf.patch \ file://configure_in_cross.patch \ file://update-config.patch \ - file://dont-swallow-errors.patch \ file://discard-use-of-dnl-in-Makefile.am.patch \ file://configure.patch \ file://pppoe-server.default \ file://pppoe-server.init \ - file://configure.in-Error-fix.patch \ file://pppoe-server.service \ file://0001-ppoe-Dont-include-linux-if_ether.h.patch \ file://0002-Enable-support-for-the-kernel-module.patch \ " -SRC_URI[md5sum] = "ec9dccd9a367a1f71f2dc81069796dd8" -SRC_URI[sha256sum] = "8cd6bc71ba46bd5f6eb4daf60220ccdcd991a8525111dee466501b1b9717e676" +SRC_URI[sha256sum] = "b1f318bc7e4e5b0fd8a8e23e8803f5e6e43165245a5a10a7162a92a6cf17829a" inherit autotools-brokensep update-rc.d systemd CACHED_CONFIGUREVARS += "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', 'rpppoe_cv_pack_bitfields=normal', 'rpppoe_cv_pack_bitfields=rev', d)}" +# Needed for strlcpy() +CFLAGS += "-D_GNU_SOURCE" + do_install:append() { install -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/pppoe-server.service ${D}${systemd_unitdir}/system diff --git a/meta-networking/recipes-protocols/zeroconf/zeroconf/0001-zeroconf-Rename-arp_op-to-avoid-namespace-conflicts-.patch b/meta-networking/recipes-protocols/zeroconf/zeroconf/0001-zeroconf-Rename-arp_op-to-avoid-namespace-conflicts-.patch index b4d6d94b06..92b581416f 100644 --- a/meta-networking/recipes-protocols/zeroconf/zeroconf/0001-zeroconf-Rename-arp_op-to-avoid-namespace-conflicts-.patch +++ b/meta-networking/recipes-protocols/zeroconf/zeroconf/0001-zeroconf-Rename-arp_op-to-avoid-namespace-conflicts-.patch @@ -12,6 +12,8 @@ and causes the conflict Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + zeroconf.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb b/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb index 4f8d4f6c6e..0b9e05b324 100644 --- a/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb +++ b/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb @@ -27,6 +27,8 @@ SRC_URI = "http://www.progsoc.org/~wildfire/zeroconf/download/${BPN}-${PV}.tar.g SRC_URI[md5sum] = "bdafb16b008ebb5633e4e581f77821d2" SRC_URI[sha256sum] = "a8c74df127753e2310fa1e072f3c9ca44a404bb0bbce9cfec7a84c6dff8bec7b" +EXTRA_OEMAKE += "CPPFLAGS='${CFLAGS}'" + do_install () { install -d ${D}${sbindir} install -d ${D}${sysconfdir}/network/if-up.d diff --git a/meta-networking/recipes-support/aoetools/aoetools/reproducible-build.patch b/meta-networking/recipes-support/aoetools/aoetools/reproducible-build.patch index 4939ab25c1..34d59b1aa6 100644 --- a/meta-networking/recipes-support/aoetools/aoetools/reproducible-build.patch +++ b/meta-networking/recipes-support/aoetools/aoetools/reproducible-build.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/Makefile +++ b/Makefile @@ -40,7 +40,8 @@ NPERSHELF=16 diff --git a/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch b/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch index eb58389c38..c58ef1a9ef 100644 --- a/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch +++ b/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch @@ -8,6 +8,8 @@ which OE uses to pass tweaks Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + Makefile | 10 ++++------ extensions/Makefile | 4 ++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/meta-networking/recipes-support/chrony/chrony/0001-Fix-compilation-with-musl.patch b/meta-networking/recipes-support/chrony/chrony/0001-Fix-compilation-with-musl.patch index 17b6353527..5e2bc64af3 100644 --- a/meta-networking/recipes-support/chrony/chrony/0001-Fix-compilation-with-musl.patch +++ b/meta-networking/recipes-support/chrony/chrony/0001-Fix-compilation-with-musl.patch @@ -8,6 +8,8 @@ Fixes: Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> --- +Upstream-Status: Pending + hash_intmd5.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch b/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch index 5ba2081262..82c0e1b68b 100644 --- a/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch +++ b/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch @@ -3,25 +3,25 @@ From: Joe Slater <jslater@windriver.com> Date: Thu, 9 Mar 2017 10:58:06 -0800 Subject: [PATCH] chrony: fix build failure for arma9 - Eliminate references to syscalls not available - for ARM_EABI. Also add a dependency on libseccomp - which is needed for scfilter to work. +Eliminate references to syscalls not available +for ARM_EABI. Also add a dependency on libseccomp +which is needed for scfilter to work. - Set PACKAGECONFIG to not enable scfilter, since - kernel CONFIG_SECCOMP is unlikely to be set. This - aligns the usage of libseccomp with that of other packages. +Set PACKAGECONFIG to not enable scfilter, since +kernel CONFIG_SECCOMP is unlikely to be set. This +aligns the usage of libseccomp with that of other packages. - Upstream-Status: Pending +Upstream-Status: Pending - Signed-off-by: Joe Slater <jslater@windriver.com> +Signed-off-by: Joe Slater <jslater@windriver.com> - Refresh patch for new upstream version. +Refresh patch for new upstream version. - Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org> +Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org> - Refreshed for 4.0 +Refreshed for 4.0 - Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> --- sys_linux.c | 15 +++++++++------ diff --git a/meta-networking/recipes-support/curlpp/curlpp/0001-curlpp-config.in-Remove-references-to-absolute-build.patch b/meta-networking/recipes-support/curlpp/curlpp/0001-curlpp-config.in-Remove-references-to-absolute-build.patch new file mode 100644 index 0000000000..539e9cefb6 --- /dev/null +++ b/meta-networking/recipes-support/curlpp/curlpp/0001-curlpp-config.in-Remove-references-to-absolute-build.patch @@ -0,0 +1,40 @@ +From d6eee2d52f31e034f9d84d38a749d86a63d5b769 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 22 May 2023 20:37:47 -0700 +Subject: [PATCH] curlpp-config.in: Remove references to absolute buildpaths + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + extras/curlpp-config.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/extras/curlpp-config.in b/extras/curlpp-config.in +index b0bd964..1416b94 100644 +--- a/extras/curlpp-config.in ++++ b/extras/curlpp-config.in +@@ -43,7 +43,7 @@ while test $# -gt 0; do + + case "$1" in + --cc) +- echo @CC@ ++ curl-config --cc + ;; + + --prefix) +@@ -73,10 +73,10 @@ while test $# -gt 0; do + ;; + + --libs) +- echo -L@libdir@ @LDFLAGS@ @LIBS@ `curl-config --libs` -lcurlpp ++ echo `curl-config --libs` -lcurlpp + ;; + --static-libs) +- echo @libdir_static@/libcurlpp.@libext@ @LDFLAGS@ @LIBS@ `curl-config --static-libs` ++ echo $prefix/@libdir_static@/libcurlpp.@libext@ `curl-config --static-libs` + ;; + + *) +-- +2.40.1 + diff --git a/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb b/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb index e36a86fd09..131f1873a2 100644 --- a/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb +++ b/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb @@ -7,7 +7,8 @@ LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=fd0c9adf285a69aa3b4faf34384e1029" DEPENDS = "curl" DEPENDS:class-native = "curl-native" -SRC_URI = "git://github.com/jpbarrette/curlpp.git;branch=master;protocol=https" +SRC_URI = "git://github.com/jpbarrette/curlpp.git;branch=master;protocol=https \ + file://0001-curlpp-config.in-Remove-references-to-absolute-build.patch" SRCREV = "592552a165cc569dac7674cb7fc9de3dc829906f" diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch b/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch index be2bb42fc2..f8697699ac 100644 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch @@ -7,6 +7,8 @@ Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- +Upstream-Status: Pending + Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.88.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.89.bb index 4bf1dd8954..684eb44320 100644 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.88.bb +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.89.bb @@ -17,8 +17,9 @@ SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getV file://dnsmasq-resolvconf.service \ file://dnsmasq-noresolvconf.service \ file://dnsmasq-resolved.conf \ + file://CVE-2023-28450.patch \ " -SRC_URI[sha256sum] = "da9d26aa3f3fc15f3b58b94edbb9ddf744cbce487194ea480bd8e7381b3ca028" +SRC_URI[sha256sum] = "8651373d000cae23776256e83dcaa6723dee72c06a39362700344e0c12c4e7e4" inherit pkgconfig update-rc.d systemd diff --git a/meta-networking/recipes-support/dnsmasq/files/CVE-2023-28450.patch b/meta-networking/recipes-support/dnsmasq/files/CVE-2023-28450.patch new file mode 100644 index 0000000000..129c9043e8 --- /dev/null +++ b/meta-networking/recipes-support/dnsmasq/files/CVE-2023-28450.patch @@ -0,0 +1,48 @@ +From eb92fb32b746f2104b0f370b5b295bb8dd4bd5e5 Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon@thekelleys.org.uk> +Date: Tue, 7 Mar 2023 22:07:46 +0000 +Subject: [PATCH] Set the default maximum DNS UDP packet size to 1232. + +http://www.dnsflagday.net/2020/ refers. + +Thanks to Xiang Li for the prompt. + +CVE: CVE-2023-28450 +Upstream-Status: Backport [https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=eb92fb32b746f2104b0f370b5b295bb8dd4bd5e5] + +Signed-off-by: Peter Marko <peter.marko@siemens.com> +--- + man/dnsmasq.8 | 3 ++- + src/config.h | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 +index 41e2e04..5acb935 100644 +--- a/man/dnsmasq.8 ++++ b/man/dnsmasq.8 +@@ -183,7 +183,8 @@ to zero completely disables DNS function, leaving only DHCP and/or TFTP. + .TP + .B \-P, --edns-packet-max=<size> + Specify the largest EDNS.0 UDP packet which is supported by the DNS +-forwarder. Defaults to 4096, which is the RFC5625-recommended size. ++forwarder. Defaults to 1232, which is the recommended size following the ++DNS flag day in 2020. Only increase if you know what you are doing. + .TP + .B \-Q, --query-port=<query_port> + Send outbound DNS queries from, and listen for their replies on, the +diff --git a/src/config.h b/src/config.h +index 1e7b30f..37b374e 100644 +--- a/src/config.h ++++ b/src/config.h +@@ -19,7 +19,7 @@ + #define CHILD_LIFETIME 150 /* secs 'till terminated (RFC1035 suggests > 120s) */ + #define TCP_MAX_QUERIES 100 /* Maximum number of queries per incoming TCP connection */ + #define TCP_BACKLOG 32 /* kernel backlog limit for TCP connections */ +-#define EDNS_PKTSZ 4096 /* default max EDNS.0 UDP packet from RFC5625 */ ++#define EDNS_PKTSZ 1232 /* default max EDNS.0 UDP packet from from /dnsflagday.net/2020 */ + #define SAFE_PKTSZ 1232 /* "go anywhere" UDP packet size, see https://dnsflagday.net/2020/ */ + #define KEYBLOCK_LEN 40 /* choose to minimise fragmentation when storing DNSSEC keys */ + #define DNSSEC_WORK 50 /* Max number of queries to validate one question */ +-- +2.20.1 + diff --git a/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch b/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch index f16f687f24..4fcfa48b99 100644 --- a/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch +++ b/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch @@ -5,7 +5,7 @@ Subject: [PATCH] configure.ac: convert AC_TRY_RUN to AC_TRY_LINK statements This is not completely safe, but it's the least invasive fix. -Upstream-Status: pending +Upstream-Status: Pending Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> diff --git a/meta-networking/recipes-support/dovecot/dovecot/0001-not-check-pandoc.patch b/meta-networking/recipes-support/dovecot/dovecot/0001-not-check-pandoc.patch index 20ba73a824..af69c82f0f 100644 --- a/meta-networking/recipes-support/dovecot/dovecot/0001-not-check-pandoc.patch +++ b/meta-networking/recipes-support/dovecot/dovecot/0001-not-check-pandoc.patch @@ -5,6 +5,8 @@ Subject: [PATCH] not check pandoc Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> --- +Upstream-Status: Pending + m4/dovecot.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/dovecot/dovecot_2.3.14.bb b/meta-networking/recipes-support/dovecot/dovecot_2.3.20.bb index d8c483191f..e41dd93f5d 100644 --- a/meta-networking/recipes-support/dovecot/dovecot_2.3.14.bb +++ b/meta-networking/recipes-support/dovecot/dovecot_2.3.20.bb @@ -12,19 +12,18 @@ SRC_URI = "http://dovecot.org/releases/2.3/dovecot-${PV}.tar.gz \ file://0001-not-check-pandoc.patch \ file://0001-m4-Check-for-libunwind-instead-of-libunwind-generic.patch \ " - -SRC_URI[md5sum] = "2f03532cec3280ae45a101a7a55ccef5" -SRC_URI[sha256sum] = "c8b3d7f3af1e558a3ff0f970309d4013a4d3ce136f8c02a53a3b05f345b9a34a" +SRC_URI[sha256sum] = "caa832eb968148abdf35ee9d0f534b779fa732c0ce4a913d9ab8c3469b218552" DEPENDS = "openssl xz zlib bzip2 libcap icu libtirpc bison-native" CFLAGS += "-I${STAGING_INCDIR}/tirpc" LDFLAGS += "-ltirpc" -inherit autotools pkgconfig systemd useradd gettext +inherit autotools pkgconfig systemd useradd gettext multilib_header -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ldap pam', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ldap pam systemd', d)}" PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam," +PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd," PACKAGECONFIG[ldap] = "--with-ldap=plugin,--without-ldap,openldap," PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," @@ -42,23 +41,22 @@ CACHED_CONFIGUREVARS += "i_cv_signed_size_t=no \ # hardcode epoll() to avoid running unsafe tests # BSD needs kqueue and uclibc poll() -EXTRA_OECONF = " --with-ioloop=epoll \ - --with-systemdsystemunitdir=${systemd_unitdir}/system" - -# Uses hidden symbols -# libssl_iostream_openssl.so: undefined reference to `ssl_iostream_handshake' -LTO = "" +EXTRA_OECONF = " --with-ioloop=epoll" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} = "dovecot.service dovecot.socket" 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 - install -m 0644 ${WORKDIR}/dovecot.service ${D}${systemd_unitdir}/system - sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/dovecot.service - sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/dovecot.service + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then + install -m 0644 ${WORKDIR}/dovecot.service ${D}${systemd_unitdir}/system + sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/dovecot.service + sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/dovecot.service + fi + oe_multilib_header dovecot/config.h } USERADD_PACKAGES = "${PN}" @@ -73,5 +71,4 @@ FILES:${PN}-staticdev += "${libdir}/dovecot/*/*.a" FILES:${PN}-dev += "${libdir}/dovecot/libdovecot*.so" FILES:${PN}-dbg += "${libdir}/dovecot/*/.debug" -# CVE-2016-4983 affects only postinstall script on specific distribution -CVE_CHECK_IGNORE += "CVE-2016-4983" +CVE_STATUS[CVE-2016-4983] = "not-applicable-platform: Affects only postinstall script on specific distribution." diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch index 84e3ad0968..4e1f68be09 100644 --- a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch +++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch @@ -3,7 +3,7 @@ From: Changqing Li <changqing.li@windriver.com> Date: Thu, 21 Apr 2022 17:22:35 +0800 Subject: [PATCH] drbd-utils: support usermerge -Upstream-Status: Inappropriate[oe-specific] +Upstream-Status: Inappropriate [oe-specific] Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch index 354be0ff18..0bf4b2fce1 100644 --- a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch +++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch @@ -5,6 +5,8 @@ Subject: [PATCH] drbdmon: add LDFLAGS when linking Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> --- +Upstream-Status: Pending + user/drbdmon/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/esmtp/esmtp/0001-Fix-libESMTP-dependency-check.patch b/meta-networking/recipes-support/esmtp/esmtp/0001-Fix-libESMTP-dependency-check.patch index 92ac4b12ba..18bffe55b2 100644 --- a/meta-networking/recipes-support/esmtp/esmtp/0001-Fix-libESMTP-dependency-check.patch +++ b/meta-networking/recipes-support/esmtp/esmtp/0001-Fix-libESMTP-dependency-check.patch @@ -8,6 +8,8 @@ check for existence instead. Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com> --- +Upstream-Status: Pending + configure.ac | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-support/ettercap/ettercap/0001-sslstrip-Enhance-the-libcurl-version-check-to-consid.patch b/meta-networking/recipes-support/ettercap/ettercap/0001-sslstrip-Enhance-the-libcurl-version-check-to-consid.patch new file mode 100644 index 0000000000..592ea52f2e --- /dev/null +++ b/meta-networking/recipes-support/ettercap/ettercap/0001-sslstrip-Enhance-the-libcurl-version-check-to-consid.patch @@ -0,0 +1,38 @@ +From 40534662043b7d831d1f6c70448afa9d374a9b63 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 23 Mar 2023 10:23:14 -0700 +Subject: [PATCH] sslstrip: Enhance the libcurl version check to consider + version 8+ + +Lately curl has released version 8 and hence LIBCURL_VERSION_MAJOR is +reset to 0, current check assumes major version to be 7 at max and hence +on systems with libcurl 8+ this check breaks and build fails + +Fixes + +TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/ettercap/0.8.3.1-r0/git/plug-ins/sslstrip/sslstrip.c:57:2: error: libcurl 7.26.0 or up is needed + ^ +1 error generated. + +Upstream-Status: Backport [https://github.com/Ettercap/ettercap/commit/40534662043b7d831d1f6c70448afa9d374a9b63] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + plug-ins/sslstrip/sslstrip.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plug-ins/sslstrip/sslstrip.c b/plug-ins/sslstrip/sslstrip.c +index 327bf58a..d9b67c8b 100644 +--- a/plug-ins/sslstrip/sslstrip.c ++++ b/plug-ins/sslstrip/sslstrip.c +@@ -51,7 +51,7 @@ + + #include <curl/curl.h> + +-#if (LIBCURL_VERSION_MAJOR < 7) || (LIBCURL_VERSION_MINOR < 26) ++#if (LIBCURL_VERSION_MAJOR < 7) || (LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR < 26) + #error libcurl 7.26.0 or up is needed + #endif + +-- +2.40.0 + diff --git a/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb b/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb index b0958e6975..723d7c8f78 100644 --- a/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb +++ b/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb @@ -20,7 +20,8 @@ DEPENDS += "ethtool \ RDEPENDS:${PN} += "bash ethtool libgcc" -SRC_URI = "gitsm://github.com/Ettercap/ettercap;branch=master;protocol=https" +SRC_URI = "gitsm://github.com/Ettercap/ettercap;branch=master;protocol=https \ + file://0001-sslstrip-Enhance-the-libcurl-version-check-to-consid.patch" SRCREV = "7281fbddb7da7478beb1d21e3cb105fff3778b31" @@ -31,6 +32,8 @@ EXTRA_OECMAKE = " \ -DBUNDLED_LIBS=ON \ -DENABLE_IPV6=ON \ -DENABLE_GTK=OFF \ + -DFLEX_TARGET_ARG_COMPILE_FLAGS='--noline' \ + -DBISON_TARGET_ARG_COMPILE_FLAGS='--no-lines' \ " CFLAGS += "-D_GNU_SOURCE" diff --git a/meta-networking/recipes-support/fetchmail/fetchmail_6.4.23.bb b/meta-networking/recipes-support/fetchmail/fetchmail_6.4.37.bb index 266573681e..4560ef84c3 100644 --- a/meta-networking/recipes-support/fetchmail/fetchmail_6.4.23.bb +++ b/meta-networking/recipes-support/fetchmail/fetchmail_6.4.37.bb @@ -6,13 +6,13 @@ connections). It supports every remote-mail protocol now in use on the Internet: RPOP, APOP, KPOP, all flavors of IMAP, ETRN, and ODMR. It can even support IPv6 and IPSEC." SECTION = "mail" LICENSE = "GPL-2.0-only & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=c3a05d9b9d3784c824c9b92a648e1353" +LIC_FILES_CHKSUM = "file://COPYING;md5=ee6b9f41d9324434dd11bd8a38f1b044" DEPENDS = "openssl" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz \ " -SRC_URI[sha256sum] = "5f7a5e13731431134a2ca535bbced7adc666d3aeb93169a0830945d91f492300" +SRC_URI[sha256sum] = "4a182e5d893e9abe6ac37ae71e542651fce6d606234fc735c2aaae18657e69ea" inherit autotools gettext pkgconfig python3-dir python3native diff --git a/meta-networking/recipes-support/fwknop/fwknop/0001-Use-pkg-config-to-find-gpgme.patch b/meta-networking/recipes-support/fwknop/fwknop/0001-Use-pkg-config-to-find-gpgme.patch new file mode 100644 index 0000000000..146501c775 --- /dev/null +++ b/meta-networking/recipes-support/fwknop/fwknop/0001-Use-pkg-config-to-find-gpgme.patch @@ -0,0 +1,27 @@ +From f8f4e1a617c4610ea7dc40a60f1c696ebc37850c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 2 Apr 2023 09:27:42 -0700 +Subject: [PATCH] Use pkg-config to find gpgme + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + m4/gpgme.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/gpgme.m4 b/m4/gpgme.m4 +index 44bf43c..c9a8ae6 100644 +--- a/m4/gpgme.m4 ++++ b/m4/gpgme.m4 +@@ -18,7 +18,7 @@ AC_DEFUN([_AM_PATH_GPGME_CONFIG], + if test "x$gpgme_config_prefix" != x ; then + GPGME_CONFIG="$gpgme_config_prefix/bin/gpgme-config" + fi +- AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no) ++ GPGME_CONFIG="pkg-config gpgme" + + if test "$GPGME_CONFIG" != "no" ; then + gpgme_version=`$GPGME_CONFIG --version` +-- +2.40.0 + diff --git a/meta-networking/recipes-support/fwknop/fwknop/0001-configure.ac-Fix-missing-comma-in-AS_IF.patch b/meta-networking/recipes-support/fwknop/fwknop/0001-configure.ac-Fix-missing-comma-in-AS_IF.patch new file mode 100644 index 0000000000..f3e1707408 --- /dev/null +++ b/meta-networking/recipes-support/fwknop/fwknop/0001-configure.ac-Fix-missing-comma-in-AS_IF.patch @@ -0,0 +1,29 @@ +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-networking/recipes-support/fwknop/fwknop_2.6.10.bb b/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb index a35ec06795..a1f56cdf16 100644 --- a/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb +++ b/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb @@ -3,29 +3,22 @@ HOMEPAGE = "http://www.cipherdyne.org/fwknop/" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ " -inherit autotools-brokensep +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[md5sum] = "47a9c7c214c40dceb5dc2aa8832e4f32" SRC_URI[sha256sum] = "f6c09bec97ed8e474a98ae14f9f53e1bcdda33393f20667b6af3fb6bb894ca77" DEPENDS = "libpcap gpgme" -EXTRA_OECONF = " --with-iptables=/usr/sbin/iptables \ - " +EXTRA_OECONF = " --with-iptables=${sbindir}/iptables" -do_configure () { +do_configure:prepend () { install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/config install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/config - - aclocal - libtoolize --automake --copy --force - autoconf - autoheader - automake -a - oe_runconf } PACKAGES =+ "${PN}-client ${PN}-daemon" diff --git a/meta-networking/recipes-support/htpdate/htpdate_1.3.6.bb b/meta-networking/recipes-support/htpdate/htpdate_1.3.7.bb index a4389ce7e8..b6dfab0856 100644 --- a/meta-networking/recipes-support/htpdate/htpdate_1.3.6.bb +++ b/meta-networking/recipes-support/htpdate/htpdate_1.3.7.bb @@ -14,7 +14,7 @@ LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://htpdate.c;beginline=26;endline=30;md5=2b6cdb94bd5349646d7e33f9f501eef7" SRC_URI = "http://www.vervest.org/htp/archive/c/htpdate-${PV}.tar.gz" -SRC_URI[sha256sum] = "3cdc558ec8e53ef374a42490b2f28c0b23981fa8754a6d7182044707828ad1e9" +SRC_URI[sha256sum] = "88c52fe475308ee95f560fd7cf68c75bc6e9a6abf56be7fed203a7f762fe7ab2" TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.8_typo.patch b/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.8_typo.patch index 246910036e..3bd87ff457 100644 --- a/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.8_typo.patch +++ b/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.8_typo.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: Correct typo: s/ommited/omitted/ Author: Michael Shuler <michael@pbandjelly.org> Index: ifmetric/man/ifmetric.8 diff --git a/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.c_netlink-invalid-arg.patch b/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.c_netlink-invalid-arg.patch index 374135d4f6..a6d1828d22 100644 --- a/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.c_netlink-invalid-arg.patch +++ b/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.c_netlink-invalid-arg.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: Fix "NETLINK: Error: Invalid argument" for links that are down, in kernel 4.4+ Author: Jim Paris <jim@jtan.com> Bug-Debian: http://bugs.debian.org/864889 diff --git a/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.c_typo.patch b/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.c_typo.patch index 992f7d2fbb..19290a59dd 100644 --- a/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.c_typo.patch +++ b/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.c_typo.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: Correct spelling-error-in-binary s/Recieved/Received/ Author: Michael Shuler <michael@pbandjelly.org> Index: ifmetric/src/ifmetric.c diff --git a/meta-networking/recipes-support/ifmetric/ifmetric/nlrequest.c_packet-too-small_fix.patch b/meta-networking/recipes-support/ifmetric/ifmetric/nlrequest.c_packet-too-small_fix.patch index 15b3103334..89851517bf 100644 --- a/meta-networking/recipes-support/ifmetric/ifmetric/nlrequest.c_packet-too-small_fix.patch +++ b/meta-networking/recipes-support/ifmetric/ifmetric/nlrequest.c_packet-too-small_fix.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: Fix "NETLINK: Packet too small or truncated!" error. Author: Benedek László <benedekl@gmail.com> Bug-Debian: http://bugs.debian.org/514197 diff --git a/meta-networking/recipes-support/ipcalc/ipcalc/0001-Makefile-pass-extra-linker-flags.patch b/meta-networking/recipes-support/ipcalc/ipcalc/0001-Makefile-pass-extra-linker-flags.patch deleted file mode 100644 index e95b6f993f..0000000000 --- a/meta-networking/recipes-support/ipcalc/ipcalc/0001-Makefile-pass-extra-linker-flags.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 7fd0e0b88df692dfc67335f235a1bb74854a0498 Mon Sep 17 00:00:00 2001 -From: Mariia Movchan <mmovchan@cisco.com> -Date: Tue, 6 Mar 2018 16:03:39 +0200 -Subject: [PATCH] Makefile: pass extra linker flags - -Fixes -ERROR: QA Issue: No GNU_HASH in the elf binary - -Upstream-Status: Pending - -Signed-off-by: Mariia Movchan <mmovchan@cisco.com> - ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 54569c1..798988f 100644 ---- a/Makefile -+++ b/Makefile -@@ -8,7 +8,7 @@ LIBS?= - VERSION=0.2.3 - CC?=gcc - CFLAGS?=-O2 -g -Wall --LDFLAGS=$(LIBS) -+LDFLAGS+=$(LIBS) - - ifeq ($(USE_GEOIP),yes) - ifeq ($(USE_DYN_GEOIP),yes) diff --git a/meta-networking/recipes-support/ipcalc/ipcalc_0.2.3.bb b/meta-networking/recipes-support/ipcalc/ipcalc_0.2.3.bb deleted file mode 100644 index efac3c86eb..0000000000 --- a/meta-networking/recipes-support/ipcalc/ipcalc_0.2.3.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Tool to assist in network address calculations for IPv4 and IPv6." -HOMEPAGE = "https://github.com/nmav/ipcalc" - -SECTION = "net" - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -S = "${WORKDIR}/git" -SRCREV = "c3ee70c878b9c5833a77a1f339f1ca4dc6f225c5" -SRC_URI = "\ - git://github.com/nmav/ipcalc.git;protocol=https;;branch=master \ - file://0001-Makefile-pass-extra-linker-flags.patch \ -" - -export USE_GEOIP = "no" - -do_install() { - install -d ${D}/${bindir} - install -m 0755 ${S}/ipcalc ${D}/${bindir} -} diff --git a/meta-networking/recipes-support/ipcalc/ipcalc_1.0.3.bb b/meta-networking/recipes-support/ipcalc/ipcalc_1.0.3.bb new file mode 100644 index 0000000000..055c6e1432 --- /dev/null +++ b/meta-networking/recipes-support/ipcalc/ipcalc_1.0.3.bb @@ -0,0 +1,14 @@ +SUMMARY = "Tool to assist in network address calculations for IPv4 and IPv6." +HOMEPAGE = "https://gitlab.com/ipcalc/ipcalc" + +SECTION = "net" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "git://gitlab.com/ipcalc/ipcalc.git;protocol=https;branch=master" +SRCREV = "c341e55be386649c0a5347eefeae410753c4e753" + +S = "${WORKDIR}/git" + +inherit meson diff --git a/meta-networking/recipes-support/ipvsadm/ipvsadm/0001-Add-CCFLAGS-to-cflags.patch b/meta-networking/recipes-support/ipvsadm/ipvsadm/0001-Add-CCFLAGS-to-cflags.patch new file mode 100644 index 0000000000..a2923088e8 --- /dev/null +++ b/meta-networking/recipes-support/ipvsadm/ipvsadm/0001-Add-CCFLAGS-to-cflags.patch @@ -0,0 +1,36 @@ +From 1bc180ec333d90e1a11deff46b5639ab5d40408d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 26 May 2023 09:29:23 -0700 +Subject: [PATCH] Add CCFLAGS to cflags + +This is to append the flags from build environment. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile | 1 + + libipvs/Makefile | 3 +++ + 2 files changed, 4 insertions(+) + +--- a/Makefile ++++ b/Makefile +@@ -50,6 +50,7 @@ else + CFLAGS = -Wall -Wunused -Wstrict-prototypes -g + endif + ++CFLAGS += $(CCFLAGS) + + ##################################### + # No servicable parts below this line +--- a/libipvs/Makefile ++++ b/libipvs/Makefile +@@ -1,6 +1,9 @@ + # Makefile for libipvs + + CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -fPIC ++ ++CFLAGS += $(CCFLAGS) ++ + ifneq (0,$(HAVE_NL)) + CFLAGS += -DLIBIPVS_USE_NL + CFLAGS += $(shell \ diff --git a/meta-networking/recipes-support/ipvsadm/ipvsadm/0001-libipvs-Include-missing-sys-types.h.patch b/meta-networking/recipes-support/ipvsadm/ipvsadm/0001-libipvs-Include-missing-sys-types.h.patch new file mode 100644 index 0000000000..8b08482be7 --- /dev/null +++ b/meta-networking/recipes-support/ipvsadm/ipvsadm/0001-libipvs-Include-missing-sys-types.h.patch @@ -0,0 +1,28 @@ +From 4fc59f5733d187941e9a7ce5e9ea33714d85285c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 26 May 2023 09:30:59 -0700 +Subject: [PATCH] libipvs: Include missing sys/types.h + +Its needed for u_intXX_t types + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libipvs/ip_vs.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libipvs/ip_vs.h b/libipvs/ip_vs.h +index 2670c23..625b6cd 100644 +--- a/libipvs/ip_vs.h ++++ b/libipvs/ip_vs.h +@@ -8,6 +8,7 @@ + + #include <netinet/in.h> + #include <sys/socket.h> ++#include <sys/types.h> + #include <arpa/inet.h> + #include <linux/types.h> /* For __beXX types in userland */ + +-- +2.40.1 + diff --git a/meta-networking/recipes-support/ipvsadm/ipvsadm_1.31.bb b/meta-networking/recipes-support/ipvsadm/ipvsadm_1.31.bb index 01bde4a68d..442e231ad4 100644 --- a/meta-networking/recipes-support/ipvsadm/ipvsadm_1.31.bb +++ b/meta-networking/recipes-support/ipvsadm/ipvsadm_1.31.bb @@ -20,6 +20,8 @@ SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/utils/kernel/ipvsadm/${BP}. file://0001-Modify-the-Makefile-for-cross-compile.patch \ file://0003-ipvsadm-remove-dependency-on-bash.patch \ file://makefile-add-ldflags.patch \ + file://0001-Add-CCFLAGS-to-cflags.patch \ + file://0001-libipvs-Include-missing-sys-types.h.patch \ " SRC_URI[md5sum] = "f6d1707c5baf684b58fd33682d67871f" @@ -27,10 +29,10 @@ SRC_URI[sha256sum] = "1a0a5e25b5a1226435d2fb76341656f83a710183aebb0d204db39c0ec3 UPSTREAM_CHECK_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/ipvsadm" +EXTRA_OEMAKE += "CCFLAGS='${CFLAGS}'" + do_compile() { - oe_runmake \ - CC="${CC} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/libnl3 -L${STAGING_LIBDIR}" \ - all + oe_runmake all } do_install() { diff --git a/meta-networking/recipes-support/libldb/libldb/0002-ldb-Add-configure-options-for-packages.patch b/meta-networking/recipes-support/libldb/libldb/0002-ldb-Add-configure-options-for-packages.patch index 988931c490..4b74a877b3 100644 --- a/meta-networking/recipes-support/libldb/libldb/0002-ldb-Add-configure-options-for-packages.patch +++ b/meta-networking/recipes-support/libldb/libldb/0002-ldb-Add-configure-options-for-packages.patch @@ -1,4 +1,4 @@ -From b4e04e5dd13c9de8b336f7d0c254973a225e3b5f Mon Sep 17 00:00:00 2001 +From acd3985f9c428882f1b731a6f9ce5cb1a4a3a02c Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Mon, 1 Jul 2019 16:14:16 +0800 Subject: [PATCH] ldb: Add configure options for packages @@ -26,7 +26,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 2 files changed, 78 insertions(+), 20 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript -index 4c774d9..63c9967 100644 +index 5c2b750..a38baae 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -25,6 +25,41 @@ def options(opt): @@ -71,7 +71,7 @@ index 4c774d9..63c9967 100644 @Utils.run_once def configure(conf): conf.RECURSE('buildtools/wafsamba') -@@ -35,12 +70,25 @@ def configure(conf): +@@ -38,12 +73,25 @@ def configure(conf): conf.DEFINE('HAVE_LIBREPLACE', 1) conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) @@ -98,10 +98,10 @@ index 4c774d9..63c9967 100644 + if Options.options.enable_libcap: + conf.CHECK_HEADERS('sys/capability.h') + - conf.CHECK_HEADERS('port.h') conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h') conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') -@@ -110,8 +158,9 @@ def configure(conf): + conf.CHECK_HEADERS('sys/resource.h sys/security.h sys/shm.h sys/statfs.h sys/statvfs.h sys/termio.h') +@@ -113,8 +161,9 @@ def configure(conf): conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') @@ -113,7 +113,7 @@ index 4c774d9..63c9967 100644 conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') -@@ -434,20 +483,21 @@ def configure(conf): +@@ -436,20 +485,21 @@ def configure(conf): strlcpy_in_bsd = False @@ -150,7 +150,7 @@ index 4c774d9..63c9967 100644 conf.CHECK_CODE(''' struct ucred cred; diff --git a/wscript b/wscript -index 60bb7cf..7f14847 100644 +index 03076e6..5365408 100644 --- a/wscript +++ b/wscript @@ -40,6 +40,14 @@ def options(opt): diff --git a/meta-networking/recipes-support/libldb/libldb_2.6.1.bb b/meta-networking/recipes-support/libldb/libldb_2.7.2.bb index 7c7701acc3..daf0f73b89 100644 --- a/meta-networking/recipes-support/libldb/libldb_2.6.1.bb +++ b/meta-networking/recipes-support/libldb/libldb_2.7.2.bb @@ -35,8 +35,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[md5sum] = "3a5f54f511fb237b83e1f34e2c7e25cd" -SRC_URI[sha256sum] = "467403f77df86782c3965bb175440baa2ed751a9feb9560194bd8c06bf1736c9" +SRC_URI[sha256sum] = "26ee72d647854e662d99643eb2b2d341655abf31f4990838d6650fb5cf9209c8" inherit pkgconfig waf-samba diff --git a/meta-networking/recipes-support/libmemcached/files/0001-Fix-comparison-types.patch b/meta-networking/recipes-support/libmemcached/files/0001-Fix-comparison-types.patch index 26b5e250cb..9e5121fed7 100644 --- a/meta-networking/recipes-support/libmemcached/files/0001-Fix-comparison-types.patch +++ b/meta-networking/recipes-support/libmemcached/files/0001-Fix-comparison-types.patch @@ -8,6 +8,8 @@ error: comparison between pointer and integer ('char *' and 'int') Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + clients/memflush.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-support/libmemcached/files/0001-configure.ac-Do-not-configure-build-aux.patch b/meta-networking/recipes-support/libmemcached/files/0001-configure.ac-Do-not-configure-build-aux.patch index 06febc5b13..1c1d814b50 100644 --- a/meta-networking/recipes-support/libmemcached/files/0001-configure.ac-Do-not-configure-build-aux.patch +++ b/meta-networking/recipes-support/libmemcached/files/0001-configure.ac-Do-not-configure-build-aux.patch @@ -8,6 +8,8 @@ configure: error: cannot find install-sh, install.sh, or shtool Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-networking/recipes-support/libmemcached/files/0002-POSIX_SPAWN_USEVFORK-is-not-linux-specific-but-glibc.patch b/meta-networking/recipes-support/libmemcached/files/0002-POSIX_SPAWN_USEVFORK-is-not-linux-specific-but-glibc.patch index e1e1be8c68..4d38fe452e 100644 --- a/meta-networking/recipes-support/libmemcached/files/0002-POSIX_SPAWN_USEVFORK-is-not-linux-specific-but-glibc.patch +++ b/meta-networking/recipes-support/libmemcached/files/0002-POSIX_SPAWN_USEVFORK-is-not-linux-specific-but-glibc.patch @@ -9,6 +9,8 @@ cmdline.cc:206:12: error: use of undeclared identifier 'POSIX_SPAWN_USEVFORK' Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + libtest/cmdline.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/libmemcached/files/crosscompile.patch b/meta-networking/recipes-support/libmemcached/files/crosscompile.patch index 63511bff5f..441b8d4177 100644 --- a/meta-networking/recipes-support/libmemcached/files/crosscompile.patch +++ b/meta-networking/recipes-support/libmemcached/files/crosscompile.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + libmemcached/backtrace.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/libtalloc/libtalloc/avoid-attr-unless-wanted.patch b/meta-networking/recipes-support/libtalloc/libtalloc/avoid-attr-unless-wanted.patch index 3c85a8a2d4..fe8d10d6f4 100644 --- a/meta-networking/recipes-support/libtalloc/libtalloc/avoid-attr-unless-wanted.patch +++ b/meta-networking/recipes-support/libtalloc/libtalloc/avoid-attr-unless-wanted.patch @@ -4,6 +4,8 @@ Date: Fri, 25 Dec 2020 15:10:58 +0900 Subject: [PATCH] avoid attr unless wanted --- +Upstream-Status: Pending + lib/replace/wscript | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/meta-networking/recipes-support/libtalloc/libtalloc_2.3.4.bb b/meta-networking/recipes-support/libtalloc/libtalloc_2.4.0.bb index 1c5922205e..f8fef9f825 100644 --- a/meta-networking/recipes-support/libtalloc/libtalloc_2.3.4.bb +++ b/meta-networking/recipes-support/libtalloc/libtalloc_2.4.0.bb @@ -12,7 +12,7 @@ SRC_URI = "https://www.samba.org/ftp/talloc/talloc-${PV}.tar.gz \ file://0001-talloc-Add-configure-options-for-packages.patch \ file://0002-Fix-pyext_PATTERN-for-cross-compilation.patch \ " -SRC_URI[sha256sum] = "179f9ebe265e67e4ab2c26cad2b7de4b6a77c6c212f966903382869f06be6505" +SRC_URI[sha256sum] = "6df36862c42466ef88f360444513870ef46934f9016c84383cc4008a7d0c46ba" inherit waf-samba diff --git a/meta-networking/recipes-support/libtdb/libtdb_1.4.7.bb b/meta-networking/recipes-support/libtdb/libtdb_1.4.8.bb index d4c4f1c371..5dc87bd91a 100644 --- a/meta-networking/recipes-support/libtdb/libtdb_1.4.7.bb +++ b/meta-networking/recipes-support/libtdb/libtdb_1.4.8.bb @@ -13,8 +13,7 @@ SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \ file://0002-Fix-pyext_PATTERN-for-cross-compilation.patch \ " -SRC_URI[md5sum] = "bc27d5b20c7f013305c40b3bced43b3a" -SRC_URI[sha256sum] = "a4fb168def533f31ff2c07f7d9844bb3131e6799f094ebe77d0380adc987c20e" +SRC_URI[sha256sum] = "8434c9c857d13ce3fa8466f75601f25c3693676b36919f159e0ad6121baf5ce8" PACKAGECONFIG ??= "\ ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ diff --git a/meta-networking/recipes-support/libtevent/libtevent/0001-Add-configure-options-for-packages.patch b/meta-networking/recipes-support/libtevent/libtevent/0001-Add-configure-options-for-packages.patch index d98559b4ef..cb66adba9c 100644 --- a/meta-networking/recipes-support/libtevent/libtevent/0001-Add-configure-options-for-packages.patch +++ b/meta-networking/recipes-support/libtevent/libtevent/0001-Add-configure-options-for-packages.patch @@ -21,13 +21,16 @@ Signed-off-by: Joe Slater <joe.slater@windriver.com> Update patch to version 0.10.0 Signed-off-by: Changqing Li <changqing.li@windriver.com> + +Update patch to version 0.14.1 +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- - lib/replace/wscript | 87 ++++++++++++++++++++++++++++++++++----------- + lib/replace/wscript | 85 +++++++++++++++++++++++++++++++++++---------- wscript | 6 ++++ - 2 files changed, 73 insertions(+), 20 deletions(-) + 2 files changed, 73 insertions(+), 18 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript -index 4c774d9..21a746a 100644 +index 5c2b750..28835ac 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -25,6 +25,41 @@ def options(opt): @@ -72,7 +75,7 @@ index 4c774d9..21a746a 100644 @Utils.run_once def configure(conf): conf.RECURSE('buildtools/wafsamba') -@@ -35,12 +70,25 @@ def configure(conf): +@@ -38,12 +73,27 @@ def configure(conf): conf.DEFINE('HAVE_LIBREPLACE', 1) conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) @@ -82,8 +85,8 @@ index 4c774d9..21a746a 100644 + conf.CHECK_HEADERS('compat.h ctype.h dustat.h') conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h') conf.CHECK_HEADERS('locale.h ndir.h pwd.h') -- conf.CHECK_HEADERS('shadow.h sys/acl.h') -- conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h') + conf.CHECK_HEADERS('shadow.h sys/acl.h') + conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h') + conf.CHECK_HEADERS('shadow.h') + conf.CHECK_HEADERS('sys/attributes.h sys/dir.h sys/epoll.h') + @@ -99,10 +102,10 @@ index 4c774d9..21a746a 100644 + if Options.options.enable_libcap: + conf.CHECK_HEADERS('sys/capability.h') + - conf.CHECK_HEADERS('port.h') conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h') conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') -@@ -110,8 +158,9 @@ def configure(conf): + conf.CHECK_HEADERS('sys/resource.h sys/security.h sys/shm.h sys/statfs.h sys/statvfs.h sys/termio.h') +@@ -113,8 +163,9 @@ def configure(conf): conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') @@ -114,7 +117,7 @@ index 4c774d9..21a746a 100644 conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') -@@ -434,20 +483,18 @@ def configure(conf): +@@ -436,20 +487,18 @@ def configure(conf): strlcpy_in_bsd = False @@ -148,7 +151,7 @@ index 4c774d9..21a746a 100644 conf.CHECK_CODE(''' struct ucred cred; diff --git a/wscript b/wscript -index 5c6f02c..75eecd4 100644 +index 0f6e92f..5a54f3a 100644 --- a/wscript +++ b/wscript @@ -28,6 +28,12 @@ def options(opt): @@ -165,5 +168,5 @@ index 5c6f02c..75eecd4 100644 def configure(conf): conf.RECURSE('lib/replace') -- -2.25.1 +2.34.1 diff --git a/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch b/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch index 1e340f3692..e15f14ab78 100644 --- a/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch +++ b/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch @@ -4,6 +4,8 @@ Date: Fri, 25 Dec 2020 15:10:58 +0900 Subject: [PATCH] avoid attr unless wanted --- +Upstream-Status: Pending + lib/replace/wscript | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/meta-networking/recipes-support/libtevent/libtevent_0.13.0.bb b/meta-networking/recipes-support/libtevent/libtevent_0.14.1.bb index 0d898be82e..b34c186ca5 100644 --- a/meta-networking/recipes-support/libtevent/libtevent_0.13.0.bb +++ b/meta-networking/recipes-support/libtevent/libtevent_0.14.1.bb @@ -17,8 +17,7 @@ SRC_URI:append:libc-musl = " file://cmocka-fix-musl-libc-conflicting-types-error LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=47386b7c539bf2706b7ce52dc9341681" -SRC_URI[md5sum] = "9f413f3184f79a4deecd9444242a5dca" -SRC_URI[sha256sum] = "b9437a917fa55344361beb64ec9e0042e99cae8879882a62dd38f6abe2371d0c" +SRC_URI[sha256sum] = "ef85fcaa80ffd2351036ba4b347630fef2a1ac3da964a7f1820466bad03cd00d" inherit pkgconfig ptest waf-samba diff --git a/meta-networking/recipes-support/linux-atm/linux-atm/install-from-buildir.patch b/meta-networking/recipes-support/linux-atm/linux-atm/install-from-buildir.patch index d1380eb2aa..08cb817f77 100644 --- a/meta-networking/recipes-support/linux-atm/linux-atm/install-from-buildir.patch +++ b/meta-networking/recipes-support/linux-atm/linux-atm/install-from-buildir.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + install binaries from builddir not srcdir. Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> diff --git a/meta-networking/recipes-support/linux-atm/linux-atm/link-with-ldflags.patch b/meta-networking/recipes-support/linux-atm/linux-atm/link-with-ldflags.patch index 62fad2a54a..8324040da9 100644 --- a/meta-networking/recipes-support/linux-atm/linux-atm/link-with-ldflags.patch +++ b/meta-networking/recipes-support/linux-atm/linux-atm/link-with-ldflags.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + LDFLAGS_FOR_BUILD should be required when doing link for qgen. Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Remove-newline-from-format-line.patch b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Remove-newline-from-format-line.patch index 1453b75d56..b8fe66f346 100644 --- a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Remove-newline-from-format-line.patch +++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Remove-newline-from-format-line.patch @@ -11,6 +11,8 @@ error: '__builtin___snprintf_chk' output truncated before the last format charac Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + addrdb/addrdb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch index 0a81a22526..81a3f52d90 100644 --- a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch +++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch @@ -21,6 +21,8 @@ Yacc. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + addrdb/coord-config-parse.y | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-coordinator-Fix-strncpy-range-warning.patch b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-coordinator-Fix-strncpy-range-warning.patch index 493832bb84..aadfae238d 100644 --- a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-coordinator-Fix-strncpy-range-warning.patch +++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-coordinator-Fix-strncpy-range-warning.patch @@ -8,6 +8,8 @@ error: 'strncpy' specified bound 4096 equals destination size [-Werror=stringop- Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/coordinator.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-src-iz.c-Undef-dprintf-before-redefining.patch b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-src-iz.c-Undef-dprintf-before-redefining.patch index 68393067d0..fec9b5736d 100644 --- a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-src-iz.c-Undef-dprintf-before-redefining.patch +++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-src-iz.c-Undef-dprintf-before-redefining.patch @@ -7,6 +7,8 @@ Clang is picky and warns about macros redefinition Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/iz.c | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-networking/recipes-support/macchanger/macchanger/0001-Fix-musl-build.patch b/meta-networking/recipes-support/macchanger/macchanger/0001-Fix-musl-build.patch index d36087d550..5231015701 100644 --- a/meta-networking/recipes-support/macchanger/macchanger/0001-Fix-musl-build.patch +++ b/meta-networking/recipes-support/macchanger/macchanger/0001-Fix-musl-build.patch @@ -11,6 +11,8 @@ Missing data type is defined in <sys/types.h>. Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> --- +Upstream-Status: Pending + src/netinfo.c | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-networking/recipes-support/mctp/mctp_git.bb b/meta-networking/recipes-support/mctp/mctp_1.1.bb index 9e97a6a60a..bf3961be42 100644 --- a/meta-networking/recipes-support/mctp/mctp_git.bb +++ b/meta-networking/recipes-support/mctp/mctp_1.1.bb @@ -5,9 +5,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=4cc91856b08b094b4f406a29dc61db21" -PV = "1.0+git${SRCPV}" - -SRCREV = "ae3a9162d6c5df0fa50abc34fc951dfd0e3d23c5" +SRCREV = "a591ad885aa28f113cb45870b2fd5bce48378d6f" SRC_URI = "git://github.com/CodeConstruct/mctp;branch=main;protocol=https" @@ -23,7 +21,7 @@ PACKAGECONFIG ??= " \ # we'll want to declare the dep and install the service. PACKAGECONFIG[systemd] = ",,systemd,libsystemd" SYSTEMD_SERVICE:${PN} = "mctpd.service mctp.target mctp-local.target" -SYSTEMD_AUTO_ENABLE_${PN} = "enable" +SYSTEMD_AUTO_ENABLE:${PN} = "enable" do_install:append () { if ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'true', 'false', d)}; then diff --git a/meta-networking/recipes-support/mdio-tools/mdio-tools.inc b/meta-networking/recipes-support/mdio-tools/mdio-tools.inc index 7afe1c56bd..46d0c1b4f1 100644 --- a/meta-networking/recipes-support/mdio-tools/mdio-tools.inc +++ b/meta-networking/recipes-support/mdio-tools/mdio-tools.inc @@ -5,4 +5,4 @@ LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://${WORKDIR}/git/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/wkz/mdio-tools.git;protocol=https;branch=master" -SRCREV = "ee47c32d958ae0dcb9900b3b06654a8c08001331" +SRCREV = "0dbfca13a094d20d736153c63161cf11b9ccf2d3" diff --git a/meta-networking/recipes-support/nbdkit/nbdkit/0001-plugins-Avoid-absolute-buildpaths-in-binaries.patch b/meta-networking/recipes-support/nbdkit/nbdkit/0001-plugins-Avoid-absolute-buildpaths-in-binaries.patch new file mode 100644 index 0000000000..75377dfb80 --- /dev/null +++ b/meta-networking/recipes-support/nbdkit/nbdkit/0001-plugins-Avoid-absolute-buildpaths-in-binaries.patch @@ -0,0 +1,38 @@ +From 1ccbd8fdbd2e367a702e48c8703b2f010d067b23 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 22 May 2023 18:16:24 -0700 +Subject: [PATCH] plugins: Avoid absolute buildpaths in binaries + +plugins seems to add CC to the plugins shared objects via compiler +cmdline which ends up in real code. Therefore scrub buildpaths from CC +and CFLAGS before passing them to plugin's build. + +Upstream-Status: Submitted [https://gitlab.com/nbdkit/nbdkit/-/merge_requests/30] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + plugins/cc/Makefile.am | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/plugins/cc/Makefile.am b/plugins/cc/Makefile.am +index df8b5d15..80586a17 100644 +--- a/plugins/cc/Makefile.am ++++ b/plugins/cc/Makefile.am +@@ -44,9 +44,12 @@ nbdkit_cc_plugin_la_SOURCES = \ + $(top_srcdir)/include/nbdkit-plugin.h \ + $(NULL) + ++workdir := $(shell dirname $(abs_top_builddir)) ++cc_no_sysroot := $(shell echo \"$(CC)\"|sed -e 's#$(workdir)#<WORKDIR>#g') ++cflags_no_sysroot := $(shell echo \"$(CFLAGS)\"|sed -e 's#$(workdir)#<WORKDIR>#g') + nbdkit_cc_plugin_la_CPPFLAGS = \ +- -DCC="\"$(CC)\"" \ +- -DCFLAGS="\"$(CFLAGS)\"" \ ++ -DCC=\"$(cc_no_sysroot)\" \ ++ -DCFLAGS=\"$(cflags_no_sysroot)\" \ + -I$(top_srcdir)/include \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/common/include \ +-- +2.40.1 + diff --git a/meta-networking/recipes-support/nbdkit/nbdkit/0001-server-Fix-build-when-printf-is-a-macro.patch b/meta-networking/recipes-support/nbdkit/nbdkit/0001-server-Fix-build-when-printf-is-a-macro.patch deleted file mode 100644 index c7ec41eb9a..0000000000 --- a/meta-networking/recipes-support/nbdkit/nbdkit/0001-server-Fix-build-when-printf-is-a-macro.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 28f07715ab4d670ce81e12776bbece043305bd83 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 11 Apr 2020 15:08:39 -0700 -Subject: [PATCH] server: Fix build when printf is a macro - -clang complains on x86 when building - -main.c:116:2: error: embedding a #include directive within macro arguments is not supported - ^ - -convert nesting include into a string assignment, to same effect but -making it compatible with clang as well - -Upstream-Status: Submitted [https://github.com/libguestfs/nbdkit/pull/3] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - server/main.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/server/main.c b/server/main.c -index 748122f..c0ac874 100644 ---- a/server/main.c -+++ b/server/main.c -@@ -112,9 +112,10 @@ static void - usage (void) - { - /* --{short,long}-options remain undocumented */ -- printf ( -+ char const *opt_list = - #include "synopsis.c" -- ); -+ ; -+ printf ("%s\n", opt_list); - printf ("\n" - "Please read the nbdkit(1) manual page for full usage.\n"); - } --- -2.26.0 - diff --git a/meta-networking/recipes-support/nbdkit/nbdkit_1.33.7.bb b/meta-networking/recipes-support/nbdkit/nbdkit_1.33.11.bb index 2af649cb45..cdf2677f13 100644 --- a/meta-networking/recipes-support/nbdkit/nbdkit_1.33.7.bb +++ b/meta-networking/recipes-support/nbdkit/nbdkit_1.33.11.bb @@ -7,11 +7,11 @@ nbdkit is a toolkit for creating NBD servers." HOMEPAGE = "https://github.com/libguestfs/nbdkit" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f9dcc2d8acdde215fa4bd6ac12bb14f0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=26250adec854bc317493f6fb98efe049" SRC_URI = "git://github.com/libguestfs/nbdkit.git;protocol=https;branch=master \ -" -SRCREV = "a5f804180240aea7031470cb8ed294f904268f0a" + file://0001-plugins-Avoid-absolute-buildpaths-in-binaries.patch" +SRCREV = "6c02c6a469d62a047f230b0ccf03f72328312d2b" S = "${WORKDIR}/git" diff --git a/meta-networking/recipes-support/ncp/libowfat/0001-replace-__pure__-with-compiler-attribute-pure.patch b/meta-networking/recipes-support/ncp/libowfat/0001-replace-__pure__-with-compiler-attribute-pure.patch index 3ad3b4aa8d..880d80b106 100644 --- a/meta-networking/recipes-support/ncp/libowfat/0001-replace-__pure__-with-compiler-attribute-pure.patch +++ b/meta-networking/recipes-support/ncp/libowfat/0001-replace-__pure__-with-compiler-attribute-pure.patch @@ -5,7 +5,7 @@ Subject: [PATCH] replace __pure__ with compiler attribute 'pure' Remove defining __deprecated__ -Upstream-Status: OE-Specific [Untested with dietlibc] +Upstream-Status: Inappropriate [Untested with dietlibc] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- byte.h | 22 ++++++---- diff --git a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.6.bb b/meta-networking/recipes-support/ndisc6/ndisc6_1.0.7.bb index 6861314a0a..a5b9bd08b2 100644 --- a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.6.bb +++ b/meta-networking/recipes-support/ndisc6/ndisc6_1.0.7.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.remlab.net/ndisc6/" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRCREV = "7e314b23329f9c24c4c097b8513673fed7e7158a" +SRCREV = "c308ba5370d66acc44d411f12d59af61d522b91a" 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 \ " diff --git a/meta-networking/recipes-support/netsniff-ng/files/0001-Cmds-automatically-create-folder.patch b/meta-networking/recipes-support/netsniff-ng/files/0001-Cmds-automatically-create-folder.patch index e535aedf51..490990d29d 100644 --- a/meta-networking/recipes-support/netsniff-ng/files/0001-Cmds-automatically-create-folder.patch +++ b/meta-networking/recipes-support/netsniff-ng/files/0001-Cmds-automatically-create-folder.patch @@ -4,6 +4,8 @@ Date: Mon, 14 Feb 2022 18:37:22 +0100 Subject: [PATCH] Cmds: automatically create folder --- +Upstream-Status: Pending + Cmds | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/ntopng/files/CVE-2021-36082.patch b/meta-networking/recipes-support/ntopng/files/CVE-2021-36082.patch deleted file mode 100644 index 8fdd62d186..0000000000 --- a/meta-networking/recipes-support/ntopng/files/CVE-2021-36082.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 1ec621c85b9411cc611652fd57a892cfef478af3 Mon Sep 17 00:00:00 2001 -From: Luca Deri <deri@ntop.org> -Date: Sat, 15 May 2021 19:53:46 +0200 -Subject: [PATCH] Added further checks - -Upstream-Status: Backport [https://github.com/ntop/nDPI/commit/1ec621c85b9411cc611652fd57a892cfef478af3] -CVE: CVE-2021-36082 - -Signed-off-by: Changqing Li <changqing.li@windriver.com> - ---- - src/lib/protocols/netbios.c | 2 +- - src/lib/protocols/tls.c | 32 +++++++++++++++++--------------- - 2 files changed, 18 insertions(+), 16 deletions(-) - -diff --git a/src/lib/protocols/netbios.c b/src/lib/protocols/netbios.c -index 1f3850cb..0d3b705f 100644 ---- a/src/lib/protocols/netbios.c -+++ b/src/lib/protocols/netbios.c -@@ -42,7 +42,7 @@ int ndpi_netbios_name_interpret(char *in, size_t inlen, char *out, u_int out_len - int ret = 0, len, idx = inlen; - char *b; - -- len = (*in++)/2; -+ len = (*in++)/2, inlen--; - b = out; - *out = 0; - -diff --git a/src/lib/protocols/tls.c b/src/lib/protocols/tls.c -index 5b572cae..c115ac08 100644 ---- a/src/lib/protocols/tls.c -+++ b/src/lib/protocols/tls.c -@@ -994,21 +994,23 @@ int processClientServerHello(struct ndpi_detection_module_struct *ndpi_struct, - i += 4 + extension_len, offset += 4 + extension_len; - } - -- ja3_str_len = snprintf(ja3_str, sizeof(ja3_str), "%u,", ja3.tls_handshake_version); -+ ja3_str_len = snprintf(ja3_str, JA3_STR_LEN, "%u,", ja3.tls_handshake_version); - -- for(i=0; i<ja3.num_cipher; i++) { -- rc = snprintf(&ja3_str[ja3_str_len], sizeof(ja3_str)-ja3_str_len, "%s%u", (i > 0) ? "-" : "", ja3.cipher[i]); -+ for(i=0; (i<ja3.num_cipher) && (JA3_STR_LEN > ja3_str_len); i++) { -+ rc = snprintf(&ja3_str[ja3_str_len], JA3_STR_LEN-ja3_str_len, "%s%u", (i > 0) ? "-" : "", ja3.cipher[i]); - - if(rc <= 0) break; else ja3_str_len += rc; - } - -- rc = snprintf(&ja3_str[ja3_str_len], sizeof(ja3_str)-ja3_str_len, ","); -- if(rc > 0 && ja3_str_len + rc < JA3_STR_LEN) ja3_str_len += rc; -+ if(JA3_STR_LEN > ja3_str_len) { -+ rc = snprintf(&ja3_str[ja3_str_len], JA3_STR_LEN-ja3_str_len, ","); -+ if(rc > 0 && ja3_str_len + rc < JA3_STR_LEN) ja3_str_len += rc; -+ } - - /* ********** */ - -- for(i=0; i<ja3.num_tls_extension; i++) { -- int rc = snprintf(&ja3_str[ja3_str_len], sizeof(ja3_str)-ja3_str_len, "%s%u", (i > 0) ? "-" : "", ja3.tls_extension[i]); -+ for(i=0; (i<ja3.num_tls_extension) && (JA3_STR_LEN-ja3_str_len); i++) { -+ int rc = snprintf(&ja3_str[ja3_str_len], JA3_STR_LEN-ja3_str_len, "%s%u", (i > 0) ? "-" : "", ja3.tls_extension[i]); - - if(rc <= 0) break; else ja3_str_len += rc; - } -@@ -1443,41 +1445,41 @@ int processClientServerHello(struct ndpi_detection_module_struct *ndpi_struct, - int rc; - - compute_ja3c: -- ja3_str_len = snprintf(ja3_str, sizeof(ja3_str), "%u,", ja3.tls_handshake_version); -+ ja3_str_len = snprintf(ja3_str, JA3_STR_LEN, "%u,", ja3.tls_handshake_version); - - for(i=0; i<ja3.num_cipher; i++) { -- rc = snprintf(&ja3_str[ja3_str_len], sizeof(ja3_str)-ja3_str_len, "%s%u", -+ rc = snprintf(&ja3_str[ja3_str_len], JA3_STR_LEN-ja3_str_len, "%s%u", - (i > 0) ? "-" : "", ja3.cipher[i]); - if(rc > 0 && ja3_str_len + rc < JA3_STR_LEN) ja3_str_len += rc; else break; - } - -- rc = snprintf(&ja3_str[ja3_str_len], sizeof(ja3_str)-ja3_str_len, ","); -+ rc = snprintf(&ja3_str[ja3_str_len], JA3_STR_LEN-ja3_str_len, ","); - if(rc > 0 && ja3_str_len + rc < JA3_STR_LEN) ja3_str_len += rc; - - /* ********** */ - - for(i=0; i<ja3.num_tls_extension; i++) { -- rc = snprintf(&ja3_str[ja3_str_len], sizeof(ja3_str)-ja3_str_len, "%s%u", -+ rc = snprintf(&ja3_str[ja3_str_len], JA3_STR_LEN-ja3_str_len, "%s%u", - (i > 0) ? "-" : "", ja3.tls_extension[i]); - if(rc > 0 && ja3_str_len + rc < JA3_STR_LEN) ja3_str_len += rc; else break; - } - -- rc = snprintf(&ja3_str[ja3_str_len], sizeof(ja3_str)-ja3_str_len, ","); -+ rc = snprintf(&ja3_str[ja3_str_len], JA3_STR_LEN-ja3_str_len, ","); - if(rc > 0 && ja3_str_len + rc < JA3_STR_LEN) ja3_str_len += rc; - - /* ********** */ - - for(i=0; i<ja3.num_elliptic_curve; i++) { -- rc = snprintf(&ja3_str[ja3_str_len], sizeof(ja3_str)-ja3_str_len, "%s%u", -+ rc = snprintf(&ja3_str[ja3_str_len], JA3_STR_LEN-ja3_str_len, "%s%u", - (i > 0) ? "-" : "", ja3.elliptic_curve[i]); - if(rc > 0 && ja3_str_len + rc < JA3_STR_LEN) ja3_str_len += rc; else break; - } - -- rc = snprintf(&ja3_str[ja3_str_len], sizeof(ja3_str)-ja3_str_len, ","); -+ rc = snprintf(&ja3_str[ja3_str_len], JA3_STR_LEN-ja3_str_len, ","); - if(rc > 0 && ja3_str_len + rc < JA3_STR_LEN) ja3_str_len += rc; - - for(i=0; i<ja3.num_elliptic_curve_point_format; i++) { -- rc = snprintf(&ja3_str[ja3_str_len], sizeof(ja3_str)-ja3_str_len, "%s%u", -+ rc = snprintf(&ja3_str[ja3_str_len], JA3_STR_LEN-ja3_str_len, "%s%u", - (i > 0) ? "-" : "", ja3.elliptic_curve_point_format[i]); - if(rc > 0 && ja3_str_len + rc < JA3_STR_LEN) ja3_str_len += rc; else break; - } --- -2.17.1 - diff --git a/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb b/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb index dca929b574..110ca36866 100644 --- a/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb +++ b/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb @@ -6,7 +6,7 @@ usability, and features." SECTION = "console/network" -DEPENDS = "curl libmaxminddb libpcap lua mariadb ndpi json-c rrdtool zeromq" +DEPENDS = "curl hiredis libmaxminddb libpcap lua mariadb ndpi json-c rrdtool zeromq" RDEPENDS:${PN} = "bash redis" LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" diff --git a/meta-networking/recipes-support/ntp/ntp/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch b/meta-networking/recipes-support/ntp/ntp/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch index 372938c6d6..d61a6e70b8 100644 --- a/meta-networking/recipes-support/ntp/ntp/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch +++ b/meta-networking/recipes-support/ntp/ntp/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch @@ -10,23 +10,24 @@ or 64Kb set by ntp should be good in glibc these days. Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- libntp/work_thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libntp/work_thread.c b/libntp/work_thread.c -index 03a5647..3ddd751 100644 +index c1fe5c2..21db4a0 100644 --- a/libntp/work_thread.c +++ b/libntp/work_thread.c -@@ -41,7 +41,7 @@ - #ifndef THREAD_MINSTACKSIZE - # define THREAD_MINSTACKSIZE (64U * 1024) - #endif --#ifndef __sun -+#if !defined(__sun) && !defined(__GLIBC__) - #if defined(PTHREAD_STACK_MIN) && THREAD_MINSTACKSIZE < PTHREAD_STACK_MIN - # undef THREAD_MINSTACKSIZE - # define THREAD_MINSTACKSIZE PTHREAD_STACK_MIN +@@ -598,7 +598,7 @@ start_blocking_thread_internal( + /* now clamp on lower stack limit. */ + if (nstacksize < THREAD_MINSTACKSIZE) + nstacksize = THREAD_MINSTACKSIZE; +-# ifdef PTHREAD_STACK_MIN ++# ifdef PTHREAD_STACK_MIN && !defined(__GLIBC__) + if (nstacksize < PTHREAD_STACK_MIN) + nstacksize = PTHREAD_STACK_MIN; + # endif -- -2.32.0 +2.34.1 diff --git a/meta-networking/recipes-support/ntp/ntp/0001-test-Fix-build-with-new-compiler-defaults-to-fno-com.patch b/meta-networking/recipes-support/ntp/ntp/0001-test-Fix-build-with-new-compiler-defaults-to-fno-com.patch index 42e1efd8be..24019e974b 100644 --- a/meta-networking/recipes-support/ntp/ntp/0001-test-Fix-build-with-new-compiler-defaults-to-fno-com.patch +++ b/meta-networking/recipes-support/ntp/ntp/0001-test-Fix-build-with-new-compiler-defaults-to-fno-com.patch @@ -5,12 +5,12 @@ Subject: [PATCH] test: Fix build with new compiler defaults to -fno-common Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- sntp/tests/run-packetHandling.c | 2 +- sntp/tests/run-t-log.c | 2 +- sntp/tests/run-utilities.c | 2 +- - tests/libntp/test-libntp.h | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sntp/tests/run-packetHandling.c b/sntp/tests/run-packetHandling.c index 7790b20..c58380c 100644 @@ -51,16 +51,6 @@ index f717882..98d9bf1 100644 //=======MAIN===== -diff --git a/tests/libntp/test-libntp.h b/tests/libntp/test-libntp.h -index 93050b3..60461d8 100644 ---- a/tests/libntp/test-libntp.h -+++ b/tests/libntp/test-libntp.h -@@ -5,4 +5,4 @@ - - time_t timefunc(time_t *ptr); - void settime(int y, int m, int d, int H, int M, int S); --time_t nowtime; -+extern time_t nowtime; -- -2.32.0 +2.34.1 diff --git a/meta-networking/recipes-support/ntp/ntp/ntp-4.2.4_p6-nano.patch b/meta-networking/recipes-support/ntp/ntp/ntp-4.2.4_p6-nano.patch index d45b7e38b7..d8e0ad3309 100644 --- a/meta-networking/recipes-support/ntp/ntp/ntp-4.2.4_p6-nano.patch +++ b/meta-networking/recipes-support/ntp/ntp/ntp-4.2.4_p6-nano.patch @@ -3,6 +3,8 @@ From: Koen Kooi <koen@dominion.thruhere.net> Date: Wed, 12 Jan 2011 21:38:46 +0100 --- +Upstream-Status: Pending + include/ntp_syscall.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta-networking/recipes-support/ntp/ntp/ntpd.service b/meta-networking/recipes-support/ntp/ntp/ntpd.service index 0e3d7cd37b..d793db4a78 100644 --- a/meta-networking/recipes-support/ntp/ntp/ntpd.service +++ b/meta-networking/recipes-support/ntp/ntp/ntpd.service @@ -3,9 +3,8 @@ Description=Network Time Service After=network.target [Service] -Type=forking -PIDFile=/run/ntpd.pid -ExecStart=/usr/sbin/ntpd -u ntp:ntp -p /run/ntpd.pid -g +Type=simple +ExecStart=/usr/sbin/ntpd -u ntp:ntp -n -g [Install] WantedBy=multi-user.target diff --git a/meta-networking/recipes-support/ntp/ntp/ntpdate b/meta-networking/recipes-support/ntp/ntp/ntpdate deleted file mode 100755 index be3bacfcd1..0000000000 --- a/meta-networking/recipes-support/ntp/ntp/ntpdate +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh - -PATH=/sbin:/bin:/usr/bin:/usr/sbin - -test -x /usr/sbin/ntpdate || exit 0 - -if test -f /etc/default/ntpdate ; then -. /etc/default/ntpdate -fi - -if [ "$NTPSERVERS" = "" ] ; then - if [ "$METHOD" = "" -a "$1" != "silent" ] ; then - echo "Please set NTPSERVERS in /etc/default/ntpdate" - exit 1 - else - exit 0 - fi -fi - -# This is a heuristic: The idea is that if a static interface is brought -# up, that is a major event, and we can put in some extra effort to fix -# the system time. Feel free to change this, especially if you regularly -# bring up new network interfaces. -if [ "$METHOD" = static ]; then - OPTS="-b" -fi - -if [ "$METHOD" = loopback ]; then - exit 0 -fi - -( - -LOCKFILE=/var/lock/ntpdate - -# Avoid running more than one at a time -if [ -x /usr/bin/lockfile-create ]; then - lockfile-create $LOCKFILE - lockfile-touch $LOCKFILE & - LOCKTOUCHPID="$!" -fi - -if /usr/sbin/ntpdate -s $OPTS $NTPSERVERS 2>/dev/null; then - if [ "$UPDATE_HWCLOCK" = "yes" ]; then - hwclock --systohc || : - fi -fi - -if [ -x /usr/bin/lockfile-create ] ; then - kill $LOCKTOUCHPID - lockfile-remove $LOCKFILE -fi - -) & - -# wait for all subprocesses to finish -# this is required when using systemd service as ntpd will start before ntpdate finishes -# and results in a bind error (port 123) -wait diff --git a/meta-networking/recipes-support/ntp/ntp/ntpdate.default b/meta-networking/recipes-support/ntp/ntp/ntpdate.default deleted file mode 100644 index 486b6e07d3..0000000000 --- a/meta-networking/recipes-support/ntp/ntp/ntpdate.default +++ /dev/null @@ -1,7 +0,0 @@ -# Configuration script used by ntpdate-sync script - -NTPSERVERS="" - -# Set to "yes" to write time to hardware clock on success -UPDATE_HWCLOCK="no" - diff --git a/meta-networking/recipes-support/ntp/ntp/ntpdate.service b/meta-networking/recipes-support/ntp/ntp/ntpdate.service deleted file mode 100644 index 10cbd70f99..0000000000 --- a/meta-networking/recipes-support/ntp/ntp/ntpdate.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Network Time Service (one-shot ntpdate mode) -Before=ntpd.service - -[Service] -Type=oneshot -ExecStart=/usr/bin/ntpdate-sync silent -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/meta-networking/recipes-support/ntp/ntp/reproducibility-fixed-path-to-posix-shell.patch b/meta-networking/recipes-support/ntp/ntp/reproducibility-fixed-path-to-posix-shell.patch index 571db75f7c..036c61a78f 100644 --- a/meta-networking/recipes-support/ntp/ntp/reproducibility-fixed-path-to-posix-shell.patch +++ b/meta-networking/recipes-support/ntp/ntp/reproducibility-fixed-path-to-posix-shell.patch @@ -1,9 +1,19 @@ ---- ntp-4.2.8p12.original/sntp/libopts/m4/libopts.m4 2018-11-12 17:54:57.747220846 +1300 -+++ ntp-4.2.8p12/sntp/libopts/m4/libopts.m4 2018-11-12 18:00:50.626211641 +1300 -@@ -114,12 +114,6 @@ +reproducibility fixed path to posixshell +--- +Upstream-Status: Pending + + sntp/libopts/m4/libopts.m4 | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/sntp/libopts/m4/libopts.m4 b/sntp/libopts/m4/libopts.m4 +index 23738ca..4e18187 100644 +--- a/sntp/libopts/m4/libopts.m4 ++++ b/sntp/libopts/m4/libopts.m4 +@@ -107,13 +107,6 @@ 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` @@ -13,3 +23,6 @@ POSIX_SHELL=`/bin/sh -c ' exec 2>/dev/null if ! true ; then exit 1 ; fi +-- +2.34.1 + diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb b/meta-networking/recipes-support/ntp/ntp_4.2.8p17.bb index 2ae53dc640..e80ea4c149 100644 --- a/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb +++ b/meta-networking/recipes-support/ntp/ntp_4.2.8p17.bb @@ -6,7 +6,7 @@ or satellite receiver or modem." HOMEPAGE = "http://support.ntp.org" SECTION = "net" LICENSE = "NTP" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4190b39435611e92a4da74e682623f19" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3a8ffebbcad335abf2c39fec38671eec" DEPENDS = "libevent" @@ -18,22 +18,19 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g file://0001-sntp-Fix-types-in-check-for-pthread_detach.patch \ file://ntpd \ file://ntp.conf \ - file://ntpdate \ - file://ntpdate.default \ - file://ntpdate.service \ file://ntpd.service \ file://sntp.service \ file://sntp \ file://ntpd.list \ " -SRC_URI[sha256sum] = "f65840deab68614d5d7ceb2d0bb9304ff70dcdedd09abb79754a87536b849c19" +SRC_URI[sha256sum] = "103dd272e6a66c5b8df07dce5e9a02555fcd6f1397bdfb782237328e89d3a866" -# CVE-2016-9312 is only for windows. -# The other CVEs are not correctly identified because cve-check -# is not able to check the version correctly (it only checks for 4.2.8 omitting p15 that makes the difference) -CVE_CHECK_IGNORE += "\ - CVE-2016-9312 \ +CVE_STATUS[CVE-2016-9312] = "not-applicable-platform: Issue only applies on Windows" +CVE_STATUS[CVE-2019-11331] = "upstream-wontfix: inherent to RFC 5905 and cannot be fixed without breaking compatibility" +CVE_STATUS_GROUPS += "CVE_STATUS_NTP" +CVE_STATUS_NTP[status] = "fixed-version: Yocto CVE check can not handle 'p' in ntp version" +CVE_STATUS_NTP = " \ CVE-2015-5146 \ CVE-2015-5300 \ CVE-2015-7975 \ @@ -95,18 +92,15 @@ do_install:append() { install -d ${D}${sysconfdir}/init.d install -m 644 ${WORKDIR}/ntp.conf ${D}${sysconfdir} install -m 755 ${WORKDIR}/ntpd ${D}${sysconfdir}/init.d - install -d ${D}${bindir} - install -m 755 ${WORKDIR}/ntpdate ${D}${bindir}/ntpdate-sync install -m 755 -d ${D}${NTP_USER_HOME} chown ntp:ntp ${D}${NTP_USER_HOME} # Fix hardcoded paths in scripts - sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync - sed -i 's!/usr/bin/!${bindir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync - sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync - sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync - sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${bindir}/ntpdate-sync + sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/ntpd + sed -i 's!/usr/bin/!${bindir}/!g' ${D}${sysconfdir}/init.d/ntpd + sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/ntpd + sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/ntpd sed -i '1s,#!.*perl -w,#! ${bindir}/env perl,' ${D}${sbindir}/ntptrace sed -i '/use/i use warnings;' ${D}${sbindir}/ntptrace sed -i '1s,#!.*perl,#! ${bindir}/env perl,' ${D}${sbindir}/ntp-wait @@ -115,26 +109,21 @@ do_install:append() { sed -i '/use/i use warnings;' ${D}${sbindir}/calc_tickadj install -d ${D}/${sysconfdir}/default - install -m 644 ${WORKDIR}/ntpdate.default ${D}${sysconfdir}/default/ntpdate install -m 0644 ${WORKDIR}/sntp ${D}${sysconfdir}/default/ - install -d ${D}/${sysconfdir}/network/if-up.d - ln -s ${bindir}/ntpdate-sync ${D}/${sysconfdir}/network/if-up.d - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/ntpdate.service ${D}${systemd_unitdir}/system/ install -m 0644 ${WORKDIR}/ntpd.service ${D}${systemd_unitdir}/system/ install -m 0644 ${WORKDIR}/sntp.service ${D}${systemd_unitdir}/system/ install -d ${D}${systemd_unitdir}/ntp-units.d install -m 0644 ${WORKDIR}/ntpd.list ${D}${systemd_unitdir}/ntp-units.d/60-ntpd.list - # Remove an empty libexecdir. + # Remove the empty libexecdir and bindir. rmdir --ignore-fail-on-non-empty ${D}${libexecdir} + rmdir --ignore-fail-on-non-empty ${D}${bindir} } -PACKAGES += "ntpdate sntp ntpdc ntpq ${PN}-tickadj ${PN}-utils" -# NOTE: you don't need ntpdate, use "ntpd -q -g -x" +PACKAGES += "sntp ntpdc ntpq ${PN}-tickadj ${PN}-utils" # ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms # with wonky clocks (e.g. OpenSlug) @@ -149,9 +138,8 @@ RCONFLICTS:${PN}-utils = "${PN}-bin" # ntpdc and ntpq were split out of ntp-utils RDEPENDS:${PN}-utils = "ntpdc ntpq" -SYSTEMD_PACKAGES = "${PN} ntpdate sntp" +SYSTEMD_PACKAGES = "${PN} sntp" SYSTEMD_SERVICE:${PN} = "ntpd.service" -SYSTEMD_SERVICE:ntpdate = "ntpdate.service" SYSTEMD_SERVICE:sntp = "sntp.service" SYSTEMD_AUTO_ENABLE:sntp = "disable" @@ -159,10 +147,6 @@ RPROVIDES:${PN} += "${PN}-systemd" RREPLACES:${PN} += "${PN}-systemd" RCONFLICTS:${PN} += "${PN}-systemd" -RPROVIDES:ntpdate += "ntpdate-systemd" -RREPLACES:ntpdate += "ntpdate-systemd" -RCONFLICTS:ntpdate += "ntpdate-systemd" - RSUGGESTS:${PN} = "iana-etc" FILES:${PN} = "${sbindir}/ntpd.ntp ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd \ @@ -172,12 +156,6 @@ FILES:${PN} = "${sbindir}/ntpd.ntp ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/n FILES:${PN}-tickadj = "${sbindir}/tickadj" FILES:${PN}-utils = "${sbindir} ${datadir}/ntp/lib" RDEPENDS:${PN}-utils += "perl" -FILES:ntpdate = "${sbindir}/ntpdate \ - ${sysconfdir}/network/if-up.d/ntpdate-sync \ - ${bindir}/ntpdate-sync \ - ${sysconfdir}/default/ntpdate \ - ${systemd_unitdir}/system/ntpdate.service \ -" FILES:sntp = "${sbindir}/sntp \ ${sysconfdir}/default/sntp \ ${systemd_unitdir}/system/sntp.service \ @@ -186,20 +164,11 @@ FILES:ntpdc = "${sbindir}/ntpdc" FILES:ntpq = "${sbindir}/ntpq" CONFFILES:${PN} = "${sysconfdir}/ntp.conf" -CONFFILES:ntpdate = "${sysconfdir}/default/ntpdate" INITSCRIPT_NAME = "ntpd" # No dependencies, so just go in at the standard level (20) INITSCRIPT_PARAMS = "defaults" -pkg_postinst:ntpdate() { - if ! grep -q -s ntpdate $D/var/spool/cron/root; then - echo "adding crontab" - test -d $D/var/spool/cron || mkdir -p $D/var/spool/cron - echo "30 * * * * ${bindir}/ntpdate-sync silent" >> $D/var/spool/cron/root - fi -} - inherit update-alternatives ALTERNATIVE_PRIORITY = "100" diff --git a/meta-networking/recipes-support/ntpsec/ntpsec/0001-wscript-Add-BISONFLAGS-support.patch b/meta-networking/recipes-support/ntpsec/ntpsec/0001-wscript-Add-BISONFLAGS-support.patch index 2e3730df47..fb29fdc47e 100644 --- a/meta-networking/recipes-support/ntpsec/ntpsec/0001-wscript-Add-BISONFLAGS-support.patch +++ b/meta-networking/recipes-support/ntpsec/ntpsec/0001-wscript-Add-BISONFLAGS-support.patch @@ -4,6 +4,8 @@ Date: Thu, 19 Jan 2023 13:00:45 +0000 Subject: [PATCH] wscript: Add BISONFLAGS support --- +Upstream-Status: Pending + wscript | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0002-Use-configure-test-for-struct-timespec.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0002-Use-configure-test-for-struct-timespec.patch index aa5ffde418..c6af3d5ff7 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0002-Use-configure-test-for-struct-timespec.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0002-Use-configure-test-for-struct-timespec.patch @@ -8,6 +8,8 @@ to keep track of what platforms has it. Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> --- +Upstream-Status: Pending + open-vm-tools/configure.ac | 1 + open-vm-tools/lib/include/hgfsUtil.h | 8 +------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0003-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0003-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch index 24279e34a0..4b6e089ace 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0003-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0003-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch @@ -10,6 +10,8 @@ This is needed for musl libc. Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> --- +Upstream-Status: Pending + open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | 8 +++++--- open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c | 3 +-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0004-Use-configure-to-test-for-feature-instead-of-platfor.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0004-Use-configure-to-test-for-feature-instead-of-platfor.patch index 613bba2126..9fe0126d30 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0004-Use-configure-to-test-for-feature-instead-of-platfor.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0004-Use-configure-to-test-for-feature-instead-of-platfor.patch @@ -23,6 +23,8 @@ Refit patch of open-vm-tools/lib/nicInfo/nicInfoPosix.c Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> Signed-off-by: Randy MacLeod <randy.macleod@windriver.com> --- +Upstream-Status: Pending + open-vm-tools/configure.ac | 4 ++++ open-vm-tools/lib/misc/idLinux.c | 30 +++++++++++------------- open-vm-tools/lib/nicInfo/nicInfoPosix.c | 6 ++++- diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-test-for-sys-stat.h-include.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-test-for-sys-stat.h-include.patch index b52f242481..ec9aa7d2ed 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-test-for-sys-stat.h-include.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-test-for-sys-stat.h-include.patch @@ -7,6 +7,8 @@ This is needed for musl libc. Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> --- +Upstream-Status: Pending + open-vm-tools/services/plugins/vix/vixTools.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0006-Fix-subdir-objects-configure-error.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0006-Fix-subdir-objects-configure-error.patch index cb30966afe..e83fb36214 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0006-Fix-subdir-objects-configure-error.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0006-Fix-subdir-objects-configure-error.patch @@ -7,6 +7,8 @@ Fix build on musl while here Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + open-vm-tools/configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0007-include-poll.h-instead-of-sys-poll.h.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0007-include-poll.h-instead-of-sys-poll.h.patch index ff5fee6d4e..7eac04ab56 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0007-include-poll.h-instead-of-sys-poll.h.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0007-include-poll.h-instead-of-sys-poll.h.patch @@ -7,6 +7,8 @@ including sys/poll.h is deprecated Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + open-vm-tools/lib/asyncsocket/asyncsocket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0008-Rename-poll.h-to-vm_poll.h.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0008-Rename-poll.h-to-vm_poll.h.patch index b3906e827a..d9000b4f13 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0008-Rename-poll.h-to-vm_poll.h.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0008-Rename-poll.h-to-vm_poll.h.patch @@ -17,6 +17,8 @@ Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> --- +Upstream-Status: Pending + open-vm-tools/lib/asyncsocket/asyncsocket.c | 2 +- open-vm-tools/lib/hgfsServer/hgfsServer.c | 2 +- open-vm-tools/lib/include/asyncsocket.h | 2 +- diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0009-use-posix-strerror_r-unless-on-gnu-libc-system.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0009-use-posix-strerror_r-unless-on-gnu-libc-system.patch index 9ae1a8e6b8..9800194920 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0009-use-posix-strerror_r-unless-on-gnu-libc-system.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0009-use-posix-strerror_r-unless-on-gnu-libc-system.patch @@ -5,6 +5,8 @@ Subject: [PATCH] use posix strerror_r unless on gnu libc system Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + open-vm-tools/lib/err/errPosix.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0010-Use-uintmax_t-for-handling-rlim_t.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0010-Use-uintmax_t-for-handling-rlim_t.patch index 36d0c641ae..d3c9149f77 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0010-Use-uintmax_t-for-handling-rlim_t.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0010-Use-uintmax_t-for-handling-rlim_t.patch @@ -13,6 +13,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> --- +Upstream-Status: Pending + open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/CVE-2023-20867.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/CVE-2023-20867.patch new file mode 100644 index 0000000000..170dddf688 --- /dev/null +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/CVE-2023-20867.patch @@ -0,0 +1,163 @@ +From 3028cdd4c0b2461b904cbe5a5868c8e591aa0941 Mon Sep 17 00:00:00 2001 +From: John Wolfe <jwolfe@vmware.com> +Date: Mon, 8 May 2023 19:04:57 -0700 +Subject: [PATCH] Remove some dead code. + +Address CVE-2023-20867. +Remove some authentication types which were deprecated long +ago and are no longer in use. These are dead code. + +CVE: CVE-2023-20867 + +Upstream-Status: Backport +[https://github.com/vmware/open-vm-tools/blob/CVE-2023-20867.patch/2023-20867-Remove-some-dead-code.patch] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + open-vm-tools/services/plugins/vix/vixTools.c | 102 -------------------------- + 1 file changed, 102 deletions(-) + +diff --git a/open-vm-tools/services/plugins/vix/vixTools.c b/open-vm-tools/services/plugins/vix/vixTools.c +index 9f376a7..85c5ba7 100644 +--- a/open-vm-tools/services/plugins/vix/vixTools.c ++++ b/open-vm-tools/services/plugins/vix/vixTools.c +@@ -254,8 +254,6 @@ char *gImpersonatedUsername = NULL; + #define VIX_TOOLS_CONFIG_API_AUTHENTICATION "Authentication" + #define VIX_TOOLS_CONFIG_AUTHTYPE_AGENTS "InfrastructureAgents" + +-#define VIX_TOOLS_CONFIG_INFRA_AGENT_DISABLED_DEFAULT TRUE +- + /* + * The switch that controls all APIs + */ +@@ -730,9 +728,6 @@ VixError GuestAuthSAMLAuthenticateAndImpersonate( + + void GuestAuthUnimpersonate(); + +-static Bool VixToolsCheckIfAuthenticationTypeEnabled(GKeyFile *confDictRef, +- const char *typeName); +- + #if SUPPORT_VGAUTH + + VGAuthError TheVGAuthContext(VGAuthContext **ctx); +@@ -8013,29 +8008,6 @@ VixToolsImpersonateUser(VixCommandRequestHeader *requestMsg, // IN + userToken); + break; + } +- case VIX_USER_CREDENTIAL_ROOT: +- { +- if ((requestMsg->requestFlags & VIX_REQUESTMSG_HAS_HASHED_SHARED_SECRET) && +- !VixToolsCheckIfAuthenticationTypeEnabled(gConfDictRef, +- VIX_TOOLS_CONFIG_AUTHTYPE_AGENTS)) { +- /* +- * Don't accept hashed shared secret if disabled. +- */ +- g_message("%s: Requested authentication type has been disabled.\n", +- __FUNCTION__); +- err = VIX_E_GUEST_AUTHTYPE_DISABLED; +- goto done; +- } +- } +- // fall through +- +- case VIX_USER_CREDENTIAL_CONSOLE_USER: +- err = VixToolsImpersonateUserImplEx(NULL, +- credentialType, +- NULL, +- loadUserProfile, +- userToken); +- break; + case VIX_USER_CREDENTIAL_NAME_PASSWORD: + case VIX_USER_CREDENTIAL_NAME_PASSWORD_OBFUSCATED: + case VIX_USER_CREDENTIAL_NAMED_INTERACTIVE_USER: +@@ -8205,36 +8177,6 @@ VixToolsImpersonateUserImplEx(char const *credentialTypeStr, // IN + } + + /* +- * If the VMX asks to be root, then we allow them. +- * The VMX will make sure that only it will pass this value in, +- * and only when the VM and host are configured to allow this. +- */ +- if ((VIX_USER_CREDENTIAL_ROOT == credentialType) +- && (thisProcessRunsAsRoot)) { +- *userToken = PROCESS_CREATOR_USER_TOKEN; +- +- gImpersonatedUsername = Util_SafeStrdup("_ROOT_"); +- err = VIX_OK; +- goto quit; +- } +- +- /* +- * If the VMX asks to be root, then we allow them. +- * The VMX will make sure that only it will pass this value in, +- * and only when the VM and host are configured to allow this. +- * +- * XXX This has been deprecated XXX +- */ +- if ((VIX_USER_CREDENTIAL_CONSOLE_USER == credentialType) +- && ((allowConsoleUserOps) || !(thisProcessRunsAsRoot))) { +- *userToken = PROCESS_CREATOR_USER_TOKEN; +- +- gImpersonatedUsername = Util_SafeStrdup("_CONSOLE_USER_NAME_"); +- err = VIX_OK; +- goto quit; +- } +- +- /* + * If the VMX asks us to run commands in the context of the current + * user, make sure that the user who requested the command is the + * same as the current user. +@@ -10917,50 +10859,6 @@ VixToolsCheckIfVixCommandEnabled(int opcode, // IN + /* + *----------------------------------------------------------------------------- + * +- * VixToolsCheckIfAuthenticationTypeEnabled -- +- * +- * Checks to see if a given authentication type has been +- * disabled via the tools configuration. +- * +- * Return value: +- * TRUE if enabled, FALSE otherwise. +- * +- * Side effects: +- * None +- * +- *----------------------------------------------------------------------------- +- */ +- +-static Bool +-VixToolsCheckIfAuthenticationTypeEnabled(GKeyFile *confDictRef, // IN +- const char *typeName) // IN +-{ +- char authnDisabledName[64]; // Authentication.<AuthenticationType>.disabled +- gboolean disabled; +- +- Str_Snprintf(authnDisabledName, sizeof(authnDisabledName), +- VIX_TOOLS_CONFIG_API_AUTHENTICATION ".%s.disabled", +- typeName); +- +- ASSERT(confDictRef != NULL); +- +- /* +- * XXX Skip doing the strcmp() to verify the auth type since we only +- * have the one typeName (VIX_TOOLS_CONFIG_AUTHTYPE_AGENTS), and default +- * it to VIX_TOOLS_CONFIG_INFRA_AGENT_DISABLED_DEFAULT. +- */ +- disabled = VMTools_ConfigGetBoolean(confDictRef, +- VIX_TOOLS_CONFIG_API_GROUPNAME, +- authnDisabledName, +- VIX_TOOLS_CONFIG_INFRA_AGENT_DISABLED_DEFAULT); +- +- return !disabled; +-} +- +- +-/* +- *----------------------------------------------------------------------------- +- * + * VixTools_ProcessVixCommand -- + * + * +-- +2.6.2 + diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.1.5.bb b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.1.5.bb index d389d2450c..e12e4be7f8 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.1.5.bb +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.1.5.bb @@ -43,6 +43,7 @@ SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stabl file://0012-hgfsServerLinux-Consider-64bit-time_t-possibility.patch;patchdir=.. \ file://0013-open-vm-tools-Correct-include-path-for-poll.h.patch;patchdir=.. \ file://0001-timeSync-Portable-way-to-print-64bit-time_t.patch;patchdir=.. \ + file://CVE-2023-20867.patch;patchdir=.. \ " UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P<pver>\d+(\.\d+)+)" diff --git a/meta-networking/recipes-support/openvpn/openvpn_2.5.8.bb b/meta-networking/recipes-support/openvpn/openvpn_2.6.3.bb index b2783d9928..a5fc158749 100644 --- a/meta-networking/recipes-support/openvpn/openvpn_2.5.8.bb +++ b/meta-networking/recipes-support/openvpn/openvpn_2.6.3.bb @@ -2,8 +2,8 @@ SUMMARY = "A full-featured SSL VPN solution via tun device." HOMEPAGE = "https://openvpn.net/" SECTION = "net" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b76abd82c14ee01cc34c4ff5e3627b89" -DEPENDS = "lzo openssl iproute2 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +LIC_FILES_CHKSUM = "file://COPYING;md5=3170e982baae61dbb8de963317d1ac94" +DEPENDS = "lzo lz4 openssl iproute2 libcap-ng ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" inherit autotools systemd update-rc.d pkgconfig @@ -14,10 +14,9 @@ SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \ UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads" -SRC_URI[sha256sum] = "a6f315b7231d44527e65901ff646f87d7f07862c87f33531daa109fb48c53db2" +SRC_URI[sha256sum] = "13b207a376d8880507c74ff78aabc3778a9da47c89f1e247dcee3c7237138ff6" -# CVE-2020-7224 and CVE-2020-27569 are for Aviatrix OpenVPN client, not for openvpn. -CVE_CHECK_IGNORE += "CVE-2020-7224 CVE-2020-27569" +CVE_STATUS[CVE-2020-27569] = "not-applicable-config: Applies only Aviatrix OpenVPN client, not openvpn" INITSCRIPT_PACKAGES = "${PN}" INITSCRIPT_NAME:${PN} = "openvpn" diff --git a/meta-networking/recipes-support/pgpool2/pgpool2/0001-Fix-build-error-when-build-this-file.patch b/meta-networking/recipes-support/pgpool2/pgpool2/0001-Fix-build-error-when-build-this-file.patch new file mode 100644 index 0000000000..52bcc3b7e3 --- /dev/null +++ b/meta-networking/recipes-support/pgpool2/pgpool2/0001-Fix-build-error-when-build-this-file.patch @@ -0,0 +1,32 @@ +From f8ab74a76049f69adeebe92c62593547e05a075d Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@fujitsu.com> +Date: Wed, 11 Jan 2023 17:22:41 +0900 +Subject: [PATCH] Fix build error when build this file. + +| snprintf.c:770:64: error: 'PG_STRERROR_R_BUFLEN' undeclared (first use in this function) +| 770 | char errbuf[PG_STRERROR_R_BUFLEN]; +| | ^~~~~~~~~~~~~~~~~~~~ + +PG_STRERROR_R_BUFLEN is defined in postgresql, but pgpool doesn't +include the header of postgresql. + +Upstream-Status: Inappropriate [OE-Specific] +Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> +--- + src/parser/snprintf.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/parser/snprintf.c b/src/parser/snprintf.c +index 84ebdb2..3387897 100644 +--- a/src/parser/snprintf.c ++++ b/src/parser/snprintf.c +@@ -46,6 +46,7 @@ + #include "pool_parser.h" + #include "stringinfo.h" + #include "utils/palloc.h" ++#include "postgresql/server/port.h" + + /* + * We used to use the platform's NL_ARGMAX here, but that's a bad idea, +-- +2.25.1 diff --git a/meta-networking/recipes-support/pgpool2/pgpool2/0001-pgpool2-Fix-unknown-type-name-fd_set-error-with-musl.patch b/meta-networking/recipes-support/pgpool2/pgpool2/0001-pgpool2-Fix-unknown-type-name-fd_set-error-with-musl.patch new file mode 100644 index 0000000000..26f8afe4d6 --- /dev/null +++ b/meta-networking/recipes-support/pgpool2/pgpool2/0001-pgpool2-Fix-unknown-type-name-fd_set-error-with-musl.patch @@ -0,0 +1,33 @@ +From 5d335b5ddd052f047759cae0e9b94ec49f9f3884 Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@fujitsu.com> +Date: Mon, 20 Mar 2023 02:03:04 +0000 +Subject: [PATCH] pgpool2: Fix unknown type name 'fd_set' error with musl. + +| read.c: In function 'read_until_ready_for_query': +| read.c:53:24: error: storage size of 'timeoutval' isn't known +| 53 | struct timeval timeoutval; +| | ^~~~~~~~~~ +| read.c:54:9: error: unknown type name 'fd_set' +| 54 | fd_set readmask; +| | ^~~~~~ + +Upstream-Status: Inappropriate [embedded specific] +Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> +--- + src/tools/pgproto/read.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/tools/pgproto/read.c b/src/tools/pgproto/read.c +index c7fb548..4efe641 100644 +--- a/src/tools/pgproto/read.c ++++ b/src/tools/pgproto/read.c +@@ -19,6 +19,7 @@ + #include "../../include/config.h" + #include "pgproto/pgproto.h" + #include <unistd.h> ++#include <sys/select.h> + #include <stdlib.h> + #include <stdio.h> + #include <string.h> +-- +2.34.1 diff --git a/meta-networking/recipes-support/pgpool2/pgpool2/pgpool.service b/meta-networking/recipes-support/pgpool2/pgpool2/pgpool.service new file mode 100644 index 0000000000..bf2d323639 --- /dev/null +++ b/meta-networking/recipes-support/pgpool2/pgpool2/pgpool.service @@ -0,0 +1,17 @@ +[Unit] +Description=Pgpool-II +After=syslog.target network.target + +[Service] + +User=postgres +Group=postgres + +EnvironmentFile=-/etc/sysconfig/pgpool + +ExecStart=/usr/bin/pgpool -f /etc/pgpool-II/pgpool.conf $OPTS +ExecStop=/usr/bin/pgpool -f /etc/pgpool-II/pgpool.conf $STOP_OPTS stop +ExecReload=/usr/bin/pgpool -f /etc/pgpool-II/pgpool.conf reload + +[Install] +WantedBy=multi-user.target diff --git a/meta-networking/recipes-support/pgpool2/pgpool2/pgpool.sysconfig b/meta-networking/recipes-support/pgpool2/pgpool2/pgpool.sysconfig new file mode 100644 index 0000000000..ea13089b7b --- /dev/null +++ b/meta-networking/recipes-support/pgpool2/pgpool2/pgpool.sysconfig @@ -0,0 +1,7 @@ +# Options for pgpool + +# -n: don't run in daemon mode. does not detach control tty +# -d: debug mode. lots of debug information will be printed + +#OPTS=" -d -n" +OPTS=" -n" diff --git a/meta-networking/recipes-support/pgpool2/pgpool2_4.4.1.bb b/meta-networking/recipes-support/pgpool2/pgpool2_4.4.1.bb new file mode 100644 index 0000000000..efb563b81a --- /dev/null +++ b/meta-networking/recipes-support/pgpool2/pgpool2_4.4.1.bb @@ -0,0 +1,53 @@ +SUMMARY = "a language independent connection pool server for PostgreSQL." + +DESCRIPTION = "Pgpool-II is a middleware that works between PostgreSQL \ + servers and a PostgreSQL database client. It is distributed \ + under a license similar to BSD and MIT. It provides the \ + following features." + +HOMEPAGE = "http://pgpool.net" + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=e4b38de086d73e0521de0bbdbaa4a1a9" + +SRC_URI = "http://www.pgpool.net/mediawiki/images/pgpool-II-${PV}.tar.gz \ + file://0001-Fix-build-error-when-build-this-file.patch \ + file://0001-pgpool2-Fix-unknown-type-name-fd_set-error-with-musl.patch \ + file://pgpool.sysconfig \ + file://pgpool.service \ + " +SRC_URI[sha256sum] = "4b379bbba8e178128a1cee4a5bd1ae116dedb3da6121b728c18f0f54c881f328" + +S = "${WORKDIR}/pgpool-II-${PV}" + +inherit autotools systemd + +SYSTEMD_SERVICE:${PN} = "pgpool.service" + +PACKAGECONFIG ??= " openssl libmemcached postgresql \ +" +PACKAGECONFIG[pam] = "--with-pam,,libpam" +PACKAGECONFIG[openssl] = "--with-openssl,,openssl" +PACKAGECONFIG[libmemcached] = "--with-memcached=${STAGING_INCDIR}/libmemcachedutil-1.0,,libmemcached" +PACKAGECONFIG[postgresql] = "--with-pgsql-includedir=${STAGING_INCDIR}/postgresql,, postgresql" + +EXTRA_OECONF += "--disable-static \ + --disable-rpath \ + " +B = "${S}" +CFLAGS:append = " -fcommon " + +FILES:${PN} += "${datadir}/pgpool-II/ " + +do_configure:append() { + echo "#define HAVE_STRCHRNUL 1" >> ${S}/src/include/config.h + sed -i "s,#define USE_REPL_SNPRINTF 1,/* #undef USE_REPL_SNPRINTF*/,g" ${S}/src/include/config.h +} + +do_install:append() { + install -d ${D}${sysconfdir}/pgpool-II + install -D -m 0644 ${WORKDIR}/pgpool.sysconfig ${D}${sysconfdir}/pgpool-II/pgpool.conf + install -D -m 0644 ${S}/src/sample/pcp.conf.sample ${D}${sysconfdir}/pgpool-II/pcp.conf + install -D -m 0644 ${S}/src/sample/pool_hba.conf.sample ${D}${sysconfdir}/pgpool-II/pool_hba.conf + install -Dm 0644 ${WORKDIR}/pgpool.service ${D}${systemd_system_unitdir}/pgpool.service +} diff --git a/meta-networking/recipes-support/pimd/pimd/0001-configure-Dont-use-uname-to-determine-target-OS.patch b/meta-networking/recipes-support/pimd/pimd/0001-configure-Dont-use-uname-to-determine-target-OS.patch index eb549ded9d..cacb84a1ca 100644 --- a/meta-networking/recipes-support/pimd/pimd/0001-configure-Dont-use-uname-to-determine-target-OS.patch +++ b/meta-networking/recipes-support/pimd/pimd/0001-configure-Dont-use-uname-to-determine-target-OS.patch @@ -7,6 +7,8 @@ Helps with cross-compiling Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch new file mode 100644 index 0000000000..03ba872616 --- /dev/null +++ b/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch @@ -0,0 +1,33 @@ +From 92747aab189aa3cee954ab31ee019205f8984155 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 27 May 2023 17:22:10 -0700 +Subject: [PATCH] cmake: Allow SYSTEMCTL_BIN to be overridden from environment + +This allows to encode correct paths which are inside the target rootfs +for systemctl + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9b7462861..c4d82fb49 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -226,7 +226,10 @@ else() + set(CYTHON_EXECUTABLE "") + endif() + +-find_program(SYSTEMCTL_BIN systemctl HINTS "/usr/bin" "/bin") ++if (NOT SYSTEMCTL_BIN) ++ find_program(SYSTEMCTL_BIN systemctl HINTS "/usr/bin" "/bin") ++endif() ++ + if (NOT SYSTEMCTL_BIN) + set (SYSTEMCTL_BIN "/bin/systemctl") + endif() +-- +2.40.1 + diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-examples-Include-alloca.h-for-strdupa.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-examples-Include-alloca.h-for-strdupa.patch deleted file mode 100644 index cb472d9db9..0000000000 --- a/meta-networking/recipes-support/rdma-core/rdma-core/0001-examples-Include-alloca.h-for-strdupa.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a6c547e46bbadd2c08be9944a85308f6625263cb Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 29 Aug 2022 23:15:44 -0700 -Subject: [PATCH] examples: Include alloca.h for strdupa - -musl defines strdupa via a macro which uses alloca() therefore include -the header to get the prototype - -Upstream-Status: Submitted [https://github.com/linux-rdma/rdma-core/pull/1212] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - libibverbs/examples/asyncwatch.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libibverbs/examples/asyncwatch.c b/libibverbs/examples/asyncwatch.c -index 724796e58..842b94180 100644 ---- a/libibverbs/examples/asyncwatch.c -+++ b/libibverbs/examples/asyncwatch.c -@@ -36,6 +36,7 @@ - #include <endian.h> - #include <getopt.h> - #include <string.h> -+#include <alloca.h> - - #include <util/compiler.h> - #include <infiniband/verbs.h> --- -2.37.2 - diff --git a/meta-networking/recipes-support/rdma-core/rdma-core_42.0.bb b/meta-networking/recipes-support/rdma-core/rdma-core_46.0.bb index 86243a52c5..a6927f566d 100644 --- a/meta-networking/recipes-support/rdma-core/rdma-core_42.0.bb +++ b/meta-networking/recipes-support/rdma-core/rdma-core_46.0.bb @@ -6,9 +6,8 @@ DEPENDS = "libnl" RDEPENDS:${PN} = "bash perl" SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=https \ - file://0001-examples-Include-alloca.h-for-strdupa.patch \ - " -SRCREV = "196bad56ed060612e22674b668b5ec3d8659ade3" + file://0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch" +SRCREV = "f2789cbd394c5839e8942d585a494ab72fd97e39" S = "${WORKDIR}/git" #Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md @@ -18,6 +17,7 @@ LIC_FILES_CHKSUM = "file://COPYING.BSD_FB;md5=0ec18bae1a9df92c8d6ae01f94a289ae \ EXTRA_OECMAKE = " \ -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=${systemd_system_unitdir} \ + -DSYSTEMCTL_BIN=${base_bindir}/systemctl \ -DCMAKE_INSTALL_PERLDIR=${libdir}/perl5/${@get_perl_version(d)} \ -DNO_MAN_PAGES=1 \ " @@ -28,7 +28,7 @@ FILES_SOLIBSDEV = "" FILES:${PN} += "${libdir}/*" INSANE_SKIP:${PN} += "dev-so" -inherit cmake cpan-base pkgconfig python3native systemd +inherit cmake cpan-base pkgconfig python3native python3targetconfig systemd SYSTEMD_SERVICE:${PN} = " \ srp_daemon.service \ diff --git a/meta-networking/recipes-support/ruli/ruli_0.36.bb b/meta-networking/recipes-support/ruli/ruli_0.36.bb index 9de4cc699a..178906b7b5 100644 --- a/meta-networking/recipes-support/ruli/ruli_0.36.bb +++ b/meta-networking/recipes-support/ruli/ruli_0.36.bb @@ -18,7 +18,7 @@ SRC_URI = "http://download.savannah.gnu.org/releases/ruli/ruli_${PV}.orig.tar.gz SRC_URI[md5sum] = "e73fbfdeadddb68a703a70cea5271468" SRC_URI[sha256sum] = "11d32def5b514748fbd9ea8c88049ae99e1bb358efc74eb91a4d268a3999dbfa" -EXTRA_OEMAKE = 'CC="${CC}" OOP_BASE_DIR="${STAGING_EXECPREFIXDIR}" \ +EXTRA_OEMAKE = 'CC="${CC}" CPPFLAGS="${CFLAGS}" OOP_BASE_DIR="${STAGING_EXECPREFIXDIR}" \ INSTALL_BASE_DIR="${D}${exec_prefix}" \ OOP_LIB_DIR=${STAGING_EXECPREFIXDIR}/${baselib} \ INSTALL_LIB_DIR=${D}${libdir}' diff --git a/meta-networking/recipes-support/spice/spice-gtk_0.4.1.bb b/meta-networking/recipes-support/spice/spice-gtk_0.42.bb index 44b42a3313..27504392a6 100644 --- a/meta-networking/recipes-support/spice/spice-gtk_0.4.1.bb +++ b/meta-networking/recipes-support/spice/spice-gtk_0.42.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ file://subprojects/keycodemapdb/LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ " -SRCREV = "74e673d7c3d9cd281d85c691fbc520107066da01" +SRCREV = "f04479c16f0969fb394ebe74b6eff74e560a42f0" SRC_URI = "gitsm://gitlab.freedesktop.org/spice/spice-gtk.git;protocol=https;branch=master" @@ -46,8 +46,15 @@ inherit meson pkgconfig vala gobject-introspection features_check REQUIRED_DISTRO_FEATURES = "opengl" -EXTRA_OEMESON = "-Dpie=true -Dvapi=enabled -Dintrospection=enabled" +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' + +PACKAGECONFIG ??= "${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'vapi', '', d)}" +PACKAGECONFIG[vapi] = "-Dvapi=enabled,-Dvapi=disabled" + +EXTRA_OEMESON = "-Dpie=true" EXTRA_OEMESON:append:libc-musl = " -Dcoroutine=libucontext" +LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--undefined-version', '', d)}" FILES:${PN} += "${datadir}" diff --git a/meta-networking/recipes-support/spice/spice_git.bb b/meta-networking/recipes-support/spice/spice_git.bb index b3e687476b..5732f509b1 100644 --- a/meta-networking/recipes-support/spice/spice_git.bb +++ b/meta-networking/recipes-support/spice/spice_git.bb @@ -30,11 +30,7 @@ SRC_URI = " \ S = "${WORKDIR}/git" -CVE_CHECK_IGNORE += "\ - CVE-2016-0749 \ - CVE-2016-2150 \ - CVE-2018-10893 \ -" +CVE_STATUS[CVE-2018-10893] = "fixed-version: patched already, caused by inaccurate CPE in the NVD database." inherit autotools gettext python3native python3-dir pkgconfig diff --git a/meta-networking/recipes-support/ssmping/files/0001-Makefile-tweak-install-dir.patch b/meta-networking/recipes-support/ssmping/files/0001-Makefile-tweak-install-dir.patch index 0cb981cf7a..4e1498a366 100644 --- a/meta-networking/recipes-support/ssmping/files/0001-Makefile-tweak-install-dir.patch +++ b/meta-networking/recipes-support/ssmping/files/0001-Makefile-tweak-install-dir.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Makefile: tweak install dir For oe-core, the man doc should be installed to /usr/share/man rather than /usr/locale/man. -Upstream-Status: inappropriate (oe specific) +Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.9.9.bb b/meta-networking/recipes-support/strongswan/strongswan_5.9.11.bb index a11cd5a6cc..fb1bea2d87 100644 --- a/meta-networking/recipes-support/strongswan/strongswan_5.9.9.bb +++ b/meta-networking/recipes-support/strongswan/strongswan_5.9.11.bb @@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "flex-native flex bison-native" DEPENDS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', ' tpm2-tss', '', d)}" -SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \ - " +SRC_URI = "https://download.strongswan.org/strongswan-${PV}.tar.bz2 \ + " -SRC_URI[sha256sum] = "5e16580998834658c17cebfb31dd637e728669cf2fdd325460234a4643b8d81d" +SRC_URI[sha256sum] = "ddf53f1f26ad26979d5f55e8da95bd389552f5de3682e35593f9a70b2584ed2d" UPSTREAM_CHECK_REGEX = "strongswan-(?P<pver>\d+(\.\d+)+)\.tar" @@ -38,6 +38,7 @@ PACKAGECONFIG[eap-mschapv2] = "--enable-eap-mschapv2,--disable-eap-mschapv2,,${P PACKAGECONFIG[gmp] = "--enable-gmp,--disable-gmp,gmp,${PN}-plugin-gmp" PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap,${PN}-plugin-ldap" PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5,${PN}-plugin-mysql" +PACKAGECONFIG[nm] = "--enable-nm,--disable-nm,networkmanager,${PN}-nm" PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl,${PN}-plugin-openssl" PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4,${PN}-plugin-soup" PACKAGECONFIG[sqlite3] = "--enable-sqlite,--disable-sqlite,sqlite3,${PN}-plugin-sqlite" @@ -101,6 +102,10 @@ ALLOW_EMPTY:${PN}-imcvs = "1" FILES:${PN}-imcvs = "${libdir}/ipsec/imcvs/*.so" FILES:${PN}-imcvs-dbg += "${libdir}/ipsec/imcvs/.debug" +PACKAGES =+ "${PN}-nm ${PN}-nm-dbg" +FILES:${PN}-nm = "${libexecdir}/ipsec/charon-nm ${datadir}/dbus-1/system.d/nm-strongswan-service.conf" +FILES:${PN}-nm-dbg = "${libexecdir}/ipsec/.debug/charon-nm" + PACKAGES_DYNAMIC += "^${PN}-plugin-.*$" NOAUTOPACKAGEDEBUG = "1" diff --git a/meta-networking/recipes-support/stunnel/stunnel_5.67.bb b/meta-networking/recipes-support/stunnel/stunnel_5.69.bb index db535e7356..8161529735 100644 --- a/meta-networking/recipes-support/stunnel/stunnel_5.67.bb +++ b/meta-networking/recipes-support/stunnel/stunnel_5.69.bb @@ -3,7 +3,7 @@ DESCRIPTION = "SSL encryption wrapper between remote client and local (inetd-sta HOMEPAGE = "https://www.stunnel.org/" SECTION = "net" LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING.md;md5=d8a2866ad5ebf3a2d2ce27279472875a" +LIC_FILES_CHKSUM = "file://COPYING.md;md5=b4988f33f70b383b3011c4ede0a679ce" DEPENDS = "autoconf-archive libnsl2 openssl" @@ -11,7 +11,7 @@ SRC_URI = "https://stunnel.org/archive/5.x/${BP}.tar.gz \ file://fix-openssl-no-des.patch \ " -SRC_URI[sha256sum] = "3086939ee6407516c59b0ba3fbf555338f9d52f459bcab6337c0f00e91ea8456" +SRC_URI[sha256sum] = "1ff7d9f30884c75b98c8a0a4e1534fa79adcada2322635e6787337b4e38fdb81" inherit autotools bash-completion pkgconfig diff --git a/meta-networking/recipes-support/tcpdump/tcpdump_4.99.3.bb b/meta-networking/recipes-support/tcpdump/tcpdump_4.99.4.bb index 03f1b76f97..803a9bb5f5 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump_4.99.3.bb +++ b/meta-networking/recipes-support/tcpdump/tcpdump_4.99.4.bb @@ -26,7 +26,7 @@ SRC_URI = " \ file://run-ptest \ " -SRC_URI[sha256sum] = "ad75a6ed3dc0d9732945b2e5483cb41dc8b4b528a169315e499c6861952e73b3" +SRC_URI[sha256sum] = "0232231bb2f29d6bf2426e70a08a7e0c63a0d59a9b44863b7f5e2357a6e49fea" UPSTREAM_CHECK_REGEX = "tcpdump-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.2.bb b/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.4.bb index 7d2a6a14d2..c7d14e2ab6 100644 --- a/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.2.bb +++ b/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.4.bb @@ -11,7 +11,7 @@ SRC_URI = "https://github.com/appneta/tcpreplay/releases/download/v${PV}/tcprepl file://0001-libopts.m4-set-POSIX_SHELL-to-bin-sh.patch \ " -SRC_URI[sha256sum] = "5b272cd83b67d6288a234ea15f89ecd93b4fadda65eddc44e7b5fcb2f395b615" +SRC_URI[sha256sum] = "44f18fb6d3470ecaf77a51b901a119dae16da5be4d4140ffbb2785e37ad6d4bf" UPSTREAM_CHECK_URI = "https://github.com/appneta/tcpreplay/releases" diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2022-40468.patch b/meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2022-40468.patch new file mode 100644 index 0000000000..4e2157ca75 --- /dev/null +++ b/meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2022-40468.patch @@ -0,0 +1,33 @@ +From 3764b8551463b900b5b4e3ec0cd9bb9182191cb7 Mon Sep 17 00:00:00 2001 +From: rofl0r <rofl0r@users.noreply.github.com> +Date: Thu, 8 Sep 2022 15:18:04 +0000 +Subject: [PATCH] prevent junk from showing up in error page in invalid + requests + +fixes #457 + +https://github.com/tinyproxy/tinyproxy/commit/3764b8551463b900b5b4e3ec0cd9bb9182191cb7 +Upstream-Status: Backport +CVE: CVE-2022-40468 +Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> +--- + src/reqs.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/reqs.c b/src/reqs.c +index bce69819..45db118d 100644 +--- a/src/reqs.c ++++ b/src/reqs.c +@@ -343,8 +343,12 @@ static struct request_s *process_request (struct conn_s *connptr, + goto fail; + } + ++ /* zero-terminate the strings so they don't contain junk in error page */ ++ request->method[0] = url[0] = request->protocol[0] = 0; ++ + ret = sscanf (connptr->request_line, "%[^ ] %[^ ] %[^ ]", + request->method, url, request->protocol); ++ + if (ret == 2 && !strcasecmp (request->method, "GET")) { + request->protocol[0] = 0; + diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch b/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch index 364baaa000..faefd1d4ea 100644 --- a/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch +++ b/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch @@ -3,6 +3,8 @@ From: Benjamin Gaignard <benjamin.gaignard@linaro.org> Date: Thu, 20 Apr 2017 14:25:18 +0200 --- +Upstream-Status: Pending + Makefile.am | 1 - configure.ac | 17 ----------------- 2 files changed, 18 deletions(-) diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.1.bb b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.1.bb index 86f57d88ff..999deff4de 100644 --- a/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.1.bb +++ b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.1.bb @@ -7,6 +7,7 @@ SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.gz file://disable-documentation.patch \ file://tinyproxy.service \ file://tinyproxy.conf \ + file://CVE-2022-40468.patch \ " SRC_URI[sha256sum] = "1574acf7ba83c703a89e98bb2758a4ed9fda456f092624b33cfcf0ce2d3b2047" diff --git a/meta-networking/recipes-support/tnftp/tnftp_20210827.bb b/meta-networking/recipes-support/tnftp/tnftp_20210827.bb index 8c5892668d..a6ba671e70 100644 --- a/meta-networking/recipes-support/tnftp/tnftp_20210827.bb +++ b/meta-networking/recipes-support/tnftp/tnftp_20210827.bb @@ -23,8 +23,8 @@ inherit autotools update-alternatives pkgconfig ALTERNATIVE_PRIORITY = "100" ALTERNATIVE:${PN} = "ftp" -ALTERNATIVE_LINK_NAME_${PN} = "${bindir}/ftp" -ALTERNATIVE_TARGET_${PN} = "${bindir}/tnftp" +ALTERNATIVE_LINK_NAME[ftp] = "${bindir}/ftp" +ALTERNATIVE_TARGET[ftp] = "${bindir}/tnftp" FILES:${PN} = "${bindir}/tnftp" diff --git a/meta-networking/recipes-support/traceroute/traceroute_2.1.1.bb b/meta-networking/recipes-support/traceroute/traceroute_2.1.2.bb index 3892a0e21a..51b581a4c6 100644 --- a/meta-networking/recipes-support/traceroute/traceroute_2.1.1.bb +++ b/meta-networking/recipes-support/traceroute/traceroute_2.1.2.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] = "8fc8d5046e855d7588607bb319f5b82e3ba13e91d5d4636863262e6386bbaf76" +SRC_URI[sha256sum] = "507c268f2977b4e218ce73e7ebed45ba0d970a8ca4995dd9cbb1ffe8e99b5b1f" EXTRA_OEMAKE = "VPATH=${STAGING_LIBDIR}" LTOEXTRA += "-flto-partition=none" diff --git a/meta-networking/recipes-support/unbound/unbound/0001-contrib-add-yocto-compatible-init-script.patch b/meta-networking/recipes-support/unbound/unbound/0001-contrib-add-yocto-compatible-init-script.patch index 7168a352f7..7bcf972612 100644 --- a/meta-networking/recipes-support/unbound/unbound/0001-contrib-add-yocto-compatible-init-script.patch +++ b/meta-networking/recipes-support/unbound/unbound/0001-contrib-add-yocto-compatible-init-script.patch @@ -5,6 +5,8 @@ Subject: [PATCH] contrib: add yocto compatible init script Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com> --- +Upstream-Status: Pending + contrib/unbound.init | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/meta-networking/recipes-support/unbound/unbound_1.17.1.bb b/meta-networking/recipes-support/unbound/unbound_1.17.1.bb index caa1bb3396..ff3d879ea9 100644 --- a/meta-networking/recipes-support/unbound/unbound_1.17.1.bb +++ b/meta-networking/recipes-support/unbound/unbound_1.17.1.bb @@ -9,14 +9,14 @@ SECTION = "net" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=5308494bc0590c0cb036afd781d78f06" -SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=http;branch=master;protocol=https \ +SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=https;branch=master \ file://0001-contrib-add-yocto-compatible-init-script.patch \ " SRCREV = "90831af981221bbce1cd7b15055562336760e484" inherit autotools pkgconfig systemd update-rc.d -DEPENDS = "openssl libevent libtool-native bison-native expat" +DEPENDS = "openssl libtool-native bison-native expat" RDEPENDS:${PN} = "bash openssl-bin daemonize" S = "${WORKDIR}/git" @@ -28,6 +28,11 @@ EXTRA_OECONF = "--with-libexpat=${STAGING_EXECPREFIXDIR} \ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[dnscrypt] = "--enable-dnscrypt, --disable-dnscrypt, libsodium" PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" +PACKAGECONFIG[libevent] = "--with-libevent=${STAGING_EXECPREFIXDIR},,libevent" + +do_configure:append() { + sed -i -e 's#${RECIPE_SYSROOT}##g' ${B}/config.h +} do_install:append() { install -d ${D}${systemd_unitdir}/system diff --git a/meta-networking/recipes-support/wireshark/files/0001-CMake-Fix-a-try_run-test-when-cross-compiling.patch b/meta-networking/recipes-support/wireshark/files/0001-CMake-Fix-a-try_run-test-when-cross-compiling.patch new file mode 100644 index 0000000000..0d51ce1b8f --- /dev/null +++ b/meta-networking/recipes-support/wireshark/files/0001-CMake-Fix-a-try_run-test-when-cross-compiling.patch @@ -0,0 +1,66 @@ +From b4f29807225cf3744c2f4f971902fbdd7486fc19 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= <j@v6e.pt> +Date: Fri, 26 May 2023 13:29:23 +0100 +Subject: [PATCH] CMake: Fix a try_run() test when cross-compiling + +Upstream-Status: Backport +Signed-off-by: Armin Kuster <akuster808@gmail.com> + +--- + ConfigureChecks.cmake | 36 ++++++++++++++++++++---------------- + 1 file changed, 20 insertions(+), 16 deletions(-) + +diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake +index dd8268e077..d8bca54115 100644 +--- a/ConfigureChecks.cmake ++++ b/ConfigureChecks.cmake +@@ -122,26 +122,30 @@ check_type_size("ssize_t" SSIZE_T) + # Check if the libc vsnprintf() conforms to C99. If this fails we may + # need to fall-back on GLib I/O. + # +-check_c_source_runs(" +- #include <stdio.h> +- int main(void) +- { +- /* Check that snprintf() and vsnprintf() don't return +- * -1 if the buffer is too small. C99 says this value +- * is the length that would be written not including +- * the nul byte. */ +- char buf[3]; +- return snprintf(buf, sizeof(buf), \"%s\", \"ABCDEF\") > 0 ? 0 : 1; +- }" +- HAVE_C99_VSNPRINTF +-) +-if (NOT HAVE_C99_VSNPRINTF) +- message(FATAL_ERROR ++# If cross-compiling we can't check so just assume this requirement is met. ++# ++if(NOT CMAKE_CROSSCOMPILING) ++ check_c_source_runs(" ++ #include <stdio.h> ++ int main(void) ++ { ++ /* Check that snprintf() and vsnprintf() don't return ++ * -1 if the buffer is too small. C99 says this value ++ * is the length that would be written not including ++ * the nul byte. */ ++ char buf[3]; ++ return snprintf(buf, sizeof(buf), \"%s\", \"ABCDEF\") > 0 ? 0 : 1; ++ }" ++ HAVE_C99_VSNPRINTF ++ ) ++ if (NOT HAVE_C99_VSNPRINTF) ++ message(FATAL_ERROR + "Building Wireshark requires a C99 compliant vsnprintf() and this \ + target does not meet that requirement. Compiling for ${CMAKE_SYSTEM} \ + using ${CMAKE_C_COMPILER_ID}. Please report this issue to the Wireshark \ + developers at wireshark-dev@wireshark.org." +- ) ++ ) ++ endif() + endif() + + # +-- +2.25.1 + diff --git a/meta-networking/recipes-support/wireshark/files/0001-wireshark-src-improve-reproducibility.patch b/meta-networking/recipes-support/wireshark/files/0001-wireshark-src-improve-reproducibility.patch index 0b83ca4ae4..6ad8a62c28 100644 --- a/meta-networking/recipes-support/wireshark/files/0001-wireshark-src-improve-reproducibility.patch +++ b/meta-networking/recipes-support/wireshark/files/0001-wireshark-src-improve-reproducibility.patch @@ -13,24 +13,11 @@ Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> tools/ncp2222.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/tools/make-plugin-reg.py b/tools/make-plugin-reg.py -index 66b4656..c52b3fc 100755 ---- a/tools/make-plugin-reg.py -+++ b/tools/make-plugin-reg.py -@@ -28,7 +28,7 @@ preamble = """\ - * - * Generated automatically from %s. - */ --""" % (sys.argv[0]) -+""" % (os.path.basename(sys.argv[0])) - - # Create the proper list of filenames - filenames = [] -diff --git a/tools/ncp2222.py b/tools/ncp2222.py -index 1dea4ec..dc376e3 100755 ---- a/tools/ncp2222.py -+++ b/tools/ncp2222.py -@@ -5858,7 +5858,7 @@ def produce_code(): +Index: wireshark-4.0.6/tools/ncp2222.py +=================================================================== +--- wireshark-4.0.6.orig/tools/ncp2222.py ++++ wireshark-4.0.6/tools/ncp2222.py +@@ -5891,7 +5891,7 @@ def produce_code(): print("/*") print(" * Do not modify this file. Changes will be overwritten.") @@ -39,6 +26,3 @@ index 1dea4ec..dc376e3 100755 print(" */\n") print(""" --- -2.26.2.Cisco - diff --git a/meta-networking/recipes-support/wireshark/files/0003-bison-Remove-line-directives.patch b/meta-networking/recipes-support/wireshark/files/0003-bison-Remove-line-directives.patch deleted file mode 100644 index 824761a3dc..0000000000 --- a/meta-networking/recipes-support/wireshark/files/0003-bison-Remove-line-directives.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 42abf1d299fed8e00a189f6f9c55fb344e5bb775 Mon Sep 17 00:00:00 2001 -From: Oleksiy Obitotskyy <oobitots@cisco.com> -Date: Wed, 27 Jan 2021 04:01:34 -0800 -Subject: [PATCH] bison: Remove #line directives - -Append --no-lines option to bison to not -generate #line directives with absolute file path. - -Upstream-Status: Pending -Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> ---- - cmake/modules/FindYACC.cmake | 31 ++++++++++++++++++++++--------- - 1 file changed, 22 insertions(+), 9 deletions(-) - -diff --git a/cmake/modules/FindYACC.cmake b/cmake/modules/FindYACC.cmake -index c96f87b..54a73cb 100644 ---- a/cmake/modules/FindYACC.cmake -+++ b/cmake/modules/FindYACC.cmake -@@ -29,15 +29,28 @@ MACRO(ADD_YACC_FILES _source _generated) - - SET(_out ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.c) - -- ADD_CUSTOM_COMMAND( -- OUTPUT ${_out} -- COMMAND ${YACC_EXECUTABLE} -- -d -- -p ${_basename} -- -o${_out} -- ${_in} -- DEPENDS ${_in} -- ) -+ IF (DEFINED ENV{SOURCE_DATE_EPOCH}) -+ ADD_CUSTOM_COMMAND( -+ OUTPUT ${_out} -+ COMMAND ${YACC_EXECUTABLE} -+ --no-lines -+ -d -+ -p ${_basename} -+ -o${_out} -+ ${_in} -+ DEPENDS ${_in} -+ ) -+ ELSE () -+ ADD_CUSTOM_COMMAND( -+ OUTPUT ${_out} -+ COMMAND ${YACC_EXECUTABLE} -+ -d -+ -p ${_basename} -+ -o${_out} -+ ${_in} -+ DEPENDS ${_in} -+ ) -+ ENDIF () - LIST(APPEND ${_source} ${_in}) - LIST(APPEND ${_generated} ${_out}) - ENDFOREACH (_current_FILE) --- -2.26.2.Cisco - diff --git a/meta-networking/recipes-support/wireshark/files/CVE-2022-3190.patch b/meta-networking/recipes-support/wireshark/files/CVE-2022-3190.patch deleted file mode 100644 index 0b987700f5..0000000000 --- a/meta-networking/recipes-support/wireshark/files/CVE-2022-3190.patch +++ /dev/null @@ -1,145 +0,0 @@ -From 4585d515b962f3b3a5e81caa64e13e8d9ed2e431 Mon Sep 17 00:00:00 2001 -From: Hitendra Prajapati <hprajapati@mvista.com> -Date: Mon, 26 Sep 2022 12:47:00 +0530 -Subject: [PATCH] CVE-2022-3190 - -Upstream-Status: Backport [https://gitlab.com/wireshark/wireshark/-/commit/67326401a595fffbc67eeed48eb6c55d66a55f67] -CVE : CVE-2022-3190 -Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com> ---- - epan/dissectors/packet-f5ethtrailer.c | 108 +++++++++++++------------- - 1 file changed, 56 insertions(+), 52 deletions(-) - -diff --git a/epan/dissectors/packet-f5ethtrailer.c b/epan/dissectors/packet-f5ethtrailer.c -index ed77dfd..b15b0d4 100644 ---- a/epan/dissectors/packet-f5ethtrailer.c -+++ b/epan/dissectors/packet-f5ethtrailer.c -@@ -2741,69 +2741,73 @@ dissect_dpt_trailer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d - static gint - dissect_old_trailer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) - { -- proto_tree *type_tree = NULL; -- proto_item *ti = NULL; - guint offset = 0; -- guint processed = 0; -- f5eth_tap_data_t *tdata = (f5eth_tap_data_t *)data; -- guint8 type; -- guint8 len; -- guint8 ver; - - /* While we still have data in the trailer. For old format trailers, this needs - * type, length, version (3 bytes) and for new format trailers, the magic header (4 bytes). - * All old format trailers are at least 4 bytes long, so just check for length of magic. - */ -- while (tvb_reported_length_remaining(tvb, offset)) { -- type = tvb_get_guint8(tvb, offset); -- len = tvb_get_guint8(tvb, offset + F5_OFF_LENGTH) + F5_OFF_VERSION; -- ver = tvb_get_guint8(tvb, offset + F5_OFF_VERSION); -- -- if (len <= tvb_reported_length_remaining(tvb, offset) && type >= F5TYPE_LOW -- && type <= F5TYPE_HIGH && len >= F5_MIN_SANE && len <= F5_MAX_SANE -- && ver <= F5TRAILER_VER_MAX) { -- /* Parse out the specified trailer. */ -- switch (type) { -- case F5TYPE_LOW: -- ti = proto_tree_add_item(tree, hf_low_id, tvb, offset, len, ENC_NA); -- type_tree = proto_item_add_subtree(ti, ett_f5ethtrailer_low); -- -- processed = dissect_low_trailer(tvb, pinfo, type_tree, offset, len, ver, tdata); -- if (processed > 0) { -- tdata->trailer_len += processed; -- tdata->noise_low = 1; -- } -- break; -- case F5TYPE_MED: -- ti = proto_tree_add_item(tree, hf_med_id, tvb, offset, len, ENC_NA); -- type_tree = proto_item_add_subtree(ti, ett_f5ethtrailer_med); -- -- processed = dissect_med_trailer(tvb, pinfo, type_tree, offset, len, ver, tdata); -- if (processed > 0) { -- tdata->trailer_len += processed; -- tdata->noise_med = 1; -- } -- break; -- case F5TYPE_HIGH: -- ti = proto_tree_add_item(tree, hf_high_id, tvb, offset, len, ENC_NA); -- type_tree = proto_item_add_subtree(ti, ett_f5ethtrailer_high); -- -- processed = -- dissect_high_trailer(tvb, pinfo, type_tree, offset, len, ver, tdata); -- if (processed > 0) { -- tdata->trailer_len += processed; -- tdata->noise_high = 1; -- } -- break; -+ while (tvb_reported_length_remaining(tvb, offset) >= F5_MIN_SANE) { -+ /* length field does not include the type and length bytes. Add them back in */ -+ guint8 len = tvb_get_guint8(tvb, offset + F5_OFF_LENGTH) + F5_OFF_VERSION; -+ if (len > tvb_reported_length_remaining(tvb, offset) -+ || len < F5_MIN_SANE || len > F5_MAX_SANE) { -+ /* Invalid length - either a malformed trailer, corrupt packet, or not f5ethtrailer */ -+ return offset; -+ } -+ guint8 type = tvb_get_guint8(tvb, offset); -+ guint8 ver = tvb_get_guint8(tvb, offset + F5_OFF_VERSION); -+ -+ /* Parse out the specified trailer. */ -+ proto_tree *type_tree = NULL; -+ proto_item *ti = NULL; -+ f5eth_tap_data_t *tdata = (f5eth_tap_data_t *)data; -+ guint processed = 0; -+ -+ switch (type) { -+ case F5TYPE_LOW: -+ ti = proto_tree_add_item(tree, hf_low_id, tvb, offset, len, ENC_NA); -+ type_tree = proto_item_add_subtree(ti, ett_f5ethtrailer_low); -+ -+ processed = dissect_low_trailer(tvb, pinfo, type_tree, offset, len, ver, tdata); -+ if (processed > 0) { -+ tdata->trailer_len += processed; -+ tdata->noise_low = 1; - } -- if (processed == 0) { -- proto_item_set_len(ti, 1); -- return offset; -+ break; -+ case F5TYPE_MED: -+ ti = proto_tree_add_item(tree, hf_med_id, tvb, offset, len, ENC_NA); -+ type_tree = proto_item_add_subtree(ti, ett_f5ethtrailer_med); -+ -+ processed = dissect_med_trailer(tvb, pinfo, type_tree, offset, len, ver, tdata); -+ if (processed > 0) { -+ tdata->trailer_len += processed; -+ tdata->noise_med = 1; -+ } -+ break; -+ case F5TYPE_HIGH: -+ ti = proto_tree_add_item(tree, hf_high_id, tvb, offset, len, ENC_NA); -+ type_tree = proto_item_add_subtree(ti, ett_f5ethtrailer_high); -+ -+ processed = -+ dissect_high_trailer(tvb, pinfo, type_tree, offset, len, ver, tdata); -+ if (processed > 0) { -+ tdata->trailer_len += processed; -+ tdata->noise_high = 1; - } -+ break; -+ default: -+ /* Unknown type - malformed trailer, corrupt packet, or not f5ethtrailer - bali out*/ -+ return offset; -+ } -+ if (processed == 0) { -+ /* couldn't process trailer - bali out */ -+ proto_item_set_len(ti, 1); -+ return offset; - } - offset += processed; - } --return offset; -+ return offset; - } /* dissect_old_trailer() */ - - /*---------------------------------------------------------------------------*/ --- -2.25.1 - diff --git a/meta-networking/recipes-support/wireshark/wireshark_3.4.12.bb b/meta-networking/recipes-support/wireshark/wireshark_4.0.7.bb index 1a4aedc139..d7df76a692 100644 --- a/meta-networking/recipes-support/wireshark/wireshark_3.4.12.bb +++ b/meta-networking/recipes-support/wireshark/wireshark_4.0.7.bb @@ -2,29 +2,26 @@ DESCRIPTION = "wireshark - a popular network protocol analyzer" HOMEPAGE = "http://www.wireshark.org" SECTION = "net" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=6e271234ba1a13c6e512e76b94ac2f77" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native c-ares" +DEPENDS = "pcre2 expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native c-ares" DEPENDS:append:class-target = " wireshark-native chrpath-replacement-native " -SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz" - -SRC_URI += " \ - file://0001-wireshark-src-improve-reproducibility.patch \ - file://0002-flex-Remove-line-directives.patch \ - file://0003-bison-Remove-line-directives.patch \ - file://0004-lemon-Remove-line-directives.patch \ - file://CVE-2022-3190.patch \ -" +SRC_URI = "https://1.eu.dl.wireshark.org/src/wireshark-${PV}.tar.xz \ + file://0001-CMake-Fix-a-try_run-test-when-cross-compiling.patch \ + file://0001-wireshark-src-improve-reproducibility.patch \ + file://0002-flex-Remove-line-directives.patch \ + file://0004-lemon-Remove-line-directives.patch \ + " UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" -SRC_URI[sha256sum] = "881a13303e263b7dc7fe337534c8a541d4914552287879bed30bbe76c5bf68ca" +SRC_URI[sha256sum] = "a79f7b04cbff823e30452abf4bcb86773d8583eb62d5f71f16c09f019f8a8777" PE = "1" -inherit cmake pkgconfig python3native perlnative upstream-version-is-even mime mime-xdg +inherit cmake pkgconfig python3native python3targetconfig perlnative upstream-version-is-even mime mime-xdg PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc" @@ -43,12 +40,12 @@ PACKAGECONFIG[zlib] = "-DENABLE_ZLIB=ON,-DENABLE_ZLIB=OFF, zlib" PACKAGECONFIG[geoip] = ",, geoip" PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF" PACKAGECONFIG[sbc] = "-DENABLE_SBC=ON,-DENABLE_SBC=OFF, sbc" -PACKAGECONFIG[libssh] = ",,libssh2" +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[nghttp2] = "-DENABLE_NGHTTP2=ON,-DENABLE_NGHTTP2=OFF, nghttp2" # these next two options require addional layers -PACKAGECONFIG[c-ares] = "-DENABLE_CARES=ON,-DENABLE_CARES=OFF, c-ares" PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON -DBUILD_wireshark=ON, -DENABLE_QT5=OFF -DBUILD_wireshark=OFF, qttools-native qtmultimedia qtsvg" inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} @@ -63,6 +60,16 @@ EXTRA_OECMAKE += "-DENABLE_NETLINK=ON \ " CFLAGS:append = " -lm" +do_compile:append:class-target() { + # Fix TMPDIR, these are in the comments section + sed -i -e "s:** source file.*::g" ${B}/wiretap/ascend_parser.c + sed -i -e "s:** source file.*::g" ${B}/wiretap/candump_parser.c + sed -i -e "s:** source file.*::g" ${B}/wiretap/busmaster_parser.c + sed -i -e "s:** source file.*::g" ${B}/epan/protobuf_lang_parser.c + sed -i -e "s:** source file.*::g" ${B}/epan/dtd_grammar.c + sed -i -e "s:** source file.*::g" ${B}/epan/dfilter/grammar.c +} + do_install:append:class-native() { install -d ${D}${bindir} for f in lemon @@ -76,6 +83,9 @@ do_install:append:class-target() { do chrpath --delete $f done + + # We don't need the cmake files installed + rm -fr ${D}${usrlib}/${BPN}/cmake } PACKAGE_BEFORE_PN += "tshark" diff --git a/meta-oe/README b/meta-oe/README.md index 676a2c8925..676a2c8925 100644 --- a/meta-oe/README +++ b/meta-oe/README.md diff --git a/meta-oe/classes/gitpkgv.bbclass b/meta-oe/classes/gitpkgv.bbclass index 180421ed35..cb2cea26be 100644 --- a/meta-oe/classes/gitpkgv.bbclass +++ b/meta-oe/classes/gitpkgv.bbclass @@ -56,7 +56,7 @@ def gitpkgv_drop_tag_prefix(d, version): def get_git_pkgv(d, use_tags): import os import bb - from pipes import quote + from shlex import quote src_uri = d.getVar('SRC_URI').split() fetcher = bb.fetch2.Fetch(src_uri, d) diff --git a/meta-oe/classes/signing.bbclass b/meta-oe/classes/signing.bbclass new file mode 100644 index 0000000000..5c74a319e4 --- /dev/null +++ b/meta-oe/classes/signing.bbclass @@ -0,0 +1,316 @@ +# +# Copyright Jan Luebbe <jlu@pengutronix.de> +# +# SPDX-License-Identifier: MIT +# + +# This class provides a common workflow to use asymmetric (i.e. RSA) keys to +# sign artifacts. Usually, the keys are either stored as simple files in the +# file system or on a HSM (Hardware Security Module). While files are easy to +# use, it's hard to verify that no copies of the private have been made and +# only authorized persons are able to use the key. Use of an HSM addresses +# these risks by only allowing use of the key via an API (often PKCS #11). The +# standard way of referring to a specific key in an HSM are PKCS #11 URIs (RFC +# 7512). +# +# Many software projects support signing using PKCS #11 keys, but configuring +# this is very project specific. Furthermore, as physical HSMs are not very +# widespread, testing code signing in CI is not simple. To solve this at the +# build system level, this class takes the approach of always using PKCS #11 at +# the recipe level. For cases where the keys are available as files (i.e. test +# keys in CI), they are imported into SoftHSM (a HSM emulation library). +# +# Recipes access the available keys via a specific role. So, depending on +# whether we're building during development or for release, a given role can +# refer to different keys. +# Each key recipe PROVIDES a virtual package corresponding to the role, allowing +# the user to select one of multiple keys for a role when needed. +# +# For use with a real HSM, a PKCS #11 URI can be set (i.e. in local.conf) to +# override the SoftHSM key with the real one: +# +# SIGNING_PKCS11_URI[fit] = "pkcs11:serial=DENK0200554;object=ptx-dev-rauc&pin-value=123456" +# SIGNING_PKCS11_MODULE[fit] = "/usr/lib/x86_64-linux-gnu/opensc-pkcs11.so" +# +# Examples for defining roles and importing keys: +# +# meta-code-signing/recipes-security/signing-keys/dummy-rsa-key-native.bb +# meta-code-signing-demo/recipes-security/ptx-dev-keys/ptx-dev-keys-native_git.bb +# +# Examples for using keys for signing: +# +# meta-code-signing-demo/recipes-security/fit-image/linux-fit-image.bb +# meta-code-signing-demo/recipes-core/bundles/update-bundle.bb +# +# Examples for using keys for authentication: +# +# meta-code-signing-demo/recipes-security/fit-image/barebox_%.bbappend +# meta-code-signing-demo/recipes-core/rauc/rauc_%.bbappend +# +# Examples for using keys for both signing and authentication: +# +# meta-code-signing-demo/recipes-kernel/linux/linux-yocto_6.1.bbappend + +SIGNING_PKCS11_URI ?= "" +SIGNING_PKCS11_MODULE ?= "" + +DEPENDS += "softhsm-native libp11-native opensc-native openssl-native" + +def signing_class_prepare(d): + import os.path + + def export(role, k, v): + k = k % (role, ) + d.setVar(k, v) + d.setVarFlag(k, "export", "1") + + roles = set() + roles |= (d.getVarFlags("SIGNING_PKCS11_URI") or {}).keys() + roles |= (d.getVarFlags("SIGNING_PKCS11_MODULE") or {}).keys() + for role in roles: + if not set(role).issubset("abcdefghijklmnopqrstuvwxyz0123456789_"): + bb.fatal("key role name '%s' must consist of only [a-z0-9_]" % (role,)) + + pkcs11_uri = d.getVarFlag("SIGNING_PKCS11_URI", role) or d.getVar("SIGNING_PKCS11_URI") + if not pkcs11_uri.startswith("pkcs11:"): + bb.fatal("URI for key role '%s' must start with 'pkcs11:'" % (role,)) + + pkcs11_module = d.getVarFlag("SIGNING_PKCS11_MODULE", role) or d.getVar("SIGNING_PKCS11_MODULE") + if not os.path.isfile(pkcs11_module): + bb.fatal("module path for key role '%s' must be an existing file" % (role,)) + + if pkcs11_uri and not pkcs11_module: + bb.warn("SIGNING_PKCS11_URI[%s] is set without SIGNING_PKCS11_MODULE[%s]" % (role, role)) + if pkcs11_module and not pkcs11_uri: + bb.warn("SIGNING_PKCS11_MODULE[%s] is set without SIGNING_PKCS11_URI[%s]" % (role, role)) + + export(role, "SIGNING_PKCS11_URI_%s_", pkcs11_uri) + export(role, "SIGNING_PKCS11_MODULE_%s_", pkcs11_module) + +signing_pkcs11_tool() { + pkcs11-tool --module "${STAGING_LIBDIR_NATIVE}/softhsm/libsofthsm2.so" --login --pin 1111 $* +} + +signing_import_prepare() { + export _SIGNING_ENV_FILE_="${B}/meta-signing.env" + rm -f "$_SIGNING_ENV_FILE_" + + export SOFTHSM2_CONF="${B}/softhsm2.conf" + export SOFTHSM2_DIR="${B}/softhsm2.tokens" + export SOFTHSM2_MOD="${STAGING_LIBDIR_NATIVE}/softhsm/libsofthsm2.so" + + echo "directories.tokendir = $SOFTHSM2_DIR" > "$SOFTHSM2_CONF" + echo "objectstore.backend = db" >> "$SOFTHSM2_CONF" + rm -rf "$SOFTHSM2_DIR" + mkdir -p "$SOFTHSM2_DIR" + + softhsm2-util --module $SOFTHSM2_MOD --init-token --free --label ${PN} --pin 1111 --so-pin 222222 +} + +signing_import_define_role() { + local role="${1}" + case "${1}" in + (*[!a-z0-9_]*) false;; + (*) true;; + esac || bbfatal "invalid role name '${1}', must consist of [a-z0-9_]" + + echo "_SIGNING_PKCS11_URI_${role}_=\"pkcs11:token=${PN};object=$role;pin-value=1111\"" >> $_SIGNING_ENV_FILE_ + echo "_SIGNING_PKCS11_MODULE_${role}_=\"softhsm\"" >> $_SIGNING_ENV_FILE_ +} + +# signing_import_cert_from_der <role> <der> +# +# Import a certificate from DER file to a role. To be used +# with SoftHSM. +signing_import_cert_from_der() { + local role="${1}" + local der="${2}" + + signing_pkcs11_tool --type cert --write-object "${der}" --label "${role}" +} + +# signing_import_cert_from_pem <role> <pem> +# +# Import a certificate from PEM file to a role. To be used +# with SoftHSM. +signing_import_cert_from_pem() { + local role="${1}" + local pem="${2}" + + openssl x509 \ + -in "${pem}" -inform pem -outform der | + signing_pkcs11_tool --type cert --write-object /proc/self/fd/0 --label "${role}" +} + +# signing_import_pubkey_from_der <role> <pem> +# +# Import a public key from DER file to a role. To be used with SoftHSM. +signing_import_pubkey_from_pem() { + local role="${1}" + local der="${2}" + + signing_pkcs11_tool --type pubkey --write-object "${der}" --label "${role}" +} + +# signing_import_pubkey_from_pem <role> <pem> +# +# Import a public key from PEM file to a role. To be used with SoftHSM. +signing_import_pubkey_from_pem() { + local openssl_keyopt + local role="${1}" + local pem="${2}" + + if [ -n "${IMPORT_PASS_FILE}" ]; then + openssl rsa \ + -passin "file:${IMPORT_PASS_FILE}" \ + -in "${pem}" -inform pem -pubout -outform der + else + openssl rsa \ + -in "${pem}" -inform pem -pubout -outform der + fi | + signing_pkcs11_tool --type pubkey --write-object /proc/self/fd/0 --label "${role}" +} + +# signing_import_privkey_from_der <role> <pem> +# +# Import a private key from DER file to a role. To be used with SoftHSM. +signing_import_privkey_from_der() { + local role="${1}" + local der="${2}" + signing_pkcs11_tool --type privkey --write-object "${der}" --label "${role}" +} + +# signing_import_privkey_from_pem <role> <pem> +# +# Import a private key from PEM file to a role. To be used with SoftHSM. +signing_import_privkey_from_pem() { + local openssl_keyopt + local role="${1}" + local pem="${2}" + + if [ -n "${IMPORT_PASS_FILE}" ]; then + openssl rsa \ + -passin "file:${IMPORT_PASS_FILE}" \ + -in "${pem}" -inform pem -outform der + else + openssl rsa \ + -in "${pem}" -inform pem -outform der + fi | + signing_pkcs11_tool --type privkey --write-object /proc/self/fd/0 --label "${role}" +} + +# signing_import_key_from_pem <role> <pem> +# +# Import a private and public key from PEM file to a role. To be used +# with SoftHSM. +signing_import_key_from_pem() { + local role="${1}" + local pem="${2}" + + signing_import_pubkey_from_pem "${role}" "${pem}" + signing_import_privkey_from_pem "${role}" "${pem}" +} + +signing_import_finish() { + echo "loaded objects:" + signing_pkcs11_tool --list-objects +} + +signing_import_install() { + install -d ${D}${localstatedir}/lib/softhsm/tokens/${PN} + install -m 600 -t ${D}${localstatedir}/lib/softhsm/tokens/${PN} ${B}/softhsm2.tokens/*/* + install -d ${D}${localstatedir}/lib/meta-signing.env.d + install -m 644 "${B}/meta-signing.env" ${D}${localstatedir}/lib/meta-signing.env.d/${PN} +} + +signing_prepare() { + if [ -f ${OPENSSL_CONF} ]; then + echo "Using '${OPENSSL_CONF}' for OpenSSL configuration" + else + echo "Missing 'openssl.cnf' at '${STAGING_ETCDIR_NATIVE}/ssl'" + return 1 + fi + if [ -d ${OPENSSL_MODULES} ]; then + echo "Using '${OPENSSL_MODULES}' for OpenSSL run-time modules" + else + echo "Missing OpenSSL module directory at '${OPENSSL_MODULES}'" + return 1 + fi + if [ -d ${OPENSSL_ENGINES} ]; then + echo "Using '${OPENSSL_ENGINES}' for OpenSSL run-time PKCS#11 modules" + else + echo "Missing OpenSSL PKCS11 engine directory at '${OPENSSL_ENGINES}'" + return 1 + fi + + export SOFTHSM2_CONF="${WORKDIR}/softhsm2.conf" + export SOFTHSM2_DIR="${STAGING_DIR_NATIVE}/var/lib/softhsm/tokens" + + echo "directories.tokendir = $SOFTHSM2_DIR" > "$SOFTHSM2_CONF" + echo "objectstore.backend = db" >> "$SOFTHSM2_CONF" + + for env in $(ls "${STAGING_DIR_NATIVE}/var/lib/meta-signing.env.d"); do + . "${STAGING_DIR_NATIVE}/var/lib/meta-signing.env.d/$env" + done +} +# make sure these functions are exported +signing_prepare[vardeps] += "signing_get_uri signing_get_module" + +signing_use_role() { + local role="${1}" + + export PKCS11_MODULE_PATH="$(signing_get_module $role)" + export PKCS11_URI="$(signing_get_uri $role)" + + if [ -z "$PKCS11_MODULE_PATH" ]; then + echo "No PKCS11_MODULE_PATH found for role '${role}'" + exit 1 + fi + if [ -z "$PKCS11_URI" ]; then + echo "No PKCS11_URI found for role '${role}'" + exit 1 + fi +} + +signing_get_uri() { + local role="${1}" + + # prefer local configuration + eval local uri="\$SIGNING_PKCS11_URI_${role}_" + if [ -n "$uri" ]; then + echo "$uri" + return + fi + + # fall back to softhsm + eval echo "\$_SIGNING_PKCS11_URI_${role}_" +} + +signing_get_module() { + local role="${1}" + + # prefer local configuration + eval local module="\$SIGNING_PKCS11_MODULE_${role}_" + if [ -n "$module" ]; then + echo "$module" + return + fi + + # fall back to softhsm + eval local module="\$_SIGNING_PKCS11_MODULE_${role}_" + if [ "$module" = "softhsm" ]; then + echo "${STAGING_LIBDIR_NATIVE}/softhsm/libsofthsm2.so" + else + echo "$module" + fi +} + +python () { + signing_class_prepare(d) +} + +export OPENSSL_MODULES="${STAGING_LIBDIR_NATIVE}/ossl-modules" +export OPENSSL_ENGINES="${STAGING_LIBDIR_NATIVE}/engines-3" +export OPENSSL_CONF="${STAGING_LIBDIR_NATIVE}/ssl-3/openssl.cnf" +export SSL_CERT_DIR="${STAGING_LIBDIR_NATIVE}/ssl-3/certs" +export SSL_CERT_FILE="${STAGING_LIBDIR_NATIVE}/ssl-3/cert.pem" diff --git a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc new file mode 100644 index 0000000000..77dace08a0 --- /dev/null +++ b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc @@ -0,0 +1,66 @@ +# +# Lists of the ptest in meta-oe, sorted into two sets by the time they take +# Please keep these sorted in alphabetical order +# +# A first pass at getting all meta-oe recipes which inherit ptest +# meta_oe_ptest_recipes=$(bitbake-layers show-recipes --recipes-only --layer meta-oe --inherits ptest --bare | tr '\n' ' ' | pcregrep -o1 '^NOTE:.+===(.+)$') +# +# ptests which take less than ~30s each +PTESTS_FAST_META_OE = "\ + cmocka \ + cunit \ + duktape \ + fmt \ + function2 \ + fwupd \ + gcab \ + jq \ + leveldb \ + libcereal \ + libee \ + libio-pty-perl \ + libmanette \ + libssh \ + libtinyxml2 \ + libxml++-5.0 \ + libxmlb \ + libyang \ + lmdb \ + minicoredumper \ + neon \ + nodejs \ + onig \ + poco \ + protobuf \ + sdbus-c++ \ + uthash \ + xmlsec1 \ + zeromq \ +" +PTESTS_FAST_META_OE:append:x86 = " mcelog" +PTESTS_FAST_META_OE:append:x86-64 = " mcelog" + +PTESTS_FAST_META_OE:remove:libc-musl = "minicoredumper" +PTESTS_FAST_META_OE:remove:riscv64 = "nodejs" +PTESTS_FAST_META_OE:remove:riscv32 = "nodejs" + +PTESTS_SLOW_META_OE = "\ + fftw \ + libusb-compat \ + rsyslog \ +" + +PTESTS_PROBLEMS_META_OE ="\ + jemalloc \ + kernel-selftest \ + keyutils \ + libdbi-perl \ + libgpiod \ + libjcat \ + libteam \ + libxml++ \ + oprofile \ + ostree \ + psqlodbc \ + pv \ +" diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index a1f50879e8..923b722b3c 100644 --- a/meta-oe/conf/layer.conf +++ b/meta-oe/conf/layer.conf @@ -34,6 +34,8 @@ BBFILES_DYNAMIC += " \ gnome-layer:${LAYERDIR}/dynamic-layers/gnome-layer/recipes-*/*/*.bbappend \ perl-layer:${LAYERDIR}/dynamic-layers/perl-layer/recipes-*/*/*.bb \ perl-layer:${LAYERDIR}/dynamic-layers/perl-layer/recipes-*/*/*.bbappend \ + selinux:${LAYERDIR}/dynamic-layers/selinux/recipes-*/*/*.bb \ + selinux:${LAYERDIR}/dynamic-layers/selinux/recipes-*/*/*.bbappend \ " # This should only be incremented on significant changes that will @@ -50,6 +52,8 @@ PREFERRED_RPROVIDER_libdevmapper = "lvm2" PREFERRED_PROVIDER_android-tools-conf ?= "android-tools-conf" # Configures whether coreutils or uutils-coreutils is used. PREFERRED_PROVIDER_coreutils = "coreutils" +PREFERRED_PROVIDER_virtual/opencl-icd ?= "opencl-icd-loader" +PREFERRED_RPROVIDER_virtual/opencl-icd ?= "opencl-icd-loader" SIGGEN_EXCLUDERECIPES_ABISAFE += " \ fbset-modes \ @@ -107,4 +111,4 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ DEFAULT_TEST_SUITES:pn-meta-oe-ptest-image = " ${PTESTTESTSUITE}" -NON_MULTILIB_RECIPES:append = " crash" +NON_MULTILIB_RECIPES:append = " crash pahole" diff --git a/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem/0001-include-missing-cstdint.patch b/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem/0001-include-missing-cstdint.patch new file mode 100644 index 0000000000..0560daa4c2 --- /dev/null +++ b/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem/0001-include-missing-cstdint.patch @@ -0,0 +1,32 @@ +From 84e884f99e581515b49d8973538bb17e1e6c0dc0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 26 Jan 2023 20:45:57 -0800 +Subject: [PATCH] include missing <cstdint> + +gcc 13 moved some includes around and as a result <cstdint> is no +longer transitively included [1]. Explicitly include it for +uint{32,64}_t. + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Upstream-Status: Submitted [https://github.com/tomba/rwmem/pull/7] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + librwmem/helpers.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/librwmem/helpers.h b/librwmem/helpers.h +index a0a738b..8d02c9c 100644 +--- a/librwmem/helpers.h ++++ b/librwmem/helpers.h +@@ -1,6 +1,7 @@ + #pragma once + + #include <cerrno> ++#include <cstdint> + #include <string> + #include <vector> + #include <string.h> +-- +2.39.1 + diff --git a/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb b/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb index 7bca24cc0a..8ccdc27a8e 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb @@ -11,25 +11,25 @@ In i2c mode rwmem accesses an i2c peripheral by sending i2c messages to it." LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS += "python3 python3-pybind11" +DEPENDS += "fmt libinih" PV .= "+git${SRCPV}" -SRCREV_rwmem = "3ec3e421211b58e766651c2e3a3a21acf14a1906" -SRCREV_inih = "4b10c654051a86556dfdb634c891b6c3224c4109" +SRCREV = "8416326777b2aada0706539b8f9f6acefa476b16" -SRCREV_FORMAT = "rwmem_inih" - -SRC_URI = " \ - git://github.com/tomba/rwmem.git;protocol=https;name=rwmem;branch=master \ - git://github.com/benhoyt/inih.git;protocol=https;name=inih;nobranch=1;destsuffix=git/ext/inih \ -" +SRC_URI = "git://github.com/tomba/rwmem.git;protocol=https;name=rwmem;branch=master \ + file://0001-include-missing-cstdint.patch" S = "${WORKDIR}/git" -inherit cmake pkgconfig +inherit meson pkgconfig python3native + +PACKAGECONFIG ?= "python static" +PACKAGECONFIG[python] = "-Dpyrwmem=enabled,-Dpyrwmem=disabled,cmake-native python3 python3-pybind11" +PACKAGECONFIG[static] = "-Dstatic-libc=true,-Dstatic-libc=false," -do_install() { - install -D -m 0755 ${B}/bin/rwmem ${D}${bindir}/rwmem - install -D -m 0644 ${B}/lib/librwmem.a ${D}${libdir}/librwmem.a +do_install:append() { + install -D -m 0644 ${B}/librwmem/librwmem.a ${D}${libdir}/librwmem.a } + +FILES:${PN} += "${libdir}/python3.11/site-packages/pyrwmem" diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Unbolt-ubuntu-hack.patch b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Unbolt-ubuntu-hack.patch new file mode 100644 index 0000000000..e58a93b6f6 --- /dev/null +++ b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Unbolt-ubuntu-hack.patch @@ -0,0 +1,26 @@ +From ca126a2832aaff0deef3ba7eaf411dd0dc43b068 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 16 Mar 2023 11:31:14 -0700 +Subject: [PATCH] Unbolt ubuntu hack + +This bites during cross compiling where the target is different than +build host and build host might be ubuntu but that does not matter in +cross compilation case. This fails builds when usrmerge feature is used + +Upstream-Status: Inappropriates [ Cross-compile specific ] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -429,7 +429,7 @@ AC_CHECK_LIB([udev], [udev_device_new_fr + ]) + + dnl Ubuntu's systemd pkg-config seems broken beyond repair. So: +-kernelversion=`cat /proc/version || echo "non-linux"` ++kernelversion="cross-compiled" + AS_CASE([$kernelversion], + [*Ubuntu*],[ + AC_MSG_NOTICE([Hardwiring Ubuntu systemd setup]) diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.2.bb b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.2.bb index 458d9d7cdd..3d474305d7 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.2.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.2.bb @@ -21,6 +21,7 @@ SRC_URI = "http://prdownloads.sourceforge.net/lirc/lirc-${PV}.tar.bz2 \ file://lirc_options.conf \ file://lirc.tmpfiles \ file://0001-Makefile.am-do-not-clobber-PYTHONPATH-from-build-env.patch \ + file://0001-Unbolt-ubuntu-hack.patch \ " SRC_URI[sha256sum] = "3d44ec8274881cf262f160805641f0827ffcc20ade0d85e7e6f3b90e0d3d222a" @@ -39,7 +40,7 @@ PACKAGECONFIG ?= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' x11', '', d)} \ " -CACHED_CONFIGUREVARS = "HAVE_WORKING_POLL=yes" +CACHED_CONFIGUREVARS = "HAVE_WORKING_POLL=yes SH_PATH=/bin/sh" #EXTRA_OEMAKE = 'SUBDIRS="lib daemons tools"' @@ -50,9 +51,9 @@ do_configure:append() { # Create PYTHON_TARBALL which LIRC needs for install-nodist_pkgdataDATA do_install:prepend() { - rm -rf ${WORKDIR}/${PN}-${PV}/python-pkg/dist/ - mkdir ${WORKDIR}/${PN}-${PV}/python-pkg/dist/ - tar --exclude='${WORKDIR}/${PN}-${PV}/python-pkg/*' -czf ${WORKDIR}/${PN}-${PV}/python-pkg/dist/${PN}-${PV}.tar.gz ${S} + rm -rf ${S}/python-pkg/dist/ + mkdir ${S}/python-pkg/dist/ + tar --exclude='${S}/python-pkg/*' -czf ${S}/python-pkg/dist/${BP}.tar.gz ${S} } # In code, path to python is a variable that is replaced with path to native version of it diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-Makefile-do-not-use-Werror.patch b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-Makefile-do-not-use-Werror.patch index 613858f6fd..b8c48d5403 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-Makefile-do-not-use-Werror.patch +++ b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-Makefile-do-not-use-Werror.patch @@ -10,7 +10,7 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de> 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile -index 0368e41..53d6a9d 100644 +index 97973ce..78273ff 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,6 @@ BUILDFLAGS = \ @@ -20,7 +20,7 @@ index 0368e41..53d6a9d 100644 - -Werror \ $(NULL) - SRCS = \ + TESTFLAGS = \ -- -2.25.1 +2.34.1 diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-Makefile-fix-parallel-build-failure.patch b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-Makefile-fix-parallel-build-failure.patch deleted file mode 100644 index 2149ee30cd..0000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-Makefile-fix-parallel-build-failure.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 2e84550b47b475d830622f41576992a1d45d6af0 Mon Sep 17 00:00:00 2001 -From: Zhao Yi <38274519+yizhao1@users.noreply.github.com> -Date: Tue, 15 Mar 2022 19:28:26 +0800 -Subject: [PATCH] Makefile: fix parallel build failure (#267) - -* Makefile: fix parallel build failure - -Add src/_features.h as dependency for dbus.o to fix the parallel build -failure: -src/dbus.c:17:10: fatal error: _features.h: No such file or directory - -Upstream-Status: Backport -[https://github.com/canonical/netplan/commit/2e84550b47b475d830622f41576992a1d45d6af0] - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 0368e41..8ac7432 100644 ---- a/Makefile -+++ b/Makefile -@@ -52,7 +52,7 @@ NOSETESTS3 ?= $(shell command -v nosetests-3 || command -v nosetests3 || echo tr - - default: netplan/_features.py generate netplan-dbus dbus/io.netplan.Netplan.service doc/netplan.html doc/netplan.5 doc/netplan-generate.8 doc/netplan-apply.8 doc/netplan-try.8 doc/netplan-dbus.8 doc/netplan-get.8 doc/netplan-set.8 - --%.o: src/%.c -+%.o: src/%.c src/_features.h - $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -c $^ `pkg-config --cflags --libs glib-2.0 gio-2.0 yaml-0.1 uuid` - - libnetplan.so.$(NETPLAN_SOVER): $(SRCS) abicompat.lds -@@ -62,7 +62,7 @@ libnetplan.so.$(NETPLAN_SOVER): $(SRCS) abicompat.lds - generate: libnetplan.so.$(NETPLAN_SOVER) generate.o - $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(filter-out $<,$^) -L. -lnetplan `pkg-config --cflags --libs glib-2.0 gio-2.0 yaml-0.1 uuid` - --netplan-dbus: libnetplan.so.$(NETPLAN_SOVER) src/_features.h dbus.o -+netplan-dbus: libnetplan.so.$(NETPLAN_SOVER) dbus.o - $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(filter-out $<,$(patsubst %.h,,$^)) -L. -lnetplan `pkg-config --cflags --libs libsystemd glib-2.0 gio-2.0 yaml-0.1 uuid` - - src/_features.h: src/[^_]*.[hc] --- -2.25.1 - diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_0.104.bb b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_0.106.bb index ea944fa9db..8c1eaa5503 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_0.104.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_0.106.bb @@ -11,12 +11,11 @@ LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" S = "${WORKDIR}/git" -SRCREV = "3e522b7255310bdecca6c781137741dfc4abc021" -PV = "0.104" +SRCREV = "15ce044d1df27b5057556d84d0d14beef8dd4e4d" +PV = "0.106" SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=main;protocol=https \ file://0001-Makefile-do-not-use-Werror.patch \ - file://0001-Makefile-fix-parallel-build-failure.patch \ " SRC_URI:append:libc-musl = " file://0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch" @@ -27,7 +26,7 @@ PACKAGECONFIG ?= "" PACKAGECONFIG[tests] = ",,,python3-nose python3-coverage python3-netifaces python3-pycodestyle python3-pyflakes python3-pyyaml" -RDEPENDS:${PN} = "python3 python3-core python3-netifaces python3-pyyaml util-linux-libuuid libnetplan" +RDEPENDS:${PN} = "python3 python3-core python3-netifaces python3-pyyaml util-linux-libuuid libnetplan python3-dbus python3-rich" inherit pkgconfig systemd diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.2.bb b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.3.bb index 7c3197778f..0987522ac8 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.2.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.3.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] = "06fdb1000cb3f25ff78a2441c0e0f9e5bb2abec3eff907d57f58c1709c110217" +SRC_URI[sha256sum] = "4d27661113c54e3b0998328f15ca7fd9e4837d1975c7c213595cb940f4b11484" inherit pypi setuptools3 diff --git a/meta-oe/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-meta-oe.bbappend b/meta-oe/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-meta-oe.bbappend index 51197c27f3..c3d4cbc500 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-meta-oe.bbappend +++ b/meta-oe/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-meta-oe.bbappend @@ -3,10 +3,10 @@ RDEPENDS:packagegroup-meta-oe-devtools += "\ rwmem \ mongodb \ " -packagegroup-meta-oe-devtools:remove:riscv64 = "mongodb" -packagegroup-meta-oe-devtools:remove:riscv32 = "mongodb" -packagegroup-meta-oe-devtools:remove:mipsarch = "mongodb" -packagegroup-meta-oe-devtools:remove:powerpc = "mongodb" +RDEPENDS:packagegroup-meta-oe-devtools:remove:riscv64 = "mongodb" +RDEPENDS:packagegroup-meta-oe-devtools:remove:riscv32 = "mongodb" +RDEPENDS:packagegroup-meta-oe-devtools:remove:mipsarch = "mongodb" +RDEPENDS:packagegroup-meta-oe-devtools:remove:powerpc = "mongodb" RDEPENDS:packagegroup-meta-oe-connectivity += "\ lirc \ diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Fix-type-mismatch-on-32bit-arches.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Fix-type-mismatch-on-32bit-arches.patch new file mode 100644 index 0000000000..def17995dc --- /dev/null +++ b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Fix-type-mismatch-on-32bit-arches.patch @@ -0,0 +1,33 @@ +From 81eabea4e4da55cddfe8bcfcbc3759fa90948254 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 3 Mar 2023 14:13:29 -0800 +Subject: [PATCH] Fix type mismatch on 32bit arches + +std::set::size returns an unsigned integral type. +std::max call therefore gets (unsigned int, unsigned long) here. +Type of both arguments is not same, so its ambigous +and there is no matching std::max implementation for mismatching +arguments. std::max expects both input variables to be of +same type, max(int,int) etc.. + +Fixes +src/mongo/util/processinfo_linux.cpp:424:16: error: no matching function for call to 'max' + return std::max(socketIds.size(), 1ul); + +Upstream-Status: Submitted [https://jira.mongodb.org/browse/SERVER-74633] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/mongo/util/processinfo_linux.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/mongo/util/processinfo_linux.cpp ++++ b/src/mongo/util/processinfo_linux.cpp +@@ -421,7 +421,7 @@ public: + + // On ARM64, the "physical id" field is unpopulated, causing there to be 0 sockets found. In + // this case, we default to 1. +- return std::max(socketIds.size(), 1ul); ++ return std::max(static_cast<unsigned long>(socketIds.size()), 1ul); + } + + /** diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-apply-msvc-workaround-for-clang-16.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-apply-msvc-workaround-for-clang-16.patch new file mode 100644 index 0000000000..096269308d --- /dev/null +++ b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-apply-msvc-workaround-for-clang-16.patch @@ -0,0 +1,32 @@ +From 03047c81b2601362bcf79cae67e06d1fba0a6101 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 2 Mar 2023 20:17:57 -0800 +Subject: [PATCH] apply msvc workaround for clang >= 16 + +This avoids a new Werror found with clang16 + +boost-1.70.0/boost/mpl/aux_/integral_wrapper.hpp:73:31: error: integer value -1 is outside the valid range of values [0, 3] for this enumeration type [-Wenum-constexpr-conversion] + typedef AUX_WRAPPER_INST( BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (value - 1)) ) prior; + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + .../boost-1.70.0/boost/mpl/aux_/integral_wrapper.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/third_party/boost-1.70.0/boost/mpl/aux_/integral_wrapper.hpp b/src/third_party/boost-1.70.0/boost/mpl/aux_/integral_wrapper.hpp +index 6bc05f7e96e..6bb8d24c9ce 100644 +--- a/src/third_party/boost-1.70.0/boost/mpl/aux_/integral_wrapper.hpp ++++ b/src/third_party/boost-1.70.0/boost/mpl/aux_/integral_wrapper.hpp +@@ -56,7 +56,7 @@ struct AUX_WRAPPER_NAME + // have to #ifdef here: some compilers don't like the 'N + 1' form (MSVC), + // while some other don't like 'value + 1' (Borland), and some don't like + // either +-#if BOOST_WORKAROUND(__EDG_VERSION__, <= 243) ++#if BOOST_WORKAROUND(__EDG_VERSION__, <= 243) || __clang_major__ > 15 + private: + BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, next_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N + 1))); + BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, prior_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N - 1))); +-- +2.39.2 + diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-free_mon-Include-missing-cstdint.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-free_mon-Include-missing-cstdint.patch new file mode 100644 index 0000000000..1373d1a794 --- /dev/null +++ b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-free_mon-Include-missing-cstdint.patch @@ -0,0 +1,26 @@ +From 5d8218b8a1b5bc71e2a0cf543a000e194daba599 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 29 Jan 2023 17:15:30 -0800 +Subject: [PATCH] free_mon: Include missing <cstdint> + +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 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/mongo/db/free_mon/free_mon_options.h | 1 + + 1 file changed, 1 insertion(+) + +--- a/src/mongo/db/free_mon/free_mon_options.h ++++ b/src/mongo/db/free_mon/free_mon_options.h +@@ -29,6 +29,7 @@ + + #pragma once + ++#include <cstdint> + #include <string> + #include <vector> + diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-server-Adjust-the-cache-alignment-assumptions.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-server-Adjust-the-cache-alignment-assumptions.patch index bf083c85f4..52c9df9b1b 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-server-Adjust-the-cache-alignment-assumptions.patch +++ b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-server-Adjust-the-cache-alignment-assumptions.patch @@ -15,7 +15,7 @@ src/mongo/db/stats/counters.h:185:47: error: static assertion failed: cache line The structure need to ensure true sharing for both the elements so align it to hardware_constructive_interference_size instead -Upstream-Status: Reported [https://jira.mongodb.org/browse/SERVER-65664] +Upstream-Status: Inappropriate [https://jira.mongodb.org/browse/SERVER-65664] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb index 6e93ec9b0c..0ce58b13c4 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb @@ -11,9 +11,9 @@ DEPENDS = "openssl libpcap zlib boost curl python3 \ inherit scons dos2unix siteinfo python3native systemd useradd -PV = "4.4.13" -#v4.4.13 -SRCREV = "df25c71b8674a78e17468f48bcda5285decb9246" +PV = "4.4.19" +#v4.4.18 +SRCREV = "9a996e0ad993148b9650dc402e6d3b1804ad3b8a" SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4;protocol=https \ file://0001-Tell-scons-to-use-build-settings-from-environment-va.patch \ file://0001-Use-long-long-instead-of-int64_t.patch \ @@ -33,6 +33,9 @@ SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4;protocol=https \ file://0001-add-explict-static_cast-size_t-to-maxMemoryUsageByte.patch \ file://0001-server-Adjust-the-cache-alignment-assumptions.patch \ file://0001-The-std-lib-unary-binary_function-base-classes-are-d.patch \ + file://0001-free_mon-Include-missing-cstdint.patch \ + file://0001-apply-msvc-workaround-for-clang-16.patch \ + file://0001-Fix-type-mismatch-on-32bit-arches.patch \ " SRC_URI:append:libc-musl ="\ file://0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch \ @@ -47,11 +50,8 @@ SRC_URI:append:toolchain-clang = "\ S = "${WORKDIR}/git" -CVE_CHECK_IGNORE += "\ - CVE-2014-8180 \ - CVE-2017-18381 \ - CVE-2017-2665 \ -" +CVE_STATUS[CVE-2014-8180] = "not-applicable-config: Not affecting our configuration so it can be safely ignored." +CVE_STATUS[CVE-2017-2665] = "not-applicable-config: Not affecting our configuration so it can be safely ignored." COMPATIBLE_HOST ?= '(x86_64|i.86|powerpc64|arm|aarch64).*-linux' @@ -73,8 +73,13 @@ WIREDTIGER ?= "off" WIREDTIGER:x86-64 = "on" WIREDTIGER:aarch64 = "on" +# ld.gold: fatal error: build/59f4f0dd/mongo/mongod: Structure needs cleaning +LDFLAGS:append:x86:libc-musl = " -fuse-ld=bfd" +LDFLAGS:remove:toolchain-clang = "-fuse-ld=bfd" + EXTRA_OESCONS = "PREFIX=${prefix} \ DESTDIR=${D} \ + MAXLINELENGTH='2097152' \ LIBPATH=${STAGING_LIBDIR} \ LINKFLAGS='${LDFLAGS}' \ CXXFLAGS='${CXXFLAGS}' \ @@ -102,8 +107,8 @@ scons_do_install() { # install binaries install -d ${D}${bindir} for i in mongod mongos mongo; do - if [ -f ${B}/build/opt/mongo/$i ]; then - install -m 0755 ${B}/build/opt/mongo/$i ${D}${bindir} + if [ -f ${B}/build/*/mongo/$i ]; then + install -m 0755 ${B}/build/*/mongo/$i ${D}${bindir} else bbnote "$i does not exist" fi @@ -119,7 +124,7 @@ scons_do_install() { # install mongo data folder install -m 755 -d ${D}${localstatedir}/lib/${BPN} - chown ${PN}:${PN} ${D}${localstatedir}/lib/${BPN} + chown ${BPN}:${BPN} ${D}${localstatedir}/lib/${BPN} # Create /var/log/mongodb in runtime. if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb/0001-CMakeLists.txt-allow-to-set-PYTHON_INSTDIR-from-outs.patch b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb/0001-CMakeLists.txt-allow-to-set-PYTHON_INSTDIR-from-outs.patch new file mode 100644 index 0000000000..474f0f1584 --- /dev/null +++ b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb/0001-CMakeLists.txt-allow-to-set-PYTHON_INSTDIR-from-outs.patch @@ -0,0 +1,67 @@ +From 30c79d1b49839a15c05a0d0ca7e54787cd7988c6 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Thu, 4 May 2023 07:17:57 +0000 +Subject: [PATCH] CMakeLists.txt: allow to set PYTHON_INSTDIR from outside + +CMakeLists.txt used: + +find_package(Python REQUIRED COMPONENTS Interpreter) +execute_process( + COMMAND ${Python_EXECUTABLE} -c + "import os.path, sys, sysconfig; print(os.path.relpath(sysconfig.get_path('purelib'), start=sys.prefix))" + OUTPUT_VARIABLE PYTHON_INSTDIR + OUTPUT_STRIP_TRAILING_WHITESPACE +) + +but with python3native this returns: + +nanopb/0.4.7-r0/git $ ../recipe-sysroot-native/usr/bin/python3-native/python3 -c "import os.path, sys, sysconfig; print(os.path.relpath(sysconfig.get_path('purelib'), start=sys.prefix))" +lib/python3.11/site-packages + +which doesn't respect target libdir which might be lib64 with multilib and with python3targetconfig +it also doesn't work right because of the long relative path: + +nanopb/0.4.7-r0/build $ ../recipe-sysroot-native/usr/bin/python3-native/python3 -c "import os.path, sys, sysconfig; print(os.path.relpath(sysconfig.get_path('purelib'), start=sys.prefix))" +../../../../../../../../../../../../usr/lib64/python3.11/site-packages + +CMake Error at cmake_install.cmake:46 (file): + file cannot create directory: + /OE/lge/build/starfish/nanbield/BUILD/work/o22-starfish-linux/nanopb/0.4.7-r0/image/usr/../../../../../../../../../../../../usr/lib64/python3.11/site-packages/proto. + Maybe need administrative privileges. + +Let CMake variable to be passed from the recipe to avoid this as we're already using +${D}${PYTHON_SITEPACKAGES_DIR} in do_install:append anyway. + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Upstream-Status: Pending +--- + CMakeLists.txt | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8d241c5..7d3f993 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,13 +39,15 @@ if(NOT DEFINED CMAKE_INSTALL_CMAKEDIR) + set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/nanopb") + endif() + +-find_package(Python REQUIRED COMPONENTS Interpreter) +-execute_process( +- COMMAND ${Python_EXECUTABLE} -c +- "import os.path, sys, sysconfig; print(os.path.relpath(sysconfig.get_path('purelib'), start=sys.prefix))" +- OUTPUT_VARIABLE PYTHON_INSTDIR +- OUTPUT_STRIP_TRAILING_WHITESPACE +-) ++if(NOT DEFINED PYTHON_INSTDIR) ++ find_package(Python REQUIRED COMPONENTS Interpreter) ++ execute_process( ++ COMMAND ${Python_EXECUTABLE} -c ++ "import os.path, sys, sysconfig; print(os.path.relpath(sysconfig.get_path('purelib'), start=sys.prefix))" ++ OUTPUT_VARIABLE PYTHON_INSTDIR ++ OUTPUT_STRIP_TRAILING_WHITESPACE ++ ) ++endif() + + if(nanopb_BUILD_GENERATOR) + set(generator_protos nanopb) diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb_0.4.7.bb b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb_0.4.7.bb index 897caea2a7..9ad558146c 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb_0.4.7.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb_0.4.7.bb @@ -4,13 +4,17 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9db4b73a55a3994384112efcdb37c01f" DEPENDS = "protobuf-native" -SRC_URI = "git://github.com/nanopb/nanopb.git;branch=master;protocol=https" +SRC_URI = "git://github.com/nanopb/nanopb.git;branch=master;protocol=https \ + file://0001-CMakeLists.txt-allow-to-set-PYTHON_INSTDIR-from-outs.patch \ +" SRCREV = "b97aa657a706d3ba4a9a6ccca7043c9d6fe41cba" S = "${WORKDIR}/git" inherit cmake python3native +EXTRA_OECMAKE += "-DPYTHON_INSTDIR=${PYTHON_SITEPACKAGES_DIR}" + do_install:append() { install -Dm 0755 ${S}/generator/nanopb_generator.py ${D}${bindir}/nanopb_generator.py install -Dm 0755 ${S}/generator/protoc-gen-nanopb ${D}${bindir}/protoc-gen-nanopb diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-compilation-with-GCC-10.x.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-compilation-with-GCC-10.x.patch deleted file mode 100644 index cd8a69c3fb..0000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-compilation-with-GCC-10.x.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9b07f6a472c24f5e1b65746756764391be0d55e4 Mon Sep 17 00:00:00 2001 -From: Harald Geyer <harald@ccbib.org> -Date: Mon, 10 Feb 2020 13:15:10 +0100 -Subject: [PATCH] Fix compilation with GCC >= 10.x - -Starting with GCC >= 10.x, -fno-common is used as default -instead of -fcommon. This patch fixes the compilation. - -Closes: #148 - -Upstream-Status: Backport -Suggested-by: Conrad Kostecki <conrad@kostecki.com> -Signed-off-by: Harald Geyer <harald@ccbib.org> ---- - clients/lcdproc/iface.c | 1 + - clients/lcdproc/iface.h | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - ---- a/clients/lcdproc/iface.c -+++ b/clients/lcdproc/iface.c -@@ -32,6 +32,7 @@ - #define UNSET_INT -1 - #define UNSET_STR "\01" - -+IfaceInfo iface[MAX_INTERFACES]; - - static int iface_count = 0; /* number of interfaces */ - static char unit_label[10] = "B"; /* default unit label is Bytes */ ---- a/clients/lcdproc/iface.h -+++ b/clients/lcdproc/iface.h -@@ -18,7 +18,7 @@ - /** max number of interfaces in multi-interface mode */ - #define MAX_INTERFACES 3 - --IfaceInfo iface[MAX_INTERFACES]; /* interface info */ -+extern IfaceInfo iface[MAX_INTERFACES]; /* interface info */ - - /** Update screen content */ - int iface_screen(int rep, int display, int *flags_ptr); diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch deleted file mode 100644 index f6a7956db2..0000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a20feee4963bc38975fbaf44bbe85a31825f59db Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 6 Apr 2019 17:28:28 -0700 -Subject: [PATCH 1/3] Fix parallel build (fix port-internal make dependencies) - on many cores - -Upstream-Status: Submitted [https://github.com/lcdproc/lcdproc/pull/142] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - server/drivers/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/server/drivers/Makefile.am b/server/drivers/Makefile.am -index e08f2b2d..4fd2e3f1 100644 ---- a/server/drivers/Makefile.am -+++ b/server/drivers/Makefile.am -@@ -47,11 +47,11 @@ CwLnx_LDADD = libLCD.a libbignum.a - futaba_LDADD = @LIBUSB_LIBS@ @LIBUSB_1_0_LIBS@ libLCD.a - g15_LDADD = @LIBG15@ - glcd_LDADD = libLCD.a @GLCD_DRIVERS@ @FT2_LIBS@ @LIBPNG_LIBS@ @LIBSERDISP@ @LIBUSB_LIBS@ @LIBX11_LIBS@ --glcd_DEPENDENCIES = @GLCD_DRIVERS@ glcd-glcd-render.o -+glcd_DEPENDENCIES = @GLCD_DRIVERS@ glcd-glcd-render.o libLCD.a - glcdlib_LDADD = @LIBGLCD@ - glk_LDADD = libbignum.a - hd44780_LDADD = libLCD.a @HD44780_DRIVERS@ @HD44780_I2C@ @LIBUSB_LIBS@ @LIBFTDI_LIBS@ @LIBUGPIO@ libbignum.a --hd44780_DEPENDENCIES = @HD44780_DRIVERS@ @HD44780_I2C@ -+hd44780_DEPENDENCIES = @HD44780_DRIVERS@ @HD44780_I2C@ libLCD.a libbignum.a - i2500vfd_LDADD = @LIBFTDI_LIBS@ - imon_LDADD = libLCD.a libbignum.a - imonlcd_LDADD = libLCD.a --- -2.24.1 - diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0002-Include-limits.h-for-PATH_MAX-definition.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0002-Include-limits.h-for-PATH_MAX-definition.patch deleted file mode 100644 index eb866bf10a..0000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0002-Include-limits.h-for-PATH_MAX-definition.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d447a05ee560ba5894d2ed4cd93d0475c2f3c08e Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 17 Dec 2019 17:39:32 -0800 -Subject: [PATCH 2/3] Include <limits.h> for PATH_MAX definition - -musl libc exposes the missing include - -Upstream-Status: Submitted [https://github.com/lcdproc/lcdproc/pull/142] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - server/drivers/hidraw_lib.c | 1 + - server/drivers/linux_input.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/server/drivers/hidraw_lib.c b/server/drivers/hidraw_lib.c -index 49b03f20..3b51f279 100644 ---- a/server/drivers/hidraw_lib.c -+++ b/server/drivers/hidraw_lib.c -@@ -8,6 +8,7 @@ - #include <dirent.h> - #include <errno.h> - #include <fcntl.h> -+#include <limits.h> - #include <stdlib.h> - #include <string.h> - #include <sys/ioctl.h> -diff --git a/server/drivers/linux_input.c b/server/drivers/linux_input.c -index 5b914d4c..6fcfc591 100644 ---- a/server/drivers/linux_input.c -+++ b/server/drivers/linux_input.c -@@ -5,6 +5,7 @@ - - #include <dirent.h> - #include <errno.h> -+#include <limits.h> - #include <stdint.h> - #include <stdio.h> - #include <stdlib.h> --- -2.24.1 - diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch deleted file mode 100644 index eed9ceee5e..0000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 7fd144f101fa5c9316d3468ed26f55629afe1305 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 17 Dec 2019 17:55:54 -0800 -Subject: [PATCH 3/3] Fix non x86 platforms on musl - -Musl only specifies in/outb for x86/x86. Use the fallback path in case -musl is used. - -This should fail compilation during the linking stage but for some reason -does not. Will do if -Werror=implicit-function-declaration is specified. - -Original here: https://github.com/openwrt/packages/blob/master/utils/lcdproc/patches/110-in-outb.patch -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - server/drivers/port.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/server/drivers/port.h -+++ b/server/drivers/port.h -@@ -94,7 +94,7 @@ static inline int port_deny_multiple(uns - /* ---------------------------- Linux ------------------------------------ */ - /* Use ioperm, inb and outb in <sys/io.h> (Linux) */ - /* And iopl for higher addresses of PCI LPT cards */ --#if defined HAVE_IOPERM -+#if HAVE_INB - - /* Glibc2 and Glibc1 */ - # ifdef HAVE_SYS_IO_H -@@ -333,7 +333,7 @@ static inline int port_deny_multiple (un - return i386_set_ioperm(port, count, 0); - } - --#else -+#elif defined(__x86__) && defined(__x86_64__) - - /* ------------------------- Everything else ----------------------------- */ - /* Last chance! Use /dev/io and i386 ASM code (BSD4.3 ?) */ ---- a/configure.ac -+++ b/configure.ac -@@ -144,6 +144,7 @@ AC_CHECK_LIB(i386, i386_get_ioperm, - [])] - ) - -+AC_CHECK_FUNCS(inb) - AC_CHECK_FUNCS(iopl) - AC_CHECK_FUNCS(ioperm) - AC_CHECK_HEADERS(sys/io.h) diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb index 76a931666d..4cae4947f2 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb @@ -10,13 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760 \ file://README.md;beginline=107;md5=5db392f043253a2d64b1737068ce6b58" PV = "0.5.9+git${SRCPV}" -SRCREV = "3a3d622d9bb74c44fa67bc20573751a207514134" -SRC_URI = "git://github.com/lcdproc/lcdproc;branch=master;protocol=https \ - file://0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch \ - file://0002-Include-limits.h-for-PATH_MAX-definition.patch \ - file://0003-Fix-non-x86-platforms-on-musl.patch \ - file://0001-Fix-compilation-with-GCC-10.x.patch \ - " +SRCREV = "0e2ce9b9c46c47363436f9ee730f7c71bf455f0f" +SRC_URI = "git://github.com/lcdproc/lcdproc;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/0001-libtrace-Use-XSI-version-of-strerror_r-on-non-glibc-.patch b/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/0001-libtrace-Use-XSI-version-of-strerror_r-on-non-glibc-.patch deleted file mode 100644 index fef71afde5..0000000000 --- a/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/0001-libtrace-Use-XSI-version-of-strerror_r-on-non-glibc-.patch +++ /dev/null @@ -1,35 +0,0 @@ -From e415152b51eacab8705b6b3274cc0d1a274772e0 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 30 Aug 2022 19:54:35 -0700 -Subject: [PATCH] libtrace: Use XSI version of strerror_r on non glibc systems - -The version used is glibc specific therefore make it so -and provide a fallback for non-glibc systems - -Upstream-Status: Submitted [https://github.com/mchehab/rasdaemon/pull/70] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - libtrace/event-parse.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/libtrace/event-parse.c b/libtrace/event-parse.c -index 6c705c3..6b651d5 100644 ---- a/libtrace/event-parse.c -+++ b/libtrace/event-parse.c -@@ -5071,7 +5071,13 @@ int pevent_strerror(struct pevent *pevent, enum pevent_errno errnum, - const char *msg; - - if (errnum >= 0) { -+#if defined(__GLIBC__) - msg = strerror_r(errnum, buf, buflen); -+#else -+ if (strerror_r(errnum, buf, buflen) != 0) -+ snprintf(buf, buflen, "unknown error %i", errnum); -+ msg = buf; -+#endif - if (msg != buf) { - size_t len = strlen(msg); - memcpy(buf, msg, min(buflen - 1, len)); --- -2.37.3 - diff --git a/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.8.bb b/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.8.0.bb index 3a525e8a15..c083a3a37a 100644 --- a/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.8.bb +++ b/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.8.0.bb @@ -4,14 +4,14 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d3070efe0afa3dc41608bd82c00bb0dc" SRC_URI = "git://github.com/mchehab/rasdaemon.git;branch=master;protocol=https \ - file://0001-libtrace-Use-XSI-version-of-strerror_r-on-non-glibc-.patch \ file://rasdaemon.service \ file://init" -SRCREV = "c2255178a49f62c53009a456bc37dd5e37332f09" +SRCREV = "4e83b848e7961af25028f3a2cecf37a63279a2bf" S = "${WORKDIR}/git" +DEPENDS = "libtraceevent" RDEPENDS:${BPN} = "perl perl-module-file-basename perl-module-file-find perl-module-file-spec perl-module-getopt-long \ perl-module-posix perl-module-file-glob libdbi-perl libdbd-sqlite-perl" diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/10-adbd-configfs.conf b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/10-adbd-configfs.conf new file mode 100644 index 0000000000..ddf155a907 --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/10-adbd-configfs.conf @@ -0,0 +1,4 @@ +[Service] +ExecStartPre=/usr/bin/android-gadget-setup +ExecStartPost=/usr/bin/android-gadget-start +ExecStopPost=/usr/bin/android-gadget-cleanup diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-cleanup b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-cleanup new file mode 100644 index 0000000000..517227d4a6 --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-cleanup @@ -0,0 +1,24 @@ +#!/bin/sh + +[ -d /sys/kernel/config/usb_gadget ] || exit 0 + +cd /sys/kernel/config/usb_gadget + +cd adb + +echo "" > UDC || true + +killall adbd || true + +umount /dev/usb-ffs/adb + +rm configs/c.1/ffs.usb0 + +rmdir configs/c.1/strings/0x409 +rmdir configs/c.1 + +rmdir functions/ffs.usb0 +rmdir strings/0x409 + +cd .. +rmdir adb diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-setup b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-setup new file mode 100644 index 0000000000..e44d1bacbe --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-setup @@ -0,0 +1,35 @@ +#!/bin/sh + +set -e + +manufacturer=RPB +model="Android device" +serial=0123456789ABCDEF + +if [ -r /etc/android-gadget-setup.machine ] ; then + . /etc/android-gadget-setup.machine +fi + +[ -d /sys/kernel/config/usb_gadget ] || modprobe libcomposite + +cd /sys/kernel/config/usb_gadget + +[ -d adb ] && /usr/bin/android-gadget-cleanup || true + +mkdir adb +cd adb + +mkdir configs/c.1 +mkdir functions/ffs.usb0 +mkdir strings/0x409 +mkdir configs/c.1/strings/0x409 +echo 0x18d1 > idVendor +echo 0xd002 > idProduct +echo "$serial" > strings/0x409/serialnumber +echo "$manufacturer" > strings/0x409/manufacturer +echo "$model" > strings/0x409/product +echo "Conf 1" > configs/c.1/strings/0x409/configuration +ln -s functions/ffs.usb0 configs/c.1 + +mkdir -p /dev/usb-ffs/adb +mount -t functionfs usb0 /dev/usb-ffs/adb diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-start b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-start new file mode 100644 index 0000000000..ca6c3df275 --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-start @@ -0,0 +1,7 @@ +#!/bin/sh + +set -e + +sleep 3 + +ls /sys/class/udc/ > /sys/kernel/config/usb_gadget/adb/UDC diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs_1.0.bb b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs_1.0.bb new file mode 100644 index 0000000000..1c26c7207b --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs_1.0.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "Various utilities from Android - corresponding configuration files for using ConfigFS" +SECTION = "console/utils" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +SRC_URI = " \ + file://android-gadget-setup \ + file://android-gadget-start \ + file://android-gadget-cleanup \ + file://10-adbd-configfs.conf \ +" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/android-gadget-setup ${D}${bindir} + install -m 0755 ${WORKDIR}/android-gadget-start ${D}${bindir} + install -m 0755 ${WORKDIR}/android-gadget-cleanup ${D}${bindir} + + if [ -r ${WORKDIR}/android-gadget-setup.machine ] ; then + install -d ${D}${sysconfdir} + install -m 0644 ${WORKDIR}/android-gadget-setup.machine ${D}${sysconfdir} + fi + + install -d ${D}${systemd_unitdir}/system/android-tools-adbd.service.d + install -m 0644 ${WORKDIR}/10-adbd-configfs.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d +} + +FILES:${PN} += " \ + ${systemd_unitdir}/system/ \ +" + +PROVIDES += "android-tools-conf" +RPROVIDES:${PN} = "android-tools-conf" diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf/android-gadget-setup b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf/android-gadget-setup new file mode 100644 index 0000000000..26cf30eddd --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf/android-gadget-setup @@ -0,0 +1,37 @@ +#!/bin/sh + +[ ! -e /dev/pts ] && mkdir -p /dev/pts +[ ! -e /dev/pts/0 ] && mount devpts /dev/pts -t devpts + +# TODO enable the lines below once we have support for getprop +# retrieve the product info from Android +# manufacturer=$(getprop ro.product.manufacturer Android) +# model=$(getprop ro.product.model Android) +# serial=$(getprop ro.serialno 0123456789ABCDEF) + +#below are now needed in order to use FunctionFS for ADB, tested to work with 3.4+ kernels +if grep -q functionfs /proc/filesystems; then + mkdir -p /dev/usb-ffs/adb + mount -t functionfs adb /dev/usb-ffs/adb + #android-gadget-setup doesn't provide below 2 and without them it won't work, so we provide them here. + echo adb > /sys/class/android_usb/android0/f_ffs/aliases + echo ffs > /sys/class/android_usb/android0/functions +fi + +manufacturer="$(cat /system/build.prop | grep -o 'ro.product.manufacturer=.*' | cut -d'=' -f 2)" +model="$(cat /system/build.prop | grep -o 'ro.product.model=.*' | cut -d'=' -f 2)" +# get the device serial number from /proc/cmdline directly(since we have no getprop on +# GNU/Linux) +serial="$(cat /proc/cmdline | sed 's/.*androidboot.serialno=//' | sed 's/ .*//')" + +echo $serial > /sys/class/android_usb/android0/iSerial +echo $manufacturer > /sys/class/android_usb/android0/iManufacturer +echo $model > /sys/class/android_usb/android0/iProduct + +echo "0" > /sys/class/android_usb/android0/enable +echo "18d1" > /sys/class/android_usb/android0/idVendor +echo "D002" > /sys/class/android_usb/android0/idProduct +echo "adb" > /sys/class/android_usb/android0/functions +echo "1" > /sys/class/android_usb/android0/enable + +sleep 4 diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb new file mode 100644 index 0000000000..b63ccbb080 --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Different utilities from Android - corresponding configuration files" +SECTION = "console/utils" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +SRC_URI = "file://android-gadget-setup" + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/android-gadget-setup ${D}${bindir} +} + +python () { + pn = d.getVar('PN') + profprov = d.getVar("PREFERRED_PROVIDER_" + pn) + if profprov and pn != profprov: + raise bb.parse.SkipRecipe("PREFERRED_PROVIDER_%s set to %s, not %s" % (pn, profprov, pn)) +} diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0001-Fixes-for-yocto-build.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0001-Fixes-for-yocto-build.patch new file mode 100644 index 0000000000..dcf27d805e --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0001-Fixes-for-yocto-build.patch @@ -0,0 +1,162 @@ +From 5de85f8273c7284aa93e35c40f025d4d43d42df9 Mon Sep 17 00:00:00 2001 +From: Etienne Cordonnier <ecordonnier@snap.com> +Date: Thu, 16 Mar 2023 18:59:35 +0100 +Subject: [PATCH] Fixes for yocto build + +Signed-off-by: JJ Robertson <jrobertson@snapchat.com> +[rebased on version 29] +Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com> + +--- + system/core/adb/daemon/file_sync_service.cpp | 4 ++-- + system/core/adb/daemon/framebuffer_service.h | 2 -- + system/core/adb/daemon/main.cpp | 5 +++-- + system/core/adb/daemon/restart_service.h | 2 -- + system/core/adb/daemon/services.cpp | 6 ++---- + system/core/adb/daemon/shell_service.cpp | 5 ++++- + system/core/adb/types.h | 1 + + 7 files changed, 12 insertions(+), 13 deletions(-) + +diff --git a/system/core/adb/daemon/file_sync_service.cpp b/system/core/adb/daemon/file_sync_service.cpp +index d6af7087..92e7087a 100644 +--- a/system/core/adb/daemon/file_sync_service.cpp ++++ b/system/core/adb/daemon/file_sync_service.cpp +@@ -111,7 +111,7 @@ static bool secure_mkdirs(const std::string& path) { + partial_path += path_component; + + if (should_use_fs_config(partial_path)) { +- fs_config(partial_path.c_str(), 1, nullptr, &uid, &gid, &mode, &capabilities); ++ // fs_config(partial_path.c_str(), 1, nullptr, &uid, &gid, &mode, &capabilities); + } + if (adb_mkdir(partial_path.c_str(), mode) == -1) { + if (errno != EEXIST) { +@@ -469,7 +469,7 @@ static bool do_send(int s, const std::string& spec, std::vector<char>& buffer) { + uint64_t capabilities = 0; + if (should_use_fs_config(path)) { + unsigned int broken_api_hack = mode; +- fs_config(path.c_str(), 0, nullptr, &uid, &gid, &broken_api_hack, &capabilities); ++ // fs_config(path.c_str(), 0, nullptr, &uid, &gid, &broken_api_hack, &capabilities); + mode = broken_api_hack; + } + +diff --git a/system/core/adb/daemon/framebuffer_service.h b/system/core/adb/daemon/framebuffer_service.h +index bab44be3..264da597 100644 +--- a/system/core/adb/daemon/framebuffer_service.h ++++ b/system/core/adb/daemon/framebuffer_service.h +@@ -18,6 +18,4 @@ + + #include "adb_unique_fd.h" + +-#if defined(__ANDROID__) + void framebuffer_service(unique_fd fd); +-#endif +diff --git a/system/core/adb/daemon/main.cpp b/system/core/adb/daemon/main.cpp +index 3322574c..e807d13d 100644 +--- a/system/core/adb/daemon/main.cpp ++++ b/system/core/adb/daemon/main.cpp +@@ -208,6 +208,9 @@ int adbd_main(int server_port) { + umask(0); + + signal(SIGPIPE, SIG_IGN); ++ signal(SIGINT, SIG_DFL); ++ signal(SIGQUIT, SIG_DFL); ++ + + #if defined(__BIONIC__) + auto fdsan_level = android_fdsan_get_error_level(); +@@ -254,13 +257,11 @@ int adbd_main(int server_port) { + + bool is_usb = false; + +-#if defined(__ANDROID__) + if (access(USB_FFS_ADB_EP0, F_OK) == 0) { + // Listen on USB. + usb_init(); + is_usb = true; + } +-#endif + + // If one of these properties is set, also listen on that port. + // If one of the properties isn't set and we couldn't listen on usb, listen +diff --git a/system/core/adb/daemon/restart_service.h b/system/core/adb/daemon/restart_service.h +index 19840bd5..7a97614b 100644 +--- a/system/core/adb/daemon/restart_service.h ++++ b/system/core/adb/daemon/restart_service.h +@@ -18,9 +18,7 @@ + + #include "adb_unique_fd.h" + +-#if defined(__ANDROID__) + void restart_root_service(unique_fd fd); + void restart_unroot_service(unique_fd fd); + void restart_tcp_service(unique_fd fd, int port); + void restart_usb_service(unique_fd fd); +-#endif +diff --git a/system/core/adb/daemon/services.cpp b/system/core/adb/daemon/services.cpp +index 4ec90d27..d8541c23 100644 +--- a/system/core/adb/daemon/services.cpp ++++ b/system/core/adb/daemon/services.cpp +@@ -156,7 +156,7 @@ static void spin_service(unique_fd fd) { + } + #endif + // Fall through +- std::string cmd = "/system/bin/reboot "; ++ std::string cmd = "/sbin/reboot "; + cmd += name; + return StartSubprocess(cmd, nullptr, SubprocessType::kRaw, SubprocessProtocol::kNone); + } +@@ -265,11 +265,10 @@ unique_fd daemon_service_to_fd(std::string_view name, atransport* transport) { + } + #endif + +-#if defined(__ANDROID__) + if (name.starts_with("framebuffer:")) { + return create_service_thread("fb", framebuffer_service); + } else if (android::base::ConsumePrefix(&name, "remount:")) { +- std::string cmd = "/system/bin/remount "; ++ std::string cmd = "/sbin/remount "; + cmd += name; + return StartSubprocess(cmd, nullptr, SubprocessType::kRaw, SubprocessProtocol::kNone); + } else if (android::base::ConsumePrefix(&name, "reboot:")) { +@@ -303,7 +302,6 @@ unique_fd daemon_service_to_fd(std::string_view name, atransport* transport) { + } else if (name.starts_with("usb:")) { + return create_service_thread("usb", restart_usb_service); + } +-#endif + + if (android::base::ConsumePrefix(&name, "dev:")) { + return unique_fd{unix_open(name, O_RDWR | O_CLOEXEC)}; +diff --git a/system/core/adb/daemon/shell_service.cpp b/system/core/adb/daemon/shell_service.cpp +index f62032d0..ebcfe18d 100644 +--- a/system/core/adb/daemon/shell_service.cpp ++++ b/system/core/adb/daemon/shell_service.cpp +@@ -273,13 +273,16 @@ bool Subprocess::ForkAndExec(std::string* error) { + env["HOSTNAME"] = GetHostName(); + env["LOGNAME"] = pw->pw_name; + env["SHELL"] = pw->pw_shell; +- env["TMPDIR"] = "/data/local/tmp"; + env["USER"] = pw->pw_name; + } + + if (!terminal_type_.empty()) { + env["TERM"] = terminal_type_; + } ++ if (env.find("PS1") == env.end()) { ++ env["PS1"] = "\\h:\\w\\$ "; ++ } ++ + + std::vector<std::string> joined_env; + for (const auto& it : env) { +diff --git a/system/core/adb/types.h b/system/core/adb/types.h +index c619fffc..f8e0f521 100644 +--- a/system/core/adb/types.h ++++ b/system/core/adb/types.h +@@ -22,6 +22,7 @@ + #include <memory> + #include <utility> + #include <vector> ++#include <string.h> + + #include <android-base/logging.h> + diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0002-android-tools-modifications-to-make-it-build-in-yoct.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0002-android-tools-modifications-to-make-it-build-in-yoct.patch new file mode 100644 index 0000000000..2b95ad2b0a --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0002-android-tools-modifications-to-make-it-build-in-yoct.patch @@ -0,0 +1,366 @@ +From fe211cbc305a9316c1d4da2f086d6a50f1c92188 Mon Sep 17 00:00:00 2001 +From: Etienne Cordonnier <ecordonnier@snap.com> +Date: Fri, 17 Mar 2023 10:33:11 +0100 +Subject: [PATCH] android-tools: modifications to make it build in yocto + +- Fix relocation errors on aarch64, e.g.: +"relocation R_AARCH64_ADR_PREL_PG_HI21 against symbol `_ZTV19SparseFileBufSource' which may bind externally can not be used when making a shared object; recompile with -fPIC" + +- use ln -f to avoid error "File exists" on incremental builds + +- fix missing headers + +Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com> + +--- + debian/external/boringssl/libcrypto.mk | 1 + + debian/system/core/append2simg.mk | 2 +- + debian/system/core/fastboot.mk | 2 +- + debian/system/core/img2simg.mk | 2 +- + debian/system/core/libbacktrace.mk | 8 ++++---- + debian/system/core/libbase.mk | 5 +++-- + debian/system/core/libcutils.mk | 5 +++-- + debian/system/core/liblog.mk | 3 ++- + debian/system/core/libsparse.mk | 5 +++-- + debian/system/core/libutils.mk | 2 +- + debian/system/core/libziparchive.mk | 5 +++-- + debian/system/core/simg2img.mk | 2 +- + debian/system/core/simg2simg.mk | 2 +- + frameworks/native/libs/adbd_auth/adbd_auth.cpp | 2 ++ + system/core/adb/adb_listeners.cpp | 12 ++++++------ + system/core/adb/transport_local.cpp | 2 +- + 16 files changed, 34 insertions(+), 26 deletions(-) + +diff --git a/debian/external/boringssl/libcrypto.mk b/debian/external/boringssl/libcrypto.mk +index c0ea54f4..b3a77bfd 100644 +--- a/debian/external/boringssl/libcrypto.mk ++++ b/debian/external/boringssl/libcrypto.mk +@@ -27,6 +27,7 @@ CPPFLAGS += \ + -DBORINGSSL_IMPLEMENTATION \ + -DBORINGSSL_SHARED_LIBRARY \ + -DOPENSSL_SMALL \ ++ -DOPENSSL_NO_ASM \ + -Iexternal/boringssl/src/crypto \ + -Iexternal/boringssl/src/include \ + +diff --git a/debian/system/core/append2simg.mk b/debian/system/core/append2simg.mk +index 1599bdb8..598c751d 100644 +--- a/debian/system/core/append2simg.mk ++++ b/debian/system/core/append2simg.mk +@@ -11,7 +11,7 @@ CPPFLAGS += \ + + LDFLAGS += \ + -Ldebian/out/system/core \ +- -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \ ++ -Wl,-rpath='$$ORIGIN/../lib/android' \ + -lbase \ + -llog \ + -lpthread \ +diff --git a/debian/system/core/fastboot.mk b/debian/system/core/fastboot.mk +index d5c9a285..a59ba1a4 100644 +--- a/debian/system/core/fastboot.mk ++++ b/debian/system/core/fastboot.mk +@@ -49,7 +49,7 @@ CPPFLAGS += \ + + LDFLAGS += \ + -Ldebian/out/system/core \ +- -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \ ++ -Wl,-rpath='$$ORIGIN/../lib/android' \ + -fuse-ld=gold \ + -lbase \ + -lcutils \ +diff --git a/debian/system/core/img2simg.mk b/debian/system/core/img2simg.mk +index 11adf014..8baf5ba5 100644 +--- a/debian/system/core/img2simg.mk ++++ b/debian/system/core/img2simg.mk +@@ -11,7 +11,7 @@ CPPFLAGS += \ + + LDFLAGS += \ + -Ldebian/out/system/core \ +- -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \ ++ -Wl,-rpath='$$ORIGIN/../lib/android' \ + -lbase \ + -llog \ + -lpthread \ +diff --git a/debian/system/core/libbacktrace.mk b/debian/system/core/libbacktrace.mk +index e3411d76..86e69874 100644 +--- a/debian/system/core/libbacktrace.mk ++++ b/debian/system/core/libbacktrace.mk +@@ -1,3 +1,4 @@ ++include rules_yocto.mk + include /usr/share/dpkg/architecture.mk + + NAME = libbacktrace +@@ -83,10 +84,9 @@ CPPFLAGS += \ + LDFLAGS += \ + -L/usr/lib/p7zip \ + -Ldebian/out/system/core \ +- -Wl,-rpath=/usr/lib/p7zip \ +- -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \ ++ -Wl,-rpath='$$ORIGIN' \ + -Wl,-soname,$(NAME).so.0 \ +- -l:7z.so \ ++ -l7z \ + -lbase \ + -llog \ + -lpthread \ +@@ -101,7 +101,7 @@ endif + build: $(OBJECTS_CXX) $(OBJECTS_ASSEMBLY) debian/out/external/libunwind/libunwind.a + mkdir -p debian/out/system/core + $(CXX) $^ -o debian/out/system/core/$(NAME).so.0 $(LDFLAGS) +- cd debian/out/system/core && ln -s $(NAME).so.0 $(NAME).so ++ cd debian/out/system/core && ln -sf $(NAME).so.0 $(NAME).so + + $(OBJECTS_CXX): %.o: %.cpp + $(CXX) -c -o $@ $< $(CXXFLAGS) $(CPPFLAGS) +diff --git a/debian/system/core/libbase.mk b/debian/system/core/libbase.mk +index d2b074ba..8a90d6de 100644 +--- a/debian/system/core/libbase.mk ++++ b/debian/system/core/libbase.mk +@@ -1,3 +1,4 @@ ++include rules_yocto.mk + NAME = libbase + + SOURCES = \ +@@ -30,7 +31,7 @@ CPPFLAGS += \ + + LDFLAGS += \ + -Ldebian/out/system/core \ +- -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \ ++ -Wl,-rpath='$$ORIGIN' \ + -Wl,-soname,$(NAME).so.0 \ + -llog \ + -lpthread \ +@@ -44,7 +45,7 @@ endif + + build: $(OBJECTS) + $(CXX) $^ -o debian/out/system/core/$(NAME).so.0 $(LDFLAGS) +- cd debian/out/system/core && ln -s $(NAME).so.0 $(NAME).so ++ cd debian/out/system/core && ln -sf $(NAME).so.0 $(NAME).so + + $(OBJECTS): %.o: %.cpp + $(CXX) -c -o $@ $< $(CXXFLAGS) $(CPPFLAGS) +diff --git a/debian/system/core/libcutils.mk b/debian/system/core/libcutils.mk +index 9d928b56..c22b0965 100644 +--- a/debian/system/core/libcutils.mk ++++ b/debian/system/core/libcutils.mk +@@ -1,3 +1,4 @@ ++include rules_yocto.mk + NAME = libcutils + + libcutils_nonwindows_sources = \ +@@ -47,7 +48,7 @@ CPPFLAGS += \ + + LDFLAGS += \ + -Ldebian/out/system/core \ +- -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \ ++ -Wl,-rpath='$$ORIGIN' \ + -Wl,-soname,$(NAME).so.0 \ + -lbase \ + -llog \ +@@ -56,7 +57,7 @@ LDFLAGS += \ + + build: $(OBJECTS_C) $(OBJECTS_CXX) + $(CXX) $^ -o debian/out/system/core/$(NAME).so.0 $(LDFLAGS) +- cd debian/out/system/core && ln -s $(NAME).so.0 $(NAME).so ++ cd debian/out/system/core && ln -sf $(NAME).so.0 $(NAME).so + + $(OBJECTS_C): %.o: %.c + $(CC) -c -o $@ $< $(CFLAGS) $(CPPFLAGS) +diff --git a/debian/system/core/liblog.mk b/debian/system/core/liblog.mk +index f8c3d7fe..34a07341 100644 +--- a/debian/system/core/liblog.mk ++++ b/debian/system/core/liblog.mk +@@ -1,3 +1,4 @@ ++include rules_yocto.mk + NAME = liblog + + liblog_sources = \ +@@ -35,7 +36,7 @@ LDFLAGS += \ + build: $(OBJECTS) + mkdir -p debian/out/system/core + $(CXX) $^ -o debian/out/system/core/$(NAME).so.0 $(LDFLAGS) +- cd debian/out/system/core && ln -s $(NAME).so.0 $(NAME).so ++ cd debian/out/system/core && ln -sf $(NAME).so.0 $(NAME).so + + $(OBJECTS): %.o: %.cpp + $(CXX) -c -o $@ $< $(CXXFLAGS) $(CPPFLAGS) +diff --git a/debian/system/core/libsparse.mk b/debian/system/core/libsparse.mk +index c2b2694c..2da12b8e 100644 +--- a/debian/system/core/libsparse.mk ++++ b/debian/system/core/libsparse.mk +@@ -1,3 +1,4 @@ ++include rules_yocto.mk + NAME = libsparse + + SOURCES = \ +@@ -19,7 +20,7 @@ CPPFLAGS += \ + + LDFLAGS += \ + -Ldebian/out/system/core \ +- -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \ ++ -Wl,-rpath='$$ORIGIN' \ + -Wl,-soname,$(NAME).so.0 \ + -lbase \ + -lz \ +@@ -27,7 +28,7 @@ LDFLAGS += \ + + build: $(OBJECTS) + $(CXX) $^ -o debian/out/system/core/$(NAME).so.0 $(LDFLAGS) +- cd debian/out/system/core && ln -s $(NAME).so.0 $(NAME).so ++ cd debian/out/system/core && ln -sf $(NAME).so.0 $(NAME).so + + $(OBJECTS): %.o: %.cpp + $(CXX) -c -o $@ $< $(CXXFLAGS) $(CPPFLAGS) +diff --git a/debian/system/core/libutils.mk b/debian/system/core/libutils.mk +index c37b1d2d..332492c1 100644 +--- a/debian/system/core/libutils.mk ++++ b/debian/system/core/libutils.mk +@@ -41,7 +41,7 @@ CPPFLAGS += \ + + LDFLAGS += \ + -Ldebian/out/system/core \ +- -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \ ++ -Wl,-rpath='$$ORIGIN' \ + -Wl,-soname,$(NAME).so.0 \ + -lbacktrace \ + -lcutils \ +diff --git a/debian/system/core/libziparchive.mk b/debian/system/core/libziparchive.mk +index 1b286b4e..1b7499be 100644 +--- a/debian/system/core/libziparchive.mk ++++ b/debian/system/core/libziparchive.mk +@@ -1,3 +1,4 @@ ++include rules_yocto.mk + NAME = libziparchive + + SOURCES = \ +@@ -19,7 +20,7 @@ CPPFLAGS += \ + + LDFLAGS += \ + -Ldebian/out/system/core \ +- -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \ ++ -Wl,-rpath='$$ORIGIN' \ + -Wl,-soname,$(NAME).so.0 \ + -lbase \ + -llog \ +@@ -29,7 +30,7 @@ LDFLAGS += \ + + build: $(OBJECTS) + $(CXX) $^ -o debian/out/system/core/$(NAME).so.0 $(LDFLAGS) +- cd debian/out/system/core && ln -s $(NAME).so.0 $(NAME).so ++ cd debian/out/system/core && ln -sf $(NAME).so.0 $(NAME).so + + $(OBJECTS): %.o: %.cc + $(CXX) -c -o $@ $< $(CXXFLAGS) $(CPPFLAGS) +diff --git a/debian/system/core/simg2img.mk b/debian/system/core/simg2img.mk +index f6e3f59d..df4f44f3 100644 +--- a/debian/system/core/simg2img.mk ++++ b/debian/system/core/simg2img.mk +@@ -13,7 +13,7 @@ CPPFLAGS += \ + + LDFLAGS += \ + -Ldebian/out/system/core \ +- -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \ ++ -Wl,-rpath='$$ORIGIN/../lib/android' \ + -lbase \ + -llog \ + -lpthread \ +diff --git a/debian/system/core/simg2simg.mk b/debian/system/core/simg2simg.mk +index ed53b04c..646ab030 100644 +--- a/debian/system/core/simg2simg.mk ++++ b/debian/system/core/simg2simg.mk +@@ -13,7 +13,7 @@ CPPFLAGS += \ + + LDFLAGS += \ + -Ldebian/out/system/core \ +- -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \ ++ -Wl,-rpath='$$ORIGIN/../lib/android' \ + -lbase \ + -llog \ + -lpthread \ +diff --git a/frameworks/native/libs/adbd_auth/adbd_auth.cpp b/frameworks/native/libs/adbd_auth/adbd_auth.cpp +index a9c23110..6ca334ba 100644 +--- a/frameworks/native/libs/adbd_auth/adbd_auth.cpp ++++ b/frameworks/native/libs/adbd_auth/adbd_auth.cpp +@@ -23,8 +23,10 @@ + #include <sys/eventfd.h> + #include <sys/uio.h> + ++#include <atomic> + #include <chrono> + #include <deque> ++#include <optional> + #include <string> + #include <string_view> + #include <tuple> +diff --git a/system/core/adb/adb_listeners.cpp b/system/core/adb/adb_listeners.cpp +index 29909a55..440cdbd4 100644 +--- a/system/core/adb/adb_listeners.cpp ++++ b/system/core/adb/adb_listeners.cpp +@@ -109,7 +109,7 @@ static void listener_event_func(int _fd, unsigned ev, void* _l) + } + + // Called as a transport disconnect function. |arg| is the raw alistener*. +-static void listener_disconnect(void* arg, atransport*) EXCLUDES(listener_list_mutex) { ++static void listener_disconnect(void* arg, atransport*) { + std::lock_guard<std::mutex> lock(listener_list_mutex); + for (auto iter = listener_list.begin(); iter != listener_list.end(); ++iter) { + if (iter->get() == arg) { +@@ -121,7 +121,7 @@ static void listener_disconnect(void* arg, atransport*) EXCLUDES(listener_list_m + } + + // Write the list of current listeners (network redirections) into a string. +-std::string format_listeners() EXCLUDES(listener_list_mutex) { ++std::string format_listeners() { + std::lock_guard<std::mutex> lock(listener_list_mutex); + std::string result; + for (auto& l : listener_list) { +@@ -140,7 +140,7 @@ std::string format_listeners() EXCLUDES(listener_list_mutex) { + } + + InstallStatus remove_listener(const char* local_name, atransport* transport) +- EXCLUDES(listener_list_mutex) { ++{ + std::lock_guard<std::mutex> lock(listener_list_mutex); + for (auto iter = listener_list.begin(); iter != listener_list.end(); ++iter) { + if (local_name == (*iter)->local_name) { +@@ -151,7 +151,7 @@ InstallStatus remove_listener(const char* local_name, atransport* transport) + return INSTALL_STATUS_LISTENER_NOT_FOUND; + } + +-void remove_all_listeners() EXCLUDES(listener_list_mutex) { ++void remove_all_listeners() { + std::lock_guard<std::mutex> lock(listener_list_mutex); + auto iter = listener_list.begin(); + while (iter != listener_list.end()) { +@@ -164,7 +164,7 @@ void remove_all_listeners() EXCLUDES(listener_list_mutex) { + } + } + +-void close_smartsockets() EXCLUDES(listener_list_mutex) { ++void close_smartsockets() { + std::lock_guard<std::mutex> lock(listener_list_mutex); + auto pred = [](const std::unique_ptr<alistener>& listener) { + return listener->local_name == "*smartsocket*"; +@@ -174,7 +174,7 @@ void close_smartsockets() EXCLUDES(listener_list_mutex) { + + InstallStatus install_listener(const std::string& local_name, const char* connect_to, + atransport* transport, int no_rebind, int* resolved_tcp_port, +- std::string* error) EXCLUDES(listener_list_mutex) { ++ std::string* error) { + std::lock_guard<std::mutex> lock(listener_list_mutex); + for (auto& l : listener_list) { + if (local_name == l->local_name) { +diff --git a/system/core/adb/transport_local.cpp b/system/core/adb/transport_local.cpp +index c7261860..5988ec4d 100644 +--- a/system/core/adb/transport_local.cpp ++++ b/system/core/adb/transport_local.cpp +@@ -333,7 +333,7 @@ struct EmulatorConnection : public FdConnection { + + /* Only call this function if you already hold local_transports_lock. */ + static atransport* find_emulator_transport_by_adb_port_locked(int adb_port) +- REQUIRES(local_transports_lock) { ++{ + auto it = local_transports.find(adb_port); + if (it == local_transports.end()) { + return nullptr; diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0003-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0003-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch new file mode 100644 index 0000000000..7ea040c68a --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0003-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch @@ -0,0 +1,126 @@ +From 02b6b6977d80af4b9b806054fadb5a06cedf011d Mon Sep 17 00:00:00 2001 +From: Etienne Cordonnier <ecordonnier@snap.com> +Date: Tue, 14 Mar 2023 11:33:50 +0100 +Subject: [PATCH] Update usage of usbdevfs_urb to match new kernel UAPI +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Linux kernel API has been changed by commit 94dfc73e7cf4 ("treewide: uapi: Replace zero-length arrays with flexible-array members") +where zero-length array iso_frame_desc in struct usbdevfs_urb was replaced with a proper flexible-array member. + +Current USB API usage causes a compilation error at Linux 6.0: + +In file included from /home/mae/.cache/kiss/proc/121205/build/android-tools/vendor/adb/client/usb_linux.cpp:28: +/usr/include/linux/usbdevice_fs.h:134:41: error: flexible array member ‘usbdevfs_urb::iso_frame_desc’ not at end of ‘struct usb_handle’ + 134 | struct usbdevfs_iso_packet_desc iso_frame_desc[]; + | ^~~~~~~~~~~~~~ +/home/mae/.cache/kiss/proc/121205/build/android-tools/vendor/adb/client/usb_linux.cpp:76:18: note: next member ‘usbdevfs_urb usb_handle::urb_out’ declared here + 76 | usbdevfs_urb urb_out; + | ^~~~~~~ +/home/mae/.cache/kiss/proc/121205/build/android-tools/vendor/adb/client/usb_linux.cpp:61:8: note: in the definition of ‘struct usb_handle’ + 61 | struct usb_handle { + | ^~~~~~~~~~ + +Fix it by using pointers to a struct with flexible-array members. +Current fix works both with the old and the new API. + +See https://github.com/nmeum/android-tools/issues/74 for more context. + +Tested: built on Linux against kernel 5.19 and 6.0; 'adb shell' over USB +cable +Acked-by: Gustavo A. R. Silva gustavoars@kernel.org +Change-Id: I7f0f7b35d9a3ab980d3520b541b60c7857a6b101 +Signed-off-by: Anatol Pomozov <anatol.pomozov@gmail.com> + +[Backported on version 10] +Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com> + +--- + system/core/adb/client/usb_linux.cpp | 24 ++++++++++++++---------- + 1 file changed, 14 insertions(+), 10 deletions(-) + +diff --git a/system/core/adb/client/usb_linux.cpp b/system/core/adb/client/usb_linux.cpp +index 343e7b59..6a4479f3 100644 +--- a/system/core/adb/client/usb_linux.cpp ++++ b/system/core/adb/client/usb_linux.cpp +@@ -71,8 +71,8 @@ struct usb_handle : public ::usb_handle { + unsigned zero_mask; + unsigned writeable = 1; + +- usbdevfs_urb urb_in; +- usbdevfs_urb urb_out; ++ usbdevfs_urb *urb_in; ++ usbdevfs_urb *urb_out; + + bool urb_in_busy = false; + bool urb_out_busy = false; +@@ -305,7 +305,7 @@ static int usb_bulk_write(usb_handle* h, const void* data, int len) { + std::unique_lock<std::mutex> lock(h->mutex); + D("++ usb_bulk_write ++"); + +- usbdevfs_urb* urb = &h->urb_out; ++ usbdevfs_urb* urb = h->urb_out; + memset(urb, 0, sizeof(*urb)); + urb->type = USBDEVFS_URB_TYPE_BULK; + urb->endpoint = h->ep_out; +@@ -344,7 +344,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) { + std::unique_lock<std::mutex> lock(h->mutex); + D("++ usb_bulk_read ++"); + +- usbdevfs_urb* urb = &h->urb_in; ++ usbdevfs_urb* urb = h->urb_in; + memset(urb, 0, sizeof(*urb)); + urb->type = USBDEVFS_URB_TYPE_BULK; + urb->endpoint = h->ep_in; +@@ -389,7 +389,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) { + } + D("[ urb @%p status = %d, actual = %d ]", out, out->status, out->actual_length); + +- if (out == &h->urb_in) { ++ if (out == h->urb_in) { + D("[ reap urb - IN complete ]"); + h->urb_in_busy = false; + if (urb->status != 0) { +@@ -398,7 +398,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) { + } + return urb->actual_length; + } +- if (out == &h->urb_out) { ++ if (out == h->urb_out) { + D("[ reap urb - OUT compelete ]"); + h->urb_out_busy = false; + h->cv.notify_all(); +@@ -502,10 +502,10 @@ void usb_kick(usb_handle* h) { + ** but this ensures that a reader blocked on REAPURB + ** will get unblocked + */ +- ioctl(h->fd, USBDEVFS_DISCARDURB, &h->urb_in); +- ioctl(h->fd, USBDEVFS_DISCARDURB, &h->urb_out); +- h->urb_in.status = -ENODEV; +- h->urb_out.status = -ENODEV; ++ ioctl(h->fd, USBDEVFS_DISCARDURB, h->urb_in); ++ ioctl(h->fd, USBDEVFS_DISCARDURB, h->urb_out); ++ h->urb_in->status = -ENODEV; ++ h->urb_out->status = -ENODEV; + h->urb_in_busy = false; + h->urb_out_busy = false; + h->cv.notify_all(); +@@ -521,6 +521,8 @@ int usb_close(usb_handle* h) { + + D("-- usb close %p (fd = %d) --", h, h->fd); + ++ delete h->urb_in; ++ delete h->urb_out; + delete h; + + return 0; +@@ -556,6 +558,8 @@ static void register_device(const char* dev_name, const char* dev_path, unsigned + usb->ep_out = ep_out; + usb->zero_mask = zero_mask; + usb->max_packet_size = max_packet_size; ++ usb->urb_in = new usbdevfs_urb; ++ usb->urb_out = new usbdevfs_urb; + + // Initialize mark so we don't get garbage collected after the device scan. + usb->mark = true; diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0004-adb-Fix-build-on-big-endian-systems.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0004-adb-Fix-build-on-big-endian-systems.patch new file mode 100644 index 0000000000..83fe4475c3 --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0004-adb-Fix-build-on-big-endian-systems.patch @@ -0,0 +1,48 @@ +From e4a29888cb52c1eafd3ab57a6e220b38147ecfbe Mon Sep 17 00:00:00 2001 +From: Etienne Cordonnier <ecordonnier@snap.com> +Date: Tue, 14 Mar 2023 13:39:23 +0100 +Subject: [PATCH] adb: Fix build on big endian systems + +The usb_linux_client.c file defines cpu_to_le16/32 by using the C +library htole16/32 function calls. However, cpu_to_le16/32 are used +when initializing structures, i.e in a context where a function call +is not allowed. + +It works fine on little endian systems because htole16/32 are defined +by the C library as no-ops. But on big-endian systems, they are +actually doing something, which might involve calling a function, +causing build failures. + +To solve this, we simply open-code cpu_to_le16/32 in a way that allows +them to be used when initializing structures. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +[Forward-ported to version 29] +Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com> + +--- + system/core/adb/daemon/usb_ffs.cpp | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/system/core/adb/daemon/usb_ffs.cpp b/system/core/adb/daemon/usb_ffs.cpp +index b19fa5d5..ef2291ca 100644 +--- a/system/core/adb/daemon/usb_ffs.cpp ++++ b/system/core/adb/daemon/usb_ffs.cpp +@@ -39,8 +39,15 @@ + + #define USB_EXT_PROP_UNICODE 1 + +-#define cpu_to_le16(x) htole16(x) +-#define cpu_to_le32(x) htole32(x) ++#if __BYTE_ORDER == __LITTLE_ENDIAN ++# define cpu_to_le16(x) (x) ++# define cpu_to_le32(x) (x) ++#else ++# define cpu_to_le16(x) ((((x) >> 8) & 0xffu) | (((x) & 0xffu) << 8)) ++# define cpu_to_le32(x) \ ++ ((((x) & 0xff000000u) >> 24) | (((x) & 0x00ff0000u) >> 8) | \ ++ (((x) & 0x0000ff00u) << 8) | (((x) & 0x000000ffu) << 24)) ++#endif + + // clang-format off + struct func_desc { diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0005-adb-Allow-adbd-to-be-run-as-root.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0005-adb-Allow-adbd-to-be-run-as-root.patch new file mode 100644 index 0000000000..3fbdcd4bac --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0005-adb-Allow-adbd-to-be-run-as-root.patch @@ -0,0 +1,23 @@ +From 4ef35041ba5c02df48c31f2382e7c3c4316ad936 Mon Sep 17 00:00:00 2001 +From: Etienne Cordonnier <ecordonnier@snap.com> +Date: Tue, 14 Mar 2023 13:53:51 +0100 +Subject: [PATCH] adb: Allow adbd to be run as root + +Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com> + +--- + system/core/adb/daemon/main.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/system/core/adb/daemon/main.cpp b/system/core/adb/daemon/main.cpp +index e807d13d..309663a2 100644 +--- a/system/core/adb/daemon/main.cpp ++++ b/system/core/adb/daemon/main.cpp +@@ -75,6 +75,7 @@ static bool should_drop_capabilities_bounding_set() { + } + + static bool should_drop_privileges() { ++ return true; + // "adb root" not allowed, always drop privileges. + if (!ALLOW_ADBD_ROOT && !is_device_unlocked()) return true; + diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/adbd.mk b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/adbd.mk new file mode 100644 index 0000000000..3282216b8e --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/adbd.mk @@ -0,0 +1,87 @@ +include rules_yocto.mk +NAME = adbd + +SOURCES = \ + adb/adbconnection/adbconnection_server.cpp \ + adb/daemon/auth.cpp \ + adb/daemon/file_sync_service.cpp \ + adb/daemon/file_sync_service.h \ + adb/daemon/framebuffer_service.cpp \ + adb/daemon/framebuffer_service.h \ + adb/daemon/jdwp_service.cpp \ + adb/daemon/main.cpp \ + adb/daemon/restart_service.cpp \ + adb/daemon/restart_service.h \ + adb/daemon/services.cpp \ + adb/daemon/shell_service.cpp \ + adb/daemon/shell_service.h \ + adb/daemon/usb_ffs.cpp \ + adb/daemon/usb_legacy.cpp \ + adb/daemon/usb.cpp \ + adb/shell_service_protocol.cpp \ + adb/adb.cpp \ + adb/adb_io.cpp \ + adb/adb_listeners.cpp \ + adb/adb_trace.cpp \ + adb/adb_unique_fd.cpp \ + adb/adb_utils.cpp \ + adb/fdevent/fdevent.cpp \ + adb/fdevent/fdevent_epoll.cpp \ + adb/services.cpp \ + adb/sockets.cpp \ + adb/socket_spec.cpp \ + adb/sysdeps/errno.cpp \ + adb/sysdeps/posix/network.cpp \ + adb/sysdeps_unix.cpp \ + adb/transport.cpp \ + adb/transport_fd.cpp \ + adb/transport_local.cpp \ + adb/transport_usb.cpp \ + adb/types.cpp \ + diagnose_usb/diagnose_usb.cpp \ + libasyncio/AsyncIO.cpp \ + +SOURCES := $(foreach source, $(SOURCES), system/core/$(source)) + +SOURCES += \ + frameworks/native/libs/adbd_auth/adbd_auth.cpp + +CXXFLAGS += -std=gnu++20 +CPPFLAGS += -Isystem/coreinclude -Isystem/core/adb -Isystem/core/base/include -Idebian/out/system/core -Isystem/tools/mkbootimg/include/bootimg -Isystem/core/fs_mgr/include \ + -Isystem/core/fs_mgr/include_fstab \ + -DADB_VERSION='"$(DEB_VERSION)"' -D_GNU_SOURCE +LDFLAGS += -Wl,-rpath='$$ORIGIN/../lib/android' -Wl,-rpath-link='$$ORIGIN/../lib/android' \ + -lpthread -Ldebian/out/system/core -Ldebian/out/external/boringssl -lbase -lcrypto_utils -l:libcrypto.a -lcutils -llog -lresolv + +PAGE_SIZE ?= 4096 + +CXXFLAGS += -UADB_HOST +CXXFLAGS += -DADB_HOST=0 +CXXFLAGS += -DALLOW_ADBD_DISABLE_VERITY +CXXFLAGS += -DALLOW_ADBD_NO_AUTH +CXXFLAGS += -DPLATFORM_TOOLS_VERSION='"28.0.2"' +CXXFLAGS += -Isystem/core/diagnose_usb/include +CXXFLAGS += -Isystem/core/adb/daemon/include +CXXFLAGS += -Isystem/core/adb/adbconnection/include +CXXFLAGS += -Isystem/core/libasyncio/include +CXXFLAGS += -Isystem/core/libcutils/include +CXXFLAGS += -Isystem/core/libcrypto_utils/include +CXXFLAGS += -Isystem/core/liblog/include/ +CXXFLAGS += -Isystem/core/libutils/include +CXXFLAGS += -Iframeworks/native/libs/adbd_auth/include +CXXFLAGS += -Wno-c++11-narrowing +CXXFLAGS += -DPAGE_SIZE=$(PAGE_SIZE) + + +# -latomic should be the last library specified +# https://github.com/android/ndk/issues/589 +ifneq ($(filter armel mipsel,$(DEB_HOST_ARCH)),) + LDFLAGS += -latomic +endif + +build: $(SOURCES) + mkdir --parents debian/out/system/core + $(CXX) $^ -o debian/out/system/core/adbd $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) + +clean: + $(RM) debian/out/system/core/adbd diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service new file mode 100644 index 0000000000..ddf8d7f74e --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service @@ -0,0 +1,13 @@ +[Unit] +Description=Android Debug Bridge +ConditionPathExists=/var/usb-debugging-enabled +Before=android-system.service + +[Service] +Type=simple +Restart=on-failure +ExecStartPre=-/usr/bin/android-gadget-setup adb +ExecStart=/usr/bin/adbd + +[Install] +WantedBy=basic.target diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Add-riscv64-support.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Add-riscv64-support.patch new file mode 100644 index 0000000000..4669f89d07 --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Add-riscv64-support.patch @@ -0,0 +1,651 @@ +From: Guo Ren <guoren@linux.alibaba.com> +Date: Wed, 29 Jun 2022 16:46:46 +0800 +Subject: Add riscv64 support + +This patch contains the dwarf unwind support for 64bit risc-v. + + * DwarfCfa.cpp (cfa_def_cfa_register): setup register if CFA_REG is + not setup for riscv64 + * Elf.cpp (GetRelPc): convert offset to virtual address for riscv64. + * ElfInterface.cpp (GetVirtAddrFromOffset): New for riscv64. + * RegsRiscv64.cpp (StepIfSignalHandler): Fix signal frame check. + libunwindstack/include/unwindstack/ + * ElfInterface.h (GetVirtAddrFromOffset): New for riscv64. + libunwindstack/tests/ + * DwarfCfaTest.cpp (cfa_def_cfa_register): ok for riscv64. + * RegsStepIfSignalHandlerTest.cpp (riscv64_step_if_signal_handler): Fix + testcase for riscv64 + +Test: Builds. +Test: All unit tests pass. + +Signed-off-by: Guo Ren <guoren@linux.alibaba.com> +Signed-off-by: Lifang Xia <lifang_xia@linux.alibaba.com> +Signed-off-by: Mao Han <han_mao@linux.alibaba.com> +Change-Id: Ib21ddf23cc83f332af202df7bffcaceec16063e0 +--- + system/core/libunwindstack/Android.bp | 1 + + system/core/libunwindstack/Elf.cpp | 2 + + system/core/libunwindstack/Regs.cpp | 10 ++ + system/core/libunwindstack/RegsRiscv64.cpp | 156 +++++++++++++++++++++ + .../core/libunwindstack/include/unwindstack/Elf.h | 5 + + .../include/unwindstack/MachineRiscv64.h | 59 ++++++++ + .../include/unwindstack/RegsGetLocal.h | 43 ++++++ + .../include/unwindstack/RegsRiscv64.h | 59 ++++++++ + .../include/unwindstack/UcontextRiscv64.h | 80 +++++++++++ + .../include/unwindstack/UserRiscv64.h | 37 +++++ + system/core/libunwindstack/tools/unwind.cpp | 3 + + .../core/libunwindstack/tools/unwind_symbols.cpp | 3 + + 12 files changed, 458 insertions(+) + create mode 100644 system/core/libunwindstack/RegsRiscv64.cpp + create mode 100644 system/core/libunwindstack/include/unwindstack/MachineRiscv64.h + create mode 100644 system/core/libunwindstack/include/unwindstack/RegsRiscv64.h + create mode 100644 system/core/libunwindstack/include/unwindstack/UcontextRiscv64.h + create mode 100644 system/core/libunwindstack/include/unwindstack/UserRiscv64.h + +diff --git a/system/core/libunwindstack/Android.bp b/system/core/libunwindstack/Android.bp +index 3695f72..f1f9c68 100644 +--- a/system/core/libunwindstack/Android.bp ++++ b/system/core/libunwindstack/Android.bp +@@ -70,6 +70,7 @@ cc_library { + "RegsArm64.cpp", + "RegsX86.cpp", + "RegsX86_64.cpp", ++ "RegsRiscv64.cpp", + "RegsMips.cpp", + "RegsMips64.cpp", + "Unwinder.cpp", +diff --git a/system/core/libunwindstack/Elf.cpp b/system/core/libunwindstack/Elf.cpp +index f01b092..3c2088b 100644 +--- a/system/core/libunwindstack/Elf.cpp ++++ b/system/core/libunwindstack/Elf.cpp +@@ -290,6 +290,8 @@ ElfInterface* Elf::CreateInterfaceFromMemory(Memory* memory) { + arch_ = ARCH_X86_64; + } else if (e_machine == EM_MIPS) { + arch_ = ARCH_MIPS64; ++ } else if (e_machine == EM_RISCV) { ++ arch_ = ARCH_RISCV64; + } else { + // Unsupported. + ALOGI("64 bit elf that is neither aarch64 nor x86_64 nor mips64: e_machine = %d\n", +diff --git a/system/core/libunwindstack/Regs.cpp b/system/core/libunwindstack/Regs.cpp +index c7dec52..447a554 100644 +--- a/system/core/libunwindstack/Regs.cpp ++++ b/system/core/libunwindstack/Regs.cpp +@@ -27,12 +27,14 @@ + #include <unwindstack/RegsArm64.h> + #include <unwindstack/RegsMips.h> + #include <unwindstack/RegsMips64.h> ++#include <unwindstack/RegsRiscv64.h> + #include <unwindstack/RegsX86.h> + #include <unwindstack/RegsX86_64.h> + #include <unwindstack/UserArm.h> + #include <unwindstack/UserArm64.h> + #include <unwindstack/UserMips.h> + #include <unwindstack/UserMips64.h> ++#include <unwindstack/UserRiscv64.h> + #include <unwindstack/UserX86.h> + #include <unwindstack/UserX86_64.h> + +@@ -67,6 +69,8 @@ Regs* Regs::RemoteGet(pid_t pid) { + return RegsMips::Read(buffer.data()); + case sizeof(mips64_user_regs): + return RegsMips64::Read(buffer.data()); ++ case sizeof(riscv64_user_regs): ++ return RegsRiscv64::Read(buffer.data()); + } + return nullptr; + } +@@ -85,6 +89,8 @@ Regs* Regs::CreateFromUcontext(ArchEnum arch, void* ucontext) { + return RegsMips::CreateFromUcontext(ucontext); + case ARCH_MIPS64: + return RegsMips64::CreateFromUcontext(ucontext); ++ case ARCH_RISCV64: ++ return RegsRiscv64::CreateFromUcontext(ucontext); + case ARCH_UNKNOWN: + default: + return nullptr; +@@ -104,6 +110,8 @@ ArchEnum Regs::CurrentArch() { + return ARCH_MIPS; + #elif defined(__mips__) && defined(__LP64__) + return ARCH_MIPS64; ++#elif defined(__riscv) ++ return ARCH_RISCV64; + #else + abort(); + #endif +@@ -123,6 +131,8 @@ Regs* Regs::CreateFromLocal() { + regs = new RegsMips(); + #elif defined(__mips__) && defined(__LP64__) + regs = new RegsMips64(); ++#elif defined(__riscv) ++ regs = new RegsRiscv64(); + #else + abort(); + #endif +diff --git a/system/core/libunwindstack/RegsRiscv64.cpp b/system/core/libunwindstack/RegsRiscv64.cpp +new file mode 100644 +index 0000000..887762a +--- /dev/null ++++ b/system/core/libunwindstack/RegsRiscv64.cpp +@@ -0,0 +1,156 @@ ++/* ++ * Copyright (C) 2022 The Android Open Source Project ++ * ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++#include <stdint.h> ++#include <string.h> ++ ++#include <functional> ++ ++#include <unwindstack/Elf.h> ++#include <unwindstack/MachineRiscv64.h> ++#include <unwindstack/MapInfo.h> ++#include <unwindstack/Memory.h> ++#include <unwindstack/RegsRiscv64.h> ++#include <unwindstack/UcontextRiscv64.h> ++#include <unwindstack/UserRiscv64.h> ++ ++namespace unwindstack { ++ ++RegsRiscv64::RegsRiscv64() ++ : RegsImpl<uint64_t>(RISCV64_REG_MAX, Location(LOCATION_REGISTER, RISCV64_REG_RA)) {} ++ ++ArchEnum RegsRiscv64::Arch() { ++ return ARCH_RISCV64; ++} ++ ++uint64_t RegsRiscv64::pc() { ++ return regs_[RISCV64_REG_PC]; ++} ++ ++uint64_t RegsRiscv64::sp() { ++ return regs_[RISCV64_REG_SP]; ++} ++ ++void RegsRiscv64::set_pc(uint64_t pc) { ++ regs_[RISCV64_REG_PC] = pc; ++} ++ ++void RegsRiscv64::set_sp(uint64_t sp) { ++ regs_[RISCV64_REG_SP] = sp; ++} ++ ++uint64_t RegsRiscv64::GetPcAdjustment(uint64_t rel_pc, Elf*) { ++ if (rel_pc < 8) { ++ return 0; ++ } ++ // For now, just assume no compact branches ++ return 8; ++} ++ ++bool RegsRiscv64::SetPcFromReturnAddress(Memory*) { ++ uint64_t ra = regs_[RISCV64_REG_RA]; ++ if (regs_[RISCV64_REG_PC] == ra) { ++ return false; ++ } ++ ++ regs_[RISCV64_REG_PC] = ra; ++ return true; ++} ++ ++void RegsRiscv64::IterateRegisters(std::function<void(const char*, uint64_t)> fn) { ++ fn("pc", regs_[RISCV64_REG_PC]); ++ fn("ra", regs_[RISCV64_REG_RA]); ++ fn("sp", regs_[RISCV64_REG_SP]); ++ fn("gp", regs_[RISCV64_REG_GP]); ++ fn("tp", regs_[RISCV64_REG_TP]); ++ fn("t0", regs_[RISCV64_REG_T0]); ++ fn("t1", regs_[RISCV64_REG_T1]); ++ fn("t2", regs_[RISCV64_REG_T2]); ++ fn("t3", regs_[RISCV64_REG_T3]); ++ fn("t4", regs_[RISCV64_REG_T4]); ++ fn("t5", regs_[RISCV64_REG_T5]); ++ fn("t6", regs_[RISCV64_REG_T6]); ++ fn("s0", regs_[RISCV64_REG_S0]); ++ fn("s1", regs_[RISCV64_REG_S1]); ++ fn("s2", regs_[RISCV64_REG_S2]); ++ fn("s3", regs_[RISCV64_REG_S3]); ++ fn("s4", regs_[RISCV64_REG_S4]); ++ fn("s5", regs_[RISCV64_REG_S5]); ++ fn("s6", regs_[RISCV64_REG_S6]); ++ fn("s7", regs_[RISCV64_REG_S7]); ++ fn("s8", regs_[RISCV64_REG_S8]); ++ fn("s9", regs_[RISCV64_REG_S9]); ++ fn("s10", regs_[RISCV64_REG_S10]); ++ fn("s11", regs_[RISCV64_REG_S11]); ++ fn("a0", regs_[RISCV64_REG_A0]); ++ fn("a1", regs_[RISCV64_REG_A1]); ++ fn("a2", regs_[RISCV64_REG_A2]); ++ fn("a3", regs_[RISCV64_REG_A3]); ++ fn("a4", regs_[RISCV64_REG_A4]); ++ fn("a5", regs_[RISCV64_REG_A5]); ++ fn("a6", regs_[RISCV64_REG_A6]); ++ fn("a7", regs_[RISCV64_REG_A7]); ++} ++ ++Regs* RegsRiscv64::Read(void* remote_data) { ++ riscv64_user_regs* user = reinterpret_cast<riscv64_user_regs*>(remote_data); ++ ++ RegsRiscv64* regs = new RegsRiscv64(); ++ memcpy(regs->RawData(), &user->regs[0], RISCV64_REG_MAX * sizeof(uint64_t)); ++ // uint64_t* reg_data = reinterpret_cast<uint64_t*>(regs->RawData()); ++ return regs; ++} ++ ++Regs* RegsRiscv64::CreateFromUcontext(void* ucontext) { ++ riscv64_ucontext_t* riscv64_ucontext = reinterpret_cast<riscv64_ucontext_t*>(ucontext); ++ ++ RegsRiscv64* regs = new RegsRiscv64(); ++ memcpy(regs->RawData(), &riscv64_ucontext->uc_mcontext.__gregs[0], ++ RISCV64_REG_MAX * sizeof(uint64_t)); ++ return regs; ++} ++ ++bool RegsRiscv64::StepIfSignalHandler(uint64_t elf_offset, Elf* elf, Memory* process_memory) { ++ uint64_t data; ++ Memory* elf_memory = elf->memory(); ++ // Read from elf memory since it is usually more expensive to read from ++ // process memory. ++ if (!elf_memory->ReadFully(elf_offset, &data, sizeof(data))) { ++ return false; ++ } ++ // Look for the kernel sigreturn function. ++ // __kernel_rt_sigreturn: ++ // li a7, __NR_rt_sigreturn ++ // scall ++ ++ const uint8_t li_scall[] = {0x93, 0x08, 0xb0, 0x08, 0x73, 0x00, 0x00, 0x00}; ++ if (memcmp(&data, &li_scall, 8) != 0) { ++ return false; ++ } ++ ++ // SP + sizeof(siginfo_t) + uc_mcontext offset + PC offset. ++ if (!process_memory->ReadFully(regs_[RISCV64_REG_SP] + 0x80 + 0xb0 + 0x00, regs_.data(), ++ sizeof(uint64_t) * (RISCV64_REG_MAX))) { ++ return false; ++ } ++ return true; ++} ++ ++Regs* RegsRiscv64::Clone() { ++ return new RegsRiscv64(*this); ++} ++ ++} // namespace unwindstack +diff --git a/system/core/libunwindstack/include/unwindstack/Elf.h b/system/core/libunwindstack/include/unwindstack/Elf.h +index 472ed92..88fa0ff 100644 +--- a/system/core/libunwindstack/include/unwindstack/Elf.h ++++ b/system/core/libunwindstack/include/unwindstack/Elf.h +@@ -32,6 +32,10 @@ + #define EM_AARCH64 183 + #endif + ++#if !defined(EM_RISCV) ++#define EM_RISCV 243 ++#endif ++ + namespace unwindstack { + + // Forward declaration. +@@ -46,6 +50,7 @@ enum ArchEnum : uint8_t { + ARCH_X86_64, + ARCH_MIPS, + ARCH_MIPS64, ++ ARCH_RISCV64, + }; + + class Elf { +diff --git a/system/core/libunwindstack/include/unwindstack/MachineRiscv64.h b/system/core/libunwindstack/include/unwindstack/MachineRiscv64.h +new file mode 100644 +index 0000000..397e680 +--- /dev/null ++++ b/system/core/libunwindstack/include/unwindstack/MachineRiscv64.h +@@ -0,0 +1,59 @@ ++/* ++ * Copyright (C) 2022 The Android Open Source Project ++ * ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++#pragma once ++ ++#include <stdint.h> ++ ++namespace unwindstack { ++ ++enum Riscv64Reg : uint16_t { ++ RISCV64_REG_PC, ++ RISCV64_REG_RA, ++ RISCV64_REG_SP, ++ RISCV64_REG_GP, ++ RISCV64_REG_TP, ++ RISCV64_REG_T0, ++ RISCV64_REG_T1, ++ RISCV64_REG_T2, ++ RISCV64_REG_S0, ++ RISCV64_REG_S1, ++ RISCV64_REG_A0, ++ RISCV64_REG_A1, ++ RISCV64_REG_A2, ++ RISCV64_REG_A3, ++ RISCV64_REG_A4, ++ RISCV64_REG_A5, ++ RISCV64_REG_A6, ++ RISCV64_REG_A7, ++ RISCV64_REG_S2, ++ RISCV64_REG_S3, ++ RISCV64_REG_S4, ++ RISCV64_REG_S5, ++ RISCV64_REG_S6, ++ RISCV64_REG_S7, ++ RISCV64_REG_S8, ++ RISCV64_REG_S9, ++ RISCV64_REG_S10, ++ RISCV64_REG_S11, ++ RISCV64_REG_T3, ++ RISCV64_REG_T4, ++ RISCV64_REG_T5, ++ RISCV64_REG_T6, ++ RISCV64_REG_MAX, ++}; ++ ++} // namespace unwindstack +diff --git a/system/core/libunwindstack/include/unwindstack/RegsGetLocal.h b/system/core/libunwindstack/include/unwindstack/RegsGetLocal.h +index f0b5e3a..698eba2 100644 +--- a/system/core/libunwindstack/include/unwindstack/RegsGetLocal.h ++++ b/system/core/libunwindstack/include/unwindstack/RegsGetLocal.h +@@ -81,6 +81,49 @@ inline __attribute__((__always_inline__)) void AsmGetRegs(void* reg_data) { + : "x12", "x13", "memory"); + } + ++#elif defined(__riscv) ++ ++inline __attribute__((__always_inline__)) void AsmGetRegs(void* reg_data) { ++ asm volatile( ++ "1:\n" ++ "sd ra, 8(%[base])\n" ++ "sd sp, 16(%[base])\n" ++ "sd gp, 24(%[base])\n" ++ "sd tp, 32(%[base])\n" ++ "sd t0, 40(%[base])\n" ++ "sd t1, 48(%[base])\n" ++ "sd t2, 56(%[base])\n" ++ "sd s0, 64(%[base])\n" ++ "sd s1, 72(%[base])\n" ++ "sd a0, 80(%[base])\n" ++ "sd a1, 88(%[base])\n" ++ "sd a2, 96(%[base])\n" ++ "sd a3, 104(%[base])\n" ++ "sd a4, 112(%[base])\n" ++ "sd a5, 120(%[base])\n" ++ "sd a6, 128(%[base])\n" ++ "sd a7, 136(%[base])\n" ++ "sd s2, 144(%[base])\n" ++ "sd s3, 152(%[base])\n" ++ "sd s4, 160(%[base])\n" ++ "sd s5, 168(%[base])\n" ++ "sd s6, 176(%[base])\n" ++ "sd s7, 184(%[base])\n" ++ "sd s8, 192(%[base])\n" ++ "sd s9, 200(%[base])\n" ++ "sd s10, 208(%[base])\n" ++ "sd s11, 216(%[base])\n" ++ "sd t3, 224(%[base])\n" ++ "sd t4, 232(%[base])\n" ++ "sd t5, 240(%[base])\n" ++ "sd t6, 248(%[base])\n" ++ "la t1, 1b\n" ++ "sd t1, 0(%[base])\n" ++ : [base] "+r"(reg_data) ++ : ++ : "t1", "memory"); ++} ++ + #elif defined(__i386__) || defined(__x86_64__) || defined(__mips__) + + extern "C" void AsmGetRegs(void* regs); +diff --git a/system/core/libunwindstack/include/unwindstack/RegsRiscv64.h b/system/core/libunwindstack/include/unwindstack/RegsRiscv64.h +new file mode 100644 +index 0000000..eb09397 +--- /dev/null ++++ b/system/core/libunwindstack/include/unwindstack/RegsRiscv64.h +@@ -0,0 +1,59 @@ ++/* ++ * Copyright (C) 2022 The Android Open Source Project ++ * ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++#pragma once ++ ++#include <stdint.h> ++ ++#include <functional> ++ ++#include <unwindstack/Elf.h> ++#include <unwindstack/Regs.h> ++ ++namespace unwindstack { ++ ++// Forward declarations. ++class Memory; ++ ++class RegsRiscv64 : public RegsImpl<uint64_t> { ++ public: ++ RegsRiscv64(); ++ virtual ~RegsRiscv64() = default; ++ ++ ArchEnum Arch() override final; ++ ++ uint64_t GetPcAdjustment(uint64_t rel_pc, Elf* elf) override; ++ ++ bool SetPcFromReturnAddress(Memory* process_memory) override; ++ ++ bool StepIfSignalHandler(uint64_t elf_offset, Elf* elf, Memory* process_memory) override; ++ ++ void IterateRegisters(std::function<void(const char*, uint64_t)>) override final; ++ ++ uint64_t pc() override; ++ uint64_t sp() override; ++ ++ void set_pc(uint64_t pc) override; ++ void set_sp(uint64_t sp) override; ++ ++ Regs* Clone() override final; ++ ++ static Regs* Read(void* data); ++ ++ static Regs* CreateFromUcontext(void* ucontext); ++}; ++ ++} // namespace unwindstack +diff --git a/system/core/libunwindstack/include/unwindstack/UcontextRiscv64.h b/system/core/libunwindstack/include/unwindstack/UcontextRiscv64.h +new file mode 100644 +index 0000000..c6c82b1 +--- /dev/null ++++ b/system/core/libunwindstack/include/unwindstack/UcontextRiscv64.h +@@ -0,0 +1,80 @@ ++/* ++ * Copyright (C) 2014 The Android Open Source Project ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * * Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * * Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in ++ * the documentation and/or other materials provided with the ++ * distribution. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS ++ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ++ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, ++ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS ++ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED ++ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, ++ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ++ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ++ * SUCH DAMAGE. ++ */ ++ ++#pragma once ++ ++#include <sys/cdefs.h> ++ ++typedef uint64_t __riscv_mc_gp_state[32]; // unsigned long ++ ++struct __riscv_mc_f_ext_state { ++ uint32_t __f[32]; ++ uint32_t __fcsr; ++}; ++ ++struct __riscv_mc_d_ext_state { ++ uint64_t __f[32]; ++ uint32_t __fcsr; ++}; ++ ++struct __riscv_mc_q_ext_state { ++ uint64_t __f[64] __attribute__((__aligned__(16))); ++ uint32_t __fcsr; ++ uint32_t __reserved[3]; ++}; ++ ++union __riscv_mc_fp_state { ++ struct __riscv_mc_f_ext_state __f; ++ struct __riscv_mc_d_ext_state __d; ++ struct __riscv_mc_q_ext_state __q; ++}; ++ ++struct __riscv_stack_t { ++ uint64_t ss_sp; ++ int32_t ss_flags; ++ uint64_t ss_size; ++}; ++ ++struct riscv64_sigset_t { ++ uint64_t sig; // unsigned long ++}; ++ ++struct riscv64_mcontext_t { ++ __riscv_mc_gp_state __gregs; ++ union __riscv_mc_fp_state __fpregs; ++}; ++ ++struct riscv64_ucontext_t { ++ uint64_t uc_flags; // unsigned long ++ struct riscv64_ucontext_t* uc_link; ++ __riscv_stack_t uc_stack; ++ riscv64_sigset_t uc_sigmask; ++ /* The kernel adds extra padding here to allow sigset_t to grow. */ ++ int8_t __padding[128 - sizeof(riscv64_sigset_t)]; // char ++ riscv64_mcontext_t uc_mcontext; ++}; +diff --git a/system/core/libunwindstack/include/unwindstack/UserRiscv64.h b/system/core/libunwindstack/include/unwindstack/UserRiscv64.h +new file mode 100644 +index 0000000..1e91228 +--- /dev/null ++++ b/system/core/libunwindstack/include/unwindstack/UserRiscv64.h +@@ -0,0 +1,37 @@ ++/* ++ * Copyright (C) 2016 The Android Open Source Project ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * * Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * * Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in ++ * the documentation and/or other materials provided with the ++ * distribution. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS ++ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ++ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, ++ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS ++ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED ++ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, ++ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ++ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ++ * SUCH DAMAGE. ++ */ ++ ++#pragma once ++ ++namespace unwindstack { ++ ++struct riscv64_user_regs { ++ uint64_t regs[32]; ++}; ++ ++} // namespace unwindstack +diff --git a/system/core/libunwindstack/tools/unwind.cpp b/system/core/libunwindstack/tools/unwind.cpp +index 1812e50..ae20891 100644 +--- a/system/core/libunwindstack/tools/unwind.cpp ++++ b/system/core/libunwindstack/tools/unwind.cpp +@@ -83,6 +83,9 @@ void DoUnwind(pid_t pid) { + case unwindstack::ARCH_MIPS64: + printf("mips64"); + break; ++ case unwindstack::ARCH_RISCV64: ++ printf("riscv64"); ++ break; + default: + printf("unknown\n"); + return; +diff --git a/system/core/libunwindstack/tools/unwind_symbols.cpp b/system/core/libunwindstack/tools/unwind_symbols.cpp +index 8df2284..976db56 100644 +--- a/system/core/libunwindstack/tools/unwind_symbols.cpp ++++ b/system/core/libunwindstack/tools/unwind_symbols.cpp +@@ -77,6 +77,9 @@ int main(int argc, char** argv) { + case EM_AARCH64: + printf("ABI: arm64\n"); + break; ++ case EM_RISCV: ++ printf("ABI: riscv64\n"); ++ break; + case EM_386: + printf("ABI: x86\n"); + break; diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Added-missing-headers.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Added-missing-headers.patch new file mode 100644 index 0000000000..c07e93660f --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Added-missing-headers.patch @@ -0,0 +1,44 @@ +Description: Added missing headers causing compile errors +Author: Umang Parmar <umangjparmar@gmail.com> +Forwarded: not-needed + +--- a/system/core/adb/sysdeps/posix/network.cpp ++++ b/system/core/adb/sysdeps/posix/network.cpp +@@ -22,6 +22,7 @@ + #include <sys/socket.h> + + #include <string> ++#include <cstring> + + #include <android-base/logging.h> + #include <android-base/stringprintf.h> +--- a/system/core/base/file.cpp ++++ b/system/core/base/file.cpp +@@ -26,6 +26,7 @@ + #include <sys/stat.h> + #include <sys/types.h> + #include <unistd.h> ++#include <cstring> + + #include <memory> + #include <mutex> +--- a/system/core/libbacktrace/BacktraceMap.cpp ++++ b/system/core/libbacktrace/BacktraceMap.cpp +@@ -21,6 +21,7 @@ + #include <stdint.h> + #include <sys/types.h> + #include <unistd.h> ++#include <algorithm> + + #include <log/log.h> + +--- a/system/core/libbacktrace/UnwindStackMap.cpp ++++ b/system/core/libbacktrace/UnwindStackMap.cpp +@@ -20,6 +20,7 @@ + + #include <string> + #include <vector> ++#include <algorithm> + + #include <backtrace/BacktraceMap.h> + #include <unwindstack/Elf.h> diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Nonnull.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Nonnull.patch new file mode 100644 index 0000000000..8d1408a48e --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Nonnull.patch @@ -0,0 +1,20 @@ +Description: Bring Clang's _Nonnull keyword to GCC +Author: Kai-Chung Yan +Forwarded: not-needed +--- a/system/core/adb/sysdeps.h ++++ b/system/core/adb/sysdeps.h +@@ -40,11 +40,12 @@ + #include "sysdeps/network.h" + #include "sysdeps/stat.h" + ++#define _Nonnull ++#define _Nullable ++ + #ifdef _WIN32 + + // Clang-only nullability specifiers +-#define _Nonnull +-#define _Nullable + + #include <ctype.h> + #include <direct.h> diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Vector-cast.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Vector-cast.patch new file mode 100644 index 0000000000..b32d5f6f54 --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Vector-cast.patch @@ -0,0 +1,14 @@ +Description: Fix the weird error by GCC7 that fails to match the correct parent method. +Author: Kai-Chung Yan +Forwarded: not-needed +--- a/system/core/libutils/include/utils/Vector.h ++++ b/system/core/libutils/include/utils/Vector.h +@@ -256,7 +256,7 @@ + + template<class TYPE> inline + const Vector<TYPE>& Vector<TYPE>::operator = (const Vector<TYPE>& rhs) const { +- VectorImpl::operator = (static_cast<const VectorImpl&>(rhs)); ++ VectorImpl::operator = (rhs); + return *this; + } + diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/add-missing-headers.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/add-missing-headers.patch new file mode 100644 index 0000000000..49d3ecefbb --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/add-missing-headers.patch @@ -0,0 +1,41 @@ +Forwarded: not-needed +--- a/system/core/fs_mgr/liblp/reader.cpp ++++ b/system/core/fs_mgr/liblp/reader.cpp +@@ -22,6 +22,7 @@ + #include <unistd.h> + + #include <functional> ++#include <cstring> + + #include <android-base/file.h> + #include <android-base/unique_fd.h> +--- a/system/core/fs_mgr/liblp/writer.cpp ++++ b/system/core/fs_mgr/liblp/writer.cpp +@@ -21,6 +21,7 @@ + #include <unistd.h> + + #include <string> ++#include <cstring> + + #include <android-base/file.h> + #include <android-base/unique_fd.h> +--- a/system/core/liblog/logger_write.cpp ++++ b/system/core/liblog/logger_write.cpp +@@ -27,6 +27,7 @@ + #include <android/set_abort_message.h> + #endif + ++#include <mutex> + #include <shared_mutex> + + #include <android-base/errno_restorer.h> +--- a/system/core/libziparchive/zip_archive_stream_entry.cc ++++ b/system/core/libziparchive/zip_archive_stream_entry.cc +@@ -23,6 +23,7 @@ + #include <sys/types.h> + #include <unistd.h> + ++#include <limits> + #include <memory> + #include <vector> + diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/20150704-CVE-2015-3239_dwarf_i.h.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/20150704-CVE-2015-3239_dwarf_i.h.patch new file mode 100644 index 0000000000..b926eddcdf --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/20150704-CVE-2015-3239_dwarf_i.h.patch @@ -0,0 +1,13 @@ +Description: Off-by-one error in the dwarf_to_unw_regnum function in include/dwarf_i.h in +libunwind 1.1 allows local users to have unspecified impact via invalid dwarf opcodes. +--- a/external/libunwind/include/dwarf_i.h ++++ b/external/libunwind/include/dwarf_i.h +@@ -20,7 +20,7 @@ + extern const uint8_t dwarf_to_unw_regnum_map[DWARF_REGNUM_MAP_LENGTH]; + /* REG is evaluated multiple times; it better be side-effects free! */ + # define dwarf_to_unw_regnum(reg) \ +- (((reg) <= DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0) ++ (((reg) < DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0) + #endif + + #ifdef UNW_LOCAL_ONLY diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/legacy_built-in_sync_functions.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/legacy_built-in_sync_functions.patch new file mode 100644 index 0000000000..ce1d4e52eb --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/legacy_built-in_sync_functions.patch @@ -0,0 +1,26 @@ +Description: Replace the legacy __sync built-in functions with __atomic ones + libunwind uses the built-in __sync_* functions which are deprecated by GCC and + should be replaced by __atomic_* ones. See the official manuals [1]. + . + The legacy __sync functions do not require to specify the memory order but + __atomic ones do, so we choose the strongest one: __ATOMIC_SEQ_CST. + . + We do this because __sync_fetch_and_add() is not supported on armel. + . + [1]: https://gcc.gnu.org/onlinedocs/gcc/_005f_005fsync-Builtins.html +Author: Kai-Chung Yan () +Last-Update: 2016-10-04 +Forwarded: not-needed +--- a/external/libunwind/include/libunwind_i.h ++++ b/external/libunwind/include/libunwind_i.h +@@ -155,8 +155,8 @@ cmpxchg_ptr (void *addr, void *old, void + u.vp = addr; + return __sync_bool_compare_and_swap(u.vlp, (long) old, (long) new); + } +-# define fetch_and_add1(_ptr) __sync_fetch_and_add(_ptr, 1) +-# define fetch_and_add(_ptr, value) __sync_fetch_and_add(_ptr, value) ++# define fetch_and_add1(_ptr) __atomic_fetch_add(_ptr, 1, __ATOMIC_SEQ_CST) ++# define fetch_and_add(_ptr, value) __atomic_fetch_add(_ptr, value, __ATOMIC_SEQ_CST) + # define HAVE_CMPXCHG + # define HAVE_FETCH_AND_ADD + #endif diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/user_pt_regs.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/user_pt_regs.patch new file mode 100644 index 0000000000..600471f126 --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/user_pt_regs.patch @@ -0,0 +1,24 @@ +Author: Kai-Chung Yan <seamlikok@gmail.com> +Last-Update: 2016-08-24 +Description: Manual definition of struct user_pt_regs + On ARM64, libunwind uses struct user_pt_regs which is not defined in + anywhere, which causes FTBFS. +Forwarded: not-needed +--- a/external/libunwind/src/ptrace/_UPT_access_reg.c ++++ b/external/libunwind/src/ptrace/_UPT_access_reg.c +@@ -26,6 +26,15 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE + + #include "_UPT_internal.h" + ++#if defined(__aarch64__) ++ struct user_pt_regs { ++ __u64 regs[31]; ++ __u64 sp; ++ __u64 pc; ++ __u64 pstate; ++ }; ++#endif ++ + #if UNW_TARGET_IA64 + # include <elf.h> + # ifdef HAVE_ASM_PTRACE_OFFSETS_H diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-attribute-issue-with-gcc.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-attribute-issue-with-gcc.patch new file mode 100644 index 0000000000..e0b4275579 --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-attribute-issue-with-gcc.patch @@ -0,0 +1,17 @@ +Description: remove clang-ism +Forwarded: not-needed + +--- a/system/core/base/include/android-base/logging.h ++++ b/system/core/base/include/android-base/logging.h +@@ -451,10 +451,7 @@ + // -Wno-user-defined-warnings to CPPFLAGS. + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wgcc-compat" +-#define OSTREAM_STRING_POINTER_USAGE_WARNING \ +- __attribute__((diagnose_if(true, "Unexpected logging of string pointer", "warning"))) +-inline OSTREAM_STRING_POINTER_USAGE_WARNING +-std::ostream& operator<<(std::ostream& stream, const std::string* string_pointer) { ++inline std::ostream& operator<<(std::ostream& stream, const std::string* string_pointer) { + return stream << static_cast<const void*>(string_pointer); + } + #pragma clang diagnostic pop diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-build-on-non-x86.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-build-on-non-x86.patch new file mode 100644 index 0000000000..98a5078244 --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-build-on-non-x86.patch @@ -0,0 +1,24 @@ +Description: non-x86 arches do not have PAGE_SIZE +Forwarded: not-needed +--- a/system/core/base/cmsg.cpp ++++ b/system/core/base/cmsg.cpp +@@ -33,7 +33,8 @@ + const std::vector<int>& fds) { + size_t cmsg_space = CMSG_SPACE(sizeof(int) * fds.size()); + size_t cmsg_len = CMSG_LEN(sizeof(int) * fds.size()); +- if (cmsg_space >= PAGE_SIZE) { ++ size_t pagesize = static_cast<size_t>(sysconf(_SC_PAGE_SIZE)); ++ if (cmsg_space >= pagesize) { + errno = ENOMEM; + return -1; + } +@@ -75,7 +76,8 @@ + fds->clear(); + + size_t cmsg_space = CMSG_SPACE(sizeof(int) * max_fds); +- if (cmsg_space >= PAGE_SIZE) { ++ size_t pagesize = static_cast<size_t>(sysconf(_SC_PAGE_SIZE)); ++ if (cmsg_space >= pagesize) { + errno = ENOMEM; + return -1; + } diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-gettid-exception-declaration.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-gettid-exception-declaration.patch new file mode 100644 index 0000000000..7fd228bff6 --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-gettid-exception-declaration.patch @@ -0,0 +1,24 @@ +Description: get libcutils building +Forwarded: not-needed +--- a/system/core/libcutils/include/cutils/threads.h ++++ b/system/core/libcutils/include/cutils/threads.h +@@ -33,7 +33,7 @@ + // Deprecated: use android::base::GetThreadId instead, which doesn't truncate on Mac/Windows. + // + +-extern pid_t gettid(); ++extern pid_t gettid(void) __THROW; + + // + // Deprecated: use `_Thread_local` in C or `thread_local` in C++. +--- a/system/core/libcutils/threads.cpp ++++ b/system/core/libcutils/threads.cpp +@@ -33,7 +33,7 @@ + + // No definition needed for Android because we'll just pick up bionic's copy. + #ifndef __ANDROID__ +-pid_t gettid() { ++pid_t gettid(void) __THROW { + #if defined(__APPLE__) + uint64_t tid; + pthread_threadid_np(NULL, &tid); diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-standard-namespace-errors.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-standard-namespace-errors.patch new file mode 100644 index 0000000000..e41a3576ae --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-standard-namespace-errors.patch @@ -0,0 +1,22 @@ +Description: Add missing 'std::' scope identifiers. +Forwarded: not-needed +--- a/system/core/libunwindstack/include/unwindstack/DwarfMemory.h ++++ b/system/core/libunwindstack/include/unwindstack/DwarfMemory.h +@@ -29,7 +29,7 @@ + DwarfMemory(Memory* memory) : memory_(memory) {} + virtual ~DwarfMemory() = default; + +- bool ReadBytes(void* dst, size_t num_bytes); ++ bool ReadBytes(void* dst, std::size_t num_bytes); + + template <typename SignedType> + bool ReadSigned(uint64_t* value); +@@ -39,7 +39,7 @@ + bool ReadSLEB128(int64_t* value); + + template <typename AddressType> +- size_t GetEncodedSize(uint8_t encoding); ++ std::size_t GetEncodedSize(uint8_t encoding); + + bool AdjustEncodedValue(uint8_t encoding, uint64_t* value); + diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/hard-code-build-number.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/hard-code-build-number.patch new file mode 100644 index 0000000000..2a332eb689 --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/hard-code-build-number.patch @@ -0,0 +1,44 @@ +Description: just hard code rather than deal with circular deps +Forwarded: not-needed +--- a/system/core/adb/adb.cpp ++++ b/system/core/adb/adb.cpp +@@ -44,8 +44,6 @@ + #include <android-base/parsenetaddress.h> + #include <android-base/stringprintf.h> + #include <android-base/strings.h> +-#include <build/version.h> +-#include <platform_tools_version.h> + + #include "adb_auth.h" + #include "adb_io.h" +@@ -69,7 +67,7 @@ + "Version %s-%s\n" + "Installed as %s\n", + ADB_VERSION_MAJOR, ADB_VERSION_MINOR, ADB_SERVER_VERSION, +- PLATFORM_TOOLS_VERSION, android::build::GetBuildNumber().c_str(), ++ PLATFORM_TOOLS_VERSION, "debian", + android::base::GetExecutablePath().c_str()); + } + +--- a/system/core/fastboot/fastboot.cpp ++++ b/system/core/fastboot/fastboot.cpp +@@ -59,10 +59,8 @@ + #include <android-base/stringprintf.h> + #include <android-base/strings.h> + #include <android-base/unique_fd.h> +-#include <build/version.h> + #include <libavb/libavb.h> + #include <liblp/liblp.h> +-#include <platform_tools_version.h> + #include <sparse/sparse.h> + #include <ziparchive/zip_archive.h> + +@@ -1680,7 +1678,7 @@ + setvbuf(stdout, nullptr, _IONBF, 0); + setvbuf(stderr, nullptr, _IONBF, 0); + } else if (name == "version") { +- fprintf(stdout, "fastboot version %s-%s\n", PLATFORM_TOOLS_VERSION, android::build::GetBuildNumber().c_str()); ++ fprintf(stdout, "fastboot version %s-%s\n", PLATFORM_TOOLS_VERSION, "debian"); + fprintf(stdout, "Installed as %s\n", android::base::GetExecutablePath().c_str()); + return 0; + #if !defined(_WIN32) diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/libusb-header-path.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/libusb-header-path.patch new file mode 100644 index 0000000000..1663aae465 --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/libusb-header-path.patch @@ -0,0 +1,16 @@ +Description: libusb.h comes from different location +Author: Umang Parmar <umangjparmar@gmail.com> +Forwarded: not-needed +Last-Update: 2018-05-26 + +--- a/system/core/adb/client/usb_libusb.cpp ++++ b/system/core/adb/client/usb_libusb.cpp +@@ -30,7 +30,7 @@ + #include <thread> + #include <unordered_map> + +-#include <libusb/libusb.h> ++#include <libusb-1.0/libusb.h> + + #include <android-base/file.h> + #include <android-base/logging.h> diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/move-log-file-to-proper-dir.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/move-log-file-to-proper-dir.patch new file mode 100644 index 0000000000..006564b024 --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/move-log-file-to-proper-dir.patch @@ -0,0 +1,18 @@ +Description: Update log file directory. +Author: Umang Parmar <umangjparmar@gmail.com> +Last Updated: 2018-05-17 + +--- a/system/core/adb/adb_utils.cpp ++++ b/system/core/adb/adb_utils.cpp +@@ -339,6 +339,11 @@ + + return temp_path_utf8 + log_name; + #else ++ std::string log_dir = android::base::StringPrintf("/run/user/%u/adb.log", getuid()); ++ struct stat st = {0}; ++ if (stat(log_dir.c_str(), &st) == 0) { ++ return log_dir; ++ } + const char* tmp_dir = getenv("TMPDIR"); + if (tmp_dir == nullptr) tmp_dir = "/tmp"; + return android::base::StringPrintf("%s/adb.%u.log", tmp_dir, getuid()); diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/simg_dump-python3.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/simg_dump-python3.patch new file mode 100644 index 0000000000..e6933ef145 --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/simg_dump-python3.patch @@ -0,0 +1,62 @@ +Description: Port simg_dump to Python 3. +Author: Antonio Russo <antonio.e.russo@gmail.com> +Forwarded: not-needed +Last-Update: 2019-01-05 +Origin: https://bugs.debian.org/945646 + +--- +Index: android-platform-tools/system/core/libsparse/simg_dump.py +=================================================================== +--- android-platform-tools.orig/system/core/libsparse/simg_dump.py ++++ android-platform-tools/system/core/libsparse/simg_dump.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + + # Copyright (C) 2012 The Android Open Source Project + # +@@ -14,7 +14,7 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-from __future__ import print_function ++ + import csv + import getopt + import hashlib +@@ -47,7 +47,7 @@ def main(): + opts, args = getopt.getopt(sys.argv[1:], + "vsc:", + ["verbose", "showhash", "csvfile"]) +- except getopt.GetoptError, e: ++ except getopt.GetoptError as e: + print(e) + usage(me) + for o, a in opts: +@@ -66,7 +66,7 @@ def main(): + usage(me) + + if csvfilename: +- csvfile = open(csvfilename, "wb") ++ csvfile = open(csvfilename, "w", newline='') + csvwriter = csv.writer(csvfile) + + output = verbose or csvfilename or showhash +@@ -121,7 +121,7 @@ def main(): + "output offset", "output blocks", "type", "hash"]) + + offset = 0 +- for i in xrange(1, total_chunks + 1): ++ for i in range(1, total_chunks + 1): + header_bin = FH.read(12) + header = struct.unpack("<2H2I", header_bin) + chunk_type = header[0] +@@ -160,7 +160,7 @@ def main(): + if showhash: + h = hashlib.sha1() + data = fill_bin * (blk_sz / 4); +- for block in xrange(chunk_sz): ++ for block in range(chunk_sz): + h.update(data) + curhash = h.hexdigest() + elif chunk_type == 0xCAC3: diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/stdatomic.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/stdatomic.patch new file mode 100644 index 0000000000..ea3711dfa2 --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/stdatomic.patch @@ -0,0 +1,64 @@ +Description: Fix incompatibility between <stdatomic.h> and <atomic> + This 2 headers combined will cause errors for both GCC and Clang. This patch + makes sure only one of them is present at any time. +Bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60932 +Bug: https://reviews.llvm.org/D45470 +--- a/system/core/libcutils/include/cutils/trace.h ++++ b/system/core/libcutils/include/cutils/trace.h +@@ -18,7 +18,14 @@ + #define _LIBS_CUTILS_TRACE_H + + #include <inttypes.h> ++#ifdef __cplusplus ++#include <atomic> ++using std::atomic_bool; ++using std::atomic_load_explicit; ++using std::memory_order_acquire; ++#else + #include <stdatomic.h> ++#endif + #include <stdbool.h> + #include <stdint.h> + #include <stdio.h> +--- a/system/core/libcutils/include/cutils/atomic.h ++++ b/system/core/libcutils/include/cutils/atomic.h +@@ -19,7 +19,23 @@ + + #include <stdint.h> + #include <sys/types.h> ++#ifdef __cplusplus ++#include <atomic> ++using std::atomic_compare_exchange_strong_explicit; ++using std::atomic_fetch_add_explicit; ++using std::atomic_fetch_or_explicit; ++using std::atomic_fetch_sub_explicit; ++using std::atomic_int_least32_t; ++using std::atomic_load_explicit; ++using std::atomic_store_explicit; ++using std::atomic_thread_fence; ++using std::memory_order::memory_order_acquire; ++using std::memory_order::memory_order_relaxed; ++using std::memory_order::memory_order_release; ++using std::memory_order::memory_order_seq_cst; ++#else + #include <stdatomic.h> ++#endif + + #ifndef ANDROID_ATOMIC_INLINE + #define ANDROID_ATOMIC_INLINE static inline +--- a/system/core/liblog/logger.h ++++ b/system/core/liblog/logger.h +@@ -16,7 +16,13 @@ + + #pragma once + ++#ifdef __cplusplus ++#include <atomic> ++using std::atomic_int; ++using std::atomic_uintptr_t; ++#else + #include <stdatomic.h> ++#endif + #include <sys/cdefs.h> + + #include <log/log.h> diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/stub-out-fastdeploy.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/stub-out-fastdeploy.patch new file mode 100644 index 0000000000..d2426a781d --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/stub-out-fastdeploy.patch @@ -0,0 +1,93 @@ +Description: Defer packaging fastdeploy with adb for 29.x.x tags. +Forwarded: not-needed +--- a/system/core/adb/client/commandline.cpp ++++ b/system/core/adb/client/commandline.cpp +@@ -59,7 +59,6 @@ + #include "bugreport.h" + #include "client/file_sync_client.h" + #include "commandline.h" +-#include "fastdeploy.h" + #include "services.h" + #include "shell_protocol.h" + #include "sysdeps/chrono.h" +--- a/system/core/adb/client/adb_install.cpp ++++ b/system/core/adb/client/adb_install.cpp +@@ -35,7 +35,6 @@ + #include "adb_utils.h" + #include "client/file_sync_client.h" + #include "commandline.h" +-#include "fastdeploy.h" + + static constexpr int kFastDeployMinApi = 24; + +@@ -167,14 +166,6 @@ + } + + if (use_fastdeploy) { +- auto metadata = extract_metadata(file); +- if (metadata.has_value()) { +- // pass all but 1st (command) and last (apk path) parameters through to pm for +- // session creation +- std::vector<const char*> pm_args{argv + 1, argv + argc - 1}; +- auto patchFd = install_patch(pm_args.size(), pm_args.data()); +- return stream_patch(file, std::move(metadata.value()), std::move(patchFd)); +- } + } + + struct stat sb; +@@ -267,16 +258,6 @@ + argv[last_apk] = apk_dest.c_str(); /* destination name, not source location */ + + if (use_fastdeploy) { +- auto metadata = extract_metadata(apk_file[0]); +- if (metadata.has_value()) { +- auto patchFd = apply_patch_on_device(apk_dest.c_str()); +- int status = stream_patch(apk_file[0], std::move(metadata.value()), std::move(patchFd)); +- +- result = pm_command(argc, argv); +- delete_device_file(apk_dest); +- +- return status; +- } + } + + if (do_sync_push(apk_file, apk_dest.c_str(), false)) { +@@ -292,7 +273,6 @@ + InstallMode installMode = INSTALL_DEFAULT; + bool use_fastdeploy = false; + bool is_reinstall = false; +- FastDeploy_AgentUpdateStrategy agent_update_strategy = FastDeploy_AgentUpdateDifferentVersion; + + for (int i = 1; i < argc; i++) { + if (!strcmp(argv[i], "--streaming")) { +@@ -313,13 +293,10 @@ + use_fastdeploy = false; + } else if (!strcmp(argv[i], "--force-agent")) { + processedArgIndicies.push_back(i); +- agent_update_strategy = FastDeploy_AgentUpdateAlways; + } else if (!strcmp(argv[i], "--date-check-agent")) { + processedArgIndicies.push_back(i); +- agent_update_strategy = FastDeploy_AgentUpdateNewerTimeStamp; + } else if (!strcmp(argv[i], "--version-check-agent")) { + processedArgIndicies.push_back(i); +- agent_update_strategy = FastDeploy_AgentUpdateDifferentVersion; + } + } + +@@ -331,13 +308,11 @@ + error_exit("Attempting to use streaming install on unsupported device"); + } + +- if (use_fastdeploy && get_device_api_level() < kFastDeployMinApi) { +- printf("Fast Deploy is only compatible with devices of API version %d or higher, " +- "ignoring.\n", +- kFastDeployMinApi); ++ if (use_fastdeploy) { ++ printf("Fast Deploy is unavailable in this build of adb, " ++ "ignoring.\n"); + use_fastdeploy = false; + } +- fastdeploy_set_agent_update_strategy(agent_update_strategy); + + std::vector<const char*> passthrough_argv; + for (int i = 0; i < argc; i++) { diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Add-riscv64-support.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Add-riscv64-support.patch new file mode 100644 index 0000000000..4669f89d07 --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Add-riscv64-support.patch @@ -0,0 +1,651 @@ +From: Guo Ren <guoren@linux.alibaba.com> +Date: Wed, 29 Jun 2022 16:46:46 +0800 +Subject: Add riscv64 support + +This patch contains the dwarf unwind support for 64bit risc-v. + + * DwarfCfa.cpp (cfa_def_cfa_register): setup register if CFA_REG is + not setup for riscv64 + * Elf.cpp (GetRelPc): convert offset to virtual address for riscv64. + * ElfInterface.cpp (GetVirtAddrFromOffset): New for riscv64. + * RegsRiscv64.cpp (StepIfSignalHandler): Fix signal frame check. + libunwindstack/include/unwindstack/ + * ElfInterface.h (GetVirtAddrFromOffset): New for riscv64. + libunwindstack/tests/ + * DwarfCfaTest.cpp (cfa_def_cfa_register): ok for riscv64. + * RegsStepIfSignalHandlerTest.cpp (riscv64_step_if_signal_handler): Fix + testcase for riscv64 + +Test: Builds. +Test: All unit tests pass. + +Signed-off-by: Guo Ren <guoren@linux.alibaba.com> +Signed-off-by: Lifang Xia <lifang_xia@linux.alibaba.com> +Signed-off-by: Mao Han <han_mao@linux.alibaba.com> +Change-Id: Ib21ddf23cc83f332af202df7bffcaceec16063e0 +--- + system/core/libunwindstack/Android.bp | 1 + + system/core/libunwindstack/Elf.cpp | 2 + + system/core/libunwindstack/Regs.cpp | 10 ++ + system/core/libunwindstack/RegsRiscv64.cpp | 156 +++++++++++++++++++++ + .../core/libunwindstack/include/unwindstack/Elf.h | 5 + + .../include/unwindstack/MachineRiscv64.h | 59 ++++++++ + .../include/unwindstack/RegsGetLocal.h | 43 ++++++ + .../include/unwindstack/RegsRiscv64.h | 59 ++++++++ + .../include/unwindstack/UcontextRiscv64.h | 80 +++++++++++ + .../include/unwindstack/UserRiscv64.h | 37 +++++ + system/core/libunwindstack/tools/unwind.cpp | 3 + + .../core/libunwindstack/tools/unwind_symbols.cpp | 3 + + 12 files changed, 458 insertions(+) + create mode 100644 system/core/libunwindstack/RegsRiscv64.cpp + create mode 100644 system/core/libunwindstack/include/unwindstack/MachineRiscv64.h + create mode 100644 system/core/libunwindstack/include/unwindstack/RegsRiscv64.h + create mode 100644 system/core/libunwindstack/include/unwindstack/UcontextRiscv64.h + create mode 100644 system/core/libunwindstack/include/unwindstack/UserRiscv64.h + +diff --git a/system/core/libunwindstack/Android.bp b/system/core/libunwindstack/Android.bp +index 3695f72..f1f9c68 100644 +--- a/system/core/libunwindstack/Android.bp ++++ b/system/core/libunwindstack/Android.bp +@@ -70,6 +70,7 @@ cc_library { + "RegsArm64.cpp", + "RegsX86.cpp", + "RegsX86_64.cpp", ++ "RegsRiscv64.cpp", + "RegsMips.cpp", + "RegsMips64.cpp", + "Unwinder.cpp", +diff --git a/system/core/libunwindstack/Elf.cpp b/system/core/libunwindstack/Elf.cpp +index f01b092..3c2088b 100644 +--- a/system/core/libunwindstack/Elf.cpp ++++ b/system/core/libunwindstack/Elf.cpp +@@ -290,6 +290,8 @@ ElfInterface* Elf::CreateInterfaceFromMemory(Memory* memory) { + arch_ = ARCH_X86_64; + } else if (e_machine == EM_MIPS) { + arch_ = ARCH_MIPS64; ++ } else if (e_machine == EM_RISCV) { ++ arch_ = ARCH_RISCV64; + } else { + // Unsupported. + ALOGI("64 bit elf that is neither aarch64 nor x86_64 nor mips64: e_machine = %d\n", +diff --git a/system/core/libunwindstack/Regs.cpp b/system/core/libunwindstack/Regs.cpp +index c7dec52..447a554 100644 +--- a/system/core/libunwindstack/Regs.cpp ++++ b/system/core/libunwindstack/Regs.cpp +@@ -27,12 +27,14 @@ + #include <unwindstack/RegsArm64.h> + #include <unwindstack/RegsMips.h> + #include <unwindstack/RegsMips64.h> ++#include <unwindstack/RegsRiscv64.h> + #include <unwindstack/RegsX86.h> + #include <unwindstack/RegsX86_64.h> + #include <unwindstack/UserArm.h> + #include <unwindstack/UserArm64.h> + #include <unwindstack/UserMips.h> + #include <unwindstack/UserMips64.h> ++#include <unwindstack/UserRiscv64.h> + #include <unwindstack/UserX86.h> + #include <unwindstack/UserX86_64.h> + +@@ -67,6 +69,8 @@ Regs* Regs::RemoteGet(pid_t pid) { + return RegsMips::Read(buffer.data()); + case sizeof(mips64_user_regs): + return RegsMips64::Read(buffer.data()); ++ case sizeof(riscv64_user_regs): ++ return RegsRiscv64::Read(buffer.data()); + } + return nullptr; + } +@@ -85,6 +89,8 @@ Regs* Regs::CreateFromUcontext(ArchEnum arch, void* ucontext) { + return RegsMips::CreateFromUcontext(ucontext); + case ARCH_MIPS64: + return RegsMips64::CreateFromUcontext(ucontext); ++ case ARCH_RISCV64: ++ return RegsRiscv64::CreateFromUcontext(ucontext); + case ARCH_UNKNOWN: + default: + return nullptr; +@@ -104,6 +110,8 @@ ArchEnum Regs::CurrentArch() { + return ARCH_MIPS; + #elif defined(__mips__) && defined(__LP64__) + return ARCH_MIPS64; ++#elif defined(__riscv) ++ return ARCH_RISCV64; + #else + abort(); + #endif +@@ -123,6 +131,8 @@ Regs* Regs::CreateFromLocal() { + regs = new RegsMips(); + #elif defined(__mips__) && defined(__LP64__) + regs = new RegsMips64(); ++#elif defined(__riscv) ++ regs = new RegsRiscv64(); + #else + abort(); + #endif +diff --git a/system/core/libunwindstack/RegsRiscv64.cpp b/system/core/libunwindstack/RegsRiscv64.cpp +new file mode 100644 +index 0000000..887762a +--- /dev/null ++++ b/system/core/libunwindstack/RegsRiscv64.cpp +@@ -0,0 +1,156 @@ ++/* ++ * Copyright (C) 2022 The Android Open Source Project ++ * ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++#include <stdint.h> ++#include <string.h> ++ ++#include <functional> ++ ++#include <unwindstack/Elf.h> ++#include <unwindstack/MachineRiscv64.h> ++#include <unwindstack/MapInfo.h> ++#include <unwindstack/Memory.h> ++#include <unwindstack/RegsRiscv64.h> ++#include <unwindstack/UcontextRiscv64.h> ++#include <unwindstack/UserRiscv64.h> ++ ++namespace unwindstack { ++ ++RegsRiscv64::RegsRiscv64() ++ : RegsImpl<uint64_t>(RISCV64_REG_MAX, Location(LOCATION_REGISTER, RISCV64_REG_RA)) {} ++ ++ArchEnum RegsRiscv64::Arch() { ++ return ARCH_RISCV64; ++} ++ ++uint64_t RegsRiscv64::pc() { ++ return regs_[RISCV64_REG_PC]; ++} ++ ++uint64_t RegsRiscv64::sp() { ++ return regs_[RISCV64_REG_SP]; ++} ++ ++void RegsRiscv64::set_pc(uint64_t pc) { ++ regs_[RISCV64_REG_PC] = pc; ++} ++ ++void RegsRiscv64::set_sp(uint64_t sp) { ++ regs_[RISCV64_REG_SP] = sp; ++} ++ ++uint64_t RegsRiscv64::GetPcAdjustment(uint64_t rel_pc, Elf*) { ++ if (rel_pc < 8) { ++ return 0; ++ } ++ // For now, just assume no compact branches ++ return 8; ++} ++ ++bool RegsRiscv64::SetPcFromReturnAddress(Memory*) { ++ uint64_t ra = regs_[RISCV64_REG_RA]; ++ if (regs_[RISCV64_REG_PC] == ra) { ++ return false; ++ } ++ ++ regs_[RISCV64_REG_PC] = ra; ++ return true; ++} ++ ++void RegsRiscv64::IterateRegisters(std::function<void(const char*, uint64_t)> fn) { ++ fn("pc", regs_[RISCV64_REG_PC]); ++ fn("ra", regs_[RISCV64_REG_RA]); ++ fn("sp", regs_[RISCV64_REG_SP]); ++ fn("gp", regs_[RISCV64_REG_GP]); ++ fn("tp", regs_[RISCV64_REG_TP]); ++ fn("t0", regs_[RISCV64_REG_T0]); ++ fn("t1", regs_[RISCV64_REG_T1]); ++ fn("t2", regs_[RISCV64_REG_T2]); ++ fn("t3", regs_[RISCV64_REG_T3]); ++ fn("t4", regs_[RISCV64_REG_T4]); ++ fn("t5", regs_[RISCV64_REG_T5]); ++ fn("t6", regs_[RISCV64_REG_T6]); ++ fn("s0", regs_[RISCV64_REG_S0]); ++ fn("s1", regs_[RISCV64_REG_S1]); ++ fn("s2", regs_[RISCV64_REG_S2]); ++ fn("s3", regs_[RISCV64_REG_S3]); ++ fn("s4", regs_[RISCV64_REG_S4]); ++ fn("s5", regs_[RISCV64_REG_S5]); ++ fn("s6", regs_[RISCV64_REG_S6]); ++ fn("s7", regs_[RISCV64_REG_S7]); ++ fn("s8", regs_[RISCV64_REG_S8]); ++ fn("s9", regs_[RISCV64_REG_S9]); ++ fn("s10", regs_[RISCV64_REG_S10]); ++ fn("s11", regs_[RISCV64_REG_S11]); ++ fn("a0", regs_[RISCV64_REG_A0]); ++ fn("a1", regs_[RISCV64_REG_A1]); ++ fn("a2", regs_[RISCV64_REG_A2]); ++ fn("a3", regs_[RISCV64_REG_A3]); ++ fn("a4", regs_[RISCV64_REG_A4]); ++ fn("a5", regs_[RISCV64_REG_A5]); ++ fn("a6", regs_[RISCV64_REG_A6]); ++ fn("a7", regs_[RISCV64_REG_A7]); ++} ++ ++Regs* RegsRiscv64::Read(void* remote_data) { ++ riscv64_user_regs* user = reinterpret_cast<riscv64_user_regs*>(remote_data); ++ ++ RegsRiscv64* regs = new RegsRiscv64(); ++ memcpy(regs->RawData(), &user->regs[0], RISCV64_REG_MAX * sizeof(uint64_t)); ++ // uint64_t* reg_data = reinterpret_cast<uint64_t*>(regs->RawData()); ++ return regs; ++} ++ ++Regs* RegsRiscv64::CreateFromUcontext(void* ucontext) { ++ riscv64_ucontext_t* riscv64_ucontext = reinterpret_cast<riscv64_ucontext_t*>(ucontext); ++ ++ RegsRiscv64* regs = new RegsRiscv64(); ++ memcpy(regs->RawData(), &riscv64_ucontext->uc_mcontext.__gregs[0], ++ RISCV64_REG_MAX * sizeof(uint64_t)); ++ return regs; ++} ++ ++bool RegsRiscv64::StepIfSignalHandler(uint64_t elf_offset, Elf* elf, Memory* process_memory) { ++ uint64_t data; ++ Memory* elf_memory = elf->memory(); ++ // Read from elf memory since it is usually more expensive to read from ++ // process memory. ++ if (!elf_memory->ReadFully(elf_offset, &data, sizeof(data))) { ++ return false; ++ } ++ // Look for the kernel sigreturn function. ++ // __kernel_rt_sigreturn: ++ // li a7, __NR_rt_sigreturn ++ // scall ++ ++ const uint8_t li_scall[] = {0x93, 0x08, 0xb0, 0x08, 0x73, 0x00, 0x00, 0x00}; ++ if (memcmp(&data, &li_scall, 8) != 0) { ++ return false; ++ } ++ ++ // SP + sizeof(siginfo_t) + uc_mcontext offset + PC offset. ++ if (!process_memory->ReadFully(regs_[RISCV64_REG_SP] + 0x80 + 0xb0 + 0x00, regs_.data(), ++ sizeof(uint64_t) * (RISCV64_REG_MAX))) { ++ return false; ++ } ++ return true; ++} ++ ++Regs* RegsRiscv64::Clone() { ++ return new RegsRiscv64(*this); ++} ++ ++} // namespace unwindstack +diff --git a/system/core/libunwindstack/include/unwindstack/Elf.h b/system/core/libunwindstack/include/unwindstack/Elf.h +index 472ed92..88fa0ff 100644 +--- a/system/core/libunwindstack/include/unwindstack/Elf.h ++++ b/system/core/libunwindstack/include/unwindstack/Elf.h +@@ -32,6 +32,10 @@ + #define EM_AARCH64 183 + #endif + ++#if !defined(EM_RISCV) ++#define EM_RISCV 243 ++#endif ++ + namespace unwindstack { + + // Forward declaration. +@@ -46,6 +50,7 @@ enum ArchEnum : uint8_t { + ARCH_X86_64, + ARCH_MIPS, + ARCH_MIPS64, ++ ARCH_RISCV64, + }; + + class Elf { +diff --git a/system/core/libunwindstack/include/unwindstack/MachineRiscv64.h b/system/core/libunwindstack/include/unwindstack/MachineRiscv64.h +new file mode 100644 +index 0000000..397e680 +--- /dev/null ++++ b/system/core/libunwindstack/include/unwindstack/MachineRiscv64.h +@@ -0,0 +1,59 @@ ++/* ++ * Copyright (C) 2022 The Android Open Source Project ++ * ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++#pragma once ++ ++#include <stdint.h> ++ ++namespace unwindstack { ++ ++enum Riscv64Reg : uint16_t { ++ RISCV64_REG_PC, ++ RISCV64_REG_RA, ++ RISCV64_REG_SP, ++ RISCV64_REG_GP, ++ RISCV64_REG_TP, ++ RISCV64_REG_T0, ++ RISCV64_REG_T1, ++ RISCV64_REG_T2, ++ RISCV64_REG_S0, ++ RISCV64_REG_S1, ++ RISCV64_REG_A0, ++ RISCV64_REG_A1, ++ RISCV64_REG_A2, ++ RISCV64_REG_A3, ++ RISCV64_REG_A4, ++ RISCV64_REG_A5, ++ RISCV64_REG_A6, ++ RISCV64_REG_A7, ++ RISCV64_REG_S2, ++ RISCV64_REG_S3, ++ RISCV64_REG_S4, ++ RISCV64_REG_S5, ++ RISCV64_REG_S6, ++ RISCV64_REG_S7, ++ RISCV64_REG_S8, ++ RISCV64_REG_S9, ++ RISCV64_REG_S10, ++ RISCV64_REG_S11, ++ RISCV64_REG_T3, ++ RISCV64_REG_T4, ++ RISCV64_REG_T5, ++ RISCV64_REG_T6, ++ RISCV64_REG_MAX, ++}; ++ ++} // namespace unwindstack +diff --git a/system/core/libunwindstack/include/unwindstack/RegsGetLocal.h b/system/core/libunwindstack/include/unwindstack/RegsGetLocal.h +index f0b5e3a..698eba2 100644 +--- a/system/core/libunwindstack/include/unwindstack/RegsGetLocal.h ++++ b/system/core/libunwindstack/include/unwindstack/RegsGetLocal.h +@@ -81,6 +81,49 @@ inline __attribute__((__always_inline__)) void AsmGetRegs(void* reg_data) { + : "x12", "x13", "memory"); + } + ++#elif defined(__riscv) ++ ++inline __attribute__((__always_inline__)) void AsmGetRegs(void* reg_data) { ++ asm volatile( ++ "1:\n" ++ "sd ra, 8(%[base])\n" ++ "sd sp, 16(%[base])\n" ++ "sd gp, 24(%[base])\n" ++ "sd tp, 32(%[base])\n" ++ "sd t0, 40(%[base])\n" ++ "sd t1, 48(%[base])\n" ++ "sd t2, 56(%[base])\n" ++ "sd s0, 64(%[base])\n" ++ "sd s1, 72(%[base])\n" ++ "sd a0, 80(%[base])\n" ++ "sd a1, 88(%[base])\n" ++ "sd a2, 96(%[base])\n" ++ "sd a3, 104(%[base])\n" ++ "sd a4, 112(%[base])\n" ++ "sd a5, 120(%[base])\n" ++ "sd a6, 128(%[base])\n" ++ "sd a7, 136(%[base])\n" ++ "sd s2, 144(%[base])\n" ++ "sd s3, 152(%[base])\n" ++ "sd s4, 160(%[base])\n" ++ "sd s5, 168(%[base])\n" ++ "sd s6, 176(%[base])\n" ++ "sd s7, 184(%[base])\n" ++ "sd s8, 192(%[base])\n" ++ "sd s9, 200(%[base])\n" ++ "sd s10, 208(%[base])\n" ++ "sd s11, 216(%[base])\n" ++ "sd t3, 224(%[base])\n" ++ "sd t4, 232(%[base])\n" ++ "sd t5, 240(%[base])\n" ++ "sd t6, 248(%[base])\n" ++ "la t1, 1b\n" ++ "sd t1, 0(%[base])\n" ++ : [base] "+r"(reg_data) ++ : ++ : "t1", "memory"); ++} ++ + #elif defined(__i386__) || defined(__x86_64__) || defined(__mips__) + + extern "C" void AsmGetRegs(void* regs); +diff --git a/system/core/libunwindstack/include/unwindstack/RegsRiscv64.h b/system/core/libunwindstack/include/unwindstack/RegsRiscv64.h +new file mode 100644 +index 0000000..eb09397 +--- /dev/null ++++ b/system/core/libunwindstack/include/unwindstack/RegsRiscv64.h +@@ -0,0 +1,59 @@ ++/* ++ * Copyright (C) 2022 The Android Open Source Project ++ * ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++#pragma once ++ ++#include <stdint.h> ++ ++#include <functional> ++ ++#include <unwindstack/Elf.h> ++#include <unwindstack/Regs.h> ++ ++namespace unwindstack { ++ ++// Forward declarations. ++class Memory; ++ ++class RegsRiscv64 : public RegsImpl<uint64_t> { ++ public: ++ RegsRiscv64(); ++ virtual ~RegsRiscv64() = default; ++ ++ ArchEnum Arch() override final; ++ ++ uint64_t GetPcAdjustment(uint64_t rel_pc, Elf* elf) override; ++ ++ bool SetPcFromReturnAddress(Memory* process_memory) override; ++ ++ bool StepIfSignalHandler(uint64_t elf_offset, Elf* elf, Memory* process_memory) override; ++ ++ void IterateRegisters(std::function<void(const char*, uint64_t)>) override final; ++ ++ uint64_t pc() override; ++ uint64_t sp() override; ++ ++ void set_pc(uint64_t pc) override; ++ void set_sp(uint64_t sp) override; ++ ++ Regs* Clone() override final; ++ ++ static Regs* Read(void* data); ++ ++ static Regs* CreateFromUcontext(void* ucontext); ++}; ++ ++} // namespace unwindstack +diff --git a/system/core/libunwindstack/include/unwindstack/UcontextRiscv64.h b/system/core/libunwindstack/include/unwindstack/UcontextRiscv64.h +new file mode 100644 +index 0000000..c6c82b1 +--- /dev/null ++++ b/system/core/libunwindstack/include/unwindstack/UcontextRiscv64.h +@@ -0,0 +1,80 @@ ++/* ++ * Copyright (C) 2014 The Android Open Source Project ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * * Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * * Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in ++ * the documentation and/or other materials provided with the ++ * distribution. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS ++ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ++ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, ++ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS ++ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED ++ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, ++ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ++ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ++ * SUCH DAMAGE. ++ */ ++ ++#pragma once ++ ++#include <sys/cdefs.h> ++ ++typedef uint64_t __riscv_mc_gp_state[32]; // unsigned long ++ ++struct __riscv_mc_f_ext_state { ++ uint32_t __f[32]; ++ uint32_t __fcsr; ++}; ++ ++struct __riscv_mc_d_ext_state { ++ uint64_t __f[32]; ++ uint32_t __fcsr; ++}; ++ ++struct __riscv_mc_q_ext_state { ++ uint64_t __f[64] __attribute__((__aligned__(16))); ++ uint32_t __fcsr; ++ uint32_t __reserved[3]; ++}; ++ ++union __riscv_mc_fp_state { ++ struct __riscv_mc_f_ext_state __f; ++ struct __riscv_mc_d_ext_state __d; ++ struct __riscv_mc_q_ext_state __q; ++}; ++ ++struct __riscv_stack_t { ++ uint64_t ss_sp; ++ int32_t ss_flags; ++ uint64_t ss_size; ++}; ++ ++struct riscv64_sigset_t { ++ uint64_t sig; // unsigned long ++}; ++ ++struct riscv64_mcontext_t { ++ __riscv_mc_gp_state __gregs; ++ union __riscv_mc_fp_state __fpregs; ++}; ++ ++struct riscv64_ucontext_t { ++ uint64_t uc_flags; // unsigned long ++ struct riscv64_ucontext_t* uc_link; ++ __riscv_stack_t uc_stack; ++ riscv64_sigset_t uc_sigmask; ++ /* The kernel adds extra padding here to allow sigset_t to grow. */ ++ int8_t __padding[128 - sizeof(riscv64_sigset_t)]; // char ++ riscv64_mcontext_t uc_mcontext; ++}; +diff --git a/system/core/libunwindstack/include/unwindstack/UserRiscv64.h b/system/core/libunwindstack/include/unwindstack/UserRiscv64.h +new file mode 100644 +index 0000000..1e91228 +--- /dev/null ++++ b/system/core/libunwindstack/include/unwindstack/UserRiscv64.h +@@ -0,0 +1,37 @@ ++/* ++ * Copyright (C) 2016 The Android Open Source Project ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * * Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * * Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in ++ * the documentation and/or other materials provided with the ++ * distribution. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS ++ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ++ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, ++ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS ++ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED ++ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, ++ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ++ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ++ * SUCH DAMAGE. ++ */ ++ ++#pragma once ++ ++namespace unwindstack { ++ ++struct riscv64_user_regs { ++ uint64_t regs[32]; ++}; ++ ++} // namespace unwindstack +diff --git a/system/core/libunwindstack/tools/unwind.cpp b/system/core/libunwindstack/tools/unwind.cpp +index 1812e50..ae20891 100644 +--- a/system/core/libunwindstack/tools/unwind.cpp ++++ b/system/core/libunwindstack/tools/unwind.cpp +@@ -83,6 +83,9 @@ void DoUnwind(pid_t pid) { + case unwindstack::ARCH_MIPS64: + printf("mips64"); + break; ++ case unwindstack::ARCH_RISCV64: ++ printf("riscv64"); ++ break; + default: + printf("unknown\n"); + return; +diff --git a/system/core/libunwindstack/tools/unwind_symbols.cpp b/system/core/libunwindstack/tools/unwind_symbols.cpp +index 8df2284..976db56 100644 +--- a/system/core/libunwindstack/tools/unwind_symbols.cpp ++++ b/system/core/libunwindstack/tools/unwind_symbols.cpp +@@ -77,6 +77,9 @@ int main(int argc, char** argv) { + case EM_AARCH64: + printf("ABI: arm64\n"); + break; ++ case EM_RISCV: ++ printf("ABI: riscv64\n"); ++ break; + case EM_386: + printf("ABI: x86\n"); + break; diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Added-missing-headers.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Added-missing-headers.patch new file mode 100644 index 0000000000..c07e93660f --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Added-missing-headers.patch @@ -0,0 +1,44 @@ +Description: Added missing headers causing compile errors +Author: Umang Parmar <umangjparmar@gmail.com> +Forwarded: not-needed + +--- a/system/core/adb/sysdeps/posix/network.cpp ++++ b/system/core/adb/sysdeps/posix/network.cpp +@@ -22,6 +22,7 @@ + #include <sys/socket.h> + + #include <string> ++#include <cstring> + + #include <android-base/logging.h> + #include <android-base/stringprintf.h> +--- a/system/core/base/file.cpp ++++ b/system/core/base/file.cpp +@@ -26,6 +26,7 @@ + #include <sys/stat.h> + #include <sys/types.h> + #include <unistd.h> ++#include <cstring> + + #include <memory> + #include <mutex> +--- a/system/core/libbacktrace/BacktraceMap.cpp ++++ b/system/core/libbacktrace/BacktraceMap.cpp +@@ -21,6 +21,7 @@ + #include <stdint.h> + #include <sys/types.h> + #include <unistd.h> ++#include <algorithm> + + #include <log/log.h> + +--- a/system/core/libbacktrace/UnwindStackMap.cpp ++++ b/system/core/libbacktrace/UnwindStackMap.cpp +@@ -20,6 +20,7 @@ + + #include <string> + #include <vector> ++#include <algorithm> + + #include <backtrace/BacktraceMap.h> + #include <unwindstack/Elf.h> diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Nonnull.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Nonnull.patch new file mode 100644 index 0000000000..8d1408a48e --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Nonnull.patch @@ -0,0 +1,20 @@ +Description: Bring Clang's _Nonnull keyword to GCC +Author: Kai-Chung Yan +Forwarded: not-needed +--- a/system/core/adb/sysdeps.h ++++ b/system/core/adb/sysdeps.h +@@ -40,11 +40,12 @@ + #include "sysdeps/network.h" + #include "sysdeps/stat.h" + ++#define _Nonnull ++#define _Nullable ++ + #ifdef _WIN32 + + // Clang-only nullability specifiers +-#define _Nonnull +-#define _Nullable + + #include <ctype.h> + #include <direct.h> diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Vector-cast.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Vector-cast.patch new file mode 100644 index 0000000000..b32d5f6f54 --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Vector-cast.patch @@ -0,0 +1,14 @@ +Description: Fix the weird error by GCC7 that fails to match the correct parent method. +Author: Kai-Chung Yan +Forwarded: not-needed +--- a/system/core/libutils/include/utils/Vector.h ++++ b/system/core/libutils/include/utils/Vector.h +@@ -256,7 +256,7 @@ + + template<class TYPE> inline + const Vector<TYPE>& Vector<TYPE>::operator = (const Vector<TYPE>& rhs) const { +- VectorImpl::operator = (static_cast<const VectorImpl&>(rhs)); ++ VectorImpl::operator = (rhs); + return *this; + } + diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/add-missing-headers.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/add-missing-headers.patch new file mode 100644 index 0000000000..49d3ecefbb --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/add-missing-headers.patch @@ -0,0 +1,41 @@ +Forwarded: not-needed +--- a/system/core/fs_mgr/liblp/reader.cpp ++++ b/system/core/fs_mgr/liblp/reader.cpp +@@ -22,6 +22,7 @@ + #include <unistd.h> + + #include <functional> ++#include <cstring> + + #include <android-base/file.h> + #include <android-base/unique_fd.h> +--- a/system/core/fs_mgr/liblp/writer.cpp ++++ b/system/core/fs_mgr/liblp/writer.cpp +@@ -21,6 +21,7 @@ + #include <unistd.h> + + #include <string> ++#include <cstring> + + #include <android-base/file.h> + #include <android-base/unique_fd.h> +--- a/system/core/liblog/logger_write.cpp ++++ b/system/core/liblog/logger_write.cpp +@@ -27,6 +27,7 @@ + #include <android/set_abort_message.h> + #endif + ++#include <mutex> + #include <shared_mutex> + + #include <android-base/errno_restorer.h> +--- a/system/core/libziparchive/zip_archive_stream_entry.cc ++++ b/system/core/libziparchive/zip_archive_stream_entry.cc +@@ -23,6 +23,7 @@ + #include <sys/types.h> + #include <unistd.h> + ++#include <limits> + #include <memory> + #include <vector> + diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-attribute-issue-with-gcc.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-attribute-issue-with-gcc.patch new file mode 100644 index 0000000000..e0b4275579 --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-attribute-issue-with-gcc.patch @@ -0,0 +1,17 @@ +Description: remove clang-ism +Forwarded: not-needed + +--- a/system/core/base/include/android-base/logging.h ++++ b/system/core/base/include/android-base/logging.h +@@ -451,10 +451,7 @@ + // -Wno-user-defined-warnings to CPPFLAGS. + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wgcc-compat" +-#define OSTREAM_STRING_POINTER_USAGE_WARNING \ +- __attribute__((diagnose_if(true, "Unexpected logging of string pointer", "warning"))) +-inline OSTREAM_STRING_POINTER_USAGE_WARNING +-std::ostream& operator<<(std::ostream& stream, const std::string* string_pointer) { ++inline std::ostream& operator<<(std::ostream& stream, const std::string* string_pointer) { + return stream << static_cast<const void*>(string_pointer); + } + #pragma clang diagnostic pop diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-build-on-non-x86.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-build-on-non-x86.patch new file mode 100644 index 0000000000..98a5078244 --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-build-on-non-x86.patch @@ -0,0 +1,24 @@ +Description: non-x86 arches do not have PAGE_SIZE +Forwarded: not-needed +--- a/system/core/base/cmsg.cpp ++++ b/system/core/base/cmsg.cpp +@@ -33,7 +33,8 @@ + const std::vector<int>& fds) { + size_t cmsg_space = CMSG_SPACE(sizeof(int) * fds.size()); + size_t cmsg_len = CMSG_LEN(sizeof(int) * fds.size()); +- if (cmsg_space >= PAGE_SIZE) { ++ size_t pagesize = static_cast<size_t>(sysconf(_SC_PAGE_SIZE)); ++ if (cmsg_space >= pagesize) { + errno = ENOMEM; + return -1; + } +@@ -75,7 +76,8 @@ + fds->clear(); + + size_t cmsg_space = CMSG_SPACE(sizeof(int) * max_fds); +- if (cmsg_space >= PAGE_SIZE) { ++ size_t pagesize = static_cast<size_t>(sysconf(_SC_PAGE_SIZE)); ++ if (cmsg_space >= pagesize) { + errno = ENOMEM; + return -1; + } diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-gettid-exception-declaration.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-gettid-exception-declaration.patch new file mode 100644 index 0000000000..7fd228bff6 --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-gettid-exception-declaration.patch @@ -0,0 +1,24 @@ +Description: get libcutils building +Forwarded: not-needed +--- a/system/core/libcutils/include/cutils/threads.h ++++ b/system/core/libcutils/include/cutils/threads.h +@@ -33,7 +33,7 @@ + // Deprecated: use android::base::GetThreadId instead, which doesn't truncate on Mac/Windows. + // + +-extern pid_t gettid(); ++extern pid_t gettid(void) __THROW; + + // + // Deprecated: use `_Thread_local` in C or `thread_local` in C++. +--- a/system/core/libcutils/threads.cpp ++++ b/system/core/libcutils/threads.cpp +@@ -33,7 +33,7 @@ + + // No definition needed for Android because we'll just pick up bionic's copy. + #ifndef __ANDROID__ +-pid_t gettid() { ++pid_t gettid(void) __THROW { + #if defined(__APPLE__) + uint64_t tid; + pthread_threadid_np(NULL, &tid); diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-standard-namespace-errors.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-standard-namespace-errors.patch new file mode 100644 index 0000000000..e41a3576ae --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-standard-namespace-errors.patch @@ -0,0 +1,22 @@ +Description: Add missing 'std::' scope identifiers. +Forwarded: not-needed +--- a/system/core/libunwindstack/include/unwindstack/DwarfMemory.h ++++ b/system/core/libunwindstack/include/unwindstack/DwarfMemory.h +@@ -29,7 +29,7 @@ + DwarfMemory(Memory* memory) : memory_(memory) {} + virtual ~DwarfMemory() = default; + +- bool ReadBytes(void* dst, size_t num_bytes); ++ bool ReadBytes(void* dst, std::size_t num_bytes); + + template <typename SignedType> + bool ReadSigned(uint64_t* value); +@@ -39,7 +39,7 @@ + bool ReadSLEB128(int64_t* value); + + template <typename AddressType> +- size_t GetEncodedSize(uint8_t encoding); ++ std::size_t GetEncodedSize(uint8_t encoding); + + bool AdjustEncodedValue(uint8_t encoding, uint64_t* value); + diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/hard-code-build-number.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/hard-code-build-number.patch new file mode 100644 index 0000000000..2a332eb689 --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/hard-code-build-number.patch @@ -0,0 +1,44 @@ +Description: just hard code rather than deal with circular deps +Forwarded: not-needed +--- a/system/core/adb/adb.cpp ++++ b/system/core/adb/adb.cpp +@@ -44,8 +44,6 @@ + #include <android-base/parsenetaddress.h> + #include <android-base/stringprintf.h> + #include <android-base/strings.h> +-#include <build/version.h> +-#include <platform_tools_version.h> + + #include "adb_auth.h" + #include "adb_io.h" +@@ -69,7 +67,7 @@ + "Version %s-%s\n" + "Installed as %s\n", + ADB_VERSION_MAJOR, ADB_VERSION_MINOR, ADB_SERVER_VERSION, +- PLATFORM_TOOLS_VERSION, android::build::GetBuildNumber().c_str(), ++ PLATFORM_TOOLS_VERSION, "debian", + android::base::GetExecutablePath().c_str()); + } + +--- a/system/core/fastboot/fastboot.cpp ++++ b/system/core/fastboot/fastboot.cpp +@@ -59,10 +59,8 @@ + #include <android-base/stringprintf.h> + #include <android-base/strings.h> + #include <android-base/unique_fd.h> +-#include <build/version.h> + #include <libavb/libavb.h> + #include <liblp/liblp.h> +-#include <platform_tools_version.h> + #include <sparse/sparse.h> + #include <ziparchive/zip_archive.h> + +@@ -1680,7 +1678,7 @@ + setvbuf(stdout, nullptr, _IONBF, 0); + setvbuf(stderr, nullptr, _IONBF, 0); + } else if (name == "version") { +- fprintf(stdout, "fastboot version %s-%s\n", PLATFORM_TOOLS_VERSION, android::build::GetBuildNumber().c_str()); ++ fprintf(stdout, "fastboot version %s-%s\n", PLATFORM_TOOLS_VERSION, "debian"); + fprintf(stdout, "Installed as %s\n", android::base::GetExecutablePath().c_str()); + return 0; + #if !defined(_WIN32) diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/libusb-header-path.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/libusb-header-path.patch new file mode 100644 index 0000000000..1663aae465 --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/libusb-header-path.patch @@ -0,0 +1,16 @@ +Description: libusb.h comes from different location +Author: Umang Parmar <umangjparmar@gmail.com> +Forwarded: not-needed +Last-Update: 2018-05-26 + +--- a/system/core/adb/client/usb_libusb.cpp ++++ b/system/core/adb/client/usb_libusb.cpp +@@ -30,7 +30,7 @@ + #include <thread> + #include <unordered_map> + +-#include <libusb/libusb.h> ++#include <libusb-1.0/libusb.h> + + #include <android-base/file.h> + #include <android-base/logging.h> diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/move-log-file-to-proper-dir.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/move-log-file-to-proper-dir.patch new file mode 100644 index 0000000000..006564b024 --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/move-log-file-to-proper-dir.patch @@ -0,0 +1,18 @@ +Description: Update log file directory. +Author: Umang Parmar <umangjparmar@gmail.com> +Last Updated: 2018-05-17 + +--- a/system/core/adb/adb_utils.cpp ++++ b/system/core/adb/adb_utils.cpp +@@ -339,6 +339,11 @@ + + return temp_path_utf8 + log_name; + #else ++ std::string log_dir = android::base::StringPrintf("/run/user/%u/adb.log", getuid()); ++ struct stat st = {0}; ++ if (stat(log_dir.c_str(), &st) == 0) { ++ return log_dir; ++ } + const char* tmp_dir = getenv("TMPDIR"); + if (tmp_dir == nullptr) tmp_dir = "/tmp"; + return android::base::StringPrintf("%s/adb.%u.log", tmp_dir, getuid()); diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/simg_dump-python3.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/simg_dump-python3.patch new file mode 100644 index 0000000000..e6933ef145 --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/simg_dump-python3.patch @@ -0,0 +1,62 @@ +Description: Port simg_dump to Python 3. +Author: Antonio Russo <antonio.e.russo@gmail.com> +Forwarded: not-needed +Last-Update: 2019-01-05 +Origin: https://bugs.debian.org/945646 + +--- +Index: android-platform-tools/system/core/libsparse/simg_dump.py +=================================================================== +--- android-platform-tools.orig/system/core/libsparse/simg_dump.py ++++ android-platform-tools/system/core/libsparse/simg_dump.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + + # Copyright (C) 2012 The Android Open Source Project + # +@@ -14,7 +14,7 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-from __future__ import print_function ++ + import csv + import getopt + import hashlib +@@ -47,7 +47,7 @@ def main(): + opts, args = getopt.getopt(sys.argv[1:], + "vsc:", + ["verbose", "showhash", "csvfile"]) +- except getopt.GetoptError, e: ++ except getopt.GetoptError as e: + print(e) + usage(me) + for o, a in opts: +@@ -66,7 +66,7 @@ def main(): + usage(me) + + if csvfilename: +- csvfile = open(csvfilename, "wb") ++ csvfile = open(csvfilename, "w", newline='') + csvwriter = csv.writer(csvfile) + + output = verbose or csvfilename or showhash +@@ -121,7 +121,7 @@ def main(): + "output offset", "output blocks", "type", "hash"]) + + offset = 0 +- for i in xrange(1, total_chunks + 1): ++ for i in range(1, total_chunks + 1): + header_bin = FH.read(12) + header = struct.unpack("<2H2I", header_bin) + chunk_type = header[0] +@@ -160,7 +160,7 @@ def main(): + if showhash: + h = hashlib.sha1() + data = fill_bin * (blk_sz / 4); +- for block in xrange(chunk_sz): ++ for block in range(chunk_sz): + h.update(data) + curhash = h.hexdigest() + elif chunk_type == 0xCAC3: diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/stdatomic.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/stdatomic.patch new file mode 100644 index 0000000000..ea3711dfa2 --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/stdatomic.patch @@ -0,0 +1,64 @@ +Description: Fix incompatibility between <stdatomic.h> and <atomic> + This 2 headers combined will cause errors for both GCC and Clang. This patch + makes sure only one of them is present at any time. +Bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60932 +Bug: https://reviews.llvm.org/D45470 +--- a/system/core/libcutils/include/cutils/trace.h ++++ b/system/core/libcutils/include/cutils/trace.h +@@ -18,7 +18,14 @@ + #define _LIBS_CUTILS_TRACE_H + + #include <inttypes.h> ++#ifdef __cplusplus ++#include <atomic> ++using std::atomic_bool; ++using std::atomic_load_explicit; ++using std::memory_order_acquire; ++#else + #include <stdatomic.h> ++#endif + #include <stdbool.h> + #include <stdint.h> + #include <stdio.h> +--- a/system/core/libcutils/include/cutils/atomic.h ++++ b/system/core/libcutils/include/cutils/atomic.h +@@ -19,7 +19,23 @@ + + #include <stdint.h> + #include <sys/types.h> ++#ifdef __cplusplus ++#include <atomic> ++using std::atomic_compare_exchange_strong_explicit; ++using std::atomic_fetch_add_explicit; ++using std::atomic_fetch_or_explicit; ++using std::atomic_fetch_sub_explicit; ++using std::atomic_int_least32_t; ++using std::atomic_load_explicit; ++using std::atomic_store_explicit; ++using std::atomic_thread_fence; ++using std::memory_order::memory_order_acquire; ++using std::memory_order::memory_order_relaxed; ++using std::memory_order::memory_order_release; ++using std::memory_order::memory_order_seq_cst; ++#else + #include <stdatomic.h> ++#endif + + #ifndef ANDROID_ATOMIC_INLINE + #define ANDROID_ATOMIC_INLINE static inline +--- a/system/core/liblog/logger.h ++++ b/system/core/liblog/logger.h +@@ -16,7 +16,13 @@ + + #pragma once + ++#ifdef __cplusplus ++#include <atomic> ++using std::atomic_int; ++using std::atomic_uintptr_t; ++#else + #include <stdatomic.h> ++#endif + #include <sys/cdefs.h> + + #include <log/log.h> diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/stub-out-fastdeploy.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/stub-out-fastdeploy.patch new file mode 100644 index 0000000000..d2426a781d --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/stub-out-fastdeploy.patch @@ -0,0 +1,93 @@ +Description: Defer packaging fastdeploy with adb for 29.x.x tags. +Forwarded: not-needed +--- a/system/core/adb/client/commandline.cpp ++++ b/system/core/adb/client/commandline.cpp +@@ -59,7 +59,6 @@ + #include "bugreport.h" + #include "client/file_sync_client.h" + #include "commandline.h" +-#include "fastdeploy.h" + #include "services.h" + #include "shell_protocol.h" + #include "sysdeps/chrono.h" +--- a/system/core/adb/client/adb_install.cpp ++++ b/system/core/adb/client/adb_install.cpp +@@ -35,7 +35,6 @@ + #include "adb_utils.h" + #include "client/file_sync_client.h" + #include "commandline.h" +-#include "fastdeploy.h" + + static constexpr int kFastDeployMinApi = 24; + +@@ -167,14 +166,6 @@ + } + + if (use_fastdeploy) { +- auto metadata = extract_metadata(file); +- if (metadata.has_value()) { +- // pass all but 1st (command) and last (apk path) parameters through to pm for +- // session creation +- std::vector<const char*> pm_args{argv + 1, argv + argc - 1}; +- auto patchFd = install_patch(pm_args.size(), pm_args.data()); +- return stream_patch(file, std::move(metadata.value()), std::move(patchFd)); +- } + } + + struct stat sb; +@@ -267,16 +258,6 @@ + argv[last_apk] = apk_dest.c_str(); /* destination name, not source location */ + + if (use_fastdeploy) { +- auto metadata = extract_metadata(apk_file[0]); +- if (metadata.has_value()) { +- auto patchFd = apply_patch_on_device(apk_dest.c_str()); +- int status = stream_patch(apk_file[0], std::move(metadata.value()), std::move(patchFd)); +- +- result = pm_command(argc, argv); +- delete_device_file(apk_dest); +- +- return status; +- } + } + + if (do_sync_push(apk_file, apk_dest.c_str(), false)) { +@@ -292,7 +273,6 @@ + InstallMode installMode = INSTALL_DEFAULT; + bool use_fastdeploy = false; + bool is_reinstall = false; +- FastDeploy_AgentUpdateStrategy agent_update_strategy = FastDeploy_AgentUpdateDifferentVersion; + + for (int i = 1; i < argc; i++) { + if (!strcmp(argv[i], "--streaming")) { +@@ -313,13 +293,10 @@ + use_fastdeploy = false; + } else if (!strcmp(argv[i], "--force-agent")) { + processedArgIndicies.push_back(i); +- agent_update_strategy = FastDeploy_AgentUpdateAlways; + } else if (!strcmp(argv[i], "--date-check-agent")) { + processedArgIndicies.push_back(i); +- agent_update_strategy = FastDeploy_AgentUpdateNewerTimeStamp; + } else if (!strcmp(argv[i], "--version-check-agent")) { + processedArgIndicies.push_back(i); +- agent_update_strategy = FastDeploy_AgentUpdateDifferentVersion; + } + } + +@@ -331,13 +308,11 @@ + error_exit("Attempting to use streaming install on unsupported device"); + } + +- if (use_fastdeploy && get_device_api_level() < kFastDeployMinApi) { +- printf("Fast Deploy is only compatible with devices of API version %d or higher, " +- "ignoring.\n", +- kFastDeployMinApi); ++ if (use_fastdeploy) { ++ printf("Fast Deploy is unavailable in this build of adb, " ++ "ignoring.\n"); + use_fastdeploy = false; + } +- fastdeploy_set_agent_update_strategy(agent_update_strategy); + + std::vector<const char*> passthrough_argv; + for (int i = 0; i < argc; i++) { diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/throw-exception-on-unknown-os.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/throw-exception-on-unknown-os.patch new file mode 100644 index 0000000000..6b07f17bfc --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/throw-exception-on-unknown-os.patch @@ -0,0 +1,16 @@ +Description: Turn #error into exceptions + So the library can be built on non-Linux platforms too, although can't + guarauntee its functionality regarding that piece of code. +Forwarded: not-needed +--- a/system/core/base/file.cpp ++++ b/system/core/base/file.cpp +@@ -422,7 +422,8 @@ + path[PATH_MAX - 1] = 0; + return path; + #else +-#error unknown OS ++#include <stdexcept> ++ throw std::runtime_error(std::string("Unknown OS!")); + #endif + } + diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/throw-exception-on-unknown-os.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/throw-exception-on-unknown-os.patch new file mode 100644 index 0000000000..6b07f17bfc --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/throw-exception-on-unknown-os.patch @@ -0,0 +1,16 @@ +Description: Turn #error into exceptions + So the library can be built on non-Linux platforms too, although can't + guarauntee its functionality regarding that piece of code. +Forwarded: not-needed +--- a/system/core/base/file.cpp ++++ b/system/core/base/file.cpp +@@ -422,7 +422,8 @@ + path[PATH_MAX - 1] = 0; + return path; + #else +-#error unknown OS ++#include <stdexcept> ++ throw std::runtime_error(std::string("Unknown OS!")); + #endif + } + diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/remount b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/remount new file mode 100644 index 0000000000..751c3501ef --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/remount @@ -0,0 +1,2 @@ +#!/bin/sh +mount -o remount,rw / diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/rules_yocto.mk b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/rules_yocto.mk new file mode 100644 index 0000000000..2c808d3c1e --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/rules_yocto.mk @@ -0,0 +1 @@ +CPPFLAGS += -fPIC diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb new file mode 100644 index 0000000000..caf55ed6d8 --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb @@ -0,0 +1,194 @@ +DESCRIPTION = "Various utilities from Android" +SECTION = "console/utils" +LICENSE = "Apache-2.0 & GPL-2.0-only & BSD-2-Clause & BSD-3-Clause" +LIC_FILES_CHKSUM = " \ + file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10 \ + file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6 \ + file://${COMMON_LICENSE_DIR}/BSD-2-Clause;md5=cb641bc04cda31daea161b1bc15da69f \ + file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \ +" +DEPENDS = "libbsd libpcre zlib libcap libusb squashfs-tools p7zip libselinux googletest" + +SRCREV_core = "abfd66fafcbb691d7860df059f1df1c9b1ef29da" + +SRC_URI = " \ + git://salsa.debian.org/android-tools-team/android-platform-tools;name=core;protocol=https;nobranch=1 \ +" + +# Patches copied from android-platform-tools/debian/patches +# and applied in the order defined by the file debian/patches/series +SRC_URI += " \ + file://debian/external/libunwind/user_pt_regs.patch \ + file://debian/external/libunwind/legacy_built-in_sync_functions.patch \ + file://debian/external/libunwind/20150704-CVE-2015-3239_dwarf_i.h.patch \ + \ + file://debian/system/core/move-log-file-to-proper-dir.patch \ + file://debian/system/core/Added-missing-headers.patch \ + file://debian/system/core/libusb-header-path.patch \ + file://debian/system/core/stdatomic.patch \ + file://debian/system/core/Nonnull.patch \ + file://debian/system/core/Vector-cast.patch \ + file://debian/system/core/throw-exception-on-unknown-os.patch \ + file://debian/system/core/simg_dump-python3.patch \ + file://debian/system/core/fix-attribute-issue-with-gcc.patch \ + file://debian/system/core/fix-gettid-exception-declaration.patch \ + file://debian/system/core/fix-build-on-non-x86.patch \ + file://debian/system/core/add-missing-headers.patch \ + file://debian/system/core/hard-code-build-number.patch \ + file://debian/system/core/stub-out-fastdeploy.patch \ + file://debian/system/core/fix-standard-namespace-errors.patch \ + file://debian/system/core/Add-riscv64-support.patch \ + \ +" + +# patches which don't come from debian +SRC_URI += " \ + file://rules_yocto.mk;subdir=git \ + file://android-tools-adbd.service \ + file://adbd.mk;subdir=git/debian/system/core \ + file://remount \ + file://0001-Fixes-for-yocto-build.patch \ + file://0002-android-tools-modifications-to-make-it-build-in-yoct.patch \ + file://0003-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch \ + file://0004-adb-Fix-build-on-big-endian-systems.patch \ + file://0005-adb-Allow-adbd-to-be-run-as-root.patch \ +" + +S = "${WORKDIR}/git" +B = "${WORKDIR}/${BPN}" + +# http://errors.yoctoproject.org/Errors/Details/1debian881/ +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" + +COMPATIBLE_HOST:powerpc = "(null)" +COMPATIBLE_HOST:powerpc64 = "(null)" +COMPATIBLE_HOST:powerpc64le = "(null)" + +inherit systemd + +SYSTEMD_SERVICE:${PN}-adbd = "android-tools-adbd.service" + +# Find libbsd headers during native builds +CC:append:class-native = " -I${STAGING_INCDIR}" +CC:append:class-nativesdk = " -I${STAGING_INCDIR}" + +PREREQUISITE_core = "liblog libbase libsparse liblog libcutils" +TOOLS_TO_BUILD = "libcrypto_utils libadb libziparchive fastboot adb img2simg simg2img libbacktrace" +TOOLS_TO_BUILD:append:class-target = " adbd" + +do_compile() { + + case "${HOST_ARCH}" in + arm) + export android_arch=linux-arm + cpu=arm + deb_host_arch=arm + ;; + aarch64) + export android_arch=linux-arm64 + cpu=arm64 + deb_host_arch=arm64 + ;; + riscv64) + export android_arch=linux-riscv64 + ;; + mips|mipsel) + export android_arch=linux-mips + cpu=mips + deb_host_arch=mips + ;; + mips64|mips64el) + export android_arch=linux-mips64 + cpu=mips64 + deb_host_arch=mips64 + ;; + powerpc|powerpc64) + export android_arch=linux-ppc + ;; + i586|i686|x86_64) + export android_arch=linux-x86 + cpu=x86_64 + deb_host_arch=amd64 + ;; + esac + + export SRCDIR=${S} + + oe_runmake -f ${S}/debian/external/boringssl/libcrypto.mk -C ${S} + oe_runmake -f ${S}/debian/external/libunwind/libunwind.mk -C ${S} CPU=${cpu} + + for tool in ${PREREQUISITE_core}; do + oe_runmake -f ${S}/debian/system/core/${tool}.mk -C ${S} + done + + for i in `find ${S}/debian/system/extras/ -name "*.mk"`; do + oe_runmake -f $i -C ${S} + done + + for tool in ${TOOLS_TO_BUILD}; do + if [ "$tool" = "libbacktrace" ]; then + oe_runmake -f ${S}/debian/system/core/${tool}.mk -C ${S} DEB_HOST_ARCH=${deb_host_arch} + else + oe_runmake -f ${S}/debian/system/core/${tool}.mk -C ${S} + fi + done + +} + +do_install() { + install -d ${D}${base_sbindir} + install -m 0755 ${S}/../remount -D ${D}${base_sbindir}/remount + + for tool in img2simg simg2img fastboot adbd; do + if echo ${TOOLS_TO_BUILD} | grep -q "$tool" ; then + install -D -p -m0755 ${S}/debian/out/system/core/$tool ${D}${bindir}/$tool + fi + done + + # grep adb also matches adbd, so handle adb separately from other tools + if echo ${TOOLS_TO_BUILD} | grep -q "adb " ; then + install -d ${D}${bindir} + install -m0755 ${S}/debian/out/system/core/adb ${D}${bindir} + fi + + # Outside the if statement to avoid errors during do_package + install -D -p -m0644 ${WORKDIR}/android-tools-adbd.service \ + ${D}${systemd_unitdir}/system/android-tools-adbd.service + + install -d ${D}${libdir}/android/ + install -m0755 ${S}/debian/out/system/core/*.so.* ${D}${libdir}/android/ + if echo ${TOOLS_TO_BUILD} | grep -q "mkbootimg" ; then + install -d ${D}${bindir} + install -m0755 ${B}/mkbootimg/mkbootimg ${D}${bindir} + fi +} + +PACKAGES =+ "${PN}-fstools ${PN}-adbd" + +RDEPENDS:${BPN} = "${BPN}-conf p7zip" + +FILES:${PN}-adbd = "\ + ${bindir}/adbd \ + ${systemd_unitdir}/system/android-tools-adbd.service \ +" + +FILES:${PN}-fstools = "\ + ${bindir}/ext2simg \ + ${bindir}/ext4fixup \ + ${bindir}/img2simg \ + ${bindir}/make_ext4fs \ + ${bindir}/simg2img \ + ${bindir}/simg2simg \ + ${bindir}/simg_dump \ + ${bindir}/mkuserimg \ +" +FILES:${PN} += "${libdir}/android ${libdir}/android/*" + +BBCLASSEXTEND = "native" + +android_tools_enable_devmode() { + touch ${IMAGE_ROOTFS}/var/usb-debugging-enabled +} + +ROOTFS_POSTPROCESS_COMMAND_${PN}-adbd += "${@bb.utils.contains("USB_DEBUGGING_ENABLED", "1", "android_tools_enable_devmode;", "", d)}" diff --git a/meta-oe/recipes-benchmark/glmark2/files/0001-libmatrix-Include-missing-utility-header.patch b/meta-oe/recipes-benchmark/glmark2/files/0001-libmatrix-Include-missing-utility-header.patch deleted file mode 100644 index 959a18e5eb..0000000000 --- a/meta-oe/recipes-benchmark/glmark2/files/0001-libmatrix-Include-missing-utility-header.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 45cb02332b38b2059e7e44369c3d8684492a7def Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 12 Apr 2022 11:41:41 -0700 -Subject: [PATCH] libmatrix: Include missing <utility> header - -Fixes build with gcc12 -| ../git/src/libmatrix/program.h:43:21: error: 'exchange' is not a member of 'std' | 43 | ready_(std::exchange(shader.ready_, false)), | | ^~~~~~~~ - -Upstream-Status: Submitted [https://github.com/glmark2/glmark2/pull/174] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/libmatrix/program.h | 1 + - 1 file changed, 1 insertion(+) - ---- a/src/libmatrix/program.h -+++ b/src/libmatrix/program.h -@@ -13,6 +13,7 @@ - #define PROGRAM_H_ - - #include <string> -+#include <utility> - #include <vector> - #include <map> - #include "mat.h" diff --git a/meta-oe/recipes-benchmark/glmark2/files/0002-run-dispmanx-fullscreen.patch b/meta-oe/recipes-benchmark/glmark2/files/0002-run-dispmanx-fullscreen.patch index 0cb22fd563..05a074cf55 100644 --- a/meta-oe/recipes-benchmark/glmark2/files/0002-run-dispmanx-fullscreen.patch +++ b/meta-oe/recipes-benchmark/glmark2/files/0002-run-dispmanx-fullscreen.patch @@ -13,10 +13,10 @@ Signed-off-by: Trevor Woerner <twoerner@gmail.com> 1 file changed, 5 insertions(+) diff --git a/src/main.cpp b/src/main.cpp -index 677962e..273a217 100644 +index d1077fe..d717cd4 100644 --- a/src/main.cpp +++ b/src/main.cpp -@@ -164,6 +164,11 @@ main(int argc, char *argv[]) +@@ -202,6 +202,11 @@ main(int argc, char *argv[]) Options::size = std::pair<int,int>(800, 600); } @@ -26,5 +26,7 @@ index 677962e..273a217 100644 +#endif + // Create the canvas - #if GLMARK2_USE_X11 - NativeStateX11 native_state; + #if GLMARK2_USE_EGL + GLStateEGL gl_state; +-- +2.25.1 diff --git a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index 2a3e74f025..a2d5b152f2 100644 --- a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -11,15 +11,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ DEPENDS = "libpng jpeg udev" DEPENDS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland-native wayland-protocols', '', d)}" -PV = "2021.12" +PV = "2023.01" SRC_URI = " \ git://github.com/glmark2/glmark2.git;protocol=https;branch=master \ file://0001-fix-dispmanx-build.patch \ file://0002-run-dispmanx-fullscreen.patch \ - file://0001-libmatrix-Include-missing-utility-header.patch \ " -SRCREV = "0858b450cd88c84a15b99dda9698d44e7f7e8c70" +SRCREV = "42e3d8fe3aa88743ef90348138f643f7b04a9237" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-benchmark/iozone3/iozone3_492.bb b/meta-oe/recipes-benchmark/iozone3/iozone3_506.bb index ba3eaec619..3b6df0b301 100644 --- a/meta-oe/recipes-benchmark/iozone3/iozone3_492.bb +++ b/meta-oe/recipes-benchmark/iozone3/iozone3_506.bb @@ -11,8 +11,7 @@ SRC_URI = "http://www.iozone.org/src/current/${BPN}_${PV}.tar \ file://0001-let-system-headers-provide-pread64.patch \ file://copyright.txt \ " -SRC_URI[md5sum] = "228f54482c01d1c04c571a9414cd20e5" -SRC_URI[sha256sum] = "322981e168f32bd39f54772b82b2906d598d958c37e954e75742e71baf58bb9b" +SRC_URI[sha256sum] = "114ce5c071873b9a2c7ba6e73d05d5ef7e66564392acbfcdc0b3261db10fcbe7" UPSTREAM_CHECK_REGEX = "iozone3_(?P<pver>\d+).tar" diff --git a/meta-oe/recipes-benchmark/iperf2/iperf2/0001-Detect-bool-definition-considering-stdbool.h-being-p.patch b/meta-oe/recipes-benchmark/iperf2/iperf2/0001-Detect-bool-definition-considering-stdbool.h-being-p.patch index 45c69ca067..dc3b85f8ef 100644 --- a/meta-oe/recipes-benchmark/iperf2/iperf2/0001-Detect-bool-definition-considering-stdbool.h-being-p.patch +++ b/meta-oe/recipes-benchmark/iperf2/iperf2/0001-Detect-bool-definition-considering-stdbool.h-being-p.patch @@ -13,6 +13,8 @@ template <> struct __libcpp_is_integral<int> : public tr Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + m4/dast.m4 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch b/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch index 7870261ee6..ff1ea05bcb 100644 --- a/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch +++ b/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch @@ -9,6 +9,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Mingli Yu <mingli.yu@windriver.com> --- +Upstream-Status: Pending + src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3_3.12.bb b/meta-oe/recipes-benchmark/iperf3/iperf3_3.14.bb index 8c5ce36e85..d181eb3b02 100644 --- a/meta-oe/recipes-benchmark/iperf3/iperf3_3.12.bb +++ b/meta-oe/recipes-benchmark/iperf3/iperf3_3.14.bb @@ -11,14 +11,14 @@ BUGTRACKER = "https://github.com/esnet/iperf/issues" AUTHOR = "ESNET <info@es.net>, Lawrence Berkeley National Laboratory <websupport@lbl.gov>" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=68ae8cfc577a2c8c51bb51e9628e80b7" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dc6301c8256ceb8f71c9e3c2ae9096b9" SRC_URI = "git://github.com/esnet/iperf.git;branch=master;protocol=https \ file://0002-Remove-pg-from-profile_CFLAGS.patch \ file://0001-configure.ac-check-for-CPP-prog.patch \ " -SRCREV = "e61aaf8c95df956cefbc54fab7b3d78914664180" +SRCREV = "a0be85934144bc04712a6695b14ea6e45c379e1d" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-include-stddef.h-for-ptrdiff_t.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-include-stddef.h-for-ptrdiff_t.patch index a84414c024..914b0514f8 100644 --- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-include-stddef.h-for-ptrdiff_t.patch +++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-include-stddef.h-for-ptrdiff_t.patch @@ -6,6 +6,8 @@ Subject: [PATCH] include stddef.h for ptrdiff_t Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + morecore.c | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0002-Mark-glibc-specific-code-so.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0002-Mark-glibc-specific-code-so.patch index 8cb184a651..7ad6c43eb1 100644 --- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0002-Mark-glibc-specific-code-so.patch +++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0002-Mark-glibc-specific-code-so.patch @@ -6,6 +6,8 @@ Subject: [PATCH] Mark glibc specific code so Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + morecore.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0003-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0003-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch index aca7e803d0..858a8e511a 100644 --- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0003-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch +++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0003-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch @@ -8,6 +8,8 @@ musl does not have it Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + alloc.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0004-shm.c-Mark-glibc-specific-changes-so.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0004-shm.c-Mark-glibc-specific-changes-so.patch index 58776e8710..c3f7b3e479 100644 --- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0004-shm.c-Mark-glibc-specific-changes-so.patch +++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0004-shm.c-Mark-glibc-specific-changes-so.patch @@ -6,6 +6,8 @@ Subject: [PATCH] shm.c: Mark glibc specific changes so Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + shm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-Include-dirent.h-for-ino_t.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-Include-dirent.h-for-ino_t.patch index e736cbc791..8bd1633392 100644 --- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-Include-dirent.h-for-ino_t.patch +++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-Include-dirent.h-for-ino_t.patch @@ -11,6 +11,8 @@ 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(+) diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0006-include-limits.h-for-PATH_MAX.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0006-include-limits.h-for-PATH_MAX.patch index 2ead21fb46..e4f8030961 100644 --- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0006-include-limits.h-for-PATH_MAX.patch +++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0006-include-limits.h-for-PATH_MAX.patch @@ -10,6 +10,8 @@ error: 'PATH_MAX' undeclared Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + hugeadm.c | 1 + tests/gethugepagesizes.c | 1 + 2 files changed, 2 insertions(+) diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench/0001-avoid-gcc-optimize-away-the-loops.patch b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-avoid-gcc-optimize-away-the-loops.patch index b964bef1f0..ff926548b6 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench/0001-avoid-gcc-optimize-away-the-loops.patch +++ b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-avoid-gcc-optimize-away-the-loops.patch @@ -3,7 +3,7 @@ From: Roy Li <rongqing.li@windriver.com> Date: Thu, 5 May 2016 09:52:01 +0800 Subject: [PATCH] [PATCH] avoid gcc optimize-away the loops -Upstream-Status: pending +Upstream-Status: Pending Change expression used in do_integer_mul and do_uint64_mul benchmarks so GCC doesn't optimize-away the loops, other diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench/0001-doc-Fix-typos-in-lat_unix_connect-manual-page.patch b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-doc-Fix-typos-in-lat_unix_connect-manual-page.patch index d49dac5b20..9014f80ab6 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench/0001-doc-Fix-typos-in-lat_unix_connect-manual-page.patch +++ b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-doc-Fix-typos-in-lat_unix_connect-manual-page.patch @@ -5,6 +5,8 @@ Subject: [PATCH 1/2] doc: Fix typos in lat_unix_connect manual page Signed-off-by: Yanfei Xu <yanfei.xu@windriver.com> --- +Upstream-Status: Pending + doc/lat_unix_connect.8 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench/0001-doc-Fix-typos-in-manual-pages.patch b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-doc-Fix-typos-in-manual-pages.patch index b27e6c9fe0..b960a7d19f 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench/0001-doc-Fix-typos-in-manual-pages.patch +++ b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-doc-Fix-typos-in-manual-pages.patch @@ -5,6 +5,8 @@ Subject: [PATCH] doc: Fix typos in manual pages Signed-off-by: He Zhe <zhe.he@windriver.com> --- +Upstream-Status: Pending + doc/bw_mem.8 | 2 +- doc/lat_fcntl.8 | 2 +- doc/lat_fifo.8 | 2 +- diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench/0001-lat_fifo-Fix-cleanup-sequence.patch b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-lat_fifo-Fix-cleanup-sequence.patch index 42b14cecee..b46c5fae76 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench/0001-lat_fifo-Fix-cleanup-sequence.patch +++ b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-lat_fifo-Fix-cleanup-sequence.patch @@ -7,6 +7,8 @@ Files should be unlinked after all users exit. Signed-off-by: He Zhe <zhe.he@windriver.com> --- +Upstream-Status: Pending + src/lat_fifo.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench/0001-lat_http.c-Add-printf-format.patch b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-lat_http.c-Add-printf-format.patch index 943b3ec889..eaa4ad0814 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench/0001-lat_http.c-Add-printf-format.patch +++ b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-lat_http.c-Add-printf-format.patch @@ -6,6 +6,8 @@ Subject: [PATCH] lat_http.c: Add printf format Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/lat_http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench/0001-lmbench-Point-webpage-lm-to-target-directory.patch b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-lmbench-Point-webpage-lm-to-target-directory.patch index 4a26b8ea7a..7b713a3243 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench/0001-lmbench-Point-webpage-lm-to-target-directory.patch +++ b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-lmbench-Point-webpage-lm-to-target-directory.patch @@ -8,6 +8,8 @@ Plus improve 'hello' copying in lmbench script. Signed-off-by: He Zhe <zhe.he@windriver.com> --- +Upstream-Status: Pending + scripts/lmbench | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench/0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch b/meta-oe/recipes-benchmark/lmbench/lmbench/0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch index 1d5d9c12ab..096726cc23 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench/0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch +++ b/meta-oe/recipes-benchmark/lmbench/lmbench/0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch @@ -9,6 +9,8 @@ to link in librirpc, make room for those changes to take effect Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + scripts/build | 2 +- src/Makefile | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb index d74c28f3f6..03018bb526 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb +++ b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb @@ -99,6 +99,6 @@ pkg_postinst:${PN} () { RDEPENDS:${PN} = "perl" FILES:${PN} += "${datadir}/lmbench" -ALTERNATIVE:${PN} = "stream" +ALTERNATIVE:${PN} = "stream hello" ALTERNATIVE_LINK_NAME[stream] = "${bindir}/stream" - +ALTERNATIVE_LINK_NAME[hello] = "${bindir}/hello" diff --git a/meta-oe/recipes-benchmark/mbw/mbw_git.bb b/meta-oe/recipes-benchmark/mbw/mbw_2.0.bb index cfdcfeb9b6..bb8c4625d5 100644 --- a/meta-oe/recipes-benchmark/mbw/mbw_git.bb +++ b/meta-oe/recipes-benchmark/mbw/mbw_2.0.bb @@ -1,14 +1,12 @@ SUMMARY = "MBW determines the copy memory bandwidth available to userspace programs" HOMEPAGE = "http://github.com/raas/mbw" SECTION = "console/tests" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://mbw.spec;beginline=1;endline=10;md5=34d71e08e6337a8411d82d7dd0c54fe2" +LICENSE = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://mbw.spec;beginline=1;endline=10;md5=9ead6bd5826678fcfe229a3cf7257c56" SRC_URI = "git://github.com/raas/${BPN}.git;branch=master;protocol=https" -SRCREV = "d2cd3d36c353fee578f752c4e65a8c1efcee002c" - -PV = "1.5" +SRCREV = "c3155b544a5065e8235508059c6512af6c46bd4d" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-benchmark/memtester/files/Makefile.patch b/meta-oe/recipes-benchmark/memtester/files/Makefile.patch index 971e52ac7f..c6da3b7059 100644 --- a/meta-oe/recipes-benchmark/memtester/files/Makefile.patch +++ b/meta-oe/recipes-benchmark/memtester/files/Makefile.patch @@ -5,6 +5,8 @@ Subject: [PATCH] memtester: Added patch to Makefile to change no-longer-supporte Signed-off-by: Joel A Fernandes <joelagnel@ti.com> --- +Upstream-Status: Pending + Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-benchmark/phoronix-test-suite/files/CVE-2022-40704.patch b/meta-oe/recipes-benchmark/phoronix-test-suite/files/CVE-2022-40704.patch new file mode 100644 index 0000000000..8b6405b4ad --- /dev/null +++ b/meta-oe/recipes-benchmark/phoronix-test-suite/files/CVE-2022-40704.patch @@ -0,0 +1,46 @@ +From d3880d9d3ba795138444da83f1153c3c3ac27640 Mon Sep 17 00:00:00 2001 +From: Michael Larabel <michael@phoronix.com> +Date: Sat, 23 Jul 2022 07:32:43 -0500 +Subject: [PATCH] phoromatic: Explicitly check both $_GET abd $_POST in + phoromatic_quit_if_invalid_input_found() + +Fixes: https://github.com/phoronix-test-suite/phoronix-test-suite/issues/650#issuecomment-1193116678 + +Upstream-Status: Backport +CVE: CVE-2022-40704 + +Reference to upstream patch: +https://github.com/phoronix-test-suite/phoronix-test-suite/commit/d3880d9d3ba795138444da83f1153c3c3ac27640 + +Signed-off-by: Li Wang <li.wang@windriver.com> +--- + pts-core/phoromatic/phoromatic_functions.php | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +diff --git a/pts-core/phoromatic/phoromatic_functions.php b/pts-core/phoromatic/phoromatic_functions.php +index 74ccc5444c..c2313dcdea 100644 +--- a/pts-core/phoromatic/phoromatic_functions.php ++++ b/pts-core/phoromatic/phoromatic_functions.php +@@ -37,9 +37,20 @@ function phoromatic_quit_if_invalid_input_found($input_keys = null) + { + foreach($input_keys as $key) + { +- if(isset($_REQUEST[$key]) && !empty($_REQUEST[$key])) ++ if(isset($_GET[$key]) && !empty($_GET[$key])) + { +- foreach(pts_arrays::to_array($_REQUEST[$key]) as $val_to_check) ++ foreach(pts_arrays::to_array($_GET[$key]) as $val_to_check) ++ { ++ if(stripos($val_to_check, $invalid_string) !== false) ++ { ++ echo '<strong>Exited due to invalid input ( ' . $invalid_string . ') attempted:</strong> ' . htmlspecialchars($val_to_check); ++ exit; ++ } ++ } ++ } ++ if(isset($_POST[$key]) && !empty($_POST[$key])) ++ { ++ foreach(pts_arrays::to_array($_POST[$key]) as $val_to_check) + { + if(stripos($val_to_check, $invalid_string) !== false) + { diff --git a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.4.bb b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.4.bb index be9756d9a7..8de3314b3c 100644 --- a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.4.bb +++ b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.4.bb @@ -5,7 +5,10 @@ LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SECTION = "console/tests" -SRC_URI = "http://www.phoronix-test-suite.com/releases/${BP}.tar.gz" +SRC_URI = "http://www.phoronix-test-suite.com/releases/${BP}.tar.gz \ + file://CVE-2022-40704.patch \ + " + SRC_URI[sha256sum] = "1f2092d536c0a3193efc53e4a50f3cee65c0ef1a78d31e5404f1c663fff7b7f4" S = "${WORKDIR}/phoronix-test-suite" diff --git a/meta-oe/recipes-benchmark/tinymembench/tinymembench/0001-asm-Delete-.func-.endfunc-directives.patch b/meta-oe/recipes-benchmark/tinymembench/tinymembench/0001-asm-Delete-.func-.endfunc-directives.patch index c090700763..d69c52bee9 100644 --- a/meta-oe/recipes-benchmark/tinymembench/tinymembench/0001-asm-Delete-.func-.endfunc-directives.patch +++ b/meta-oe/recipes-benchmark/tinymembench/tinymembench/0001-asm-Delete-.func-.endfunc-directives.patch @@ -9,6 +9,8 @@ and rightly so. Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + aarch64-asm.S | 14 +------------- arm-neon.S | 24 ------------------------ mips-32.S | 5 ++--- diff --git a/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch b/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch index fb2f07f073..72f4801000 100644 --- a/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch +++ b/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- git.old/Makefile 2012-04-17 13:29:46.280435340 +0200 +++ git/Makefile 2012-04-17 13:31:13.664433470 +0200 @@ -77,17 +77,7 @@ INSTALL_PROGRAM = ${INSTALL} diff --git a/meta-oe/recipes-bsp/fwupd/fwupd/0001-meson-Avoid-absolute-buildtime-paths-in-generated-he.patch b/meta-oe/recipes-bsp/fwupd/fwupd/0001-meson-Avoid-absolute-buildtime-paths-in-generated-he.patch new file mode 100644 index 0000000000..2273bdf105 --- /dev/null +++ b/meta-oe/recipes-bsp/fwupd/fwupd/0001-meson-Avoid-absolute-buildtime-paths-in-generated-he.patch @@ -0,0 +1,41 @@ +From b1df1ed3a21b8ef0244102043a8fb88b0ccc3f91 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 17 Apr 2023 11:30:21 -0700 +Subject: [PATCH] meson: Avoid absolute buildtime paths in generated headers + +using meson.project_source_root() means the path emitted to include .h +files is absolute and it makes its way into PN-src as well, which infact +is not going to work if the -src package was used to re-build this in a +different build path. Therefore use relative path which is '.' and +relative to ${S} + +Changes +include "<abspath>/plugins/acpi-dmar/fu-acpi-dmar-plugin.h" +to +include "./plugins/acpi-dmar/fu-acpi-dmar-plugin.h" + +in generated build/src/fu-plugin-builtin.h + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/meson.build b/src/meson.build +index b9f6736..bb856ea 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -188,7 +188,7 @@ plugins_hdr = custom_target('fwupd-generate-plugins-header', + command : [ + join_paths(meson.project_source_root(), 'contrib', 'generate-plugins-header.py'), + '@OUTPUT@', +- meson.project_source_root(), ++ '.', + ','.join(plugin_names), + ], + ) +-- +2.40.0 + diff --git a/meta-oe/recipes-bsp/fwupd/fwupd_1.8.9.bb b/meta-oe/recipes-bsp/fwupd/fwupd_1.8.9.bb index 0f889ca8fc..1f95dee1be 100644 --- a/meta-oe/recipes-bsp/fwupd/fwupd_1.8.9.bb +++ b/meta-oe/recipes-bsp/fwupd/fwupd_1.8.9.bb @@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "glib-2.0 libxmlb json-glib libjcat gcab vala-native" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ + file://0001-meson-Avoid-absolute-buildtime-paths-in-generated-he.patch \ file://run-ptest" SRC_URI[sha256sum] = "719a791ac4ba5988aeb93ec42778bd65d33cb075d0c093b5c04e5e1682be528a" @@ -13,7 +14,7 @@ UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" # 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 +inherit meson vala gobject-introspection systemd bash-completion pkgconfig gi-docgen ptest manpages useradd GIDOCGEN_MESON_OPTION = 'docs' GIDOCGEN_MESON_ENABLE_FLAG = 'docgen' @@ -115,6 +116,17 @@ 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} \ diff --git a/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb index f821cdaf4a..aba5ab5878 100644 --- a/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb +++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb @@ -151,12 +151,13 @@ RRECOMMENDS:${PN}-fancontrol = "lmsensors-config-fancontrol" # sensors-detect script files FILES:${PN}-sensorsdetect = "${sbindir}/sensors-detect" FILES:${PN}-sensorsdetect-doc = "${mandir}/man8/sensors-detect.8" -RDEPENDS:${PN}-sensorsdetect = "${PN}-sensors perl perl-modules" +RDEPENDS:${PN}-sensorsdetect = "${PN}-sensors perl perl-module-fcntl perl-module-file-basename \ + perl-module-strict perl-module-constant" # sensors-conf-convert script files FILES:${PN}-sensorsconfconvert = "${bindir}/sensors-conf-convert" FILES:${PN}-sensorsconfconvert-doc = "${mandir}/man8/sensors-conf-convert.8" -RDEPENDS:${PN}-sensorsconfconvert = "${PN}-sensors perl perl-modules" +RDEPENDS:${PN}-sensorsconfconvert = "${PN}-sensors perl perl-module-strict perl-module-vars" # pwmconfig script files FILES:${PN}-pwmconfig = "${sbindir}/pwmconfig" diff --git a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.13.bb b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.5.bb index 1055fa42a9..dd273e24d0 100644 --- a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.13.bb +++ b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.5.bb @@ -2,22 +2,20 @@ SUMMARY = "NVMe management command line interface" AUTHOR = "Stefan Wiehler <stefan.wiehler@missinglinkelectronics.com>" HOMEPAGE = "https://github.com/linux-nvme/nvme-cli" SECTION = "console/utils" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022" -DEPENDS = "util-linux" -PV .= "+git${SRCPV}" +LICENSE = "GPL-2.0-only & CC0-1.0 & MIT" +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 = "d6c07e0de9be777009ebb9ab7475bee1ae3e0e95" SRC_URI = "git://github.com/linux-nvme/nvme-cli.git;branch=master;protocol=https" -SRCREV = "f0e9569df9289d6ee55ba2c23615cc7c73a9b088" S = "${WORKDIR}/git" -inherit bash-completion systemd +inherit bash-completion meson pkgconfig systemd -do_install() { - oe_runmake install-spec DESTDIR=${D} PREFIX=${prefix} \ - UDEVDIR=${nonarch_base_libdir}/udev SYSTEMDDIR=${systemd_unitdir} -} +EXTRA_OEMESON += "-Dsystemddir=${systemd_unitdir}/system" pkg_postinst_ontarget:${PN}() { ${sbindir}/nvme gen-hostnqn > ${sysconfdir}/nvme/hostnqn diff --git a/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb b/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb index d3e7973329..9b72ffefe4 100644 --- a/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb +++ b/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb @@ -20,3 +20,5 @@ do_install() { ALLOW_EMPTY:${PN} = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" INHIBIT_DEFAULT_DEPS = "1" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-connectivity/ace/files/ace_config.patch b/meta-oe/recipes-connectivity/ace/files/ace_config.patch index 1b8e218658..c820e46522 100644 --- a/meta-oe/recipes-connectivity/ace/files/ace_config.patch +++ b/meta-oe/recipes-connectivity/ace/files/ace_config.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -ruN ACE_wrappers1/ace/config.h ACE_wrappers/ace/config.h --- ACE_wrappers1/ace/config.h 1970-01-01 02:00:00.000000000 +0200 +++ ACE_wrappers/ace/config.h 2019-01-10 13:36:52.698012477 +0200 diff --git a/meta-oe/recipes-connectivity/gattlib/files/dbus-avoid-strange-chars-from-the-build-dir.patch b/meta-oe/recipes-connectivity/gattlib/files/dbus-avoid-strange-chars-from-the-build-dir.patch index 96e4f8d6fa..7319280ca4 100644 --- a/meta-oe/recipes-connectivity/gattlib/files/dbus-avoid-strange-chars-from-the-build-dir.patch +++ b/meta-oe/recipes-connectivity/gattlib/files/dbus-avoid-strange-chars-from-the-build-dir.patch @@ -14,6 +14,8 @@ the normal include guards and request "#pragma once" instead. Signed-off-by: Peter Rosin <peda@axentia.se> --- +Upstream-Status: Pending + dbus/CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb b/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb index 1ba7dd4afc..aec41edf7a 100644 --- a/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb +++ b/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Bluetooth library with attribute support" SECTION = "libs/network" LICENSE = "GPL-2.0-or-later | BSD-3-Clause" -LIC_FILES_CHKSUM = "file://CMakeLists.txt;beginline=1;endline=6;md5=71fdd2be76b4e95fe28324a70d4981c5" +LIC_FILES_CHKSUM = "file://CMakeLists.txt;beginline=1;endline=6;md5=a87ee154f005a6f035b8b34ac2191f3b" DEPENDS = "bluez5 glib-2.0" DEPENDS += "glib-2.0-native" @@ -14,7 +14,7 @@ SRC_URI = "git://github.com/labapart/gattlib.git;branch=master;protocol=https \ " SRCBRANCH = "master" -SRCREV = "fa54ae42ccb3d8f911e00b02ed1e581537e47f79" +SRCREV = "33a8a275928b186381bb0aea0f9778e330e57ec3" S = "${WORKDIR}/git" @@ -28,5 +28,12 @@ EXTRA_OECMAKE += "-DGATTLIB_BUILD_DOCS=OFF" inherit pkgconfig cmake +do_compile:append() { + for f in org-bluez-gattdescriptor1.c org-bluez-battery1.c org-bluez-adaptater1.c \ + org-bluez-device1.c org-bluez-gattservice1.c org-bluez-gattcharacteristic1.c; do + sed -i -e 's|${B}/dbus/||g' ${B}/dbus/$f + done +} + FILES:${PN} = "${libdir}/*" FILES:${PN}-dev = "${includedir}/* ${libdir}/pkgconfig" diff --git a/meta-oe/recipes-connectivity/gensio/gensio_2.6.2.bb b/meta-oe/recipes-connectivity/gensio/gensio_2.6.7.bb index 4aca6fee5f..c3ba96ff60 100644 --- a/meta-oe/recipes-connectivity/gensio/gensio_2.6.2.bb +++ b/meta-oe/recipes-connectivity/gensio/gensio_2.6.7.bb @@ -1,11 +1,11 @@ SUMMARY = "A library to abstract stream I/O like serial port, TCP, telnet, etc" HOMEPAGE = "https://github.com/cminyard/gensio" LICENSE = "GPL-2.0-only & LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a0fd36908af843bcee10cb6dfc47fa67 \ - file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f \ +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ " -SRCREV = "c1e878f5710bafb17aca5ece7d9079e73a78c554" +SRCREV = "266277aeb39dc2db33e577335236f89ed7ca5918" SRC_URI = "git://github.com/cminyard/gensio;protocol=https;branch=master" @@ -22,3 +22,5 @@ PACKAGECONFIG[swig] = "--with-swig,--without-swig, swig" EXTRA_OECONF = "--without-python" RDEPENDS:${PN} += "bash" + +FILES:${PN}-staticdev += "${libexecdir}/gensio/${PV}/libgensio_*.a" diff --git a/meta-oe/recipes-connectivity/ifplugd/ifplugd/Fix-build-with-musl.patch b/meta-oe/recipes-connectivity/ifplugd/ifplugd/Fix-build-with-musl.patch index 35665bd3f2..7dc0067304 100644 --- a/meta-oe/recipes-connectivity/ifplugd/ifplugd/Fix-build-with-musl.patch +++ b/meta-oe/recipes-connectivity/ifplugd/ifplugd/Fix-build-with-musl.patch @@ -6,6 +6,8 @@ Organization: O.S. Systems Software LTDA. Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> --- +Upstream-Status: Pending + src/ethtool-local.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-connectivity/iwd/iwd_2.0.bb b/meta-oe/recipes-connectivity/iwd/iwd_2.7.bb index 8ec211bd6d..f4e70890a9 100644 --- a/meta-oe/recipes-connectivity/iwd/iwd_2.0.bb +++ b/meta-oe/recipes-connectivity/iwd/iwd_2.7.bb @@ -8,7 +8,7 @@ DEPENDS = "ell" 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] = "5a0bfbc567092476d60a8f9700f68a273e39fd46e7177ce2d69bbc74255a930c" +SRC_URI[sha256sum] = "289ff47a76fb854e7789c45c5e3e0f15de4adc5fd2e82e47ab08e3564d8961d9" inherit autotools manpages pkgconfig python3native systemd diff --git a/meta-oe/recipes-connectivity/krb5/krb5/0001-Fix-aclocal.m4-syntax-error-for-autoconf-2.72.patch b/meta-oe/recipes-connectivity/krb5/krb5/0001-Fix-aclocal.m4-syntax-error-for-autoconf-2.72.patch new file mode 100644 index 0000000000..9d0b066b10 --- /dev/null +++ b/meta-oe/recipes-connectivity/krb5/krb5/0001-Fix-aclocal.m4-syntax-error-for-autoconf-2.72.patch @@ -0,0 +1,40 @@ +From 0aa127afa52fd265a4f1bbded1623201390ae96a Mon Sep 17 00:00:00 2001 +From: Julien Rische <jrische@redhat.com> +Date: Thu, 17 Nov 2022 15:01:24 +0100 +Subject: [PATCH] Fix aclocal.m4 syntax error for autoconf 2.72 + +An incorrect closure inside KRB5_AC_INET6 is innocuous with autoconf +versions up to 2.71, but will cause an error at configure time with +the forthcoming autoconf 2.72. + +[ghudson@mit.edu: added more context to commit message] + +ticket: 9077 (new) +tags: pullup +target_version: 1.20-next +target_version: 1.19-next + +Upstream-Status: Backport [https://github.com/krb5/krb5/commit/d864d740d019fdf2c640460f2aa2760c7fa4d5e9] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/aclocal.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/aclocal.m4 b/src/aclocal.m4 +index 9920476..3d66a87 100644 +--- a/src/aclocal.m4 ++++ b/src/aclocal.m4 +@@ -409,8 +409,8 @@ else + [[struct sockaddr_in6 in; + AF_INET6; + IN6_IS_ADDR_LINKLOCAL(&in.sin6_addr);]])], +- [krb5_cv_inet6=yes], [krb5_cv_inet6=no])]) +-fi ++ [krb5_cv_inet6=yes], [krb5_cv_inet6=no]) ++fi]) + AC_MSG_RESULT($krb5_cv_inet6) + if test "$krb5_cv_inet6" = no && test "$ac_cv_func_inet_ntop" = yes; then + AC_MSG_CHECKING(for IPv6 compile-time support with -DINET6) +-- +2.40.0 + diff --git a/meta-oe/recipes-connectivity/krb5/krb5_1.20.1.bb b/meta-oe/recipes-connectivity/krb5/krb5_1.20.1.bb index 2221000e3b..10fff11c25 100644 --- a/meta-oe/recipes-connectivity/krb5/krb5_1.20.1.bb +++ b/meta-oe/recipes-connectivity/krb5/krb5_1.20.1.bb @@ -22,6 +22,7 @@ SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "http://web.mit.edu/kerberos/dist/${BPN}/${SHRT_VER}/${BP}.tar.gz \ file://debian-suppress-usr-lib-in-krb5-config.patch;striplevel=2 \ file://crosscompile_nm.patch \ + file://0001-Fix-aclocal.m4-syntax-error-for-autoconf-2.72.patch;striplevel=2 \ file://etc/init.d/krb5-kdc \ file://etc/init.d/krb5-admin-server \ file://etc/default/krb5-kdc \ @@ -196,3 +197,6 @@ pkg_postinst:${PN}-kdc () { } BBCLASSEXTEND = "native nativesdk" + +inherit multilib_script +MULTILIB_SCRIPTS = "${PN}-user:${bindir}/krb5-config" diff --git a/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_git.bb b/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_git.bb index 7e9299c9f3..b63aabdc0c 100644 --- a/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_git.bb +++ b/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_git.bb @@ -10,7 +10,7 @@ DEPENDS = "libplist" PV = "1.0.0+git${SRCPV}" -SRCREV = "d2ff7969dcd0a12e4f18f63dab03e6cd03054fcb" +SRCREV = "114098d30e783fbb3def5c9b49427a86621cfcb1" SRC_URI = "git://github.com/libimobiledevice/libimobiledevice-glue;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice/0001-include-unistd.h-for-usleep.patch b/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice/0001-include-unistd.h-for-usleep.patch new file mode 100644 index 0000000000..424a203e56 --- /dev/null +++ b/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice/0001-include-unistd.h-for-usleep.patch @@ -0,0 +1,31 @@ +From 6cb8069cfe08114f1dc7b50a7fcd4dc040cd1bbb Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 9 May 2023 20:19:23 -0700 +Subject: [PATCH] include unistd.h for usleep() + +clang16 flags the missing header + +Fixes +../../git/tools/idevicedevmodectl.c:363:2: error: call to undeclared function 'usleep'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] + +Upstream-Status: Submitted [https://github.com/libimobiledevice/libimobiledevice/pull/1444] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tools/idevicedevmodectl.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/idevicedevmodectl.c b/tools/idevicedevmodectl.c +index 739bc13..9fe8d6a 100644 +--- a/tools/idevicedevmodectl.c ++++ b/tools/idevicedevmodectl.c +@@ -34,6 +34,7 @@ + #ifndef WIN32 + #include <signal.h> + #endif ++#include <unistd.h> + + #ifdef WIN32 + #include <windows.h> +-- +2.40.1 + diff --git a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.3.0.bb b/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.3.0.bb deleted file mode 100644 index 41b8d94a03..0000000000 --- a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.3.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "A protocol library to access an iPhone or iPod Touch in Linux" -LICENSE = "GPL-2.0-only & LGPL-2.1-only" -LIC_FILES_CHKSUM = "\ - file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07 \ - file://COPYING.LESSER;md5=6ab17b41640564434dda85c06b7124f7 \ -" -HOMEPAGE = "http://www.libimobiledevice.org/" - -DEPENDS = "libplist usbmuxd libusbmuxd libtasn1 gnutls libgcrypt" - -SRCREV = "15f8652126664e3a4b980e5d1c039b9053ce8566" -SRC_URI = "git://github.com/libimobiledevice/libimobiledevice;protocol=https;branch=master" - -S = "${WORKDIR}/git" -inherit autotools pkgconfig - -EXTRA_OECONF = " --without-cython " diff --git a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb b/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb index 52176872cf..1a0590c57b 100644 --- a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb +++ b/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb @@ -10,8 +10,9 @@ DEPENDS = "libplist usbmuxd libusbmuxd libtasn1 gnutls libgcrypt libimobiledevic PV = "1.3.0+git${SRCPV}" -SRCREV = "2eec1b9a172354c8521123a767d998b17bd2ac18" -SRC_URI = "git://github.com/libimobiledevice/libimobiledevice;protocol=https;branch=master" +SRCREV = "860ffb707af3af94467d2ece4ad258dda957c6cd" +SRC_URI = "git://github.com/libimobiledevice/libimobiledevice;protocol=https;branch=master \ + file://0001-include-unistd.h-for-usleep.patch" S = "${WORKDIR}/git" inherit autotools pkgconfig diff --git a/meta-oe/recipes-connectivity/libirecovery/libirecovery_git.bb b/meta-oe/recipes-connectivity/libirecovery/libirecovery_git.bb index e3da1819b2..2400195975 100644 --- a/meta-oe/recipes-connectivity/libirecovery/libirecovery_git.bb +++ b/meta-oe/recipes-connectivity/libirecovery/libirecovery_git.bb @@ -6,11 +6,11 @@ LIC_FILES_CHKSUM = "\ HOMEPAGE = "http://www.libimobiledevice.org/" -DEPENDS = "libimobiledevice-glue libusb1" +DEPENDS = "libimobiledevice-glue libusb1 readline" -PV = "1.0.1+git${SRCPV}" +PV = "1.1.0" -SRCREV = "ab5b4d8d4c0e90c05d80f80c7e99a6516de9b5c6" +SRCREV = "98c9f7055ec1f2e09fac69ef1413a8757113b838" SRC_URI = "git://github.com/libimobiledevice/libirecovery;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-connectivity/libmbim/libmbim_1.26.4.bb b/meta-oe/recipes-connectivity/libmbim/libmbim_1.26.4.bb deleted file mode 100644 index 97f3f68251..0000000000 --- a/meta-oe/recipes-connectivity/libmbim/libmbim_1.26.4.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "libmbim is library for talking to WWAN devices by MBIM protocol" -DESCRIPTION = "libmbim is a glib-based library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol" -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libmbim/" -LICENSE = "GPL-2.0-only & LGPL-2.1-only" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ -" - -DEPENDS = "glib-2.0 glib-2.0-native libgudev" - -inherit autotools pkgconfig bash-completion gobject-introspection - -SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "f688cec4c4586a17575f5e327448ce62f2000ef6a07c9e4589873d4a68568ad9" diff --git a/meta-oe/recipes-connectivity/libmbim/libmbim_1.28.4.bb b/meta-oe/recipes-connectivity/libmbim/libmbim_1.28.4.bb new file mode 100644 index 0000000000..a35d9898ec --- /dev/null +++ b/meta-oe/recipes-connectivity/libmbim/libmbim_1.28.4.bb @@ -0,0 +1,22 @@ +SUMMARY = "libmbim is library for talking to WWAN devices by MBIM protocol" +DESCRIPTION = "libmbim is a glib-based library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol" +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libmbim/" +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" +LIC_FILES_CHKSUM = " \ + file://LICENSES/GPL-2.0-or-later.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LICENSES/LGPL-2.1-or-later.txt;md5=4fbd65380cdd255951079008b364516c \ +" + +DEPENDS = "glib-2.0 glib-2.0-native libgudev" + +inherit meson pkgconfig bash-completion gobject-introspection + +SRCREV = "7f1c7907c4654ba5c619a635cef5475ca161d027" +SRC_URI = "git://gitlab.freedesktop.org/mobile-broadband/libmbim.git;protocol=https;branch=mbim-1-28" + +S = "${WORKDIR}/git" + +EXTRA_OEMESON = " \ + -Dgtk_doc=false \ + -Dman=false \ +" diff --git a/meta-oe/recipes-connectivity/libnet/libnet/0001-Use-standard-int64_t-instead-of-__int64_t-for-mingw-.patch b/meta-oe/recipes-connectivity/libnet/libnet/0001-Use-standard-int64_t-instead-of-__int64_t-for-mingw-.patch index f1c607dd8a..a32414bdf6 100644 --- a/meta-oe/recipes-connectivity/libnet/libnet/0001-Use-standard-int64_t-instead-of-__int64_t-for-mingw-.patch +++ b/meta-oe/recipes-connectivity/libnet/libnet/0001-Use-standard-int64_t-instead-of-__int64_t-for-mingw-.patch @@ -6,6 +6,8 @@ Subject: [PATCH] Use standard int64_t instead of __int64_t for mingw cross Signed-off-by: Joachim Nilsson <troglobit@gmail.com> --- +Upstream-Status: Pending + include/libnet/libnet-structures.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-connectivity/libnet/libnet_1.2.bb b/meta-oe/recipes-connectivity/libnet/libnet_1.2.bb index a996f9404b..eaa0a0445d 100644 --- a/meta-oe/recipes-connectivity/libnet/libnet_1.2.bb +++ b/meta-oe/recipes-connectivity/libnet/libnet_1.2.bb @@ -16,4 +16,6 @@ SRCREV = "deeeeaeb84f8bc5d2299913d4ccf53d0d4c26966" S = "${WORKDIR}/git" -inherit autotools binconfig +inherit autotools binconfig multilib_script +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/libnet-config" + diff --git a/meta-oe/recipes-connectivity/libnfs/libnfs/0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch b/meta-oe/recipes-connectivity/libnfs/libnfs/0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch new file mode 100644 index 0000000000..55595104aa --- /dev/null +++ b/meta-oe/recipes-connectivity/libnfs/libnfs/0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch @@ -0,0 +1,61 @@ +From 95708ff427c12b58e53fab225a08c811ca358394 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Wed, 3 May 2023 22:27:10 +0200 +Subject: [PATCH] CMakeLists.txt: respect ${CMAKE_INSTALL_LIBDIR} for multilib + +* fixes: + ERROR: libnfs-5.0.2-r0 do_package: QA Issue: libnfs: Files/directories were installed but not shipped in any package: + /usr/lib/libnfs.so + /usr/lib/libnfs.so.11.1.0 + /usr/lib/libnfs.so.5.0.2 + /usr/lib/pkgconfig + /usr/lib/cmake + /usr/lib/pkgconfig/libnfs.pc + /usr/lib/cmake/libnfs + /usr/lib/cmake/libnfs/libnfs-config-version.cmake + /usr/lib/cmake/libnfs/libnfs-config.cmake + /usr/lib/cmake/libnfs/libnfs-config-noconfig.cmake + /usr/lib/cmake/libnfs/FindNFS.cmake + Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. + libnfs: 11 installed and not shipped files. [installed-vs-shipped] + + when libdir is /usr/lib64 with multilib + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Upstream-Status: Pending +--- + CMakeLists.txt | 6 +++--- + lib/CMakeLists.txt | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4fb0fe7..8e5a0e4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,11 +6,11 @@ project(libnfs + + set(SOVERSION 11.1.0 CACHE STRING "" FORCE) + +-set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries") ++set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Installation directory for libraries") + set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers") + set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages") +-set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files") +-set(INSTALL_CMAKE_DIR "${CMAKE_INSTALL_PREFIX}/lib/cmake/libnfs" CACHE PATH "Installation directory for cmake (.cmake) files") ++set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files") ++set(INSTALL_CMAKE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cmake/libnfs" CACHE PATH "Installation directory for cmake (.cmake) files") + + option(BUILD_SHARED_LIBS "Build shared libraries" ON) + option(ENABLE_TESTS "Build and run test programs" OFF) +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 88ba7b8..5ff89dc 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -23,5 +23,5 @@ set_target_properties(nfs PROPERTIES + + install(TARGETS nfs EXPORT libnfs + RUNTIME DESTINATION bin +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION lib) ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/meta-oe/recipes-connectivity/libnfs/libnfs_5.0.2.bb b/meta-oe/recipes-connectivity/libnfs/libnfs_5.0.2.bb new file mode 100644 index 0000000000..e0df18a50c --- /dev/null +++ b/meta-oe/recipes-connectivity/libnfs/libnfs_5.0.2.bb @@ -0,0 +1,12 @@ +SUMMARY = "NFS client library" +HOMEPAGE = "https://github.com/sahlberg/libnfs" +LICENSE = "LGPL-2.1-only & BSD-2-Clause & GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=825301ba17efc9d188ee0abd4b924ada" + +SRC_URI = "git://github.com/sahlberg/libnfs.git;protocol=https;branch=master \ + file://0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch \ +" +SRCREV = "40348f45d6beb8a8f50b6b63414a98fc1a061b7d" +S = "${WORKDIR}/git" + +inherit cmake diff --git a/meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch b/meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch deleted file mode 100644 index e345d28031..0000000000 --- a/meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 189528e879e4099b44aae26a2af0cb16aaa96db6 Mon Sep 17 00:00:00 2001 -From: goapunk <goapunk@riseup.net> -Date: Mon, 13 Sep 2021 13:45:41 +0200 -Subject: [PATCH] build: use python3 everywhere - ---- - build-aux/qmi-codegen/qmi-codegen | 2 +- - examples/simple-tester-python/simple-tester-python | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/build-aux/qmi-codegen/qmi-codegen b/build-aux/qmi-codegen/qmi-codegen -index 1fea7c1..1092c8e 100755 ---- a/build-aux/qmi-codegen/qmi-codegen -+++ b/build-aux/qmi-codegen/qmi-codegen -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- - # - # This program is free software; you can redistribute it and/or modify it under -diff --git a/examples/simple-tester-python/simple-tester-python b/examples/simple-tester-python/simple-tester-python -index af9065a..a35e505 100755 ---- a/examples/simple-tester-python/simple-tester-python -+++ b/examples/simple-tester-python/simple-tester-python -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- - # - # This program is free software; you can redistribute it and/or modify it under --- -2.34.1 - diff --git a/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.8.bb b/meta-oe/recipes-connectivity/libqmi/libqmi_1.32.4.bb index a1cfe29cca..7b7a3b2350 100644 --- a/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.8.bb +++ b/meta-oe/recipes-connectivity/libqmi/libqmi_1.32.4.bb @@ -12,12 +12,8 @@ DEPENDS = "glib-2.0 glib-2.0-native" inherit meson pkgconfig bash-completion gobject-introspection -SRCREV ?= "95108b6eebfefa6621a1c34565f562eeca9308b9" -# patch 0001 is on main branch upstream -SRC_URI = "\ - git://gitlab.freedesktop.org/mobile-broadband/libqmi.git;protocol=https;branch=qmi-1-30 \ - file://0001-build-use-python3-everywhere.patch \ -" +SRCREV = "6e248aceb66f53b467b343bca1c467a8211dd30d" +SRC_URI = "git://gitlab.freedesktop.org/mobile-broadband/libqmi.git;protocol=https;branch=qmi-1-32" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb b/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb index 50096cfdbc..fec05571d1 100644 --- a/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb +++ b/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb @@ -9,9 +9,7 @@ DEPENDS = "zlib libsigc++-2.0 openssl cppunit" SRC_URI = "git://github.com/rakshasa/libtorrent;branch=master;protocol=https" SRCREV = "e60f222241319aaae482789517ad00ae9344bd13" -CVE_CHECK_IGNORE += "\ - CVE-2009-1760 \ -" +CVE_STATUS[CVE-2009-1760] = "backported-patch: patched in our product" PV = "0.13.8+git${SRCPV}" diff --git a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.2.bb b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.2.bb index 67269b05af..5e6069fb81 100644 --- a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.2.bb +++ b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.2.bb @@ -36,6 +36,14 @@ EXTRA_OECMAKE += " \ -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ " +do_install:append() { + sed -i -e 's|${STAGING_LIBDIR}/libcrypto.so|crypto|g' ${D}${libdir}/cmake/libwebsockets/LibwebsocketsTargets.cmake + sed -i -e 's|${STAGING_LIBDIR}/libssl.so|ssl|g' ${D}${libdir}/cmake/libwebsockets/LibwebsocketsTargets.cmake + sed -i -e 's|${STAGING_LIBDIR}/libuv.so|uv|g' ${D}${libdir}/cmake/libwebsockets/LibwebsocketsTargets.cmake + sed -i -e 's|${STAGING_INCDIR}||g' ${D}${libdir}/cmake/libwebsockets/LibwebsocketsTargets.cmake \ + ${D}${libdir}/cmake/libwebsockets/libwebsockets-config.cmake +} + PACKAGES =+ "${PN}-testapps ${PN}-evlib-event ${PN}-evlib-uv ${PN}-evlib-ev ${PN}-evlib-sd" FILES:${PN}-testapps += "${datadir}/libwebsockets-test-server/* ${bindir}/libwebsockets-test-*" diff --git a/meta-oe/recipes-connectivity/loudmouth/loudmouth-1.4.3/04-use-pkg-config-for-gnutls.patch b/meta-oe/recipes-connectivity/loudmouth/loudmouth-1.4.3/04-use-pkg-config-for-gnutls.patch index 20f388e890..0fc87abd09 100644 --- a/meta-oe/recipes-connectivity/loudmouth/loudmouth-1.4.3/04-use-pkg-config-for-gnutls.patch +++ b/meta-oe/recipes-connectivity/loudmouth/loudmouth-1.4.3/04-use-pkg-config-for-gnutls.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: use pkg-config to detect gnutls Debian: http://bugs.debian.org/529835 Origin: http://groups.google.com/group/loudmouth-dev/browse_thread/thread/3f78255837048daf# diff --git a/meta-oe/recipes-connectivity/loudmouth/loudmouth-1.4.3/glib-2.32.patch b/meta-oe/recipes-connectivity/loudmouth/loudmouth-1.4.3/glib-2.32.patch index b6c9422e8c..921aded943 100644 --- a/meta-oe/recipes-connectivity/loudmouth/loudmouth-1.4.3/glib-2.32.patch +++ b/meta-oe/recipes-connectivity/loudmouth/loudmouth-1.4.3/glib-2.32.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- loudmouth-1.4.3.orig/loudmouth/lm-error.c 2008-10-29 21:48:15.000000000 +0100 +++ loudmouth-1.4.3/loudmouth/lm-error.c 2012-05-06 08:27:07.455739440 +0200 @@ -19,7 +19,6 @@ diff --git a/meta-oe/recipes-connectivity/modemmanager/files/0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch b/meta-oe/recipes-connectivity/modemmanager/files/0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch deleted file mode 100644 index 914760512a..0000000000 --- a/meta-oe/recipes-connectivity/modemmanager/files/0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 35173fa04d0116ba30a86dc1a19f859f2be14a24 Mon Sep 17 00:00:00 2001 -From: "Bruce A. Johnson" <waterfordtrack@gmail.com> -Date: Wed, 22 Dec 2021 14:24:02 -0500 -Subject: [PATCH] core: switch bash shell scripts to use /bin/sh for use - w/Busybox. - -Fixes https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/483 - -%% original patch: 0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch ---- - data/dispatcher-fcc-unlock/105b | 2 +- - data/dispatcher-fcc-unlock/1199 | 2 +- - data/dispatcher-fcc-unlock/1eac | 2 +- - test/mmcli-test-sms | 2 +- - tools/tests/test-wrapper.sh.in | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/data/dispatcher-fcc-unlock/105b b/data/dispatcher-fcc-unlock/105b -index 444bd51f..772c90f4 100644 ---- a/data/dispatcher-fcc-unlock/105b -+++ b/data/dispatcher-fcc-unlock/105b -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - - # SPDX-License-Identifier: CC0-1.0 - # 2021 Aleksander Morgado <aleksander@aleksander.es> -diff --git a/data/dispatcher-fcc-unlock/1199 b/data/dispatcher-fcc-unlock/1199 -index 83ab2c9e..6dbf8d1b 100644 ---- a/data/dispatcher-fcc-unlock/1199 -+++ b/data/dispatcher-fcc-unlock/1199 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - - # SPDX-License-Identifier: CC0-1.0 - # 2021 Aleksander Morgado <aleksander@aleksander.es> -diff --git a/data/dispatcher-fcc-unlock/1eac b/data/dispatcher-fcc-unlock/1eac -index 1a048dc8..44ce46d7 100644 ---- a/data/dispatcher-fcc-unlock/1eac -+++ b/data/dispatcher-fcc-unlock/1eac -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - - # SPDX-License-Identifier: CC0-1.0 - # 2021 Aleksander Morgado <aleksander@aleksander.es> -diff --git a/test/mmcli-test-sms b/test/mmcli-test-sms -index 18e0a7b4..7136ee0d 100755 ---- a/test/mmcli-test-sms -+++ b/test/mmcli-test-sms -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - - print_usage () { - echo "usage: $0 [MODEM INDEX] [all|ucs2|gsm7|data] [NUMBER]" -diff --git a/tools/tests/test-wrapper.sh.in b/tools/tests/test-wrapper.sh.in -index d64ea4cb..fcdb56de 100644 ---- a/tools/tests/test-wrapper.sh.in -+++ b/tools/tests/test-wrapper.sh.in -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - - # For debugging behavior of test-modemmanager-service.py, you can modify - # this line to add --log-file option --- -2.35.3 - diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.18.12.bb b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.20.6.bb index b06e3ebdab..ba82d21508 100644 --- a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.18.12.bb +++ b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.20.6.bb @@ -12,13 +12,8 @@ inherit gnomebase gettext systemd gobject-introspection bash-completion DEPENDS = "glib-2.0 libgudev libxslt-native dbus" -SRCREV ?= "c234bd55c9d9618c1478b5e80aaf4b8f965be181" - -# Patch 0001 will be in ModemManager > 1.19 -SRC_URI = " \ - git://gitlab.freedesktop.org/mobile-broadband/ModemManager.git;protocol=https;branch=mm-1-18 \ - file://0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch \ -" +SRCREV = "6aa0ff583d04aea88b4da7a1c20049f57062dab6" +SRC_URI = "git://gitlab.freedesktop.org/mobile-broadband/ModemManager.git;protocol=https;branch=mm-1-20" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb b/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb index 4537a09412..2869e06336 100644 --- a/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb +++ b/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "protobuf-native protobuf ncurses zlib libio-pty-perl openssl libutempter" -SRC_URI = "http://mosh.mit.edu/mosh-${PV}.tar.gz" +SRC_URI = "https://mosh.org/${BP}.tar.gz" SRC_URI[sha256sum] = "872e4b134e5df29c8933dff12350785054d2fd2839b5ae6b5587b14db1465ddd" inherit autotools pkgconfig diff --git a/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb b/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb index b2a204403e..3e59af8e2e 100644 --- a/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb +++ b/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb @@ -4,10 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "gtk+ dbus-glib dbus-glib-native imagemagick openobex bluez5" -SRC_URI = "http://tadas.dailyda.com/software/obex-data-server-${PV}.tar.gz \ +SRC_URI = "https://ftp.osuosl.org/pub/blfs/conglomeration/${BPN}/obex-data-server-${PV}.tar.gz \ file://obex-data-server-0.4.6-build-fixes-1.patch \ " -SRC_URI[md5sum] = "961ca5db6fe9c97024e133cc6203cc4d" SRC_URI[sha256sum] = "b399465ddbd6d0217abedd9411d9d74a820effa0a6a142adc448268d3920094f" inherit features_check autotools-brokensep pkgconfig diff --git a/meta-oe/recipes-connectivity/obexftp/obexftp/0001-apps-CMakeLists.txt-Explicitly-link-libbfb-and-libmu.patch b/meta-oe/recipes-connectivity/obexftp/obexftp/0001-apps-CMakeLists.txt-Explicitly-link-libbfb-and-libmu.patch index 1f6de87c8d..7a19b6172f 100644 --- a/meta-oe/recipes-connectivity/obexftp/obexftp/0001-apps-CMakeLists.txt-Explicitly-link-libbfb-and-libmu.patch +++ b/meta-oe/recipes-connectivity/obexftp/obexftp/0001-apps-CMakeLists.txt-Explicitly-link-libbfb-and-libmu.patch @@ -9,6 +9,8 @@ they are required to be added to link line explicitly. Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + apps/CMakeLists.txt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-connectivity/obexftp/obexftp/Remove_some_printf_in_obexftpd.patch b/meta-oe/recipes-connectivity/obexftp/obexftp/Remove_some_printf_in_obexftpd.patch index 8b73af32e8..23e92885e8 100644 --- a/meta-oe/recipes-connectivity/obexftp/obexftp/Remove_some_printf_in_obexftpd.patch +++ b/meta-oe/recipes-connectivity/obexftp/obexftp/Remove_some_printf_in_obexftpd.patch @@ -1,6 +1,6 @@ Signed-off-by: Jun Zhu <R01007@freescale.com> -Upstream-Status: Not applicable +Upstream-Status: Inappropriate [embedded specific] diff -Nru obexftp-0.23/apps.orig/obexftpd.c obexftp-0.23/apps/obexftpd.c --- obexftp-0.23/apps.orig/obexftpd.c 2013-11-08 10:42:20.816631583 +0800 diff --git a/meta-oe/recipes-connectivity/obexftp/obexftp/make_fuse_swig_optional.patch b/meta-oe/recipes-connectivity/obexftp/obexftp/make_fuse_swig_optional.patch index 84b143bf51..25f2a7d9e7 100644 --- a/meta-oe/recipes-connectivity/obexftp/obexftp/make_fuse_swig_optional.patch +++ b/meta-oe/recipes-connectivity/obexftp/obexftp/make_fuse_swig_optional.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: obexftp-0.24.2-Source/CMakeLists.txt =================================================================== --- obexftp-0.24.2-Source.orig/CMakeLists.txt diff --git a/meta-oe/recipes-connectivity/paho-mqtt-c/files/makefile.patch b/meta-oe/recipes-connectivity/paho-mqtt-c/files/makefile.patch deleted file mode 100644 index a31bfaa749..0000000000 --- a/meta-oe/recipes-connectivity/paho-mqtt-c/files/makefile.patch +++ /dev/null @@ -1,25 +0,0 @@ -Disable building some things we don't need - -Upstream-Status: Inappropriate [config] - -Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> - ---- - Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 33bd2d0..84262bd 100644 ---- a/Makefile -+++ b/Makefile -@@ -115,7 +115,8 @@ LDFLAGS_AS = -shared -Wl,-soname,lib${MQTTLIB_AS}.so.${MAJOR_VERSION} -lpthread - - all: build - --build: | mkdir ${MQTTLIB_C_TARGET} ${MQTTLIB_CS_TARGET} ${MQTTLIB_A_TARGET} ${MQTTLIB_AS_TARGET} ${MQTTVERSION_TARGET} ${SYNC_SAMPLES} ${ASYNC_SAMPLES} ${SYNC_TESTS} ${SYNC_SSL_TESTS} ${ASYNC_TESTS} ${ASYNC_SSL_TESTS} -+build: | mkdir ${MQTTLIB_C_TARGET} ${MQTTLIB_CS_TARGET} ${MQTTLIB_A_TARGET} ${MQTTLIB_AS_TARGET} -+#${MQTTVERSION_TARGET} ${SYNC_SAMPLES} ${ASYNC_SAMPLES} ${SYNC_TESTS} ${SYNC_SSL_TESTS} ${ASYNC_TESTS} ${ASYNC_SSL_TESTS} - - clean: - rm -rf ${blddir}/* --- diff --git a/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.12.bb b/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.12.bb index d006ae7636..4decb098c7 100644 --- a/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.12.bb +++ b/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.12.bb @@ -5,13 +5,12 @@ SECTION = "console/network" LICENSE = "EPL-2.0 | EDL-1.0" LIC_FILES_CHKSUM = " \ + file://LICENSE;md5=fd3b896dadaeec3410d753ffaeadcfac \ file://edl-v10;md5=3adfcc70f5aeb7a44f3f9b495aa1fbf3 \ file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \ - file://notice.html;md5=943f861069889acecebf51dfa24478e2 \ - file://about.html;md5=e5662cbb5f8fd5c9faac526e4077898e \ " -SRC_URI = "git://github.com/eclipse/paho.mqtt.c;protocol=http;branch=master;protocol=https" +SRC_URI = "git://github.com/eclipse/paho.mqtt.c;protocol=https;branch=master" SRCREV = "4157a27d39f1dd5b95750ecb6acd1481432785d8" @@ -31,4 +30,4 @@ do_install:append() { find ${D}${prefix} -maxdepth 1 -type f -delete } -EXTRA_OECMAKE = "-DPAHO_WITH_SSL=ON" +EXTRA_OECMAKE = "-DPAHO_WITH_SSL=ON -DPAHO_ENABLE_TESTING=OFF -DPAHO_HIGH_PERFORMANCE=ON" diff --git a/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch b/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch index 7cf9a8b121..2436b36f2d 100644 --- a/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch +++ b/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch @@ -7,6 +7,8 @@ This ensures the install paths are not hardcoded. Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + cmake/CMakeLists.txt | 4 ++-- src/samples/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.2.0.bb b/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.2.0.bb index a9e16fa045..bb5aa69077 100644 --- a/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.2.0.bb +++ b/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.2.0.bb @@ -5,13 +5,12 @@ SECTION = "console/network" LICENSE = "EPL-1.0 | EDL-1.0" LIC_FILES_CHKSUM = " \ + file://src/mqtt/message.h;beginline=9;endline=18;md5=5eec304e6066523386c222963ceeb6ff \ file://edl-v10;md5=3adfcc70f5aeb7a44f3f9b495aa1fbf3 \ file://epl-v10;md5=659c8e92a40b6df1d9e3dccf5ae45a08 \ - file://notice.html;md5=a00d6f9ab542be7babc2d8b80d5d2a4c \ - file://about.html;md5=dcde438d73cf42393da9d40fabc0c9bc \ " -SRC_URI = "git://github.com/eclipse/paho.mqtt.cpp;protocol=http;branch=master;protocol=https \ +SRC_URI = "git://github.com/eclipse/paho.mqtt.cpp;protocol=https;branch=master \ file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch \ " SRCREV = "33921c8b68b351828650c36816e7ecf936764379" diff --git a/meta-oe/recipes-connectivity/rabbitmq-c/files/CVE-2023-35789.patch b/meta-oe/recipes-connectivity/rabbitmq-c/files/CVE-2023-35789.patch new file mode 100644 index 0000000000..dfd1f98759 --- /dev/null +++ b/meta-oe/recipes-connectivity/rabbitmq-c/files/CVE-2023-35789.patch @@ -0,0 +1,131 @@ +CVE: CVE-2023-35789 +Upstream-Status: Backport [ https://github.com/alanxz/rabbitmq-c/commit/463054383fbeef889b409a7f843df5365288e2a0 ] +Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com> + +From 463054383fbeef889b409a7f843df5365288e2a0 Mon Sep 17 00:00:00 2001 +From: Christian Kastner <ckk@kvr.at> +Date: Tue, 13 Jun 2023 14:21:52 +0200 +Subject: [PATCH] Add option to read username/password from file (#781) + +* Add option to read username/password from file +--- + tools/common.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 66 insertions(+) + +diff --git a/tools/common.c b/tools/common.c +index 73b47e25..7efe557b 100644 +--- a/tools/common.c ++++ b/tools/common.c +@@ -18,6 +18,11 @@ + #include "compat.h" + #endif + ++/* For when reading auth data from a file */ ++#define MAXAUTHTOKENLEN 128 ++#define USERNAMEPREFIX "username:" ++#define PASSWORDPREFIX "password:" ++ + void die(const char *fmt, ...) { + va_list ap; + va_start(ap, fmt); +@@ -125,6 +130,7 @@ static char *amqp_vhost; + static char *amqp_username; + static char *amqp_password; + static int amqp_heartbeat = 0; ++static char *amqp_authfile; + #ifdef WITH_SSL + static int amqp_ssl = 0; + static char *amqp_cacert = "/etc/ssl/certs/cacert.pem"; +@@ -147,6 +153,8 @@ struct poptOption connect_options[] = { + "the password to login with", "password"}, + {"heartbeat", 0, POPT_ARG_INT, &amqp_heartbeat, 0, + "heartbeat interval, set to 0 to disable", "heartbeat"}, ++ {"authfile", 0, POPT_ARG_STRING, &amqp_authfile, 0, ++ "path to file containing username/password for authentication", "file"}, + #ifdef WITH_SSL + {"ssl", 0, POPT_ARG_NONE, &amqp_ssl, 0, "connect over SSL/TLS", NULL}, + {"cacert", 0, POPT_ARG_STRING, &amqp_cacert, 0, +@@ -158,6 +166,50 @@ struct poptOption connect_options[] = { + #endif /* WITH_SSL */ + {NULL, '\0', 0, NULL, 0, NULL, NULL}}; + ++void read_authfile(const char *path) { ++ size_t n; ++ FILE *fp = NULL; ++ char token[MAXAUTHTOKENLEN]; ++ ++ if ((amqp_username = malloc(MAXAUTHTOKENLEN)) == NULL || ++ (amqp_password = malloc(MAXAUTHTOKENLEN)) == NULL) { ++ die("Out of memory"); ++ } else if ((fp = fopen(path, "r")) == NULL) { ++ die("Could not read auth data file %s", path); ++ } ++ ++ if (fgets(token, MAXAUTHTOKENLEN, fp) == NULL || ++ strncmp(token, USERNAMEPREFIX, strlen(USERNAMEPREFIX))) { ++ die("Malformed auth file (missing username)"); ++ } ++ strncpy(amqp_username, &token[strlen(USERNAMEPREFIX)], MAXAUTHTOKENLEN); ++ /* Missing newline means token was cut off */ ++ n = strlen(amqp_username); ++ if (amqp_username[n - 1] != '\n') { ++ die("Username too long"); ++ } else { ++ amqp_username[n - 1] = '\0'; ++ } ++ ++ if (fgets(token, MAXAUTHTOKENLEN, fp) == NULL || ++ strncmp(token, PASSWORDPREFIX, strlen(PASSWORDPREFIX))) { ++ die("Malformed auth file (missing password)"); ++ } ++ strncpy(amqp_password, &token[strlen(PASSWORDPREFIX)], MAXAUTHTOKENLEN); ++ /* Missing newline means token was cut off */ ++ n = strlen(amqp_password); ++ if (amqp_password[n - 1] != '\n') { ++ die("Password too long"); ++ } else { ++ amqp_password[n - 1] = '\0'; ++ } ++ ++ (void)fgetc(fp); ++ if (!feof(fp)) { ++ die("Malformed auth file (trailing data)"); ++ } ++} ++ + static void init_connection_info(struct amqp_connection_info *ci) { + ci->user = NULL; + ci->password = NULL; +@@ -237,6 +289,8 @@ static void init_connection_info(struct amqp_connection_info *ci) { + if (amqp_username) { + if (amqp_url) { + die("--username and --url options cannot be used at the same time"); ++ } else if (amqp_authfile) { ++ die("--username and --authfile options cannot be used at the same time"); + } + + ci->user = amqp_username; +@@ -245,11 +299,23 @@ static void init_connection_info(struct amqp_connection_info *ci) { + if (amqp_password) { + if (amqp_url) { + die("--password and --url options cannot be used at the same time"); ++ } else if (amqp_authfile) { ++ die("--password and --authfile options cannot be used at the same time"); + } + + ci->password = amqp_password; + } + ++ if (amqp_authfile) { ++ if (amqp_url) { ++ die("--authfile and --url options cannot be used at the same time"); ++ } ++ ++ read_authfile(amqp_authfile); ++ ci->user = amqp_username; ++ ci->password = amqp_password; ++ } ++ + if (amqp_vhost) { + if (amqp_url) { + die("--vhost and --url options cannot be used at the same time"); diff --git a/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.11.0.bb b/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.13.0.bb index 304171c88c..ea80ec3344 100644 --- a/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.11.0.bb +++ b/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.13.0.bb @@ -1,11 +1,13 @@ DESCRIPTION = "A C-language AMQP client library for use with v2.0+ of the RabbitMQ broker" HOMEPAGE = "https://github.com/alanxz/rabbitmq-c" -LIC_FILES_CHKSUM = "file://LICENSE-MIT;md5=6b7424f9db80cfb11fdd5c980b583f53" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7e12f6e40e662e039e2f02b4893011ec" LICENSE = "MIT" -SRC_URI = "git://github.com/alanxz/rabbitmq-c.git;branch=master;protocol=https" -# v0.11.0-master -SRCREV = "a64c08c68aff34d49a2ac152f04988cd921084f9" +SRC_URI = "git://github.com/alanxz/rabbitmq-c.git;branch=master;protocol=https \ + file://CVE-2023-35789.patch \ +" +# v0.13.0-master +SRCREV = "974d71adceae6d742ae20a4c880d99c131f1460a" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-connectivity/rfkill/rfkill/0001-rfkill-makefile-don-t-use-t-the-OE-install-wrapper-d.patch b/meta-oe/recipes-connectivity/rfkill/rfkill/0001-rfkill-makefile-don-t-use-t-the-OE-install-wrapper-d.patch index c6f60d0ede..89a7d6f34a 100644 --- a/meta-oe/recipes-connectivity/rfkill/rfkill/0001-rfkill-makefile-don-t-use-t-the-OE-install-wrapper-d.patch +++ b/meta-oe/recipes-connectivity/rfkill/rfkill/0001-rfkill-makefile-don-t-use-t-the-OE-install-wrapper-d.patch @@ -5,6 +5,8 @@ Subject: [PATCH] rfkill makefile: don't use -t, the OE install wrapper dislikes Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> --- +Upstream-Status: Pending + Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-connectivity/rfkill/rfkill/dont.call.git.rev-parse.on.parent.dir.patch b/meta-oe/recipes-connectivity/rfkill/rfkill/dont.call.git.rev-parse.on.parent.dir.patch index 2b83689127..020419ea8a 100644 --- a/meta-oe/recipes-connectivity/rfkill/rfkill/dont.call.git.rev-parse.on.parent.dir.patch +++ b/meta-oe/recipes-connectivity/rfkill/rfkill/dont.call.git.rev-parse.on.parent.dir.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + When WORKDIR is included in some other git checkout, version.sh calls git rev-parse and it returns some description from that upper git checkout even when rfkill is being built from release tarball. diff --git a/meta-oe/recipes-connectivity/ser2net/ser2net_4.3.11.bb b/meta-oe/recipes-connectivity/ser2net/ser2net_4.3.13.bb index ca7982c0ac..a4c244d447 100644 --- a/meta-oe/recipes-connectivity/ser2net/ser2net_4.3.11.bb +++ b/meta-oe/recipes-connectivity/ser2net/ser2net_4.3.13.bb @@ -3,13 +3,13 @@ SECTION = "console/network" HOMEPAGE = "http://sourceforge.net/projects/ser2net/" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "gensio libyaml" SRC_URI = "${SOURCEFORGE_MIRROR}/project/ser2net/ser2net/ser2net-${PV}.tar.gz" -SRC_URI[sha256sum] = "8f831f11b67538280aa0e8787cb0785ff705cf90749aa175d32c337f29412ae3" +SRC_URI[sha256sum] = "ed8b98448d535111d9a593b067601a8b53e2874814d706b2421a9490a660d265" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/ser2net/files/ser2net" diff --git a/meta-oe/recipes-connectivity/smstools3/smstools3/scripts_no_bash.patch b/meta-oe/recipes-connectivity/smstools3/smstools3/scripts_no_bash.patch index 49b4d1ddac..e287ae5e73 100644 --- a/meta-oe/recipes-connectivity/smstools3/smstools3/scripts_no_bash.patch +++ b/meta-oe/recipes-connectivity/smstools3/smstools3/scripts_no_bash.patch @@ -3,6 +3,8 @@ From: Bill Randle <bill.randle@gmail.com> Date: Sun, 31 Dec 2017 09:08:23 -0800 --- +Upstream-Status: Pending + scripts/sendsms | 2 +- scripts/sms2html | 2 +- scripts/sms2unicode | 2 +- diff --git a/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch b/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch index e1d79d3327..db829744d3 100644 --- a/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch +++ b/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch @@ -3,6 +3,8 @@ From: Kai Ulrich <kaiu@gmx.de> Date: Wed, 18 Mar 2015 11:20:53 +0100 --- +Upstream-Status: Pending + scripts/sms3 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-connectivity/thrift/thrift/0001-DefineInstallationPaths.cmake-Define-libdir-in-terms.patch b/meta-oe/recipes-connectivity/thrift/thrift/0001-DefineInstallationPaths.cmake-Define-libdir-in-terms.patch index e1e474ab0a..bbfc6c8069 100644 --- a/meta-oe/recipes-connectivity/thrift/thrift/0001-DefineInstallationPaths.cmake-Define-libdir-in-terms.patch +++ b/meta-oe/recipes-connectivity/thrift/thrift/0001-DefineInstallationPaths.cmake-Define-libdir-in-terms.patch @@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> --- a/build/cmake/DefineInstallationPaths.cmake +++ b/build/cmake/DefineInstallationPaths.cmake -@@ -26,11 +26,11 @@ +@@ -26,11 +26,11 @@ else() set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "The library install dir (default: lib${LIB_SUFFIX})") endif() set(INCLUDE_INSTALL_DIR "include" CACHE PATH "The library install dir (default: include)") @@ -29,7 +29,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> set(cmakedir "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DIR}") --- a/build/cmake/DefineCMakeDefaults.cmake +++ b/build/cmake/DefineCMakeDefaults.cmake -@@ -44,8 +44,8 @@ +@@ -44,8 +44,8 @@ include(BuildType) # top of the build tree rather than in hard-to-find leaf # directories. This simplifies manual testing and the use of the build # tree rather than installed thrift libraries. diff --git a/meta-oe/recipes-connectivity/thrift/thrift/0001-cmake-Use-idirafter-instead-of-isystem.patch b/meta-oe/recipes-connectivity/thrift/thrift/0001-cmake-Use-idirafter-instead-of-isystem.patch deleted file mode 100644 index fd995153b3..0000000000 --- a/meta-oe/recipes-connectivity/thrift/thrift/0001-cmake-Use-idirafter-instead-of-isystem.patch +++ /dev/null @@ -1,180 +0,0 @@ -From 0b9c6c4286a33961016839826e709a0e7394b28b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 21 Jan 2023 00:00:04 -0800 -Subject: [PATCH] cmake: Use -idirafter instead of -isystem - -isystem dirs are searched before the regular system dirs -this exposes an interesting include ordering problem when using -clang + libc++, when including C++ headers like <cstdlib> - -cstdlib includes stdlib.h and in case of libc++, this should be coming -from libc++ as well, which is then eventually including system stdlib.h - -libc++ has added a check for checking this order recently, which means -if cstlib ends up including system stdlib.h before libc++ provided -stdlib.h it errors out - -/mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/thrift/0.17.0-r0/recipe-sysroot/usr/include/c++/v1/cstdlib:90:5: error: <cstdlib> tried including <stdlib.h> but didn't find libc++'s <stdlib.h> header. This usually means that your header search paths are not configured properly. The header search paths should contain the C++ Standard Library headers before any C Standard Library, and you are probably using compiler flags that make that not be the case. - ^ - -The reason is that include_directories with SYSTEM property adds the -directory via -system and some of these directories point to sysroot -e.g. OPENSSL_INCLUDE_DIR which ends up adding -isystem -<sysroot>/usr/include and causes the system stdlib.h to included before -libc++ stdlib.h - -A fix is to use -idirafter which preserved the effects of system headers -but instead of prepending, it will append to system headers and the -issue is addressed - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - build/cmake/BoostMacros.cmake | 2 +- - lib/c_glib/CMakeLists.txt | 4 ++-- - lib/c_glib/test/CMakeLists.txt | 2 +- - lib/cpp/CMakeLists.txt | 7 +++---- - lib/cpp/test/CMakeLists.txt | 2 +- - test/c_glib/CMakeLists.txt | 6 +++--- - test/cpp/CMakeLists.txt | 6 +++--- - 7 files changed, 14 insertions(+), 15 deletions(-) - -diff --git a/build/cmake/BoostMacros.cmake b/build/cmake/BoostMacros.cmake -index ffb85af..9f9d2dd 100644 ---- a/build/cmake/BoostMacros.cmake -+++ b/build/cmake/BoostMacros.cmake -@@ -26,7 +26,7 @@ macro(REQUIRE_BOOST_HEADERS) - endif() - if (DEFINED Boost_INCLUDE_DIRS) - # pre-boost 1.70.0 aware cmake, otherwise it is using targets -- include_directories(SYSTEM "${Boost_INCLUDE_DIRS}") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${Boost_INCLUDE_DIRS}") - endif() - endmacro() - -diff --git a/lib/c_glib/CMakeLists.txt b/lib/c_glib/CMakeLists.txt -index 218f7dd..d7a6161 100644 ---- a/lib/c_glib/CMakeLists.txt -+++ b/lib/c_glib/CMakeLists.txt -@@ -83,7 +83,7 @@ if(OPENSSL_FOUND AND WITH_OPENSSL) - list(APPEND SYSLIBS OpenSSL::Crypto) - endif() - else() -- include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${OPENSSL_INCLUDE_DIR}") - list(APPEND SYSLIBS "${OPENSSL_LIBRARIES}") - endif() - endif() -@@ -97,7 +97,7 @@ target_link_libraries(thrift_c_glib PUBLIC ${SYSLIBS}) - - # If Zlib is not found just ignore the Zlib stuff - if(WITH_ZLIB) -- include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS}) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${ZLIB_INCLUDE_DIRS}") - ADD_LIBRARY_THRIFT(thrift_c_glib_zlib ${thrift_c_glib_zlib_SOURCES}) - target_link_libraries(thrift_c_glib_zlib ${SYSLIBS} ${ZLIB_LIBRARIES}) - target_link_libraries(thrift_c_glib_zlib thrift_c_glib) -diff --git a/lib/c_glib/test/CMakeLists.txt b/lib/c_glib/test/CMakeLists.txt -index 85c6dd0..0c8d3d2 100644 ---- a/lib/c_glib/test/CMakeLists.txt -+++ b/lib/c_glib/test/CMakeLists.txt -@@ -129,7 +129,7 @@ target_link_libraries(testthriftmemorybufferreadcheck testgenc) - add_test(NAME testthriftmemorybufferreadcheck COMMAND testthriftmemorybufferreadcheck) - - if(WITH_ZLIB) -- include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${ZLIB_INCLUDE_DIRS}") - add_executable(testzlibtransport testzlibtransport.c) - target_link_libraries(testzlibtransport testgenc ${ZLIB_LIBRARIES}) - target_link_libraries(testzlibtransport thrift_c_glib_zlib) -diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt -index 13b41c5..96bea53 100644 ---- a/lib/cpp/CMakeLists.txt -+++ b/lib/cpp/CMakeLists.txt -@@ -111,7 +111,7 @@ if(OPENSSL_FOUND AND WITH_OPENSSL) - list(APPEND SYSLIBS OpenSSL::Crypto) - endif() - else() -- include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${OPENSSL_INCLUDE_DIR}") - list(APPEND SYSLIBS "${OPENSSL_LIBRARIES}") - endif() - endif() -@@ -167,8 +167,7 @@ ADD_PKGCONFIG_THRIFT(thrift) - - if(WITH_LIBEVENT) - find_package(Libevent REQUIRED) # Libevent comes with CMake support from upstream -- include_directories(SYSTEM ${LIBEVENT_INCLUDE_DIRS}) -- -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${LIBEVENT_INCLUDE_DIRS}") - ADD_LIBRARY_THRIFT(thriftnb ${thriftcppnb_SOURCES}) - target_link_libraries(thriftnb PUBLIC thrift) - if(TARGET libevent::core AND TARGET libevent::extra) -@@ -182,7 +181,7 @@ endif() - - if(WITH_ZLIB) - find_package(ZLIB REQUIRED) -- include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS}) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${ZLIB_INCLUDE_DIRS}") - - ADD_LIBRARY_THRIFT(thriftz ${thriftcppz_SOURCES}) - target_link_libraries(thriftz PUBLIC thrift) -diff --git a/lib/cpp/test/CMakeLists.txt b/lib/cpp/test/CMakeLists.txt -index 19854e1..1b36b47 100644 ---- a/lib/cpp/test/CMakeLists.txt -+++ b/lib/cpp/test/CMakeLists.txt -@@ -127,7 +127,7 @@ endif () - add_test(NAME TServerIntegrationTest COMMAND TServerIntegrationTest) - - if(WITH_ZLIB) --include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${ZLIB_INCLUDE_DIRS}") - add_executable(TransportTest TransportTest.cpp) - target_link_libraries(TransportTest - testgencpp -diff --git a/test/c_glib/CMakeLists.txt b/test/c_glib/CMakeLists.txt -index 410774d..cbda860 100644 ---- a/test/c_glib/CMakeLists.txt -+++ b/test/c_glib/CMakeLists.txt -@@ -21,14 +21,14 @@ - include(ThriftMacros) - - find_package(GLIB REQUIRED COMPONENTS gobject) --include_directories(SYSTEM "${GLIB_INCLUDE_DIR}") --include_directories(SYSTEM "${GLIBCONFIG_INCLUDE_DIR}") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${GLIB_INCLUDE_DIR}") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${GLIBCONFIG_INCLUDE_DIR}") - - #Make sure gen-c_glib files can be included - include_directories("${CMAKE_CURRENT_BINARY_DIR}") - include_directories("${CMAKE_CURRENT_BINARY_DIR}/gen-c_glib") - include_directories("${PROJECT_SOURCE_DIR}/lib/c_glib/src") --include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${OPENSSL_INCLUDE_DIR}") - - set(crosstestgencglib_SOURCES - gen-c_glib/t_test_second_service.c -diff --git a/test/cpp/CMakeLists.txt b/test/cpp/CMakeLists.txt -index a6c1fd5..160c67b 100644 ---- a/test/cpp/CMakeLists.txt -+++ b/test/cpp/CMakeLists.txt -@@ -27,13 +27,13 @@ REQUIRE_BOOST_LIBRARIES(BOOST_COMPONENTS) - include(ThriftMacros) - - find_package(OpenSSL REQUIRED) --include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${OPENSSL_INCLUDE_DIR}") - - find_package(Libevent REQUIRED) # Libevent comes with CMake support from upstream --include_directories(SYSTEM ${LIBEVENT_INCLUDE_DIRS}) -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${LIBEVENT_INCLUDE_DIRS}") - - find_package(ZLIB REQUIRED) --include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS}) -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${ZLIB_INCLUDE_DIRS}") - - #Make sure gen-cpp files can be included - include_directories("${CMAKE_CURRENT_BINARY_DIR}") --- -2.39.1 - diff --git a/meta-oe/recipes-connectivity/thrift/thrift_0.17.0.bb b/meta-oe/recipes-connectivity/thrift/thrift_0.18.1.bb index 216af02c42..ea5a3972dc 100644 --- a/meta-oe/recipes-connectivity/thrift/thrift_0.17.0.bb +++ b/meta-oe/recipes-connectivity/thrift/thrift_0.18.1.bb @@ -8,11 +8,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c40a383cb3f747e0c7abbf1482f194f0 \ DEPENDS = "thrift-native boost flex-native bison-native openssl zlib" -SRC_URI = "https://www-eu.apache.org/dist/thrift//${PV}/${BPN}-${PV}.tar.gz \ - file://0001-DefineInstallationPaths.cmake-Define-libdir-in-terms.patch \ - file://0001-cmake-Use-idirafter-instead-of-isystem.patch \ - " -SRC_URI[sha256sum] = "b272c1788bb165d99521a2599b31b97fa69e5931d099015d91ae107a0b0cc58f" +SRC_URI = "https://downloads.apache.org/${BPN}/${PV}/${BP}.tar.gz \ + file://0001-DefineInstallationPaths.cmake-Define-libdir-in-terms.patch" +SRC_URI[sha256sum] = "04c6f10e5d788ca78e13ee2ef0d2152c7b070c0af55483d6b942e29cff296726" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_1.1.1.bb b/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_1.1.1.bb deleted file mode 100644 index 3f4f846f9e..0000000000 --- a/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_1.1.1.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "This daemon is in charge of multiplexing connections over USB to an iPhone or iPod touch." -HOMEPAGE = "https://github.com/libimobiledevice/usbmuxd" -LICENSE = "GPL-3.0-only & GPL-2.0-only & LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=ebb5c50ab7cab4baeffba14977030c07 \ - file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504" - -DEPENDS = "udev libusb1 libplist" - -inherit autotools pkgconfig gitpkgv systemd - -PKGV = "${GITPKGVTAG}" - -SRCREV = "79c8b38d1488a6b07e1e68f39d8caec3f1a45622" -SRC_URI = "git://github.com/libimobiledevice/usbmuxd;protocol=https;branch=master" - -S = "${WORKDIR}/git" - -EXTRA_OECONF += "--without-preflight" - -FILES:${PN} += "${base_libdir}/udev/rules.d/" - -SYSTEMD_SERVICE:${PN} = "usbmuxd.service" diff --git a/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb b/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb index e9afaf5712..1492234495 100644 --- a/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb +++ b/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb @@ -11,7 +11,7 @@ inherit autotools pkgconfig gitpkgv systemd PKGV = "${GITPKGVTAG}" PV = "1.1.2+git${SRCPV}" -SRCREV = "f50e52f3393a9149ac65fdda8f0d425109efc7fe" +SRCREV = "01c94c77f59404924f1c46d99c4e5e0c7817281b" SRC_URI = "git://github.com/libimobiledevice/usbmuxd;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-connectivity/wifi-test-suite/files/0003-fix-path-to-usr-sbin-for-script-and-make-script-for-.patch b/meta-oe/recipes-connectivity/wifi-test-suite/files/0003-fix-path-to-usr-sbin-for-script-and-make-script-for-.patch index a51302a0cb..cfa46ff496 100644 --- a/meta-oe/recipes-connectivity/wifi-test-suite/files/0003-fix-path-to-usr-sbin-for-script-and-make-script-for-.patch +++ b/meta-oe/recipes-connectivity/wifi-test-suite/files/0003-fix-path-to-usr-sbin-for-script-and-make-script-for-.patch @@ -6,6 +6,8 @@ Subject: [PATCH 3/3] fix path to /usr/sbin for script and make script for Signed-off-by: Ankit Navik <ankit.tarot@gmail.com> --- +Upstream-Status: Pending + lib/wfa_cs.c | 4 ++-- scripts/dev_send_frame | 2 +- scripts/sta_reset_parm | 2 +- diff --git a/meta-oe/recipes-connectivity/wvdial/wvdial/typo_pon.wvdial.1.patch b/meta-oe/recipes-connectivity/wvdial/wvdial/typo_pon.wvdial.1.patch index eec5a5d646..5f9cf8a31f 100644 --- a/meta-oe/recipes-connectivity/wvdial/wvdial/typo_pon.wvdial.1.patch +++ b/meta-oe/recipes-connectivity/wvdial/wvdial/typo_pon.wvdial.1.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Remove warnings found by lintian Last-Update: 2011-01-09 Index: wvdial-1.61/pon.wvdial.1 diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams/0001-Check-for-limits.h-during-configure.patch b/meta-oe/recipes-connectivity/wvdial/wvstreams/0001-Check-for-limits.h-during-configure.patch index b092ba2fce..42f3e42757 100644 --- a/meta-oe/recipes-connectivity/wvdial/wvstreams/0001-Check-for-limits.h-during-configure.patch +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams/0001-Check-for-limits.h-during-configure.patch @@ -5,6 +5,8 @@ Subject: [PATCH 1/5] Check for limits.h during configure Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + configure.ac | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams/0001-build-fix-parallel-make.patch b/meta-oe/recipes-connectivity/wvdial/wvstreams/0001-build-fix-parallel-make.patch index 6bc34331d6..954c3d9fca 100644 --- a/meta-oe/recipes-connectivity/wvdial/wvstreams/0001-build-fix-parallel-make.patch +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams/0001-build-fix-parallel-make.patch @@ -7,6 +7,8 @@ Imported from Gentoo Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + Makefile | 15 +++++++++++++-- wvrules-posix.mk | 7 +++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvrules.mk-Use-_DEFAULT_SOURCE.patch b/meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvrules.mk-Use-_DEFAULT_SOURCE.patch index 59f70e380d..5b7135c3f3 100644 --- a/meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvrules.mk-Use-_DEFAULT_SOURCE.patch +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvrules.mk-Use-_DEFAULT_SOURCE.patch @@ -8,6 +8,8 @@ warning: "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + wvrules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams/0003-wvtask-Check-for-HAVE_LIBC_STACK_END-only-on-glibc-s.patch b/meta-oe/recipes-connectivity/wvdial/wvstreams/0003-wvtask-Check-for-HAVE_LIBC_STACK_END-only-on-glibc-s.patch index f9304197ae..856c2460b4 100644 --- a/meta-oe/recipes-connectivity/wvdial/wvstreams/0003-wvtask-Check-for-HAVE_LIBC_STACK_END-only-on-glibc-s.patch +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams/0003-wvtask-Check-for-HAVE_LIBC_STACK_END-only-on-glibc-s.patch @@ -6,6 +6,8 @@ Subject: [PATCH 3/5] wvtask: Check for HAVE_LIBC_STACK_END only on glibc Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + utils/wvtask.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams/0004-wvcrash-Replace-use-of-basename-API.patch b/meta-oe/recipes-connectivity/wvdial/wvstreams/0004-wvcrash-Replace-use-of-basename-API.patch index 6f3fbffbdf..f960c98622 100644 --- a/meta-oe/recipes-connectivity/wvdial/wvstreams/0004-wvcrash-Replace-use-of-basename-API.patch +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams/0004-wvcrash-Replace-use-of-basename-API.patch @@ -7,6 +7,8 @@ musl does not have this API Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + utils/wvcrash.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams/0005-check-for-libexecinfo-during-configure.patch b/meta-oe/recipes-connectivity/wvdial/wvstreams/0005-check-for-libexecinfo-during-configure.patch index 25e9ee2369..508007c0ea 100644 --- a/meta-oe/recipes-connectivity/wvdial/wvstreams/0005-check-for-libexecinfo-during-configure.patch +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams/0005-check-for-libexecinfo-during-configure.patch @@ -5,6 +5,8 @@ Subject: [PATCH 5/5] check for libexecinfo during configure Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + configure.ac | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams/04_signed_request.diff b/meta-oe/recipes-connectivity/wvdial/wvstreams/04_signed_request.diff index 5ab633bc3d..50f3f72cd4 100644 --- a/meta-oe/recipes-connectivity/wvdial/wvstreams/04_signed_request.diff +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams/04_signed_request.diff @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: wvstreams-4.6/crypto/wvx509.cc =================================================================== --- wvstreams-4.6.orig/crypto/wvx509.cc 2009-07-29 11:58:16.000000000 -0400 diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams/05_gcc.diff b/meta-oe/recipes-connectivity/wvdial/wvstreams/05_gcc.diff index 616843d4ae..6b31f2e10f 100644 --- a/meta-oe/recipes-connectivity/wvdial/wvstreams/05_gcc.diff +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams/05_gcc.diff @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc =================================================================== --- wvstreams-4.6.1.orig/ipstreams/wvunixdgsocket.cc 2011-05-20 00:02:38.391136584 +0200 diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams/06_gcc-4.7.diff b/meta-oe/recipes-connectivity/wvdial/wvstreams/06_gcc-4.7.diff index a75067a108..7b05e468a9 100644 --- a/meta-oe/recipes-connectivity/wvdial/wvstreams/06_gcc-4.7.diff +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams/06_gcc-4.7.diff @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: Fix FTBFS with gcc-4.7 Small header include change. This is borderlinde cosmetic, but still needed to prevent the FTBFS. diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams/07_buildflags.diff b/meta-oe/recipes-connectivity/wvdial/wvstreams/07_buildflags.diff index ec99dcd36a..bd08d81c37 100644 --- a/meta-oe/recipes-connectivity/wvdial/wvstreams/07_buildflags.diff +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams/07_buildflags.diff @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: b/gen-cc =================================================================== --- a/gen-cc diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams/argp.patch b/meta-oe/recipes-connectivity/wvdial/wvstreams/argp.patch index e857213637..ed6e8599e1 100644 --- a/meta-oe/recipes-connectivity/wvdial/wvstreams/argp.patch +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams/argp.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Check for argp_parse in libargp and then in libc before using internal version Index: wvstreams-4.6.1/configure.ac diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams/gcc-6.patch b/meta-oe/recipes-connectivity/wvdial/wvstreams/gcc-6.patch index b084887ba7..899eeb9212 100644 --- a/meta-oe/recipes-connectivity/wvdial/wvstreams/gcc-6.patch +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams/gcc-6.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: Fix compilation with gcc-6 Author: Gert Wollny <gw.fossdev@gmail.com> Last-Updated: 2016-07-26 diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams/openssl-buildfix.patch b/meta-oe/recipes-connectivity/wvdial/wvstreams/openssl-buildfix.patch index 1c7005c2fe..7e372d391d 100644 --- a/meta-oe/recipes-connectivity/wvdial/wvstreams/openssl-buildfix.patch +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams/openssl-buildfix.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: wvstreams-4.6.1/crypto/wvx509.cc =================================================================== --- wvstreams-4.6.1.orig/crypto/wvx509.cc diff --git a/meta-oe/recipes-connectivity/zabbix/zabbix_6.2.6.bb b/meta-oe/recipes-connectivity/zabbix/zabbix_6.2.7.bb index bafde31348..8708852ce7 100644 --- a/meta-oe/recipes-connectivity/zabbix/zabbix_6.2.6.bb +++ b/meta-oe/recipes-connectivity/zabbix/zabbix_6.2.7.bb @@ -28,7 +28,7 @@ SRC_URI = "https://cdn.zabbix.com/zabbix/sources/stable/6.2/${BPN}-${PV}.tar.gz file://0001-initialize-msghdr-portably.patch \ file://zabbix-agent.service \ " -SRC_URI[sha256sum] = "ae40c8cd4b24159466a7483e65f85836a8c963a0bc394a3dd890142aaf30ac17" +SRC_URI[sha256sum] = "6d423810667b948ed22052d9aa84a035e2d4b92cbe8efdb669cac529806b722d" inherit autotools-brokensep linux-kernel-base pkgconfig systemd useradd diff --git a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb b/meta-oe/recipes-connectivity/zeromq/cppzmq_4.10.0.bb index 1dbdc3e46a..948d312bde 100644 --- a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb +++ b/meta-oe/recipes-connectivity/zeromq/cppzmq_4.10.0.bb @@ -4,8 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=db174eaf7b55a34a7c89551197f66e94" DEPENDS = "zeromq" -SRCREV = "d67b6352b87a238775cd17e4376b980d07fa7939" -PV = "4.9.0" +SRCREV = "c94c20743ed7d4aa37835a5c46567ab0790d4acc" SRC_URI = "git://github.com/zeromq/cppzmq.git;branch=master;protocol=https" diff --git a/meta-oe/recipes-connectivity/zeromq/files/0001-src-secure_allocator.hpp-define-missing-rebind-type.patch b/meta-oe/recipes-connectivity/zeromq/files/0001-src-secure_allocator.hpp-define-missing-rebind-type.patch new file mode 100644 index 0000000000..d32190818b --- /dev/null +++ b/meta-oe/recipes-connectivity/zeromq/files/0001-src-secure_allocator.hpp-define-missing-rebind-type.patch @@ -0,0 +1,64 @@ +From 66e72389cc90625ed74e8ba1ea3a65234bdb06b5 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyich@gmail.com> +Date: Tue, 20 Dec 2022 21:45:16 +0000 +Subject: [PATCH] src/secure_allocator.hpp: define missing 'rebind' type + +`gcc-13` added an assert to standard headers to make sure custom +allocators have intended implementation of rebind type instead +of inherited rebind. gcc change: + https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=64c986b49558a7 + +Without the fix build fails on this week's `gcc-13` as: + + [ 92%] Building CXX object tests/CMakeFiles/test_security_curve.dir/test_security_curve.cpp.o + In file included from /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:34, + from /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/stl_uninitialized.h:64, + from /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/memory:69, + from tests/../src/secure_allocator.hpp:42, + from tests/../src/curve_client_tools.hpp:49, + from tests/test_security_curve.cpp:53: + /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h: In instantiation of 'struct std::__allocator_traits_base::__rebind<zmq::secure_allocator_t<unsigned char>, unsigned char, void>': + /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:94:11: required by substitution of 'template<class _Alloc, class _Up> using std::__alloc_rebind = typename std::__allocator_traits_base::__rebind<_Alloc, _Up>::type [with _Alloc = zmq::secure_allocator_t<unsigned char>; _Up = unsigned char]' + /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:228:8: required by substitution of 'template<class _Alloc> template<class _Tp> using std::allocator_traits< <template-parameter-1-1> >::rebind_alloc = std::__alloc_rebind<_Alloc, _Tp> [with _Tp = unsigned char; _Alloc = zmq::secure_allocator_t<unsigned char>]' + /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:126:65: required from 'struct __gnu_cxx::__alloc_traits<zmq::secure_allocator_t<unsigned char>, unsigned char>::rebind<unsigned char>' + /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:88:21: required from 'struct std::_Vector_base<unsigned char, zmq::secure_allocator_t<unsigned char> >' + /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:423:11: required from 'class std::vector<unsigned char, zmq::secure_allocator_t<unsigned char> >' + tests/../src/curve_client_tools.hpp:64:76: required from here + /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:70:31: error: static assertion failed: allocator_traits<A>::rebind_alloc<A::value_type> must be A + 70 | _Tp>::value, + | ^~~~~ + +The change adds trivial `rebind` definition with expected return type +and satisfies conversion requirements. + +Upstream-Status: Backport [https://github.com/zeromq/libzmq/commit/438d5d88] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/secure_allocator.hpp | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/src/secure_allocator.hpp b/src/secure_allocator.hpp +index 0d37e7ed..5b8de9e2 100644 +--- a/src/secure_allocator.hpp ++++ b/src/secure_allocator.hpp +@@ -95,6 +95,17 @@ bool operator!= (const secure_allocator_t<T> &, const secure_allocator_t<U> &) + #else + template <typename T> struct secure_allocator_t : std::allocator<T> + { ++ secure_allocator_t () ZMQ_DEFAULT; ++ ++ template <class U> ++ secure_allocator_t (const secure_allocator_t<U> &) ZMQ_NOEXCEPT ++ { ++ } ++ ++ template <class U> struct rebind ++ { ++ typedef secure_allocator_t<U> other; ++ }; + }; + #endif + } +-- +2.39.1 + diff --git a/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.4.bb b/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.4.bb index 697bc47137..cd319b5d3a 100644 --- a/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.4.bb +++ b/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.4.bb @@ -1,6 +1,6 @@ DESCRIPTION = "ZeroMQ looks like an embeddable networking library but acts like a concurrency framework" HOMEPAGE = "http://www.zeromq.org" -LICENSE = "LGPL-3.0-or-later" +LICENSE = "LGPL-3.0-with-zeromq-exception" LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=d5311495d952062e0e4fbba39cbf3de1" PACKAGECONFIG ??= "libsodium" @@ -8,6 +8,7 @@ PACKAGECONFIG[libsodium] = "-DWITH_LIBSODIUM=ON,-DWITH_LIBSODIUM=OFF, libsodium" SRC_URI = "http://github.com/zeromq/libzmq/releases/download/v${PV}/zeromq-${PV}.tar.gz \ file://0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch \ + file://0001-src-secure_allocator.hpp-define-missing-rebind-type.patch \ file://run-ptest \ " SRC_URI[md5sum] = "c897d4005a3f0b8276b00b7921412379" diff --git a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.3.1.bb b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.4.0.bb index 7af62b7418..6294827b18 100644 --- a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.3.1.bb +++ b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.4.0.bb @@ -5,9 +5,8 @@ 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 \ - file://0001-Include-missing-cstdint.patch" -SRCREV = "898f6ea8f7ffe454e81a9337002df555728d4199" +SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master;protocol=https" +SRCREV = "ebac3df5beeb4337f65968ae5b265927abb792af" DEPENDS = "\ dbus \ diff --git a/meta-oe/recipes-core/dbus-cxx/files/0001-Include-missing-cstdint.patch b/meta-oe/recipes-core/dbus-cxx/files/0001-Include-missing-cstdint.patch deleted file mode 100644 index 4ad69eab42..0000000000 --- a/meta-oe/recipes-core/dbus-cxx/files/0001-Include-missing-cstdint.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 56e2cce87445d514c9992ecc19d03bb2115c82d6 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 25 Jan 2023 22:17:31 -0800 -Subject: [PATCH] Include missing <cstdint> - -gcc 13 moved some includes around and as a result <cstdint> is no longer transitively included [1]. Explicitly include it for uint{32,64}_t. - -[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes - -Upstream-Status: Submitted [https://github.com/dbus-cxx/dbus-cxx/pull/111] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - dbus-cxx/enums.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dbus-cxx/enums.h b/dbus-cxx/enums.h -index 8253a4b..c793fad 100644 ---- a/dbus-cxx/enums.h -+++ b/dbus-cxx/enums.h -@@ -5,6 +5,7 @@ - * * - * This file is part of the dbus-cxx library. * - ***************************************************************************/ -+#include <cstdint> - #include <ostream> - - #ifndef DBUSCXX_ENUMS_H --- -2.39.1 - diff --git a/meta-oe/recipes-core/dbus/dbus-daemon-proxy/0001-dbus-daemon-proxy-Return-DBUS_HANDLER_RESULT_NOT_YET.patch b/meta-oe/recipes-core/dbus/dbus-daemon-proxy/0001-dbus-daemon-proxy-Return-DBUS_HANDLER_RESULT_NOT_YET.patch index 1c2fc3813f..ebcb9e7e24 100644 --- a/meta-oe/recipes-core/dbus/dbus-daemon-proxy/0001-dbus-daemon-proxy-Return-DBUS_HANDLER_RESULT_NOT_YET.patch +++ b/meta-oe/recipes-core/dbus/dbus-daemon-proxy/0001-dbus-daemon-proxy-Return-DBUS_HANDLER_RESULT_NOT_YET.patch @@ -9,6 +9,8 @@ not be handled here Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + dbus-daemon-proxy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0001-pipe.c-Use-a-string-instead-of-char.patch b/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0001-pipe.c-Use-a-string-instead-of-char.patch index 6883f9a0b2..5710c867fa 100644 --- a/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0001-pipe.c-Use-a-string-instead-of-char.patch +++ b/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0001-pipe.c-Use-a-string-instead-of-char.patch @@ -8,6 +8,8 @@ error: invalid conversion from 'char' to 'const void*' [-fpermissive] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/pipe.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-core/emlog/emlog.inc b/meta-oe/recipes-core/emlog/emlog.inc index 824787083a..0972aff32c 100644 --- a/meta-oe/recipes-core/emlog/emlog.inc +++ b/meta-oe/recipes-core/emlog/emlog.inc @@ -3,8 +3,8 @@ most recent (and only the most recent) output from a process" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -SRC_URI = "git://github.com/nicupavel/emlog.git;protocol=http;branch=master;protocol=https" -SRCREV = "aee53e8dee862f35291242ba41b0ca88010f6c71" +SRC_URI = "git://github.com/nicupavel/emlog.git;protocol=https;branch=master" +SRCREV = "a9bbf324fde131ff4cf064e32674086c4ced4dca" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-core/emlog/emlog/Drop-use-of-error-h.patch b/meta-oe/recipes-core/emlog/emlog/Drop-use-of-error-h.patch index 6bfc44cb85..4c5a191ac4 100644 --- a/meta-oe/recipes-core/emlog/emlog/Drop-use-of-error-h.patch +++ b/meta-oe/recipes-core/emlog/emlog/Drop-use-of-error-h.patch @@ -10,6 +10,8 @@ friendly it makes sense to avoid glibc-specific code. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> --- +Upstream-Status: Pending + mkemlog.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/meta-oe/recipes-core/emlog/emlog_git.bb b/meta-oe/recipes-core/emlog/emlog_git.bb index 05fa0c334c..03c895f667 100644 --- a/meta-oe/recipes-core/emlog/emlog_git.bb +++ b/meta-oe/recipes-core/emlog/emlog_git.bb @@ -25,11 +25,9 @@ do_install() { RRECOMMENDS:${PN} += "kernel-module-emlog" -# The NVD database doesn't have a CPE for this product, -# the name of this product is exactly the same as github.com/emlog/emlog -# but it's not related in any way. The following CVEs are from that project -# so they can be safely ignored -CVE_CHECK_IGNORE += "\ +CVE_STATUS_GROUPS += "CVE_STATUS_EMLOG" +CVE_STATUS_EMLOG[status] = "fixed-version: The name of this product is exactly the same as github.com/emlog/emlog. CVE can be safely ignored." +CVE_STATUS_EMLOG = " \ CVE-2019-16868 \ CVE-2019-17073 \ CVE-2021-44584 \ diff --git a/meta-oe/recipes-core/glfw/glfw_3.3.8.bb b/meta-oe/recipes-core/glfw/glfw_3.3.8.bb new file mode 100644 index 0000000000..ad7a3a7ed4 --- /dev/null +++ b/meta-oe/recipes-core/glfw/glfw_3.3.8.bb @@ -0,0 +1,36 @@ +SUMMARY = "A multi-platform library for OpenGL, OpenGL ES, Vulkan, window and input" +HOMEPAGE = "https://www.glfw.org/" +DESCRIPTION = "GLFW is an Open Source, multi-platform library for OpenGL, \ +OpenGL ES and Vulkan application development. It provides a simple, \ +platform-independent API for creating windows, contexts and surfaces, reading \ +input, handling events, etc." +LICENSE = "Zlib" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=98d93d1ddc537f9b9ea6def64e046b5f" +SECTION = "lib" + +inherit pkgconfig cmake features_check + +PV .= "+git${SRCPV}" +SRCREV = "7482de6071d21db77a7236155da44c172a7f6c9e" +SRC_URI = "git://github.com/glfw/glfw.git;branch=3.3-stable;protocol=https" + +S = "${WORKDIR}/git" + +EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DGLFW_BUILD_DOCS=OFF" + +CFLAGS += "-fPIC" + +DEPENDS = "libpng zlib" +REQUIRED_DISTRO_FEATURES = "opengl x11" +ANY_OF_DISTRO_FEATURES = "wayland x11" + +# upstream considers x11 and wayland backends mutually exclusive and will +# prioritize wayland if it is enabled, but wayland has dependencies that cannot +# be satisfied by this layer so it is disabled by default + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" + +PACKAGECONFIG[wayland] = "-DGLFW_USE_WAYLAND=ON,,wayland wayland-native wayland-protocols extra-cmake-modules libxkbcommon" +PACKAGECONFIG[x11] = ",,libxrandr libxinerama libxi libxcursor libglu" + +COMPATIBLE_HOST:libc-musl = "null" diff --git a/meta-oe/recipes-core/glfw/glfw_3.3.bb b/meta-oe/recipes-core/glfw/glfw_3.3.bb deleted file mode 100644 index b31bba6b6b..0000000000 --- a/meta-oe/recipes-core/glfw/glfw_3.3.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "A multi-platform library for OpenGL, OpenGL ES, Vulkan, window and input" -HOMEPAGE = "https://www.glfw.org/" -DESCRIPTION = "GLFW is an Open Source, multi-platform library for OpenGL, \ -OpenGL ES and Vulkan application development. It provides a simple, \ -platform-independent API for creating windows, contexts and surfaces, reading \ -input, handling events, etc." -LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=98d93d1ddc537f9b9ea6def64e046b5f" -SECTION = "lib" - -inherit pkgconfig cmake features_check - -PV .= "+git${SRCPV}" -SRCREV = "781fbbadb0bccc749058177b1385c82da9ace880" -SRC_URI = "git://github.com/glfw/glfw.git;branch=master;protocol=https" - -S = "${WORKDIR}/git" - -EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DGLFW_BUILD_DOCS=OFF" - -CFLAGS += "-fPIC" - -DEPENDS = "libpng libglu zlib libxrandr libxinerama libxi libxcursor" -REQUIRED_DISTRO_FEATURES = "x11 opengl" - -COMPATIBLE_HOST:libc-musl = "null" diff --git a/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.74.0.bb b/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.74.0.bb index 5028a8bb8a..83ceb64581 100644 --- a/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.74.0.bb +++ b/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.74.0.bb @@ -17,13 +17,17 @@ SRC_URI[archive.sha256sum] = "2b472696cbac79db8e405724118ec945219c5b9b18af63dc8c S = "${WORKDIR}/${GNOMEBN}-${PV}" -do_install:append() { - for i in generate_wrap_init.pl gmmproc; do - sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/glibmm-2.68/proc/$i - done -} - FILES:${PN} = "${libdir}/lib*.so.*" FILES:${PN}-dev += "${datadir}/glibmm-* ${libdir}/${BPN}/include/ ${libdir}/${BPN}/proc/ ${libdir}/giomm-2.68/include/" RDEPENDS:${PN}-dev = "perl" + +EXTRA_OEMESON += "--cross-file=${WORKDIR}/meson-${PN}.cross -Dmaintainer-mode=false" + +do_write_config:append() { + cat >${WORKDIR}/meson-${PN}.cross <<EOF +[binaries] +m4 = '${bindir}/m4' +perl = '${bindir}/perl' +EOF +} diff --git a/meta-oe/recipes-core/glib-2.0/glibmm/remove-examples.patch b/meta-oe/recipes-core/glib-2.0/glibmm/remove-examples.patch deleted file mode 100644 index 42f2520175..0000000000 --- a/meta-oe/recipes-core/glib-2.0/glibmm/remove-examples.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 52360260c0d73a00082d867bc416225fbc2b657e Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Tue, 12 Jul 2011 11:46:37 +0200 -Subject: [PATCH] glibmm: add 2.28.2 - ---- - Makefile.am | 7 +------ - configure.ac | 1 - - 2 files changed, 1 insertion(+), 7 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 1b366b4..0ff58b5 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -23,12 +23,7 @@ src_subdirs = glib/src gio/src - else - src_subdirs = - endif --if ENABLE_DOCUMENTATION --doc_subdirs = docs --else --doc_subdirs = --endif --SUBDIRS = tools $(src_subdirs) glib/glibmm gio/giomm tests examples $(doc_subdirs) -+SUBDIRS = tools $(src_subdirs) glib/glibmm gio/giomm tests - - glibmm_includedir = $(includedir)/$(GLIBMM_MODULE_NAME) - glibmm_include_HEADERS = glib/glibmm.h -diff --git a/configure.ac b/configure.ac -index e706687..198e0d0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -166,7 +166,6 @@ AC_CONFIG_FILES([Makefile - gio/src/Makefile - gio/giomm/Makefile - tests/Makefile -- examples/Makefile - docs/Makefile - docs/reference/Doxyfile - MSVC_NMake/glibmm/glibmm.rc diff --git a/meta-oe/recipes-core/glib-2.0/glibmm_2.66.2.bb b/meta-oe/recipes-core/glib-2.0/glibmm_2.66.2.bb index f554a73fa6..a6dc8ff20c 100644 --- a/meta-oe/recipes-core/glib-2.0/glibmm_2.66.2.bb +++ b/meta-oe/recipes-core/glib-2.0/glibmm_2.66.2.bb @@ -15,13 +15,17 @@ SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI[archive.sha256sum] = "b2a4cd7b9ae987794cbb5a1becc10cecb65182b9bb841868625d6bbb123edb1d" -do_install:append() { - for i in generate_wrap_init.pl gmmproc; do - sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/glibmm-2.4/proc/$i - done -} - 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/" RDEPENDS:${PN}-dev = "perl" + +EXTRA_OEMESON += "--cross-file=${WORKDIR}/meson-${PN}.cross -Dmaintainer-mode=false" + +do_write_config:append() { + cat >${WORKDIR}/meson-${PN}.cross <<EOF +[binaries] +m4 = '${bindir}/m4' +perl = '${bindir}/perl' +EOF +} diff --git a/meta-oe/recipes-core/images/meta-oe-ptest-all-image.bb b/meta-oe/recipes-core/images/meta-oe-ptest-all-image.bb new file mode 100644 index 0000000000..0ea03dd2e3 --- /dev/null +++ b/meta-oe/recipes-core/images/meta-oe-ptest-all-image.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Recipe to trigger execution of all meta-oe ptest images." +HOMEPAGE = "https://www.openembedded.org/" + +LICENSE = "MIT" + +inherit features_check nopackages +REQUIRED_DISTRO_FEATURES = "ptest" + +require conf/include/ptest-packagelists-meta-oe.inc + +# Include the full set of ptests +PTESTS_META_OE = "${PTESTS_FAST_META_OE} ${PTESTS_SLOW_META_OE}" + +do_testimage[noexec] = "1" +do_testimage[depends] = "${@' '.join(['meta-oe-ptest-image-'+x+':do_testimage' for x in d.getVar('PTESTS_META_OE').split()])}" + +do_build[depends] = "${@' '.join(['meta-oe-ptest-image-'+x+':do_build' for x in d.getVar('PTESTS_META_OE').split()])}" + +# normally image.bbclass would do this +EXCLUDE_FROM_WORLD = "1" + +python () { + if bb.utils.contains('IMAGE_CLASSES', 'testimage', True, False, d): + bb.build.addtask("do_testimage", "", "", d) +} diff --git a/meta-oe/recipes-core/images/meta-oe-ptest-fast-image.bb b/meta-oe/recipes-core/images/meta-oe-ptest-fast-image.bb new file mode 100644 index 0000000000..f56e841ff1 --- /dev/null +++ b/meta-oe/recipes-core/images/meta-oe-ptest-fast-image.bb @@ -0,0 +1,6 @@ +require meta-oe-ptest-all-image.bb + +DESCRIPTION = "Recipe to trigger execution of all fast meta-oe ptest images." + +PTESTS_META_OE = "${PTESTS_FAST_META_OE}" + diff --git a/meta-oe/recipes-core/images/meta-oe-ptest-image.bb b/meta-oe/recipes-core/images/meta-oe-ptest-image.bb index 0166b9c41d..951d91f821 100644 --- a/meta-oe/recipes-core/images/meta-oe-ptest-image.bb +++ b/meta-oe/recipes-core/images/meta-oe-ptest-image.bb @@ -1,5 +1,41 @@ +inherit features_check +REQUIRED_DISTRO_FEATURES = "ptest" + +require conf/include/ptest-packagelists-meta-oe.inc + require meta-oe-image-base.bb SUMMARY = "meta-oe ptest test image" -IMAGE_INSTALL += "packagegroup-meta-oe" +DESCRIPTION += "Also including the ${MCNAME} ptest package." +HOMEPAGE = "https://www.openembedded.org/" + +PTESTS_META_OE = "${PTESTS_SLOW_META_OE} ${PTESTS_FAST_META_OE}" + +IMAGE_INSTALL:append = " ${MCNAME}-ptest openssh" + +BBCLASSEXTEND = "${@' '.join(['mcextend:'+x for x in d.getVar('PTESTS_META_OE').split()])}" + +# The image can be sufficiently large (~1.8GB) that we need to be careful that it fits in a live +# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the +# box) and explicitly add up to 1500MB. +IMAGE_OVERHEAD_FACTOR = "1.0" +IMAGE_ROOTFS_EXTRA_SPACE = "324288" +# If a particular ptest needs more space, it can be customized: +#IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend-<pn> = "1024288" + +# ptests need more memory than standard to avoid the OOM killer +QB_MEM = "-m 1024" +# If a particular ptest needs more memroy, it can be customized: +#QB_MEM:virtclass-mcextend-<pn> = "-m 4096" + +TEST_SUITES = "ping ssh parselogs ptest" + +# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places +PTEST_EXPECT_FAILURE = "1" + +python () { + if not d.getVar("MCNAME"): + raise bb.parse.SkipRecipe("No class extension set") +} + diff --git a/meta-oe/recipes-core/libxml/libxml++/libxml++_ptest.patch b/meta-oe/recipes-core/libxml/libxml++/libxml++_ptest.patch index dc6198fe98..2172c147c3 100644 --- a/meta-oe/recipes-core/libxml/libxml++/libxml++_ptest.patch +++ b/meta-oe/recipes-core/libxml/libxml++/libxml++_ptest.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/Makefile.am +++ b/Makefile.am @@ -40,5 +40,8 @@ EXTRA_DIST = \ diff --git a/meta-oe/recipes-core/mdbus2/mdbus2_git.bb b/meta-oe/recipes-core/mdbus2/mdbus2_git.bb index 07c5cc9394..c6db78b4ab 100644 --- a/meta-oe/recipes-core/mdbus2/mdbus2_git.bb +++ b/meta-oe/recipes-core/mdbus2/mdbus2_git.bb @@ -6,7 +6,7 @@ DEPENDS = "readline" PV = "2.3.3+git${SRCPV}" -SRC_URI = "git://github.com/freesmartphone/mdbus.git;protocol=http;branch=master;protocol=https \ +SRC_URI = "git://github.com/freesmartphone/mdbus.git;protocol=https;branch=master \ file://0001-Fix-arguments-in-GLib.DBusSignalCallback-for-Vala-0..patch \ " SRCREV = "28202692d0b441000f4ddb8f347f72d1355021aa" diff --git a/meta-oe/recipes-core/opencl/ocl-icd_2.3.1.bb b/meta-oe/recipes-core/opencl/ocl-icd_2.3.1.bb index 250cb6883b..b1980e3682 100644 --- a/meta-oe/recipes-core/opencl/ocl-icd_2.3.1.bb +++ b/meta-oe/recipes-core/opencl/ocl-icd_2.3.1.bb @@ -14,5 +14,7 @@ S = "${WORKDIR}/git" inherit autotools DEPENDS = "ruby-native" +PROVIDES = "virtual/opencl-icd" +RPROVIDES:${PN} = "virtual/opencl-icd" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-core/opencl/opencl-headers_git.bb b/meta-oe/recipes-core/opencl/opencl-headers_04.17.bb index 6374f45973..6ffaf68ea2 100644 --- a/meta-oe/recipes-core/opencl/opencl-headers_git.bb +++ b/meta-oe/recipes-core/opencl/opencl-headers_04.17.bb @@ -5,8 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SECTION = "base" S = "${WORKDIR}/git" -PV = "2022.09.30" -SRCREV = "a51354a85f41d203e755124ad51ae3425933df45" +SRCREV = "4fdcfb0ae675f2f63a9add9552e0af62c2b4ed30" SRC_URI = "git://github.com/KhronosGroup/OpenCL-Headers.git;branch=main;protocol=https" do_configure[noexec] = "1" diff --git a/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb b/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb index 67437732d8..fc04cb55f2 100644 --- a/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb +++ b/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb @@ -9,6 +9,7 @@ inherit pkgconfig cmake DEPENDS += "opencl-headers" PROVIDES = "virtual/opencl-icd" +RPROVIDES:${PN} = "virtual/opencl-icd" S = "${WORKDIR}/git" PV = "v2022.01.04+git${SRCPV}" diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 34689fb48b..0a88f37acf 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -448,8 +448,8 @@ RDEPENDS:packagegroup-meta-oe-extended:remove:mips = "sysdig" RDEPENDS:packagegroup-meta-oe-extended:remove:powerpc = "upm mraa minifi-cpp" RDEPENDS:packagegroup-meta-oe-extended:remove:powerpc64 = "upm mraa minifi-cpp" RDEPENDS:packagegroup-meta-oe-extended:remove:powerpc64le = "upm mraa sysdig" -RDEPENDS:packagegroup-meta-oe-extended:remove:riscv64 = "upm libleak libyang mraa sysdig tiptop" -RDEPENDS:packagegroup-meta-oe-extended:remove:riscv32 = "upm libleak libyang mraa sysdig tiptop" +RDEPENDS:packagegroup-meta-oe-extended:remove:riscv64 = "upm libleak mraa sysdig tiptop" +RDEPENDS:packagegroup-meta-oe-extended:remove:riscv32 = "upm libleak mraa sysdig tiptop" RDEPENDS:packagegroup-meta-oe-extended-python2 ="\ ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', 'openlmi-tools', '', d), "", d)} \ @@ -464,7 +464,7 @@ RDEPENDS:packagegroup-meta-oe-gnome ="\ gtk+ \ gtkmm3 \ gtkmm \ - libpeas \ + ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "libpeas", "", d)} \ pyxdg \ vte9 \ gnome-theme-adwaita \ @@ -488,7 +488,6 @@ RDEPENDS:packagegroup-meta-oe-graphics ="\ gphoto2 \ imlib2 \ libgphoto2 \ - graphene \ graphviz \ gtkwave \ jasper \ @@ -570,7 +569,6 @@ RDEPENDS:packagegroup-meta-oe-graphics ="\ xclock \ xfontsel \ xkbprint \ - xsetmode \ xlsatoms \ xlsclients \ xlsfonts \ @@ -596,9 +594,7 @@ RDEPENDS:packagegroup-meta-oe-graphics ="\ font-cursor-misc \ font-misc-misc \ xorg-fonts-100dpi \ - liblbxutil \ libxaw6 \ - libxkbui \ libxpresent \ xcb-util-cursor \ xserver-common \ @@ -642,7 +638,8 @@ RDEPENDS:packagegroup-meta-oe-kernel ="\ usbip-tools \ " RDEPENDS:packagegroup-meta-oe-kernel:append:x86 = " intel-speed-select ipmiutil pm-graph turbostat" -RDEPENDS:packagegroup-meta-oe-kernel:append:x86-64 = " intel-speed-select ipmiutil kpatch pm-graph turbostat bpftool" +RDEPENDS:packagegroup-meta-oe-kernel:append:x86-64 = " intel-speed-select ipmiutil pm-graph turbostat bpftool" +RDEPENDS:packagegroup-meta-oe-kernel:append:x86-64:libc-glibc = " kpatch" RDEPENDS:packagegroup-meta-oe-kernel:append:powerpc64 = " libpfm4" # Kernel-selftest does not build with 5.8 and its exluded from build too so until its fixed remove it @@ -668,7 +665,6 @@ RDEPENDS:packagegroup-meta-oe-multimedia ="\ jack-server \ jack-utils \ libass \ - libburn \ libcdio-paranoia \ libcdio \ ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "libmad", "", d)} \ @@ -982,6 +978,8 @@ RDEPENDS:packagegroup-meta-oe-ptest-packages = "\ libee-ptest \ poco-ptest \ cmocka-ptest \ + minicoredumper-ptest \ + hiredis-ptest \ " RDEPENDS:packagegroup-meta-oe-ptest-packages:append:x86 = " mcelog-ptest" RDEPENDS:packagegroup-meta-oe-ptest-packages:append:x86-64 = " mcelog-ptest" @@ -989,6 +987,7 @@ RDEPENDS:packagegroup-meta-oe-ptest-packages:append:x86-64 = " mcelog-ptest" RDEPENDS:packagegroup-meta-oe-ptest-packages:remove:riscv64 = "oprofile-ptest" RDEPENDS:packagegroup-meta-oe-ptest-packages:remove:riscv32 = "oprofile-ptest" RDEPENDS:packagegroup-meta-oe-ptest-packages:remove:arm = "numactl-ptest" +RDEPENDS:packagegroup-meta-oe-ptest-packages:remove:libc-musl = "minicoredumper-ptest" RDEPENDS:packagegroup-meta-oe-fortran-packages = "\ diff --git a/meta-oe/recipes-core/plymouth/files/0001-plymouth-Add-the-retain-splash-option.patch b/meta-oe/recipes-core/plymouth/files/0001-plymouth-Add-the-retain-splash-option.patch index ba2bf224a6..58838500bf 100644 --- a/meta-oe/recipes-core/plymouth/files/0001-plymouth-Add-the-retain-splash-option.patch +++ b/meta-oe/recipes-core/plymouth/files/0001-plymouth-Add-the-retain-splash-option.patch @@ -10,7 +10,7 @@ Adding the "retain-splash” option to tell plymouth to keep the boot splash’s contents on screen even after plymouth exits to make the splash screen show more friendly on the system which boots so fast. -Upstream-Status: Inappropriate[embedded specific] +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Mingli Yu <mingli.yu@windriver.com> --- diff --git a/meta-oe/recipes-core/plymouth/files/0001-systemd-switch-to-KillMode-mixed.patch b/meta-oe/recipes-core/plymouth/files/0001-systemd-switch-to-KillMode-mixed.patch deleted file mode 100644 index eb1c8db21c..0000000000 --- a/meta-oe/recipes-core/plymouth/files/0001-systemd-switch-to-KillMode-mixed.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 9d0f8b2e7bc2d1d2b0900fcdf119bb9a2cc4f474 Mon Sep 17 00:00:00 2001 -From: Ray Strode <rstrode@redhat.com> -Date: Tue, 25 Aug 2020 10:49:11 -0400 -Subject: [PATCH] systemd: switch to KillMode=mixed - -KillMode=none is deprecated, so we need to stop using it. - -For now, use `KillMode=mixed` and `IgnoreOnIsolate=true` instead. - -In the future, we should change plymouth to be able to exit and -start again without restarting the active animation, but that's -going to require some effort. - -https://gitlab.freedesktop.org/plymouth/plymouth/-/issues/123 - -Upstream-Status: Backport [https://gitlab.freedesktop.org/plymouth/plymouth/-/commit/9d0f8b2e7bc2d1d2b0900fcdf119bb9a2cc4f474] - -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - systemd-units/plymouth-start.service.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/systemd-units/plymouth-start.service.in b/systemd-units/plymouth-start.service.in -index 3d00cc6..830a62d 100644 ---- a/systemd-units/plymouth-start.service.in -+++ b/systemd-units/plymouth-start.service.in -@@ -6,11 +6,12 @@ After=systemd-vconsole-setup.service systemd-udev-trigger.service systemd-udevd. - Before=systemd-ask-password-plymouth.service - ConditionKernelCommandLine=!plymouth.enable=0 - ConditionVirtualization=!container -+IgnoreOnIsolate=true - - [Service] - ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session - ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash - Type=forking - RemainAfterExit=yes --KillMode=none -+KillMode=mixed - SendSIGKILL=no --- -2.17.1 - diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/static-libsystemd-pkgconfig.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/static-libsystemd-pkgconfig.patch index 1f0e911cfc..4f42308471 100644 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/static-libsystemd-pkgconfig.patch +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/static-libsystemd-pkgconfig.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/src/libsystemd/libsystemd.pc.in +++ b/src/libsystemd/libsystemd.pc.in @@ -16,5 +16,5 @@ Name: systemd diff --git a/meta-oe/recipes-core/uutils-coreutils/README.txt b/meta-oe/recipes-core/uutils-coreutils/README.txt deleted file mode 100644 index cfd7b051b1..0000000000 --- a/meta-oe/recipes-core/uutils-coreutils/README.txt +++ /dev/null @@ -1,19 +0,0 @@ -How to generate/update the file uutils-coreutils_XXX.bb: - -cargo with version > 1.60 is needed so cargo from Ubuntu's apt will not work -(because of https://github.com/rust-lang/cargo/issues/10623): -This package is needed (tested on Ubuntu 22.04): -sudo apt-get -y install librust-cargo+openssl-dev - -Then install cargo-bitbake with: -$ cargo install --locked cargo-bitbake - -You can now update coreutils: -$ git clone https://github.com/uutils/coreutils.git -$ cd coreutils -$ git tag -$ git checkout 0.0.XXX -$ cargo-bitbake bitbake -Wrote: coreutils_0.0.15.bb - -Verify manual changes in the bb file (rename coreutils.inc to uutils-coreutils.inc) diff --git a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc new file mode 100644 index 0000000000..39269d7a0f --- /dev/null +++ b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc @@ -0,0 +1,556 @@ +# Autogenerated with 'bitbake -c update_crates uutils-coreutils' + +# from Cargo.lock +SRC_URI += " \ + crate://crates.io/adler/1.0.2 \ + crate://crates.io/ahash/0.7.6 \ + crate://crates.io/aho-corasick/0.7.19 \ + crate://crates.io/aho-corasick/1.0.1 \ + crate://crates.io/android-tzdata/0.1.1 \ + crate://crates.io/android_system_properties/0.1.5 \ + crate://crates.io/anstream/0.3.2 \ + crate://crates.io/anstyle/1.0.0 \ + crate://crates.io/anstyle-parse/0.2.0 \ + crate://crates.io/anstyle-query/1.0.0 \ + crate://crates.io/anstyle-wincon/1.0.1 \ + crate://crates.io/arrayref/0.3.6 \ + crate://crates.io/arrayvec/0.7.2 \ + crate://crates.io/autocfg/1.1.0 \ + crate://crates.io/bigdecimal/0.4.0 \ + crate://crates.io/binary-heap-plus/0.5.0 \ + crate://crates.io/bindgen/0.63.0 \ + crate://crates.io/bitflags/1.3.2 \ + crate://crates.io/blake2b_simd/1.0.1 \ + crate://crates.io/blake3/1.4.0 \ + crate://crates.io/block-buffer/0.10.3 \ + crate://crates.io/bstr/1.6.0 \ + crate://crates.io/bumpalo/3.11.1 \ + crate://crates.io/bytecount/0.6.3 \ + crate://crates.io/byteorder/1.4.3 \ + crate://crates.io/cc/1.0.79 \ + crate://crates.io/cexpr/0.6.0 \ + crate://crates.io/cfg-if/1.0.0 \ + crate://crates.io/chrono/0.4.26 \ + crate://crates.io/clang-sys/1.4.0 \ + crate://crates.io/clap/4.3.0 \ + crate://crates.io/clap_builder/4.3.0 \ + crate://crates.io/clap_complete/4.3.0 \ + crate://crates.io/clap_lex/0.5.0 \ + crate://crates.io/clap_mangen/0.2.9 \ + crate://crates.io/colorchoice/1.0.0 \ + crate://crates.io/compare/0.1.0 \ + crate://crates.io/console/0.15.7 \ + crate://crates.io/const-random/0.1.15 \ + crate://crates.io/const-random-macro/0.1.15 \ + crate://crates.io/constant_time_eq/0.2.4 \ + crate://crates.io/conv/0.3.3 \ + crate://crates.io/core-foundation-sys/0.8.3 \ + crate://crates.io/coz/0.1.3 \ + crate://crates.io/cpp/0.5.7 \ + crate://crates.io/cpp_build/0.5.7 \ + crate://crates.io/cpp_common/0.5.7 \ + crate://crates.io/cpp_macros/0.5.7 \ + crate://crates.io/cpufeatures/0.2.5 \ + crate://crates.io/crc32fast/1.3.2 \ + crate://crates.io/crossbeam-channel/0.5.8 \ + crate://crates.io/crossbeam-deque/0.8.2 \ + crate://crates.io/crossbeam-epoch/0.9.14 \ + crate://crates.io/crossbeam-utils/0.8.15 \ + crate://crates.io/crossterm/0.26.1 \ + crate://crates.io/crossterm_winapi/0.9.0 \ + crate://crates.io/crunchy/0.2.2 \ + crate://crates.io/crypto-common/0.1.6 \ + crate://crates.io/ctrlc/3.4.0 \ + crate://crates.io/custom_derive/0.1.7 \ + crate://crates.io/data-encoding/2.4.0 \ + crate://crates.io/data-encoding-macro/0.1.13 \ + crate://crates.io/data-encoding-macro-internal/0.1.11 \ + crate://crates.io/diff/0.1.13 \ + crate://crates.io/digest/0.10.7 \ + crate://crates.io/dlv-list/0.5.0 \ + crate://crates.io/dns-lookup/2.0.2 \ + 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/errno/0.3.1 \ + crate://crates.io/errno-dragonfly/0.1.2 \ + crate://crates.io/exacl/0.10.0 \ + crate://crates.io/fastrand/1.8.0 \ + crate://crates.io/file_diff/1.0.0 \ + crate://crates.io/filetime/0.2.20 \ + crate://crates.io/flate2/1.0.24 \ + 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/fundu/1.2.0 \ + crate://crates.io/fundu-core/0.2.0 \ + crate://crates.io/futures/0.3.25 \ + crate://crates.io/futures-channel/0.3.25 \ + crate://crates.io/futures-core/0.3.25 \ + crate://crates.io/futures-executor/0.3.25 \ + crate://crates.io/futures-io/0.3.25 \ + crate://crates.io/futures-macro/0.3.25 \ + crate://crates.io/futures-sink/0.3.25 \ + crate://crates.io/futures-task/0.3.25 \ + crate://crates.io/futures-timer/3.0.2 \ + crate://crates.io/futures-util/0.3.25 \ + crate://crates.io/gcd/2.3.0 \ + 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.2.1 \ + crate://crates.io/hashbrown/0.12.3 \ + crate://crates.io/hashbrown/0.13.2 \ + crate://crates.io/hermit-abi/0.3.2 \ + crate://crates.io/hex/0.4.3 \ + crate://crates.io/hex-literal/0.4.1 \ + crate://crates.io/hostname/0.3.1 \ + 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/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/is-terminal/0.4.7 \ + crate://crates.io/itertools/0.11.0 \ + crate://crates.io/itoa/1.0.4 \ + crate://crates.io/js-sys/0.3.60 \ + crate://crates.io/keccak/0.1.4 \ + crate://crates.io/kqueue/1.0.7 \ + 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.147 \ + crate://crates.io/libloading/0.7.4 \ + crate://crates.io/libm/0.2.7 \ + crate://crates.io/linux-raw-sys/0.1.4 \ + crate://crates.io/linux-raw-sys/0.3.8 \ + crate://crates.io/lock_api/0.4.9 \ + crate://crates.io/log/0.4.17 \ + crate://crates.io/lscolors/0.14.0 \ + crate://crates.io/match_cfg/0.1.0 \ + crate://crates.io/md-5/0.10.5 \ + crate://crates.io/memchr/2.5.0 \ + crate://crates.io/memmap2/0.7.0 \ + crate://crates.io/memoffset/0.8.0 \ + crate://crates.io/minimal-lexical/0.2.1 \ + crate://crates.io/miniz_oxide/0.5.4 \ + crate://crates.io/mio/0.8.6 \ + crate://crates.io/nix/0.26.2 \ + crate://crates.io/nom/7.1.3 \ + crate://crates.io/notify/6.0.1 \ + crate://crates.io/nu-ansi-term/0.47.0 \ + crate://crates.io/num-bigint/0.4.3 \ + crate://crates.io/num-integer/0.1.45 \ + crate://crates.io/num-traits/0.2.15 \ + crate://crates.io/num_cpus/1.16.0 \ + crate://crates.io/num_threads/0.1.6 \ + crate://crates.io/number_prefix/0.4.0 \ + crate://crates.io/once_cell/1.18.0 \ + crate://crates.io/onig/6.4.0 \ + crate://crates.io/onig_sys/69.8.1 \ + crate://crates.io/ordered-multimap/0.6.0 \ + crate://crates.io/os_display/0.1.3 \ + crate://crates.io/parking_lot/0.12.1 \ + crate://crates.io/parking_lot_core/0.9.7 \ + crate://crates.io/parse_datetime/0.4.0 \ + crate://crates.io/peeking_take_while/0.1.2 \ + crate://crates.io/phf/0.11.2 \ + crate://crates.io/phf_codegen/0.11.2 \ + crate://crates.io/phf_generator/0.11.1 \ + crate://crates.io/phf_shared/0.11.2 \ + crate://crates.io/pin-project-lite/0.2.9 \ + crate://crates.io/pin-utils/0.1.0 \ + crate://crates.io/pkg-config/0.3.26 \ + crate://crates.io/platform-info/2.0.2 \ + crate://crates.io/portable-atomic/0.3.15 \ + crate://crates.io/ppv-lite86/0.2.17 \ + crate://crates.io/pretty_assertions/1.4.0 \ + crate://crates.io/proc-macro-hack/0.5.20+deprecated \ + crate://crates.io/proc-macro2/1.0.63 \ + crate://crates.io/procfs/0.15.1 \ + 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/rand/0.8.5 \ + crate://crates.io/rand_chacha/0.3.1 \ + crate://crates.io/rand_core/0.6.4 \ + crate://crates.io/rand_pcg/0.3.1 \ + crate://crates.io/rayon/1.7.0 \ + crate://crates.io/rayon-core/1.11.0 \ + crate://crates.io/redox_syscall/0.2.16 \ + crate://crates.io/redox_syscall/0.3.5 \ + crate://crates.io/reference-counted-singleton/0.1.2 \ + crate://crates.io/regex/1.9.1 \ + crate://crates.io/regex-automata/0.3.1 \ + crate://crates.io/regex-syntax/0.7.3 \ + crate://crates.io/relative-path/1.8.0 \ + crate://crates.io/rlimit/0.10.0 \ + crate://crates.io/roff/0.2.1 \ + crate://crates.io/rstest/0.18.1 \ + crate://crates.io/rstest_macros/0.18.1 \ + crate://crates.io/rust-ini/0.19.0 \ + crate://crates.io/rustc-hash/1.1.0 \ + crate://crates.io/rustc_version/0.4.0 \ + crate://crates.io/rustix/0.36.14 \ + crate://crates.io/rustix/0.37.19 \ + crate://crates.io/same-file/1.0.6 \ + crate://crates.io/scopeguard/1.1.0 \ + crate://crates.io/self_cell/1.0.1 \ + crate://crates.io/selinux/0.4.0 \ + crate://crates.io/selinux-sys/0.6.2 \ + crate://crates.io/semver/1.0.14 \ + crate://crates.io/serde/1.0.147 \ + crate://crates.io/sha1/0.10.5 \ + crate://crates.io/sha2/0.10.7 \ + crate://crates.io/sha3/0.10.8 \ + crate://crates.io/shlex/1.1.0 \ + crate://crates.io/signal-hook/0.3.15 \ + crate://crates.io/signal-hook-mio/0.2.3 \ + crate://crates.io/signal-hook-registry/1.4.0 \ + 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.11.0 \ + crate://crates.io/smawk/0.3.1 \ + crate://crates.io/socket2/0.5.3 \ + crate://crates.io/static_assertions/1.1.0 \ + crate://crates.io/strsim/0.10.0 \ + crate://crates.io/subtle/2.4.1 \ + crate://crates.io/syn/1.0.109 \ + crate://crates.io/syn/2.0.23 \ + crate://crates.io/tempfile/3.6.0 \ + crate://crates.io/term_grid/0.1.7 \ + crate://crates.io/terminal_size/0.2.6 \ + crate://crates.io/textwrap/0.16.0 \ + 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/tiny-keccak/2.0.2 \ + crate://crates.io/typenum/1.15.0 \ + crate://crates.io/unicode-ident/1.0.5 \ + crate://crates.io/unicode-linebreak/0.1.4 \ + crate://crates.io/unicode-segmentation/1.10.1 \ + crate://crates.io/unicode-width/0.1.10 \ + crate://crates.io/unicode-xid/0.2.4 \ + crate://crates.io/unindent/0.2.1 \ + crate://crates.io/utf8parse/0.2.1 \ + crate://crates.io/uuid/1.2.2 \ + crate://crates.io/version_check/0.9.4 \ + crate://crates.io/walkdir/2.3.2 \ + crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ + crate://crates.io/wasm-bindgen/0.2.83 \ + crate://crates.io/wasm-bindgen-backend/0.2.83 \ + crate://crates.io/wasm-bindgen-macro/0.2.83 \ + crate://crates.io/wasm-bindgen-macro-support/0.2.83 \ + crate://crates.io/wasm-bindgen-shared/0.2.83 \ + crate://crates.io/which/4.3.0 \ + crate://crates.io/wild/2.1.0 \ + 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-sys/0.45.0 \ + crate://crates.io/windows-sys/0.48.0 \ + crate://crates.io/windows-targets/0.42.2 \ + crate://crates.io/windows-targets/0.48.0 \ + crate://crates.io/windows_aarch64_gnullvm/0.42.2 \ + crate://crates.io/windows_aarch64_gnullvm/0.48.0 \ + crate://crates.io/windows_aarch64_msvc/0.42.2 \ + crate://crates.io/windows_aarch64_msvc/0.48.0 \ + crate://crates.io/windows_i686_gnu/0.42.2 \ + crate://crates.io/windows_i686_gnu/0.48.0 \ + crate://crates.io/windows_i686_msvc/0.42.2 \ + crate://crates.io/windows_i686_msvc/0.48.0 \ + crate://crates.io/windows_x86_64_gnu/0.42.2 \ + crate://crates.io/windows_x86_64_gnu/0.48.0 \ + crate://crates.io/windows_x86_64_gnullvm/0.42.2 \ + crate://crates.io/windows_x86_64_gnullvm/0.48.0 \ + crate://crates.io/windows_x86_64_msvc/0.42.2 \ + crate://crates.io/windows_x86_64_msvc/0.48.0 \ + crate://crates.io/xattr/1.0.0 \ + crate://crates.io/yansi/0.5.1 \ + crate://crates.io/z85/3.0.5 \ + crate://crates.io/zip/0.6.6 \ +" + +SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +SRC_URI[ahash-0.7.6.sha256sum] = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +SRC_URI[aho-corasick-0.7.19.sha256sum] = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +SRC_URI[aho-corasick-1.0.1.sha256sum] = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +SRC_URI[android-tzdata-0.1.1.sha256sum] = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" +SRC_URI[android_system_properties-0.1.5.sha256sum] = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +SRC_URI[anstream-0.3.2.sha256sum] = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +SRC_URI[anstyle-1.0.0.sha256sum] = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +SRC_URI[anstyle-parse-0.2.0.sha256sum] = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +SRC_URI[anstyle-query-1.0.0.sha256sum] = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +SRC_URI[anstyle-wincon-1.0.1.sha256sum] = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +SRC_URI[arrayref-0.3.6.sha256sum] = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" +SRC_URI[arrayvec-0.7.2.sha256sum] = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +SRC_URI[bigdecimal-0.4.0.sha256sum] = "5274a6b6e0ee020148397245b973e30163b7bffbc6d473613f850cb99888581e" +SRC_URI[binary-heap-plus-0.5.0.sha256sum] = "e4551d8382e911ecc0d0f0ffb602777988669be09447d536ff4388d1def11296" +SRC_URI[bindgen-0.63.0.sha256sum] = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" +SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +SRC_URI[blake2b_simd-1.0.1.sha256sum] = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc" +SRC_URI[blake3-1.4.0.sha256sum] = "729b71f35bd3fa1a4c86b85d32c8b9069ea7fe14f7a53cfabb65f62d4265b888" +SRC_URI[block-buffer-0.10.3.sha256sum] = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +SRC_URI[bstr-1.6.0.sha256sum] = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" +SRC_URI[bumpalo-3.11.1.sha256sum] = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +SRC_URI[bytecount-0.6.3.sha256sum] = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" +SRC_URI[byteorder-1.4.3.sha256sum] = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +SRC_URI[cc-1.0.79.sha256sum] = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +SRC_URI[cexpr-0.6.0.sha256sum] = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +SRC_URI[chrono-0.4.26.sha256sum] = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +SRC_URI[clang-sys-1.4.0.sha256sum] = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" +SRC_URI[clap-4.3.0.sha256sum] = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" +SRC_URI[clap_builder-4.3.0.sha256sum] = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" +SRC_URI[clap_complete-4.3.0.sha256sum] = "a04ddfaacc3bc9e6ea67d024575fafc2a813027cf374b8f24f7bc233c6b6be12" +SRC_URI[clap_lex-0.5.0.sha256sum] = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +SRC_URI[clap_mangen-0.2.9.sha256sum] = "bb0f09a0ca8f0dd8ac92c546b426f466ef19828185c6d504c80c48c9c2768ed9" +SRC_URI[colorchoice-1.0.0.sha256sum] = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +SRC_URI[compare-0.1.0.sha256sum] = "120133d4db2ec47efe2e26502ee984747630c67f51974fca0b6c1340cf2368d3" +SRC_URI[console-0.15.7.sha256sum] = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +SRC_URI[const-random-0.1.15.sha256sum] = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e" +SRC_URI[const-random-macro-0.1.15.sha256sum] = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" +SRC_URI[constant_time_eq-0.2.4.sha256sum] = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279" +SRC_URI[conv-0.3.3.sha256sum] = "78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299" +SRC_URI[core-foundation-sys-0.8.3.sha256sum] = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +SRC_URI[coz-0.1.3.sha256sum] = "cef55b3fe2f5477d59e12bc792e8b3c95a25bd099eadcfae006ecea136de76e2" +SRC_URI[cpp-0.5.7.sha256sum] = "dec5e86d4f6547f0218ad923d9508244a71ef83b763196e6698b4f70f3595185" +SRC_URI[cpp_build-0.5.7.sha256sum] = "16f4d303b8ec35fb3afd7e963e2c898117f1e49930becb703e4a7ac528ad2dd0" +SRC_URI[cpp_common-0.5.7.sha256sum] = "76071bb9c8c4dd2b5eb209907deab7b031323cf1be3dfdc6ec5d37f4f187d8a1" +SRC_URI[cpp_macros-0.5.7.sha256sum] = "7fdaa01904c12a8989dbfa110b41ef27efc432ac9934f691b9732f01cb64dc01" +SRC_URI[cpufeatures-0.2.5.sha256sum] = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +SRC_URI[crc32fast-1.3.2.sha256sum] = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +SRC_URI[crossbeam-channel-0.5.8.sha256sum] = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +SRC_URI[crossbeam-deque-0.8.2.sha256sum] = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +SRC_URI[crossbeam-epoch-0.9.14.sha256sum] = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +SRC_URI[crossbeam-utils-0.8.15.sha256sum] = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +SRC_URI[crossterm-0.26.1.sha256sum] = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" +SRC_URI[crossterm_winapi-0.9.0.sha256sum] = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c" +SRC_URI[crunchy-0.2.2.sha256sum] = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +SRC_URI[crypto-common-0.1.6.sha256sum] = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +SRC_URI[ctrlc-3.4.0.sha256sum] = "2a011bbe2c35ce9c1f143b7af6f94f29a167beb4cd1d29e6740ce836f723120e" +SRC_URI[custom_derive-0.1.7.sha256sum] = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9" +SRC_URI[data-encoding-2.4.0.sha256sum] = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +SRC_URI[data-encoding-macro-0.1.13.sha256sum] = "c904b33cc60130e1aeea4956ab803d08a3f4a0ca82d64ed757afac3891f2bb99" +SRC_URI[data-encoding-macro-internal-0.1.11.sha256sum] = "8fdf3fce3ce863539ec1d7fd1b6dcc3c645663376b43ed376bbf887733e4f772" +SRC_URI[diff-0.1.13.sha256sum] = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" +SRC_URI[digest-0.10.7.sha256sum] = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +SRC_URI[dlv-list-0.5.0.sha256sum] = "d529fd73d344663edfd598ccb3f344e46034db51ebd103518eae34338248ad73" +SRC_URI[dns-lookup-2.0.2.sha256sum] = "8f332aa79f9e9de741ac013237294ef42ce2e9c6394dc7d766725812f1238812" +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[errno-0.3.1.sha256sum] = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +SRC_URI[errno-dragonfly-0.1.2.sha256sum] = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +SRC_URI[exacl-0.10.0.sha256sum] = "1cfeb22a59deb24c3262c43ffcafd1eb807180f371f9fcc99098d181b5d639be" +SRC_URI[fastrand-1.8.0.sha256sum] = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +SRC_URI[file_diff-1.0.0.sha256sum] = "31a7a908b8f32538a2143e59a6e4e2508988832d5d4d6f7c156b3cbc762643a5" +SRC_URI[filetime-0.2.20.sha256sum] = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" +SRC_URI[flate2-1.0.24.sha256sum] = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +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[fundu-1.2.0.sha256sum] = "34804ed59f10b3a630c79822ebf7370b562b7281028369e9baa40547c17f8bdc" +SRC_URI[fundu-core-0.2.0.sha256sum] = "71a99190954ca83bade03ba054799b17a158ea948a6855c6bb8121adb6b49d9f" +SRC_URI[futures-0.3.25.sha256sum] = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +SRC_URI[futures-channel-0.3.25.sha256sum] = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +SRC_URI[futures-core-0.3.25.sha256sum] = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +SRC_URI[futures-executor-0.3.25.sha256sum] = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +SRC_URI[futures-io-0.3.25.sha256sum] = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +SRC_URI[futures-macro-0.3.25.sha256sum] = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +SRC_URI[futures-sink-0.3.25.sha256sum] = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +SRC_URI[futures-task-0.3.25.sha256sum] = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +SRC_URI[futures-timer-3.0.2.sha256sum] = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" +SRC_URI[futures-util-0.3.25.sha256sum] = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +SRC_URI[gcd-2.3.0.sha256sum] = "1d758ba1b47b00caf47f24925c0074ecb20d6dfcffe7f6d53395c0465674841a" +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.2.1.sha256sum] = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +SRC_URI[hashbrown-0.12.3.sha256sum] = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +SRC_URI[hashbrown-0.13.2.sha256sum] = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +SRC_URI[hermit-abi-0.3.2.sha256sum] = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +SRC_URI[hex-0.4.3.sha256sum] = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +SRC_URI[hex-literal-0.4.1.sha256sum] = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" +SRC_URI[hostname-0.3.1.sha256sum] = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +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[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[is-terminal-0.4.7.sha256sum] = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +SRC_URI[itertools-0.11.0.sha256sum] = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +SRC_URI[itoa-1.0.4.sha256sum] = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" +SRC_URI[js-sys-0.3.60.sha256sum] = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +SRC_URI[keccak-0.1.4.sha256sum] = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +SRC_URI[kqueue-1.0.7.sha256sum] = "2c8fc60ba15bf51257aa9807a48a61013db043fcf3a78cb0d916e8e396dcad98" +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.147.sha256sum] = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +SRC_URI[libloading-0.7.4.sha256sum] = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +SRC_URI[libm-0.2.7.sha256sum] = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +SRC_URI[linux-raw-sys-0.1.4.sha256sum] = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +SRC_URI[linux-raw-sys-0.3.8.sha256sum] = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +SRC_URI[lock_api-0.4.9.sha256sum] = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +SRC_URI[log-0.4.17.sha256sum] = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +SRC_URI[lscolors-0.14.0.sha256sum] = "18a9df1d1fb6d9e92fa043e9eb9a3ecf6892c7b542bae5137cd1e419e40aa8bf" +SRC_URI[match_cfg-0.1.0.sha256sum] = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" +SRC_URI[md-5-0.10.5.sha256sum] = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +SRC_URI[memchr-2.5.0.sha256sum] = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +SRC_URI[memmap2-0.7.0.sha256sum] = "180d4b35be83d33392d1d1bfbd2ae1eca7ff5de1a94d3fc87faaa99a069e7cbd" +SRC_URI[memoffset-0.8.0.sha256sum] = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" +SRC_URI[miniz_oxide-0.5.4.sha256sum] = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" +SRC_URI[mio-0.8.6.sha256sum] = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +SRC_URI[nix-0.26.2.sha256sum] = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +SRC_URI[notify-6.0.1.sha256sum] = "5738a2795d57ea20abec2d6d76c6081186709c0024187cd5977265eda6598b51" +SRC_URI[nu-ansi-term-0.47.0.sha256sum] = "1df031e117bca634c262e9bd3173776844b6c17a90b3741c9163663b4385af76" +SRC_URI[num-bigint-0.4.3.sha256sum] = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +SRC_URI[num-integer-0.1.45.sha256sum] = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +SRC_URI[num-traits-0.2.15.sha256sum] = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +SRC_URI[num_cpus-1.16.0.sha256sum] = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +SRC_URI[num_threads-0.1.6.sha256sum] = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +SRC_URI[number_prefix-0.4.0.sha256sum] = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" +SRC_URI[once_cell-1.18.0.sha256sum] = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +SRC_URI[onig-6.4.0.sha256sum] = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" +SRC_URI[onig_sys-69.8.1.sha256sum] = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" +SRC_URI[ordered-multimap-0.6.0.sha256sum] = "4ed8acf08e98e744e5384c8bc63ceb0364e68a6854187221c18df61c4797690e" +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.7.sha256sum] = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +SRC_URI[parse_datetime-0.4.0.sha256sum] = "fecceaede7767a9a98058687a321bc91742eff7670167a34104afb30fc8757df" +SRC_URI[peeking_take_while-0.1.2.sha256sum] = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" +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" +SRC_URI[phf_shared-0.11.2.sha256sum] = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +SRC_URI[pin-project-lite-0.2.9.sha256sum] = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +SRC_URI[pin-utils-0.1.0.sha256sum] = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +SRC_URI[pkg-config-0.3.26.sha256sum] = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +SRC_URI[platform-info-2.0.2.sha256sum] = "d6259c4860e53bf665016f1b2f46a8859cadfa717581dc9d597ae4069de6300f" +SRC_URI[portable-atomic-0.3.15.sha256sum] = "15eb2c6e362923af47e13c23ca5afb859e83d54452c55b0b9ac763b8f7c1ac16" +SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +SRC_URI[pretty_assertions-1.4.0.sha256sum] = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" +SRC_URI[proc-macro-hack-0.5.20+deprecated.sha256sum] = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" +SRC_URI[proc-macro2-1.0.63.sha256sum] = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +SRC_URI[procfs-0.15.1.sha256sum] = "943ca7f9f29bab5844ecd8fdb3992c5969b6622bb9609b9502fef9b4310e3f1f" +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[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[rand_pcg-0.3.1.sha256sum] = "59cad018caf63deb318e5a4586d99a24424a364f40f1e5778c29aca23f4fc73e" +SRC_URI[rayon-1.7.0.sha256sum] = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +SRC_URI[rayon-core-1.11.0.sha256sum] = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +SRC_URI[redox_syscall-0.2.16.sha256sum] = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +SRC_URI[redox_syscall-0.3.5.sha256sum] = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +SRC_URI[reference-counted-singleton-0.1.2.sha256sum] = "f1bfbf25d7eb88ddcbb1ec3d755d0634da8f7657b2cb8b74089121409ab8228f" +SRC_URI[regex-1.9.1.sha256sum] = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +SRC_URI[regex-automata-0.3.1.sha256sum] = "e9aaecc05d5c4b5f7da074b9a0d1a0867e71fd36e7fc0482d8bcfe8e8fc56290" +SRC_URI[regex-syntax-0.7.3.sha256sum] = "2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846" +SRC_URI[relative-path-1.8.0.sha256sum] = "4bf2521270932c3c7bed1a59151222bd7643c79310f2916f01925e1e16255698" +SRC_URI[rlimit-0.10.0.sha256sum] = "9b5b8be0bc0ef630d24f8fa836b3a3463479b2343b29f9a8fa905c71a8c7b69b" +SRC_URI[roff-0.2.1.sha256sum] = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" +SRC_URI[rstest-0.18.1.sha256sum] = "2b96577ca10cb3eade7b337eb46520108a67ca2818a24d0b63f41fd62bc9651c" +SRC_URI[rstest_macros-0.18.1.sha256sum] = "225e674cf31712b8bb15fdbca3ec0c1b9d825c5a24407ff2b7e005fb6a29ba03" +SRC_URI[rust-ini-0.19.0.sha256sum] = "7e2a3bcec1f113553ef1c88aae6c020a369d03d55b58de9869a0908930385091" +SRC_URI[rustc-hash-1.1.0.sha256sum] = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +SRC_URI[rustc_version-0.4.0.sha256sum] = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +SRC_URI[rustix-0.36.14.sha256sum] = "14e4d67015953998ad0eb82887a0eb0129e18a7e2f3b7b0f6c422fddcd503d62" +SRC_URI[rustix-0.37.19.sha256sum] = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +SRC_URI[same-file-1.0.6.sha256sum] = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +SRC_URI[scopeguard-1.1.0.sha256sum] = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +SRC_URI[self_cell-1.0.1.sha256sum] = "4c309e515543e67811222dbc9e3dd7e1056279b782e1dacffe4242b718734fb6" +SRC_URI[selinux-0.4.0.sha256sum] = "a00576725d21b588213fbd4af84cd7e4cc4304e8e9bd6c0f5a1498a3e2ca6a51" +SRC_URI[selinux-sys-0.6.2.sha256sum] = "806d381649bb85347189d2350728817418138d11d738e2482cb644ec7f3c755d" +SRC_URI[semver-1.0.14.sha256sum] = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" +SRC_URI[serde-1.0.147.sha256sum] = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +SRC_URI[sha1-0.10.5.sha256sum] = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +SRC_URI[sha2-0.10.7.sha256sum] = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +SRC_URI[sha3-0.10.8.sha256sum] = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" +SRC_URI[shlex-1.1.0.sha256sum] = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +SRC_URI[signal-hook-0.3.15.sha256sum] = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" +SRC_URI[signal-hook-mio-0.2.3.sha256sum] = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +SRC_URI[signal-hook-registry-1.4.0.sha256sum] = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +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.11.0.sha256sum] = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +SRC_URI[smawk-0.3.1.sha256sum] = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" +SRC_URI[socket2-0.5.3.sha256sum] = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +SRC_URI[static_assertions-1.1.0.sha256sum] = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +SRC_URI[strsim-0.10.0.sha256sum] = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +SRC_URI[subtle-2.4.1.sha256sum] = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +SRC_URI[syn-2.0.23.sha256sum] = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" +SRC_URI[tempfile-3.6.0.sha256sum] = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +SRC_URI[term_grid-0.1.7.sha256sum] = "230d3e804faaed5a39b08319efb797783df2fd9671b39b7596490cb486d702cf" +SRC_URI[terminal_size-0.2.6.sha256sum] = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" +SRC_URI[textwrap-0.16.0.sha256sum] = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +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[tiny-keccak-2.0.2.sha256sum] = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +SRC_URI[typenum-1.15.0.sha256sum] = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +SRC_URI[unicode-ident-1.0.5.sha256sum] = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +SRC_URI[unicode-linebreak-0.1.4.sha256sum] = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137" +SRC_URI[unicode-segmentation-1.10.1.sha256sum] = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +SRC_URI[unicode-width-0.1.10.sha256sum] = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +SRC_URI[unicode-xid-0.2.4.sha256sum] = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +SRC_URI[unindent-0.2.1.sha256sum] = "5aa30f5ea51ff7edfc797c6d3f9ec8cbd8cfedef5371766b7181d33977f4814f" +SRC_URI[utf8parse-0.2.1.sha256sum] = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +SRC_URI[uuid-1.2.2.sha256sum] = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" +SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +SRC_URI[walkdir-2.3.2.sha256sum] = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +SRC_URI[wasm-bindgen-0.2.83.sha256sum] = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +SRC_URI[wasm-bindgen-backend-0.2.83.sha256sum] = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +SRC_URI[wasm-bindgen-macro-0.2.83.sha256sum] = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +SRC_URI[wasm-bindgen-macro-support-0.2.83.sha256sum] = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +SRC_URI[wasm-bindgen-shared-0.2.83.sha256sum] = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +SRC_URI[which-4.3.0.sha256sum] = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" +SRC_URI[wild-2.1.0.sha256sum] = "05b116685a6be0c52f5a103334cbff26db643826c7b3735fc0a3ba9871310a74" +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-sys-0.45.0.sha256sum] = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +SRC_URI[windows-sys-0.48.0.sha256sum] = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +SRC_URI[windows-targets-0.42.2.sha256sum] = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +SRC_URI[windows-targets-0.48.0.sha256sum] = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +SRC_URI[windows_aarch64_gnullvm-0.42.2.sha256sum] = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +SRC_URI[windows_aarch64_gnullvm-0.48.0.sha256sum] = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +SRC_URI[windows_aarch64_msvc-0.42.2.sha256sum] = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +SRC_URI[windows_aarch64_msvc-0.48.0.sha256sum] = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +SRC_URI[windows_i686_gnu-0.42.2.sha256sum] = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +SRC_URI[windows_i686_gnu-0.48.0.sha256sum] = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +SRC_URI[windows_i686_msvc-0.42.2.sha256sum] = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +SRC_URI[windows_i686_msvc-0.48.0.sha256sum] = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +SRC_URI[windows_x86_64_gnu-0.42.2.sha256sum] = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +SRC_URI[windows_x86_64_gnu-0.48.0.sha256sum] = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +SRC_URI[windows_x86_64_gnullvm-0.42.2.sha256sum] = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +SRC_URI[windows_x86_64_gnullvm-0.48.0.sha256sum] = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +SRC_URI[windows_x86_64_msvc-0.42.2.sha256sum] = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +SRC_URI[windows_x86_64_msvc-0.48.0.sha256sum] = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +SRC_URI[xattr-1.0.0.sha256sum] = "ea263437ca03c1522846a4ddafbca2542d0ad5ed9b784909d4b27b76f62bc34a" +SRC_URI[yansi-0.5.1.sha256sum] = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" +SRC_URI[z85-3.0.5.sha256sum] = "2a599daf1b507819c1121f0bf87fa37eb19daac6aff3aefefd4e6e2e0f2020fc" +SRC_URI[zip-0.6.6.sha256sum] = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" diff --git a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils.inc b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils.inc index 68cfa8178c..973b722ba3 100644 --- a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils.inc +++ b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils.inc @@ -1,4 +1,3 @@ -# This file contains content which was not automatically generated using cargo-bitbake on the cargo.toml file of uutils-coreutils # Copyright (c) 2022, Snap Inc. # Released under the MIT license (see COPYING.MIT for the terms) diff --git a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.17.bb b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.17.bb deleted file mode 100644 index 61d7c8c063..0000000000 --- a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.17.bb +++ /dev/null @@ -1,303 +0,0 @@ -# Auto-Generated by cargo-bitbake 0.3.16 -# -inherit cargo - -# If this is git based prefer versioned ones if they exist -# DEFAULT_PREFERENCE = "-1" - -# how to get coreutils could be as easy as but default to a git checkout: -# SRC_URI += "crate://crates.io/coreutils/0.0.17" -SRC_URI += "git://github.com/uutils/coreutils.git;protocol=https;nobranch=1" -SRCREV = "7e127005afbd6c3632d74ad8082340ccb8329d67" -S = "${WORKDIR}/git" -CARGO_SRC_DIR = "" - - -# please note if you have entries that do not begin with crate:// -# you must change them to how that package can be fetched -SRC_URI += " \ - crate://crates.io/Inflector/0.11.4 \ - crate://crates.io/adler/1.0.2 \ - crate://crates.io/ahash/0.7.6 \ - crate://crates.io/aho-corasick/0.7.19 \ - crate://crates.io/aliasable/0.1.3 \ - crate://crates.io/android_system_properties/0.1.5 \ - crate://crates.io/arrayref/0.3.6 \ - crate://crates.io/arrayvec/0.7.2 \ - crate://crates.io/atty/0.2.14 \ - crate://crates.io/autocfg/1.1.0 \ - crate://crates.io/bigdecimal/0.3.0 \ - crate://crates.io/binary-heap-plus/0.5.0 \ - crate://crates.io/bindgen/0.62.0 \ - crate://crates.io/bitflags/1.3.2 \ - crate://crates.io/blake2b_simd/1.0.0 \ - crate://crates.io/blake3/1.3.2 \ - crate://crates.io/block-buffer/0.10.3 \ - crate://crates.io/bstr/1.0.1 \ - crate://crates.io/bumpalo/3.11.1 \ - crate://crates.io/bytecount/0.6.3 \ - crate://crates.io/byteorder/1.4.3 \ - crate://crates.io/cc/1.0.77 \ - crate://crates.io/cexpr/0.6.0 \ - crate://crates.io/cfg-if/1.0.0 \ - crate://crates.io/chrono/0.4.23 \ - crate://crates.io/clang-sys/1.4.0 \ - crate://crates.io/clap/4.0.26 \ - crate://crates.io/clap_complete/4.0.6 \ - crate://crates.io/clap_lex/0.3.0 \ - crate://crates.io/codespan-reporting/0.11.1 \ - crate://crates.io/compare/0.1.0 \ - crate://crates.io/console/0.15.2 \ - crate://crates.io/constant_time_eq/0.1.5 \ - crate://crates.io/constant_time_eq/0.2.4 \ - crate://crates.io/conv/0.3.3 \ - crate://crates.io/core-foundation-sys/0.8.3 \ - crate://crates.io/coz/0.1.3 \ - crate://crates.io/cpp/0.5.7 \ - crate://crates.io/cpp_build/0.5.7 \ - crate://crates.io/cpp_common/0.5.7 \ - crate://crates.io/cpp_macros/0.5.7 \ - crate://crates.io/cpufeatures/0.2.5 \ - crate://crates.io/crc32fast/1.3.2 \ - crate://crates.io/crossbeam-channel/0.5.6 \ - crate://crates.io/crossbeam-deque/0.8.2 \ - crate://crates.io/crossbeam-epoch/0.9.12 \ - crate://crates.io/crossbeam-utils/0.8.13 \ - crate://crates.io/crossterm/0.25.0 \ - crate://crates.io/crossterm_winapi/0.9.0 \ - crate://crates.io/crunchy/0.2.2 \ - crate://crates.io/crypto-common/0.1.6 \ - crate://crates.io/ctor/0.1.26 \ - crate://crates.io/ctrlc/3.2.3 \ - crate://crates.io/custom_derive/0.1.7 \ - crate://crates.io/cxx-build/1.0.82 \ - crate://crates.io/cxx/1.0.82 \ - crate://crates.io/cxxbridge-flags/1.0.82 \ - crate://crates.io/cxxbridge-macro/1.0.82 \ - crate://crates.io/data-encoding-macro-internal/0.1.10 \ - crate://crates.io/data-encoding-macro/0.1.12 \ - crate://crates.io/data-encoding/2.3.2 \ - crate://crates.io/diff/0.1.13 \ - crate://crates.io/digest/0.10.6 \ - crate://crates.io/dlv-list/0.3.0 \ - crate://crates.io/dns-lookup/1.0.8 \ - crate://crates.io/dunce/1.0.3 \ - 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/errno-dragonfly/0.1.2 \ - crate://crates.io/errno/0.2.8 \ - crate://crates.io/exacl/0.9.0 \ - crate://crates.io/fastrand/1.8.0 \ - crate://crates.io/file_diff/1.0.0 \ - crate://crates.io/filetime/0.2.18 \ - crate://crates.io/flate2/1.0.24 \ - crate://crates.io/fnv/1.0.7 \ - crate://crates.io/fs_extra/1.2.0 \ - crate://crates.io/fsevent-sys/4.1.0 \ - crate://crates.io/fts-sys/0.2.3 \ - crate://crates.io/futures-channel/0.3.25 \ - crate://crates.io/futures-core/0.3.25 \ - crate://crates.io/futures-executor/0.3.25 \ - crate://crates.io/futures-io/0.3.25 \ - crate://crates.io/futures-macro/0.3.25 \ - crate://crates.io/futures-sink/0.3.25 \ - crate://crates.io/futures-task/0.3.25 \ - crate://crates.io/futures-timer/3.0.2 \ - crate://crates.io/futures-util/0.3.25 \ - crate://crates.io/futures/0.3.25 \ - crate://crates.io/gcd/2.1.0 \ - crate://crates.io/generic-array/0.14.6 \ - crate://crates.io/getrandom/0.2.8 \ - crate://crates.io/glob/0.3.0 \ - crate://crates.io/half/2.1.0 \ - crate://crates.io/hashbrown/0.12.3 \ - crate://crates.io/heck/0.4.0 \ - crate://crates.io/hermit-abi/0.1.19 \ - crate://crates.io/hex-literal/0.3.4 \ - crate://crates.io/hex/0.4.3 \ - crate://crates.io/hostname/0.3.1 \ - crate://crates.io/iana-time-zone-haiku/0.1.1 \ - crate://crates.io/iana-time-zone/0.1.53 \ - crate://crates.io/indicatif/0.17.2 \ - crate://crates.io/inotify-sys/0.1.5 \ - crate://crates.io/inotify/0.9.6 \ - crate://crates.io/instant/0.1.12 \ - crate://crates.io/io-lifetimes/0.7.5 \ - crate://crates.io/itertools/0.10.5 \ - crate://crates.io/itoa/1.0.4 \ - crate://crates.io/js-sys/0.3.60 \ - crate://crates.io/keccak/0.1.3 \ - crate://crates.io/kqueue-sys/1.0.3 \ - crate://crates.io/kqueue/1.0.7 \ - crate://crates.io/lazy_static/1.4.0 \ - crate://crates.io/lazycell/1.3.0 \ - crate://crates.io/libc/0.2.137 \ - crate://crates.io/libloading/0.7.4 \ - crate://crates.io/link-cplusplus/1.0.7 \ - crate://crates.io/linux-raw-sys/0.0.46 \ - crate://crates.io/lock_api/0.4.9 \ - crate://crates.io/log/0.4.17 \ - crate://crates.io/lscolors/0.13.0 \ - crate://crates.io/match_cfg/0.1.0 \ - crate://crates.io/md-5/0.10.5 \ - crate://crates.io/memchr/2.5.0 \ - crate://crates.io/memmap2/0.5.8 \ - crate://crates.io/memoffset/0.6.5 \ - crate://crates.io/memoffset/0.7.1 \ - crate://crates.io/minimal-lexical/0.2.1 \ - crate://crates.io/miniz_oxide/0.5.4 \ - crate://crates.io/mio/0.8.5 \ - crate://crates.io/nix/0.25.0 \ - crate://crates.io/nom/7.1.1 \ - crate://crates.io/notify/5.0.0 \ - crate://crates.io/nu-ansi-term/0.46.0 \ - crate://crates.io/num-bigint/0.4.3 \ - crate://crates.io/num-integer/0.1.45 \ - crate://crates.io/num-traits/0.2.15 \ - crate://crates.io/num_cpus/1.14.0 \ - crate://crates.io/num_threads/0.1.6 \ - crate://crates.io/number_prefix/0.4.0 \ - crate://crates.io/once_cell/1.16.0 \ - crate://crates.io/onig/6.4.0 \ - crate://crates.io/onig_sys/69.8.1 \ - crate://crates.io/ordered-multimap/0.4.3 \ - crate://crates.io/os_display/0.1.3 \ - crate://crates.io/os_str_bytes/6.4.1 \ - crate://crates.io/ouroboros/0.15.5 \ - crate://crates.io/ouroboros_macro/0.15.5 \ - crate://crates.io/output_vt100/0.1.3 \ - crate://crates.io/overload/0.1.1 \ - crate://crates.io/parking_lot/0.12.1 \ - crate://crates.io/parking_lot_core/0.9.4 \ - crate://crates.io/paste/1.0.9 \ - crate://crates.io/peeking_take_while/0.1.2 \ - crate://crates.io/phf/0.11.1 \ - crate://crates.io/phf_codegen/0.11.1 \ - crate://crates.io/phf_generator/0.11.1 \ - crate://crates.io/phf_shared/0.11.1 \ - crate://crates.io/pin-project-lite/0.2.9 \ - crate://crates.io/pin-utils/0.1.0 \ - crate://crates.io/pkg-config/0.3.26 \ - crate://crates.io/platform-info/1.0.2 \ - crate://crates.io/portable-atomic/0.3.15 \ - crate://crates.io/ppv-lite86/0.2.17 \ - crate://crates.io/pretty_assertions/1.3.0 \ - crate://crates.io/proc-macro-error-attr/1.0.4 \ - crate://crates.io/proc-macro-error/1.0.4 \ - crate://crates.io/proc-macro2/1.0.47 \ - crate://crates.io/procfs/0.14.1 \ - crate://crates.io/quick-error/2.0.1 \ - crate://crates.io/quickcheck/1.0.3 \ - crate://crates.io/quote/1.0.21 \ - 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/rand_pcg/0.3.1 \ - crate://crates.io/rayon-core/1.10.1 \ - crate://crates.io/rayon/1.6.0 \ - crate://crates.io/redox_syscall/0.2.16 \ - crate://crates.io/reference-counted-singleton/0.1.2 \ - crate://crates.io/regex-automata/0.1.10 \ - crate://crates.io/regex-syntax/0.6.28 \ - crate://crates.io/regex/1.7.0 \ - crate://crates.io/remove_dir_all/0.5.3 \ - crate://crates.io/remove_dir_all/0.7.0 \ - crate://crates.io/retain_mut/0.1.7 \ - crate://crates.io/rlimit/0.8.3 \ - crate://crates.io/rstest/0.16.0 \ - crate://crates.io/rstest_macros/0.16.0 \ - crate://crates.io/rust-ini/0.18.0 \ - crate://crates.io/rustc-hash/1.1.0 \ - crate://crates.io/rustc_version/0.4.0 \ - crate://crates.io/rustix/0.35.13 \ - crate://crates.io/rustversion/1.0.9 \ - crate://crates.io/same-file/1.0.6 \ - crate://crates.io/scopeguard/1.1.0 \ - crate://crates.io/scratch/1.0.2 \ - crate://crates.io/selinux-sys/0.6.1 \ - crate://crates.io/selinux/0.3.1 \ - crate://crates.io/semver/1.0.14 \ - crate://crates.io/serde/1.0.147 \ - crate://crates.io/sha1/0.10.5 \ - crate://crates.io/sha2/0.10.6 \ - crate://crates.io/sha3/0.10.6 \ - crate://crates.io/shlex/1.1.0 \ - crate://crates.io/signal-hook-mio/0.2.3 \ - crate://crates.io/signal-hook-registry/1.4.0 \ - crate://crates.io/signal-hook/0.3.14 \ - crate://crates.io/siphasher/0.3.10 \ - crate://crates.io/slab/0.4.7 \ - crate://crates.io/smallvec/1.10.0 \ - crate://crates.io/smawk/0.3.1 \ - crate://crates.io/socket2/0.4.7 \ - crate://crates.io/strsim/0.10.0 \ - crate://crates.io/strum/0.24.1 \ - crate://crates.io/strum_macros/0.24.3 \ - crate://crates.io/subtle/2.4.1 \ - crate://crates.io/syn/1.0.103 \ - crate://crates.io/tempfile/3.3.0 \ - crate://crates.io/term_grid/0.1.7 \ - crate://crates.io/termcolor/1.1.3 \ - crate://crates.io/terminal_size/0.1.17 \ - crate://crates.io/terminal_size/0.2.2 \ - crate://crates.io/textwrap/0.16.0 \ - crate://crates.io/thiserror-impl/1.0.37 \ - crate://crates.io/thiserror/1.0.37 \ - crate://crates.io/time-core/0.1.0 \ - crate://crates.io/time-macros/0.2.6 \ - crate://crates.io/time/0.3.17 \ - crate://crates.io/typenum/1.15.0 \ - crate://crates.io/unicode-ident/1.0.5 \ - crate://crates.io/unicode-linebreak/0.1.4 \ - crate://crates.io/unicode-segmentation/1.10.0 \ - crate://crates.io/unicode-width/0.1.10 \ - crate://crates.io/unicode-xid/0.2.4 \ - crate://crates.io/unindent/0.1.10 \ - crate://crates.io/users/0.11.0 \ - crate://crates.io/utf-8/0.7.6 \ - crate://crates.io/uuid/1.2.2 \ - crate://crates.io/version_check/0.9.4 \ - crate://crates.io/walkdir/2.3.2 \ - crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ - crate://crates.io/wasm-bindgen-backend/0.2.83 \ - crate://crates.io/wasm-bindgen-macro-support/0.2.83 \ - crate://crates.io/wasm-bindgen-macro/0.2.83 \ - crate://crates.io/wasm-bindgen-shared/0.2.83 \ - crate://crates.io/wasm-bindgen/0.2.83 \ - crate://crates.io/which/4.3.0 \ - crate://crates.io/wild/2.1.0 \ - 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/winapi/0.3.9 \ - crate://crates.io/windows-sys/0.42.0 \ - crate://crates.io/windows_aarch64_gnullvm/0.42.0 \ - crate://crates.io/windows_aarch64_msvc/0.42.0 \ - crate://crates.io/windows_i686_gnu/0.42.0 \ - crate://crates.io/windows_i686_msvc/0.42.0 \ - crate://crates.io/windows_x86_64_gnu/0.42.0 \ - crate://crates.io/windows_x86_64_gnullvm/0.42.0 \ - crate://crates.io/windows_x86_64_msvc/0.42.0 \ - crate://crates.io/xattr/0.2.3 \ - crate://crates.io/yansi/0.5.1 \ - crate://crates.io/z85/3.0.5 \ - crate://crates.io/zip/0.6.3 \ -" - - - -# FIXME: update generateme with the real MD5 of the license file -LIC_FILES_CHKSUM = " \ - file://LICENSE;md5=41f7469eaacac62c67d5664fff2c062d \ -" - -SUMMARY = "coreutils ~ GNU coreutils (updated); implemented as universal (cross-platform) utils, written in Rust" -HOMEPAGE = "https://github.com/uutils/coreutils" -LICENSE = "MIT" - -# includes this file if it exists but does not fail -# this is useful for anything you may want to override from -# what cargo-bitbake generates. -include uutils-coreutils-${PV}.inc -include uutils-coreutils.inc diff --git a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.20.bb b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.20.bb new file mode 100644 index 0000000000..0614416690 --- /dev/null +++ b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.20.bb @@ -0,0 +1,19 @@ +SUMMARY = "coreutils ~ GNU coreutils (updated); implemented as universal (cross-platform) utils, written in Rust" +HOMEPAGE = "https://github.com/uutils/coreutils" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=41f7469eaacac62c67d5664fff2c062d" + +inherit cargo cargo-update-recipe-crates + +SRC_URI += "git://github.com/uutils/coreutils.git;protocol=https;nobranch=1" + +# musl not supported because the libc crate does not support functions like "endutxent" at the moment, +# so src/uucore/src/lib/features.rs disables utmpx when targetting musl. +COMPATIBLE_HOST:libc-musl = "null" + +SRCREV = "8093d81dac0fb87ff3984ba9fe22ab171e630443" +S = "${WORKDIR}/git" + +require ${BPN}-crates.inc + +include uutils-coreutils.inc diff --git a/meta-oe/recipes-crypto/cryptsetup/cryptsetup/0001-Replace-off64_t-with-off_t.patch b/meta-oe/recipes-crypto/cryptsetup/cryptsetup/0001-Replace-off64_t-with-off_t.patch deleted file mode 100644 index 23aa86c0fb..0000000000 --- a/meta-oe/recipes-crypto/cryptsetup/cryptsetup/0001-Replace-off64_t-with-off_t.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 683d0c525765415be34c269edf9cc066276f9f65 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 18 Dec 2022 13:53:51 -0800 -Subject: [PATCH] Replace off64_t with off_t - -AC_SYS_LARGEFILE autoconf macro is in use in configure script which will -add needed feature macros on commandline to enable 64bit off_t. - -Also replace lseek64 with lseek, since it will be same when -_FILE_OFFSET_BITS=64 is defined on relevant platforms via AC_SYS_LARGEFILE - -Upstream-Status: Submitted [https://gitlab.com/cryptsetup/cryptsetup/-/merge_requests/467] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - lib/utils.c | 4 ++-- - lib/utils_wipe.c | 4 ++-- - src/utils_reencrypt_luks1.c | 12 ++++++------ - 3 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/lib/utils.c b/lib/utils.c -index 9d79ee29..be5f5287 100644 ---- a/lib/utils.c -+++ b/lib/utils.c -@@ -102,9 +102,9 @@ static int keyfile_seek(int fd, uint64_t bytes) - char tmp[BUFSIZ]; - size_t next_read; - ssize_t bytes_r; -- off64_t r; -+ off_t r; - -- r = lseek64(fd, bytes, SEEK_CUR); -+ r = lseek(fd, bytes, SEEK_CUR); - if (r > 0) - return 0; - if (r < 0 && errno != ESPIPE) -diff --git a/lib/utils_wipe.c b/lib/utils_wipe.c -index 285a9e77..0c376f44 100644 ---- a/lib/utils_wipe.c -+++ b/lib/utils_wipe.c -@@ -150,7 +150,7 @@ static int wipe_block(struct crypt_device *cd, int devfd, crypt_wipe_pattern pat - if (blockdev && pattern == CRYPT_WIPE_ZERO && - !wipe_zeroout(cd, devfd, offset, wipe_block_size)) { - /* zeroout ioctl does not move offset */ -- if (lseek64(devfd, offset + wipe_block_size, SEEK_SET) < 0) { -+ if (lseek(devfd, offset + wipe_block_size, SEEK_SET) < 0) { - log_err(cd, _("Cannot seek to device offset.")); - return -EINVAL; - } -@@ -221,7 +221,7 @@ int crypt_wipe_device(struct crypt_device *cd, - if (r) - goto out; - -- if (lseek64(devfd, offset, SEEK_SET) < 0) { -+ if (lseek(devfd, offset, SEEK_SET) < 0) { - log_err(cd, _("Cannot seek to device offset.")); - r = -EINVAL; - goto out; -diff --git a/src/utils_reencrypt_luks1.c b/src/utils_reencrypt_luks1.c -index 96368bdb..d83a1da4 100644 ---- a/src/utils_reencrypt_luks1.c -+++ b/src/utils_reencrypt_luks1.c -@@ -729,8 +729,8 @@ static int copy_data_forward(struct reenc_ctx *rc, int fd_old, int fd_new, - - log_dbg("Reencrypting in forward direction."); - -- if (lseek64(fd_old, rc->device_offset, SEEK_SET) < 0 || -- lseek64(fd_new, rc->device_offset, SEEK_SET) < 0) { -+ if (lseek(fd_old, rc->device_offset, SEEK_SET) < 0 || -+ lseek(fd_new, rc->device_offset, SEEK_SET) < 0) { - log_err(_("Cannot seek to device offset.")); - goto out; - } -@@ -788,7 +788,7 @@ static int copy_data_backward(struct reenc_ctx *rc, int fd_old, int fd_new, - size_t block_size, void *buf, uint64_t *bytes) - { - ssize_t s1, s2, working_block; -- off64_t working_offset; -+ off_t working_offset; - int r = -EIO; - char *backing_file = NULL; - struct tools_progress_params prog_parms = { -@@ -827,8 +827,8 @@ static int copy_data_backward(struct reenc_ctx *rc, int fd_old, int fd_new, - working_block = block_size; - } - -- if (lseek64(fd_old, working_offset, SEEK_SET) < 0 || -- lseek64(fd_new, working_offset, SEEK_SET) < 0) { -+ if (lseek(fd_old, working_offset, SEEK_SET) < 0 || -+ lseek(fd_new, working_offset, SEEK_SET) < 0) { - log_err(_("Cannot seek to device offset.")); - goto out; - } -@@ -874,7 +874,7 @@ static void zero_rest_of_device(int fd, size_t block_size, void *buf, - - log_dbg("Zeroing rest of device."); - -- if (lseek64(fd, offset, SEEK_SET) < 0) { -+ if (lseek(fd, offset, SEEK_SET) < 0) { - log_dbg("Cannot seek to device offset."); - return; - } diff --git a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.6.0.bb b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.6.1.bb index 1d4f440871..2935221400 100644 --- a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.6.0.bb +++ b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.6.1.bb @@ -19,10 +19,8 @@ DEPENDS = " \ 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 \ - file://0001-Replace-off64_t-with-off_t.patch \ - " -SRC_URI[sha256sum] = "44397ba76e75a9cde5b02177bc63cd7af428a785788e3a7067733e7761842735" +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz" +SRC_URI[sha256sum] = "410ded65a1072ab9c8e41added37b9729c087fef4d2db02bb4ef529ad6da4693" inherit autotools gettext pkgconfig diff --git a/meta-oe/recipes-crypto/libtomcrypt/libtomcrypt/CVE-2019-17362.patch b/meta-oe/recipes-crypto/libtomcrypt/libtomcrypt/CVE-2019-17362.patch new file mode 100644 index 0000000000..8b7348a11f --- /dev/null +++ b/meta-oe/recipes-crypto/libtomcrypt/libtomcrypt/CVE-2019-17362.patch @@ -0,0 +1,25 @@ +From 25c26a3b7a9ad8192ccc923e15cf62bf0108ef94 Mon Sep 17 00:00:00 2001 +From: werew <werew@ret2libc.com> +Date: Thu, 3 Oct 2019 19:57:10 +0200 +Subject: [PATCH] Fixes #507 + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- +Upstream-Status: Backport [https://github.com/libtom/libtomcrypt/commit/64d1153e5a515740ab56f39c46baf4cf6991a9d3] + + src/pk/asn1/der/utf8/der_decode_utf8_string.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/pk/asn1/der/utf8/der_decode_utf8_string.c b/src/pk/asn1/der/utf8/der_decode_utf8_string.c +index 94555b99f..d3ed82bea 100644 +--- a/src/pk/asn1/der/utf8/der_decode_utf8_string.c ++++ b/src/pk/asn1/der/utf8/der_decode_utf8_string.c +@@ -65,7 +65,7 @@ int der_decode_utf8_string(const unsigned char *in, unsigned long inlen, + /* count number of bytes */ + for (z = 0; (tmp & 0x80) && (z <= 4); z++, tmp = (tmp << 1) & 0xFF); + +- if (z > 4 || (x + (z - 1) > inlen)) { ++ if (z == 1 || z > 4 || (x + (z - 1) > inlen)) { + return CRYPT_INVALID_PACKET; + } + diff --git a/meta-oe/recipes-crypto/libtomcrypt/libtomcrypt_1.18.2.bb b/meta-oe/recipes-crypto/libtomcrypt/libtomcrypt_1.18.2.bb index 357fd0ab8d..5479007d92 100644 --- a/meta-oe/recipes-crypto/libtomcrypt/libtomcrypt_1.18.2.bb +++ b/meta-oe/recipes-crypto/libtomcrypt/libtomcrypt_1.18.2.bb @@ -1,21 +1,41 @@ SUMMARY = "LibTomCrypt is a public domain open source cryptographic toolkit" HOMEPAGE = "https://www.libtom.net/LibTomCrypt" SECTION = "libs" +# Unlicense isn't very accurate for this revision, it was WTFPL in 0.18.0-rc1: +# https://github.com/libtom/libtomcrypt/commit/77e31fb6a980212e90b9a50f116dc5a7bd91e527 +# then updated to dual license PD and WTFPL also in 0.18.0-rc1: +# https://github.com/libtom/libtomcrypt/commit/412b2ee1fccc3a0df58f93f372c90d6d0f93bfc9 +# and then updated again to Unlicense after the 0.18.2 tag (it's only in develop branch): +# https://github.com/libtom/libtomcrypt/commit/3630bee6fc0f73dd9c7923fd43f8ae15a2c0fb70 +# but keep using Unlicense to avoid triggering people with WTFPL license: +# https://groups.google.com/g/libtom/c/17Z7xkECULM +# and this comment can be removed next time libtomcrypt is updated LICENSE = "Unlicense" LIC_FILES_CHKSUM = "file://LICENSE;md5=71baacc459522324ef3e2b9e052e8180" -DEPENDS += "libtool-cross" +DEPENDS = "libtool-cross" -SRC_URI = "git://github.com/libtom/libtomcrypt.git;protocol=https;branch=master" +SRC_URI = "git://github.com/libtom/libtomcrypt.git;protocol=https;branch=master \ + file://CVE-2019-17362.patch \ +" SRCREV = "7e7eb695d581782f04b24dc444cbfde86af59853" S = "${WORKDIR}/git" +inherit pkgconfig + +PACKAGECONFIG ??= "ltm" +PACKAGECONFIG[ltm] = ",,libtommath" + +CFLAGS += "${@bb.utils.contains('PACKAGECONFIG', 'ltm', '-DUSE_LTM -DLTM_DESC', '', d)}" + +EXTRA_OEMAKE = "'PREFIX=${prefix}' 'DESTDIR=${D}' 'LIBPATH=${libdir}' 'CFLAGS=${CFLAGS}'" + do_compile() { oe_runmake -f makefile.shared } do_install() { - oe_runmake -f makefile.shared 'PREFIX=${prefix}' 'DESTDIR=${D}' install + oe_runmake -f makefile.shared install } diff --git a/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.29.0.bb b/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.29.0.bb index a34a4b9140..d17ac1e7e1 100644 --- a/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.29.0.bb +++ b/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.29.0.bb @@ -18,8 +18,9 @@ LIC_FILES_CHKSUM = " \ SRC_URI = "git://github.com/OpenSC/${BPN}.git;branch=master;protocol=https" S = "${WORKDIR}/git" -# v1.27 -SRCREV = "2306f896c2f3c147792300155316fd65825aabad" +# master +SRCREV = "f23911037d9790a3f3a3447a78d31a6362358e21" +PV .= "+1.30.0+git${SRCPV}" UPSTREAM_CHECK_GITTAGREGEX = "pkcs11-helper-(?P<pver>\d+(\.\d+)+)" diff --git a/meta-oe/recipes-dbs/influxdb/influxdb/0001-patch-term-module-for-mips-ispeed-ospeed-termios-abs.patch b/meta-oe/recipes-dbs/influxdb/influxdb/0001-patch-term-module-for-mips-ispeed-ospeed-termios-abs.patch index b8d355706c..b05fd3666b 100644 --- a/meta-oe/recipes-dbs/influxdb/influxdb/0001-patch-term-module-for-mips-ispeed-ospeed-termios-abs.patch +++ b/meta-oe/recipes-dbs/influxdb/influxdb/0001-patch-term-module-for-mips-ispeed-ospeed-termios-abs.patch @@ -3,7 +3,7 @@ From: Khem Raj <raj.khem@gmail.com> Date: Mon, 11 Jan 2021 15:16:57 -0800 Subject: [PATCH] patch term module for mips ispeed/ospeed termios absense -Upstream-Status: OE-Specific [needed on mips] +Upstream-Status: Inappropriate [OE-Specific needed on mips] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- diff --git a/meta-oe/recipes-dbs/lmdb/files/0001-Makefile-use-libprefix-instead-of-libdir.patch b/meta-oe/recipes-dbs/lmdb/files/0001-Makefile-use-libprefix-instead-of-libdir.patch index 2cc98e6d62..3017bcede1 100644 --- a/meta-oe/recipes-dbs/lmdb/files/0001-Makefile-use-libprefix-instead-of-libdir.patch +++ b/meta-oe/recipes-dbs/lmdb/files/0001-Makefile-use-libprefix-instead-of-libdir.patch @@ -10,6 +10,8 @@ to be configurable. Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> --- +Upstream-Status: Pending + libraries/liblmdb/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-dbs/lmdb/files/0001-make-set-soname-on-liblmdb.patch b/meta-oe/recipes-dbs/lmdb/files/0001-make-set-soname-on-liblmdb.patch index 312809d1d2..3dde46573f 100644 --- a/meta-oe/recipes-dbs/lmdb/files/0001-make-set-soname-on-liblmdb.patch +++ b/meta-oe/recipes-dbs/lmdb/files/0001-make-set-soname-on-liblmdb.patch @@ -4,6 +4,8 @@ Date: Thu, 25 Aug 2022 17:22:20 -0400 Subject: [PATCH] make: set soname on liblmdb --- +Upstream-Status: Pending + libraries/liblmdb/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb b/meta-oe/recipes-dbs/lmdb/lmdb_0.9.31.bb index a76d388d70..b2f1920f6b 100644 --- a/meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb +++ b/meta-oe/recipes-dbs/lmdb/lmdb_0.9.31.bb @@ -14,18 +14,18 @@ SRC_URI = "git://github.com/LMDB/lmdb.git;nobranch=1;protocol=https \ file://0001-make-set-soname-on-liblmdb.patch;patchdir=../.. \ " -SRCREV = "8ad7be2510414b9506ec9f9e24f24d04d9b04a1a" +SRCREV = "ce201088de95d26fc0da36ba805bf2ddc2ba74ff" inherit ptest S = "${WORKDIR}/git/libraries/liblmdb" do_compile() { - oe_runmake CC="${CC}" SOEXT=".so.${PV}" LDFLAGS="${LDFLAGS}" + oe_runmake CC="${CC}" SOEXT=".so.${PV}" LDFLAGS="${LDFLAGS}" XCFLAGS="${CFLAGS}" } do_install() { - oe_runmake CC="${CC}" DESTDIR="${D}" prefix="${prefix}" libprefix="${libdir}" manprefix="${mandir}" SOEXT=".so.${PV}" LDFLAGS="${LDFLAGS}" install + oe_runmake CC="${CC}" DESTDIR="${D}" prefix="${prefix}" libprefix="${libdir}" manprefix="${mandir}" SOEXT=".so.${PV}" LDFLAGS="${LDFLAGS}" XCFLAGS="${CFLAGS}" install cd ${D}${libdir} ln -s liblmdb.so.${PV} liblmdb.so rm liblmdb.a diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.1.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.4.bb index 578357b480..578357b480 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.1.bb +++ b/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.4.bb diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 1a47d91105..2fb0bd7be5 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -25,7 +25,7 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ " SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch" -SRC_URI[sha256sum] = "ffacf84e74daf249ad64b9573d79a4e882f66b004614f8b33bfcb14a8e25da1d" +SRC_URI[sha256sum] = "ce8dac125568cc5f40da74c17212767c92d8faed81066580b526a485a591127d" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" @@ -110,6 +110,11 @@ OECMAKE_GENERATOR = "Unix Makefiles" ARM_INSTRUCTION_SET:armv4 = "arm" ARM_INSTRUCTION_SET:armv5 = "arm" +do_compile:prepend:class-target () { + # remove the buildpath + sed -i -e "s:CMAKE_SYSROOT:CMAKE_SYSROOT_PLACE_HOLDER:g" ${S}/libmariadb/mariadb_config/mariadb_config.c.in +} + do_configure:append() { # handle distros with different values of ${libexecdir} libexecdir2=`echo ${libexecdir} | sed -e 's+/usr/++g'` @@ -140,6 +145,7 @@ do_compile:prepend:class-target () { echo "#endif" >>${B}/include/openssl/kssl.h fi fi + install -D ${RECIPE_SYSROOT_NATIVE}/usr/bin/uca-dump ${B}/strings/uca-dump } SYSROOT_PREPROCESS_FUNCS += "mariadb_sysroot_preprocess" diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch index 7c37fef493..12fbd75976 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch @@ -1,4 +1,4 @@ -From 6e376601c990abaa5e261d1311f92acb3b370b8f Mon Sep 17 00:00:00 2001 +From 68100b1f2243304289b9a9a35e8fb0e1bb0cf70f Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 24 Jan 2023 21:40:43 -0800 Subject: [PATCH] Add missing includes <cstdint> and <cstdio> @@ -9,17 +9,16 @@ This is needed with GCC 13 and newer [1] Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> --- .../rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h | 1 + storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h | 1 + .../rocksdb/rocksdb/table/block_based/data_block_hash_index.h | 1 + storage/rocksdb/rocksdb/util/slice.cc | 1 + - storage/rocksdb/rocksdb/util/string_util.h | 1 + - tpool/aio_linux.cc | 1 + - 6 files changed, 6 insertions(+) + 4 files changed, 4 insertions(+) diff --git a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h -index 963c1d8eb49..73487edd96d 100644 +index 963c1d8e..73487edd 100644 --- a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h +++ b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h @@ -5,6 +5,7 @@ @@ -31,7 +30,7 @@ index 963c1d8eb49..73487edd96d 100644 struct CompactionIterationStats { diff --git a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h -index c7f93b4cfcd..3c2ab80535a 100644 +index c7f93b4c..3c2ab805 100644 --- a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h +++ b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h @@ -8,6 +8,7 @@ @@ -43,7 +42,7 @@ index c7f93b4cfcd..3c2ab80535a 100644 #include <vector> #include "rocksdb/status.h" diff --git a/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h -index f356395f329..3215221755d 100644 +index f356395f..32152217 100644 --- a/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h +++ b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h @@ -5,6 +5,7 @@ @@ -55,7 +54,7 @@ index f356395f329..3215221755d 100644 #include <vector> diff --git a/storage/rocksdb/rocksdb/util/slice.cc b/storage/rocksdb/rocksdb/util/slice.cc -index 6db11cc947a..c26b6a21a57 100644 +index 6db11cc9..c26b6a21 100644 --- a/storage/rocksdb/rocksdb/util/slice.cc +++ b/storage/rocksdb/rocksdb/util/slice.cc @@ -8,6 +8,7 @@ @@ -66,30 +65,6 @@ index 6db11cc947a..c26b6a21a57 100644 #include "rocksdb/slice_transform.h" #include "rocksdb/slice.h" #include "util/string_util.h" -diff --git a/storage/rocksdb/rocksdb/util/string_util.h b/storage/rocksdb/rocksdb/util/string_util.h -index a761be66c52..064d059f08f 100644 ---- a/storage/rocksdb/rocksdb/util/string_util.h -+++ b/storage/rocksdb/rocksdb/util/string_util.h -@@ -6,6 +6,7 @@ - - #pragma once - -+#include <cstdint> - #include <sstream> - #include <string> - #include <unordered_map> -diff --git a/tpool/aio_linux.cc b/tpool/aio_linux.cc -index 10234e0e46a..a6adf1af257 100644 ---- a/tpool/aio_linux.cc -+++ b/tpool/aio_linux.cc -@@ -18,6 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 - 1301 USA*/ - - # include <thread> - # include <atomic> -+# include <cstdio> - # include <libaio.h> - # include <sys/syscall.h> - -- -2.39.1 +2.25.1 diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch index 6d9352fe86..d8671b76b0 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch @@ -6,6 +6,8 @@ Subject: [PATCH] Fix library LZ4 lookup. Signed-off-by: Sumit Garg <sumit.garg@linaro.org> Signed-off-by: Mingli Yu <mingli.yu@windriver.com> --- +Upstream-Status: Pending + cmake/FindLZ4.cmake | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-aio_linux-Check-if-syscall-exists-before-using-it.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-aio_linux-Check-if-syscall-exists-before-using-it.patch index 6ed174113b..aba9b9d966 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/0001-aio_linux-Check-if-syscall-exists-before-using-it.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-aio_linux-Check-if-syscall-exists-before-using-it.patch @@ -13,6 +13,8 @@ tpool/aio_linux.cc:63:20: error: '__NR_io_getevents' was not declared in this sc Upstream-Staus: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + tpool/aio_linux.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-oe/recipes-dbs/mysql/mariadb/lfs64.patch b/meta-oe/recipes-dbs/mysql/mariadb/lfs64.patch index 9867908c6c..7a685a6521 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/lfs64.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/lfs64.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/storage/connect/os.h +++ b/storage/connect/os.h @@ -2,13 +2,15 @@ diff --git a/meta-oe/recipes-dbs/mysql/mariadb/mm_malloc.patch b/meta-oe/recipes-dbs/mysql/mariadb/mm_malloc.patch index 347fcd8516..6aa6c84882 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/mm_malloc.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/mm_malloc.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/storage/rocksdb/rocksdb/port/jemalloc_helper.h +++ b/storage/rocksdb/rocksdb/port/jemalloc_helper.h @@ -5,7 +5,7 @@ diff --git a/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch b/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch index a4deee6070..3787b74ad1 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Remove glibc specific function dependencies Sourced from: https://git.alpinelinux.org/aports/tree/main/mariadb/ppc-remove-glibc-dep.patch diff --git a/meta-oe/recipes-dbs/mysql/mariadb/support-files-CMakeLists.txt-fix-do_populate_sysroot.patch b/meta-oe/recipes-dbs/mysql/mariadb/support-files-CMakeLists.txt-fix-do_populate_sysroot.patch index 4f9a4e9b0e..233d9e6af6 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/support-files-CMakeLists.txt-fix-do_populate_sysroot.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/support-files-CMakeLists.txt-fix-do_populate_sysroot.patch @@ -7,7 +7,7 @@ Comment out the logic which for suse as it introduces below do_populate_sysroot error: ERROR: mariadb-native-10.3.13-r0 do_populate_sysroot: sstate found an absolute path symlink /build/tmp/work/x86_64-linux/mariadb-native/10.3.13-r0/sysroot-destdir/build/tmp/work/x86_64-linux/mariadb-native/10.3.13-r0/recipe-sysroot-native/usr/sbin/rcmysql pointing at /build/tmp/work/x86_64-linux/mariadb-native/10.3.13-r0/recipe-sysroot-native/etc/init.d/mysql. Please replace this with a relative link. -Upstream-Status: Inappropriate[oe build specific] +Upstream-Status: Inappropriate [oe build specific] Signed-off-by: Mingli Yu <mingli.yu@windriver.com> diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.11.1.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.11.4.bb index 87faabfa27..87faabfa27 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb_10.11.1.bb +++ b/meta-oe/recipes-dbs/mysql/mariadb_10.11.4.bb diff --git a/meta-oe/recipes-dbs/postgresql/files/0001-Add-support-for-RISC-V.patch b/meta-oe/recipes-dbs/postgresql/files/0001-Add-support-for-RISC-V.patch index 90b7419495..7a4ba9897c 100644 --- a/meta-oe/recipes-dbs/postgresql/files/0001-Add-support-for-RISC-V.patch +++ b/meta-oe/recipes-dbs/postgresql/files/0001-Add-support-for-RISC-V.patch @@ -6,11 +6,13 @@ Subject: [PATCH] Add support for RISC-V. The architecture is sufficiently similar to aarch64 that simply extending the existing aarch64 macro works. --- - src/include/storage/s_lock.h | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) +Upstream-Status: Pending + + src/include/storage/s_lock.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h -index dccbd29..ad60429 100644 +index 4d3ffc7..22e27bf 100644 --- a/src/include/storage/s_lock.h +++ b/src/include/storage/s_lock.h @@ -317,11 +317,12 @@ tas(volatile slock_t *lock) @@ -27,15 +29,16 @@ index dccbd29..ad60429 100644 #ifdef HAVE_GCC__SYNC_INT32_TAS #define HAS_TEST_AND_SET -@@ -338,7 +339,7 @@ tas(volatile slock_t *lock) - #define S_UNLOCK(lock) __sync_lock_release(lock) +@@ -355,8 +356,7 @@ spin_delay(void) + #endif /* __aarch64__ || __aarch64 */ #endif /* HAVE_GCC__SYNC_INT32_TAS */ -#endif /* __arm__ || __arm || __aarch64__ || __aarch64 */ +- +#endif /* __arm__ || __arm || __aarch64__ || __aarch64 || __riscv */ - - /* + /* S/390 and S/390x Linux (32- and 64-bit zSeries) */ + #if defined(__s390__) || defined(__s390x__) -- 2.34.1 diff --git a/meta-oe/recipes-dbs/postgresql/files/0001-configure.ac-bypass-autoconf-2.69-version-check.patch b/meta-oe/recipes-dbs/postgresql/files/0001-configure.ac-bypass-autoconf-2.69-version-check.patch index 4a576d7172..3c8187d1a2 100644 --- a/meta-oe/recipes-dbs/postgresql/files/0001-configure.ac-bypass-autoconf-2.69-version-check.patch +++ b/meta-oe/recipes-dbs/postgresql/files/0001-configure.ac-bypass-autoconf-2.69-version-check.patch @@ -1,4 +1,4 @@ -From 258c6bd2ad96f2c42f1cb5f4c84e4ca5865059f0 Mon Sep 17 00:00:00 2001 +From 5f9dedc91a0a9710033fa155ea759f765ce5b58b Mon Sep 17 00:00:00 2001 From: Yi Fan Yu <yifan.yu@windriver.com> Date: Fri, 5 Feb 2021 17:15:42 -0500 Subject: [PATCH] configure.ac: bypass autoconf 2.69 version check @@ -14,17 +14,17 @@ Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> 1 file changed, 4 deletions(-) diff --git a/configure.ac b/configure.ac -index ffe878e..c39799b 100644 +index 998ff31..912e490 100644 --- a/configure.ac +++ b/configure.ac @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros - AC_INIT([PostgreSQL], [14.5], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) + AC_INIT([PostgreSQL], [15.3], [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 -recommended. You can remove the check from 'configure.ac' but it is then -your responsibility whether the result works or not.])]) - AC_COPYRIGHT([Copyright (c) 1996-2021, PostgreSQL Global Development Group]) + AC_COPYRIGHT([Copyright (c) 1996-2022, PostgreSQL Global Development Group]) AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) AC_CONFIG_AUX_DIR(config) diff --git a/meta-oe/recipes-dbs/postgresql/files/0001-postgresql-fix-ptest-failure-of-sysviews.patch b/meta-oe/recipes-dbs/postgresql/files/0001-postgresql-fix-ptest-failure-of-sysviews.patch new file mode 100644 index 0000000000..4db36d26fd --- /dev/null +++ b/meta-oe/recipes-dbs/postgresql/files/0001-postgresql-fix-ptest-failure-of-sysviews.patch @@ -0,0 +1,42 @@ +From 9f81377dddfe32d950844d7053020a36b40fce08 Mon Sep 17 00:00:00 2001 +From: Manoj Saun <manojsingh.saun@windriver.com> +Date: Wed, 22 Mar 2023 08:07:26 +0000 +Subject: [PATCH] postgresql: fix ptest failure of sysviews + +The patch "0001-config_info.c-not-expose-build-info.patch" hides the debug info +in pg_config table which reduces the count of rows from pg_config and leads to +sysviews test failure. +To fix it we need to reduce the count of parameters in sysviews test. +Also we need to reduce the row count in expected result of sysview test +to make the test output shown as pass. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Manoj Saun <manojsingh.saun@windriver.com> +--- + src/test/regress/expected/sysviews.out | 2 +- + src/test/regress/sql/sysviews.sql | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/src/test/regress/expected/sysviews.out ++++ b/src/test/regress/expected/sysviews.out +@@ -29,7 +29,7 @@ select name, ident, parent, level, total + (1 row) + + -- At introduction, pg_config had 23 entries; it may grow +-select count(*) > 20 as ok from pg_config; ++select count(*) > 13 as ok from pg_config; + ok + ---- + t +--- a/src/test/regress/sql/sysviews.sql ++++ b/src/test/regress/sql/sysviews.sql +@@ -18,7 +18,7 @@ select name, ident, parent, level, total + from pg_backend_memory_contexts where level = 0; + + -- At introduction, pg_config had 23 entries; it may grow +-select count(*) > 20 as ok from pg_config; ++select count(*) > 13 as ok from pg_config; + + -- We expect no cursors in this test; see also portals.sql + select count(*) = 0 as ok from pg_cursors; diff --git a/meta-oe/recipes-dbs/postgresql/files/remove_duplicate.patch b/meta-oe/recipes-dbs/postgresql/files/remove_duplicate.patch deleted file mode 100644 index 92a3dcc710..0000000000 --- a/meta-oe/recipes-dbs/postgresql/files/remove_duplicate.patch +++ /dev/null @@ -1,38 +0,0 @@ -Remove duplicate code for riscv - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- a/src/include/storage/s_lock.h -+++ b/src/include/storage/s_lock.h -@@ -341,30 +341,6 @@ tas(volatile slock_t *lock) - #endif /* HAVE_GCC__SYNC_INT32_TAS */ - #endif /* __arm__ || __arm || __aarch64__ || __aarch64 || __riscv */ - -- --/* -- * RISC-V likewise uses __sync_lock_test_and_set(int *, int) if available. -- */ --#if defined(__riscv) --#ifdef HAVE_GCC__SYNC_INT32_TAS --#define HAS_TEST_AND_SET -- --#define TAS(lock) tas(lock) -- --typedef int slock_t; -- --static __inline__ int --tas(volatile slock_t *lock) --{ -- return __sync_lock_test_and_set(lock, 1); --} -- --#define S_UNLOCK(lock) __sync_lock_release(lock) -- --#endif /* HAVE_GCC__SYNC_INT32_TAS */ --#endif /* __riscv */ -- -- - /* S/390 and S/390x Linux (32- and 64-bit zSeries) */ - #if defined(__s390__) || defined(__s390x__) - #define HAS_TEST_AND_SET diff --git a/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-oe/recipes-dbs/postgresql/postgresql.inc index 60d44ce979..15ecdeeb2e 100644 --- a/meta-oe/recipes-dbs/postgresql/postgresql.inc +++ b/meta-oe/recipes-dbs/postgresql/postgresql.inc @@ -36,7 +36,7 @@ LEAD_SONAME = "libpq.so" # LDFLAGS for shared libraries export LDFLAGS_SL = "${LDFLAGS}" -inherit autotools pkgconfig perlnative python3native python3targetconfig useradd update-rc.d systemd gettext cpan-base +inherit autotools pkgconfig perlnative python3native python3targetconfig useradd update-rc.d systemd gettext cpan-base multilib_header CFLAGS += "-I${STAGING_INCDIR}/${PYTHON_DIR} -I${STAGING_INCDIR}/tcl8.6" @@ -183,6 +183,7 @@ INITSCRIPT_PARAMS = "start 64 . stop 36 0 1 2 3 4 5 6 ." do_install:append() { # install contrib oe_runmake DESTDIR=${D} -C contrib install + oe_multilib_header pg_config.h pg_config_ext.h ecpg_config.h postgresql/server/pg_config.h postgresql/server/pg_config_ext.h # install tutorial install -d -m 0755 ${D}${libdir}/${BPN}/tutorial install ${B}/src/tutorial/* ${D}${libdir}/${BPN}/tutorial diff --git a/meta-oe/recipes-dbs/postgresql/postgresql_14.5.bb b/meta-oe/recipes-dbs/postgresql/postgresql_14.5.bb deleted file mode 100644 index 1551d34053..0000000000 --- a/meta-oe/recipes-dbs/postgresql/postgresql_14.5.bb +++ /dev/null @@ -1,18 +0,0 @@ -require postgresql.inc - -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=75af6e3eeec4a06cdd2e578673236fc3" - -SRC_URI += "\ - file://not-check-libperl.patch \ - file://0001-Add-support-for-RISC-V.patch \ - file://0001-Improve-reproducibility.patch \ - file://0001-configure.ac-bypass-autoconf-2.69-version-check.patch \ - file://remove_duplicate.patch \ - file://0001-config_info.c-not-expose-build-info.patch \ -" - -SRC_URI[sha256sum] = "d4f72cb5fb857c9a9f75ec8cf091a1771272802f2178f0b2e65b7b6ff64f4a30" - -CVE_CHECK_IGNORE += "\ - CVE-2017-8806 \ -" diff --git a/meta-oe/recipes-dbs/postgresql/postgresql_15.3.bb b/meta-oe/recipes-dbs/postgresql/postgresql_15.3.bb new file mode 100644 index 0000000000..e1d49895f0 --- /dev/null +++ b/meta-oe/recipes-dbs/postgresql/postgresql_15.3.bb @@ -0,0 +1,16 @@ +require postgresql.inc + +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=c31f662bb2bfb3b4187fe9a53e0ffe7c" + +SRC_URI += "\ + file://not-check-libperl.patch \ + file://0001-Add-support-for-RISC-V.patch \ + file://0001-Improve-reproducibility.patch \ + file://0001-configure.ac-bypass-autoconf-2.69-version-check.patch \ + file://0001-config_info.c-not-expose-build-info.patch \ + file://0001-postgresql-fix-ptest-failure-of-sysviews.patch \ +" + +SRC_URI[sha256sum] = "ffc7d4891f00ffbf5c3f4eab7fbbced8460b8c0ee63c5a5167133b9e6599d932" + +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-oe/recipes-dbs/psqlodbc/psqlodbc_13.02.0000.bb b/meta-oe/recipes-dbs/psqlodbc/psqlodbc_15.00.0000.bb index 57ade6162b..be79caef0b 100644 --- a/meta-oe/recipes-dbs/psqlodbc/psqlodbc_13.02.0000.bb +++ b/meta-oe/recipes-dbs/psqlodbc/psqlodbc_15.00.0000.bb @@ -26,7 +26,7 @@ SRC_URI = "http://ftp.postgresql.org/pub/odbc/versions/src/${BPN}-${PV}.tar.gz \ file://run-ptest \ " -SRC_URI[sha256sum] = "b39b7e5c41fd6475c551112fa724bf57c4a446175ec4188a90e2844cc1612585" +SRC_URI[sha256sum] = "ca57d6349532ea7fb4fae17bbfc107abe5a155ca2f43446315f9e23764b3f8ec" DEPENDS += "postgresql unixodbc" diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch index 4aa91d9b26..c98623360f 100644 --- a/meta-oe/recipes-dbs/rocksdb/files/0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch +++ b/meta-oe/recipes-dbs/rocksdb/files/0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch @@ -8,6 +8,8 @@ __sync* builtins are not implemented atleast for 64bit values Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + .../range/range_tree/lib/portability/toku_atomic.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-oe/recipes-dbs/rocksdb/files/arm.patch b/meta-oe/recipes-dbs/rocksdb/files/arm.patch index 573767797d..3066aa8279 100644 --- a/meta-oe/recipes-dbs/rocksdb/files/arm.patch +++ b/meta-oe/recipes-dbs/rocksdb/files/arm.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + implement timer for arm >= v6 Signed-off-by: Khem Raj <raj.khem@gmail.com> diff --git a/meta-oe/recipes-dbs/rocksdb/files/mips.patch b/meta-oe/recipes-dbs/rocksdb/files/mips.patch index 0104d54347..cea70352d1 100644 --- a/meta-oe/recipes-dbs/rocksdb/files/mips.patch +++ b/meta-oe/recipes-dbs/rocksdb/files/mips.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + implement timer implementation for mips platform Signed-off-by: Khem Raj <raj.khem@gmail.com> diff --git a/meta-oe/recipes-dbs/rocksdb/files/ppc64.patch b/meta-oe/recipes-dbs/rocksdb/files/ppc64.patch index 211c1c720b..273b8fe2ed 100644 --- a/meta-oe/recipes-dbs/rocksdb/files/ppc64.patch +++ b/meta-oe/recipes-dbs/rocksdb/files/ppc64.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + implement support for musl/ppc64 Signed-off-by: Khem Raj <raj.khem@gmail.com> diff --git a/meta-oe/recipes-dbs/soci/soci/soci_libdir.patch b/meta-oe/recipes-dbs/soci/soci/soci_libdir.patch deleted file mode 100644 index 00a1a5c862..0000000000 --- a/meta-oe/recipes-dbs/soci/soci/soci_libdir.patch +++ /dev/null @@ -1,28 +0,0 @@ -Define SOCI_LIBDIR only if its not passed via environemnt. In OE we -want to set it per our choice since we use 'lib' for 64bit unless we -are using multilib - --Khem - -Index: soci-3.2.2/CMakeLists.txt -=================================================================== ---- soci-3.2.2.orig/CMakeLists.txt -+++ soci-3.2.2/CMakeLists.txt -@@ -69,11 +69,12 @@ include(SociDependencies) - ############################################################################### - # Installation - ############################################################################### -- --if(APPLE OR CMAKE_SIZEOF_VOID_P EQUAL 4) -- set(SOCI_LIBDIR "lib") --else() -- set(SOCI_LIBDIR "lib64") -+if(NOT DEFINED SOCI_LIBDIR) -+ if(APPLE OR CMAKE_SIZEOF_VOID_P EQUAL 4) -+ set(SOCI_LIBDIR "lib") -+ else() -+ set(SOCI_LIBDIR "lib") -+ endif() - endif() - - set(BINDIR "bin" CACHE PATH "The directory to install binaries into.") diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch index 7b7244b491..b92a487523 100644 --- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch @@ -4,6 +4,8 @@ Date: Mon, 3 Feb 2020 03:25:57 +0000 Subject: [PATCH 2/3] 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/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Remove-neon-option-from-cross-compilation.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Remove-neon-option-from-cross-compilation.patch index c0039c2107..1a80a428b7 100644 --- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Remove-neon-option-from-cross-compilation.patch +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Remove-neon-option-from-cross-compilation.patch @@ -8,6 +8,8 @@ them. Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de> --- +Upstream-Status: Pending + absl/copts/GENERATED_AbseilCopts.cmake | 4 ---- absl/copts/GENERATED_copts.bzl | 4 ---- 2 files changed, 8 deletions(-) diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/abseil-ppc-fixes.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/abseil-ppc-fixes.patch index 9b408259f9..f2ebd9f08c 100644 --- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/abseil-ppc-fixes.patch +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/abseil-ppc-fixes.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + An all-in-one patch that fixes several issues: 1) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl) diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb index f7f8fc848e..dd7ce4aee4 100644 --- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb @@ -7,9 +7,9 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915" -PV = "20221014.0" -SRCREV = "5fa65f28e46e86c44966a1ca8a727a329d9c1ff8" -BRANCH = "master" +PV = "20230125.3" +SRCREV = "c2435f8342c2d0ed8101cb43adfd605fdc52dca2" +BRANCH = "lts_2023_01_25" 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 \ @@ -28,6 +28,7 @@ inherit cmake EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON \ -DBUILD_TESTING=OFF \ -DCMAKE_CXX_STANDARD=14 \ + -DABSL_ENABLE_INSTALL=ON \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/build/0001-Riscv-Add-risc-v-Android-config-header.patch b/meta-oe/recipes-devtools/android-tools/android-tools/build/0001-Riscv-Add-risc-v-Android-config-header.patch index 57c443b707..c091fd404b 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools/build/0001-Riscv-Add-risc-v-Android-config-header.patch +++ b/meta-oe/recipes-devtools/android-tools/android-tools/build/0001-Riscv-Add-risc-v-Android-config-header.patch @@ -4,6 +4,8 @@ Date: Mon, 20 Apr 2020 15:32:40 +0800 Subject: [PATCH 1/1] Riscv: Add risc-v Android config header --- +Upstream-Status: Pending + .../arch/linux-riscv64/AndroidConfig.h | 340 ++++++++++++++++++ 1 file changed, 340 insertions(+) create mode 100644 core/combo/include/arch/linux-riscv64/AndroidConfig.h diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0004-adb-Fix-build-on-big-endian-systems.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0004-adb-Fix-build-on-big-endian-systems.patch index 79e9d4d3b2..7f03cd2beb 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0004-adb-Fix-build-on-big-endian-systems.patch +++ b/meta-oe/recipes-devtools/android-tools/android-tools/core/0004-adb-Fix-build-on-big-endian-systems.patch @@ -18,6 +18,8 @@ them to be used when initializing structures. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- +Upstream-Status: Pending + adb/usb_linux_client.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0005-adb-add-base64-implementation.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0005-adb-add-base64-implementation.patch index fcd4ae2388..4827ffe042 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0005-adb-add-base64-implementation.patch +++ b/meta-oe/recipes-devtools/android-tools/android-tools/core/0005-adb-add-base64-implementation.patch @@ -7,6 +7,8 @@ musl needs it Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + adb/adb_auth_client.c | 2 +- adb/base64.c | 315 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 316 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0006-adb-Musl-fixes.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0006-adb-Musl-fixes.patch index 53f7bcb8e8..182b1eb29e 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0006-adb-Musl-fixes.patch +++ b/meta-oe/recipes-devtools/android-tools/android-tools/core/0006-adb-Musl-fixes.patch @@ -9,6 +9,8 @@ Do not redefine close() and lseek() Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + adb/adb.h | 2 ++ adb/disable_verity_service.c | 13 ++++++++----- adb/framebuffer_service.c | 7 ++++--- diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0007-adb-usb_linux.c-fix-build-with-glibc-2.28.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0007-adb-usb_linux.c-fix-build-with-glibc-2.28.patch index e02a95687f..64fbce4cbe 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0007-adb-usb_linux.c-fix-build-with-glibc-2.28.patch +++ b/meta-oe/recipes-devtools/android-tools/android-tools/core/0007-adb-usb_linux.c-fix-build-with-glibc-2.28.patch @@ -7,6 +7,8 @@ Subject: [PATCH] adb: usb_linux.c: fix build with glibc-2.28 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- +Upstream-Status: Pending + adb/usb_linux.c | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0008-adb-Allow-adbd-to-be-ran-as-root.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0008-adb-Allow-adbd-to-be-ran-as-root.patch index 7d223e05f1..ad21b5aaa6 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0008-adb-Allow-adbd-to-be-ran-as-root.patch +++ b/meta-oe/recipes-devtools/android-tools/android-tools/core/0008-adb-Allow-adbd-to-be-ran-as-root.patch @@ -4,6 +4,8 @@ Date: Mon, 30 Oct 2017 21:05:46 +0100 Subject: [PATCH] adb: Allow adbd to be ran as root --- +Upstream-Status: Pending + adb/adb.c | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0013-adb-Support-riscv64.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0013-adb-Support-riscv64.patch index a8434afbad..5138556d63 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0013-adb-Support-riscv64.patch +++ b/meta-oe/recipes-devtools/android-tools/android-tools/core/0013-adb-Support-riscv64.patch @@ -4,6 +4,8 @@ Date: Mon, 20 Apr 2020 15:27:22 +0800 Subject: [PATCH 1/1] adb: Support riscv64 --- +Upstream-Status: Pending + include/cutils/atomic-inline.h | 2 + include/cutils/atomic-riscv64.h | 156 ++++++++++++++++++++++++++++++++ 2 files changed, 158 insertions(+) diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0014-add-u3-ss-descriptor-support-for-adb.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0014-add-u3-ss-descriptor-support-for-adb.patch index 05973aaaf2..cf23f3c251 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0014-add-u3-ss-descriptor-support-for-adb.patch +++ b/meta-oe/recipes-devtools/android-tools/android-tools/core/0014-add-u3-ss-descriptor-support-for-adb.patch @@ -12,6 +12,8 @@ modified for backporting to android-tools_5.1.1.r37. Signed-off-by: Macpaul Lin <macpaul.lin@mediatek.com> Signed-off-by: Jiacheng Liu <jiacheng.liu@mediatek.com> --- +Upstream-Status: Pending + adb/usb_linux_client.c | 275 +++++++++++++++++++++++++++++++---------- 1 file changed, 207 insertions(+), 68 deletions(-) diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff b/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff index 3ead649b1d..177d69a97a 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff +++ b/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff @@ -4,8 +4,12 @@ Description: adb: Make compatible with openssl 1.1 Author: Chirayu Desai <chirayudesai1@gmail.com Last-Update: 2016-11-10 --- +Upstream-Status: Pending + This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- +Upstream-Status: Pending + system/core/adb/adb_auth_host.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/libselinux/0001-libselinux-Do-not-define-gettid-if-glibc-2.30-is-use.patch b/meta-oe/recipes-devtools/android-tools/android-tools/libselinux/0001-libselinux-Do-not-define-gettid-if-glibc-2.30-is-use.patch index 87771cba85..8b5e4cf999 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools/libselinux/0001-libselinux-Do-not-define-gettid-if-glibc-2.30-is-use.patch +++ b/meta-oe/recipes-devtools/android-tools/android-tools/libselinux/0001-libselinux-Do-not-define-gettid-if-glibc-2.30-is-use.patch @@ -24,6 +24,8 @@ Signed-off-by: Petr Lautrbach <plautrba@redhat.com> Acked-by: Stephen Smalley <sds@tycho.nsa.gov> Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/procattr.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb index abd140c7b8..9278146702 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb +++ b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb @@ -92,7 +92,7 @@ do_compile() { # Setting both variables below causing our makefiles to not work with # implicit make rules - unset CFLAGS + CFLAGS="-ffile-prefix-map=${S}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}" unset CPPFLAGS export SRCDIR=${S} diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/0001-Do-not-add-stack-pointer-to-clobber-list.patch b/meta-oe/recipes-devtools/breakpad/breakpad/0001-Do-not-add-stack-pointer-to-clobber-list.patch deleted file mode 100644 index 6e58490980..0000000000 --- a/meta-oe/recipes-devtools/breakpad/breakpad/0001-Do-not-add-stack-pointer-to-clobber-list.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 5c63eb5d56abd4e5232add4727247965a863d851 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 15 Dec 2019 14:02:45 -0800 -Subject: [PATCH] Do not add stack pointer to clobber list - -It was being ignored until now when gcc 9.0 became capable -of flagging these silent ignore via [1]. - -We weren't actually clobbering the stack pointers here -so it should not cause change in behavior. - -[1] https://gcc.gnu.org/PR52813 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - linux_syscall_support.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/linux_syscall_support.h b/linux_syscall_support.h -index 9276f56..6e73309 100644 ---- a/linux_syscall_support.h -+++ b/linux_syscall_support.h -@@ -1955,7 +1955,7 @@ struct kernel_statfs { - LSS_ENTRYPOINT \ - "pop %%ebx" \ - args \ -- : "esp", "memory"); \ -+ : "memory"); \ - LSS_RETURN(type,__res) - #undef _syscall0 - #define _syscall0(type,name) \ -@@ -2012,7 +2012,7 @@ struct kernel_statfs { - : "i" (__NR_##name), "ri" ((long)(arg1)), \ - "c" ((long)(arg2)), "d" ((long)(arg3)), \ - "S" ((long)(arg4)), "D" ((long)(arg5)) \ -- : "esp", "memory"); \ -+ : "memory"); \ - LSS_RETURN(type,__res); \ - } - #undef _syscall6 -@@ -2034,7 +2034,7 @@ struct kernel_statfs { - : "i" (__NR_##name), "0" ((long)(&__s)), \ - "c" ((long)(arg2)), "d" ((long)(arg3)), \ - "S" ((long)(arg4)), "D" ((long)(arg5)) \ -- : "esp", "memory"); \ -+ : "memory"); \ - LSS_RETURN(type,__res); \ - } - LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack, -@@ -2120,7 +2120,7 @@ struct kernel_statfs { - : "0"(-EINVAL), "i"(__NR_clone), - "m"(fn), "m"(child_stack), "m"(flags), "m"(arg), - "m"(parent_tidptr), "m"(newtls), "m"(child_tidptr) -- : "esp", "memory", "ecx", "edx", "esi", "edi"); -+ : "memory", "ecx", "edx", "esi", "edi"); - LSS_RETURN(int, __res); - } - --- -2.24.1 - diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/0001-Remove-HAVE_GETCONTEXT-check-to-add-local-implementa.patch b/meta-oe/recipes-devtools/breakpad/breakpad/0001-Remove-HAVE_GETCONTEXT-check-to-add-local-implementa.patch index d7a5c06753..df41b4d6c0 100644 --- a/meta-oe/recipes-devtools/breakpad/breakpad/0001-Remove-HAVE_GETCONTEXT-check-to-add-local-implementa.patch +++ b/meta-oe/recipes-devtools/breakpad/breakpad/0001-Remove-HAVE_GETCONTEXT-check-to-add-local-implementa.patch @@ -12,11 +12,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> Makefile.am | 12 ------------ 1 file changed, 12 deletions(-) -diff --git a/Makefile.am b/Makefile.am -index ee7454e4..69700192 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -187,10 +187,6 @@ src_client_linux_libbreakpad_client_a_SOURCES = \ +@@ -529,10 +529,6 @@ src_client_linux_libbreakpad_client_a_SO src/common/linux/linux_libc_support.cc \ src/common/linux/memory_mapped_file.cc \ src/common/linux/safe_readlink.cc @@ -24,10 +22,10 @@ index ee7454e4..69700192 100644 -src_client_linux_libbreakpad_client_a_SOURCES += \ - src/common/linux/breakpad_getcontext.S -endif - endif LINUX_HOST - if !DISABLE_PROCESSOR -@@ -508,10 +504,6 @@ src_client_linux_linux_client_unittest_shlib_SOURCES = \ + # Client tests + src_client_linux_linux_dumper_unittest_helper_SOURCES = \ +@@ -580,10 +576,6 @@ src_client_linux_linux_client_unittest_s src/processor/minidump.cc \ src/processor/pathname_stripper.cc \ src/processor/proc_maps_linux.cc @@ -38,7 +36,7 @@ index ee7454e4..69700192 100644 src_client_linux_linux_client_unittest_shlib_CPPFLAGS = \ $(AM_CPPFLAGS) $(TEST_CFLAGS) -@@ -541,10 +533,6 @@ src_client_linux_linux_client_unittest_shlib_LDADD = \ +@@ -613,10 +605,6 @@ src_client_linux_linux_client_unittest_s src/common/string_conversion.o \ $(TEST_LIBS) \ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) @@ -49,6 +47,3 @@ index ee7454e4..69700192 100644 if ANDROID_HOST src_client_linux_linux_client_unittest_shlib_LDFLAGS += \ -llog -lm --- -2.30.2 - diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/0001-Turn-off-sign-compare-for-musl-libc.patch b/meta-oe/recipes-devtools/breakpad/breakpad/0001-Turn-off-sign-compare-for-musl-libc.patch index 6b8d011d8b..b2d2c72cb1 100644 --- a/meta-oe/recipes-devtools/breakpad/breakpad/0001-Turn-off-sign-compare-for-musl-libc.patch +++ b/meta-oe/recipes-devtools/breakpad/breakpad/0001-Turn-off-sign-compare-for-musl-libc.patch @@ -10,6 +10,8 @@ Fix Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/client/linux/crash_generation/crash_generation_server.cc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/0001-exception_handler.cc-Match-the-types-for-SIGSTKSZ.patch b/meta-oe/recipes-devtools/breakpad/breakpad/0001-exception_handler.cc-Match-the-types-for-SIGSTKSZ.patch deleted file mode 100644 index afe8a61b29..0000000000 --- a/meta-oe/recipes-devtools/breakpad/breakpad/0001-exception_handler.cc-Match-the-types-for-SIGSTKSZ.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 66a2b6e4ba8e2b49115043127ce4aa0fcd71ad1e Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 11 May 2021 11:12:35 -0700 -Subject: [PATCH] exception_handler.cc: Match the types for SIGSTKSZ - -In glibc 2.34, SIGSTKSZ is a syscall which returns a long int, therefore -current check fails - -| ../git/src/client/linux/handler/exception_handler.cc:141:49: error: no matching function for call to 'max(int, long int)' -| 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); -| | ~~~~~~~~^~~~~~~~~~~~~~~~~ - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/client/linux/handler/exception_handler.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/client/linux/handler/exception_handler.cc b/src/client/linux/handler/exception_handler.cc -index ca353c40..dc0fc4a9 100644 ---- a/src/client/linux/handler/exception_handler.cc -+++ b/src/client/linux/handler/exception_handler.cc -@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { - // SIGSTKSZ may be too small to prevent the signal handlers from overrunning - // the alternative stack. Ensure that the size of the alternative stack is - // large enough. -- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); -+ static const unsigned kSigStackSize = std::max(16384u, (unsigned)SIGSTKSZ); - - // Only set an alternative stack if there isn't already one, or if the current - // one is too small. --- -2.31.1 - diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/0001-include-sys-reg.h-to-get-__WORDSIZE-on-musl-libc.patch b/meta-oe/recipes-devtools/breakpad/breakpad/0001-include-sys-reg.h-to-get-__WORDSIZE-on-musl-libc.patch index 3dc55cf1fc..87e00c2422 100644 --- a/meta-oe/recipes-devtools/breakpad/breakpad/0001-include-sys-reg.h-to-get-__WORDSIZE-on-musl-libc.patch +++ b/meta-oe/recipes-devtools/breakpad/breakpad/0001-include-sys-reg.h-to-get-__WORDSIZE-on-musl-libc.patch @@ -4,6 +4,8 @@ Date: Sun, 1 Feb 2015 14:26:52 +0100 Subject: [PATCH 1/3] include <sys/reg.h> to get __WORDSIZE on musl libc --- +Upstream-Status: Pending + src/common/linux/elf_core_dump.h | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/0001-lss-Match-syscalls-to-match-musl.patch b/meta-oe/recipes-devtools/breakpad/breakpad/0001-lss-Match-syscalls-to-match-musl.patch index bdd787afd5..80e5a8a764 100644 --- a/meta-oe/recipes-devtools/breakpad/breakpad/0001-lss-Match-syscalls-to-match-musl.patch +++ b/meta-oe/recipes-devtools/breakpad/breakpad/0001-lss-Match-syscalls-to-match-musl.patch @@ -5,12 +5,14 @@ Subject: [PATCH] lss: Match syscalls to match musl Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + linux_syscall_support.h | 3 +++ 1 file changed, 3 insertions(+) --- a/linux_syscall_support.h +++ b/linux_syscall_support.h -@@ -816,6 +816,9 @@ struct kernel_statfs { +@@ -1006,6 +1006,9 @@ struct kernel_statx { #define FUTEX_TRYLOCK_PI_PRIVATE (FUTEX_TRYLOCK_PI | FUTEX_PRIVATE_FLAG) #endif @@ -20,17 +22,17 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #if defined(__x86_64__) #ifndef ARCH_SET_GS -@@ -947,6 +950,7 @@ struct kernel_statfs { - #ifndef __NR_fallocate - #define __NR_fallocate 324 +@@ -1140,6 +1143,7 @@ struct kernel_statx { + #ifndef __NR_getrandom + #define __NR_getrandom 355 #endif + /* End of i386 definitions */ #elif defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) #ifndef __NR_setresuid -@@ -1239,6 +1243,12 @@ struct kernel_statfs { - #ifndef __NR_fallocate - #define __NR_fallocate 285 +@@ -1448,6 +1452,12 @@ struct kernel_statx { + #ifndef __NR_getrandom + #define __NR_getrandom 318 #endif +#ifndef __NR_pread +#define __NR_pread __NR_pread64 @@ -41,9 +43,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> /* End of x86-64 definitions */ #elif defined(__mips__) #if _MIPS_SIM == _MIPS_SIM_ABI32 -@@ -1418,6 +1428,12 @@ struct kernel_statfs { - #ifndef __NR_ioprio_get - #define __NR_ioprio_get (__NR_Linux + 274) +@@ -1633,6 +1643,12 @@ struct kernel_statx { + #ifndef __NR_getrandom + #define __NR_getrandom (__NR_Linux + 313) #endif + +#undef __NR_pread diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/0003-Dont-include-stab.h.patch b/meta-oe/recipes-devtools/breakpad/breakpad/0003-Dont-include-stab.h.patch index 76b2088b01..81844d0d66 100644 --- a/meta-oe/recipes-devtools/breakpad/breakpad/0003-Dont-include-stab.h.patch +++ b/meta-oe/recipes-devtools/breakpad/breakpad/0003-Dont-include-stab.h.patch @@ -5,6 +5,8 @@ Subject: [PATCH 3/5] Dont include stab.h Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/common/stabs_reader.cc | 1 - src/common/stabs_reader.h | 12 +++++++++++- src/common/stabs_reader_unittest.cc | 1 - @@ -12,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> --- a/src/common/stabs_reader.cc +++ b/src/common/stabs_reader.cc -@@ -34,7 +34,9 @@ +@@ -38,7 +38,9 @@ #include "common/stabs_reader.h" #include <assert.h> @@ -24,7 +26,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #include <string> --- a/src/common/stabs_reader.h +++ b/src/common/stabs_reader.h -@@ -58,6 +58,30 @@ +@@ -54,6 +54,30 @@ #elif defined(HAVE_A_OUT_H) #include <a.out.h> #endif @@ -57,7 +59,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #include <vector> --- a/src/common/stabs_reader_unittest.cc +++ b/src/common/stabs_reader_unittest.cc -@@ -33,7 +33,9 @@ +@@ -36,7 +36,9 @@ #include <assert.h> #include <errno.h> @@ -69,8 +71,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #include <string.h> --- a/configure.ac +++ b/configure.ac -@@ -72,7 +72,7 @@ AC_ARG_ENABLE(m32, - AC_HEADER_STDC +@@ -61,7 +61,7 @@ fi + AC_SYS_LARGEFILE AX_PTHREAD -AC_CHECK_HEADERS([a.out.h sys/mman.h sys/random.h]) diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch b/meta-oe/recipes-devtools/breakpad/breakpad/0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch index 851004704f..9b16dc3b2a 100644 --- a/meta-oe/recipes-devtools/breakpad/breakpad/0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch +++ b/meta-oe/recipes-devtools/breakpad/breakpad/0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch @@ -6,22 +6,22 @@ Subject: [PATCH 3/3] Fix conflict between musl libc <dirent.h> and lss Include <dirent.h> late to avoid the macro getdents64 in musl libc's <dirent.h> to conflict with linux_sycall_support.h. --- +Upstream-Status: Pending + src/client/linux/crash_generation/crash_generation_server.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/src/client/linux/crash_generation/crash_generation_server.cc b/src/client/linux/crash_generation/crash_generation_server.cc -index 26c50a5c..2596afde 100644 --- a/src/client/linux/crash_generation/crash_generation_server.cc +++ b/src/client/linux/crash_generation/crash_generation_server.cc -@@ -28,7 +28,6 @@ - // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +@@ -31,7 +31,6 @@ + #endif #include <assert.h> -#include <dirent.h> #include <fcntl.h> #include <limits.h> #include <poll.h> -@@ -49,6 +48,8 @@ +@@ -52,6 +51,8 @@ #include "common/linux/guid_creator.h" #include "common/linux/safe_readlink.h" @@ -30,6 +30,3 @@ index 26c50a5c..2596afde 100644 static const char kCommandQuit = 'x'; namespace google_breakpad { --- -2.14.1 - diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch b/meta-oe/recipes-devtools/breakpad/breakpad/0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch index 5892cfa7d6..ff331977b6 100644 --- a/meta-oe/recipes-devtools/breakpad/breakpad/0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch +++ b/meta-oe/recipes-devtools/breakpad/breakpad/0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch @@ -6,13 +6,15 @@ Subject: [PATCH 4/5] elf_reader.cc: include <sys/reg.h> to get __WORDSIZE on Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/common/dwarf/elf_reader.cc | 1 + 1 file changed, 1 insertion(+) --- a/src/common/dwarf/elf_reader.cc +++ b/src/common/dwarf/elf_reader.cc -@@ -30,12 +30,16 @@ - #define _GNU_SOURCE // needed for pread() +@@ -34,12 +34,16 @@ + #include <config.h> // Must come first #endif +#include <config.h> @@ -30,8 +32,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #include <algorithm> --- a/configure.ac +++ b/configure.ac -@@ -72,7 +72,7 @@ AC_ARG_ENABLE(m32, - AC_HEADER_STDC +@@ -61,7 +61,7 @@ fi + AC_SYS_LARGEFILE AX_PTHREAD -AC_CHECK_HEADERS([a.out.h stab.h sys/mman.h sys/random.h]) diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/mcontext.patch b/meta-oe/recipes-devtools/breakpad/breakpad/mcontext.patch index 51393967bc..cb323fbdcb 100644 --- a/meta-oe/recipes-devtools/breakpad/breakpad/mcontext.patch +++ b/meta-oe/recipes-devtools/breakpad/breakpad/mcontext.patch @@ -1,18 +1,16 @@ map the mcontext_t structure for musl -Upstream-Status: Inappropriate[need to consider Android] +Upstream-Status: Inappropriate [need to consider Android] Signed-off-by: Khem Raj <raj.khem@gmail.com> -Index: git/src/client/linux/minidump_writer/linux_core_dumper.cc -=================================================================== ---- git.orig/src/client/linux/minidump_writer/linux_core_dumper.cc -+++ git/src/client/linux/minidump_writer/linux_core_dumper.cc -@@ -196,7 +196,7 @@ bool LinuxCoreDumper::EnumerateThreads() +--- a/src/client/linux/minidump_writer/linux_core_dumper.cc ++++ b/src/client/linux/minidump_writer/linux_core_dumper.cc +@@ -214,7 +214,7 @@ bool LinuxCoreDumper::EnumerateThreads() info.tgid = status->pr_pgrp; info.ppid = status->pr_ppid; #if defined(__mips__) --#if defined(__ANDROID__) -+#if defined(__ANDROID__) || !defined(__GLIBC__) +-# if defined(__ANDROID__) ++# if defined(__ANDROID__) || !defined(__GLIBC__) for (int i = EF_R0; i <= EF_R31; i++) info.mcontext.gregs[i - EF_R0] = status->pr_reg[i]; - #else // __ANDROID__ + # else // __ANDROID__ diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/mips_asm_sgidefs.patch b/meta-oe/recipes-devtools/breakpad/breakpad/mips_asm_sgidefs.patch index 96f5f48cc8..77d08399bf 100644 --- a/meta-oe/recipes-devtools/breakpad/breakpad/mips_asm_sgidefs.patch +++ b/meta-oe/recipes-devtools/breakpad/breakpad/mips_asm_sgidefs.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/linux_syscall_support.h +++ b/linux_syscall_support.h @@ -119,14 +119,7 @@ extern "C" { diff --git a/meta-oe/recipes-devtools/breakpad/breakpad_git.bb b/meta-oe/recipes-devtools/breakpad/breakpad_git.bb index c752a10083..3462b846d3 100644 --- a/meta-oe/recipes-devtools/breakpad/breakpad_git.bb +++ b/meta-oe/recipes-devtools/breakpad/breakpad_git.bb @@ -6,11 +6,12 @@ SUMMARY = "An open-source multi-platform crash reporting system" DESCRIPTION = "Breakpad is a library and tool suite that allows you to distribute an application to users with compiler-provided debugging information removed, record crashes in compact \"minidump\" files, send them back to your server, and produce C and C++ stack traces from these minidumps. " HOMEPAGE = "https://code.google.com/p/google-breakpad/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8bb274ebd1901085fd71a8d8afe8831b" +LIC_FILES_CHKSUM = "file://LICENSE;md5=07aeb530115539d62cacf9942fa60cac" SECTION = "libs" inherit autotools +DEPENDS += "zlib" DEPENDS:append:libc-musl = " libucontext" BBCLASSEXTEND = "native" @@ -21,11 +22,11 @@ PV = "1.0" SRCREV_FORMAT = "breakpad_gtest_protobuf_lss_gyp" -SRCREV_breakpad = "8b22babdf894e5aa98b2dbbe103f7e3856a71944" +SRCREV_breakpad = "7a1a190f4f68e8a3e06788498f50a4d5520a69f3" #v1.10.0 -SRCREV_gtest = "4fe018038f87675c083d0cfb6a6b57c274fb1753" +SRCREV_gtest = "e2239ee6043f73722e7aa812a459f54a28552929" SRCREV_protobuf = "cb6dd4ef5f82e41e06179dcd57d3b1d9246ad6ac" -SRCREV_lss = "fd00dbbd0c06a309c657d89e9430143b179ff6db" +SRCREV_lss = "9719c1e1e676814c456b55f5f070eabad6709d31" SRCREV_gyp = "324dd166b7c0b39d513026fa52d6280ac6d56770" SRC_URI = "git://github.com/google/breakpad;name=breakpad;branch=main;protocol=https \ @@ -40,10 +41,8 @@ SRC_URI = "git://github.com/google/breakpad;name=breakpad;branch=main;protocol=h file://0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch \ file://mcontext.patch \ file://0001-Remove-HAVE_GETCONTEXT-check-to-add-local-implementa.patch \ - file://0001-exception_handler.cc-Match-the-types-for-SIGSTKSZ.patch \ file://0001-lss-Match-syscalls-to-match-musl.patch;patchdir=src/third_party/lss \ file://mips_asm_sgidefs.patch;patchdir=src/third_party/lss \ - file://0001-Do-not-add-stack-pointer-to-clobber-list.patch;patchdir=src/third_party/lss \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-devtools/capnproto/capnproto_0.10.3.bb b/meta-oe/recipes-devtools/capnproto/capnproto_0.10.4.bb index bf98d561e6..bbdc3b5970 100644 --- a/meta-oe/recipes-devtools/capnproto/capnproto_0.10.3.bb +++ b/meta-oe/recipes-devtools/capnproto/capnproto_0.10.4.bb @@ -5,8 +5,8 @@ SECTION = "console/tools" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://../LICENSE;md5=a05663ae6cca874123bf667a60dca8c9" -SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-0.10.3;protocol=https" -SRCREV = "a16468f296a9584f4068072efecdee8a9eb9c2ed" +SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-0.10.4;protocol=https" +SRCREV = "a91ec65323c2577732224d0cf6f5bf1e79d3a724" S = "${WORKDIR}/git/c++" diff --git a/meta-oe/recipes-devtools/cgdb/cgdb/0001-cgdb-Do-not-search-for-cgdb.txt-in-build-dir.patch b/meta-oe/recipes-devtools/cgdb/cgdb/0001-cgdb-Do-not-search-for-cgdb.txt-in-build-dir.patch new file mode 100644 index 0000000000..989df8ed92 --- /dev/null +++ b/meta-oe/recipes-devtools/cgdb/cgdb/0001-cgdb-Do-not-search-for-cgdb.txt-in-build-dir.patch @@ -0,0 +1,34 @@ +From be56e955a32e5e9da0be32008afb8a8ee60e9b56 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 24 May 2023 19:31:23 -0700 +Subject: [PATCH] cgdb: Do not search for cgdb.txt in build dir + +If we do cross builds it encodes the build time workdir here and it wont +be useful to look into this dir since cross-built cgdb may not run on +build host and build workdir will not exist on target + +Upstream-Status: Inappropriate [Cross-compile specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + cgdb/interface.cpp | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/cgdb/interface.cpp b/cgdb/interface.cpp +index dc58137..d3aab5e 100644 +--- a/cgdb/interface.cpp ++++ b/cgdb/interface.cpp +@@ -1568,11 +1568,6 @@ void if_display_help(void) + + fs_util_get_path(PKGDATADIR, "cgdb.txt", cgdb_help_file); + +- /* File doesn't exist. Try to find cgdb.txt in the build dir in case +- * the user is running a built cgdb binary directly. */ +- if (!fs_verify_file_exists(cgdb_help_file)) +- fs_util_get_path(TOPBUILDDIR, "doc/cgdb.txt", cgdb_help_file); +- + ret_val = source_set_exec_line(src_viewer, cgdb_help_file, 1, 0); + + if (ret_val == 0) +-- +2.40.1 + diff --git a/meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb b/meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb index c5a0030823..922dfc7763 100644 --- a/meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb +++ b/meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb @@ -9,7 +9,8 @@ DEPENDS = "flex-native readline ncurses" inherit autotools texinfo -SRC_URI = "http://cgdb.me/files/${BP}.tar.gz" +SRC_URI = "http://cgdb.me/files/${BP}.tar.gz \ + file://0001-cgdb-Do-not-search-for-cgdb.txt-in-build-dir.patch" SRC_URI[sha256sum] = "0d38b524d377257b106bad6d856d8ae3304140e1ee24085343e6ddf1b65811f1" CACHED_CONFIGUREVARS = "ac_cv_file__dev_ptmx=yes ac_cv_rl_version=6.2 ac_cv_file__proc_self_status=yes" diff --git a/meta-oe/recipes-devtools/concurrencykit/concurrencykit/0001-configure-Fix-compoiler-detection-logic-for-cross-co.patch b/meta-oe/recipes-devtools/concurrencykit/concurrencykit/0001-configure-Fix-compoiler-detection-logic-for-cross-co.patch index 6be0246626..718f8c19f1 100644 --- a/meta-oe/recipes-devtools/concurrencykit/concurrencykit/0001-configure-Fix-compoiler-detection-logic-for-cross-co.patch +++ b/meta-oe/recipes-devtools/concurrencykit/concurrencykit/0001-configure-Fix-compoiler-detection-logic-for-cross-co.patch @@ -35,9 +35,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> + fi + assert "$CC" "not found" +fi -+if `$CC --version | grep gcc >& /dev/null`; then ++if `$CC --version | grep gcc > /dev/null 2>&1`; then + COMPILER=gcc -+elif `$CC --version | grep clang >& /dev/null`; then ++elif `$CC --version | grep clang > /dev/null 2>&1`; then + COMPILER=clang +else + COMPILER="not-found" diff --git a/meta-oe/recipes-devtools/ctags/ctags_6.0.20230115.0.bb b/meta-oe/recipes-devtools/ctags/ctags_6.0.20230716.0.bb index adae876649..b454e7f998 100644 --- a/meta-oe/recipes-devtools/ctags/ctags_6.0.20230115.0.bb +++ b/meta-oe/recipes-devtools/ctags/ctags_6.0.20230716.0.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" inherit autotools-brokensep pkgconfig manpages -SRCREV = "c39ff7a753a286d9bd7460a1a1e092746d592fbd" +SRCREV = "983cab50c0dc8603989c4bd2ca535bae821d7ecc" SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https" S = "${WORKDIR}/git" @@ -32,3 +32,5 @@ PACKAGECONFIG[json] = "--enable-json,--disable-json,jansson" PACKAGECONFIG[seccomp] = "--enable-seccomp,--disable-seccomp,libseccomp" PACKAGECONFIG[yaml] = "--enable-yaml,--disable-yaml,libyaml" PACKAGECONFIG[manpages] = ",,python3-docutils-native" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.128.bb b/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.128.bb index 4d13aa66c8..592d997aad 100644 --- a/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.128.bb +++ b/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.128.bb @@ -5,7 +5,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://debian/copyright;md5=1e68ced6e1689d4cd9dac75ff5225608" SRC_URI = "\ - http://http.debian.net/debian/pool/main/d/debootstrap/debootstrap_${PV}.tar.gz \ + ${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 \ diff --git a/meta-oe/recipes-devtools/dmalloc/dmalloc/0001-undefined-strdup-macro.patch b/meta-oe/recipes-devtools/dmalloc/dmalloc/0001-undefined-strdup-macro.patch index ea940e9932..a3a3df4a7b 100644 --- a/meta-oe/recipes-devtools/dmalloc/dmalloc/0001-undefined-strdup-macro.patch +++ b/meta-oe/recipes-devtools/dmalloc/dmalloc/0001-undefined-strdup-macro.patch @@ -8,6 +8,8 @@ system header. Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + dmalloc.h.3 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-oe/recipes-devtools/dmalloc/dmalloc/02-Makefile.in.patch b/meta-oe/recipes-devtools/dmalloc/dmalloc/02-Makefile.in.patch index 967643badc..ba65d394f0 100644 --- a/meta-oe/recipes-devtools/dmalloc/dmalloc/02-Makefile.in.patch +++ b/meta-oe/recipes-devtools/dmalloc/dmalloc/02-Makefile.in.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: Changes for building shared libraries This patch includes changes for building shared libraries with PIC object files and the correct soname and libname. diff --git a/meta-oe/recipes-devtools/dmalloc/dmalloc/03-threads.patch b/meta-oe/recipes-devtools/dmalloc/dmalloc/03-threads.patch index be09452573..9cbc0a2884 100644 --- a/meta-oe/recipes-devtools/dmalloc/dmalloc/03-threads.patch +++ b/meta-oe/recipes-devtools/dmalloc/dmalloc/03-threads.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: Fix LOCK_THREADS in settings.dist This patch takes into account that if --enable-threads is used, LOCK_THREADS doesn't get updated diff --git a/meta-oe/recipes-devtools/dmalloc/dmalloc/100-use-xtools.patch b/meta-oe/recipes-devtools/dmalloc/dmalloc/100-use-xtools.patch index e1db690599..94ca93647f 100644 --- a/meta-oe/recipes-devtools/dmalloc/dmalloc/100-use-xtools.patch +++ b/meta-oe/recipes-devtools/dmalloc/dmalloc/100-use-xtools.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + This patch makes configure use the cross ld and ar rather than the native tools. It was build up by Yann E. MORIN <yann.morin.1998@anciens.enib.fr> from some diff --git a/meta-oe/recipes-devtools/dmalloc/dmalloc/13-fix-ldflags-in-makefile.patch b/meta-oe/recipes-devtools/dmalloc/dmalloc/13-fix-ldflags-in-makefile.patch index 2581e54880..3b7344dbf9 100644 --- a/meta-oe/recipes-devtools/dmalloc/dmalloc/13-fix-ldflags-in-makefile.patch +++ b/meta-oe/recipes-devtools/dmalloc/dmalloc/13-fix-ldflags-in-makefile.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: dmalloc-5.5.2/Makefile.in =================================================================== --- dmalloc-5.5.2.orig/Makefile.in diff --git a/meta-oe/recipes-devtools/dmalloc/dmalloc/130-mips.patch b/meta-oe/recipes-devtools/dmalloc/dmalloc/130-mips.patch index 935ac983a6..18f5993e47 100644 --- a/meta-oe/recipes-devtools/dmalloc/dmalloc/130-mips.patch +++ b/meta-oe/recipes-devtools/dmalloc/dmalloc/130-mips.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Patch to correctly handle the MIPS case. It was build up by Yann E. MORIN <yann.morin.1998@anciens.enib.fr> from some diff --git a/meta-oe/recipes-devtools/dmalloc/dmalloc/150-use_DESTDIR.patch b/meta-oe/recipes-devtools/dmalloc/dmalloc/150-use_DESTDIR.patch index 7edd46412a..1a9b0060b9 100644 --- a/meta-oe/recipes-devtools/dmalloc/dmalloc/150-use_DESTDIR.patch +++ b/meta-oe/recipes-devtools/dmalloc/dmalloc/150-use_DESTDIR.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Make install rules use DESTDIR. Split installation of the utilitity from the global install. diff --git a/meta-oe/recipes-devtools/dmalloc/dmalloc/configure-pagesize-HACK.patch b/meta-oe/recipes-devtools/dmalloc/dmalloc/configure-pagesize-HACK.patch index a5bd736610..9c928fc438 100644 --- a/meta-oe/recipes-devtools/dmalloc/dmalloc/configure-pagesize-HACK.patch +++ b/meta-oe/recipes-devtools/dmalloc/dmalloc/configure-pagesize-HACK.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + We cant run tests during cross compile therefore pin to 4k pages Signed-off-by: Khem Raj <raj.khem@gmail.com> diff --git a/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb b/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb index ca2b20108a..94023922a2 100644 --- a/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb +++ b/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb @@ -4,7 +4,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/ubinux/dnf-plugin-tui.git;branch=master;protocol=https" -SRCREV = "8d21f52577aa03958732a5a346a678c699e98cb6" +SRCREV = "83917a3935ac7ce1d8d96e914d96a6679319a336" PV = "1.3" SRC_URI:append:class-target = " file://oe-remote.repo.sample" diff --git a/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch b/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch index b6d007d8df..796bc61ddc 100644 --- a/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch +++ b/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch @@ -34,7 +34,7 @@ This patch is only needded by doxygen-native. Updated to apply to release 1.9.1. -Upstream-Status: Inappropriate[oe specific] +Upstream-Status: Inappropriate [oe specific] Co-Authored-By: Kai Kang <kai.kang@windriver.com> Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> diff --git a/meta-oe/recipes-devtools/doxygen/doxygen_1.9.3.bb b/meta-oe/recipes-devtools/doxygen/doxygen_1.9.3.bb index 92fea981e1..8bd0992bd6 100644 --- a/meta-oe/recipes-devtools/doxygen/doxygen_1.9.3.bb +++ b/meta-oe/recipes-devtools/doxygen/doxygen_1.9.3.bb @@ -14,4 +14,8 @@ SRC_URI[sha256sum] = "f352dbc3221af7012b7b00935f2dfdc9fb67a97d43287d2f6c81c50449 inherit cmake python3native +EXTRA_OECMAKE += "\ + -DFLEX_TARGET_ARG_COMPILE_FLAGS='--noline' \ + -DBISON_TARGET_ARG_COMPILE_FLAGS='--no-lines' \ +" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.5.bb b/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.6.bb index da5c07ff28..1facb352cc 100644 --- a/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.5.bb +++ b/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.6.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f515fff3ea0a2b9797eda60d83c0e5ca" SRC_URI = "git://github.com/editorconfig/editorconfig-core-c.git;protocol=https;branch=master" S = "${WORKDIR}/git" -SRCREV = "f6b0ca395149b5a2fbd56a488cae30306a58170f" +SRCREV = "b7837029494c03af5ea70ed9d265e8c2123bff53" inherit cmake diff --git a/meta-oe/recipes-devtools/exprtk/exprtk_git.bb b/meta-oe/recipes-devtools/exprtk/exprtk_git.bb index 52975c8215..4019f26899 100644 --- a/meta-oe/recipes-devtools/exprtk/exprtk_git.bb +++ b/meta-oe/recipes-devtools/exprtk/exprtk_git.bb @@ -3,9 +3,9 @@ HOMEPAGE = "https://github.com/ArashPartow/exprtk" SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -SRCREV = "281c2ccc65b8f91c012ea3725ebcef406378a225" +SRCREV = "f46bffcd6966d38a09023fb37ba9335214c9b959" -SRC_URI = "git://github.com/ArashPartow/exprtk.git;branch=master;protocol=https" +SRC_URI = "git://github.com/ArashPartow/exprtk.git;branch=release;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-devtools/extract-cert/extract-cert_0.3.bb b/meta-oe/recipes-devtools/extract-cert/extract-cert_0.3.bb new file mode 100644 index 0000000000..a4cd7ad157 --- /dev/null +++ b/meta-oe/recipes-devtools/extract-cert/extract-cert_0.3.bb @@ -0,0 +1,14 @@ +SUMMARY = "small helper program to extract X.509 certificates from PKCS#11 tokens" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "openssl" + +SRC_URI = "git://git.pengutronix.de/git/extract-cert;protocol=https;branch=master;" +SRCREV = "d652b4e8279aef2a85f58676ab472744bafeafc9" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb b/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb index f4a8b020a8..183554e2c8 100644 --- a/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb +++ b/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb @@ -2,7 +2,7 @@ SUMMARY = "Memory Efficient Serialization Library" HOMEPAGE = "https://github.com/google/flatbuffers" SECTION = "console/tools" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" require flatbuffers.inc @@ -15,8 +15,6 @@ RDEPENDS:${PN}-dev += "${PN}-compiler" S = "${WORKDIR}/git" -CVE_CHECK_IGNORE += "CVE-2020-35864" - EXTRA_OECMAKE += " \ -DFLATBUFFERS_BUILD_TESTS=OFF \ -DFLATBUFFERS_BUILD_SHAREDLIB=ON \ diff --git a/meta-oe/recipes-devtools/flatbuffers/flatbuffers.inc b/meta-oe/recipes-devtools/flatbuffers/flatbuffers.inc index a85c74c128..7533f7c758 100644 --- a/meta-oe/recipes-devtools/flatbuffers/flatbuffers.inc +++ b/meta-oe/recipes-devtools/flatbuffers/flatbuffers.inc @@ -1,3 +1,3 @@ -PV = "23.1.4" -SRCREV = "af9ceabeef1a10c1004e2741f8c0c090ca59e5af" +PV = "23.5.26" +SRCREV = "0100f6a5779831fa7a651e4b67ef389a8752bd9b" SRC_URI = "git://github.com/google/flatbuffers.git;branch=master;protocol=https" diff --git a/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers.bb b/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers.bb index fb5b86ddea..5d3c73fd9a 100644 --- a/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers.bb +++ b/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers.bb @@ -2,7 +2,7 @@ SUMMARY = "Memory Efficient Serialization Library - Python3 Modules" HOMEPAGE = "https://github.com/google/flatbuffers" SECTION = "console/tools" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://../LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" require flatbuffers.inc diff --git a/meta-oe/recipes-devtools/glade/glade_3.22.2.bb b/meta-oe/recipes-devtools/glade/glade_3.22.2.bb index 6c1112038c..28b1279390 100644 --- a/meta-oe/recipes-devtools/glade/glade_3.22.2.bb +++ b/meta-oe/recipes-devtools/glade/glade_3.22.2.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \ file://COPYING.LGPL;md5=252890d9eee26aab7b432e8b8a616475" DEPENDS = "gtk+3 glib-2.0 libxml2 intltool-native \ gnome-common-native \ + autoconf-archive-native \ " inherit features_check autotools pkgconfig gnomebase gobject-introspection mime-xdg diff --git a/meta-oe/recipes-devtools/grpc/grpc/0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch b/meta-oe/recipes-devtools/grpc/grpc/0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch index 2f1483f97c..b245ad8657 100644 --- a/meta-oe/recipes-devtools/grpc/grpc/0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch +++ b/meta-oe/recipes-devtools/grpc/grpc/0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch @@ -33,6 +33,8 @@ core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot-native= -Wl,-z,relro,-z,now Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- +Upstream-Status: Pending + include/grpcpp/impl/codegen/sync.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-devtools/grpc/grpc_1.50.1.bb b/meta-oe/recipes-devtools/grpc/grpc_1.50.1.bb index 7b8a25c277..958992e1e3 100644 --- a/meta-oe/recipes-devtools/grpc/grpc_1.50.1.bb +++ b/meta-oe/recipes-devtools/grpc/grpc_1.50.1.bb @@ -37,6 +37,7 @@ EXTRA_OECMAKE = " \ -DgRPC_ZLIB_PROVIDER=package \ -DgRPC_SSL_PROVIDER=package \ -DgRPC_PROTOBUF_PROVIDER=package \ + -D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${STAGING_BINDIR_NATIVE}/protoc \ -DgRPC_ABSL_PROVIDER=package \ -DgRPC_RE2_PROVIDER=package \ -DgRPC_INSTALL=ON \ diff --git a/meta-oe/recipes-devtools/jemalloc/files/run-ptest b/meta-oe/recipes-devtools/jemalloc/files/run-ptest index b351f947e8..5c826a1766 100644 --- a/meta-oe/recipes-devtools/jemalloc/files/run-ptest +++ b/meta-oe/recipes-devtools/jemalloc/files/run-ptest @@ -1,9 +1,37 @@ #!/bin/sh +export MALLOC_CONF_ALL=${MALLOC_CONF} +# Concatenate the individual test's MALLOC_CONF and MALLOC_CONF_ALL. +export_malloc_conf() { + if [ "x${MALLOC_CONF}" != "x" -a "x${MALLOC_CONF_ALL}" != "x" ] ; then + export MALLOC_CONF="${MALLOC_CONF},${MALLOC_CONF_ALL}" + else + export MALLOC_CONF="${MALLOC_CONF}${MALLOC_CONF_ALL}" + fi +} + + + saved_dir=$PWD for dir in tests/* ; do cd $dir for atest in * ; do + if [[ "${atest##*.}" == "sh" ]]; then + continue + fi + if [ -e "${atest}.sh" ] ; then + # Source the shell script corresponding to the test in a subshell and + # execute the test. This allows the shell script to set MALLOC_CONF, which + # is then used to set MALLOC_CONF (thus allowing the + # per test shell script to ignore the detail). + enable_fill=1 \ + enable_prof=1 \ + . $(pwd)/${atest}.sh && \ + export_malloc_conf + else + export MALLOC_CONF= && \ + export_malloc_conf + fi if [ \( -x $atest \) -a \( -f $atest \) ] ; then rm -rf tests.log ./$atest > tests.log 2>&1 @@ -18,4 +46,3 @@ for dir in tests/* ; do done cd $saved_dir done - diff --git a/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb b/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb index 950b64ee9b..9ad83261ef 100644 --- a/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb +++ b/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb @@ -42,10 +42,13 @@ do_compile_ptest() { do_install_ptest() { install -d ${D}${PTEST_PATH}/tests - subdirs="test/unit test/integration test/stress " + subdirs="unit integration stress " for tooltest in ${subdirs} do - cp -r ${B}/${tooltest} ${D}${PTEST_PATH}/tests + cp -r ${B}/test/${tooltest} ${D}${PTEST_PATH}/tests + if find ${S}/test/${tooltest}/ -name '*.sh' -print -quit | grep -q .; then + cp ${S}/test/${tooltest}/*.sh ${D}${PTEST_PATH}/tests/${tooltest} + fi done find ${D}${PTEST_PATH}/tests \( -name "*.d" -o -name "*.o" \) -exec rm -f {} \; } diff --git a/meta-oe/recipes-devtools/jq/jq/0002-builtin-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch b/meta-oe/recipes-devtools/jq/jq/0002-builtin-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch index d2f999a728..e849436578 100644 --- a/meta-oe/recipes-devtools/jq/jq/0002-builtin-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch +++ b/meta-oe/recipes-devtools/jq/jq/0002-builtin-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch @@ -12,6 +12,8 @@ warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" Uptream-Status: Submitted [https://github.com/stedolan/jq/pull/2480] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/builtin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-Fix-build-with-libmicrohttpd.patch b/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-Fix-build-with-libmicrohttpd.patch deleted file mode 100644 index a4cacb3fc0..0000000000 --- a/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-Fix-build-with-libmicrohttpd.patch +++ /dev/null @@ -1,52 +0,0 @@ -From d983161415f5f5748fbdbaa5fbd168154ccf8867 Mon Sep 17 00:00:00 2001 -From: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> -Date: Wed, 5 Aug 2020 12:31:24 +0900 -Subject: [PATCH] Fix build with libmicrohttpd 0.9.71 - ---- - src/jsonrpccpp/server/connectors/httpserver.cpp | 2 +- - src/jsonrpccpp/server/connectors/httpserver.h | 8 +++++++- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/jsonrpccpp/server/connectors/httpserver.cpp b/src/jsonrpccpp/server/connectors/httpserver.cpp -index a849615..dd3b841 100644 ---- a/src/jsonrpccpp/server/connectors/httpserver.cpp -+++ b/src/jsonrpccpp/server/connectors/httpserver.cpp -@@ -151,7 +151,7 @@ void HttpServer::SetUrlHandler(const string &url, - this->SetHandler(NULL); - } - --int HttpServer::callback(void *cls, MHD_Connection *connection, const char *url, -+mhd_result HttpServer::callback(void *cls, MHD_Connection *connection, const char *url, - const char *method, const char *version, - const char *upload_data, size_t *upload_data_size, - void **con_cls) { -diff --git a/src/jsonrpccpp/server/connectors/httpserver.h b/src/jsonrpccpp/server/connectors/httpserver.h -index 7785edb..0dcf032 100644 ---- a/src/jsonrpccpp/server/connectors/httpserver.h -+++ b/src/jsonrpccpp/server/connectors/httpserver.h -@@ -32,6 +32,12 @@ typedef intptr_t ssize_t; - #include <map> - #include <microhttpd.h> - -+#if MHD_VERSION >= 0x00097002 -+# define mhd_result enum MHD_Result -+#else -+# define mhd_result int -+#endif -+ - namespace jsonrpc { - /** - * This class provides an embedded HTTP Server, based on libmicrohttpd, to -@@ -79,7 +85,7 @@ private: - std::map<std::string, IClientConnectionHandler *> urlhandler; - struct sockaddr_in loopback_addr; - -- static int callback(void *cls, struct MHD_Connection *connection, -+ static mhd_result callback(void *cls, struct MHD_Connection *connection, - const char *url, const char *method, const char *version, - const char *upload_data, size_t *upload_data_size, - void **con_cls); --- -2.25.1 - diff --git a/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.3.0.bb b/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.4.1.bb index 43dc2e36a4..544922f05d 100644 --- a/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.3.0.bb +++ b/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.4.1.bb @@ -9,11 +9,9 @@ SECTION = "libs" DEPENDS = "curl jsoncpp libmicrohttpd hiredis" -SRC_URI = "git://github.com/cinemast/libjson-rpc-cpp;branch=master;protocol=https \ - file://0001-Fix-build-with-libmicrohttpd.patch \ -" +SRC_URI = "git://github.com/cinemast/libjson-rpc-cpp;branch=master;protocol=https" -SRCREV = "c696f6932113b81cd20cd4a34fdb1808e773f23e" +SRCREV = "ec5ce12fc9c0299e1454cc002c70218b5a6f005b" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.6.0.bb b/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.6.0.bb index 8929115fd7..2e06b701cc 100644 --- a/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.6.0.bb +++ b/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.6.0.bb @@ -16,3 +16,5 @@ DEPENDS = "openssl" inherit cmake EXTRA_OECMAKE += "-DJWT_BUILD_EXAMPLES=OFF -DJWT_CMAKE_FILES_INSTALL_DIR=${libdir}/cmake" + +BBCLASSEXTEND = "nativesdk" diff --git a/meta-oe/recipes-devtools/libubox/libubox/0001-version-libraries.patch b/meta-oe/recipes-devtools/libubox/libubox/0001-version-libraries.patch index 02117fa8d6..f82c31ad07 100644 --- a/meta-oe/recipes-devtools/libubox/libubox/0001-version-libraries.patch +++ b/meta-oe/recipes-devtools/libubox/libubox/0001-version-libraries.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff --git a/CMakeLists.txt b/CMakeLists.txt index 57804cf..1aa7f27 100644 --- a/CMakeLists.txt diff --git a/meta-oe/recipes-devtools/lshw/files/0001-disable-docbook2man.patch b/meta-oe/recipes-devtools/lshw/files/0001-disable-docbook2man.patch index 00f7b8674e..706f2d5248 100644 --- a/meta-oe/recipes-devtools/lshw/files/0001-disable-docbook2man.patch +++ b/meta-oe/recipes-devtools/lshw/files/0001-disable-docbook2man.patch @@ -5,7 +5,7 @@ Subject: [PATCH] build: Do not build .sgml file It needs docbook2man tool which we do not have recipe for -Upstream-Status: OE-Specific [needs native docbook2man tool] +Upstream-Status: Inappropriate [needs native docbook2man tool] Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> --- diff --git a/meta-oe/recipes-devtools/lshw/lshw_02.19.2.bb b/meta-oe/recipes-devtools/lshw/lshw_02.19.2.bb index f2de593cf1..f5eda17f48 100644 --- a/meta-oe/recipes-devtools/lshw/lshw_02.19.2.bb +++ b/meta-oe/recipes-devtools/lshw/lshw_02.19.2.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64|riscv64).*-linux" PV .= "+git${SRCPV}" -SRCREV = "42fef565731411a784101de614a54bff79d1858e" +SRCREV = "b4e067307906ec6f277cce5c8a882f5edd03cbbc" SRC_URI = " \ git://github.com/lyonel/lshw.git;protocol=https;branch=master \ file://0001-disable-docbook2man.patch \ @@ -29,7 +29,7 @@ PACKAGECONFIG[sqlite] = "SQLITE=1,SQLITE=0,sqlite3" PACKAGECONFIG[zlib] = "ZLIB=1,ZLIB=0,zlib gzip-native" # use the PACKAGECONFIG configurations arguments -EXTRA_OEMAKE = "${PACKAGECONFIG_CONFARGS}" +EXTRA_OEMAKE = "${PACKAGECONFIG_CONFARGS} RPM_OPT_FLAGS='${CFLAGS}'" do_compile() { # build core only - don't ship gui diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-ARM-code-has-unreachable-code-after-switch-statement.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-ARM-code-has-unreachable-code-after-switch-statement.patch index 4d0e0392f7..c896e3ebb0 100644 --- a/meta-oe/recipes-devtools/ltrace/ltrace/0001-ARM-code-has-unreachable-code-after-switch-statement.patch +++ b/meta-oe/recipes-devtools/ltrace/ltrace/0001-ARM-code-has-unreachable-code-after-switch-statement.patch @@ -11,6 +11,8 @@ sysdeps/linux-gnu/arm/trace.c:173:33: error: statement will never be executed [- 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/meta-oe/recipes-devtools/ltrace/ltrace/0001-Fix-type-of-single-bit-bitfields.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-Fix-type-of-single-bit-bitfields.patch new file mode 100644 index 0000000000..61932269bd --- /dev/null +++ b/meta-oe/recipes-devtools/ltrace/ltrace/0001-Fix-type-of-single-bit-bitfields.patch @@ -0,0 +1,86 @@ +From 491b3b153f6b5cbf2d23a9778e5676eb29a6705f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 6 Feb 2023 16:37:19 -0800 +Subject: [PATCH] Fix type of single bit bitfields + +clang16 warns +trace.c:311:22: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion] + +quash the warning by using an unsigned type to allow +an assignment of 0 or 1 without implicit conversion. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + library.h | 6 +++--- + prototype.h | 2 +- + sysdeps/linux-gnu/trace.h | 10 +++++----- + 3 files changed, 9 insertions(+), 9 deletions(-) + +--- a/library.h ++++ b/library.h +@@ -71,20 +71,20 @@ struct library_symbol { + * looking up one in LIB->protolib. */ + struct prototype *proto; + +- int own_name : 1; ++ unsigned int own_name : 1; + + /* This is relevant for PLT symbols. Latent PLT symbols are + * those that don't match any of the -e rules, but that might + * potentially become active if a library implementing them + * appears that matches a -l rule. Ltrace core is responsible + * for clearing latent flag. */ +- int latent : 1; ++ unsigned latent : 1; + + /* Delayed symbols are those for which a breakpoint shouldn't + * be enabled yet. They are similar to latent symbols, but + * backend is responsible for clearing the delayed flag. See + * proc_activate_delayed_symbol. */ +- int delayed : 1; ++ unsigned int delayed : 1; + + struct arch_library_symbol_data arch; + struct os_library_symbol_data os; +--- a/prototype.h ++++ b/prototype.h +@@ -162,7 +162,7 @@ struct protolib_cache { + + /* For tracking uses of cache during cache's own + * initialization. */ +- int bootstrap : 1; ++ unsigned int bootstrap : 1; + }; + + /* Initialize CACHE. Returns 0 on success or a negative value on +--- a/sysdeps/linux-gnu/trace.h ++++ b/sysdeps/linux-gnu/trace.h +@@ -33,11 +33,11 @@ + struct pid_task { + pid_t pid; /* This may be 0 for tasks that exited + * mid-handling. */ +- int sigstopped : 1; +- int got_event : 1; +- int delivered : 1; +- int vforked : 1; +- int sysret : 1; ++ unsigned int sigstopped : 1; ++ unsigned int got_event : 1; ++ unsigned int delivered : 1; ++ unsigned int vforked : 1; ++ unsigned int sysret : 1; + }; + + struct pid_set { +--- a/sysdeps/linux-gnu/trace.c ++++ b/sysdeps/linux-gnu/trace.c +@@ -1043,7 +1043,7 @@ ltrace_exiting_install_handler(struct pr + struct process_vfork_handler + { + struct event_handler super; +- int vfork_bp_refd:1; ++ unsigned int vfork_bp_refd:1; + }; + + static Event * diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-Use-correct-enum-type.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-Use-correct-enum-type.patch index 01a35842c8..38a7d055dc 100644 --- a/meta-oe/recipes-devtools/ltrace/ltrace/0001-Use-correct-enum-type.patch +++ b/meta-oe/recipes-devtools/ltrace/ltrace/0001-Use-correct-enum-type.patch @@ -7,6 +7,8 @@ Clang warns about wrong enum initializtion Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + sysdeps/linux-gnu/aarch64/fetch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-configure-Recognise-linux-musl-as-a-host-OS.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-configure-Recognise-linux-musl-as-a-host-OS.patch index 52264a17e6..f3a6d9e599 100644 --- a/meta-oe/recipes-devtools/ltrace/ltrace/0001-configure-Recognise-linux-musl-as-a-host-OS.patch +++ b/meta-oe/recipes-devtools/ltrace/ltrace/0001-configure-Recognise-linux-musl-as-a-host-OS.patch @@ -5,6 +5,8 @@ Subject: [PATCH] configure: Recognise linux-musl as a host OS Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-mips-plt.c-Delete-include-error.h.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-mips-plt.c-Delete-include-error.h.patch index 76ba7de785..ce4dcf8a98 100644 --- a/meta-oe/recipes-devtools/ltrace/ltrace/0001-mips-plt.c-Delete-include-error.h.patch +++ b/meta-oe/recipes-devtools/ltrace/ltrace/0001-mips-plt.c-Delete-include-error.h.patch @@ -7,6 +7,8 @@ Its not needed Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + sysdeps/linux-gnu/mips/plt.c | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-ppc-Remove-unused-host_powerpc64-function.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-ppc-Remove-unused-host_powerpc64-function.patch index 39e1f77a0a..35062debf2 100644 --- a/meta-oe/recipes-devtools/ltrace/ltrace/0001-ppc-Remove-unused-host_powerpc64-function.patch +++ b/meta-oe/recipes-devtools/ltrace/ltrace/0001-ppc-Remove-unused-host_powerpc64-function.patch @@ -8,6 +8,8 @@ with clang Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + sysdeps/linux-gnu/ppc/plt.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0002-Fix-const-qualifier-error.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0002-Fix-const-qualifier-error.patch index c152771923..f78db5b0db 100644 --- a/meta-oe/recipes-devtools/ltrace/ltrace/0002-Fix-const-qualifier-error.patch +++ b/meta-oe/recipes-devtools/ltrace/ltrace/0002-Fix-const-qualifier-error.patch @@ -8,6 +8,8 @@ error: duplicate 'const' declaration specifier [-Werror,-Wduplicate-decl-specifi Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + dict.h | 2 +- library.c | 2 +- vect.h | 2 +- diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/add_ppc64le.patch b/meta-oe/recipes-devtools/ltrace/ltrace/add_ppc64le.patch index dff61b1502..dcd0285db6 100644 --- a/meta-oe/recipes-devtools/ltrace/ltrace/add_ppc64le.patch +++ b/meta-oe/recipes-devtools/ltrace/ltrace/add_ppc64le.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/sysdeps/linux-gnu/ppc/ptrace.h +++ b/sysdeps/linux-gnu/ppc/ptrace.h @@ -18,4 +18,5 @@ diff --git a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb index 72bec301fb..d690dd4f02 100644 --- a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb +++ b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb @@ -14,7 +14,7 @@ PV = "7.91+git${SRCPV}" SRCREV = "c22d359433b333937ee3d803450dc41998115685" DEPENDS = "elfutils" -SRC_URI = "git://github.com/sparkleholic/ltrace.git;branch=master;protocol=http;protocol=https \ +SRC_URI = "git://github.com/sparkleholic/ltrace.git;protocol=https;branch=master \ file://configure-allow-to-disable-selinux-support.patch \ file://0001-replace-readdir_r-with-readdir.patch \ file://0001-Use-correct-enum-type.patch \ @@ -31,6 +31,7 @@ SRC_URI = "git://github.com/sparkleholic/ltrace.git;branch=master;protocol=http; 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 \ " SRC_URI:append:libc-musl = " file://add_ppc64le.patch" diff --git a/meta-oe/recipes-devtools/makeself/makeself_2.4.5.bb b/meta-oe/recipes-devtools/makeself/makeself_2.5.0.bb index 4cfe2ecca3..f94025dd05 100644 --- a/meta-oe/recipes-devtools/makeself/makeself_2.4.5.bb +++ b/meta-oe/recipes-devtools/makeself/makeself_2.5.0.bb @@ -12,7 +12,7 @@ SRC_URI = "\ git://github.com/megastep/${BPN}.git;protocol=https;branch=master \ " -SRCREV = "5742be6410bfad2c619fb1e98bf795e8fa0913c7" +SRCREV = "09488c50c6bdc40aec8e3a9b23a539c5054a634c" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-devtools/mbpoll/mbpoll_1.5.2.bb b/meta-oe/recipes-devtools/mbpoll/mbpoll_1.5.2.bb new file mode 100644 index 0000000000..028a8f9e46 --- /dev/null +++ b/meta-oe/recipes-devtools/mbpoll/mbpoll_1.5.2.bb @@ -0,0 +1,16 @@ +SUMMARY = "Command line utility to communicate with ModBus slave (RTU or TCP)" +DESCRIPTION = "mbpoll can: read discrete inputs; read and write binary outputs \ +(coil); read input registers; read and write output registers (holding register). \ +The reading and writing registers may be in decimal, hexadecimal or floating single \ +precision." +LICENSE = "GPL-3.0-only" +HOMEPAGE = "https://github.com/epsilonrt/mbpoll" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" +DEPENDS = "libmodbus (>=3.1.4)" + +SRC_URI = "git://github.com/epsilonrt/mbpoll;protocol=https;branch=master" +SRCREV = "a0bd6c08d3d15b086f2104477295c0705aed366a" + +S = "${WORKDIR}/git" + +inherit pkgconfig cmake diff --git a/meta-oe/recipes-devtools/mcpp/files/CVE-2019-14274.patch b/meta-oe/recipes-devtools/mcpp/files/CVE-2019-14274.patch index a0c6584ecb..b1e05c59d5 100644 --- a/meta-oe/recipes-devtools/mcpp/files/CVE-2019-14274.patch +++ b/meta-oe/recipes-devtools/mcpp/files/CVE-2019-14274.patch @@ -4,6 +4,8 @@ Date: Tue, 4 Feb 2014 11:00:40 -0800 Subject: [PATCH] line comment bug --- +Upstream-Status: Pending + src/support.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/mcpp/files/ice-mcpp.patch b/meta-oe/recipes-devtools/mcpp/files/ice-mcpp.patch index 1df3ae55bc..36cc2bd64d 100644 --- a/meta-oe/recipes-devtools/mcpp/files/ice-mcpp.patch +++ b/meta-oe/recipes-devtools/mcpp/files/ice-mcpp.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -r -c -N ../mcpp-2.7.2-old/noconfig/vc2010.dif ./noconfig/vc2010.dif *** ../mcpp-2.7.2-old/noconfig/vc2010.dif Wed Dec 31 20:30:00 1969 --- ./noconfig/vc2010.dif Fri May 14 12:47:22 2010 diff --git a/meta-oe/recipes-devtools/memstat/memstat/0001-Include-limits.h-for-PATH_MAX-definition.patch b/meta-oe/recipes-devtools/memstat/memstat/0001-Include-limits.h-for-PATH_MAX-definition.patch index 9a0a17e0e4..907ac9edbd 100644 --- a/meta-oe/recipes-devtools/memstat/memstat/0001-Include-limits.h-for-PATH_MAX-definition.patch +++ b/meta-oe/recipes-devtools/memstat/memstat/0001-Include-limits.h-for-PATH_MAX-definition.patch @@ -9,6 +9,8 @@ error: use of undeclared identifier 'PATH_MAX' Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + memstat.c | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-devtools/mercurial/mercurial_6.1.bb b/meta-oe/recipes-devtools/mercurial/mercurial_6.1.bb index 3abecc3054..a415ebc1e8 100644 --- a/meta-oe/recipes-devtools/mercurial/mercurial_6.1.bb +++ b/meta-oe/recipes-devtools/mercurial/mercurial_6.1.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "python3 python3-native" RDEPENDS:${PN} = "python3 python3-modules" -inherit python3native +inherit python3native python3targetconfig SRC_URI = "https://www.mercurial-scm.org/release/${BP}.tar.gz" SRC_URI[sha256sum] = "86f98645e4565a9256991dcde22b77b8e7d22ca6fbb60c1f4cdbd8469a38cc1f" diff --git a/meta-oe/recipes-devtools/mpich/mpich_4.0.3.bb b/meta-oe/recipes-devtools/mpich/mpich_4.0.3.bb deleted file mode 100644 index 000f739812..0000000000 --- a/meta-oe/recipes-devtools/mpich/mpich_4.0.3.bb +++ /dev/null @@ -1,58 +0,0 @@ -SUMMARY = "Message Passing Interface (MPI) implementation" -HOMEPAGE = "http://www.mpich.org/" -SECTION = "devel" - -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=bd4d7ab13df98988b1ca2a4e01c8c163" - -SRC_URI = "http://www.mpich.org/static/downloads/${PV}/mpich-${PV}.tar.gz" -SRC_URI[sha256sum] = "17406ea90a6ed4ecd5be39c9ddcbfac9343e6ab4f77ac4e8c5ebe4a3e3b6c501" - -RDEPENDS:${PN} += "bash perl libxml2" - -EXTRA_OECONF = "--enable-debuginfo \ - --enable-fast \ - --enable-shared \ - --with-pm=gforker \ - --disable-rpath \ - --disable-f77 \ - --disable-fc \ - --disable-fortran \ - --disable-cxx \ - BASH_SHELL='${USRBINPATH}/env bash' \ - PERL='${USRBINPATH}/env perl' \ - --with-device=ch3:nemesis \ - --with-rdmacm=no \ - --disable-numa \ -" - -PACKAGECONFIG += " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ -" -PACKAGECONFIG[x11] = "--with-x --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--without-x,virtual/libx11" - -# libmpi.so needs symbols like __multf3 and somehow it does not respect --rtlib option passed by clang -LDFLAGS:append:x86-64 = " -lgcc" -LDFLAGS:append:x86 = " -lgcc" - -inherit autotools gettext pkgconfig - -do_configure() { - for d in confdb test/mpi test/mpi/confdb src/pm/hydra/confdb \ - src/pm/hydra/tools/topo/hwloc/hwloc/config src/pm/hydra/mpl/confdb \ - modules/yaksa/m4 modules/json-c modules/ucx modules/hwloc/config \ - test/mpi/dtpools/confdb src/mpl/confdb src/mpi/romio/confdb; do - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/$d - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/$d - done -# cd ${S} -# autoupdate -# autoreconf --verbose --install --force -# cd ${B} - oe_runconf -} - -do_install:append() { - sed -i 's,${S}/,,g' ${D}/${libdir}/libmpi.la - sed -i 's,${DEBUG_PREFIX_MAP},,g' ${D}/${libdir}/pkgconfig/mpich.pc -} diff --git a/meta-oe/recipes-devtools/mpich/mpich_4.1.2.bb b/meta-oe/recipes-devtools/mpich/mpich_4.1.2.bb new file mode 100644 index 0000000000..ac8094d118 --- /dev/null +++ b/meta-oe/recipes-devtools/mpich/mpich_4.1.2.bb @@ -0,0 +1,67 @@ +SUMMARY = "Message Passing Interface (MPI) implementation" +HOMEPAGE = "http://www.mpich.org/" +SECTION = "devel" + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=f1804c45b8b4e816e53eb1f175d810f3" + +SRC_URI = "http://www.mpich.org/static/downloads/${PV}/mpich-${PV}.tar.gz" +SRC_URI[sha256sum] = "3492e98adab62b597ef0d292fb2459b6123bc80070a8aa0a30be6962075a12f0" + +RDEPENDS:${PN} += "bash perl libxml2" + +EXTRA_OECONF = "--enable-debuginfo \ + --enable-fast \ + --enable-shared \ + --with-pm=gforker \ + BASH_SHELL='${USRBINPATH}/env bash' \ + PERL='${USRBINPATH}/env perl' \ + --with-device=ch3:nemesis \ +" + +PACKAGECONFIG ??= "" + +PACKAGECONFIG[cxx] = "--enable-cxx,--disable-cxx" +PACKAGECONFIG[fortran] = "--with-cross=${WORKDIR}/cross_values.txt --enable-fortran,--disable-f77 --disable-fortran,libgfortran" + +# libmpi.so needs symbols like __multf3 and somehow it does not respect --rtlib option passed by clang +LDFLAGS:append:x86-64 = " -lgcc" +LDFLAGS:append:x86 = " -lgcc" + +inherit autotools gettext pkgconfig qemu + +DEPENDS += "qemu-native" + +do_configure() { + if [ "${@bb.utils.contains('PACKAGECONFIG', 'fortran', '1', '', d)}" = "1" ]; then + qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}" + cat > ${WORKDIR}/qemuwrapper << EOF +#!/bin/sh +$qemu_binary "\$@" +EOF + chmod +x ${WORKDIR}/qemuwrapper + + sed -i 's:my \(.*\) ./t`;:my \1 ${WORKDIR}/qemuwrapper ${WORKDIR}/t`;:' ${S}/maint/gen_cross.pl + + cd ${WORKDIR} + perl ${S}/maint/gen_cross.pl + + sed -i 's:\(CROSS_F90_INTEGER_MODEL_MAP=.*\) }"$:\1 }, ":' ${WORKDIR}/cross_values.txt + fi + + cd ${S} + ./autogen.sh + + cd ${B} + oe_runconf + sed -i -e 's,${WORKDIR},,g' ${B}/src/include/mpichinfo.h +} + +do_install:append() { + sed -i 's,${S}/,,g' ${D}/${libdir}/libmpi.la + sed -i 's,${DEBUG_PREFIX_MAP},,g' ${D}${bindir}/mpicxx + sed -i 's,${DEBUG_PREFIX_MAP},,g' ${D}${bindir}/mpicc + sed -i 's,${DEBUG_PREFIX_MAP},,g' ${D}/${libdir}/pkgconfig/mpich.pc + sed -i 's,${RECIPE_SYSROOT},/,g' ${D}${bindir}/mpicc + sed -i 's,${RECIPE_SYSROOT},/,g' ${D}${bindir}/mpicxx +} diff --git a/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.2.bb b/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.2.bb index 502262820a..6cf27755e8 100644 --- a/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.2.bb +++ b/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.2.bb @@ -18,7 +18,7 @@ inherit cmake EXTRA_OECMAKE += "-DJSON_BuildTests=OFF" # nlohmann-json is a header only C++ library, so the main package will be empty. - +ALLOW_EMPTY:${PN} = "1" RDEPENDS:${PN}-dev = "" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-18.12/oe-npm-cache b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-18.16/oe-npm-cache index f596207648..f596207648 100755 --- a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-18.12/oe-npm-cache +++ b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-18.16/oe-npm-cache diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_18.12.bb b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_18.16.bb index a61dd5018f..a61dd5018f 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_18.12.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_18.16.bb diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch index d6e439ba22..12f6cd8b96 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch @@ -3,20 +3,44 @@ From: Zuzana Svetlikova <zsvetlik@redhat.com> Date: Thu, 27 Apr 2017 14:25:42 +0200 Subject: [PATCH] Disable running gyp on shared deps +Upstream-Status: Inappropriate [embedded specific] + +Probably imported from: +https://src.fedoraproject.org/rpms/nodejs/c/41af04f2a3c050fb44628e91ac65fd225b927acb?branch=22609d8c1bfeaa21fe0057645af20b3a2ccc7f53 +which is probably based on dont-run-gyp-files-for-bundled-deps.patch added in: +https://github.com/alpinelinux/aports/commit/6662eb3199902e8451fb20dce82554ad96f796bb + +We also explicitly prune some dependencies from source in the bitbake recipe: + +python prune_sources() { + import shutil + + shutil.rmtree(d.getVar('S') + '/deps/openssl') + if 'ares' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/deps/cares') + if 'brotli' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/deps/brotli') + if 'libuv' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/deps/uv') + if 'nghttp2' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/deps/nghttp2') + if 'zlib' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/deps/zlib') +} +do_unpack[postfuncs] += "prune_sources" + --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/Makefile b/Makefile -index 93d63110..79caaec2 100644 --- a/Makefile +++ b/Makefile -@@ -138,7 +138,7 @@ with-code-cache test-code-cache: +@@ -169,7 +169,7 @@ with-code-cache test-code-cache: $(warning '$@' target is a noop) out/Makefile: config.gypi common.gypi node.gyp \ - deps/uv/uv.gyp deps/llhttp/llhttp.gyp deps/zlib/zlib.gyp \ + deps/llhttp/llhttp.gyp \ + deps/simdutf/simdutf.gyp deps/ada/ada.gyp \ tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \ tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp - $(PYTHON) tools/gyp_node.py -f make diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Using-native-binaries.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Using-native-binaries.patch index feafe38fdb..66e10a0d00 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Using-native-binaries.patch +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Using-native-binaries.patch @@ -3,6 +3,13 @@ From: Guillaume Burel <guillaume.burel@stormshield.eu> Date: Fri, 3 Jan 2020 11:25:54 +0100 Subject: [PATCH] Using native binaries +Upstream-Status: Inappropriate [embedded specific] + +Originally added in: +https://git.openembedded.org/meta-openembedded/commit/?id=1c8e4a679ae382f953b2e5c7a4966a4646314f3e +later extended and renamed in: +https://git.openembedded.org/meta-openembedded/commit/?id=feeb172d1a8bf010490d22b8df9448b20d9d2aed + Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com> --- node.gyp | 1 + diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch index 4773f05109..dd9c9015e2 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch @@ -7,6 +7,8 @@ clang does not support this option Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + common.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/mips-less-memory.patch b/meta-oe/recipes-devtools/nodejs/nodejs/mips-less-memory.patch index 56e93c50cf..16776cb762 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs/mips-less-memory.patch +++ b/meta-oe/recipes-devtools/nodejs/nodejs/mips-less-memory.patch @@ -6,6 +6,11 @@ Forwarded: https://bugs.chromium.org/p/v8/issues/detail?id=10586 This ensures that we reserve 500M instead of 2G range for codegen ensures that qemu-mips can allocate such large ranges +Upstream-Status: Inappropriate [embedded specific] + +Imported from debian https://salsa.debian.org/js-team/nodejs/-/blob/master-12.x/debian/patches/mips-less-memory.patch +https://buildd.debian.org/status/fetch.php?pkg=nodejs&arch=mipsel&ver=12.17.0~dfsg-2&stamp=1591050388&raw=0 + Signed-off-by: Khem Raj <raj.khem@gmail.com> --- a/deps/v8/src/common/globals.h diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/run-ptest b/meta-oe/recipes-devtools/nodejs/nodejs/run-ptest new file mode 100755 index 0000000000..07a8f2a99c --- /dev/null +++ b/meta-oe/recipes-devtools/nodejs/nodejs/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +./cctest diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_18.16.0.bb index e96913e563..3adb51549e 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_18.16.0.bb @@ -1,9 +1,11 @@ DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" HOMEPAGE = "http://nodejs.org" -LICENSE = "MIT & ISC & BSD-2-Clause & BSD-3-Clause & Artistic-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=dfd7ae796baf5326016a3865ee1dc632" +LICENSE = "MIT & ISC & BSD-2-Clause & BSD-3-Clause & Artistic-2.0 & Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0be148d0e7298c5c94f7501affafbce5" -DEPENDS = "openssl" +CVE_PRODUCT = "nodejs node.js" + +DEPENDS = "openssl file-replacement-native" DEPENDS:append:class-target = " qemu-native" DEPENDS:append:class-native = " c-ares-native" @@ -25,6 +27,7 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://system-c-ares.patch \ file://0001-liftoff-Correct-function-signatures.patch \ file://0001-mips-Use-32bit-cast-for-operand-on-mips32.patch \ + file://run-ptest \ " SRC_URI:append:class-target = " \ @@ -36,7 +39,7 @@ SRC_URI:append:toolchain-clang:x86 = " \ SRC_URI:append:toolchain-clang:powerpc64le = " \ file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \ " -SRC_URI[sha256sum] = "4fa406451bc52659a290e52cfdb2162a760bd549da4b8bbebe6a29f296d938df" +SRC_URI[sha256sum] = "33d81a233e235a509adda4a4f2209008d04591979de6b3f0f67c1c906093f118" S = "${WORKDIR}/node-v${PV}" @@ -76,9 +79,9 @@ PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" # and we need to use the right flags during host compile, # too. EXTRA_OEMAKE = "\ - CC.host='${CC}' \ + CC.host='${CC} -pie -fPIE' \ CFLAGS.host='${CPPFLAGS} ${CFLAGS}' \ - CXX.host='${CXX}' \ + CXX.host='${CXX} -pie -fPIE' \ CXXFLAGS.host='${CPPFLAGS} ${CXXFLAGS}' \ LDFLAGS.host='${LDFLAGS}' \ AR.host='${AR}' \ @@ -86,22 +89,24 @@ EXTRA_OEMAKE = "\ builddir_name=./ \ " -python do_unpack() { +EXTRANATIVEPATH += "file-native" + +python prune_sources() { import shutil - bb.build.exec_func('base_do_unpack', d) - shutil.rmtree(d.getVar('S') + '/deps/openssl', True) + shutil.rmtree(d.getVar('S') + '/deps/openssl') if 'ares' in d.getVar('PACKAGECONFIG'): - shutil.rmtree(d.getVar('S') + '/deps/cares', True) + shutil.rmtree(d.getVar('S') + '/deps/cares') if 'brotli' in d.getVar('PACKAGECONFIG'): - shutil.rmtree(d.getVar('S') + '/deps/brotli', True) + shutil.rmtree(d.getVar('S') + '/deps/brotli') if 'libuv' in d.getVar('PACKAGECONFIG'): - shutil.rmtree(d.getVar('S') + '/deps/uv', True) + shutil.rmtree(d.getVar('S') + '/deps/uv') if 'nghttp2' in d.getVar('PACKAGECONFIG'): - shutil.rmtree(d.getVar('S') + '/deps/nghttp2', True) + shutil.rmtree(d.getVar('S') + '/deps/nghttp2') if 'zlib' in d.getVar('PACKAGECONFIG'): - shutil.rmtree(d.getVar('S') + '/deps/zlib', True) + shutil.rmtree(d.getVar('S') + '/deps/zlib') } +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 @@ -114,7 +119,7 @@ python do_create_v8_qemu_wrapper () { on the host.""" qemu_libdirs = [d.expand('${STAGING_DIR_HOST}${libdir}'), d.expand('${STAGING_DIR_HOST}${base_libdir}')] - qemu_cmd = qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST', True), + qemu_cmd = qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), qemu_libdirs) wrapper_path = d.expand('${B}/v8-qemu-wrapper.sh') with open(wrapper_path, 'w') as wrapper_file: @@ -134,24 +139,26 @@ addtask create_v8_qemu_wrapper after do_configure before do_compile LDFLAGS:append:x86 = " -latomic" +CROSS_FLAGS = "--cross-compiling" +CROSS_FLAGS:class-native = "--no-cross-compiling" + # Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi do_configure () { - export LD="${CXX}" GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES # $TARGET_ARCH settings don't match --dest-cpu settings - python3 configure.py --prefix=${prefix} --cross-compiling \ + python3 configure.py --verbose --prefix=${prefix} \ --shared-openssl \ --without-dtrace \ --without-etw \ --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \ --dest-os=linux \ - --libdir=${D}${libdir} \ + --libdir=${baselib} \ + ${CROSS_FLAGS} \ ${ARCHFLAGS} \ ${PACKAGECONFIG_CONFARGS} } do_compile () { - export LD="${CXX}" install -D ${RECIPE_SYSROOT_NATIVE}/etc/ssl/openssl.cnf ${B}/deps/openssl/nodejs-openssl.cnf install -D ${B}/v8-qemu-wrapper.sh ${B}/out/Release/v8-qemu-wrapper.sh oe_runmake BUILDTYPE=Release @@ -167,21 +174,8 @@ do_install_ptest () { chown -R root:root ${D}${PTEST_PATH} } -BINARIES = " \ - bytecode_builtins_list_generator \ - ${@bb.utils.contains('PACKAGECONFIG', 'icu', 'gen-regexp-special-case', '', d)} \ - node_mksnapshot \ - torque \ -" - -do_install:append:class-native() { - # Install the native binaries to provide it within sysroot for the target compilation - install -d ${D}${bindir} - (cd ${S}/out/Release && install ${BINARIES} ${D}${bindir}) -} - PACKAGES =+ "${PN}-npm" -FILES:${PN}-npm = "${nonarch_libdir}/node_modules ${bindir}/npm ${bindir}/npx" +FILES:${PN}-npm = "${nonarch_libdir}/node_modules ${bindir}/npm ${bindir}/npx ${bindir}/corepack" RDEPENDS:${PN}-npm = "bash python3-core python3-shell python3-datetime \ python3-misc python3-multiprocessing" diff --git a/meta-oe/recipes-devtools/octave/files/fix-blas-library-integer-size.patch b/meta-oe/recipes-devtools/octave/files/fix-blas-library-integer-size.patch index e89d7d3466..4189d4083a 100644 --- a/meta-oe/recipes-devtools/octave/files/fix-blas-library-integer-size.patch +++ b/meta-oe/recipes-devtools/octave/files/fix-blas-library-integer-size.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -Naur octave-4.4.1.orig/configure.ac octave-4.4.1/configure.ac --- octave-4.4.1.orig/configure.ac 2019-02-23 10:46:24.287240571 +0000 +++ octave-4.4.1/configure.ac 2019-02-23 10:46:42.255249333 +0000 diff --git a/meta-oe/recipes-devtools/openocd/openocd/0001-autosetup-cc-check-tools-check-only-the-name.patch b/meta-oe/recipes-devtools/openocd/openocd/0001-autosetup-cc-check-tools-check-only-the-name.patch deleted file mode 100644 index 165c658d08..0000000000 --- a/meta-oe/recipes-devtools/openocd/openocd/0001-autosetup-cc-check-tools-check-only-the-name.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 29e8dfae4593c91f11d7ea31a4722a6d82f6c950 Mon Sep 17 00:00:00 2001 -From: Kory Maincent <kory.maincent@bootlin.com> -Date: Wed, 2 Nov 2022 16:39:30 +0100 -Subject: [PATCH] autosetup: cc-check-tools: check only the name of the tool - without its params - -Update the tool existence check. Test only the first word of the -args to keep only the executable without its parameters. - -Signed-off-by: Kory Maincent <kory.maincent@bootlin.com> ---- - autosetup/cc.tcl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/jimtcl/autosetup/cc.tcl b/jimtcl/autosetup/cc.tcl -index 585d259..4c87854 100644 ---- a/jimtcl/autosetup/cc.tcl -+++ b/jimtcl/autosetup/cc.tcl -@@ -264,7 +264,7 @@ proc cc-check-tools {args} { - foreach tool $args { - set TOOL [string toupper $tool] - set exe [get-env $TOOL [get-define cross]$tool] -- if {[find-executable {*}$exe]} { -+ if {[find-executable {*}[regexp -inline {\S+} $exe]]} { - define $TOOL $exe - continue - } --- -2.25.1 - diff --git a/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-oe/recipes-devtools/openocd/openocd_git.bb index 06d77b6a9e..d30d9c3466 100644 --- a/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-oe/recipes-devtools/openocd/openocd_git.bb @@ -1,31 +1,30 @@ SUMMARY = "Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +LIC_FILES_CHKSUM = "file://COPYING;md5=599d2d1ee7fc84c0467b3d19801db870" DEPENDS = "libusb-compat libftdi" RDEPENDS:${PN} = "libusb1" SRC_URI = " \ git://repo.or.cz/openocd.git;protocol=http;name=openocd;branch=master \ git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl;branch=master \ - git://repo.or.cz/r/jimtcl.git;protocol=http;destsuffix=git/jimtcl;name=jimtcl;branch=master \ + git://github.com/msteveb/jimtcl.git;protocol=http;destsuffix=git/jimtcl;name=jimtcl;branch=master \ git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink;branch=master \ - file://0001-autosetup-cc-check-tools-check-only-the-name.patch \ " SRCREV_FORMAT = "openocd" -SRCREV_openocd = "f342aac0845a69d591ad39a025d74e9c765f6420" +SRCREV_openocd = "91bd4313444c5a949ce49d88ab487608df7d6c37" SRCREV_git2cl = "8373c9f74993e218a08819cbcdbab3f3564bbeba" -SRCREV_jimtcl = "0aa0fb4e3a38d38a49de9eb585d93d63a370dcf6" +SRCREV_jimtcl = "fcbb4499a6b46ef69e7a95da53e30796e20817f0" SRCREV_libjaylink = "9aa7a5957c07bb6e862fc1a6d3153d109c7407e4" -PV = "0.11+gitr${SRCPV}" +PV = "0.12+gitr${SRCPV}" S = "${WORKDIR}/git" inherit pkgconfig autotools-brokensep gettext BBCLASSEXTEND += "native nativesdk" -EXTRA_OECONF = "--enable-ftdi --disable-doxygen-html --disable-werror" +EXTRA_OECONF = "--enable-ftdi --enable-jtag_vpi --enable-buspirate --disable-doxygen-html --disable-werror" do_configure() { ./bootstrap nosubmodule diff --git a/meta-oe/recipes-devtools/pahole/files/0001-CMakeList.txt-make-python-optional.patch b/meta-oe/recipes-devtools/pahole/files/0001-CMakeList.txt-make-python-optional.patch deleted file mode 100644 index d64cba109f..0000000000 --- a/meta-oe/recipes-devtools/pahole/files/0001-CMakeList.txt-make-python-optional.patch +++ /dev/null @@ -1,44 +0,0 @@ -From f6ca8c930d0fbd2491b3cc77169e32806a14e5e9 Mon Sep 17 00:00:00 2001 -From: Matteo Croce <mcroce@microsoft.com> -Date: Mon, 30 Aug 2021 16:25:56 +0200 -Subject: [PATCH] CMakeList.txt: make python optional - -Upstream-Status: Backport [https://git.kernel.org/pub/scm/devel/pahole/pahole.git/commit/?id=88431099950ab3e8bc1645353508d7978a6cad35] - -ostra-cg, which requires python, is installed in the destination dir. -Make it optional for embedded distributions which doesn't have the -python interpreter available. - -Signed-off-by: Matteo Croce <mcroce@microsoft.com> ---- - CMakeLists.txt | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4140574..8523bce 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -61,6 +61,7 @@ find_package(DWARF REQUIRED) - find_package(ZLIB REQUIRED) - find_package(argp REQUIRED) - find_package(obstack REQUIRED) -+find_package(Python3 QUIET) - - # make sure git submodule(s) are checked out - find_package(Git QUIET) -@@ -185,8 +186,10 @@ install(FILES dwarves.h dwarves_emit.h dwarves_reorganize.h - elfcreator.h elf_symtab.h hash.h libctf.h - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/dwarves/) - install(FILES man-pages/pahole.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1/) --install(PROGRAMS ostra/ostra-cg DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) -+if(Python3_FOUND) -+ install(PROGRAMS ostra/ostra-cg DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) -+ install(FILES ostra/python/ostra.py DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dwarves/runtime/python) -+endif() - install(PROGRAMS btfdiff fullcircle DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) --install(FILES ostra/python/ostra.py DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dwarves/runtime/python) - install(FILES lib/Makefile lib/ctracer_relay.c lib/ctracer_relay.h lib/linux.blacklist.cu - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dwarves/runtime) --- -2.31.1 - diff --git a/meta-oe/recipes-devtools/pahole/files/0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch b/meta-oe/recipes-devtools/pahole/files/0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch index 54cd096e4f..4f7dfd4cca 100644 --- a/meta-oe/recipes-devtools/pahole/files/0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch +++ b/meta-oe/recipes-devtools/pahole/files/0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch @@ -3,7 +3,7 @@ From: Matteo Croce <mcroce@microsoft.com> Date: Wed, 15 Sep 2021 17:54:01 +0200 Subject: [PATCH] Use /usr/bin/env python3 instead of just /usr/bin/python3 -Upstream-Status: inappropriate [OE specific] +Upstream-Status: Inappropriate [OE specific] --- ostra/ostra-cg | 2 +- diff --git a/meta-oe/recipes-devtools/pahole/files/0003-CMakeList.txt-don-t-download-libbpf-source-when-syst.patch b/meta-oe/recipes-devtools/pahole/files/0003-CMakeList.txt-don-t-download-libbpf-source-when-syst.patch deleted file mode 100644 index 3d491e2ef2..0000000000 --- a/meta-oe/recipes-devtools/pahole/files/0003-CMakeList.txt-don-t-download-libbpf-source-when-syst.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3d20210d84f61ee2189927e2d9de9ce3e5a0a9c5 Mon Sep 17 00:00:00 2001 -From: Matteo Croce <mcroce@microsoft.com> -Date: Mon, 20 Sep 2021 18:44:52 +0200 -Subject: [PATCH] CMakeList.txt: Don't download libbpf source when system - library is used - -Upstream-Status: Backport [https://git.kernel.org/pub/scm/devel/pahole/pahole.git/commit/?id=3d20210d84f61ee2189927e2d9de9ce3e5a0a9c5] - -The build system always download the libbpf submodule, regardless if -we're using the embedded or the system version. -Download the libbpf source only if we're using the embedded one. - -Signed-off-by: Matteo Croce <mcroce@microsoft.com> -Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8523bce..2ab66e4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -65,7 +65,7 @@ find_package(Python3 QUIET) - - # make sure git submodule(s) are checked out - find_package(Git QUIET) --if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") -+if(LIBBPF_EMBEDDED AND GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") - # Update submodules as needed - option(GIT_SUBMODULE "Check submodules during build" ON) - if(GIT_SUBMODULE) --- -2.31.1 - diff --git a/meta-oe/recipes-devtools/pahole/pahole_1.22.bb b/meta-oe/recipes-devtools/pahole/pahole_1.24.bb index 449508a5d5..2bb73c3eb7 100644 --- a/meta-oe/recipes-devtools/pahole/pahole_1.22.bb +++ b/meta-oe/recipes-devtools/pahole/pahole_1.24.bb @@ -9,11 +9,10 @@ DEPENDS = "elfutils zlib libbpf" PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_HOST = "(x86_64|i.86|aarch64).*-linux" -SRCREV = "f02af2553ea58ae1186226af0d0ec835a248358f" +PV .= "+1.25+git${SRCPV}" +SRCREV = "a9498899109d3be14f17abbc322a8f55a1067bee" SRC_URI = "git://git.kernel.org/pub/scm/devel/pahole/pahole.git;branch=master \ - file://0001-CMakeList.txt-make-python-optional.patch \ - file://0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch \ - file://0003-CMakeList.txt-don-t-download-libbpf-source-when-syst.patch" + file://0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch" S = "${WORKDIR}/git" @@ -21,7 +20,7 @@ inherit cmake pkgconfig PACKAGECONFIG[python3] = ",,python3-core,python3-core" -EXTRA_OECMAKE = "-D__LIB=lib -DCMAKE_BUILD_TYPE=Release -DLIBBPF_EMBEDDED=OFF" +EXTRA_OECMAKE = "-D__LIB=${@os.path.relpath(d.getVar('libdir'), d.getVar('prefix') + '/')} -DCMAKE_BUILD_TYPE=Release -DLIBBPF_EMBEDDED=OFF" FILES:${PN} = "${bindir}/pahole \ ${libdir}/libdwarves.so* \ diff --git a/meta-oe/recipes-devtools/perfetto/files/0001-Add-missing-header-cstdint-for-uintXX_t-types.patch b/meta-oe/recipes-devtools/perfetto/files/0001-Add-missing-header-cstdint-for-uintXX_t-types.patch new file mode 100644 index 0000000000..d08721ae65 --- /dev/null +++ b/meta-oe/recipes-devtools/perfetto/files/0001-Add-missing-header-cstdint-for-uintXX_t-types.patch @@ -0,0 +1,58 @@ +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-oe/recipes-devtools/perfetto/files/0001-Remove-check_build_deps-build-steps.patch b/meta-oe/recipes-devtools/perfetto/files/0001-Remove-check_build_deps-build-steps.patch index 28fa983874..c10400aef4 100644 --- a/meta-oe/recipes-devtools/perfetto/files/0001-Remove-check_build_deps-build-steps.patch +++ b/meta-oe/recipes-devtools/perfetto/files/0001-Remove-check_build_deps-build-steps.patch @@ -12,6 +12,8 @@ rather than the Bitbake-generated one. Signed-off-by: Sui Chen <suichen6@gmail.com> --- +Upstream-Status: Pending + gn/BUILD.gn | 1 - gn/standalone/BUILD.gn | 12 ++++++------ gn/standalone/BUILDCONFIG.gn | 5 +++-- diff --git a/meta-oe/recipes-devtools/perfetto/files/0001-meson-add-pc-file-for-lib_perfetto.patch b/meta-oe/recipes-devtools/perfetto/files/0001-meson-add-pc-file-for-lib_perfetto.patch index 70de44173d..ae644747c1 100644 --- a/meta-oe/recipes-devtools/perfetto/files/0001-meson-add-pc-file-for-lib_perfetto.patch +++ b/meta-oe/recipes-devtools/perfetto/files/0001-meson-add-pc-file-for-lib_perfetto.patch @@ -4,20 +4,20 @@ Date: Mon, 17 Oct 2022 19:20:53 +0200 Subject: [PATCH] meson: add PC file for lib_perfetto --- +Upstream-Status: Pending + meson.build | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) -diff --git a/meson.build b/meson.build -index 06015141c..752b4d928 100644 --- a/meson.build +++ b/meson.build @@ -19,9 +19,12 @@ project( 'perfetto', - ['c','cpp'], -- default_options: ['c_std=c99', 'cpp_std=c++11'] -+ default_options: ['c_std=c99', 'cpp_std=c++11'], -+ version: '27.1' + ['cpp'], +- default_options: ['cpp_std=c++17'] ++ default_options: ['cpp_std=c++17'], ++ version: '31.0' ) +soversion = meson.project_version() @@ -25,20 +25,20 @@ index 06015141c..752b4d928 100644 fs = import('fs') if not fs.is_dir('sdk') -@@ -30,8 +33,9 @@ endif - - dep_threads = dependency('threads') +@@ -36,8 +39,9 @@ if host_machine.system() == 'android' + deps_perfetto += cpp.find_library('log') + endif -lib_perfetto = static_library( +lib_perfetto = shared_library( 'perfetto', + version: soversion, sources: 'sdk/perfetto.cc', - dependencies: dep_threads, + dependencies: deps_perfetto, install: true, -@@ -39,6 +43,10 @@ lib_perfetto = static_library( +@@ -50,6 +54,10 @@ dir_perfetto_trace = join_paths(meson.cu - inc_perfetto = include_directories('sdk') + install_data(dir_perfetto_trace / 'perfetto_trace.proto') +install_headers('sdk/perfetto.h') +pkg = import('pkgconfig') @@ -47,6 +47,3 @@ index 06015141c..752b4d928 100644 dep_perfetto = declare_dependency( link_with: lib_perfetto, include_directories: inc_perfetto, --- -2.34.1 - diff --git a/meta-oe/recipes-devtools/perfetto/perfetto.bb b/meta-oe/recipes-devtools/perfetto/perfetto.bb index d1980a0097..4ab7a93714 100644 --- a/meta-oe/recipes-devtools/perfetto/perfetto.bb +++ b/meta-oe/recipes-devtools/perfetto/perfetto.bb @@ -2,7 +2,6 @@ LICENSE = "Apache-2.0 & BSD-3-Clause & MIT & Zlib" LIC_FILES_CHKSUM = "file://LICENSE;md5=f87516e0b698007e9e75a1fe1012b390 \ file://buildtools/libcxx/LICENSE.TXT;md5=55d89dd7eec8d3b4204b680e27da3953 \ - file://buildtools/libcxx/utils/google-benchmark/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://buildtools/libcxxabi/LICENSE.TXT;md5=7b9334635b542c56868400a46b272b1e \ file://buildtools/libunwind/LICENSE.TXT;md5=f66970035d12f196030658b11725e1a1 \ file://buildtools/protobuf/LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \ @@ -15,14 +14,30 @@ SRC_URI:append = " \ 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 \ + git://android.googlesource.com/platform/system/libbase.git;branch=master;protocol=https;destsuffix=git/buildtools/android-libbase;name=libbase \ + git://android.googlesource.com/platform/system/unwinding.git;branch=master;protocol=https;destsuffix=git/buildtools/android-unwinding;name=unwinding \ + git://android.googlesource.com/platform/system/logging.git;branch=master;protocol=https;destsuffix=git/buildtools/android-logging;name=logging \ + git://android.googlesource.com/platform/system/libprocinfo.git;branch=master;protocol=https;destsuffix=git/buildtools/android-libprocinfo;name=libprocinfo \ + git://android.googlesource.com/platform/system/core.git;branch=master;protocol=https;destsuffix=git/buildtools/android-core;name=core \ + 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 \ 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-Remove-check_build_deps-build-steps.patch \ + file://0001-Add-missing-header-cstdint-for-uintXX_t-types.patch" + +SRCREV_bionic = "4b0e16bc72a82a63c699977376a7d6eadca1b206" +SRCREV_core = "9e6cef7f07d8c11b3ea820938aeb7ff2e9dbaa52" +SRCREV_lzma = "7851dce6f4ca17f5caa1c93a4e0a45686b1d56c3" +SRCREV_libprocinfo = "fd214c13ededecae97a3b15b5fccc8925a749a84" +SRCREV_logging = "7b36b566c9113fc703d68f76e8f40c0c2432481c" +SRCREV_unwinding = "d66882575ebe3700d6a6b10185f3aee28acc1051" SRCREV_protobuf = "6a59a2ad1f61d9696092f79b6d74368b4d7970a3" -SRCREV_libcxx = "d9040c75cfea5928c804ab7c235fed06a63f743a" -SRCREV_libcxxabi = "196ba1aaa8ac285d94f4ea8d9836390a45360533" -SRCREV_libunwind = "d999d54f4bca789543a2eb6c995af2d9b5a1f3ed" +SRCREV_libbase = "78f1c2f83e625bdf66d55b48bdb3a301c20d2fb3" +SRCREV_libcxx = "f8571eaba606bde2eb8cd34b30104ca33e7c207e" +SRCREV_libcxxabi = "8dd405113a4f3694e910b79785dd7fb7535a888a" +SRCREV_libunwind = "aabcd8753678f1536e15eb6385a948470debdae4" SRCREV_zlib = "5c85a2da4c13eda07f69d81a1579a5afddd35f59" SRC_URI[gn.sha256sum] = "f706aaa0676e3e22f5fc9ca482295d7caee8535d1869f99efa2358177b64f5cd" @@ -32,6 +47,11 @@ DEPENDS += " ninja-native" COMPATIBLE_HOST = "(i.86|x86_64|aarch64|arm).*-linux*" +CCACHE_DISABLE = "1" + +# Some musl hacks gets through compiling it for musl +# Nullifying -DTEMP_FAILURE_RETRY might be grossest of them +TUNE_CCARGS:append:libc-musl = " -D_LIBCPP_HAS_MUSL_LIBC -Dgetprogname\(\)=program_invocation_name -DTEMP_FAILURE_RETRY=" FILES:${PN}:append = " \ ${bindir}/tracebox \ " @@ -116,13 +136,6 @@ do_configure () { cd .. fi # Done processing the Ninja files - - # Workaround for the functions not supported by musl - if [ "${TCLIBC}" = "musl" ]; then - sed -e 's/strtoll_l(__a, \&__p2, __base, _LIBCPP_GET_C_LOCALE)/strtoll(__a, \&__p2, __base)/g' \ - -e 's/strtoull_l(__a, \&__p2, __base, _LIBCPP_GET_C_LOCALE)/strtoull(__a, \&__p2, __base)/g' \ - ${S}/buildtools/libcxx/include/locale -i - fi } # Perfetto generates a few different binaries, such as traced and traced_probes and perfetto. diff --git a/meta-oe/recipes-devtools/perfetto/perfetto.inc b/meta-oe/recipes-devtools/perfetto/perfetto.inc index 5cb6f8bb34..de871d4f3d 100644 --- a/meta-oe/recipes-devtools/perfetto/perfetto.inc +++ b/meta-oe/recipes-devtools/perfetto/perfetto.inc @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/google/perfetto" SRC_URI = "git://github.com/google/perfetto.git;protocol=https;name=perfetto;nobranch=1" -SRCREV_perfetto = "1c52b5e132312aeb007ed180d4ba1d8d66227923" -PV = "27.1" +SRCREV_perfetto = "b8da07095979310818f0efde2ef3c69ea70d62c5" +PV = "31.0" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-devtools/perl/libdev-checklib-perl/0001-CheckLib.pm-don-t-execute-the-binary.patch b/meta-oe/recipes-devtools/perl/libdev-checklib-perl/0001-CheckLib.pm-don-t-execute-the-binary.patch index 8d4920b390..f79b158114 100644 --- a/meta-oe/recipes-devtools/perl/libdev-checklib-perl/0001-CheckLib.pm-don-t-execute-the-binary.patch +++ b/meta-oe/recipes-devtools/perl/libdev-checklib-perl/0001-CheckLib.pm-don-t-execute-the-binary.patch @@ -21,7 +21,7 @@ and use the return status to determine the lib's checking status is not appropriate in cross compile env. $ /yocto/builds/upgrade1/tmp/work/core2-64-poky-linux/libdbd-mysql-perl/4.050-r0/git/assertlibCOw_eujb -Upstream-Status: Inappropriate[oe specific] +Upstream-Status: Inappropriate [oe specific] Signed-off-by: Mingli Yu <mingli.yu@windriver.com> --- diff --git a/meta-oe/recipes-devtools/perl/libio-pty-perl/0001-Make-function-checks-more-robust-within-shared-libs.patch b/meta-oe/recipes-devtools/perl/libio-pty-perl/0001-Make-function-checks-more-robust-within-shared-libs.patch new file mode 100644 index 0000000000..13a9e3b884 --- /dev/null +++ b/meta-oe/recipes-devtools/perl/libio-pty-perl/0001-Make-function-checks-more-robust-within-shared-libs.patch @@ -0,0 +1,54 @@ +From 1735a78561dbe139fd138caef2d44d81f5494fe7 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 4 Apr 2023 12:28:11 -0700 +Subject: [PATCH] Make function checks more robust within shared libs + +Previous attempt to error at link like was with + +https://github.com/toddr/IO-Tty/commit/1747cdf9f98cfd3aada9bf6c09f9d46297e18a5e + +this however causes issues with newer clang where it detects +the assignment as -Wint-conversion warning which is treated at error +and builds with clang fail. So this is an attempt to instruct +linker explicitly to error out if the symbol is not found during link +time when building a shared library, this fixes both the problems +as reported in + +https://github.com/toddr/IO-Tty/issues/23 + +as well as + +https://github.com/toddr/IO-Tty/pull/33#issuecomment-1260147256 + +Upstream-Status: Submitted [https://github.com/toddr/IO-Tty/pull/33] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile.PL | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Makefile.PL b/Makefile.PL +index eaf47e0..2e8338d 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -163,7 +163,8 @@ main () + #if defined (__stub_$f) || defined (__stub___$f) + choke me + #else +-f = $f (); ++f = $f; ++f(); + #endif + + ; +@@ -173,7 +174,7 @@ ESQ + + close(TST); + print "Looking for $f()" . "." x (13-length($f)) . " "; +- if (system("$cfg{'cc'} $flags $funcs{$f} functest_$f.c > functest_$f.log 2>&1")) { ++ if (system("$cfg{'cc'} $flags -Wl,--no-undefined $funcs{$f} functest_$f.c > functest_$f.log 2>&1")) { + print "not found.\n"; + } else { + $define{"-DHAVE_\U$f"} = undef; +-- +2.40.0 + diff --git a/meta-oe/recipes-devtools/perl/libio-pty-perl/0001-Tty.xs-Do-not-mark-strlcpy-as-static.patch b/meta-oe/recipes-devtools/perl/libio-pty-perl/0001-Tty.xs-Do-not-mark-strlcpy-as-static.patch deleted file mode 100644 index 07c7690fb8..0000000000 --- a/meta-oe/recipes-devtools/perl/libio-pty-perl/0001-Tty.xs-Do-not-mark-strlcpy-as-static.patch +++ /dev/null @@ -1,45 +0,0 @@ -From fae771aefc593a0ef798bc0c1e21b0524eb85e2d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 31 Aug 2022 20:32:35 -0700 -Subject: [PATCH] Tty.xs: Do not mark strlcpy as static - -Some libcs e.g. musl do not provide implementation of strlcpy but they -do provide the signature in string.h, if we mark it static here then it -conflicts with the libc define and compiler may warn/error - -Fixes -Tty.xs:190:1: error: static declaration of 'strlcpy' follows non-static declaration -strlcpy( ^ -/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/libio-pty-perl/1.16-r0/recipe-sysroot/usr/include/string.h:86:8: note: previous declaration is here -size_t strlcpy (char *, const char *, size_t); ^ - -Upstream-Status: Submitted [https://github.com/toddr/IO-Tty/pull/33] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - Tty.xs | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/Tty.xs b/Tty.xs -index aa638f4..4bab39d 100644 ---- a/Tty.xs -+++ b/Tty.xs -@@ -186,11 +186,11 @@ mysignal(int sig, mysig_t act) - * will be copied. Always NUL terminates (unless siz == 0). - * Returns strlen(src); if retval >= siz, truncation occurred. - */ --static size_t --strlcpy(dst, src, siz) -- char *dst; -- const char *src; -- size_t siz; -+size_t -+strlcpy( -+ char *dst, -+ const char *src, -+ size_t siz) - { - register char *d = dst; - register const char *s = src; --- -2.37.3 - diff --git a/meta-oe/recipes-devtools/perl/libio-pty-perl_1.17.bb b/meta-oe/recipes-devtools/perl/libio-pty-perl_1.17.bb index 684788f199..e5c1ec1c82 100644 --- a/meta-oe/recipes-devtools/perl/libio-pty-perl_1.17.bb +++ b/meta-oe/recipes-devtools/perl/libio-pty-perl_1.17.bb @@ -4,9 +4,8 @@ LICENSE = "Artistic-1.0 | GPL-1.0-or-later" LIC_FILES_CHKSUM = "file://META.yml;beginline=11;endline=12;md5=b2562f94907eeb42e8ce9d45f628e587" SRC_URI = "http://www.cpan.org/modules/by-module/IO/IO-Tty-${PV}.tar.gz \ - file://0001-Tty.xs-Do-not-mark-strlcpy-as-static.patch \ + file://0001-Make-function-checks-more-robust-within-shared-libs.patch \ " - SRC_URI[sha256sum] = "a5f1a83020bc5b5dd6c1b570f48c7546e0a8f7fac10a068740b03925ad9e14e8" S = "${WORKDIR}/IO-Tty-${PV}" diff --git a/meta-oe/recipes-devtools/perl/libpcsc-perl_1.4.14.bb b/meta-oe/recipes-devtools/perl/libpcsc-perl_1.4.14.bb new file mode 100644 index 0000000000..ff4e1f0563 --- /dev/null +++ b/meta-oe/recipes-devtools/perl/libpcsc-perl_1.4.14.bb @@ -0,0 +1,22 @@ +SUMMARY = "Perl interface to the PC/SC smart card library" +DESCRIPTION = "Perl wrapper to the PC/SC smartcard library (pcsc-lite) \ +together with some small examples. \ +The provided modules are Chipcard::PCSC and Chipcard::PCSC::Card." +HOMEPAGE = "https://metacpan.org/dist/pcsc-perl" +SECTION = "libs" +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" + +S = "${WORKDIR}/pcsc-perl-${PV}" + +inherit cpan pkgconfig + +DEPENDS += "pcsc-lite" + +RDEPENDS:${PN} += "perl-module-carp" + +BBCLASSEXTEND="native" diff --git a/meta-oe/recipes-devtools/php/php/0001-Change-whether-to-inline-XXH3_hashLong_withSecret-to.patch b/meta-oe/recipes-devtools/php/php/0001-Change-whether-to-inline-XXH3_hashLong_withSecret-to.patch new file mode 100644 index 0000000000..5b8c76209a --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/0001-Change-whether-to-inline-XXH3_hashLong_withSecret-to.patch @@ -0,0 +1,93 @@ +From 1eeb59366d6140a799f6051fb9f57d988b81fd5b Mon Sep 17 00:00:00 2001 +From: easyaspi314 <easyaspi314@users.noreply.github.com> +Date: Wed, 12 Apr 2023 13:33:07 +0800 +Subject: [PATCH] Change whether to inline XXH3_hashLong_withSecret to a config + option + +Change whether to inline XXH3_hashLong_withSecret to a config option to fix +GCC 12 -Og. + +Upstream-Status: Submitted [https://github.com/php/php-src/pull/11062] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + ext/hash/xxhash/xxhash.h | 35 +++++++++++++++++++++++++++++++++-- + 1 file changed, 33 insertions(+), 2 deletions(-) + +diff --git a/ext/hash/xxhash/xxhash.h b/ext/hash/xxhash/xxhash.h +index b5bd2864..8e816c05 100644 +--- a/ext/hash/xxhash/xxhash.h ++++ b/ext/hash/xxhash/xxhash.h +@@ -1375,6 +1375,23 @@ XXH3_128bits_reset_withSecretandSeed(XXH3_state_t* statePtr, + */ + # define XXH_NO_INLINE_HINTS 0 + ++/*! ++ * @def XXH3_INLINE_SECRET ++ * @brief Determines whether to inline the XXH3 withSecret code. ++ * ++ * When the secret size is known, the compiler can improve the performance ++ * of XXH3_64bits_withSecret() and XXH3_128bits_withSecret(). ++ * ++ * However, if the secret size is not known, it doesn't have any benefit. This ++ * happens when xxHash is compiled into a global symbol. Therefore, if ++ * @ref XXH_INLINE_ALL is *not* defined, this will be defined to 0. ++ * ++ * Additionally, this defaults to 0 on GCC 12+, which has an issue with function pointers ++ * that are *sometimes* force inline on -Og, and it is impossible to automatically ++ * detect this optimization level. ++ */ ++# define XXH3_INLINE_SECRET 0 ++ + /*! + * @def XXH32_ENDJMP + * @brief Whether to use a jump for `XXH32_finalize`. +@@ -1439,6 +1456,15 @@ XXH3_128bits_reset_withSecretandSeed(XXH3_state_t* statePtr, + # endif + #endif + ++#ifndef XXH3_INLINE_SECRET ++# if (defined(__GNUC__) && !defined(__clang__) && __GNUC__ >= 12) \ ++ || !defined(XXH_INLINE_ALL) ++# define XXH3_INLINE_SECRET 0 ++# else ++# define XXH3_INLINE_SECRET 1 ++# endif ++#endif ++ + #ifndef XXH32_ENDJMP + /* generally preferable for performance */ + # define XXH32_ENDJMP 0 +@@ -1515,6 +1541,11 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) + # define XXH_NO_INLINE static + #endif + ++#if XXH3_INLINE_SECRET ++# define XXH3_WITH_SECRET_INLINE XXH_FORCE_INLINE ++#else ++# define XXH3_WITH_SECRET_INLINE XXH_NO_INLINE ++#endif + + + /* ************************************* +@@ -4465,7 +4496,7 @@ XXH3_hashLong_64b_internal(const void* XXH_RESTRICT input, size_t len, + * so that the compiler can properly optimize the vectorized loop. + * This makes a big performance difference for "medium" keys (<1 KB) when using AVX instruction set. + */ +-XXH_FORCE_INLINE XXH64_hash_t ++XXH3_WITH_SECRET_INLINE XXH64_hash_t + XXH3_hashLong_64b_withSecret(const void* XXH_RESTRICT input, size_t len, + XXH64_hash_t seed64, const xxh_u8* XXH_RESTRICT secret, size_t secretLen) + { +@@ -5263,7 +5294,7 @@ XXH3_hashLong_128b_default(const void* XXH_RESTRICT input, size_t len, + * It's important for performance to pass @secretLen (when it's static) + * to the compiler, so that it can properly optimize the vectorized loop. + */ +-XXH_FORCE_INLINE XXH128_hash_t ++XXH3_WITH_SECRET_INLINE XXH128_hash_t + XXH3_hashLong_128b_withSecret(const void* XXH_RESTRICT input, size_t len, + XXH64_hash_t seed64, + const void* XXH_RESTRICT secret, size_t secretLen) +-- +2.25.1 + diff --git a/meta-oe/recipes-devtools/php/php/0005-pear-fix-Makefile.frag-for-Yocto.patch b/meta-oe/recipes-devtools/php/php/0005-pear-fix-Makefile.frag-for-Yocto.patch index fa956e0284..37752ef949 100644 --- a/meta-oe/recipes-devtools/php/php/0005-pear-fix-Makefile.frag-for-Yocto.patch +++ b/meta-oe/recipes-devtools/php/php/0005-pear-fix-Makefile.frag-for-Yocto.patch @@ -8,6 +8,8 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> update patch to 8.0.12 Signed-off-by: Claude Bing <cbing@cybernetics.com> --- +Upstream-Status: Pending + pear/Makefile.frag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/php/php/0009-php-don-t-use-broken-wrapper-for-mkdir.patch b/meta-oe/recipes-devtools/php/php/0009-php-don-t-use-broken-wrapper-for-mkdir.patch index 57b05e6a77..b5a33cca7f 100644 --- a/meta-oe/recipes-devtools/php/php/0009-php-don-t-use-broken-wrapper-for-mkdir.patch +++ b/meta-oe/recipes-devtools/php/php/0009-php-don-t-use-broken-wrapper-for-mkdir.patch @@ -11,6 +11,8 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> update patch to version 8.0.12 Signed-off-by: Claude Bing <cbing@cybernetics.com> --- +Upstream-Status: Pending + build/Makefile.global | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/php/php_8.1.11.bb b/meta-oe/recipes-devtools/php/php_8.2.8.bb index dca482a1c8..407b1a7bcb 100644 --- a/meta-oe/recipes-devtools/php/php_8.1.11.bb +++ b/meta-oe/recipes-devtools/php/php_8.2.8.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.php.net" SECTION = "console/network" LICENSE = "PHP-3.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=99532e0f6620bc9bca34f12fadaee33c" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5ebd5be8e2a89f634486445bd164bef0" BBCLASSEXTEND = "native" DEPENDS = "zlib bzip2 libxml2 virtual/libiconv php-native lemon-native" @@ -19,6 +19,7 @@ SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \ file://0006-ext-phar-Makefile.frag-Fix-phar-packaging.patch \ file://0009-php-don-t-use-broken-wrapper-for-mkdir.patch \ file://0010-iconv-fix-detection.patch \ + file://0001-Change-whether-to-inline-XXH3_hashLong_withSecret-to.patch \ " SRC_URI:append:class-target = " \ @@ -33,15 +34,17 @@ SRC_URI:append:class-target = " \ " S = "${WORKDIR}/php-${PV}" -SRC_URI[sha256sum] = "af6250b18b4403b6eeff9b4a02786ac86a12a208141f6f65478f79256f47f246" +SRC_URI[sha256sum] = "995ed4009c7917c962d31837a1a3658f36d4af4f357b673c97ffdbe6403f8517" -CVE_CHECK_IGNORE += "\ +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." +CVE_STATUS_PHP = " \ CVE-2007-2728 \ CVE-2007-3205 \ CVE-2007-4596 \ " -inherit autotools pkgconfig python3native gettext +inherit autotools pkgconfig python3native gettext multilib_header multilib_script # phpize is not scanned for absolute paths by default (but php-config is). # @@ -128,6 +131,7 @@ CFLAGS += " -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -g -DPTYS_ARE_GETPT -DPTYS_ARE_S CFLAGS += " -DHAVE_LIBDL " LDFLAGS += " -ldl " LDFLAGS:append:libc-musl = " -lucontext " +LDFLAGS:append:riscv64 = " -latomic" EXTRA_OEMAKE = "INSTALL_ROOT=${D}" @@ -142,6 +146,13 @@ do_configure:append() { # No, libtool, we really don't want rpath set... sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + sed -i -e's@${RECIPE_SYSROOT}@@g' \ + -e's@-ffile-prefix-map=[^ ]*[ ]*@@g' \ + -e's@-fdebug-prefix-map=[^ ]*[ ]*@@g' \ + -e's@-ffile-prefix-map=[^ ]*[ ]*@@g' \ + -e's@-fmacro-prefix-map=[^ ]*[ ]*@@g' \ + ${B}/main/build-defs.h \ + ${B}/scripts/php-config } do_install:append:class-native() { @@ -201,6 +212,14 @@ do_install:append:class-target() { fi } +MULTILIB_SCRIPTS += "${PN}:${bindir}/php-config \ + ${PN}:${bindir}/phpize \ +" + +do_install:append () { + oe_multilib_header php/main/build-defs.h php/main/php_config.h +} + SYSROOT_PREPROCESS_FUNCS += "php_sysroot_preprocess" php_sysroot_preprocess () { @@ -275,12 +294,3 @@ do_install:append:class-native() { create_wrapper ${D}${bindir}/php \ PHP_PEAR_SYSCONF_DIR=${sysconfdir}/ } - -# Fails to build with thumb-1 (qemuarm) -# | {standard input}: Assembler messages: -# | {standard input}:3719: Error: selected processor does not support Thumb mode `smull r0,r2,r9,r3' -# | {standard input}:3720: Error: unshifted register required -- `sub r2,r2,r0,asr#31' -# | {standard input}:3796: Error: selected processor does not support Thumb mode `smull r0,r2,r3,r3' -# | {standard input}:3797: Error: unshifted register required -- `sub r2,r2,r0,asr#31' -# | make: *** [ext/standard/math.lo] Error 1 -ARM_INSTRUCTION_SET = "arm" diff --git a/meta-oe/recipes-devtools/ply/ply_git.bb b/meta-oe/recipes-devtools/ply/ply_git.bb index 61a0092c81..c22dcbd12a 100644 --- a/meta-oe/recipes-devtools/ply/ply_git.bb +++ b/meta-oe/recipes-devtools/ply/ply_git.bb @@ -12,6 +12,8 @@ SRCREV = "864fac79116870df1ab7aa21e639578807e41e75" S = "${WORKDIR}/git" +LD = "${HOST_PREFIX}ld.bfd${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH}" + inherit autotools-brokensep COMPATIBLE_HOST = "(x86_64.*|aarch64.*|arm.*|powerpc)-linux" diff --git a/meta-oe/recipes-devtools/poke/poke/0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch b/meta-oe/recipes-devtools/poke/poke/0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch index 3bd041a0e7..a41f985eb8 100644 --- a/meta-oe/recipes-devtools/poke/poke/0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch +++ b/meta-oe/recipes-devtools/poke/poke/0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch @@ -12,6 +12,8 @@ Subject: [PATCH] build: do not check for Tcl/Tk if --disable-gui is specified [Romain: remove Changelog entry] Signed-off-by: Romain Naour <romain.naour@gmail.com> --- +Upstream-Status: Pending + configure.ac | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-devtools/poke/poke/0002-jitter-jitter-config.in-avoit-host-poisoning-while-c.patch b/meta-oe/recipes-devtools/poke/poke/0002-jitter-jitter-config.in-avoit-host-poisoning-while-c.patch index fa55f817ff..660b19f514 100644 --- a/meta-oe/recipes-devtools/poke/poke/0002-jitter-jitter-config.in-avoit-host-poisoning-while-c.patch +++ b/meta-oe/recipes-devtools/poke/poke/0002-jitter-jitter-config.in-avoit-host-poisoning-while-c.patch @@ -20,6 +20,8 @@ for @-substitutions. Signed-off-by: Romain Naour <romain.naour@gmail.com> --- +Upstream-Status: Pending + jitter/bin/jitter-config.in | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/meta-oe/recipes-devtools/poke/poke/0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch b/meta-oe/recipes-devtools/poke/poke/0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch index f217c917f1..ad2bf764d3 100644 --- a/meta-oe/recipes-devtools/poke/poke/0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch +++ b/meta-oe/recipes-devtools/poke/poke/0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch @@ -13,6 +13,8 @@ Avoid: Signed-off-by: Romain Naour <romain.naour@gmail.com> --- +Upstream-Status: Pending + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-linking-error-with-ld-gold.patch b/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-linking-error-with-ld-gold.patch index 2bcb138731..2bc44c898b 100644 --- a/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-linking-error-with-ld-gold.patch +++ b/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-linking-error-with-ld-gold.patch @@ -21,6 +21,8 @@ N/A protobuf-3.11.4 --- +Upstream-Status: Pending + src/libprotobuf-lite.map | 2 ++ src/libprotobuf.map | 2 ++ src/libprotoc.map | 2 ++ diff --git a/meta-oe/recipes-devtools/python/python3-apt_2.5.0.bb b/meta-oe/recipes-devtools/python/python3-apt_2.5.3.bb index 57da3b34de..1d54b9f6af 100644 --- a/meta-oe/recipes-devtools/python/python3-apt_2.5.0.bb +++ b/meta-oe/recipes-devtools/python/python3-apt_2.5.3.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3 \ SRC_URI = "git://salsa.debian.org/apt-team/python-apt.git;protocol=https;branch=main" -SRCREV = "adf41e6f4088845dcb9e85de0436e25e8d32da25" +SRCREV = "3252935b6224b3bd2e2250894b9559b47c61b2e1" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-devtools/sip/sip_6.7.5.bb b/meta-oe/recipes-devtools/sip/sip_6.7.9.bb index fb42ef476b..f6c2457bc5 100644 --- a/meta-oe/recipes-devtools/sip/sip_6.7.5.bb +++ b/meta-oe/recipes-devtools/sip/sip_6.7.9.bb @@ -11,6 +11,6 @@ LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303" inherit pypi setuptools3 python3native PYPI_PACKAGE = "sip" -SRC_URI[sha256sum] = "9655d089e1d0c5fbf66bde11558a874980729132b5bd0c2ae355ac1a7b893ab4" +SRC_URI[sha256sum] = "35d51fc10f599d3696abb50f29d068ad04763df7b77808c76b74597660f99b17" BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-devtools/smemstat/smemstat_0.02.12.bb b/meta-oe/recipes-devtools/smemstat/smemstat_0.02.12.bb new file mode 100644 index 0000000000..46dc94154d --- /dev/null +++ b/meta-oe/recipes-devtools/smemstat/smemstat_0.02.12.bb @@ -0,0 +1,22 @@ +SUMMARY = "smemstat reports the physical memory usage taking into consideration shared memory" +HOMEPAGE = "https://github.com/ColinIanKing/smemstat" +LICENSE = "GPL-2.0-or-later" + +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "ncurses" + +SRC_URI = "git://github.com/ColinIanKing/smemstat.git;protocol=https;branch=master" +SRCREV = "72efeb08ccdb22f57054279d25e3c522e8e1d4c3" + +S = "${WORKDIR}/git" + +inherit bash-completion + +do_compile () { + oe_runmake smemstat +} + +do_install () { + oe_runmake DESTDIR=${D} install +} diff --git a/meta-oe/recipes-devtools/suitesparse/suitesparse/0001-Preserve-CXXFLAGS-from-environment-in-Mongoose.patch b/meta-oe/recipes-devtools/suitesparse/suitesparse/0001-Preserve-CXXFLAGS-from-environment-in-Mongoose.patch index c955b5fa7d..47865de858 100644 --- a/meta-oe/recipes-devtools/suitesparse/suitesparse/0001-Preserve-CXXFLAGS-from-environment-in-Mongoose.patch +++ b/meta-oe/recipes-devtools/suitesparse/suitesparse/0001-Preserve-CXXFLAGS-from-environment-in-Mongoose.patch @@ -8,6 +8,8 @@ build process, instead of overwriting them. This is useful in a cross compile context where the CXXFLAGS variable might contain necessary flags for cross compiling. --- +Upstream-Status: Pending + Mongoose/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-devtools/suitesparse/suitesparse/0002-Preserve-links-when-installing-libmetis.patch b/meta-oe/recipes-devtools/suitesparse/suitesparse/0002-Preserve-links-when-installing-libmetis.patch index 190eaf164d..d80c1a7362 100644 --- a/meta-oe/recipes-devtools/suitesparse/suitesparse/0002-Preserve-links-when-installing-libmetis.patch +++ b/meta-oe/recipes-devtools/suitesparse/suitesparse/0002-Preserve-links-when-installing-libmetis.patch @@ -4,6 +4,8 @@ Date: Wed, 21 Oct 2020 15:26:52 -0600 Subject: [PATCH] Preserve links when installing libmetis --- +Upstream-Status: Pending + Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/suitesparse/suitesparse/0003-Add-version-information-to-libmetis.patch b/meta-oe/recipes-devtools/suitesparse/suitesparse/0003-Add-version-information-to-libmetis.patch index dee6039a81..fc83897a05 100644 --- a/meta-oe/recipes-devtools/suitesparse/suitesparse/0003-Add-version-information-to-libmetis.patch +++ b/meta-oe/recipes-devtools/suitesparse/suitesparse/0003-Add-version-information-to-libmetis.patch @@ -4,6 +4,8 @@ Date: Wed, 21 Oct 2020 15:27:07 -0600 Subject: [PATCH] Add version information to libmetis --- +Upstream-Status: Pending + metis-5.1.0/Makefile | 8 ++++---- metis-5.1.0/libmetis/CMakeLists.txt | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-devtools/suitesparse/suitesparse_5.10.1.bb b/meta-oe/recipes-devtools/suitesparse/suitesparse_5.10.1.bb index 56cbfce20e..13e6fd066c 100644 --- a/meta-oe/recipes-devtools/suitesparse/suitesparse_5.10.1.bb +++ b/meta-oe/recipes-devtools/suitesparse/suitesparse_5.10.1.bb @@ -19,14 +19,14 @@ RPROVIDES:${PN} = "mongoose graphblas" # the command line. To get around this problem, set these variables to only the # program name and prepend the rest of the value onto the corresponding FLAGS # variable. -CFLAGS:prepend := "${@" ".join(d.getVar('CC', True).split()[1:])} " -export CC := "${@d.getVar('CC', True).split()[0]}" +CFLAGS:prepend := "${@" ".join(d.getVar('CC').split()[1:])} " +export CC := "${@d.getVar('CC').split()[0]}" -CXXFLAGS:prepend := "${@" ".join(d.getVar('CXX', True).split()[1:])} " -export CXX := "${@d.getVar('CXX', True).split()[0]}" +CXXFLAGS:prepend := "${@" ".join(d.getVar('CXX').split()[1:])} " +export CXX := "${@d.getVar('CXX').split()[0]}" -LDFLAGS:prepend := "${@" ".join(d.getVar('LD', True).split()[1:])} " -export LD := "${@d.getVar('LD', True).split()[0]}" +LDFLAGS:prepend := "${@" ".join(d.getVar('LD').split()[1:])} " +export LD := "${@d.getVar('LD').split()[0]}" export CMAKE_OPTIONS = " \ -DCMAKE_INSTALL_PREFIX=${D}${prefix} \ diff --git a/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff b/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff index 229acf3e7a..e13bf69b23 100644 --- a/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff +++ b/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff @@ -8,6 +8,8 @@ and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian installation. --- +Upstream-Status: Pending + unix/configure | 1 + unix/tcl.m4 | 2 ++ 2 files changed, 3 insertions(+) diff --git a/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff b/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff index 4aa5d6b894..fdf3c66535 100644 --- a/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff +++ b/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- /tmp/configure.in 2010-05-19 13:29:03.000000000 +0200 +++ unix/configure.in 2010-05-19 13:42:05.000000000 +0200 @@ -526,13 +526,9 @@ diff --git a/meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff b/meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff index 4e15469736..62467af1d5 100644 --- a/meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff +++ b/meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Patch by Chris Waters sets path which are normally point to a directory with Tk sources to a subdirectory of /usr/include/tcl8.4 (debian/rules puts private Tk headers there). diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb b/meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb index efab9618ec..f3cab4e610 100644 --- a/meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb +++ b/meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb @@ -34,7 +34,7 @@ PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/${BPN}${PV}" VER = "${@os.path.splitext(d.getVar('PV'))[0]}" LDFLAGS += "-Wl,-rpath,${libdir}/tcltk/${PV}/lib" -inherit autotools features_check +inherit autotools features_check pkgconfig # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-oe/recipes-devtools/uftrace/uftrace/0001-build-Fix-a-build-race-related-to-utils-mermaid.html.patch b/meta-oe/recipes-devtools/uftrace/uftrace/0001-build-Fix-a-build-race-related-to-utils-mermaid.html.patch deleted file mode 100644 index 2cb4f26fbd..0000000000 --- a/meta-oe/recipes-devtools/uftrace/uftrace/0001-build-Fix-a-build-race-related-to-utils-mermaid.html.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 1fa61d77fa7173744dd6dc9d3c4bb0aa783f5222 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 21 Jan 2023 10:35:46 -0800 -Subject: [PATCH] build: Fix a build race related to utils/mermaid.html.cstr - -Sometimes build fails like below - -| /home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/uftrace/0.13-r0/git/cmds/dump.c: In function 'dump_mermaid_footer': -| /home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/uftrace/0.13-r0/git/cmds/dump.c:1347:10: fatal error: utils/mermaid.html.cstr: No such file or directory -| 1347 | #include "utils/mermaid.html.cstr" /* This file is a converted of mermaid.html to one string literal in build-time */ -| | ^~~~~~~~~~~~~~~~~~~~~~~~~ -| compilation terminated. -| make[1]: *** [Makefile:310: /home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/uftrace/0.13-r0/build/cmds/dump.o] Error 1 - -Create a dependency on c-str-conversion for dump.o - -Upstream-Status: Submitted [https://github.com/namhyung/uftrace/pull/1622] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - Makefile | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Makefile b/Makefile -index 70dc12f0..bb2ac669 100644 ---- a/Makefile -+++ b/Makefile -@@ -304,6 +304,8 @@ $(objdir)/misc/dbginfo.o: $(srcdir)/misc/dbginfo.c $(objdir)/version.h $(COMMON_ - $(objdir)/misc/bench.o: $(srcdir)/misc/bench.c - $(QUIET_CC)$(CC) $(BENCH_CFLAGS) -c -o $@ $< - -+$(objdir)/cmds/dump.o: c-str-conversion -+ - $(UFTRACE_OBJS_VERSION): $(objdir)/version.h - - $(filter-out $(objdir)/uftrace.o, $(UFTRACE_OBJS)): $(objdir)/%.o: $(srcdir)/%.c $(COMMON_DEPS) --- -2.39.1 - diff --git a/meta-oe/recipes-devtools/uftrace/uftrace_0.13.bb b/meta-oe/recipes-devtools/uftrace/uftrace_0.13.1.bb index 1302420983..4e1edc6cef 100644 --- a/meta-oe/recipes-devtools/uftrace/uftrace_0.13.bb +++ b/meta-oe/recipes-devtools/uftrace/uftrace_0.13.1.bb @@ -10,10 +10,8 @@ DEPENDS:append:libc-musl = " argp-standalone" inherit autotools -SRCREV = "53ec12d40701cf73ddcf5db8cff63b54736d0eda" -SRC_URI = "git://github.com/namhyung/${BPN};branch=master;protocol=https \ - file://0001-build-Fix-a-build-race-related-to-utils-mermaid.html.patch \ - " +SRCREV = "be3f46f7656bd9243b1835337b5350247b030b02" +SRC_URI = "git://github.com/namhyung/${BPN};branch=master;protocol=https" S = "${WORKDIR}/git" LDFLAGS:append:libc-musl = " -largp" diff --git a/meta-oe/recipes-devtools/uw-imap/uw-imap/0001-Support-OpenSSL-1.1.patch b/meta-oe/recipes-devtools/uw-imap/uw-imap/0001-Support-OpenSSL-1.1.patch index d5610bbcd5..e9c80fa3af 100644 --- a/meta-oe/recipes-devtools/uw-imap/uw-imap/0001-Support-OpenSSL-1.1.patch +++ b/meta-oe/recipes-devtools/uw-imap/uw-imap/0001-Support-OpenSSL-1.1.patch @@ -8,7 +8,7 @@ When building with OpenSSL 1.1 and newer, use the new built-in structs having been made opaque. Bug-Debian: https://bugs.debian.org/828589 -Upstream-Status: Unknown +Upstream-Status: Pending [Unknown] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- diff --git a/meta-oe/recipes-devtools/uw-imap/uw-imap/quote_cctype.patch b/meta-oe/recipes-devtools/uw-imap/uw-imap/quote_cctype.patch index f729ee2074..10c91673c3 100644 --- a/meta-oe/recipes-devtools/uw-imap/uw-imap/quote_cctype.patch +++ b/meta-oe/recipes-devtools/uw-imap/uw-imap/quote_cctype.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -urN imap-2007.orig/Makefile imap-2007/Makefile --- imap-2007.orig/Makefile 2007-12-20 23:11:10.000000000 +0100 +++ imap-2007/Makefile 2008-03-19 14:08:47.000000000 +0100 diff --git a/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb b/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb index 2f4261b00d..dcb59f4ea0 100644 --- a/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb +++ b/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb @@ -22,14 +22,12 @@ SRC_URI[sha256sum] = "53e15a2b5c1bc80161d42e9f69792a3fa18332b7b771910131004eb520 S = "${WORKDIR}/imap-${PV}" -CVE_CHECK_IGNORE += "\ - CVE-2005-0198 \ -" +CVE_STATUS[CVE-2005-0198] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" PACKAGECONFIG[pam] = ",,libpam" -EXTRA_OEMAKE = "CC='${CC} -std=c99 -D_GNU_SOURCE' ARRC='${AR} -rc' RANLIB='${RANLIB}'" +EXTRA_OEMAKE = "CC='${CC} -std=c99 -D_GNU_SOURCE' ARRC='${AR} -rc' RANLIB='${RANLIB}' EXTRACFLAGS='${CFLAGS}'" HEADERS = "src/c-client/*.h src/osdep/unix/*.h c-client/auths.c c-client/linkage.c c-client/linkage.h c-client/osdep.h" diff --git a/meta-oe/recipes-devtools/valijson/valijson_1.0.bb b/meta-oe/recipes-devtools/valijson/valijson_1.0.1.bb index 52475522ad..b8e7f50b58 100644 --- a/meta-oe/recipes-devtools/valijson/valijson_1.0.bb +++ b/meta-oe/recipes-devtools/valijson/valijson_1.0.1.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 = "78ac8a737df56b5334354efe104ea8f99e2a2f00" +SRCREV = "f7399c1a244982632671906d17f3ea77f3ccfc67" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.06.bb b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.59.01.bb index 0a7ad33c64..278db6dc84 100644 --- a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.06.bb +++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.59.01.bb @@ -9,8 +9,8 @@ SRC_URI = "git://github.com/mirror/xmlrpc-c.git;branch=master;protocol=https \ file://0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch \ file://0002-fix-formatting-issues.patch \ " -#Release 1.54.06 -SRCREV = "00870af80021aa0a66cc72c9aeb00587cbfde560" +#Release 1.59.01 +SRCREV = "352aeaa9ae49e90e55187cbda839f2113df06278" S = "${WORKDIR}/git/stable" @@ -40,6 +40,10 @@ do_configure() { rm -fv ${S}/tools/turbocharger/mod_gzip.c } +do_install:append:class-target() { + sed -i 's,${WORKDIR},/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR},g' ${D}${bindir}/xmlrpc-c-config +} + BBCLASSEXTEND = "native" CLEANBROKEN = "1" diff --git a/meta-oe/recipes-devtools/yasm/yasm/CVE-2023-31975.patch b/meta-oe/recipes-devtools/yasm/yasm/CVE-2023-31975.patch new file mode 100644 index 0000000000..ae10e99c2f --- /dev/null +++ b/meta-oe/recipes-devtools/yasm/yasm/CVE-2023-31975.patch @@ -0,0 +1,29 @@ +From b2cc5a1693b17ac415df76d0795b15994c106441 Mon Sep 17 00:00:00 2001 +From: Katsuhiko Gondow <gondow@cs.titech.ac.jp> +Date: Tue, 13 Jun 2023 05:00:47 +0900 +Subject: [PATCH] Fix memory leak in bin-objfmt (#231) + +Upstream-Status: Backport [https://github.com/yasm/yasm/commit/b2cc5a1693b17ac415df76d0795b15994c106441] + +CVE: CVE-2023-31975 +--- + modules/objfmts/bin/bin-objfmt.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/modules/objfmts/bin/bin-objfmt.c b/modules/objfmts/bin/bin-objfmt.c +index 18026750..a38c3422 100644 +--- a/modules/objfmts/bin/bin-objfmt.c ++++ b/modules/objfmts/bin/bin-objfmt.c +@@ -1680,6 +1680,10 @@ static void + bin_section_data_destroy(void *data) + { + bin_section_data *bsd = (bin_section_data *)data; ++ if (bsd->align) ++ yasm_xfree(bsd->align); ++ if (bsd->valign) ++ yasm_xfree(bsd->valign); + if (bsd->start) + yasm_expr_destroy(bsd->start); + if (bsd->vstart) +-- +2.40.0 diff --git a/meta-oe/recipes-devtools/yasm/yasm_git.bb b/meta-oe/recipes-devtools/yasm/yasm_git.bb index 3dd382be1f..19686ff275 100644 --- a/meta-oe/recipes-devtools/yasm/yasm_git.bb +++ b/meta-oe/recipes-devtools/yasm/yasm_git.bb @@ -12,6 +12,7 @@ PV = "1.3.0+git${SRCPV}" SRCREV = "ba463d3c26c0ece2e797b8d6381b161633b5971a" SRC_URI = "git://github.com/yasm/yasm.git;branch=master;protocol=https \ file://0001-Do-not-use-AC_HEADER_STDC.patch \ + file://CVE-2023-31975.patch \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-extended/beep/files/linux-input.patch b/meta-oe/recipes-extended/beep/files/linux-input.patch deleted file mode 100644 index 1b38ba72a3..0000000000 --- a/meta-oe/recipes-extended/beep/files/linux-input.patch +++ /dev/null @@ -1,155 +0,0 @@ -# the diff between Alessandro Zummo's copy of beep.c and the original -# one... - ---- beep-1.2.2/beep.c.orig 2006-01-29 12:13:36.994560551 -0800 -+++ beep-1.2.2/beep.c 2006-01-29 12:35:02.950558713 -0800 -@@ -26,6 +26,7 @@ - #include <sys/ioctl.h> - #include <sys/types.h> - #include <linux/kd.h> -+#include <linux/input.h> - - /* I don't know where this number comes from, I admit that freely. A - wonderful human named Raine M. Ekman used it in a program that played -@@ -86,18 +87,28 @@ typedef struct beep_parms_t { - struct beep_parms_t *next; /* in case -n/--new is used. */ - } beep_parms_t; - -+enum { BEEP_TYPE_CONSOLE, BEEP_TYPE_EVDEV }; -+ - /* Momma taught me never to use globals, but we need something the signal - handlers can get at.*/ - int console_fd = -1; -+int console_type = BEEP_TYPE_CONSOLE; -+char *console_device = NULL; -+ -+void do_beep(int freq); - - /* If we get interrupted, it would be nice to not leave the speaker beeping in - perpetuity. */ - void handle_signal(int signum) { -+ -+ if(console_device) -+ free(console_device); -+ - switch(signum) { - case SIGINT: - if(console_fd >= 0) { - /* Kill the sound, quit gracefully */ -- ioctl(console_fd, KIOCSOUND, 0); -+ do_beep(0); - close(console_fd); - exit(signum); - } else { -@@ -110,7 +121,7 @@ void handle_signal(int signum) { - /* print usage and exit */ - void usage_bail(const char *executable_name) { - printf("Usage:\n%s [-f freq] [-l length] [-r reps] [-d delay] " -- "[-D delay] [-s] [-c]\n", -+ "[-D delay] [-s] [-c] [-e device]\n", - executable_name); - printf("%s [Options...] [-n] [--new] [Options...] ... \n", executable_name); - printf("%s [-h] [--help]\n", executable_name); -@@ -141,11 +152,12 @@ void usage_bail(const char *executable_n - void parse_command_line(int argc, char **argv, beep_parms_t *result) { - int c; - -- struct option opt_list[4] = {{"help", 0, NULL, 'h'}, -+ struct option opt_list[] = {{"help", 0, NULL, 'h'}, - {"version", 0, NULL, 'V'}, - {"new", 0, NULL, 'n'}, -+ {"device", 1, NULL, 'e'}, - {0,0,0,0}}; -- while((c = getopt_long(argc, argv, "f:l:r:d:D:schvVn", opt_list, NULL)) -+ while((c = getopt_long(argc, argv, "f:l:r:d:D:schvVne:", opt_list, NULL)) - != EOF) { - int argval = -1; /* handle parsed numbers for various arguments */ - float argfreq = -1; -@@ -207,6 +219,9 @@ void parse_command_line(int argc, char * - result->next->next = NULL; - result = result->next; /* yes, I meant to do that. */ - break; -+ case 'e' : /* also --device */ -+ console_device = strdup(optarg); -+ break; - case 'h' : /* notice that this is also --help */ - default : - usage_bail(argv[0]); -@@ -214,26 +229,61 @@ void parse_command_line(int argc, char * - } - } - -+void do_beep(int freq) -+{ -+ if (console_type == BEEP_TYPE_CONSOLE) -+ { -+ if(ioctl(console_fd, KIOCSOUND, freq != 0 -+ ? (int)(CLOCK_TICK_RATE/freq) -+ : freq) < 0) { -+ printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ -+ perror("ioctl"); -+ } -+ } -+ else -+ { -+ /* BEEP_TYPE_EVDEV */ -+ struct input_event e; -+ -+ e.type = EV_SND; -+ e.code = SND_TONE; -+ e.value = freq; -+ -+ write(console_fd, &e, sizeof(struct input_event)); -+ } -+} -+ - void play_beep(beep_parms_t parms) { - int i; /* loop counter */ - - /* try to snag the console */ -- if((console_fd = open("/dev/console", O_WRONLY)) == -1) { -- fprintf(stderr, "Could not open /dev/console for writing.\n"); -+ -+ if(console_device) -+ console_fd = open(console_device, O_WRONLY); -+ else -+ if((console_fd = open("/dev/input/event0", O_WRONLY)) == -1) -+ if((console_fd = open("/dev/tty0", O_WRONLY)) == -1) -+ console_fd = open("/dev/vc/0", O_WRONLY); -+ -+ if(console_fd == -1) { -+ fprintf(stderr, "Could not open %s for writing\n", -+ console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0"); - printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ - perror("open"); - exit(1); - } - -+ if (ioctl(console_fd, EVIOCGSND(0)) != -1) -+ console_type = BEEP_TYPE_EVDEV; -+ else -+ console_type = BEEP_TYPE_CONSOLE; -+ - /* Beep */ - for (i = 0; i < parms.reps; i++) { /* start beep */ -- if(ioctl(console_fd, KIOCSOUND, (int)(CLOCK_TICK_RATE/parms.freq)) < 0) { -- printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ -- perror("ioctl"); -- } -+ do_beep(parms.freq); - /* Look ma, I'm not ansi C compatible! */ - usleep(1000*parms.length); /* wait... */ -- ioctl(console_fd, KIOCSOUND, 0); /* stop beep */ -+ do_beep(0); - if(parms.end_delay || (i+1 < parms.reps)) - usleep(1000*parms.delay); /* wait... */ - } /* repeat. */ -@@ -295,5 +345,8 @@ int main(int argc, char **argv) { - parms = next; - } - -+ if(console_device) -+ free(console_device); -+ - return EXIT_SUCCESS; - } diff --git a/meta-oe/recipes-extended/bitwise/bitwise_0.43.bb b/meta-oe/recipes-extended/bitwise/bitwise_0.50.bb index 713492b44f..5cd20c5b1c 100644 --- a/meta-oe/recipes-extended/bitwise/bitwise_0.43.bb +++ b/meta-oe/recipes-extended/bitwise/bitwise_0.50.bb @@ -12,8 +12,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" SRC_URI = "https://github.com/mellowcandle/bitwise/releases/download/v${PV}/bitwise-v${PV}.tar.gz \ file://0001-makefile.am-Fix-build-when-build-dir-is-not-same-as-.patch \ + file://run-ptest \ + file://ptest.out.expected \ " -SRC_URI[sha256sum] = "f524f794188a10defc4df673d8cf0b3739f93e58e93aff0cdb8a99fbdcca2ffb" +SRC_URI[sha256sum] = "806271fa5bf31de0600315e8720004a8f529954480e991ca84a9868dc1cae97e" UPSTREAM_CHECK_URI = "https://github.com/mellowcandle/bitwise/releases" @@ -21,4 +23,10 @@ S = "${WORKDIR}/${BPN}-v${PV}" DEPENDS = "ncurses readline" -inherit autotools +inherit autotools ptest + +do_install_ptest() { + install -d ${D}${PTEST_PATH} + install -m 0644 ${WORKDIR}/ptest.out.expected ${D}${PTEST_PATH}/ptest.out.expected +} + diff --git a/meta-oe/recipes-extended/bitwise/files/0001-makefile.am-Fix-build-when-build-dir-is-not-same-as-.patch b/meta-oe/recipes-extended/bitwise/files/0001-makefile.am-Fix-build-when-build-dir-is-not-same-as-.patch index ad3f0bb1fd..76d12f9cd8 100644 --- a/meta-oe/recipes-extended/bitwise/files/0001-makefile.am-Fix-build-when-build-dir-is-not-same-as-.patch +++ b/meta-oe/recipes-extended/bitwise/files/0001-makefile.am-Fix-build-when-build-dir-is-not-same-as-.patch @@ -8,6 +8,8 @@ This ensures right include paths are added to compiler Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/bitwise/files/ptest.out.expected b/meta-oe/recipes-extended/bitwise/files/ptest.out.expected new file mode 100644 index 0000000000..c5ca3e5215 --- /dev/null +++ b/meta-oe/recipes-extended/bitwise/files/ptest.out.expected @@ -0,0 +1,13 @@ +Unsigned decimal: 66 +Signed decimal: 66 +Hexadecimal: 0x42 +Octal: 0102 +Human: 66 +Radix64: 0/ +IPv4 (Network byte order - Big): 66.0.0.0 +IPv4 (Reverwsed byte order - Little): 0.0.0.66 +ASCII: .......B +Binary: +0 1 0 0 0 0 1 0 + 7 - 0 + diff --git a/meta-oe/recipes-extended/bitwise/files/run-ptest b/meta-oe/recipes-extended/bitwise/files/run-ptest new file mode 100755 index 0000000000..c29e1eaddc --- /dev/null +++ b/meta-oe/recipes-extended/bitwise/files/run-ptest @@ -0,0 +1,11 @@ +#!/bin/sh + +# Test 1: Basic bitwise operation +bitwise --no-color -w b 0x42 > test.out + +# Compare expected output with actual output + +if ! cmp test.out ptest.out.expected; then + echo "[FAIL] Test 1: Basic bitwise operation" + exit 1 +fi diff --git a/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch b/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch index 8365da0f90..f761ccbdc8 100644 --- a/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch +++ b/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch @@ -21,16 +21,19 @@ Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> Update for 20210808. Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> + +Update for 20210201 +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- aclocal.m4 | 1 - configure | 259 ----------------------------------------------------- 2 files changed, 260 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 -index 7a9a8fb..108b6cc 100644 +index 832d0c8..63b03f2 100644 --- a/aclocal.m4 +++ b/aclocal.m4 -@@ -1401,7 +1401,6 @@ CF_GCC_VERSION +@@ -1421,7 +1421,6 @@ CF_GCC_VERSION CF_ACVERSION_CHECK(2.52, [AC_PROG_CC_STDC], [CF_ANSI_CC_REQD]) @@ -39,20 +42,20 @@ index 7a9a8fb..108b6cc 100644 dnl --------------------------------------------------------------------------- dnl CF_PROG_GROFF version: 3 updated: 2018/01/07 13:16:19 diff --git a/configure b/configure -index 5b98a03..e3a4237 100755 +index cb47b4c..c72b6e4 100755 --- a/configure +++ b/configure -@@ -2146,265 +2146,6 @@ esac +@@ -2144,265 +2144,6 @@ esac # This should have been defined by AC_PROG_CC : "${CC:=cc}" --echo "$as_me:2149: checking \$CFLAGS variable" >&5 +-echo "$as_me:2147: checking \$CFLAGS variable" >&5 -echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 -case "x$CFLAGS" in -(*-[IUD]*) -- echo "$as_me:2153: result: broken" >&5 +- echo "$as_me:2151: result: broken" >&5 -echo "${ECHO_T}broken" >&6 -- { echo "$as_me:2155: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 +- { echo "$as_me:2153: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 -echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;} - cf_flags="$CFLAGS" - CFLAGS= @@ -160,18 +163,18 @@ index 5b98a03..e3a4237 100755 - done - ;; -(*) -- echo "$as_me:2263: result: ok" >&5 +- echo "$as_me:2261: result: ok" >&5 -echo "${ECHO_T}ok" >&6 - ;; -esac - --echo "$as_me:2268: checking \$CC variable" >&5 +-echo "$as_me:2266: checking \$CC variable" >&5 -echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 -case "$CC" in -(*[\ \ ]-*) -- echo "$as_me:2272: result: broken" >&5 +- echo "$as_me:2270: result: broken" >&5 -echo "${ECHO_T}broken" >&6 -- { echo "$as_me:2274: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 +- { echo "$as_me:2272: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 -echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} - # humor him... - cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'` @@ -288,26 +291,26 @@ index 5b98a03..e3a4237 100755 - done - test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 - --echo "${as_me:-configure}:2391: testing resulting CC: '$CC' ..." 1>&5 +-echo "${as_me:-configure}:2389: testing resulting CC: '$CC' ..." 1>&5 - - test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 - --echo "${as_me:-configure}:2395: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 +-echo "${as_me:-configure}:2393: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 - - test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 - --echo "${as_me:-configure}:2399: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 +-echo "${as_me:-configure}:2397: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 - - ;; -(*) -- echo "$as_me:2403: result: ok" >&5 +- echo "$as_me:2401: result: ok" >&5 -echo "${ECHO_T}ok" >&6 - ;; -esac - - echo "$as_me:2408: checking whether ${MAKE-make} sets \${MAKE}" >&5 + echo "$as_me:2406: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` -- -2.25.1 +2.34.1 diff --git a/meta-oe/recipes-extended/byacc/byacc_20221229.bb b/meta-oe/recipes-extended/byacc/byacc_20230219.bb index f7f75b02cf..614bcaf646 100644 --- a/meta-oe/recipes-extended/byacc/byacc_20221229.bb +++ b/meta-oe/recipes-extended/byacc/byacc_20230219.bb @@ -4,7 +4,7 @@ # Setting to PD as this is what the upstream has it as. LICENSE = "PD" -LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=62c37a10a2faf90235ee64280ad72737" +LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=b56b7454f5f865de2e6e35ee2185b461" require byacc.inc -SRC_URI[sha256sum] = "1316c6f790fafa6688427f1ff91267b61d8b7873b443c620eef69a6eff0503bc" +SRC_URI[sha256sum] = "36b972a6d4ae97584dd186925fbbc397d26cb20632a76c2f52ac7653cd081b58" diff --git a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles/python3.patch b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles/python3.patch deleted file mode 100644 index a6f6701261..0000000000 --- a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles/python3.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/modules/packages/apt_get -+++ b/modules/packages/apt_get -@@ -1,4 +1,4 @@ --#!/var/cfengine/bin/python -+#!/var/cfengine/bin/python3 - - import sys - import os ---- a/modules/packages/apt_get.in -+++ b/modules/packages/apt_get.in -@@ -1,4 +1,4 @@ --#!@bindir@/python -+#!@bindir@/python3 - - import sys - import os diff --git a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.21.0.bb index 4ef3fc15ad..68d4042554 100644 --- a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb +++ b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.21.0.bb @@ -18,13 +18,12 @@ or wherever `$(sys.masterdir)` points. \ HOMEPAGE = "http://cfengine.com" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9f76426f9ef8c6f6739fadd21d817a4f" +LIC_FILES_CHKSUM = "file://LICENSE;md5=bb843e794feb6890f7697637b461c36e" SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz \ - file://python3.patch \ " -SRC_URI[md5sum] = "6d456fdd9bd24ff6617eeaa05efae602" -SRC_URI[sha256sum] = "4a071c0c4ba7df9bad93144cff5fbc0566e5172afd66201072e3193b76c55a38" +#SRC_URI[md5sum] = "5df2f85c75efc351ffadebcc11046a98" +SRC_URI[sha256sum] = "013ebe68599915cedb4bf753b471713d91901a991623358b9a967d9a779bcc16" inherit autotools diff --git a/meta-oe/recipes-extended/cfengine/cfengine/0001-Fixed-with-libxml2-no-case-in-configure.ac.patch b/meta-oe/recipes-extended/cfengine/cfengine/0001-Fixed-with-libxml2-no-case-in-configure.ac.patch new file mode 100644 index 0000000000..78f36bde45 --- /dev/null +++ b/meta-oe/recipes-extended/cfengine/cfengine/0001-Fixed-with-libxml2-no-case-in-configure.ac.patch @@ -0,0 +1,89 @@ +From a08acdfadb5eba2a3201209c6da3ad6f2ca4ae79 Mon Sep 17 00:00:00 2001 +From: Craig Comstock <craig.comstock@northern.tech> +Date: Fri, 27 Jan 2023 15:19:48 -0600 +Subject: [PATCH] Fixed --with-libxml2=no case in configure.ac + +The CF3_WITH_LIBRARY and AC_CHECK_HEADERS were moved to outside of the check for with-libxml2=no + +Ticket: CFE-4023 +Changelog: title +--- +Upstream-Status: Pending + + configure.ac | 21 +++++++++++---------- + libntech/configure.ac | 21 +++++++++++---------- + 2 files changed, 22 insertions(+), 20 deletions(-) + +diff --git a/configure.ac b/configure.ac +index e189b10..f6b8226 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -659,19 +659,20 @@ if test "x$with_libxml2" != "xno"; then + LIBXML2_CPPFLAGS=-I$with_libxml2/include/libxml2 + fi + fi +-fi + +-CF3_WITH_LIBRARY(libxml2, +- [AC_CHECK_LIB(xml2, xmlFirstElementChild, +- [], +- [if test "x$with_libxml2" != xcheck; then +- AC_MSG_ERROR(Cannot find libxml2); fi] +- ) +- AC_CHECK_HEADERS([libxml/xmlwriter.h], [break], ++ CF3_WITH_LIBRARY(libxml2, ++ [AC_CHECK_LIB(xml2, xmlFirstElementChild, ++ [], + [if test "x$with_libxml2" != xcheck; then + AC_MSG_ERROR(Cannot find libxml2); fi] +- )] +-) ++ ) ++ AC_CHECK_HEADERS([libxml/xmlwriter.h], [break], ++ [if test "x$with_libxml2" != xcheck; then ++ AC_MSG_ERROR(Cannot find libxml2); fi] ++ )] ++ ) ++ ++fi + + AM_CONDITIONAL([HAVE_LIBXML2], + [test "x$with_libxml2" != xno && +diff --git a/libntech/configure.ac b/libntech/configure.ac +index 7bb8787..28b3683 100644 +--- a/libntech/configure.ac ++++ b/libntech/configure.ac +@@ -571,19 +571,20 @@ if test "x$with_libxml2" != "xno"; then + LIBXML2_CPPFLAGS=-I$with_libxml2/include/libxml2 + fi + fi +-fi + +-CF3_WITH_LIBRARY(libxml2, +- [AC_CHECK_LIB(xml2, xmlFirstElementChild, +- [], +- [if test "x$with_libxml2" != xcheck; then +- AC_MSG_ERROR(Cannot find libxml2); fi] +- ) +- AC_CHECK_HEADERS([libxml/xmlwriter.h], [break], ++ CF3_WITH_LIBRARY(libxml2, ++ [AC_CHECK_LIB(xml2, xmlFirstElementChild, ++ [], + [if test "x$with_libxml2" != xcheck; then + AC_MSG_ERROR(Cannot find libxml2); fi] +- )] +-) ++ ) ++ AC_CHECK_HEADERS([libxml/xmlwriter.h], [break], ++ [if test "x$with_libxml2" != xcheck; then ++ AC_MSG_ERROR(Cannot find libxml2); fi] ++ )] ++ ) ++ ++fi + + AM_CONDITIONAL([HAVE_LIBXML2], + [test "x$with_libxml2" != xno && +-- +2.39.1 + diff --git a/meta-oe/recipes-extended/cfengine/cfengine_3.15.0.bb b/meta-oe/recipes-extended/cfengine/cfengine_3.21.0.bb index 1566f8a88f..6fa5d2743a 100644 --- a/meta-oe/recipes-extended/cfengine/cfengine_3.15.0.bb +++ b/meta-oe/recipes-extended/cfengine/cfengine_3.21.0.bb @@ -15,13 +15,15 @@ SKIP_RECIPE[cfengine] ?= "Needs porting to openssl 3.x" LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=233aa25e53983237cf0bd4c238af255f" -DEPENDS = "attr tokyocabinet bison-native" +DEPENDS += "attr tokyocabinet bison-native libxml2" +#RDEPENDS:cfengine += "attr tokyocabinet bison-native libxml2" -SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz \ +SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BPN}-community-${PV}.tar.gz \ + file://0001-Fixed-with-libxml2-no-case-in-configure.ac.patch \ file://set-path-of-default-config-file.patch \ " -SRC_URI[md5sum] = "d4dabfa46d8afa151be5610f184354e7" -SRC_URI[sha256sum] = "fa53e137f850eb268a8e7ae4578b5db5dc383656341f5053dc1a353ed0288265" +#SRC_URI[md5sum] = "5318e40702bc66a3ece44ec4ad77712b" +SRC_URI[sha256sum] = "911778ddb0a4e03a3ddfc8fc0f033136e1551849ea2dcbdb3f0f14359dfe3126" inherit autotools-brokensep systemd diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Fix-error.patch b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Fix-error.patch index d1a303cf4f..1d8013be6f 100644 --- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Fix-error.patch +++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Fix-error.patch @@ -5,6 +5,8 @@ Subject: [PATCH] Fix error Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + swig/python/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-the-build-error-when-python-3.0.patch b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-the-build-error-when-python-3.0.patch index 0d6f029e4c..5d5652a5f2 100644 --- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-the-build-error-when-python-3.0.patch +++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-the-build-error-when-python-3.0.patch @@ -5,6 +5,8 @@ Subject: [PATCH] fix Xthe build error when python>3.0 Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> --- +Upstream-Status: Pending + src/target_python.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb index 464d25ad08..3b7453536b 100644 --- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb +++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b19ee058d2d5f69af45da98051d91064" SECTION = "Development/Libraries" DEPENDS = "swig-native python3 sblim-cmpi-devel" -SRC_URI = "git://github.com/kkaempf/cmpi-bindings.git;protocol=http;branch=master;protocol=https \ +SRC_URI = "git://github.com/kkaempf/cmpi-bindings.git;protocol=https;branch=master \ file://cmpi-bindings-0.4.17-no-ruby-perl.patch \ file://cmpi-bindings-0.4.17-sblim-sigsegv.patch \ file://cmpi-bindings-0.9.5-python-lib-dir.patch \ diff --git a/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch b/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch index 8d31e12f94..f42461e322 100644 --- a/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch +++ b/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch @@ -14,6 +14,8 @@ client.c:834:23: error: '%s' directive output may be truncated writing up to 102 Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + configure.ac | 1 + m4/ax_check_compile_flag.m4 | 74 +++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/meta-oe/recipes-extended/collectd/collectd/0005-Disable-new-gcc8-warnings.patch b/meta-oe/recipes-extended/collectd/collectd/0005-Disable-new-gcc8-warnings.patch index 13510cdea0..459bbd4e5a 100644 --- a/meta-oe/recipes-extended/collectd/collectd/0005-Disable-new-gcc8-warnings.patch +++ b/meta-oe/recipes-extended/collectd/collectd/0005-Disable-new-gcc8-warnings.patch @@ -9,6 +9,8 @@ already in place Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/libcollectdclient/network_parse.c | 7 +++++++ src/write_sensu.c | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch b/meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch index f12b16cb91..409f8dea02 100644 --- a/meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch +++ b/meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch @@ -3,6 +3,8 @@ From: Paul Eggleton <paul.eggleton@linux.intel.com> Date: Mon, 22 Apr 2013 16:28:16 +0000 --- +Upstream-Status: Pending + configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-extended/ddrescue/ddrescue_1.26.bb b/meta-oe/recipes-extended/ddrescue/ddrescue_1.27.bb index a31911b977..7a71d02dc1 100644 --- a/meta-oe/recipes-extended/ddrescue/ddrescue_1.26.bb +++ b/meta-oe/recipes-extended/ddrescue/ddrescue_1.27.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \ " SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.lz" -SRC_URI[sha256sum] = "e513cd3a90d9810dfdd91197d40aa40f6df01597bfb5ecfdfb205de1127c551f" +SRC_URI[sha256sum] = "38c80c98c5a44f15e53663e4510097fd68d6ec20758efdf3a925037c183232eb" # This isn't already added by base.bbclass do_unpack[depends] += "lzip-native:do_populate_sysroot" diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch deleted file mode 100644 index 7b40b7a67e..0000000000 --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch +++ /dev/null @@ -1,45 +0,0 @@ -From dd2d42a7f877d292f86e421dd9651f4b7c2abf18 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 19 Apr 2022 14:57:58 -0700 -Subject: [PATCH] cmake: Link with libatomic on rv32/rv64 - -Use of <atomic> needs to link in libatomic on riscv -Fixes - -undefined reference to `__atomic_exchange_1' - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/lib/CMakeLists.txt | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt -index 3293376..65018be 100644 ---- a/src/lib/CMakeLists.txt -+++ b/src/lib/CMakeLists.txt -@@ -37,6 +37,12 @@ else() - set(SOCKET_LIBRARY socket) - endif() - -+if(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv32") -+ set(ATOMIC_LIBRARY atomic) -+else() -+ set(ATOMIC_LIBRARY "") -+endif() -+ - if(HAVE_FUNC_PTHREAD_SETNAME_NP) - add_definitions(-DDLT_USE_PTHREAD_SETNAME_NP) - message(STATUS "Using pthread_setname_np API to set thread name") -@@ -44,7 +50,7 @@ else() - message(STATUS "pthread_setname_np API not available on this platform") - endif() - --target_link_libraries(dlt ${RT_LIBRARY} ${SOCKET_LIBRARY} Threads::Threads) -+target_link_libraries(dlt ${RT_LIBRARY} ${SOCKET_LIBRARY} ${ATOMIC_LIBRARY} Threads::Threads) - - target_include_directories(dlt - PUBLIC --- -2.36.0 - diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-dlt-system-Fix-buffer-overflow-detection-on-32bit-ta.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-dlt-system-Fix-buffer-overflow-detection-on-32bit-ta.patch deleted file mode 100644 index e7e6cb3b1a..0000000000 --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-dlt-system-Fix-buffer-overflow-detection-on-32bit-ta.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 94378458d653b1edca86435026909592cbe5e793 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Fri, 19 Aug 2022 11:12:17 +0800 -Subject: [PATCH] dlt-system: Fix buffer overflow detection on 32bit targets - -On 32bit target, dlt-system will termiated with error: -dlt-system: *** buffer overflow detected ***: terminated - -Upstream-Status: Submitted [https://github.com/COVESA/dlt-daemon/pull/398] - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - src/system/dlt-system-watchdog.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/system/dlt-system-watchdog.c b/src/system/dlt-system-watchdog.c -index a2b01de..c0eaa12 100644 ---- a/src/system/dlt-system-watchdog.c -+++ b/src/system/dlt-system-watchdog.c -@@ -109,8 +109,8 @@ int register_watchdog_fd(struct pollfd *pollfd, int fdcnt) - - void watchdog_fd_handler(int fd) - { -- long int timersElapsed = 0; -- int r = read(fd, &timersElapsed, 8); // only needed to reset fd event -+ uint64_t timersElapsed = 0ULL; -+ int r = read(fd, &timersElapsed, 8U); // only needed to reset fd event - if(r < 0) - DLT_LOG(watchdogContext, DLT_LOG_ERROR, DLT_STRING("Could not reset systemd watchdog. Exit with: "), - DLT_STRING(strerror(r))); -@@ -120,4 +120,4 @@ void watchdog_fd_handler(int fd) - - DLT_LOG(watchdogContext, DLT_LOG_DEBUG, DLT_STRING("systemd watchdog waited periodic\n")); - } --#endif -\ No newline at end of file -+#endif --- -2.25.1 - diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/481.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/481.patch new file mode 100644 index 0000000000..52d9de2fd7 --- /dev/null +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/481.patch @@ -0,0 +1,49 @@ +From 95476de802585629c6d89707a9247bbb0c70f6c9 Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> +Date: Fri, 28 Apr 2023 22:39:57 +0200 +Subject: [PATCH] Update gtest_dlt_daemon_multiple_files_logging.cpp +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fix build error due to dlt_vlog not having the correct format string with security build flags enabled + +[ 88%] Building CXX object tests/CMakeFiles/gtest_dlt_daemon_multiple_files_logging.dir/gtest_dlt_daemon_multiple_files_logging.cpp.o +cd dlt-daemon-2.18.9/obj-x86_64-linux-gnu/tests && /usr/bin/c++ -DCONFIGURATION_FILES_DIR=\"/etc\" -DDLT_DAEMON_USE_FIFO_IPC -DDLT_LIB_USE_FIFO_IPC -DDLT_NETWORK_TRACE_ENABLE -DDLT_SYSTEMD_ENABLE -DDLT_SYSTEMD_JOURNAL_ENABLE -DDLT_UNIT_TESTS -DDLT_USER_IPC_PATH=\"/tmp\" -DDLT_USE_IPv6 -DEXTENDED_FILTERING -D_GNU_SOURCE -Idlt-daemon-2.18.9 -Idlt-daemon-2.18.9/obj-x86_64-linux-gnu/include/dlt -Idlt-daemon-2.18.9/include/dlt -Idlt-daemon-2.18.9/src/shared -Idlt-daemon-2.18.9/src/core_dump_handler -Idlt-daemon-2.18.9/src/offlinelogstorage -Idlt-daemon-2.18.9/src/lib -Idlt-daemon-2.18.9/src/daemon -Idlt-daemon-2.18.9/src/console -Idlt-daemon-2.18.9/src/gateway -Idlt-daemon-2.18.9/systemd/3rdparty -g -O2 -ffile-prefix-map=dlt-daemon-2.18.9=. -flto=auto -ffat-lto-objects -flto=auto -ffat-lto-objects -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -isystem /include -std=gnu++0x -std=gnu++11 -Wall -Wextra -Wno-variadic-macros -Wno-strict-aliasing -DGTEST_HAS_PTHREAD=1 -MD -MT tests/CMakeFiles/gtest_dlt_daemon_multiple_files_logging.dir/gtest_dlt_daemon_multiple_files_logging.cpp.o -MF CMakeFiles/gtest_dlt_daemon_multiple_files_logging.dir/gtest_dlt_daemon_multiple_files_logging.cpp.o.d -o CMakeFiles/gtest_dlt_daemon_multiple_files_logging.dir/gtest_dlt_daemon_multiple_files_logging.cpp.o -c dlt-daemon-2.18.9/tests/gtest_dlt_daemon_multiple_files_logging.cpp +dlt-daemon-2.18.9/tests/gtest_dlt_daemon_multiple_files_logging.cpp: In member function ‘virtual void t_dlt_logging_multiple_files_append_reinit_normal_Test::TestBody()’: +dlt-daemon-2.18.9/tests/gtest_dlt_daemon_multiple_files_logging.cpp:106:13: error: format not a string literal and no format arguments [-Werror=format-security] + 106 | dlt_vlog(LOG_INFO, log1); + | ~~~~~~~~^~~~~~~~~~~~~~~~ +dlt-daemon-2.18.9/tests/gtest_dlt_daemon_multiple_files_logging.cpp:110:13: error: format not a string literal and no format arguments [-Werror=format-security] + 110 | dlt_vlog(LOG_INFO, log2); + | ~~~~~~~~^~~~~~~~~~~~~~~~ +In file included from /usr/include/string.h:535, + from /usr/include/gtest/internal/gtest-port.h:264, + from /usr/include/gtest/internal/gtest-internal.h:40, + from /usr/include/gtest/gtest.h:62, + from dlt-daemon-2.18.9/tests/gtest_dlt_daemon_multiple_files_logging.cpp:27: +In function ‘strncpy’, +--- +Upstream-Status: Pending + + tests/gtest_dlt_daemon_multiple_files_logging.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/gtest_dlt_daemon_multiple_files_logging.cpp b/tests/gtest_dlt_daemon_multiple_files_logging.cpp +index 2da512e1..05b58f2c 100644 +--- a/tests/gtest_dlt_daemon_multiple_files_logging.cpp ++++ b/tests/gtest_dlt_daemon_multiple_files_logging.cpp +@@ -103,11 +103,11 @@ TEST(t_dlt_logging_multiple_files_append_reinit, normal) + const char* log2 = "TWO\n"; + + configure(path, file_name, true, file_size, max_file_size); +- dlt_vlog(LOG_INFO, log1); ++ dlt_vlog(LOG_INFO, "%s", log1); + EXPECT_NO_THROW(dlt_log_free()); + + configure(path, file_name, true, file_size, max_file_size); +- dlt_vlog(LOG_INFO, log2); ++ dlt_vlog(LOG_INFO, "%s", log2); + EXPECT_NO_THROW(dlt_log_free()); + verify_in_one_file(path, file_name, log1, log2); + } diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/482.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/482.patch new file mode 100644 index 0000000000..7c9e222b35 --- /dev/null +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/482.patch @@ -0,0 +1,40 @@ +From b38761831670e980a58acb33d611f65255d678ac Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> +Date: Fri, 28 Apr 2023 22:46:36 +0200 +Subject: [PATCH] Update CMakeLists.txt + +Link systemd libraries, to avoid underlinking of tests with +-DWITH_SYSTEMD_SOCKET_ACTIVATION=ON + +[ 82%] Linking CXX executable gtest_dlt_daemon_gateway +cd dlt-daemon-2.18.9/obj-x86_64-linux-gnu/tests && /usr/bin/cmake -E cmake_link_script CMakeFiles/gtest_dlt_daemon_gateway.dir/link.txt --verbose=1 +/usr/bin/c++ -g -O2 -ffile-prefix-map=dlt-daemon-2.18.9=. -flto=auto -ffat-lto-objects -flto=auto -ffat-lto-objects -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -isystem /include -std=gnu++0x -Wl,-Bsymbolic-functions -flto=auto -ffat-lto-objects -flto=auto -Wl,-z,relro -rdynamic CMakeFiles/gtest_dlt_daemon_gateway.dir/gtest_dlt_daemon_gateway.cpp.o CMakeFiles/gtest_dlt_daemon_gateway.dir/__/systemd/3rdparty/sd-daemon.c.o -o gtest_dlt_daemon_gateway -Wl,-rpath,dlt-daemon-2.18.9/obj-x86_64-linux-gnu/src/daemon ../src/daemon/libdlt_daemon.so /usr/lib/x86_64-linux-gnu/libgtest.a /usr/lib/x86_64-linux-gnu/libgtest_main.a -lrt /usr/lib/x86_64-linux-gnu/libgtest.a +/usr/bin/ld: ../src/daemon/libdlt_daemon.so: undefined reference to `sd_listen_fds_with_names' +--- +Upstream-Status: Pending + + tests/CMakeLists.txt | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 579d7308..3155ca9a 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -21,8 +21,16 @@ else() + set(LIBRARIES socket) + endif() + ++if(WITH_SYSTEMD_JOURNAL) ++ if(SYSTEMD_VERSION LESS 209) ++ set(SYSTEMD_LIBS systemd-journal systemd-id128) ++ else(SYSTEMD_VERSION LESS 209) ++ set(SYSTEMD_LIBS systemd) ++ endif(SYSTEMD_VERSION LESS 209) ++endif(WITH_SYSTEMD_JOURNAL) ++ + set(DLT_LIBRARIES dlt ${GTEST_LIBS} ${LIBRARIES}) +-set(DLT_DAEMON_LIBRARIES dlt_daemon ${GTEST_LIBS} ${LIBRARIES}) ++set(DLT_DAEMON_LIBRARIES dlt_daemon ${GTEST_LIBS} ${LIBRARIES} ${SYSTEMD_LIBS}) + set(DLT_CONTROL_LIBRARIES dlt dlt_control_common_lib ${GTEST_LIBS}) + + #Receiver used for QTs. add_test() is not required diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/504.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/504.patch new file mode 100644 index 0000000000..3290d1108c --- /dev/null +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/504.patch @@ -0,0 +1,34 @@ +Bug: https://bugs.debian.org/1041124 +From 3f8bc3343983697531d52918fb6cdba19593f3a8 Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> +Date: Sat, 15 Jul 2023 11:31:55 +0200 +Subject: [PATCH] Update CMakeLists.txt: set required std version to gnu++14 + +New googletest 1.13.0 defaults to gnu++14, so makes this package FTBFS when building testsuite with this error: + +In file included from /usr/include/gtest/gtest-message.h:57, + from /usr/include/gtest/gtest-assertion-result.h:46, + from /usr/include/gtest/gtest.h:64, + from /build/1st/dlt-daemon-2.18.9/tests/gtest_dlt_user.cpp:27: +/usr/include/gtest/internal/gtest-port.h:270:2: error: #error C++ versions less than C++14 are not supported. + 270 | #error C++ versions less than C++14 are not supported. + | ^~~~~ + +Thanks Adrian Bunk <bunk@debian.org> for the report and the fix! +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 014fc3bb..b2e056db 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -213,7 +213,7 @@ endif() + + add_compile_options( + $<$<COMPILE_LANGUAGE:C>:-std=gnu99> +- $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++11> ++ $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++14> + -Wall + -Wextra + # -pedantic diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.8.bb b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.9.bb index aa5ef46a9d..2d6d1879a7 100644 --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.8.bb +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.9.bb @@ -1,34 +1,31 @@ SUMMARY = "Diagnostic Log and Trace" DESCRIPTION = "This component provides a standardised log and trace interface, \ based on the standardised protocol specified in the AUTOSAR standard 4.0 DLT. \ -This component can be used by GENIVI components and other applications as \ +This component can be used by COVESA components and other applications as \ logging facility providing: \ - the DLT shared library \ - the DLT daemon, including startup scripts \ - the DLT daemon adaptors- the DLT client console utilities \ - the DLT test applications" -HOMEPAGE = "https://www.genivi.org/" +HOMEPAGE = "https://www.covesa.global/" SECTION = "console/utils" LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=8184208060df880fe3137b93eb88aeea" DEPENDS = "zlib gzip-native json-c" -SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https;branch=master \ +SRC_URI = "git://github.com/COVESA/${BPN}.git;protocol=https;branch=master \ file://0002-Don-t-execute-processes-as-a-specific-user.patch \ file://0004-Modify-systemd-config-directory.patch \ - file://0001-cmake-Link-with-libatomic-on-rv32-rv64.patch \ - file://0001-dlt-system-Fix-buffer-overflow-detection-on-32bit-ta.patch \ + file://481.patch \ + file://482.patch \ + file://504.patch \ " -SRCREV = "6a3bd901d825c7206797e36ea98e10a218f5aad2" - -PV .= "+2.18.9git${SRCPV}" +SRCREV = "9a2312d3512a27620d41b9a325338b6e7b3d42de" S = "${WORKDIR}/git" -LDFLAGS:append:riscv64 = " -latomic" - -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd systemd-watchdog systemd-journal dlt-examples dlt-adaptor dlt-adaptor-udp dlt-console ', '', d)} \ +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd systemd-watchdog systemd-journal dlt-examples dlt-adaptor dlt-adaptor-stdin dlt-adaptor-udp dlt-console ', '', d)} \ udp-connection dlt-system dlt-filetransfer " # dlt-dbus @@ -45,6 +42,7 @@ PACKAGECONFIG[udp-connection] = "-DWITH_UDP_CONNECTION=ON,-DWITH_UDP_CONNECTION= # Command line options PACKAGECONFIG[dlt-system] = "-DWITH_DLT_SYSTEM=ON,-DWITH_DLT_SYSTEM=OFF" PACKAGECONFIG[dlt-adaptor] = "-DWITH_DLT_ADAPTOR=ON,-DWITH_DLT_ADAPTOR=OFF,,dlt-daemon-systemd" +PACKAGECONFIG[dlt-adaptor-stdin] = "-DWITH_DLT_ADAPTOR_STDIN=ON,-DWITH_DLT_ADAPTOR_STDIN=OFF,,dlt-daemon-systemd" PACKAGECONFIG[dlt-adaptor-udp] = "-DWITH_DLT_ADAPTOR_UDP=ON,-DWITH_DLT_ADAPTOR_UDP=OFF,,dlt-daemon-systemd" PACKAGECONFIG[dlt-filetransfer] = "-DWITH_DLT_FILETRANSFER=ON,-DWITH_DLT_FILETRANSFER=OFF" PACKAGECONFIG[dlt-console] = "-DWITH_DLT_CONSOLE=ON,-DWITH_DLT_CONSOLE=OFF,,dlt-daemon-systemd" diff --git a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.14.3.bb b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.14.3.bb new file mode 100644 index 0000000000..71744026da --- /dev/null +++ b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.14.3.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "C++ API for etcd's v3 client API" +HOMEPAGE = "https://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=eae7da6a2cd1788a5cf8a9f838cf6450" + +SRC_URI += "git://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3.git;branch=master;protocol=https" +SRCREV = "5e2884f36276e44f683fa02fca39807716fdbc16" + +inherit cmake + +DEPENDS += "grpc protobuf cpprest grpc-native protobuf-native" + +S = "${WORKDIR}/git" + +EXTRA_OECONF += "-DCPPREST_EXCLUDE_WEBSOCKETS=ON" + +INSANE_SKIP:${PN}:append = " ldflags" +SOLIBS = ".so" +FILES_SOLIBSDEV = "" diff --git a/meta-oe/recipes-extended/etcd/etcd/0001-test_lib.sh-remove-gobin-requirement-during-build.patch b/meta-oe/recipes-extended/etcd/etcd/0001-test_lib.sh-remove-gobin-requirement-during-build.patch new file mode 100644 index 0000000000..f0d9c2936a --- /dev/null +++ b/meta-oe/recipes-extended/etcd/etcd/0001-test_lib.sh-remove-gobin-requirement-during-build.patch @@ -0,0 +1,51 @@ +From a57d78a94e7cbc8cfa468b58c7d4e23668c05fec Mon Sep 17 00:00:00 2001 +From: Andrew Geissler <geissonator@yahoo.com> +Date: Tue, 2 May 2023 13:36:36 -0600 +Subject: [PATCH] test_lib.sh: remove gobin requirement during build + +This tool is installed as a part of the build process (build.sh sources +test_lib.sh) + +This tool has been removed in the latest etcd main branch. Installing it +as a part of the build process breaks bitbake (it doesn't allow +downloading of packages once in the build steps). + +This tool is not needed to build etcd (it appears to be used for some +optional test cases). + +Signed-off-by: Andrew Geissler <geissonator@yahoo.com> +--- +Upstream-Status: Pending + + scripts/test_lib.sh | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/scripts/test_lib.sh b/scripts/test_lib.sh +index 44b9d2895..da97a9c26 100644 +--- a/scripts/test_lib.sh ++++ b/scripts/test_lib.sh +@@ -140,7 +140,7 @@ function run { + command=("${command[@]@Q}") + if [[ "${rpath}" != "." && "${rpath}" != "" ]]; then + repro="(cd ${rpath} && ${command[*]})" +- else ++ else + repro="${command[*]}" + fi + +@@ -305,7 +305,11 @@ function tool_exists { + + # Ensure gobin is available, as it runs majority of the tools + if ! command -v "gobin" >/dev/null; then +- run env GO111MODULE=off go get github.com/myitcv/gobin || exit 1 ++ # This script is run as a part of the build process. Installing packages ++ # during the build process is not allowed in bitbake. ++ # Gobin is deprecated and not needed when building in the bitbake env ++ echo "Not installing gobin in bitbake env" ++ # run env GO111MODULE=off go get github.com/myitcv/gobin || exit 1 + fi + + # tool_get_bin [tool] - returns absolute path to a tool binary (or returns error) +-- +2.37.1 (Apple Git-137.1) + diff --git a/meta-oe/recipes-extended/etcd/etcd/0001-xxhash-bump-to-v2.1.2.patch b/meta-oe/recipes-extended/etcd/etcd/0001-xxhash-bump-to-v2.1.2.patch new file mode 100644 index 0000000000..c897fe17cd --- /dev/null +++ b/meta-oe/recipes-extended/etcd/etcd/0001-xxhash-bump-to-v2.1.2.patch @@ -0,0 +1,205 @@ +From e99ee73e7660689203b83fab6b26c400191b145c Mon Sep 17 00:00:00 2001 +From: Andrew Geissler <geissonator@yahoo.com> +Date: Fri, 24 Mar 2023 10:00:35 -0500 +Subject: [PATCH] xxhash: bump to v2.1.2 + +There is a known issue in v2.1.1: + + https://github.com/cespare/xxhash/issues/54 + +Fix that issue by bumping to the version with the fix. + +This has been fixed in upstream etcd via the following: + + https://github.com/etcd-io/etcd/commit/f0f77fc14e3bd4d94a953b490e810a06ef36695a + +But it was a pretty major upgrade so just take the one piece we need for +the etcd v3.5 release tag. + +Signed-off-by: Andrew Geissler <geissonator@yahoo.com> +--- +Upstream-Status: Pending + + client/v3/go.mod | 2 +- + client/v3/go.sum | 2 ++ + etcdctl/go.mod | 2 +- + etcdctl/go.sum | 3 ++- + etcdutl/go.mod | 2 +- + etcdutl/go.sum | 3 ++- + go.mod | 2 +- + go.sum | 3 ++- + server/go.mod | 2 +- + server/go.sum | 3 ++- + tests/go.mod | 2 +- + tests/go.sum | 3 ++- + 12 files changed, 18 insertions(+), 11 deletions(-) + +diff --git a/client/v3/go.mod b/client/v3/go.mod +index ec286316a..6e72eb067 100644 +--- a/client/v3/go.mod ++++ b/client/v3/go.mod +@@ -15,7 +15,7 @@ require ( + + require ( + github.com/beorn7/perks v1.0.1 // indirect +- github.com/cespare/xxhash/v2 v2.1.1 // indirect ++ github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/coreos/go-semver v0.3.0 // indirect + github.com/coreos/go-systemd/v22 v22.3.2 // indirect + github.com/gogo/protobuf v1.3.2 // indirect +diff --git a/client/v3/go.sum b/client/v3/go.sum +index 024078504..8866fabba 100644 +--- a/client/v3/go.sum ++++ b/client/v3/go.sum +@@ -14,6 +14,8 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r + github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= + github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= + github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= ++github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= ++github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= + github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= + github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= + github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +diff --git a/etcdctl/go.mod b/etcdctl/go.mod +index 2101ed78e..3a727b492 100644 +--- a/etcdctl/go.mod ++++ b/etcdctl/go.mod +@@ -23,7 +23,7 @@ require ( + + require ( + github.com/beorn7/perks v1.0.1 // indirect +- github.com/cespare/xxhash/v2 v2.1.1 // indirect ++ github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/coreos/go-semver v0.3.0 // indirect + github.com/coreos/go-systemd/v22 v22.3.2 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect +diff --git a/etcdctl/go.sum b/etcdctl/go.sum +index 980aca775..765a77e72 100644 +--- a/etcdctl/go.sum ++++ b/etcdctl/go.sum +@@ -38,8 +38,9 @@ github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 h1:uH66TXeswKn5P + github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= + github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= + github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= + github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= ++github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= ++github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= + github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= + github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= + github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +diff --git a/etcdutl/go.mod b/etcdutl/go.mod +index 24fd3f1bb..7f7ad8bc4 100644 +--- a/etcdutl/go.mod ++++ b/etcdutl/go.mod +@@ -36,7 +36,7 @@ require ( + + require ( + github.com/beorn7/perks v1.0.1 // indirect +- github.com/cespare/xxhash/v2 v2.1.1 // indirect ++ github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/coreos/go-semver v0.3.0 // indirect + github.com/coreos/go-systemd/v22 v22.3.2 // indirect + github.com/gogo/protobuf v1.3.2 // indirect +diff --git a/etcdutl/go.sum b/etcdutl/go.sum +index 7d3675855..4c894740e 100644 +--- a/etcdutl/go.sum ++++ b/etcdutl/go.sum +@@ -37,8 +37,9 @@ github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 h1:uH66TXeswKn5P + github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= + github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= + github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= + github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= ++github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= ++github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= + github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= + github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= + github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +diff --git a/go.mod b/go.mod +index 3df2c43e1..f794ab8d2 100644 +--- a/go.mod ++++ b/go.mod +@@ -39,7 +39,7 @@ require ( + require ( + github.com/beorn7/perks v1.0.1 // indirect + github.com/cenkalti/backoff/v4 v4.1.1 // indirect +- github.com/cespare/xxhash/v2 v2.1.1 // indirect ++ github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/cockroachdb/datadriven v1.0.1-0.20220214170620-9913f5bc19b7 // indirect + github.com/cockroachdb/errors v1.9.0 // indirect + github.com/coreos/go-semver v0.3.0 // indirect +diff --git a/go.sum b/go.sum +index 7bb455e8b..e2e07cfe4 100644 +--- a/go.sum ++++ b/go.sum +@@ -50,8 +50,9 @@ github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6 + github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= + github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= + github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= + github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= ++github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= ++github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= + github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= + github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= + github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +diff --git a/server/go.mod b/server/go.mod +index 46dcfad08..ab635e592 100644 +--- a/server/go.mod ++++ b/server/go.mod +@@ -47,7 +47,7 @@ require ( + require ( + github.com/beorn7/perks v1.0.1 // indirect + github.com/cenkalti/backoff/v4 v4.1.1 // indirect +- github.com/cespare/xxhash/v2 v2.1.1 // indirect ++ github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/gorilla/websocket v1.4.2 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect +diff --git a/server/go.sum b/server/go.sum +index 8f78c3864..c4fbfac25 100644 +--- a/server/go.sum ++++ b/server/go.sum +@@ -39,8 +39,9 @@ github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 h1:uH66TXeswKn5P + github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= + github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= + github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= + github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= ++github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= ++github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= + github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= + github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= + github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +diff --git a/tests/go.mod b/tests/go.mod +index b578bbf02..45820817c 100644 +--- a/tests/go.mod ++++ b/tests/go.mod +@@ -46,7 +46,7 @@ require ( + require ( + github.com/beorn7/perks v1.0.1 // indirect + github.com/cenkalti/backoff/v4 v4.1.1 // indirect +- github.com/cespare/xxhash/v2 v2.1.1 // indirect ++ github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/coreos/go-semver v0.3.0 // indirect + github.com/coreos/go-systemd/v22 v22.3.2 // indirect + github.com/creack/pty v1.1.11 // indirect +diff --git a/tests/go.sum b/tests/go.sum +index 203bf65d6..46c18c31f 100644 +--- a/tests/go.sum ++++ b/tests/go.sum +@@ -39,8 +39,9 @@ github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 h1:uH66TXeswKn5P + github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= + github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= + github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= + github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= ++github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= ++github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= + github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= + github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= + github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +-- +2.37.1 (Apple Git-137.1) + diff --git a/meta-oe/recipes-extended/etcd/etcd/etcd-existing.conf b/meta-oe/recipes-extended/etcd/etcd/etcd-existing.conf new file mode 100644 index 0000000000..fc32cc8084 --- /dev/null +++ b/meta-oe/recipes-extended/etcd/etcd/etcd-existing.conf @@ -0,0 +1,37 @@ +# This is the configuration file to start the etcd server with +# existing cluster configuration in the data directory. + +# Initial cluster state ('new' or 'existing'). +ETCD_INITIAL_CLUSTER_STATE='existing' + +# Path to the data directory. +ETCD_DATA_DIR='/var/lib/etcd' + +# Time (in milliseconds) of a heartbeat interval. +ETCD_HEARTBEAT_INTERVAL=100 + +# Time (in milliseconds) for an election to timeout. +ETCD_ELECTION_TIMEOUT=1000 + +# List of comma separated URLs to listen on for peer traffic. +ETCD_LISTEN_PEER_URLS=http://localhost:2380 + +# List of comma separated URLs to listen on for client traffic. +ETCD_LISTEN_CLIENT_URLS=http://localhost:2379 + +# List of this member's peer URLs to advertise to the rest of the cluster. +# The URLs needed to be a comma-separated list. +ETCD_INITIAL_ADVERTISE_PEER_URLS=http://localhost:2380 + +# List of this member's client URLs to advertise to the public. +# The URLs needed to be a comma-separated list. +ETCD_ADVERTISE_CLIENT_URLS=http://localhost:2379 + +# Enable info-level logging for etcd. +ETCD_LOG_LEVEL='info' + +# Specify 'stdout' or 'stderr' to skip journald logging even when running under systemd. +ETCD_LOG_OUTPUTS='default' + +# etcd is not officially supported on arm64 +ETCD_UNSUPPORTED_ARCH='arm' diff --git a/meta-oe/recipes-extended/etcd/etcd/etcd-new.path b/meta-oe/recipes-extended/etcd/etcd/etcd-new.path new file mode 100644 index 0000000000..1a18a40160 --- /dev/null +++ b/meta-oe/recipes-extended/etcd/etcd/etcd-new.path @@ -0,0 +1,9 @@ +[Unit] +Description=Monitor the etcd config file changes + +[Path] +PathChanged=/run/etcd-new.conf +Unit=etcd-new.service + +[Install] +WantedBy=multi-user.target diff --git a/meta-oe/recipes-extended/etcd/etcd/etcd-new.service b/meta-oe/recipes-extended/etcd/etcd/etcd-new.service new file mode 100644 index 0000000000..479678dc67 --- /dev/null +++ b/meta-oe/recipes-extended/etcd/etcd/etcd-new.service @@ -0,0 +1,15 @@ +[Unit] +Description=etcd cluster member start/add service +Documentation=https://etcd.io/docs/v3.5/op-guide/clustering/ +ConditionPathExists=!/var/lib/etcd/member +ConditionPathExists=/run/etcd-new.conf +OnFailure=etcd.service + +[Service] +Type=notify +EnvironmentFile=/run/etcd-new.conf +ExecStart=/usr/bin/etcd +Restart=no + +[Install] +WantedBy=multi-user.target diff --git a/meta-oe/recipes-extended/etcd/etcd/etcd.service b/meta-oe/recipes-extended/etcd/etcd/etcd.service new file mode 100644 index 0000000000..782ef4ef09 --- /dev/null +++ b/meta-oe/recipes-extended/etcd/etcd/etcd.service @@ -0,0 +1,15 @@ +[Unit] +Description=etcd key-value store +Documentation=https://github.com/etcd-io/etcd +After=network-online.target local-fs.target remote-fs.target time-sync.target +Wants=network-online.target local-fs.target remote-fs.target time-sync.target +ConditionPathExists=/var/lib/etcd/member + +[Service] +Type=notify +EnvironmentFile=/etc/etcd.d/etcd-existing.conf +ExecStart=/usr/bin/etcd +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb b/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb new file mode 100644 index 0000000000..0794158a52 --- /dev/null +++ b/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb @@ -0,0 +1,73 @@ +DESCRIPTION = "etcd is a distributed key-value store for distributed systems" +HOMEPAGE = "https://etcd.io/" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/${GO_INSTALL}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI = " \ + git://github.com/etcd-io/etcd;branch=release-3.5;protocol=https \ + file://0001-xxhash-bump-to-v2.1.2.patch;patchdir=src/${GO_IMPORT} \ + file://0001-test_lib.sh-remove-gobin-requirement-during-build.patch;patchdir=src/${GO_IMPORT} \ + file://etcd.service \ + file://etcd-existing.conf \ + file://etcd-new.service \ + file://etcd-new.path \ +" + +SRCREV = "215b53cf3b48ee761f4c40908b3874b2e5e95e9f" +UPSTREAM_CHECK_COMMITS = "1" + +GO_IMPORT = "go.etcd.io/etcd/v3" +GO_INSTALL = "src/${GO_IMPORT}/" + +RDEPENDS:${PN}-dev = " \ + bash \ +" + +export GO111MODULE="on" + +inherit go systemd pkgconfig features_check + +# Go based binaries do not handle being stripped +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_SYSROOT_STRIP = "1" + +# network is required by go to get dependent packages +do_compile[network] = "1" + +# Need to build etcd out of where it is extracted to +# Need to directly call build script vs. "make build" +# because "make build" executes the generated binaries +# at the end of the build which do not run correctly +# when cross compiling for another machine +go_do_compile:prepend() { + cd ${GO_INSTALL} + ./build.sh + + + # Lots of discussion in go community about how it sets packages to + # read-only by default -> https://github.com/golang/go/issues/31481 + # etcd is going to need some upstream work to support it. + # For now, set the packages which are read-only back to + # writeable so things like "bitbake -c cleanall etcd" will work. + chmod u+w -R ${WORKDIR}/build/pkg/mod +} + +REQUIRED_DISTRO_FEATURES = "systemd" +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN}:append = " etcd.service etcd-new.service etcd-new.path" + +do_install:append() { + install -d ${D}${bindir}/ + install -m 0755 ${D}${libdir}/go/src/go.etcd.io/etcd/v3/bin/etcd ${D}${bindir} + install -m 0755 ${D}${libdir}/go/src/go.etcd.io/etcd/v3/bin/etcdctl ${D}${bindir} + install -m 0755 ${D}${libdir}/go/src/go.etcd.io/etcd/v3/bin/etcdutl ${D}${bindir} + install -m 0644 ${WORKDIR}/etcd-existing.conf -D -t ${D}${sysconfdir}/etcd.d + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/etcd.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${WORKDIR}/etcd-new.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${WORKDIR}/etcd-new.path ${D}${systemd_system_unitdir}/ +} + +FILES:${PN}:append = " ${sysconfdir}/etcd.d/etcd-existing.conf" + diff --git a/meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch b/meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch index 99e9cd23b1..c1f2cca5c6 100644 --- a/meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch +++ b/meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch @@ -5,6 +5,8 @@ Subject: [PATCH] flatpak.pc: add pc_sysrootdir Signed-off-by: Markus Volk <f_l_k@t-online.de> --- +Upstream-Status: Pending + meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/flatpak/flatpak_1.15.1.bb b/meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb index 04f4c532a4..163d732a86 100644 --- a/meta-oe/recipes-extended/flatpak/flatpak_1.15.1.bb +++ b/meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb @@ -8,7 +8,7 @@ SRC_URI = " \ file://0001-flatpak-pc-add-pc_sysrootdir.patch \ " -SRCREV = "47ea3934c0e055605b8dff93edad2136141e48ec" +SRCREV = "e936e3100d406c50ba49f3ad6a0ecae455345ec0" S = "${WORKDIR}/git" @@ -28,11 +28,13 @@ DEPENDS = " \ json-glib \ libarchive \ libcap \ + libxml2 \ libxslt-native \ ostree \ polkit \ python3-pyparsing-native \ xmlto-native \ + zstd \ " RDEPENDS:${PN} = " \ @@ -40,17 +42,20 @@ RDEPENDS:${PN} = " \ ca-certificates \ dconf \ flatpak-xdg-utils \ + xdg-dbus-proxy \ " +EXTRA_OEMESON += "-Dsystem_dbus_proxy=${bindir}/xdg-dbus-proxy -Dsystem_bubblewrap=${bindir}/bwrap" + GIR_MESON_OPTION = "" -PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,xauth" +PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,xauth socat-native" PACKAGECONFIG[xauth] = "-Dxauth=enabled,-Dxauth=disabled,xauth" PACKAGECONFIG[seccomp] = "-Dseccomp=enabled,-Dseccomp=disabled,libseccomp" PACKAGECONFIG ?= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xauth', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'security', 'seccomp', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'seccomp', 'seccomp', '', d)} \ " FILES:${PN} += "${libdir} ${datadir}" diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-chunkio-Link-with-fts-library-with-musl.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0002-chunkio-Link-with-fts-library-with-musl.patch index 4ffb20d9ca..bdcc534964 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-chunkio-Link-with-fts-library-with-musl.patch +++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0002-chunkio-Link-with-fts-library-with-musl.patch @@ -8,6 +8,8 @@ cio_utils.c:(.text+0x64): undefined reference to `fts_read' Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + lib/chunkio/src/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch index 4358b2a512..425b838b78 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch +++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch @@ -8,6 +8,8 @@ reproducible and contaminates it with host builder paths. Instead make it take CMAKE_DEBUG_SRCDIR that can be set to a known reproducible value --- +Upstream-Status: Pending + include/fluent-bit/flb_info.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-mbedtls-Remove-unused-variable.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0002-mbedtls-Remove-unused-variable.patch index d4451bcaef..d911420df2 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-mbedtls-Remove-unused-variable.patch +++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0002-mbedtls-Remove-unused-variable.patch @@ -8,6 +8,8 @@ library/bignum.c:1395:29: error: variable 't' set but not used [-Werror,-Wunused Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + lib/mbedtls-2.28.0/library/bignum.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Disable-documentation-warning-as-error-with-.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Disable-documentation-warning-as-error-with-.patch index 2d7b4efda7..473ebaf7d4 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Disable-documentation-warning-as-error-with-.patch +++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Disable-documentation-warning-as-error-with-.patch @@ -9,6 +9,8 @@ treat them as errors Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + lib/mbedtls-2.28.0/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch index 6c585c2f5b..158857ae20 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch +++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch @@ -7,7 +7,7 @@ bitbake passes CFLAGS that are often in conflict with the ones set in mbedtls' CMakeLists.txt. Such conflicts are the inability to use FORTIFY_SOURCE=2 except in release mode -Upstream-Status: Innapropriate [due to fluent-bit having it's own Release flags that also overwrite bitbake ones.] +Upstream-Status: Inappropriate [due to fluent-bit having it's own Release flags that also overwrite bitbake ones.] --- lib/mbedtls-2.28.0/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0004-Use-correct-type-to-store-return-from-flb_kv_item_cr.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0004-Use-correct-type-to-store-return-from-flb_kv_item_cr.patch index 224b8ccf1b..bd4276193d 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit/0004-Use-correct-type-to-store-return-from-flb_kv_item_cr.patch +++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0004-Use-correct-type-to-store-return-from-flb_kv_item_cr.patch @@ -8,6 +8,8 @@ error: incompatible pointer to integer conversion assigning to 'int' from 'struc Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + plugins/out_stackdriver/stackdriver_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0005-stackdriver-Fix-return-type-mismatch.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0005-stackdriver-Fix-return-type-mismatch.patch index cdbbb6b2c1..f023ab5732 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit/0005-stackdriver-Fix-return-type-mismatch.patch +++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0005-stackdriver-Fix-return-type-mismatch.patch @@ -10,6 +10,8 @@ error: incompatible integer to pointer conversion returning 'int' from a functio Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + plugins/out_stackdriver/stackdriver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0006-monkey-Fix-TLS-detection-testcase.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0006-monkey-Fix-TLS-detection-testcase.patch index eef1a56ba7..c3f2574d26 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit/0006-monkey-Fix-TLS-detection-testcase.patch +++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0006-monkey-Fix-TLS-detection-testcase.patch @@ -13,6 +13,8 @@ error: call to undeclared function '__tls_get_addr'; ISO C99 and later do not su Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + lib/monkey/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0007-cmake-Do-not-check-for-upstart-on-build-host.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0007-cmake-Do-not-check-for-upstart-on-build-host.patch new file mode 100644 index 0000000000..71bdd34eeb --- /dev/null +++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0007-cmake-Do-not-check-for-upstart-on-build-host.patch @@ -0,0 +1,46 @@ +From c41653e856d05ed430d22f8b311714ff756a0e0b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 23 Mar 2023 18:05:27 -0700 +Subject: [PATCH] cmake: Do not check for upstart on build host + +Some ubuntu distros might have this directory /usr/share/upstart around +and yocto based distros not using systemd will process this piece of +code and falsely assume that target supports upstart, which may not be +true in case of cross-compilation. + +This also can end up in configure errors e.g. + +| CMake Error at src/CMakeLists.txt:496 (install): +| install DIRECTORY given unknown argument "/etc/td-agent-bit/". +| +| +| -- Configuring incomplete, errors occurred! + +Upstream-Status: Inappropriate [ Cross-compile Specific ] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/CMakeLists.txt | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index bb30b2a..c63b6d8 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -486,14 +486,6 @@ if(FLB_BINARY) + ) + install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION ${SYSTEMD_UNITDIR}) + install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR} COMPONENT binary) +- elseif(IS_DIRECTORY /usr/share/upstart) +- set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf") +- configure_file( +- "${PROJECT_SOURCE_DIR}/init/upstart.in" +- ${FLB_UPSTART_SCRIPT} +- ) +- install(FILES ${FLB_UPSTART_SCRIPT} COMPONENT binary DESTINATION /etc/init) +- install(DIRECTORY DESTINATION COMPONENT binary ${FLB_INSTALL_CONFDIR}) + else() + # FIXME: should we support Sysv init script ? + endif() +-- +2.40.0 + diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.7.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.7.bb index 814d4b9644..26238e51f1 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.7.bb +++ b/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.7.bb @@ -11,7 +11,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" SECTION = "net" -SRC_URI = "https://releases.fluentbit.io/1.9/source-${PV}.tar.gz;subdir=fluent-bit-${PV} \ +SRC_URI = "https://releases.fluentbit.io/1.9/source-${PV}.tar.gz;subdir=fluent-bit-${PV};downloadfilename=${BPN}-${PV}.tar.gz \ file://0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch \ file://0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch \ file://0003-mbedtls-Do-not-overwrite-CFLAGS.patch \ @@ -22,6 +22,7 @@ SRC_URI = "https://releases.fluentbit.io/1.9/source-${PV}.tar.gz;subdir=fluent-b file://0004-Use-correct-type-to-store-return-from-flb_kv_item_cr.patch \ file://0005-stackdriver-Fix-return-type-mismatch.patch \ file://0006-monkey-Fix-TLS-detection-testcase.patch \ + file://0007-cmake-Do-not-check-for-upstart-on-build-host.patch \ " SRC_URI:remove:x86 = "file://0002-mbedtls-Remove-unused-variable.patch" SRC_URI:append:libc-musl = "\ diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/0003-Use-native-tools-to-build-docs.patch b/meta-oe/recipes-extended/gnuplot/gnuplot/0003-Use-native-tools-to-build-docs.patch index c2d2f7f3f0..7a7e550349 100644 --- a/meta-oe/recipes-extended/gnuplot/gnuplot/0003-Use-native-tools-to-build-docs.patch +++ b/meta-oe/recipes-extended/gnuplot/gnuplot/0003-Use-native-tools-to-build-docs.patch @@ -14,6 +14,8 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- +Upstream-Status: Pending + docs/Makefile.am | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/meta-oe/recipes-extended/hiredis/hiredis/run-ptest b/meta-oe/recipes-extended/hiredis/hiredis/run-ptest new file mode 100644 index 0000000000..59b747dbd8 --- /dev/null +++ b/meta-oe/recipes-extended/hiredis/hiredis/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +TEST_SSL=0 TEST_ASYNC=0 ./test.sh diff --git a/meta-oe/recipes-extended/hiredis/hiredis_1.0.2.bb b/meta-oe/recipes-extended/hiredis/hiredis_1.0.2.bb deleted file mode 100644 index 3a8c9481fc..0000000000 --- a/meta-oe/recipes-extended/hiredis/hiredis_1.0.2.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Minimalistic C client library for Redis" -HOMEPAGE = "http://github.com/redis/hiredis" -SECTION = "libs" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=d84d659a35c666d23233e54503aaea51" -DEPENDS = "redis openssl" - -SRC_URI = "git://github.com/redis/hiredis;protocol=https;branch=master" -SRCREV = "b731283245f3183af527237166261ad0768ba7d4" - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE += "-DENABLE_SSL=ON" - -FILES:${PN}-dev += "${datadir}/hiredis_ssl" diff --git a/meta-oe/recipes-extended/hiredis/hiredis_1.2.0.bb b/meta-oe/recipes-extended/hiredis/hiredis_1.2.0.bb new file mode 100644 index 0000000000..d081242736 --- /dev/null +++ b/meta-oe/recipes-extended/hiredis/hiredis_1.2.0.bb @@ -0,0 +1,39 @@ +DESCRIPTION = "Minimalistic C client library for Redis" +HOMEPAGE = "http://github.com/redis/hiredis" +SECTION = "libs" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=d84d659a35c666d23233e54503aaea51" + +SRC_URI = " \ + git://github.com/redis/hiredis;protocol=https;branch=master \ + file://run-ptest \ + " +SRCREV = "60e5075d4ac77424809f855ba3e398df7aacefe8" + +S = "${WORKDIR}/git" + +inherit cmake ptest + +# 'testssl' is not enabled by default as redis recipe does not build with ssl support +# option 'testssl' requires 'ssl' +PACKAGECONFIG ??= "ssl ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'test testasync', '', d)}" +PACKAGECONFIG[ssl] = "-DENABLE_SSL=ON, -DENABLE_SSL=OFF, openssl" +PACKAGECONFIG[test] = "-DDISABLE_TESTS=OFF, -DDISABLE_TESTS=ON" +PACKAGECONFIG[testssl] = "-DENABLE_SSL_TESTS=ON, -DENABLE_SSL_TESTS=OFF, openssl" +PACKAGECONFIG[testasync] = "-DENABLE_ASYNC_TESTS=ON, -DENABLE_ASYNC_TESTS=OFF, libevent" + +do_install_ptest() { + install ${S}/test.sh ${D}${PTEST_PATH}/ + install ${B}/hiredis-test ${D}${PTEST_PATH}/ + if ${@bb.utils.contains('PACKAGECONFIG','testssl','true','false',d)}; then + sed -i 's/TEST_SSL=0/TEST_SSL=1/g' ${D}${PTEST_PATH}/run-ptest + fi + if ${@bb.utils.contains('PACKAGECONFIG','testasync','true','false',d)}; then + sed -i 's/TEST_ASYNC=0/TEST_ASYNC=1/g' ${D}${PTEST_PATH}/run-ptest + fi +} + +FILES:${PN}-dev += "${datadir}/hiredis_ssl ${prefix}/build" + +RDEPENDS:${PN} = "redis" +RDEPENDS:${PN}-ptest = "${@bb.utils.contains('PACKAGECONFIG', 'testssl', 'openssl-bin', '', d)}" diff --git a/meta-oe/recipes-extended/hplip/hplip/0001-Fix-installing-ipp-usb-quirk.patch b/meta-oe/recipes-extended/hplip/hplip/0001-Fix-installing-ipp-usb-quirk.patch new file mode 100644 index 0000000000..d45db1b2e3 --- /dev/null +++ b/meta-oe/recipes-extended/hplip/hplip/0001-Fix-installing-ipp-usb-quirk.patch @@ -0,0 +1,40 @@ +From 5cfe30829174a18ec64e53c84292a0229ffa5602 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?= + <zboszor@gmail.com> +Date: Thu, 30 Mar 2023 11:31:27 +0200 +Subject: [PATCH] Fix installing ipp-usb quirk +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Use $(DESTDIR) as installation prefix for +/usr/share/usb-ipp/quirk/HPLIP.conf. + +Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> +--- +Upstream-Status: Pending + + Makefile.am | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index e10364d..f520225 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -703,10 +703,9 @@ if !DISBALE_IMAGEPROCESSOR_BUILD + ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \ + fi + endif #DISABLE_IMAGEPROCESSOR +- if [ -d "/usr/share/ipp-usb/quirks/" ]; then \ +- echo "ipp-usb directory exists"; \ +- cp prnt/ipp-usb/HPLIP.conf /usr/share/ipp-usb/quirks/ ; \ +- fi ++ install -d -m0755 $(DESTDIR)/usr/share/ipp-usb/quirks ; \ ++ echo "ipp-usb directory exists"; \ ++ cp prnt/ipp-usb/HPLIP.conf $(DESTDIR)/usr/share/ipp-usb/quirks/ + if !HPLIP_CLASS_DRIVER + # If scanner build, add hpaio entry to sane dll.conf. + if [ "$(scan_build)" = "yes" ]; then \ +-- +2.39.2 + diff --git a/meta-oe/recipes-extended/hplip/hplip/0002-Add-ImageProcessor-only-when-DISBALE_IMAGEPROCESSOR_.patch b/meta-oe/recipes-extended/hplip/hplip/0002-Add-ImageProcessor-only-when-DISBALE_IMAGEPROCESSOR_.patch index 2cfe1255e9..fa973a8d85 100644 --- a/meta-oe/recipes-extended/hplip/hplip/0002-Add-ImageProcessor-only-when-DISBALE_IMAGEPROCESSOR_.patch +++ b/meta-oe/recipes-extended/hplip/hplip/0002-Add-ImageProcessor-only-when-DISBALE_IMAGEPROCESSOR_.patch @@ -7,8 +7,8 @@ Subject: [PATCH 2/4] Add ImageProcessor only when DISBALE_IMAGEPROCESSOR_BUILD Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - Makefile.am | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) + Makefile.am | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 5f75759..73421b1 100644 @@ -27,6 +27,22 @@ index 5f75759..73421b1 100644 #else #hpcupsdir = $(cupsfilterdir) #hpcups_PROGRAMS = hpcups +@@ -687,6 +692,7 @@ + + install-data-hook: + if HPLIP_BUILD ++if !DISBALE_IMAGEPROCESSOR_BUILD + if [ \( "$(UNAME)" = "x86_64" -a -d "$(libdir)/" \) ]; then \ + cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \ + chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \ +@@ -697,6 +703,7 @@ + chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \ + ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \ + fi ++endif #DISABLE_IMAGEPROCESSOR + if [ -d "/usr/share/ipp-usb/quirks/" ]; then \ + echo "ipp-usb directory exists"; \ + cp prnt/ipp-usb/HPLIP.conf /usr/share/ipp-usb/quirks/ ; \ -- 2.37.3 diff --git a/meta-oe/recipes-extended/hplip/hplip/0003-pserror.c-Define-column-to-be-int-explcitly.patch b/meta-oe/recipes-extended/hplip/hplip/0003-pserror.c-Define-column-to-be-int-explcitly.patch index 78325ac8d6..bf93c222ea 100644 --- a/meta-oe/recipes-extended/hplip/hplip/0003-pserror.c-Define-column-to-be-int-explcitly.patch +++ b/meta-oe/recipes-extended/hplip/hplip/0003-pserror.c-Define-column-to-be-int-explcitly.patch @@ -5,6 +5,8 @@ Subject: [PATCH 3/4] pserror.c: Define column to be int explcitly Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + prnt/hpps/pserror.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/hplip/hplip/0004-Define-missing-prototype-for-functions.patch b/meta-oe/recipes-extended/hplip/hplip/0004-Define-missing-prototype-for-functions.patch index 276d025785..7223bf939e 100644 --- a/meta-oe/recipes-extended/hplip/hplip/0004-Define-missing-prototype-for-functions.patch +++ b/meta-oe/recipes-extended/hplip/hplip/0004-Define-missing-prototype-for-functions.patch @@ -5,6 +5,8 @@ Subject: [PATCH 4/4] Define missing prototype for functions Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + prnt/cupsext/cupsext.c | 1 + protocol/hp_ipp.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-extended/hplip/hplip/0005-hp_ipp.c-Add-printf-format-to-snprintf-calls.patch b/meta-oe/recipes-extended/hplip/hplip/0005-hp_ipp.c-Add-printf-format-to-snprintf-calls.patch index d844e49ad3..ac0ff81e6f 100644 --- a/meta-oe/recipes-extended/hplip/hplip/0005-hp_ipp.c-Add-printf-format-to-snprintf-calls.patch +++ b/meta-oe/recipes-extended/hplip/hplip/0005-hp_ipp.c-Add-printf-format-to-snprintf-calls.patch @@ -7,6 +7,8 @@ Avoid -Wformat warnings Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + protocol/hp_ipp.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/meta-oe/recipes-extended/hplip/hplip/0006-Workaround-patch-for-missing-Python3-transition-of-t.patch b/meta-oe/recipes-extended/hplip/hplip/0006-Workaround-patch-for-missing-Python3-transition-of-t.patch index 5d78bb3bbb..194deb8b81 100644 --- a/meta-oe/recipes-extended/hplip/hplip/0006-Workaround-patch-for-missing-Python3-transition-of-t.patch +++ b/meta-oe/recipes-extended/hplip/hplip/0006-Workaround-patch-for-missing-Python3-transition-of-t.patch @@ -9,6 +9,8 @@ Subject: Workaround patch for missing Python3 transition of the old proper solution in the next upstream release of HPLIP (see LP: #1275353) --- +Upstream-Status: Pending + pcard/pcardext/pcardext.c | 59 +++++++++++++++++++++++++++++++++++++---------- pcard/photocard.py | 2 +- unload.py | 5 ++++ diff --git a/meta-oe/recipes-extended/hplip/hplip/030-replace_unsafe_memcpy_with_memmove.patch b/meta-oe/recipes-extended/hplip/hplip/030-replace_unsafe_memcpy_with_memmove.patch index 2babb2b67a..e8ca8b2d6c 100644 --- a/meta-oe/recipes-extended/hplip/hplip/030-replace_unsafe_memcpy_with_memmove.patch +++ b/meta-oe/recipes-extended/hplip/hplip/030-replace_unsafe_memcpy_with_memmove.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + https://bugs.launchpad.net/hplip/+bug/1672256 memcpy should never be used with overlapping memory regions diff --git a/meta-oe/recipes-extended/hplip/hplip/050-fix-glibcisms.patch b/meta-oe/recipes-extended/hplip/hplip/050-fix-glibcisms.patch index e020bd4642..93fdcf4bfd 100644 --- a/meta-oe/recipes-extended/hplip/hplip/050-fix-glibcisms.patch +++ b/meta-oe/recipes-extended/hplip/hplip/050-fix-glibcisms.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff --git a/scan/sane/OrbliteScan/LinuxCommon.h b/scan/sane/OrbliteScan/LinuxCommon.h index 6605dd9..55c7110 100644 --- a/scan/sane/OrbliteScan/LinuxCommon.h diff --git a/meta-oe/recipes-extended/hplip/hplip/600-fix.patch b/meta-oe/recipes-extended/hplip/hplip/600-fix.patch index 91a5035ae9..cddc5e0065 100644 --- a/meta-oe/recipes-extended/hplip/hplip/600-fix.patch +++ b/meta-oe/recipes-extended/hplip/hplip/600-fix.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/configure.in +++ b/configure.in @@ -254,7 +254,6 @@ if test "$class_driver" = "yes"; then diff --git a/meta-oe/recipes-extended/hplip/hplip/configure.patch b/meta-oe/recipes-extended/hplip/hplip/configure.patch index a6e61a47ca..0e0fd47fa1 100644 --- a/meta-oe/recipes-extended/hplip/hplip/configure.patch +++ b/meta-oe/recipes-extended/hplip/hplip/configure.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/configure.in +++ b/configure.in @@ -30,7 +30,7 @@ diff --git a/meta-oe/recipes-extended/hplip/hplip/fix-libusb-paths.patch b/meta-oe/recipes-extended/hplip/hplip/fix-libusb-paths.patch index 6aa1de0a8a..f2cd2be60d 100644 --- a/meta-oe/recipes-extended/hplip/hplip/fix-libusb-paths.patch +++ b/meta-oe/recipes-extended/hplip/hplip/fix-libusb-paths.patch @@ -1,33 +1,69 @@ -Upstream-Status: Inappropriate [configuration] +Don't hardcode paths to libusb, instead use pkg-config. ---- a/configure.in -+++ b/configure.in -@@ -599,6 +599,8 @@ if test "$class_driver" = "no" && test " - AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel support], 11)]) - else - AC_CHECK_LIB([usb-1.0], [libusb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb 1.0 support], 2)]) -+ LIBUSBINCLUDEROOT?="/usr/include/" -+ AC_ARG_VAR(LIBUSBINCLUDEROOT, [path to libusb-1.0 folder]) - AC_CHECK_HEADERS(libusb-1.0/libusb.h, ,[AC_MSG_ERROR([cannot find libusb-1.0-devel support], 11)]) - fi - fi +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@arm.com> + +diff --git a/Makefile.am b/Makefile.am +index b77327f..29e838a 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -109,7 +109,7 @@ libhpmud_la_SOURCES += io/hpmud/musb_lib - libhpmud_la_LDFLAGS += -lusb +@@ -107,12 +107,11 @@ libhpmud_la_SOURCES = io/hpmud/hpmud.c io/hpmud/mlc.c io/hpmud/model.c io/hpmud/ + + if LIBUSB01_BUILD + libhpmud_la_SOURCES += io/hpmud/musb_libusb01.c +-libhpmud_la_LDFLAGS += -lusb else libhpmud_la_SOURCES += io/hpmud/musb.c -libhpmud_la_CFLAGS += -I/usr/include/libusb-1.0 -+libhpmud_la_CFLAGS += -I$(LIBUSBINCLUDEROOT)/libusb-1.0 - libhpmud_la_LDFLAGS += -lusb-1.0 +-libhpmud_la_LDFLAGS += -lusb-1.0 endif ++libhpmud_la_CFLAGS += $(USB_CFLAGS) ++libhpmud_la_LDFLAGS += $(USB_LIBS) + + + if NETWORK_BUILD +@@ -356,7 +355,7 @@ hpmudextdir = $(pyexecdir) + hpmudext_LTLIBRARIES = hpmudext.la + hpmudext_la_LDFLAGS = -module -avoid-version + hpmudext_la_SOURCES = io/mudext/hpmudext.c +-hpmudext_la_CFLAGS = -I$(PYTHONINCLUDEDIR) ++hpmudext_la_CFLAGS = -I$(PYTHONINCLUDEDIR) $(USB_CFLAGS) + hpmudext_la_LIBADD = libhpmud.la -@@ -362,7 +362,7 @@ hpmudext_la_CFLAGS += -Iprotocol/discove + if NETWORK_BUILD +@@ -364,9 +363,6 @@ hpmudext_la_LIBADD += libhpdiscovery.la + hpmudext_la_CFLAGS += -Iprotocol/discovery endif - if !LIBUSB01_BUILD +-if !LIBUSB01_BUILD -hpmudext_la_CFLAGS +=-I/usr/include/libusb-1.0 -+hpmudext_la_CFLAGS +=-I$(LIBUSBINCLUDEROOT)/libusb-1.0 - endif +-endif endif #!HPLIP_CLASS_DRIVER # ui (qt3) + if GUI_BUILD +diff --git a/configure.in b/configure.in +index b1c690c..4a65c97 100644 +--- a/configure.in ++++ b/configure.in +@@ -36,6 +36,7 @@ AC_PROG_CXX + AC_PROG_CC + AC_PROG_INSTALL + AC_PROG_LIBTOOL ++PKG_PROG_PKG_CONFIG + + # Checks for required libraries, don't set global -lpthread, -lm, -ljpeg, ... here, set in Makefile. + AC_CHECK_LIB([pthread], [pthread_create], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libpthread support], 7)]) +@@ -620,11 +621,9 @@ if test "$class_driver" = "no" && test "$hpijs_only_build" = "no" && test "$hpcu + AC_CHECK_LIB([cups], [cupsDoFileRequest], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libcups support], 9)]) + AC_CHECK_HEADERS(cups/cups.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)]) + if test "$libusb01_build" = "yes"; then +- AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb support], 2)]) +- AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel support], 11)]) ++ PKG_CHECK_MODULES([USB], [libusb]) + else +- AC_CHECK_LIB([usb-1.0], [libusb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb 1.0 support], 2)]) +- AC_CHECK_HEADERS(libusb-1.0/libusb.h, ,[AC_MSG_ERROR([cannot find libusb-1.0-devel support], 11)]) ++ PKG_CHECK_MODULES([USB], [libusb-1.0]) + fi + fi + diff --git a/meta-oe/recipes-extended/hplip/hplip/hplip-3.19.6-fix-return.patch b/meta-oe/recipes-extended/hplip/hplip/hplip-3.19.6-fix-return.patch index 67546b07dc..45b25c5e76 100644 --- a/meta-oe/recipes-extended/hplip/hplip/hplip-3.19.6-fix-return.patch +++ b/meta-oe/recipes-extended/hplip/hplip/hplip-3.19.6-fix-return.patch @@ -4,6 +4,8 @@ Date: Wed, 14 Aug 2019 15:47:38 -0700 Subject: [PATCH] Fixing invalid return in void function --- +Upstream-Status: Pending + prnt/hpps/hppsfilter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb b/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb index e054553d85..ed9f28e073 100644 --- a/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb +++ b/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb @@ -15,12 +15,13 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \ file://0004-Define-missing-prototype-for-functions.patch \ file://0005-hp_ipp.c-Add-printf-format-to-snprintf-calls.patch \ file://0006-Workaround-patch-for-missing-Python3-transition-of-t.patch \ + file://0001-Fix-installing-ipp-usb-quirk.patch \ file://0001-Drop-using-register-storage-classifier.patch" SRC_URI[sha256sum] = "533c3f2f6b53e4163ded4fd81d1f11ae6162a0f6451bd5e62a8382d0c1366624" -DEPENDS += "cups python3 libusb" +DEPENDS += "cups python3 libusb1" -inherit autotools-brokensep python3-dir python3native pkgconfig systemd +inherit autotools-brokensep python3-dir python3native python3targetconfig pkgconfig systemd export STAGING_INCDIR export STAGING_LIBDIR @@ -28,7 +29,6 @@ export STAGING_LIBDIR CFLAGS += "-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}${PYTHON_ABI}" EXTRA_OECONF += "\ - LIBUSBINCLUDEROOT=${STAGING_INCDIR} \ --enable-cups-drv-install \ --enable-cups-ppd-install \ --disable-network-build \ @@ -72,14 +72,9 @@ RDEPENDS:${PN} += " \ python3-resource \ python3-terminal \ " -RDEPENDS:${PN}-filter += "perl" - -# need to snag the debug file or OE will fail on backend package -FILES:${PN}-dbg += "\ - ${libexecdir}/cups/backend/.debug \ - ${PYTHON_SITEPACKAGES_DIR}/.debug \ - ${libexecdir}/cups/filter/.debug " +RDEPENDS:${PN}-filter += "perl ghostscript" +FILES:${PN} += "${datadir}/ipp-usb/quirks/HPLIP.conf" FILES:${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/*.la" FILES:${PN}-ppd = "${datadir}/ppd" FILES:${PN}-cups = "${datadir}/cups" diff --git a/meta-oe/recipes-extended/hwloc/hwloc_2.9.0.bb b/meta-oe/recipes-extended/hwloc/hwloc_2.9.2.bb index 51ceb4c262..487b7da130 100644 --- a/meta-oe/recipes-extended/hwloc/hwloc_2.9.0.bb +++ b/meta-oe/recipes-extended/hwloc/hwloc_2.9.2.bb @@ -8,7 +8,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=79179bb373cd55cbd834463a514fb714" SRC_URI = "https://www.open-mpi.org/software/${BPN}/v2.9/downloads/${BP}.tar.bz2" -SRC_URI[sha256sum] = "2070e963596a2421b9af8eca43bdec113ee1107aaf7ccb475d4d3767a8856887" +SRC_URI[sha256sum] = "0a87fdf677f8b00b567d229b6320bf6b25c693edaa43e0b85268d999d6b060cf" UPSTREAM_CHECK_URI = "https://www.open-mpi.org/software/hwloc/v2.9/" inherit autotools bash-completion pkgconfig diff --git a/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb b/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb index d003279966..39d6459227 100644 --- a/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb +++ b/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" PV = "2.3.6+git${SRCPV}" -SRC_URI = "git://github.com/snarlistic/jpnevulator.git;protocol=http;branch=master;protocol=https" +SRC_URI = "git://github.com/snarlistic/jpnevulator.git;protocol=https;branch=master" SRCREV = "bc1d4f6587a4a4829b5d55e3ca7ad584da6de545" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch index 40a064307e..2671111b79 100644 --- a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch +++ b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch @@ -5,6 +5,8 @@ Subject: [PATCH] CMakeLists.txt: fix lib64 can not be shiped in 64bit target Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> --- +Upstream-Status: Pending + CMakeLists.txt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-drop-including-rpath-cmake-module.patch b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-drop-including-rpath-cmake-module.patch index 342017bedc..293706d889 100644 --- a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-drop-including-rpath-cmake-module.patch +++ b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-drop-including-rpath-cmake-module.patch @@ -8,6 +8,8 @@ Fixes cross compilation QA errors e.g. Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/konkret/CMakeLists.txt | 1 - src/program/CMakeLists.txt | 1 - 2 files changed, 2 deletions(-) diff --git a/meta-oe/recipes-extended/lastlog2/files/0001-remove-lto-to-fix-link-error-of-clang.patch b/meta-oe/recipes-extended/lastlog2/files/0001-remove-lto-to-fix-link-error-of-clang.patch new file mode 100644 index 0000000000..71c3de9748 --- /dev/null +++ b/meta-oe/recipes-extended/lastlog2/files/0001-remove-lto-to-fix-link-error-of-clang.patch @@ -0,0 +1,31 @@ +From 692523d2f8bf0ce893a781761154db4277f0fceb Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@fujitsu.com> +Date: Wed, 19 Jul 2023 07:11:15 +0000 +Subject: remove lto to fix link error of clang + +error message: +| tests/tst-y2038-64bit-time_t.p/tst-y2038-64bit-time_t.c.o: file not recognized: file format not recognized +| clang-16: error: linker command failed with exit code 1 (use -v to see invocation) + +Upstream-Status: Pending + +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> +--- + meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/meson.build b/meson.build +index c521577..13d993b 100644 +--- a/meson.build ++++ b/meson.build +@@ -26,7 +26,6 @@ add_project_arguments(['-D_GNU_SOURCE=1', + '-DPROJECT_VERSION="@0@"'.format(meson.project_version()) ], language : 'c') + + possible_cc_flags = [ +- '-flto=auto', + '-ffat-lto-objects', + '-fstack-protector-strong', + '-funwind-tables', +-- +2.34.1 + diff --git a/meta-oe/recipes-extended/lastlog2/lastlog2_1.1.0.bb b/meta-oe/recipes-extended/lastlog2/lastlog2_1.1.0.bb new file mode 100644 index 0000000000..757af0073a --- /dev/null +++ b/meta-oe/recipes-extended/lastlog2/lastlog2_1.1.0.bb @@ -0,0 +1,36 @@ +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 = "585153a577788c590370d20e40263b61238dfab3" + +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-oe/recipes-extended/libblockdev/libblockdev_2.28.bb b/meta-oe/recipes-extended/libblockdev/libblockdev_2.28.bb index 44b4e7daf9..2e7412e823 100644 --- a/meta-oe/recipes-extended/libblockdev/libblockdev_2.28.bb +++ b/meta-oe/recipes-extended/libblockdev/libblockdev_2.28.bb @@ -8,7 +8,9 @@ SECTION = "devel/lib" LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" -inherit autotools gobject-introspection pkgconfig +inherit autotools gobject-introspection pkgconfig lib_package + +DEPENDS = "autoconf-archive-native glib-2.0 kmod udev" SRC_URI = "git://github.com/storaged-project/libblockdev;branch=2.x-branch;protocol=https \ " @@ -17,24 +19,25 @@ S = "${WORKDIR}/git" FILES:${PN} += "${libdir}/python2.7/dist-packages ${libdir}/python3.*/site-packages" -PACKAGECONFIG ??= "python3 lvm dm kmod parted fs escrow btrfs crypto mdraid kbd mpath nvdimm" +PACKAGECONFIG ??= "python3 lvm dm kmod parted fs escrow btrfs crypto mdraid kbd mpath nvdimm tools" PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" PACKAGECONFIG[python2] = "--with-python2, --without-python2,,python" PACKAGECONFIG[lvm] = "--with-lvm, --without-lvm, multipath-tools, lvm2" PACKAGECONFIG[lvm-dbus] = "--with-lvm_dbus, --without-lvm_dbus, multipath-tools, lvm2" PACKAGECONFIG[dm] = "--with-dm, --without-dm, multipath-tools, lvm2" PACKAGECONFIG[dmraid] = "--with-dmraid, --without-dmraid" -PACKAGECONFIG[kmod] = "--with-kbd, --without-kbd, kmod" +PACKAGECONFIG[kmod] = "--with-kbd, --without-kbd,libbytesize" PACKAGECONFIG[parted] = "--with-part, --without-part, parted" PACKAGECONFIG[fs] = "--with-fs, --without-fs, util-linux" PACKAGECONFIG[doc] = "--with-gtk-doc, --without-gtk-doc, gtk-doc-native" PACKAGECONFIG[nvdimm] = "--with-nvdimm, --without-nvdimm, ndctl util-linux" -PACKAGECONFIG[vdo] = "--with-vdo, --without-vdo" +PACKAGECONFIG[vdo] = "--with-vdo, --without-vdo,libbytesize" PACKAGECONFIG[escrow] = "--with-escrow, --without-escrow, nss volume-key" PACKAGECONFIG[btrfs] = "--with-btrfs,--without-btrfs,libbytesize btrfs-tools" PACKAGECONFIG[crypto] = "--with-crypto,--without-crypto,cryptsetup nss volume-key" PACKAGECONFIG[mdraid] = "--with-mdraid,--without-mdraid,libbytesize" PACKAGECONFIG[kbd] = "--with-kbd,--without-kbd,libbytesize" PACKAGECONFIG[mpath] = "--with-mpath,--without-mpath, multipath-tools, lvm2" +PACKAGECONFIG[tools] = "--with-tools,--without-tools,libbytesize libdevmapper" export GIR_EXTRA_LIBS_PATH="${B}/src/utils/.libs" diff --git a/meta-oe/recipes-extended/libcbor/libcbor_0.10.2.bb b/meta-oe/recipes-extended/libcbor/libcbor_0.10.2.bb new file mode 100755 index 0000000000..3ac270e5e0 --- /dev/null +++ b/meta-oe/recipes-extended/libcbor/libcbor_0.10.2.bb @@ -0,0 +1,14 @@ +SUMMARY = "library for CBOR" +DESCRIPTION = "C library for parsing and generating CBOR, the general-purpose schema-less binary data format." + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=6f3b3881df62ca763a02d359a6e94071" + +SRC_URI = "git://github.com/PJK/libcbor.git;protocol=https;branch=master" +SRCREV = "efa6c0886bae46bdaef9b679f61f4b9d8bc296ae" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE += " -DCMAKE_BUILD_TYPE=Release" diff --git a/meta-oe/recipes-extended/libcec/libcec/0001-Remove-buggy-test-confusing-host-and-target.patch b/meta-oe/recipes-extended/libcec/libcec/0001-Remove-buggy-test-confusing-host-and-target.patch index 7c29e15e20..07277f7064 100644 --- a/meta-oe/recipes-extended/libcec/libcec/0001-Remove-buggy-test-confusing-host-and-target.patch +++ b/meta-oe/recipes-extended/libcec/libcec/0001-Remove-buggy-test-confusing-host-and-target.patch @@ -4,6 +4,8 @@ Date: Mon, 7 Sep 2020 18:17:21 +0200 Subject: [PATCH] Remove buggy test confusing host and target --- +Upstream-Status: Pending + src/libcec/cmake/CheckPlatformSupport.cmake | 8 -------- 1 file changed, 8 deletions(-) diff --git a/meta-oe/recipes-extended/libdeflate/libdeflate_1.18.bb b/meta-oe/recipes-extended/libdeflate/libdeflate_1.18.bb new file mode 100644 index 0000000000..b1c3371159 --- /dev/null +++ b/meta-oe/recipes-extended/libdeflate/libdeflate_1.18.bb @@ -0,0 +1,15 @@ +SUMMARY = "libdeflate is a library for fast, whole-buffer DEFLATE-based compression and decompression." +HOMEPAGE = "https://github.com/ebiggers/libdeflate" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://COPYING;md5=7b6977026437092191e9da699ed9f780" + +DEPENDS += "gzip zlib" + +SRC_URI = "git://github.com/ebiggers/libdeflate.git;protocol=https;branch=master" + +S = "${WORKDIR}/git" +SRCREV = "495fee110ebb48a5eb63b75fd67e42b2955871e2" + +inherit cmake pkgconfig + diff --git a/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb b/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb index 2f67b12a8d..87778c6314 100644 --- a/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb +++ b/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb @@ -8,9 +8,9 @@ DEPENDS = "libusb1" inherit autotools pkgconfig -PV = "0.7.0" +PV = "0.8.0" -SRCREV = "47cbed5355ffda7b952193a770a9a9fa9f89b25b" +SRCREV = "db9371cf9f38b5a3b2f6e4fae3f92eb052d2d929" SRC_URI = "git://github.com/libdivecomputer/libdivecomputer.git;protocol=https;branch=master \ " diff --git a/meta-oe/recipes-extended/libexecinfo/libexecinfo/0001-makefile-Fix-build-on-linux.patch b/meta-oe/recipes-extended/libexecinfo/libexecinfo/0001-makefile-Fix-build-on-linux.patch index f1863f14b3..b37b1aa2a6 100644 --- a/meta-oe/recipes-extended/libexecinfo/libexecinfo/0001-makefile-Fix-build-on-linux.patch +++ b/meta-oe/recipes-extended/libexecinfo/libexecinfo/0001-makefile-Fix-build-on-linux.patch @@ -5,6 +5,8 @@ Subject: [PATCH 1/2] makefile: Fix build on linux Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + Makefile | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/meta-oe/recipes-extended/libexecinfo/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch b/meta-oe/recipes-extended/libexecinfo/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch index 423b670823..34fd98aaba 100644 --- a/meta-oe/recipes-extended/libexecinfo/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch +++ b/meta-oe/recipes-extended/libexecinfo/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch @@ -5,6 +5,8 @@ Subject: [PATCH 2/2] execinfo: Fix compiler errors found with newer gcc/clang Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + execinfo.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/meta-oe/recipes-extended/libgxim/libgxim/0001-Use-AM_CPPFLAGS-instead-of-INCLUDES.patch b/meta-oe/recipes-extended/libgxim/libgxim/0001-Use-AM_CPPFLAGS-instead-of-INCLUDES.patch index 41e07f39f1..393571c313 100644 --- a/meta-oe/recipes-extended/libgxim/libgxim/0001-Use-AM_CPPFLAGS-instead-of-INCLUDES.patch +++ b/meta-oe/recipes-extended/libgxim/libgxim/0001-Use-AM_CPPFLAGS-instead-of-INCLUDES.patch @@ -4,6 +4,8 @@ Date: Mon, 13 May 2013 16:05:32 +0900 Subject: [PATCH 1/3] Use AM_CPPFLAGS instead of INCLUDES --- +Upstream-Status: Pending + docs/reference/Makefile.am | 2 +- libgxim/Makefile.am | 2 +- tests/Makefile.am | 2 +- diff --git a/meta-oe/recipes-extended/libgxim/libgxim/0002-Update-autotools-macro.patch b/meta-oe/recipes-extended/libgxim/libgxim/0002-Update-autotools-macro.patch index 808203b6ef..01233f0a1f 100644 --- a/meta-oe/recipes-extended/libgxim/libgxim/0002-Update-autotools-macro.patch +++ b/meta-oe/recipes-extended/libgxim/libgxim/0002-Update-autotools-macro.patch @@ -4,6 +4,8 @@ Date: Wed, 22 Jan 2014 18:59:32 +0900 Subject: [PATCH 2/3] Update autotools macro --- +Upstream-Status: Pending + configure.ac | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-extended/libgxim/libgxim/0003-Add-format-string-qualifier-to-fix-potential-securit.patch b/meta-oe/recipes-extended/libgxim/libgxim/0003-Add-format-string-qualifier-to-fix-potential-securit.patch index cb21e1ef44..98bbde08a2 100644 --- a/meta-oe/recipes-extended/libgxim/libgxim/0003-Add-format-string-qualifier-to-fix-potential-securit.patch +++ b/meta-oe/recipes-extended/libgxim/libgxim/0003-Add-format-string-qualifier-to-fix-potential-securit.patch @@ -9,6 +9,8 @@ libgxim/gximprotocol10.c:2076:66: error: format string is not a string literal ( Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + libgxim/gximprotocol10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/libgxim/libgxim/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch b/meta-oe/recipes-extended/libgxim/libgxim/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch index 3d293b473e..f2603d1399 100644 --- a/meta-oe/recipes-extended/libgxim/libgxim/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch +++ b/meta-oe/recipes-extended/libgxim/libgxim/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + multi-line ACLOCAL_AMFLAGS isn't supported by autoreconf. It will cause configure error as follow. diff --git a/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb b/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb index 2d93936f37..3912e0a8d7 100644 --- a/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb +++ b/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb @@ -24,7 +24,7 @@ LIC_FILES_CHKSUM = "\ file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" EXTRA_OECONF = "--enable-debug --disable-static --disable-rebuilds --enable-compile-warnings=minimum" -DEPENDS += "gtk+ glib-2.0 glib-2.0-native ruby-native intltool-native gnome-common-native" +DEPENDS += "gtk+ glib-2.0 glib-2.0-native ruby-native intltool-native gnome-common-native autoconf-archive-native" inherit features_check autotools pkgconfig gettext diff --git a/meta-oe/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch b/meta-oe/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch deleted file mode 100644 index d5fb8e7c82..0000000000 --- a/meta-oe/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch +++ /dev/null @@ -1,180 +0,0 @@ -Subject: [PATCH] idn: fix printf() format security warnings -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -| ../../libidn-1.32/src/idn.c: In function 'main': -| ../../libidn-1.32/src/idn.c:172:7: error: format not a string literal and no format arguments [-Werror=format-security] -| error (0, 0, _("only one of -s, -e, -d, -a, -u or -n can be specified")); -| ^~~~~ -| ../../libidn-1.32/src/idn.c:187:5: error: format not a string literal and no format arguments [-Werror=format-security] -| fprintf (stderr, _("Type each input string on a line by itself, " -| ^~~~~~~ -| ../../libidn-1.32/src/idn.c:202:4: error: format not a string literal and no format arguments [-Werror=format-security] -| error (EXIT_FAILURE, errno, _("input error")); -| ^~~~~ -| ../../libidn-1.32/src/idn.c:220:8: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UTF-8 to UCS-4")); -| ^ -| ../../libidn-1.32/src/idn.c:245:8: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UTF-8 to UCS-4")); -| ^ -| ../../libidn-1.32/src/idn.c:281:6: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UTF-8 to UCS-4")); -| ^ -| ../../libidn-1.32/src/idn.c:340:6: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UCS-4 to UTF-8")); -| ^ -| ../../libidn-1.32/src/idn.c:364:6: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UCS-4 to UTF-8")); -| ^ -| ../../libidn-1.32/src/idn.c:442:8: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UCS-4 to UTF-8")); -| ^ -| ../../libidn-1.32/src/idn.c:498:6: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UTF-8 to UCS-4")); -| ^ -| ../../libidn-1.32/src/idn.c:527:5: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UTF-8 to UCS-4")); -| ^ -| ../../libidn-1.32/src/idn.c:540:6: error: format not a string literal and no format arguments [-Werror=format-security] -| error (EXIT_FAILURE, 0, _("could not do NFKC normalization")); -| ^~~~~ -| ../../libidn-1.32/src/idn.c:551:5: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UTF-8 to UCS-4")); -| ^ - -Signed-off-by: André Draszik <adraszik@tycoint.com> -Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> - -Upstream-Status: Pending - ---- - src/idn.c | 27 ++++++++++++++------------- - 1 file changed, 14 insertions(+), 13 deletions(-) - -diff --git a/src/idn.c b/src/idn.c -index f2fee11..c6e5caa 100644 ---- a/src/idn.c -+++ b/src/idn.c -@@ -169,7 +169,7 @@ main (int argc, char *argv[]) - (args_info.idna_to_unicode_given ? 1 : 0) + - (args_info.nfkc_given ? 1 : 0) != 1) - { -- error (0, 0, -+ error (0, 0, "%s", - _("only one of -s, -e, -d, -a, -u or -n can be specified")); - usage (EXIT_FAILURE); - } -@@ -183,7 +183,7 @@ main (int argc, char *argv[]) - - if (!args_info.quiet_given - && args_info.inputs_num == 0 && isatty (fileno (stdin))) -- fprintf (stderr, _("Type each input string on a line by itself, " -+ fprintf (stderr, "%s", _("Type each input string on a line by itself, " - "terminated by a newline character.\n")); - - do -@@ -195,7 +195,7 @@ main (int argc, char *argv[]) - if (feof (stdin)) - break; - -- error (EXIT_FAILURE, errno, _("input error")); -+ error (EXIT_FAILURE, errno, "%s", _("input error")); - } - - if (strlen (line) > 0) -@@ -213,7 +213,7 @@ main (int argc, char *argv[]) - if (!q) - { - free (p); -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UTF-8 to UCS-4")); - } - -@@ -238,7 +238,7 @@ main (int argc, char *argv[]) - if (!q) - { - free (r); -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UTF-8 to UCS-4")); - } - -@@ -275,7 +275,7 @@ main (int argc, char *argv[]) - q = stringprep_utf8_to_ucs4 (p, -1, &len); - free (p); - if (!q) -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UTF-8 to UCS-4")); - - if (args_info.debug_given) -@@ -334,7 +334,7 @@ main (int argc, char *argv[]) - r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL); - free (q); - if (!r) -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UCS-4 to UTF-8")); - - p = stringprep_utf8_to_locale (r); -@@ -358,7 +358,7 @@ main (int argc, char *argv[]) - q = stringprep_utf8_to_ucs4 (p, -1, NULL); - free (p); - if (!q) -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UCS-4 to UTF-8")); - - if (args_info.debug_given) -@@ -436,7 +436,7 @@ main (int argc, char *argv[]) - if (!q) - { - free (p); -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UCS-4 to UTF-8")); - } - -@@ -492,7 +492,7 @@ main (int argc, char *argv[]) - r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL); - free (q); - if (!r) -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UTF-8 to UCS-4")); - - p = stringprep_utf8_to_locale (r); -@@ -521,7 +521,7 @@ main (int argc, char *argv[]) - if (!q) - { - free (p); -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UTF-8 to UCS-4")); - } - -@@ -535,7 +535,8 @@ main (int argc, char *argv[]) - r = stringprep_utf8_nfkc_normalize (p, -1); - free (p); - if (!r) -- error (EXIT_FAILURE, 0, _("could not do NFKC normalization")); -+ error (EXIT_FAILURE, 0, "%s", -+ _("could not do NFKC normalization")); - - if (args_info.debug_given) - { -@@ -545,7 +546,7 @@ main (int argc, char *argv[]) - if (!q) - { - free (r); -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UTF-8 to UCS-4")); - } - --- -2.25.1 - diff --git a/meta-oe/recipes-extended/libidn/libidn/0001-largefile.m4-Sync-with-latest-gnulib.patch b/meta-oe/recipes-extended/libidn/libidn/0001-largefile.m4-Sync-with-latest-gnulib.patch new file mode 100644 index 0000000000..1dbf2955c9 --- /dev/null +++ b/meta-oe/recipes-extended/libidn/libidn/0001-largefile.m4-Sync-with-latest-gnulib.patch @@ -0,0 +1,390 @@ +From 66c1646a3f12836846a054ebd2c427e30c93d3a5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 2 Apr 2023 10:37:15 -0700 +Subject: [PATCH] largefile.m4: Sync with latest gnulib + +This ensures it can work with latest autoconf 2.72 release ( upcoming ) + +Upstream-Status: Backport [it will be not needed with 1.42 release] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gl/m4/largefile.m4 | 330 ++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 263 insertions(+), 67 deletions(-) + +diff --git a/gl/m4/largefile.m4 b/gl/m4/largefile.m4 +index 3e8b5e3..7fb81b8 100644 +--- a/gl/m4/largefile.m4 ++++ b/gl/m4/largefile.m4 +@@ -1,7 +1,7 @@ + # Enable large files on systems where this is not the default. + # Enable support for files on Linux file systems with 64-bit inode numbers. + +-# Copyright 1992-1996, 1998-2022 Free Software Foundation, Inc. ++# Copyright 1992-1996, 1998-2023 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -10,8 +10,9 @@ + # It does not set _LARGEFILE_SOURCE=1 on HP-UX/ia64 32-bit, although this + # setting of _LARGEFILE_SOURCE is needed so that <stdio.h> declares fseeko + # and ftello in C++ mode as well. ++# Fixed in Autoconf 2.72, which has AC_SYS_YEAR2038. + AC_DEFUN([gl_SET_LARGEFILE_SOURCE], +-[ ++ m4_ifndef([AC_SYS_YEAR2038], [[ + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_FUNC_FSEEKO + case "$host_os" in +@@ -20,10 +21,10 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], + [Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2).]) + ;; + esac +-]) ++ ]]) ++) + +-# Work around a problem in Autoconf through at least 2.71 on glibc 2.34+ +-# with _TIME_BITS. Also, work around a problem in autoconf <= 2.69: ++# Work around a problem in autoconf <= 2.69: + # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, + # or configures them incorrectly in some cases. + m4_version_prereq([2.70], [], [ +@@ -43,33 +44,258 @@ m4_define([_AC_SYS_LARGEFILE_TEST_INCLUDES], + ]) + ])# m4_version_prereq 2.70 + ++# Support AC_SYS_YEAR2038, even if Autoconf 2.71 or earlier. ++# This code is taken from Autoconf master. ++m4_ifndef([AC_SYS_YEAR2038], [ ++ ++# _AC_SYS_YEAR2038_TEST_CODE ++# -------------------------- ++# C code used to probe for time_t that can represent time points more ++# than 2**31 - 1 seconds after the epoch. With the usual Unix epoch, ++# these correspond to dates after 2038-01-18 22:14:07 +0000 (Gregorian), ++# hence the name. ++AC_DEFUN([_AC_SYS_YEAR2038_TEST_CODE], ++[[ ++ #include <time.h> ++ /* Check that time_t can represent 2**32 - 1 correctly. */ ++ #define LARGE_TIME_T \\ ++ ((time_t) (((time_t) 1 << 30) - 1 + 3 * ((time_t) 1 << 30))) ++ int verify_time_t_range[(LARGE_TIME_T / 65537 == 65535 ++ && LARGE_TIME_T % 65537 == 0) ++ ? 1 : -1]; ++]]) ++ ++# _AC_SYS_YEAR2038_OPTIONS ++# ------------------------ ++# List of known ways to enable support for large time_t. If you change ++# this list you probably also need to change the AS_CASE at the end of ++# _AC_SYS_YEAR2038_PROBE. ++m4_define([_AC_SYS_YEAR2038_OPTIONS], m4_normalize( ++ ["none needed"] dnl 64-bit and newer 32-bit Unix ++ ["-D_TIME_BITS=64"] dnl glibc 2.34 with some 32-bit ABIs ++ ["-D__MINGW_USE_VC2005_COMPAT"] dnl 32-bit MinGW ++ ["-U_USE_32_BIT_TIME_T -D__MINGW_USE_VC2005_COMPAT"] ++ dnl 32-bit MinGW (misconfiguration) ++)) ++ ++# _AC_SYS_YEAR2038_PROBE([IF-NOT-DETECTED]) ++# ----------------------------------------- ++# Subroutine of AC_SYS_YEAR2038. Probe for time_t that can represent ++# time points more than 2**31 - 1 seconds after the epoch (dates after ++# 2038-01-18, see above) and set the cache variable ac_cv_sys_year2038_opts ++# to one of the values in the _AC_SYS_YEAR2038_OPTIONS list, or to ++# "support not detected" if none of them worked. Then, set compilation ++# options and #defines as necessary to enable large time_t support. ++# ++# Note that we do not test whether mktime, localtime, etc. handle ++# large values of time_t correctly, as that would require use of ++# AC_TRY_RUN. Note also that some systems only support large time_t ++# together with large off_t. ++# ++# If support is not detected, the behavior depends on which of the ++# top-level AC_SYS_YEAR2038 macros was used (see below). ++# ++# If you change this macro you may also need to change ++# _AC_SYS_YEAR2038_OPTIONS. ++AC_DEFUN([_AC_SYS_YEAR2038_PROBE], ++[AC_CACHE_CHECK([for $CC option to enable timestamps after Jan 2038], ++ [ac_cv_sys_year2038_opts], ++ [ac_save_CPPFLAGS="$CPPFLAGS" ++ ac_opt_found=no ++ for ac_opt in _AC_SYS_YEAR2038_OPTIONS; do ++ AS_IF([test x"$ac_opt" != x"none needed"], ++ [CPPFLAGS="$ac_save_CPPFLAGS $ac_opt"]) ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([_AC_SYS_YEAR2038_TEST_CODE])], ++ [ac_cv_sys_year2038_opts="$ac_opt" ++ ac_opt_found=yes]) ++ test $ac_opt_found = no || break ++ done ++ CPPFLAGS="$ac_save_CPPFLAGS" ++ test $ac_opt_found = yes || ac_cv_sys_year2038_opts="support not detected"]) ++ ++ac_have_year2038=yes ++AS_CASE([$ac_cv_sys_year2038_opts], ++ ["none needed"], [], ++ ["support not detected"], ++ [ac_have_year2038=no ++ AS_CASE([$enable_year2038], ++ [yes], ++ [# If we're not cross compiling and 'touch' works with a large ++ # timestamp, then we can presume the system supports wider time_t ++ # *somehow* and we just weren't able to detect it. One common ++ # case that we deliberately *don't* probe for is a system that ++ # supports both 32- and 64-bit ABIs but only the 64-bit ABI offers ++ # wide time_t. (It would be inappropriate for us to override an ++ # intentional use of -m32.) Error out, demanding use of ++ # --disable-year2038 if this is intentional. ++ AS_IF([test $cross_compiling = no], ++ [AS_IF([TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null], ++ [AS_CASE([`TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null`], ++ [*'Feb 7 2106'* | *'Feb 7 17:10'*], ++ [AC_MSG_FAILURE(m4_text_wrap( ++ [this system appears to support timestamps after January 2038, ++ but no mechanism for enabling wide 'time_t' was detected. ++ Did you mean to build a 64-bit binary? (e.g. 'CC="${CC} -m64"'.) ++ To proceed with 32-bit time_t, configure with '--disable-year2038'.], ++ [], [], [55]))])])])])], ++ ++ ["-D_TIME_BITS=64"], ++ [AC_DEFINE([_TIME_BITS], [64], ++ [Number of bits in time_t, on hosts where this is settable.])], ++ ++ ["-D__MINGW_USE_VC2005_COMPAT=1"], ++ [AC_DEFINE([__MINGW_USE_VC2005_COMPAT], [1], ++ [Define to 1 on platforms where this makes time_t a 64-bit type.])], + +-# _AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, +-# CACHE-VAR, +-# DESCRIPTION, +-# PROLOGUE, [FUNCTION-BODY]) +-# -------------------------------------------------------- +-m4_define([_AC_SYS_LARGEFILE_MACRO_VALUE], +-[AC_CACHE_CHECK([for $1 value needed for large files], [$3], +-[while :; do +- m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])( +- [AC_LANG_PROGRAM([$5], [$6])], +- [$3=no; break]) +- m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])( +- [AC_LANG_PROGRAM([#undef $1 +-#define $1 $2 +-$5], [$6])], +- [$3=$2; break]) +- $3=unknown +- break +-done]) +-case $$3 in #( +- no | unknown) ;; +- *) AC_DEFINE_UNQUOTED([$1], [$$3], [$4]);; +-esac +-rm -rf conftest*[]dnl +-])# _AC_SYS_LARGEFILE_MACRO_VALUE ++ ["-U_USE_32_BIT_TIME_T"*], ++ [AC_MSG_FAILURE(m4_text_wrap( ++ [the 'time_t' type is currently forced to be 32-bit. ++ It will stop working after January 2038. ++ Remove _USE_32BIT_TIME_T from the compiler flags.], ++ [], [], [55]))], ++ ++ [AC_MSG_ERROR( ++ [internal error: bad value for \$ac_cv_sys_year2038_opts])]) ++]) ++ ++# _AC_SYS_YEAR2038_ENABLE ++# ----------------------- ++# Subroutine of AC_SYS_YEAR2038 and _AC_SYS_YEAR2038_OPT_IN. ++# Depending on which of the YEAR2038 macros was used, add either an ++# --enable-year2038, or a --disable-year2038, or no option at all to ++# the configure script. Note that this is expanded very late and ++# therefore there cannot be any code in the AC_ARG_ENABLE. The ++# default value for enable_year2038 is emitted unconditionally ++# because the generated code always looks at this variable. ++m4_define([_AC_SYS_YEAR2038_ENABLE], ++[m4_divert_text([DEFAULTS], ++ m4_provide_if([AC_SYS_YEAR2038], ++ [enable_year2038=yes], ++ [enable_year2038=no]))]dnl ++[AC_ARG_ENABLE([year2038], ++ m4_provide_if([AC_SYS_YEAR2038], ++ [AS_HELP_STRING([--disable-year2038], ++ [do not support timestamps after 2038])], ++ [AS_HELP_STRING([--enable-year2038], ++ [support timestamps after 2038])]))]) ++ ++# _AC_SYS_YEAR2038_OPT_IN ++# ----------------------- ++# If the --enable-year2038 option is given to configure, attempt to ++# detect and activate support for large time_t on 32-bit systems. ++# This macro is automatically invoked by AC_SYS_LARGEFILE when large ++# *file* support is detected. It does not AC_REQUIRE AC_SYS_LARGEFILE ++# to avoid a dependency loop, and is therefore unsafe to expose as a ++# documented macro. ++AC_DEFUN([_AC_SYS_YEAR2038_OPT_IN], ++[m4_provide_if([_AC_SYS_YEAR2038_PROBE], [], [dnl ++ AS_IF([test "$enable_year2038" != no], [_AC_SYS_YEAR2038_PROBE]) ++ AC_CONFIG_COMMANDS_PRE([_AC_SYS_YEAR2038_ENABLE]) ++])]) ++ ++# AC_SYS_YEAR2038 ++# --------------- ++# Attempt to detect and activate support for large time_t. ++# On systems where time_t is not always 64 bits, this probe can be ++# skipped by passing the --disable-year2038 option to configure. ++AC_DEFUN([AC_SYS_YEAR2038], ++[AC_REQUIRE([AC_SYS_LARGEFILE])]dnl ++[m4_provide_if([_AC_SYS_YEAR2038_PROBE], [], [dnl ++ AS_IF([test "$enable_year2038" != no], [_AC_SYS_YEAR2038_PROBE]) ++ AC_CONFIG_COMMANDS_PRE([_AC_SYS_YEAR2038_ENABLE]) ++])]) ++ ++# _AC_SYS_LARGEFILE_TEST_CODE ++# --------------------------- ++# C code used to probe for large file support. ++m4_define([_AC_SYS_LARGEFILE_TEST_CODE], ++[@%:@include <sys/types.h> ++ /* Check that off_t can represent 2**63 - 1 correctly. ++ We can't simply define LARGE_OFF_T to be 9223372036854775807, ++ since some C++ compilers masquerading as C compilers ++ incorrectly reject 9223372036854775807. */ ++@%:@define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) ++ int off_t_is_large[[(LARGE_OFF_T % 2147483629 == 721 ++ && LARGE_OFF_T % 2147483647 == 1) ++ ? 1 : -1]];[]dnl ++]) ++ ++# _AC_SYS_LARGEFILE_OPTIONS ++# ------------------------- ++# List of known ways to enable support for large files. If you change ++# this list you probably also need to change the AS_CASE at the end of ++# _AC_SYS_LARGEFILE_PROBE. ++m4_define([_AC_SYS_LARGEFILE_OPTIONS], m4_normalize( ++ ["none needed"] dnl Most current systems ++ ["-D_FILE_OFFSET_BITS=64"] dnl X/Open LFS spec ++ ["-D_LARGE_FILES=1"] dnl AIX (which versions?) ++ ["-n32"] dnl Irix 6.2 w/ SGI compiler ++)) ++ ++# _AC_SYS_LARGEFILE_PROBE ++# ----------------------- ++# Subroutine of AC_SYS_LARGEFILE. Probe for large file support and set ++# the cache variable ac_cv_sys_largefile_opts to one of the values in ++# the _AC_SYS_LARGEFILE_OPTIONS list, or to "support not detected" if ++# none of the options in that list worked. Then, set compilation ++# options and #defines as necessary to enable large file support. ++# ++# If large file support is not detected, the behavior depends on which of ++# the top-level AC_SYS_LARGEFILE macros was used (see below). ++# ++# If you change this macro you may also need to change ++# _AC_SYS_LARGEFILE_OPTIONS. ++AC_DEFUN([_AC_SYS_LARGEFILE_PROBE], ++[AC_CACHE_CHECK([for $CC option to enable large file support], ++ [ac_cv_sys_largefile_opts], ++ [ac_save_CC="$CC" ++ ac_opt_found=no ++ for ac_opt in _AC_SYS_LARGEFILE_OPTIONS; do ++ AS_IF([test x"$ac_opt" != x"none needed"], ++ [CC="$ac_save_CC $ac_opt"]) ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([_AC_SYS_LARGEFILE_TEST_CODE])], ++ [ac_cv_sys_largefile_opts="$ac_opt" ++ ac_opt_found=yes]) ++ test $ac_opt_found = no || break ++ done ++ CC="$ac_save_CC" ++ test $ac_opt_found = yes || ac_cv_sys_largefile_opts="support not detected"]) ++ ++ac_have_largefile=yes ++AS_CASE([$ac_cv_sys_largefile_opts], ++ ["none needed"], [], ++ ["support not detected"], ++ [ac_have_largefile=no], ++ ++ ["-D_FILE_OFFSET_BITS=64"], ++ [AC_DEFINE([_FILE_OFFSET_BITS], [64], ++ [Number of bits in a file offset, on hosts where this is settable.])], ++ ++ ["-D_LARGE_FILES=1"], ++ [AC_DEFINE([_LARGE_FILES], [1], ++ [Define to 1 on platforms where this makes off_t a 64-bit type.])], ++ ++ ["-n32"], ++ [CC="$CC -n32"], ++ ++ [AC_MSG_ERROR( ++ [internal error: bad value for \$ac_cv_sys_largefile_opts])]) ++ ++_AC_SYS_YEAR2038_OPT_IN ++]) + ++# _AC_SYS_LARGEFILE_ENABLE ++# ------------------------ ++# Subroutine of AC_SYS_LARGEFILE. Note that this ++# is expanded very late and therefore there cannot be any code in the ++# AC_ARG_ENABLE. The default value for enable_largefile is emitted ++# unconditionally because the generated shell code always looks at ++# this variable. ++m4_define([_AC_SYS_LARGEFILE_ENABLE], ++[m4_divert_text([DEFAULTS], ++ enable_largefile=yes)]dnl ++[AC_ARG_ENABLE([largefile], ++ [AS_HELP_STRING([--disable-largefile], [omit support for large files])])]) + + # AC_SYS_LARGEFILE + # ---------------- +@@ -80,44 +306,14 @@ rm -rf conftest*[]dnl + # Additionally, on Linux file systems with 64-bit inodes a file that happens + # to have a 64-bit inode number cannot be accessed by 32-bit applications on + # Linux x86/x86_64. This can occur with file systems such as XFS and NFS. ++# This macro allows configuration to continue if the system doesn't support ++# large files. + AC_DEFUN([AC_SYS_LARGEFILE], +-[AC_ARG_ENABLE(largefile, +- [ --disable-largefile omit support for large files]) +-AS_IF([test "$enable_largefile" != no], +- [AC_CACHE_CHECK([for special C compiler options needed for large files], +- ac_cv_sys_largefile_CC, +- [ac_cv_sys_largefile_CC=no +- if test "$GCC" != yes; then +- ac_save_CC=$CC +- while :; do +- # IRIX 6.2 and later do not support large files by default, +- # so use the C compiler's -n32 option if that helps. +- AC_LANG_CONFTEST([AC_LANG_PROGRAM([_AC_SYS_LARGEFILE_TEST_INCLUDES])]) +- AC_COMPILE_IFELSE([], [break]) +- CC="$CC -n32" +- AC_COMPILE_IFELSE([], [ac_cv_sys_largefile_CC=' -n32'; break]) +- break +- done +- CC=$ac_save_CC +- rm -f conftest.$ac_ext +- fi]) +- if test "$ac_cv_sys_largefile_CC" != no; then +- CC=$CC$ac_cv_sys_largefile_CC +- fi +- +- _AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64, +- ac_cv_sys_file_offset_bits, +- [Number of bits in a file offset, on hosts where this is settable.], +- [_AC_SYS_LARGEFILE_TEST_INCLUDES]) +- AS_CASE([$ac_cv_sys_file_offset_bits], +- [unknown], +- [_AC_SYS_LARGEFILE_MACRO_VALUE([_LARGE_FILES], [1], +- [ac_cv_sys_large_files], +- [Define for large files, on AIX-style hosts.], +- [_AC_SYS_LARGEFILE_TEST_INCLUDES])], +- [64], +- [gl_YEAR2038_BODY([])])]) +-])# AC_SYS_LARGEFILE ++[m4_provide_if([_AC_SYS_LARGEFILE_PROBE], [], [dnl ++ AS_IF([test "$enable_largefile" != no], [_AC_SYS_LARGEFILE_PROBE]) ++ AC_CONFIG_COMMANDS_PRE([_AC_SYS_LARGEFILE_ENABLE]) ++])]) ++])# m4_ifndef AC_SYS_YEAR2038 + + # Enable large files on systems where this is implemented by Gnulib, not by the + # system headers. +-- +2.40.0 + diff --git a/meta-oe/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch b/meta-oe/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch index 0863530f29..46938bccf6 100644 --- a/meta-oe/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch +++ b/meta-oe/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch @@ -1,23 +1,23 @@ Upstream-Status: Inappropriate [disable feature] Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> -diff -Nurdd libidn-1.26/doc/Makefile.am libidn-1.26/doc/Makefile.am ---- libidn-1.26/doc/Makefile.am 2012-09-18 11:25:45.000000000 +0300 -+++ libidn-1.26/doc/Makefile.am 2013-02-08 07:41:24.591431462 +0200 -@@ -49,15 +49,9 @@ - +--- libidn-1.41.orig/doc/Makefile.am ++++ libidn-1.41/doc/Makefile.am +@@ -73,16 +73,9 @@ BUILT_SOURCES = example.txt example2.txt + # Man pages. - + -dist_man_MANS = idn.1 $(gdoc_MANS) +dist_man_MANS = $(gdoc_MANS) MAINTAINERCLEANFILES = $(dist_man_MANS) - --idn.1: $(top_srcdir)/src/idn.c $(top_srcdir)/src/idn.ggo \ -- $(top_srcdir)/configure.ac -- $(HELP2MAN) \ + +-idn.1: $(top_srcdir)/src/idn.c $(top_srcdir)/src/idn.ggo $(top_srcdir)/.version +- $(MAKE) -C ../lib +- $(MAKE) -C ../src +- $(AM_V_GEN)$(HELP2MAN) \ - --name="Internationalized Domain Names command line tool" \ - --output=$@ $(top_builddir)/src/idn$(EXEEXT) - # GDOC - - GDOC_BIN = $(srcdir)/gdoc + + gdoc_TEXINFOS = diff --git a/meta-oe/recipes-extended/libidn/libidn_1.36.bb b/meta-oe/recipes-extended/libidn/libidn_1.41.bb index 0dea4aff5c..17ffc6cdc5 100644 --- a/meta-oe/recipes-extended/libidn/libidn_1.36.bb +++ b/meta-oe/recipes-extended/libidn/libidn_1.41.bb @@ -3,24 +3,27 @@ DESCRIPTION = "Implementation of the Stringprep, Punycode and IDNA specification HOMEPAGE = "http://www.gnu.org/software/libidn/" SECTION = "libs" LICENSE = "(LGPL-2.1-or-later | LGPL-3.0-only) & GPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=df4be47940a91ee69556f5f71eed4aec \ +LIC_FILES_CHKSUM = "file://COPYING;md5=f95a3dc99fecfa9a0c4e726d4b5d822f \ file://COPYING.LESSERv2;md5=4fbd65380cdd255951079008b364516c \ file://COPYING.LESSERv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \ - file://lib/idna.h;endline=21;md5=c381d797e2d7fbdace7c147b1285d076 \ - file://src/idn.c;endline=20;md5=7d88aa87b0494d690bdf7748fe08d536" + file://COPYINGv3;md5=11cc2d3ee574f9d6b7ee797bdce4d423 \ + file://lib/idna.h;endline=21;md5=176de4fe1d98e59d743d3b12a850e4cb \ + file://src/idn.c;endline=20;md5=dd17b9093355bf669e2ea108d2defbd0 \ + " + DEPENDS = "virtual/libiconv autoconf-archive" inherit pkgconfig autotools gettext texinfo gtk-doc SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \ file://dont-depend-on-help2man.patch \ - file://0001-idn-format-security-warnings.patch \ + file://0001-largefile.m4-Sync-with-latest-gnulib.patch \ " -SRC_URI[md5sum] = "813c7b268d1051ca02c3610986126f38" -SRC_URI[sha256sum] = "14b67108344d81ba844631640df77c9071d9fb0659b080326ff5424e86b14038" +#SRC_URI[md5sum] = "813c7b268d1051ca02c3610986126f38" +#SRC_URI[sha256sum] = "14b67108344d81ba844631640df77c9071d9fb0659b080326ff5424e86b14038" +SRC_URI[sha256sum] = "884d706364b81abdd17bee9686d8ff2ae7431c5a14651047c68adf8b31fd8945" # command tool is under GPLv3+, while libidn itself is under LGPLv2.1+ or LGPLv3 # so package command into a separate package diff --git a/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb b/meta-oe/recipes-extended/libimobiledevice/libplist_2.3.0.bb index daaff00395..f636990f89 100644 --- a/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb +++ b/meta-oe/recipes-extended/libimobiledevice/libplist_2.3.0.bb @@ -8,12 +8,15 @@ DEPENDS = "libxml2 glib-2.0 swig python3" inherit autotools pkgconfig python3native python3targetconfig -SRCREV = "c5a30e9267068436a75b5d00fcbf95cb9c1f4dcd" +SRCREV = "b8fcc89b74c9128a13b07cc15a0ce25dca0cd97e" SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https;branch=master" S = "${WORKDIR}/git" +PR = "r1" -CVE_CHECK_IGNORE += "\ +CVE_STATUS_GROUPS += "CVE_STATUS_LIBLIST" +CVE_STATUS_LIBLIST[status] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." +CVE_STATUS_LIBLIST = " \ CVE-2017-5834 \ CVE-2017-5835 \ CVE-2017-5836 \ diff --git a/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb b/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb index 82f3e4d0c9..3a10b40f1f 100644 --- a/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb +++ b/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb @@ -8,14 +8,16 @@ DEPENDS = "libxml2 glib-2.0 swig python3" inherit autotools pkgconfig python3native python3targetconfig -PV = "2.2.0+git${SRCPV}" +PV = "2.3.0" -SRCREV = "db93bae96d64140230ad050061632531644c46ad" +SRCREV = "b8fcc89b74c9128a13b07cc15a0ce25dca0cd97e" SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https;branch=master" S = "${WORKDIR}/git" -CVE_CHECK_IGNORE += "\ +CVE_STATUS_GROUPS += "CVE_STATUS_LIBLIST" +CVE_STATUS_LIBLIST[status] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." +CVE_STATUS_LIBLIST = " \ CVE-2017-5834 \ CVE-2017-5835 \ CVE-2017-5836 \ diff --git a/meta-oe/recipes-extended/libleak/libleak/0001-respect-environment-variables.patch b/meta-oe/recipes-extended/libleak/libleak/0001-respect-environment-variables.patch index bbdfa3c960..800ddd9507 100644 --- a/meta-oe/recipes-extended/libleak/libleak/0001-respect-environment-variables.patch +++ b/meta-oe/recipes-extended/libleak/libleak/0001-respect-environment-variables.patch @@ -5,21 +5,22 @@ Subject: [PATCH] respect environment variables Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/Makefile b/Makefile -index 1d70f17..c7e726e 100644 --- a/Makefile +++ b/Makefile -@@ -1,5 +1,5 @@ +@@ -1,8 +1,8 @@ -CFLAGS = -g -O2 -Wall -fPIC -Ilibwuya -LDFLAGS = -Llibwuya +CFLAGS += -g -O2 -Wall -fPIC -Ilibwuya +LDFLAGS += -Llibwuya libleak.so: libleak.o - CFLAGS='-fPIC' make -C libwuya --- -2.30.1 - +- CFLAGS='-fPIC' make -C libwuya ++ make -C libwuya + $(CC) -shared -o $@ $^ $(LDFLAGS) -lwuya -lpthread -ldl -lbacktrace + + clean: diff --git a/meta-oe/recipes-extended/libleak/libleak_git.bb b/meta-oe/recipes-extended/libleak/libleak_0.3.6.bb index a83a11c684..e3e4c01acb 100644 --- a/meta-oe/recipes-extended/libleak/libleak_git.bb +++ b/meta-oe/recipes-extended/libleak/libleak_0.3.6.bb @@ -8,13 +8,12 @@ LIC_FILES_CHKSUM = "file://README.md;beginline=18;endline=21;md5=de4f705f12cdedb DEPENDS += "libbacktrace" +PE = "1" +SRCREV = "1c56b0a2ba643db976f589ec04b246e693b6c0ce" SRC_URI = "gitsm://github.com/WuBingzheng/libleak;protocol=https;branch=master \ file://0001-respect-environment-variables.patch \ " -PV = "1.0+git${SRCPV}" -SRCREV = "ea2bb608ae25701692269a37d39d77e966b887ac" - S = "${WORKDIR}/git" do_configure () { diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-add-DESTDIR.patch b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-add-DESTDIR.patch index ea415dd8ba..2533b3a008 100644 --- a/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-add-DESTDIR.patch +++ b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-add-DESTDIR.patch @@ -1,4 +1,4 @@ -From 67843dabe1177840697839b916fd899218893ec7 Mon Sep 17 00:00:00 2001 +From 8e370a2f35d0c3472ddc9068fab19d0077434c61 Mon Sep 17 00:00:00 2001 From: Mingli Yu <mingli.yu@windriver.com> Date: Thu, 19 Jul 2018 00:25:23 -0700 Subject: [PATCH] Makefile.in: add DESTDIR @@ -29,7 +29,7 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 36a6d23..1e4130e 100644 +index 9c74b35..8cbda1d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -12,11 +12,11 @@ CC = @CC@ @@ -50,5 +50,5 @@ index 36a6d23..1e4130e 100644 MAILGROUP = @MAILGROUP@ -- -2.17.1 +2.25.1 diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-fix-install-failure-on-host-without-ldco.patch b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-fix-install-failure-on-host-without-ldco.patch new file mode 100644 index 0000000000..1fd5c827ba --- /dev/null +++ b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-fix-install-failure-on-host-without-ldco.patch @@ -0,0 +1,63 @@ +From 8b3a5916fff4004b5b2f1e8a1d3a051346ba3901 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Fri, 10 Mar 2023 08:59:39 +0800 +Subject: [PATCH] Makefile.in: fix install failure on host without ldconfig + +fix syntax error when ldconfig is not installed on host + +when ldconfig is not installed on the build host, install will failed with +error: +ln -sf nfslock.so.0.1 /mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image/usr/lib64/nfslock.so.0 +install -m 644 lockfile.h maillock.h /mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image/usr/include +if test "/mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image" = ""; then ; fi +if [ "mail" != "" ]; then\ + install -g mail -m 2755 dotlockfile /mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image/usr/bin;\ + else \ + install -g root -m 755 dotlockfile /mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image/usr/bin; \ + fi +/bin/sh: -c: line 1: syntax error near unexpected token `;' +/bin/sh: -c: line 1: `if test "/mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image" = ""; then ; fi' + +Upstream-Status: Submitted [https://github.com/miquels/liblockfile/pull/20] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + Makefile.in | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index e02d75e..5fc5b5a 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -9,6 +9,10 @@ NFSVER = 0.1 + CFLAGS = @CFLAGS@ -I. + LDFLAGS = @LDFLAGS@ + CC = @CC@ ++LDCONFIG = @LDCONFIG@ ++ifeq ($(LDCONFIG),) ++ LDCONFIG = ":" ++endif + + prefix = $(DESTDIR)@prefix@ + exec_prefix = @exec_prefix@ +@@ -69,7 +73,7 @@ install_shared: shared install_static install_common + $(libdir)/liblockfile.so.$(SOVER) + ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so.$(MAJOR) + ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so +- if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi ++ if test "$(DESTDIR)" = ""; then $(LDCONFIG); fi + + install_common: + install -d -m 755 -g root -p $(includedir) +@@ -90,7 +94,7 @@ install_nfslib: nfslib + install -m 755 nfslock.so.$(NFSVER) $(nfslockdir) + ln -sf nfslock.so.$(NFSVER) $(libdir)/nfslock.so + ln -sf nfslock.so.$(NFSVER) $(libdir)/nfslock.so.0 +- if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi ++ if test "$(DESTDIR)" = ""; then $(LDCONFIG); fi + + test: test-stamp + @: +-- +2.25.1 + diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock-libs.patch b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock-libs.patch index a6b297b592..f99ac2bf7a 100644 --- a/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock-libs.patch +++ b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock-libs.patch @@ -1,4 +1,4 @@ -From 631d46efff2a6d8970e202ba5422ebedd17a8d2f Mon Sep 17 00:00:00 2001 +From 0f34d1d91d641c3d5c5bb2eb11bd6eec7cfaf738 Mon Sep 17 00:00:00 2001 From: Mingli Yu <mingli.yu@windriver.com> Date: Thu, 19 Jul 2018 01:00:10 -0700 Subject: [PATCH] Makefile.in: install nfslock.so and nfslock.so.0 @@ -14,10 +14,10 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> 1 file changed, 2 insertions(+) diff --git a/Makefile.in b/Makefile.in -index 1e4130e..0f1b506 100644 +index 8cbda1d..3a74811 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -77,6 +77,8 @@ install_common: +@@ -88,6 +88,8 @@ install_common: install_nfslib: nfslib install -d -m 755 -g root -p $(nfslockdir) install -m 755 nfslock.so.$(NFSVER) $(nfslockdir) @@ -25,7 +25,7 @@ index 1e4130e..0f1b506 100644 + ln -sf nfslock.so.$(NFSVER) $(libdir)/nfslock.so.0 if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi - clean: + test: test-stamp -- -2.17.1 +2.25.1 diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-redefine-LOCKPROG.patch b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-redefine-LOCKPROG.patch index 35549ff2d3..c387db123f 100644 --- a/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-redefine-LOCKPROG.patch +++ b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-redefine-LOCKPROG.patch @@ -1,4 +1,4 @@ -From 9beb650712d448ad9c0899de9d98e9b623f9c249 Mon Sep 17 00:00:00 2001 +From 05227e74b732f13ed5a2a98232676f98bba028e6 Mon Sep 17 00:00:00 2001 From: Mingli Yu <mingli.yu@windriver.com> Date: Fri, 12 Aug 2022 11:18:15 +0800 Subject: [PATCH] Makefile.in: redefine LOCKPROG @@ -11,23 +11,41 @@ And it should be "/usr/bin/dotlockfile" on the target. Upstream-Status: Inappropriate [oe specific] Signed-off-by: Mingli Yu <mingli.yu@windriver.com> + +Update patch for 1.17, also redefine LOCKPROG in other lines +Signed-off-by: Changqing Li <changqing.li@windriver.com> --- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + Makefile.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 6e53179..bfa0acb 100644 +index e447cb2..e02d75e 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -42,7 +42,7 @@ dotlockfile: dotlockfile.o xlockfile.o - $(CC) $(LDFLAGS) -o dotlockfile dotlockfile.o xlockfile.o +@@ -44,19 +44,19 @@ dotlockfile: dotlockfile.o dlockfile.o + $(CC) $(LDFLAGS) -o dotlockfile dotlockfile.o dlockfile.o + + dotlockfile.o: dotlockfile.c +- $(CC) $(CFLAGS) -DLOCKPROG=\"$(bindir)/dotlockfile\" \ ++ $(CC) $(CFLAGS) -DLOCKPROG=\"/usr/bin/dotlockfile\" \ + -c dotlockfile.c lockfile.o: lockfile.c - $(CC) $(CFLAGS) -DLIB -DLOCKPROG=\"$(bindir)/dotlockfile\" \ + $(CC) $(CFLAGS) -DLIB -DLOCKPROG=\"/usr/bin/dotlockfile\" \ - -c lockfile.c + -DSTATIC -c lockfile.c + + solockfile.o: lockfile.c +- $(CC) $(CFLAGS) -DLIB -DLOCKPROG=\"$(bindir)/dotlockfile\" \ ++ $(CC) $(CFLAGS) -DLIB -DLOCKPROG=\"/usr/bin/dotlockfile\" \ + -c lockfile.c -o solockfile.o + + dlockfile.o: lockfile.c +- $(CC) $(CFLAGS) -DLOCKPROG=\"$(bindir)/dotlockfile\" \ ++ $(CC) $(CFLAGS) -DLOCKPROG=\"/usr/bin/dotlockfile\" \ + -c lockfile.c -o dlockfile.o - xlockfile.o: lockfile.c + install_static: static install_common -- 2.25.1 diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile/configure.patch b/meta-oe/recipes-extended/liblockfile/liblockfile/configure.patch index ea13e11d25..2bdf96e639 100644 --- a/meta-oe/recipes-extended/liblockfile/liblockfile/configure.patch +++ b/meta-oe/recipes-extended/liblockfile/liblockfile/configure.patch @@ -1,10 +1,19 @@ +From fd3fce8c1a3d0c70a0ffd461fbbe7e2ef71dd3a7 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Tue, 7 Mar 2023 11:05:45 +0800 +Subject: [PATCH] Update patch for 1.17 -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- +Upstream-Status: Pending ---- liblockfile-1.05/./configure.in~configure -+++ liblockfile-1.05/./configure.in + configure.ac | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index df26cee..76e9165 100644 +--- a/configure.ac ++++ b/configure.ac @@ -1,4 +1,5 @@ -AC_INIT(lockfile.c) +AC_INIT @@ -12,7 +21,7 @@ AC_CONFIG_HEADER(autoconf.h) AC_REVISION($Revision: 1.0 $)dnl -@@ -111,7 +112,8 @@ +@@ -111,7 +112,8 @@ AC_SUBST(TARGETS) AC_SUBST(INSTALL_TARGETS) AC_SUBST(nfslockdir) @@ -23,3 +32,6 @@ -) +]) +AC_OUTPUT +-- +2.25.1 + diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile/liblockfile-fix-install-so-to-man-dir.patch b/meta-oe/recipes-extended/liblockfile/liblockfile/liblockfile-fix-install-so-to-man-dir.patch index da25033393..046cd8e693 100644 --- a/meta-oe/recipes-extended/liblockfile/liblockfile/liblockfile-fix-install-so-to-man-dir.patch +++ b/meta-oe/recipes-extended/liblockfile/liblockfile/liblockfile-fix-install-so-to-man-dir.patch @@ -1,4 +1,4 @@ -From 363eb1aaeca914c7d36a2cdaf1417e4f87af4c22 Mon Sep 17 00:00:00 2001 +From 079d04c187800e22f18723c74e41c4e46eef67f8 Mon Sep 17 00:00:00 2001 From: Mingli Yu <mingli.yu@windriver.com> Date: Thu, 19 Jul 2018 01:12:47 -0700 Subject: [PATCH] Makefile.in: define dotlockfile.1 installed to man @@ -16,10 +16,10 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in -index 0f1b506..6e53179 100644 +index 3a74811..e447cb2 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -71,7 +71,7 @@ install_common: +@@ -82,7 +82,7 @@ install_common: else \ install -g root -m 755 dotlockfile $(bindir); \ fi @@ -29,5 +29,5 @@ index 0f1b506..6e53179 100644 install_nfslib: nfslib -- -2.17.1 +2.25.1 diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb b/meta-oe/recipes-extended/liblockfile/liblockfile_1.17.bb index 2604e14f07..b094337e90 100644 --- a/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb +++ b/meta-oe/recipes-extended/liblockfile/liblockfile_1.17.bb @@ -4,22 +4,20 @@ SECTION = "libs" LICENSE = "LGPL-2.0-or-later & GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=f4ba6ad04fcb05cc30a4cfa5062c55a3" -SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.14.orig.tar.gz \ - ${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.14-1.debian.tar.bz2;name=1.14-1 \ +SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.17.orig.tar.gz \ + ${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.17-1.debian.tar.bz2;name=1.17-1 \ file://configure.patch \ file://0001-Makefile.in-add-DESTDIR.patch \ file://0001-Makefile.in-install-nfslock-libs.patch \ file://liblockfile-fix-install-so-to-man-dir.patch \ file://0001-Makefile.in-redefine-LOCKPROG.patch \ + file://0001-Makefile.in-fix-install-failure-on-host-without-ldco.patch \ " -SRC_URI[md5sum] = "420c056ba0cc4d1477e402f70ba2f5eb" -SRC_URI[sha256sum] = "ab40d4a3e8cbc204f7e87fea637a4e4ddf9a1149aaa0a723a4267febd0b1d060" +SRC_URI[sha256sum] = "6e937f3650afab4aac198f348b89b1ca42edceb17fb6bb0918f642143ccfd15e" +SRC_URI[1.17-1.sha256sum] = "e3657c0e3facfeccb58900c0b48d56cd68ad5f9f24d1b4c6eaa69c26490fb673" -SRC_URI[1.14-1.md5sum] = "f9a44928c3477d218c56252712ebc479" -SRC_URI[1.14-1.sha256sum] = "73f9be769e602149391588c28f0f4f5cda131e30fb94c0777dbb23d811ac21ff" - -S = "${WORKDIR}/${BPN}" +S = "${WORKDIR}/${BP}" inherit autotools-brokensep diff --git a/meta-oe/recipes-extended/libmodbus/libmodbus/Fix-float-endianness-issue-on-big-endian-arch.patch b/meta-oe/recipes-extended/libmodbus/libmodbus/Fix-float-endianness-issue-on-big-endian-arch.patch index 5372a23b6a..e7fbb0389f 100644 --- a/meta-oe/recipes-extended/libmodbus/libmodbus/Fix-float-endianness-issue-on-big-endian-arch.patch +++ b/meta-oe/recipes-extended/libmodbus/libmodbus/Fix-float-endianness-issue-on-big-endian-arch.patch @@ -9,6 +9,8 @@ This patch was modified from rm5248 [1] [1] https://github.com/synexxus/libmodbus/commit/a511768e7fe7ec52d7bae1d9ae04e33f87a59627 --- +Upstream-Status: Pending + src/modbus-data.c | 110 ++++++++++++++++++++++++++++++++++++++--------- tests/unit-test-client.c | 22 ++++++---- tests/unit-test.h.in | 41 ++++++++++++++++-- diff --git a/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch b/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch index ec8672107f..636b294073 100644 --- a/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch +++ b/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch @@ -4,7 +4,7 @@ Date: Mon, 3 Aug 2015 13:43:14 +0800 Subject: [PATCH] setup.py.in: add missing python include dir for cross compiling -Upstream-Status: inappropriate [oe-core specific] +Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- diff --git a/meta-oe/recipes-extended/libqb/libqb_2.0.6.bb b/meta-oe/recipes-extended/libqb/libqb_2.0.7.bb index ce3606d777..9123e0a4cd 100644 --- a/meta-oe/recipes-extended/libqb/libqb_2.0.6.bb +++ b/meta-oe/recipes-extended/libqb/libqb_2.0.7.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=321bf41f280cf805086dd5a720b37785" inherit autotools pkgconfig -SRCREV = "758044bed5f615c90818aa5431d00303288888e5" +SRCREV = "06c8641de2e1fef1fc6026709fb2109fbbb79d79" SRC_URI = "git://github.com/ClusterLabs/${BPN}.git;branch=main;protocol=https \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-extended/libreport/files/0001-Makefile.am-remove-doc-and-apidoc.patch b/meta-oe/recipes-extended/libreport/files/0001-Makefile.am-remove-doc-and-apidoc.patch index 97fb097fef..934dd1778a 100644 --- a/meta-oe/recipes-extended/libreport/files/0001-Makefile.am-remove-doc-and-apidoc.patch +++ b/meta-oe/recipes-extended/libreport/files/0001-Makefile.am-remove-doc-and-apidoc.patch @@ -1,28 +1,32 @@ -From 1f7d106c7d982fe055addc8d883b161202233175 Mon Sep 17 00:00:00 2001 +From 73dc0c2cd942e30f5f7cb40cb5828895b96f0fb1 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Wed, 26 Apr 2017 03:47:58 -0400 -Subject: [PATCH 1/4] Makefile.am: remove doc and apidoc +Subject: [PATCH] Makefile.am: remove doc and apidoc There was a failure at do_install time, so remove doc to workaround. -Upstream-Status: Inappropriate workaround +Upstream-Status: Inappropriate [workaround] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + +Context modified to apply to v2.17.8. + +Signed-off-by: Joe Slater <joe.slater@windriver.com> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am -index 9ad827c..34364a8 100644 +index 4ff2f5c5..d4e30bc2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ ACLOCAL_AMFLAGS = -I m4 --SUBDIRS = po src tests doc apidoc -+SUBDIRS = po src tests +-SUBDIRS = data po src tests doc apidoc ++SUBDIRS = data po src tests EXTRA_DIST = \ libreport.pc.in \ -- -2.7.4 +2.25.1 diff --git a/meta-oe/recipes-extended/libreport/files/0002-configure.ac-remove-prog-test-of-xmlto-and-asciidoc.patch b/meta-oe/recipes-extended/libreport/files/0002-configure.ac-remove-prog-test-of-xmlto-and-asciidoc.patch index 7f5895ea12..4fdf69c73a 100644 --- a/meta-oe/recipes-extended/libreport/files/0002-configure.ac-remove-prog-test-of-xmlto-and-asciidoc.patch +++ b/meta-oe/recipes-extended/libreport/files/0002-configure.ac-remove-prog-test-of-xmlto-and-asciidoc.patch @@ -1,24 +1,28 @@ -From 9beadcdfca9198548f06bf18f3f26e1d11542e53 Mon Sep 17 00:00:00 2001 +From 276c45d0663124c9ccab0ddc8b97fb5cdc8b3867 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Tue, 31 Jul 2018 16:53:04 +0800 -Subject: [PATCH 2/4] configure.ac: remove prog test of xmlto and asciidoc +Subject: [PATCH] configure.ac: remove prog test of xmlto and asciidoc The prog of xmlto and asciidoc were used to generate documents, and since the doc module has already been disabled, so we should remove the prog test. -Upstream-Status: Inappropriate workaround +Upstream-Status: Inappropriate [workaround] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + +Modify to apply to v 2.17.8. + +Signed-off-by: Joe Slater <joe.slater@windriver.com> --- configure.ac | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/configure.ac b/configure.ac -index feafc28..aceccf4 100644 +index da8cf898..17ece200 100644 --- a/configure.ac +++ b/configure.ac -@@ -56,24 +56,6 @@ IT_PROG_INTLTOOL([0.35.0]) +@@ -57,24 +57,6 @@ IT_PROG_INTLTOOL([0.35.0]) dnl ****** END **************************************** @@ -42,7 +46,7 @@ index feafc28..aceccf4 100644 - AC_ARG_WITH(bugzilla, AS_HELP_STRING([--with-bugzilla],[use Bugzilla plugin (default is YES)]), - LIBREPORT_PARSE_WITH([bugzilla])) + LIBREPORT_PARSE_WITH([bugzilla]), -- -2.7.4 +2.25.1 diff --git a/meta-oe/recipes-extended/libreport/files/0003-without-build-plugins.patch b/meta-oe/recipes-extended/libreport/files/0003-without-build-plugins.patch index 2ff1731be6..f6ff860408 100644 --- a/meta-oe/recipes-extended/libreport/files/0003-without-build-plugins.patch +++ b/meta-oe/recipes-extended/libreport/files/0003-without-build-plugins.patch @@ -1,26 +1,30 @@ -From 41bce1de2fd2a0f79c266f245ae3e3720ccaf46a Mon Sep 17 00:00:00 2001 +From f46610901dbac56d9631df012374c600db08453e Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Wed, 26 Apr 2017 03:51:03 -0400 -Subject: [PATCH 3/4] without build plugins +Subject: [PATCH] without build plugins -Upstream-Status: Inappropriate workaround +Upstream-Status: Inappropriate [workaround] Rebase to 2.9.1 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + +Modify to apply to v2.17.8. + +Signed-off-by: Joe Slater <joe.slater@windriver.com> --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am -index c15928c..bac02b1 100644 +index 410bfcb0..bac02b16 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,4 +8,4 @@ if BUILD_NEWT sub_dirs += report-newt endif --SUBDIRS = include lib plugins report-python cli client-python workflows $(sub_dirs) +-SUBDIRS = include lib report-python cli client-python plugins workflows $(sub_dirs) +SUBDIRS = include lib report-python cli client-python workflows $(sub_dirs) -- -2.7.4 +2.25.1 diff --git a/meta-oe/recipes-extended/libreport/files/0004-configure.ac-remove-prog-test-of-augparse.patch b/meta-oe/recipes-extended/libreport/files/0004-configure.ac-remove-prog-test-of-augparse.patch index 4ba69c793d..998ae6b50e 100644 --- a/meta-oe/recipes-extended/libreport/files/0004-configure.ac-remove-prog-test-of-augparse.patch +++ b/meta-oe/recipes-extended/libreport/files/0004-configure.ac-remove-prog-test-of-augparse.patch @@ -1,25 +1,29 @@ -From c1c301502a8f69b9889197744b301a136082f09d Mon Sep 17 00:00:00 2001 +From 62c922f43b54585d25ba89be36c10612b479270b Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Thu, 27 Apr 2017 02:15:02 -0400 -Subject: [PATCH 4/4] configure.ac: remove prog test of augparse +Subject: [PATCH] configure.ac: remove prog test of augparse The build time does not require it. -Upstream-Status: Inappropriate workaround +Upstream-Status: Inappropriate [workaround] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + +Modify to apply to v2.17.8. + +Signed-off-by: Joe Slater <joe.slater@windriver.com> --- - configure.ac | 8 -------- - 1 file changed, 8 deletions(-) + configure.ac | 9 --------- + 1 file changed, 9 deletions(-) diff --git a/configure.ac b/configure.ac -index aceccf4..83c101b 100644 +index 17ece200..89b463a4 100644 --- a/configure.ac +++ b/configure.ac -@@ -350,14 +350,6 @@ AC_ARG_WITH(augeaslenslibdir, - [Directory for librepor lens (default: /usr/share/augeas/lenses)])], - [], [with_augeaslenslibdir="/usr/share/augeas/lenses"]) - AC_SUBST([AUGEAS_LENS_LIB_DIR], [$with_augeaslenslibdir]) +@@ -287,15 +287,6 @@ AC_ARG_WITH(largedatatmpdir, + [], [with_largedatatmpdir="/var/tmp"]) + AC_SUBST([LARGE_DATA_TMP_DIR], [$with_largedatatmpdir]) + -AC_PATH_PROG(AUGPARSE, augparse, no) -[if test "$AUGPARSE" = "no"] -[then] @@ -28,9 +32,10 @@ index aceccf4..83c101b 100644 - [echo "Then run configure again before attempting to build libreport."] - [exit 1] -[fi] - +- AC_ARG_WITH([defaultdumpdirmode], AS_HELP_STRING([--with-defaultdumpdirmode=OCTAL-MODE], + [Default dump dir mode (default: 0x1A0 (0640))]), -- -2.7.4 +2.25.1 diff --git a/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb b/meta-oe/recipes-extended/libreport/libreport_2.17.8.bb index 35ef692617..1f2c55c699 100644 --- a/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb +++ b/meta-oe/recipes-extended/libreport/libreport_2.17.8.bb @@ -4,7 +4,7 @@ SUMMARY = "Generic library for reporting various problems" HOMEPAGE = "https://abrt.readthedocs.org/" LICENSE = "GPL-2.0-or-later" DEPENDS = "xmlrpc-c xmlrpc-c-native intltool-native \ - json-c libtar libnewt libproxy rpm \ + json-c libarchive libtar libnewt libproxy rpm \ augeas satyr systemd \ " @@ -17,7 +17,9 @@ SRC_URI += "file://0001-Makefile.am-remove-doc-and-apidoc.patch \ file://0003-without-build-plugins.patch \ file://0004-configure.ac-remove-prog-test-of-augparse.patch \ " -SRCREV = "eaff08f38d771d9362923765bb404b1514c5ca0a" + +# 2.17.8 +SRCREV = "46a99a14adba7276e5697b7c613d918796792345" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" @@ -31,7 +33,7 @@ inherit gettext autotools python3native python3targetconfig pkgconfig PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','x11','gtk','',d)}" PACKAGECONFIG[gtk] = "--with-gtk, --without-gtk, gtk+3," -EXTRA_OECONF += "--without-python2 --with-python3" +EXTRA_OECONF += "--with-python3" RDEPENDS:python3-libreport += "${PN}" diff --git a/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-intoverflow.patch b/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-intoverflow.patch index 50d915c010..4e7cd8887a 100644 --- a/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-intoverflow.patch +++ b/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-intoverflow.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + http://cvs.fedoraproject.org/viewvc/devel/libwmf/libwmf-0.2.8.4-intoverflow.patch?view=log CVE-2006-3376 libwmf integer overflow diff --git a/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-useafterfree.patch b/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-useafterfree.patch index 4d2d285641..9a8cbcb508 100644 --- a/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-useafterfree.patch +++ b/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-useafterfree.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + http://cvs.fedoraproject.org/viewvc/devel/libwmf/libwmf-0.2.8.4-useafterfree.patch?view=log Resolves: CVE-2009-1364 diff --git a/meta-oe/recipes-extended/libx86-1/libx86-1.1/0001-Define-CARD32-as-uint-as-it-is-32-bit.patch b/meta-oe/recipes-extended/libx86-1/libx86-1.1/0001-Define-CARD32-as-uint-as-it-is-32-bit.patch new file mode 100644 index 0000000000..aef521bc5d --- /dev/null +++ b/meta-oe/recipes-extended/libx86-1/libx86-1.1/0001-Define-CARD32-as-uint-as-it-is-32-bit.patch @@ -0,0 +1,42 @@ +From 592c915df252932961a4151c891da58c48a8db90 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 2 Mar 2023 18:47:40 -0800 +Subject: [PATCH] Define CARD32 as uint as it is 32-bit + +long can be 64bit on LP64 systems and none of systems we support need int < 32-bits +therefore use NUM32 to be int always if the system is linux + +Fixes build with clang-16 +thunk.c:147:3: error: incompatible function pointer types initializing 'x86emuu32 (*)(X86EMU_pioAddr)' (aka 'unsigned int (*)(unsigned short)') with an expression of type 'unsigned long (*)(unsigned short)' [-Wincompatible-function-pointer-types] + (&x_inl), + ^~~~~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + x86emu/include/xf86int10.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/x86emu/include/xf86int10.h ++++ b/x86emu/include/xf86int10.h +@@ -18,7 +18,7 @@ + + #define CARD8 unsigned char + #define CARD16 unsigned short +-#define CARD32 unsigned long ++#define CARD32 unsigned int + #define pointer void * + #define IOADDRESS void * + #define Bool int +--- a/x86emu/include/types.h ++++ b/x86emu/include/types.h +@@ -77,7 +77,8 @@ + defined(__s390x__) || \ + (defined(__hppa__) && defined(__LP64)) || \ + defined(__amd64__) || defined(amd64) || \ +- (defined(__sgi) && (_MIPS_SZLONG == 64)) ++ (defined(__sgi) && (_MIPS_SZLONG == 64)) || \ ++ defined(__linux__) + #define NUM32 int + #else + #define NUM32 long diff --git a/meta-oe/recipes-extended/libx86-1/libx86-1.1/libx86-mmap-offset.patch b/meta-oe/recipes-extended/libx86-1/libx86-1.1/libx86-mmap-offset.patch index 843acc8868..1c120c04b9 100644 --- a/meta-oe/recipes-extended/libx86-1/libx86-1.1/libx86-mmap-offset.patch +++ b/meta-oe/recipes-extended/libx86-1/libx86-1.1/libx86-mmap-offset.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Upstream-Statue: Pending [from ftp://195.220.108.108/linux/fedora/linux/development/rawhide/source/SRPMS/l/libx86-1.1-21.fc23.src.rpm] diff --git a/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb b/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb index 9dc91f3f6f..f11c52dd11 100644 --- a/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb +++ b/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb @@ -7,14 +7,13 @@ LICENSE = "MIT & BSD-3-Clause" SECTION = "libs" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=633af6c02e6f624d4c472d970a2aca53" -SRC_URI = "http://www.codon.org.uk/~mjg59/libx86/downloads/${BPN}-${PV}.tar.gz \ +SRC_URI = "https://mirrors.slackware.com/slackware/slackware-current/source/ap/libx86/libx86-${PV}.tar.gz \ file://libx86-mmap-offset.patch \ file://0001-assume-zero-is-valid-address.patch \ file://makefile-add-ldflags.patch \ file://0001-Fix-type-of-the-void-pointer-assignment.patch \ + file://0001-Define-CARD32-as-uint-as-it-is-32-bit.patch \ " - -SRC_URI[md5sum] = "41bee1f8e22b82d82b5f7d7ba51abc2a" SRC_URI[sha256sum] = "5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048" BPN = "libx86" diff --git a/meta-oe/recipes-extended/libyang/libyang/0001-test_context-skip-test-case-test_searchdirs.patch b/meta-oe/recipes-extended/libyang/libyang/0001-test_context-skip-test-case-test_searchdirs.patch new file mode 100644 index 0000000000..3c6aee9247 --- /dev/null +++ b/meta-oe/recipes-extended/libyang/libyang/0001-test_context-skip-test-case-test_searchdirs.patch @@ -0,0 +1,29 @@ +From 5de24e1b39c09adb0c5bf4bb4228bd1bb935542a Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Wed, 22 Mar 2023 16:03:56 +0800 +Subject: [PATCH] test_context: skip test case test_searchdirs + +Skip test case test_searchdirs as it searchs the source code directory. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + tests/utests/basic/test_context.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/tests/utests/basic/test_context.c b/tests/utests/basic/test_context.c +index cfba1d30f..8c3bb7ad6 100644 +--- a/tests/utests/basic/test_context.c ++++ b/tests/utests/basic/test_context.c +@@ -1061,7 +1061,6 @@ int + main(void) + { + const struct CMUnitTest tests[] = { +- UTEST(test_searchdirs), + UTEST(test_options), + UTEST(test_models), + UTEST(test_imports), +-- +2.25.1 + diff --git a/meta-oe/recipes-extended/libyang/libyang/libyang-add-stdint-h.patch b/meta-oe/recipes-extended/libyang/libyang/libyang-add-stdint-h.patch deleted file mode 100644 index d357411146..0000000000 --- a/meta-oe/recipes-extended/libyang/libyang/libyang-add-stdint-h.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c7f3e2a8fe530beec6103cb9071ccc41458879aa Mon Sep 17 00:00:00 2001 -From: Tony Tascioglu <tony.tascioglu@windriver.com> -Date: Mon, 21 Jun 2021 12:34:22 -0400 -Subject: [PATCH] libyang: fix initial build errors - -This patch addresses build errors seen when integrating libyang as a -recipe. - -There is a missing include statement for stdint.h in utests.h which -causes build problems. stdint.h is required to be imported by cmocka.h -prior to the cmocka file. Adding the stdint allows it to build the -tests correctly - -Upstream-Status: Submitted [ https://github.com/CESNET/libyang/pull/1819 ] - -Signed-off-by: Tony Tascioglu <tony.tascioglu@windriver.com> -Signed-off-by: Randy MacLeod <randy.macleod@windriver.com> ---- - tests/utests/utests.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/utests/utests.h b/tests/utests/utests.h -index 7e85a66e..8eee26ce 100644 ---- a/tests/utests/utests.h -+++ b/tests/utests/utests.h -@@ -22,6 +22,7 @@ - #include <stdarg.h> - #include <stddef.h> - #include <stdlib.h> -+#include <stdint.h> - - #include <cmocka.h> - --- -2.32.0 diff --git a/meta-oe/recipes-extended/libyang/libyang/run-ptest b/meta-oe/recipes-extended/libyang/libyang/run-ptest index 1c9f8f47f7..c507afb2f5 100644 --- a/meta-oe/recipes-extended/libyang/libyang/run-ptest +++ b/meta-oe/recipes-extended/libyang/libyang/run-ptest @@ -1,46 +1,18 @@ #!/bin/sh -# Valid tests to run -tests="utest_binary \ - utest_bits \ - utest_common \ - utest_hash_table \ - utest_inet_types \ - utest_int8 \ - utest_json \ - utest_list \ - utest_merge \ - utest_metadata \ - utest_parser_yang \ - utest_parser_yin \ - utest_pattern \ - utest_printer_yang \ - utest_printer_yin \ - utest_range \ - utest_schema \ - utest_set \ - utest_string \ - utest_tree_data \ - utest_tree_schema_compile \ - utest_types \ - utest_xml \ - utest_xpath \ - utest_yang_types \ - utest_yanglib" # cd into right directory ptestdir=$(dirname "$(readlink -f "$0")") cd "$ptestdir"/tests || exit -# Run specified tests +tests=$(find * -type f -name 'utest_*') + for f in $tests do - if test -e ./"$f"; then + if test -x ./"$f"; then if ./"$f" > ./"$f".out 2> ./"$f".err; then echo "PASS: $f" else echo "FAIL: $f" fi - else - echo "SKIP: $f" fi done diff --git a/meta-oe/recipes-extended/libyang/libyang_2.0.194.bb b/meta-oe/recipes-extended/libyang/libyang_2.0.194.bb deleted file mode 100644 index 548dcdd2f5..0000000000 --- a/meta-oe/recipes-extended/libyang/libyang_2.0.194.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "YANG data modeling language library" -DESCRIPTION = "libyang is a YANG data modelling language parser and toolkit written (and providing API) in C." -HOMEPAGE = "https://github.com/CESNET/libyang" -SECTION = "libs" -LICENSE = "BSD-3-Clause" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=f3916d7d8d42a6508d0ea418cfff10ad" - -SRCREV = "87375f15159545a87a1e0de200f5d9d67e9091d7" - -SRC_URI = "git://github.com/CESNET/libyang.git;branch=master;protocol=https \ - file://libyang-add-stdint-h.patch \ - file://run-ptest \ - " - -S = "${WORKDIR}/git" - -# Due to valgrind not supported on these arches: -COMPATIBLE_HOST:riscv32 = "null" -COMPATIBLE_HOST:armv5 = "null" -COMPATIBLE_HOST:riscv64 = "null" - -# Main dependencies -inherit cmake pkgconfig lib_package ptest -DEPENDS = "libpcre2" -DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'cmocka', '', d)}" - -# Ptest dependencies -RDEPENDS:${PN}-ptest += "valgrind" - -EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release" -EXTRA_OECMAKE += " ${@bb.utils.contains('PTEST_ENABLED', '1', '-DENABLE_TESTS=ON', '', d)}" - -do_install_ptest () { - cp -fR ${B}/tests/ ${D}${PTEST_PATH}/ -} - diff --git a/meta-oe/recipes-extended/libyang/libyang_2.1.55.bb b/meta-oe/recipes-extended/libyang/libyang_2.1.55.bb new file mode 100644 index 0000000000..bddf30bf6a --- /dev/null +++ b/meta-oe/recipes-extended/libyang/libyang_2.1.55.bb @@ -0,0 +1,45 @@ +SUMMARY = "YANG data modeling language library" +DESCRIPTION = "libyang is a YANG data modelling language parser and toolkit written (and providing API) in C." +HOMEPAGE = "https://github.com/CESNET/libyang" +SECTION = "libs" +LICENSE = "BSD-3-Clause" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=f3916d7d8d42a6508d0ea418cfff10ad" + +SRCREV = "9a4e5b2ce30b9696116d6e654ee55caab5aafed8" + +SRC_URI = "git://github.com/CESNET/libyang.git;branch=master;protocol=https \ + file://0001-test_context-skip-test-case-test_searchdirs.patch \ + file://run-ptest \ + " + +S = "${WORKDIR}/git" + +# Main dependencies +inherit cmake pkgconfig lib_package ptest multilib_header +DEPENDS = "libpcre2" +DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'cmocka', '', d)}" + +EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release" +EXTRA_OECMAKE += " ${@bb.utils.contains('PTEST_ENABLED', '1', '-DENABLE_TESTS=ON -DENABLE_VALGRIND_TESTS=OFF', '', d)}" + +do_compile:prepend () { + if [ ${PTEST_ENABLED} = "1" ]; then + sed -i -e 's|${S}|${PTEST_PATH}|g' ${B}/tests/tests_config.h + sed -i -e 's|${B}|${PTEST_PATH}|g' ${B}/tests/tests_config.h + fi +} + +do_install:append () { + oe_multilib_header libyang/config.h +} + +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + cp -f ${B}/tests/utest_* ${D}${PTEST_PATH}/tests/ + cp -fR ${S}/tests/modules ${D}${PTEST_PATH}/tests/ + install -d ${D}${PTEST_PATH}/tests/plugins + cp -f ${B}/tests/plugins/plugin_*.so ${D}${PTEST_PATH}/tests/plugins/ +} + +FILES:${PN} += "${datadir}/yang/*" diff --git a/meta-oe/recipes-extended/libzip/libzip_1.9.2.bb b/meta-oe/recipes-extended/libzip/libzip_1.10.0.bb index 7fb58de3c1..b500f26e25 100644 --- a/meta-oe/recipes-extended/libzip/libzip_1.9.2.bb +++ b/meta-oe/recipes-extended/libzip/libzip_1.10.0.bb @@ -21,9 +21,6 @@ inherit cmake SRC_URI = "https://libzip.org/download/libzip-${PV}.tar.xz" -SRC_URI[sha256sum] = "c93e9852b7b2dc931197831438fee5295976ee0ba24f8524a8907be5c2ba5937" - -# Patch for CVE-2017-12858 is applied in version 1.2.0. -CVE_CHECK_IGNORE += "CVE-2017-12858" +SRC_URI[sha256sum] = "cd2a7ac9f1fb5bfa6218272d9929955dc7237515bba6e14b5ad0e1d1e2212b43" BBCLASSEXTEND += "native" diff --git a/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.1.19.bb b/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.1.19.bb index d7ba6e14b2..834687b43b 100644 --- a/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.1.19.bb +++ b/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.1.19.bb @@ -12,7 +12,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/l/${BPN}/${BPN}_${PV}.tar.gz" SRC_URI[sha256sum] = "2c5704b01c8f474f82921780e4592a927b2bf6a6d7616354a6c5d7cd5664857e" do_compile() { - oe_runmake CFLAGS=' -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -fasynchronous-unwind-tables' + oe_runmake CFLAGS=' -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -fasynchronous-unwind-tables ${DEBUG_PREFIX_MAP}' } do_install() { diff --git a/meta-oe/recipes-extended/logwatch/logwatch_7.7.bb b/meta-oe/recipes-extended/logwatch/logwatch_7.8.bb index 37a94661aa..187e794b3d 100644 --- a/meta-oe/recipes-extended/logwatch/logwatch_7.7.bb +++ b/meta-oe/recipes-extended/logwatch/logwatch_7.8.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] = "2a10c2c73f85d2ec9d8e9be3f553b7b5849cf795b89a1c1379c99cc36a06adbd" +SRC_URI[sha256sum] = "b1df31779306c2c87d595816305c89c19c382edf9ebbfce03143f567e580be42" do_install() { install -m 0755 -d ${D}${sysconfdir}/logwatch/scripts diff --git a/meta-oe/recipes-extended/md5deep/files/wrong-variable-expansion.patch b/meta-oe/recipes-extended/md5deep/files/wrong-variable-expansion.patch index 73c6cb126a..b637d81e9e 100644 --- a/meta-oe/recipes-extended/md5deep/files/wrong-variable-expansion.patch +++ b/meta-oe/recipes-extended/md5deep/files/wrong-variable-expansion.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: git/configure.ac =================================================================== --- git.orig/configure.ac diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0001-Do-not-use-LFS64-functions-on-linux-musl.patch b/meta-oe/recipes-extended/minifi-cpp/files/0001-Do-not-use-LFS64-functions-on-linux-musl.patch new file mode 100644 index 0000000000..29f5b94a04 --- /dev/null +++ b/meta-oe/recipes-extended/minifi-cpp/files/0001-Do-not-use-LFS64-functions-on-linux-musl.patch @@ -0,0 +1,35 @@ +From 6690e7fe566445e20fec178e9e209e5f9f2fdde3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 5 Apr 2023 23:33:46 -0700 +Subject: [PATCH] Do not use LFS64 functions on linux/musl + +On musl, off_t is 64bit always ( even on 32bit platforms ), therefore using +LFS64 funcitons is not needed on such platforms. Moreover, musl has stopped +providing aliases for these functions [1] which means it wont compile on +newer musl systems. Therefore only use it on 32bit glibc/linux platforms +and exclude musl like cygwin or OSX + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=246f1c811448f37a44b41cd8df8d0ef9736d95f4 + +Upstream-Status: Submitted [https://github.com/gabime/spdlog/pull/2589] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + thirdparty/spdlog-20170710/include/spdlog/details/os.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/thirdparty/spdlog-20170710/include/spdlog/details/os.h b/thirdparty/spdlog-20170710/include/spdlog/details/os.h +index 735f60147..639b07a79 100644 +--- a/thirdparty/spdlog-20170710/include/spdlog/details/os.h ++++ b/thirdparty/spdlog-20170710/include/spdlog/details/os.h +@@ -237,7 +237,7 @@ inline size_t filesize(FILE *f) + #else // unix + int fd = fileno(f); + //64 bits(but not in osx, where fstat64 is deprecated) +-#if !defined(__FreeBSD__) && !defined(__APPLE__) && (defined(__x86_64__) || defined(__ppc64__)) ++#if !defined(__FreeBSD__) && !defined(__APPLE__) && ((defined(__x86_64__) || defined(__ppc64__)) && (!defined(__linux__))) + struct stat64 st; + if (fstat64(fd, &st) == 0) + return static_cast<size_t>(st.st_size); +-- +2.40.0 + diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-the-constness-issues-around-autovector-iterator_.patch b/meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-the-constness-issues-around-autovector-iterator_.patch new file mode 100644 index 0000000000..acb96f40d5 --- /dev/null +++ b/meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-the-constness-issues-around-autovector-iterator_.patch @@ -0,0 +1,63 @@ +From 787d5052a6034cc722b073c652cc610ae037f933 Mon Sep 17 00:00:00 2001 +From: Levi Tamasi <ltamasi@fb.com> +Date: Fri, 22 Nov 2019 18:12:35 -0800 +Subject: [PATCH 1/2] Fix the constness issues around + autovector::iterator_impl's dereference operators (#6057) + +Summary: +As described in detail in issue https://github.com/facebook/rocksdb/issues/6048, iterators' dereference operators +(`*`, `->`, and `[]`) should return `pointer`s/`reference`s (as opposed to +`const_pointer`s/`const_reference`s) even if the iterator itself is `const` +to be in sync with the standard's iterator concept. +Pull Request resolved: https://github.com/facebook/rocksdb/pull/6057 + +Test Plan: make check + +Differential Revision: D18623235 + +Pulled By: ltamasi + +fbshipit-source-id: 04e82d73bc0c67fb0ded018383af8dfc332050cc +--- + thirdparty/rocksdb/util/autovector.h | 15 ++++----------- + 1 file changed, 4 insertions(+), 11 deletions(-) + +diff --git a/thirdparty/rocksdb/util/autovector.h b/thirdparty/rocksdb/util/autovector.h +index b5c84712..6d337908 100644 +--- a/thirdparty/rocksdb/util/autovector.h ++++ b/thirdparty/rocksdb/util/autovector.h +@@ -120,27 +120,20 @@ class autovector { + } + + // -- Reference +- reference operator*() { ++ reference operator*() const { + assert(vect_->size() >= index_); + return (*vect_)[index_]; + } + +- const_reference operator*() const { +- assert(vect_->size() >= index_); +- return (*vect_)[index_]; +- } +- +- pointer operator->() { ++ pointer operator->() const { + assert(vect_->size() >= index_); + return &(*vect_)[index_]; + } + +- const_pointer operator->() const { +- assert(vect_->size() >= index_); +- return &(*vect_)[index_]; ++ reference operator[](difference_type len) const { ++ return *(*this + len); + } + +- + // -- Logical Operators + bool operator==(const self_type& other) const { + assert(vect_ == other.vect_); +-- +2.41.0 + diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0002-Fix-build-with-clang-17.patch b/meta-oe/recipes-extended/minifi-cpp/files/0002-Fix-build-with-clang-17.patch new file mode 100644 index 0000000000..7581efc763 --- /dev/null +++ b/meta-oe/recipes-extended/minifi-cpp/files/0002-Fix-build-with-clang-17.patch @@ -0,0 +1,37 @@ +From a784973e500753747992a51dc0fb1caabbbb03be Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 6 Jul 2023 17:52:38 -0700 +Subject: [PATCH 2/2] Fix build with clang 17 + +Part of https://github.com/jarro2783/cxxopts/commit/513afbc6dcfe2952cb2ffab0dae2415b11bba2d0 + +Upstream-Status: Backport [https://github.com/jarro2783/cxxopts/commit/513afbc6dcfe2952cb2ffab0dae2415b11bba2d0] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + thirdparty/cxxopts/include/cxxopts.hpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/thirdparty/cxxopts/include/cxxopts.hpp b/thirdparty/cxxopts/include/cxxopts.hpp +index e87416f1..bd2d81cf 100644 +--- a/thirdparty/cxxopts/include/cxxopts.hpp ++++ b/thirdparty/cxxopts/include/cxxopts.hpp +@@ -468,14 +468,14 @@ namespace cxxopts + { + if (negative) + { +- if (u > static_cast<U>(-std::numeric_limits<T>::min())) ++ if (u > static_cast<U>((std::numeric_limits<T>::min)())) + { + throw argument_incorrect_type(text); + } + } + else + { +- if (u > static_cast<U>(std::numeric_limits<T>::max())) ++ if (u > static_cast<U>((std::numeric_limits<T>::max)())) + { + throw argument_incorrect_type(text); + } +-- +2.41.0 + diff --git a/meta-oe/recipes-extended/minifi-cpp/files/fix-libressl-avoid-BSWAP-assembly-for-ARM-v6.patch b/meta-oe/recipes-extended/minifi-cpp/files/fix-libressl-avoid-BSWAP-assembly-for-ARM-v6.patch index d0febfd534..a7dc35ae57 100644 --- a/meta-oe/recipes-extended/minifi-cpp/files/fix-libressl-avoid-BSWAP-assembly-for-ARM-v6.patch +++ b/meta-oe/recipes-extended/minifi-cpp/files/fix-libressl-avoid-BSWAP-assembly-for-ARM-v6.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -urN -x .git orig/thirdparty/libressl/avoid-BSWAP-assembly-for-ARM-v6.patch patched/thirdparty/libressl/avoid-BSWAP-assembly-for-ARM-v6.patch --- orig/thirdparty/libressl/avoid-BSWAP-assembly-for-ARM-v6.patch 1970-01-01 09:00:00.000000000 +0900 +++ patched/thirdparty/libressl/avoid-BSWAP-assembly-for-ARM-v6.patch 2020-08-07 23:14:46.196764271 +0900 diff --git a/meta-oe/recipes-extended/minifi-cpp/files/fix-libressl-compile.patch b/meta-oe/recipes-extended/minifi-cpp/files/fix-libressl-compile.patch index 84b8c8cb0e..32bcfbd2b9 100644 --- a/meta-oe/recipes-extended/minifi-cpp/files/fix-libressl-compile.patch +++ b/meta-oe/recipes-extended/minifi-cpp/files/fix-libressl-compile.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -urN -x .git orig/cmake/LibreSSL.cmake patched/cmake/LibreSSL.cmake --- orig/cmake/LibreSSL.cmake 2020-08-07 21:58:34.660773928 +0900 +++ patched/cmake/LibreSSL.cmake 2020-08-07 22:51:18.620767245 +0900 diff --git a/meta-oe/recipes-extended/minifi-cpp/files/fix-minifi-compile.patch b/meta-oe/recipes-extended/minifi-cpp/files/fix-minifi-compile.patch index 9653ba3426..d5b4449b82 100644 --- a/meta-oe/recipes-extended/minifi-cpp/files/fix-minifi-compile.patch +++ b/meta-oe/recipes-extended/minifi-cpp/files/fix-minifi-compile.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -urN -x .git orig/CMakeLists.txt patched/CMakeLists.txt --- orig/CMakeLists.txt 2020-08-07 21:58:34.656773928 +0900 +++ patched/CMakeLists.txt 2020-08-10 15:08:31.800278357 +0900 diff --git a/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-compile.patch b/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-compile.patch index 42e1e583c3..903e72e07b 100644 --- a/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-compile.patch +++ b/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-compile.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -urN -x .git orig/cmake/BundledOSSPUUID.cmake patched/cmake/BundledOSSPUUID.cmake --- orig/cmake/BundledOSSPUUID.cmake 2020-08-07 21:58:34.660773928 +0900 +++ patched/cmake/BundledOSSPUUID.cmake 2020-08-07 22:05:57.404772993 +0900 diff --git a/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-cross-compile.patch b/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-cross-compile.patch index dc354d9ac7..add1f6f2d5 100644 --- a/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-cross-compile.patch +++ b/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-cross-compile.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -urN -x .git orig/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch patched/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch --- orig/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch 1970-01-01 09:00:00.000000000 +0900 +++ patched/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch 2020-08-07 22:28:04.396770190 +0900 diff --git a/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-musl-compile.patch b/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-musl-compile.patch index 7caf848eb5..f8ba89dc3c 100644 --- a/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-musl-compile.patch +++ b/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-musl-compile.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -urN -x .git orig/thirdparty/ossp-uuid/ossp-uuid-musl-compile-fix.patch patched/thirdparty/ossp-uuid/ossp-uuid-musl-compile-fix.patch --- orig/thirdparty/ossp-uuid/ossp-uuid-musl-compile-fix.patch 1970-01-01 09:00:00.000000000 +0900 +++ patched/thirdparty/ossp-uuid/ossp-uuid-musl-compile-fix.patch 2020-08-07 11:22:49.344854508 +0900 diff --git a/meta-oe/recipes-extended/minifi-cpp/files/fix-rocksdb-cross-compile.patch b/meta-oe/recipes-extended/minifi-cpp/files/fix-rocksdb-cross-compile.patch index 8c5db7c9e3..0a3194da94 100644 --- a/meta-oe/recipes-extended/minifi-cpp/files/fix-rocksdb-cross-compile.patch +++ b/meta-oe/recipes-extended/minifi-cpp/files/fix-rocksdb-cross-compile.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -urN orig/thirdparty/rocksdb/CMakeLists.txt patched/thirdparty/rocksdb/CMakeLists.txt --- orig/thirdparty/rocksdb/CMakeLists.txt 2020-07-28 11:39:40.254677515 +0900 +++ patched/thirdparty/rocksdb/CMakeLists.txt 2020-07-28 11:51:11.898676054 +0900 diff --git a/meta-oe/recipes-extended/minifi-cpp/files/remove_const_due_to_std_lock_guard.patch b/meta-oe/recipes-extended/minifi-cpp/files/remove_const_due_to_std_lock_guard.patch index 2d66576f6e..365dec9d44 100644 --- a/meta-oe/recipes-extended/minifi-cpp/files/remove_const_due_to_std_lock_guard.patch +++ b/meta-oe/recipes-extended/minifi-cpp/files/remove_const_due_to_std_lock_guard.patch @@ -20,6 +20,8 @@ Compiling this on FreeBSD with CLang fails due to: 1 error generated. ``` --- +Upstream-Status: Pending + thirdparty/rocksdb/util/channel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb index 1bf99d4907..0986fdec07 100644 --- a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb +++ b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb @@ -32,6 +32,9 @@ SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git;branch=master;protocol=ht file://0001-Fix-build-with-libc.patch \ file://0001-civetweb-Disable-lto.patch \ file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ + file://0001-Do-not-use-LFS64-functions-on-linux-musl.patch \ + file://0001-Fix-the-constness-issues-around-autovector-iterator_.patch \ + file://0002-Fix-build-with-clang-17.patch \ file://minifi.service \ file://systemd-volatile.conf \ file://sysvinit-volatile.conf \ @@ -60,6 +63,8 @@ EXTRA_OECMAKE += " \ -DGCC_AR=${STAGING_BINDIR_TOOLCHAIN}/${AR} \ -DGCC_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${RANLIB} \ -DDISABLE_PYTHON_SCRIPTING=ON \ + -DFLEX_TARGET_ARG_COMPILE_FLAGS='--noline' \ + -DBISON_TARGET_ARG_COMPILE_FLAGS='--no-lines --file-prefix-map=${S}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}' \ " EXTRA_OECMAKE:append:toolchain-clang = " -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ranlib" LDFLAGS:append:toolchain-clang = " -fuse-ld=lld" @@ -87,6 +92,10 @@ do_configure:prepend:libc-musl() { sed -i -e 's/-DHAVE_POSIX_STRERROR_R=0/-DHAVE_POSIX_STRERROR_R=1/' ${S}/CMakeLists.txt } +do_configure:append() { + sed -i -e 's|${WORKDIR}|<WORKDIR>|g' ${S}/libminifi/include/agent/agent_version.h +} + CFLAGS:append:libc-glibc = " -D_GNU_SOURCE" CXXFLAGS:append:libc-glibc = " -D_GNU_SOURCE" diff --git a/meta-oe/recipes-extended/minio/minio_git.bb b/meta-oe/recipes-extended/minio/minio_git.bb index 94986089c7..bfd313ddfe 100644 --- a/meta-oe/recipes-extended/minio/minio_git.bb +++ b/meta-oe/recipes-extended/minio/minio_git.bb @@ -26,6 +26,9 @@ inherit goarch # | ./github.com/minio/mc/main.go:27:(.text+0xd258b8): relocation R_MIPS_HI16 against `a local symbol' cannot be used when making a shared object; recompile with -fPIC COMPATIBLE_HOST:mips = "null" +# ERROR: QA Issue: minio: ELF binary /usr/sbin/mc has relocations in .text [textrel] +# Needs fixing with go >= 1.20.4" +EXCLUDE_FROM_WORLD = "1" DEPENDS += "rsync-native" diff --git a/meta-oe/recipes-extended/mozjs/mozjs-102/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch b/meta-oe/recipes-extended/mozjs/mozjs-102/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch index e63b053565..202f126126 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs-102/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch +++ b/meta-oe/recipes-extended/mozjs/mozjs-102/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch @@ -5,7 +5,7 @@ Subject: [PATCH] rust.configure: do not try to find a suitable upstream target OE is using custom targets and so this is bound to fail. -Upstream-Status: Inapppropriate [oe-core specific] +Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- diff --git a/meta-oe/recipes-extended/mozjs/mozjs-102/fix-musl-build.patch b/meta-oe/recipes-extended/mozjs/mozjs-102/fix-musl-build.patch index f847979ea2..6905282eb7 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs-102/fix-musl-build.patch +++ b/meta-oe/recipes-extended/mozjs/mozjs-102/fix-musl-build.patch @@ -8,6 +8,8 @@ Reason: mozjs60 miscompiles on musl if built with HAVE_THREAD_TLS_KEYWORD: https://github.com/void-linux/void-packages/issues/2598 --- +Upstream-Status: Pending + js/src/old-configure.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-oe/recipes-extended/mozjs/mozjs-102/py-3.11.patch b/meta-oe/recipes-extended/mozjs/mozjs-102/py-3.11.patch deleted file mode 100644 index 85af547093..0000000000 --- a/meta-oe/recipes-extended/mozjs/mozjs-102/py-3.11.patch +++ /dev/null @@ -1,139 +0,0 @@ -From 1479dd9c75917d2be70ee840c9db141e59987e44 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Wed, 14 Sep 2022 14:03:10 +0200 -Subject: [PATCH] mozjs-91: backport a python 3.11 compatibility patch - -# HG changeset patch -# User ahochheiden <ahochheiden@mozilla.com> -# Date 1654151264 0 -# Node ID f54162b2c1f2fe52c6137ab2c3469a1944f58b27 -# Parent 6e7776492240c27732840d65a33dcc440fa1aba0 -Bug 1769631 - Remove 'U' from 'mode' parameters for various 'open' calls to ensure Python3.11 compatibility r=firefox-build-system-reviewers,glandium - -The 'U' flag represents "universal newline". It has been deprecated -since Python3.3. Since then "universal newline" is the default when a -file is opened in text mode (not bytes). In Python3.11 using the 'U' -flag throws errors. There should be no harm in removing 'U' from 'open' -everywhere it is used, and doing allows the use of Python3.11. - -For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api - -Differential Revision: https://phabricator.services.mozilla.com/D147721 - -Upstream-Status: Backport [https://hg.mozilla.org/mozilla-central/rev/f54162b2c1f2fe52c6137ab2c3469a1944f58b27] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> - ---- - dom/base/usecounters.py | 2 +- - python/mozbuild/mozbuild/action/process_define_files.py | 2 +- - python/mozbuild/mozbuild/backend/base.py | 2 +- - python/mozbuild/mozbuild/preprocessor.py | 6 +++--- - python/mozbuild/mozbuild/util.py | 2 +- - python/mozbuild/mozpack/files.py | 4 ++-- - 6 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py -index 780e3b32b2..7e2c7148ec 100644 ---- a/dom/base/usecounters.py -+++ b/dom/base/usecounters.py -@@ -8,7 +8,7 @@ import re - - def read_conf(conf_filename): - # Can't read/write from a single StringIO, so make a new one for reading. -- stream = open(conf_filename, "rU") -+ stream = open(conf_filename, "r") - - def parse_counters(stream): - for line_num, line in enumerate(stream): -diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py -index f1d401ac26..aca59d0f05 100644 ---- a/python/mozbuild/mozbuild/action/process_define_files.py -+++ b/python/mozbuild/mozbuild/action/process_define_files.py -@@ -36,7 +36,7 @@ def process_define_file(output, input): - ) and not config.substs.get("JS_STANDALONE"): - config = PartialConfigEnvironment(mozpath.join(topobjdir, "js", "src")) - -- with open(path, "rU") as input: -+ with open(path, "r") as input: - r = re.compile( - "^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?", re.U - ) -diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py -index 7bc1986d86..b64a709468 100644 ---- a/python/mozbuild/mozbuild/backend/base.py -+++ b/python/mozbuild/mozbuild/backend/base.py -@@ -272,7 +272,7 @@ class BuildBackend(LoggingMixin): - return status - - @contextmanager -- def _write_file(self, path=None, fh=None, readmode="rU"): -+ def _write_file(self, path=None, fh=None, readmode="r"): - """Context manager to write a file. - - This is a glorified wrapper around FileAvoidWrite with integration to -diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py -index f7820b9c91..857f1a6c9b 100644 ---- a/python/mozbuild/mozbuild/preprocessor.py -+++ b/python/mozbuild/mozbuild/preprocessor.py -@@ -531,7 +531,7 @@ class Preprocessor: - - if args: - for f in args: -- with io.open(f, "rU", encoding="utf-8") as input: -+ with io.open(f, "r", encoding="utf-8") as input: - self.processFile(input=input, output=out) - if depfile: - mk = Makefile() -@@ -860,7 +860,7 @@ class Preprocessor: - args = self.applyFilters(args) - if not os.path.isabs(args): - args = os.path.join(self.curdir, args) -- args = io.open(args, "rU", encoding="utf-8") -+ args = io.open(args, "r", encoding="utf-8") - except Preprocessor.Error: - raise - except Exception: -@@ -914,7 +914,7 @@ class Preprocessor: - def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker="#"): - pp = Preprocessor(defines=defines, marker=marker) - for f in includes: -- with io.open(f, "rU", encoding="utf-8") as input: -+ with io.open(f, "r", encoding="utf-8") as input: - pp.processFile(input=input, output=output) - return pp.includes - -diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py -index b09f164698..4f1e0cdc5f 100644 ---- a/python/mozbuild/mozbuild/util.py -+++ b/python/mozbuild/mozbuild/util.py -@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO): - still occur, as well as diff capture if requested. - """ - -- def __init__(self, filename, capture_diff=False, dry_run=False, readmode="rU"): -+ def __init__(self, filename, capture_diff=False, dry_run=False, readmode="r"): - BytesIO.__init__(self) - self.name = filename - assert type(capture_diff) == bool -diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py -index 1d8a1ed2d8..a295a67b5a 100644 ---- a/python/mozbuild/mozpack/files.py -+++ b/python/mozbuild/mozpack/files.py -@@ -554,7 +554,7 @@ class PreprocessedFile(BaseFile): - pp = Preprocessor(defines=self.defines, marker=self.marker) - pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings) - -- with _open(self.path, "rU") as input: -+ with _open(self.path, "r") as input: - with _open(os.devnull, "w") as output: - pp.processFile(input=input, output=output) - -@@ -611,7 +611,7 @@ class PreprocessedFile(BaseFile): - pp = Preprocessor(defines=self.defines, marker=self.marker) - pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings) - -- with _open(self.path, "rU") as input: -+ with _open(self.path, "r") as input: - pp.processFile(input=input, output=dest, depfile=deps_out) - - dest.close() diff --git a/meta-oe/recipes-extended/mozjs/mozjs-102_102.5.0.bb b/meta-oe/recipes-extended/mozjs/mozjs-102_102.9.0.bb index 5e884b6f64..e6ff379e95 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs-102_102.5.0.bb +++ b/meta-oe/recipes-extended/mozjs/mozjs-102_102.9.0.bb @@ -13,11 +13,10 @@ SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/fire file://riscv32.patch \ file://0001-util.configure-fix-one-occasionally-reproduced-confi.patch \ file://0001-rewrite-cargo-host-linker-in-python3.patch \ - file://py-3.11.patch \ file://musl-disable-stackwalk.patch \ file://0001-add-arm-to-list-of-mozinline.patch \ " -SRC_URI[sha256sum] = "017dd44b1285913f477074802707a4c76ed1a28270ec5a327bbb76574cc057d8" +SRC_URI[sha256sum] = "31b074623f09ca821a8a7dee0b3d2df1a45f1164264d31c26b4969a4d6a21dd1" S = "${WORKDIR}/firefox-${PV}" diff --git a/meta-oe/recipes-extended/mraa/mraa/0001-cmake-Use-a-regular-expression-to-match-x86-architec.patch b/meta-oe/recipes-extended/mraa/mraa/0001-cmake-Use-a-regular-expression-to-match-x86-architec.patch index 0cae02f061..dedb4adf9b 100644 --- a/meta-oe/recipes-extended/mraa/mraa/0001-cmake-Use-a-regular-expression-to-match-x86-architec.patch +++ b/meta-oe/recipes-extended/mraa/mraa/0001-cmake-Use-a-regular-expression-to-match-x86-architec.patch @@ -13,6 +13,8 @@ So using a wildcard helps in using any x86 arch Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-oe/recipes-extended/mraa/mraa_git.bb index 2a50550a0e..f1cdf66fc2 100644 --- a/meta-oe/recipes-extended/mraa/mraa_git.bb +++ b/meta-oe/recipes-extended/mraa/mraa_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=91e7de50a8d3cf01057f318d72460acd" SRCREV = "7786c7ded5c9ce7773890d0e3dc27632898fc6b1" PV = "2.2.0+git${SRCPV}" -SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=http;branch=master;protocol=https \ +SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=https;branch=master \ file://0001-cmake-Use-a-regular-expression-to-match-x86-architec.patch \ file://0001-include-Declare-gVERSION-global-as-extern.patch \ " diff --git a/meta-oe/recipes-extended/nana/nana/change-mandir-to-DESTDIR.patch b/meta-oe/recipes-extended/nana/nana/change-mandir-to-DESTDIR.patch index 653a7e44c1..54098f721d 100644 --- a/meta-oe/recipes-extended/nana/nana/change-mandir-to-DESTDIR.patch +++ b/meta-oe/recipes-extended/nana/nana/change-mandir-to-DESTDIR.patch @@ -3,7 +3,7 @@ From: Li xin <lixin.fnst@cn.fujitsu.com> Date: Thu, 4 Dec 2014 03:50:19 +0900 Subject: [PATCH 1/2] change mandir to DESTDIR -Upstream-Status: pending +Upstream-Status: Pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- diff --git a/meta-oe/recipes-extended/nana/nana/modify-acinclude.m4-and-configure.in.patch b/meta-oe/recipes-extended/nana/nana/modify-acinclude.m4-and-configure.in.patch index aeb25466ca..043fd85500 100644 --- a/meta-oe/recipes-extended/nana/nana/modify-acinclude.m4-and-configure.in.patch +++ b/meta-oe/recipes-extended/nana/nana/modify-acinclude.m4-and-configure.in.patch @@ -7,7 +7,7 @@ this patch is from Debian to fix build errors. "acinclude.m4:34: error: automatic de-ANSI-fication support has been removed" -Upstream-Status: pending +Upstream-Status: Pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- diff --git a/meta-oe/recipes-extended/networking/mstpd/bridge-stp b/meta-oe/recipes-extended/networking/mstpd/bridge-stp new file mode 100644 index 0000000000..59c5786b74 --- /dev/null +++ b/meta-oe/recipes-extended/networking/mstpd/bridge-stp @@ -0,0 +1,18 @@ +#!/bin/sh +if [ "$#" -lt 2 ]; then + echo "Missing args: bridge-stp <bridge> <start|stop>" >&2 + exit 1 +fi +case "$2" in + start) + /usr/sbin/mstpctl addbridge "$1" + exit + ;; + stop) + /usr/sbin/mstpctl delbridge "$1" + exit + ;; + *) + echo "Invalid operation: $2" >&2 + exit 1 +esac diff --git a/meta-oe/recipes-extended/networking/mstpd/mstpd.service b/meta-oe/recipes-extended/networking/mstpd/mstpd.service new file mode 100644 index 0000000000..645db893cc --- /dev/null +++ b/meta-oe/recipes-extended/networking/mstpd/mstpd.service @@ -0,0 +1,10 @@ +[Unit] +Description=Multiple Spanning Tree Protocol Daemon +Before=network-pre.target +Wants=network-pre.target +[Service] +Restart=always +Type=simple +ExecStart=/usr/sbin/mstpd -d -v 2 +[Install] +WantedBy=multi-user.target diff --git a/meta-oe/recipes-extended/networking/mstpd_git.bb b/meta-oe/recipes-extended/networking/mstpd_git.bb new file mode 100644 index 0000000000..e2565d6201 --- /dev/null +++ b/meta-oe/recipes-extended/networking/mstpd_git.bb @@ -0,0 +1,32 @@ +PR = "r1" +PV = "0.1+git${SRCPV}" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4325afd396febcb659c36b49533135d4" + +SRC_URI = "git://github.com/mstpd/mstpd;branch=master;protocol=https" +SRCREV = "181c453fc1a00573e19f14960dcc54ad84beea7c" +S = "${WORKDIR}/git" + +SRC_URI:append = " \ + file://bridge-stp \ + file://mstpd.service \ +" + +inherit autotools pkgconfig systemd + +PACKAGES =+ "${PN}-mstpd" +FILES:${PN}-mstpd = "${sbindir}/mstpd ${sbindir}/mstpctl ${sbindir}/bridge-stp" + +SYSTEMD_PACKAGES = "${PN}-mstpd" +SYSTEMD_SERVICE:${PN}-mstpd = "mstpd.service" + +do_install:append() { + rm -rf ${D}${libexecdir} ${D}${libdir}/NetworkManager + rmdir ${D}${libdir} || true + + install -d -m 0755 ${D}/${sbindir} + install -m 0755 ${WORKDIR}/bridge-stp ${D}/${sbindir} + + install -d -m 0755 ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/mstpd.service ${D}${systemd_system_unitdir}/ +} diff --git a/meta-oe/recipes-extended/nicstat/nicstat/0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch b/meta-oe/recipes-extended/nicstat/nicstat/0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch index a208f97eb2..78e3176e89 100644 --- a/meta-oe/recipes-extended/nicstat/nicstat/0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch +++ b/meta-oe/recipes-extended/nicstat/nicstat/0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch @@ -8,6 +8,8 @@ Use the defines from platform Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + nicstat.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb b/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb index 3875f0f605..bf742fa062 100644 --- a/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb +++ b/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://nicstat.sourceforge.net" LICENSE = "Artistic-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b4a94da2a1f918b217ef5156634fc9e0" -SRC_URI = "http://softlayer-sng.dl.sourceforge.net/project/${BPN}/${BP}.tar.gz \ +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \ file://0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch \ " SRC_URI[md5sum] = "9a0b87bbc670c1e738e5b40c7afd184d" diff --git a/meta-oe/recipes-extended/openwsman/openwsman/0001-Link-with-libm-for-floor-function.patch b/meta-oe/recipes-extended/openwsman/openwsman/0001-Link-with-libm-for-floor-function.patch new file mode 100644 index 0000000000..2f47261588 --- /dev/null +++ b/meta-oe/recipes-extended/openwsman/openwsman/0001-Link-with-libm-for-floor-function.patch @@ -0,0 +1,71 @@ +From 09101da4efaa5584b7f3f3f3bfa5dbb4d1e26948 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 24 Jul 2023 22:09:21 -0700 +Subject: [PATCH] Link with libm for floor() function + +LLD linker finds this missing symbol + +arm-yoe-linux-gnueabi-ld.lld: error: undefined reference due to --no-allow-shlib-undefined: floor +>>> referenced by src/lib/libwsman.so.1.0.0 + +Upstream-Status: Submitted [https://github.com/Openwsman/openwsman/pull/195] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + CMakeLists.txt | 10 ++++++++++ + configure.ac | 3 ++- + src/lib/CMakeLists.txt | 4 ++++ + 3 files changed, 16 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6e54c66b..507ee633 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -297,6 +297,16 @@ ELSE(HAVE_LIBDL) + SET(HAVE_LIBDL 0) + ENDIF(HAVE_LIBDL) + ++# m ++ ++FIND_LIBRARY( HAVE_LIBM "m" ) ++IF(HAVE_LIBM) ++ SET(M_LIBRARIES ${HAVE_LIBM}) ++ SET(HAVE_LIBM 1) ++ELSE(HAVE_LIBM) ++ SET(HAVE_LIBM 0) ++ENDIF(HAVE_LIBM) ++ + # crypt + + FIND_LIBRARY( HAVE_LIBCRYPT "crypt" ) +diff --git a/configure.ac b/configure.ac +index 125564da..010fa0b6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -128,7 +128,8 @@ daemon \ + va_copy \ + memmove \ + bcopy \ +-gmtime_r ++gmtime_r \ ++floor + ) + AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket)) + AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname)) +diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt +index 5c51781f..496fd672 100644 +--- a/src/lib/CMakeLists.txt ++++ b/src/lib/CMakeLists.txt +@@ -36,6 +36,10 @@ if( HAVE_LIBDL ) + TARGET_LINK_LIBRARIES(wsman ${DL_LIBRARIES}) + endif( HAVE_LIBDL ) + ++if( HAVE_LIBM ) ++TARGET_LINK_LIBRARIES(wsman ${M_LIBRARIES}) ++endif( HAVE_LIBM ) ++ + IF( ENABLE_EVENTING_SUPPORT ) + TARGET_LINK_LIBRARIES( wsman ${WSMAN_CLIENT_PKG} ) + ENDIF( ENABLE_EVENTING_SUPPORT ) +-- +2.41.0 + diff --git a/meta-oe/recipes-extended/openwsman/openwsman/0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch b/meta-oe/recipes-extended/openwsman/openwsman/0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch index 7823fde7a0..0e2349e303 100644 --- a/meta-oe/recipes-extended/openwsman/openwsman/0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch +++ b/meta-oe/recipes-extended/openwsman/openwsman/0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch @@ -8,6 +8,8 @@ checking for OS Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/lib/u/lock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/openwsman/openwsman/libssl-is-required-if-eventint-supported.patch b/meta-oe/recipes-extended/openwsman/openwsman/libssl-is-required-if-eventint-supported.patch index bd540e37c1..71f3d90a81 100644 --- a/meta-oe/recipes-extended/openwsman/openwsman/libssl-is-required-if-eventint-supported.patch +++ b/meta-oe/recipes-extended/openwsman/openwsman/libssl-is-required-if-eventint-supported.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + libssl is required by wsman_client_transport if ENABLE_EVENTING_SUPPORT enabled. Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> diff --git a/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb b/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb index 39a9c52a47..1c68b5f432 100644 --- a/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb +++ b/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb @@ -21,6 +21,7 @@ SRC_URI = "git://github.com/Openwsman/openwsman.git;branch=main;protocol=https \ file://libssl-is-required-if-eventint-supported.patch \ file://openwsmand.service \ file://0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch \ + file://0001-Link-with-libm-for-floor-function.patch \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-extended/ostree/ostree/0001-lib-repo-checkout-Add-ALLPERMS-for-musl.patch b/meta-oe/recipes-extended/ostree/ostree/0001-lib-repo-checkout-Add-ALLPERMS-for-musl.patch deleted file mode 100644 index 1502f1d4fd..0000000000 --- a/meta-oe/recipes-extended/ostree/ostree/0001-lib-repo-checkout-Add-ALLPERMS-for-musl.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6aef666a2911c15b31efeed08d89fe9997d89e04 Mon Sep 17 00:00:00 2001 -From: Alex Kiernan <alex.kiernan@gmail.com> -Date: Sat, 31 Dec 2022 11:11:14 +0000 -Subject: [PATCH] lib/repo-checkout: Add ALLPERMS for musl - -ALLPERMS is glibc specific, add a definition for musl. - -Upstream-Status: Submitted [https://github.com/ostreedev/ostree/pull/2797] -Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> ---- - src/libostree/ostree-core-private.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/libostree/ostree-core-private.h b/src/libostree/ostree-core-private.h -index 2bd2f9848718..48b2b8ab307f 100644 ---- a/src/libostree/ostree-core-private.h -+++ b/src/libostree/ostree-core-private.h -@@ -34,6 +34,11 @@ G_BEGIN_DECLS - #define DEFAULT_DIRECTORY_MODE 0775 - #define DEFAULT_REGFILE_MODE 0660 - -+/* This exists in glibc's sys/stat.h, but not on musl */ -+#ifndef ALLPERMS -+#define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) -+#endif -+ - /* This file contains private implementation data format definitions - * read by multiple implementation .c files. - */ --- -2.39.0 - diff --git a/meta-oe/recipes-extended/ostree/ostree/0001-tests-Handle-musl-s-ERANGE-mapping.patch b/meta-oe/recipes-extended/ostree/ostree/0001-tests-Handle-musl-s-ERANGE-mapping.patch deleted file mode 100644 index d0a8447e3d..0000000000 --- a/meta-oe/recipes-extended/ostree/ostree/0001-tests-Handle-musl-s-ERANGE-mapping.patch +++ /dev/null @@ -1,29 +0,0 @@ -From bd182584a1e2f820493d9db689598a20c5700ba5 Mon Sep 17 00:00:00 2001 -From: Alex Kiernan <alex.kiernan@gmail.com> -Date: Mon, 2 Jan 2023 10:37:49 +0000 -Subject: [PATCH] tests: Handle musl's ERANGE mapping - -musl uses "Result not representable" for ERANGE, support this in -addition to glibc's "Numerical result out of range". - -Upstream-Status: Backport [https://github.com/ostreedev/ostree/commit/2d4ee168d7eae0afcce356a3f8135294e6d7fe6f] -Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> ---- - tests/test-commit-timestamp.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/test-commit-timestamp.sh b/tests/test-commit-timestamp.sh -index 0688c63a4bdb..de105b768a9c 100755 ---- a/tests/test-commit-timestamp.sh -+++ b/tests/test-commit-timestamp.sh -@@ -40,6 +40,6 @@ fi - ${CMD_PREFIX} ostree --repo=./testrepo show env > show-env.txt - rm -rf testrepo testrepo-files - assert_file_has_content_literal commit-invalid.txt 'Failed to convert SOURCE_DATE_EPOCH' --assert_file_has_content_literal commit-overflowing.txt 'Parsing SOURCE_DATE_EPOCH: Numerical result out of range' -+assert_file_has_content commit-overflowing.txt 'Parsing SOURCE_DATE_EPOCH: \(Numerical result out of range\|Result not representable\)' - assert_file_has_content_literal show-env.txt 'Date: 2009-02-13 23:31:30 +0000' - echo "ok commit with env timestamp" --- -2.39.0 - diff --git a/meta-oe/recipes-extended/ostree/ostree_2022.7.bb b/meta-oe/recipes-extended/ostree/ostree_2023.5.bb index 61e208b3b7..3028c4c92a 100644 --- a/meta-oe/recipes-extended/ostree/ostree_2022.7.bb +++ b/meta-oe/recipes-extended/ostree/ostree_2023.5.bb @@ -9,6 +9,7 @@ LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" DEPENDS = " \ + glib-2.0-native \ glib-2.0 \ e2fsprogs \ libcap \ @@ -17,19 +18,17 @@ DEPENDS = " \ bison-native \ " -SRC_URI = " \ - https://github.com/ostreedev/ostree/releases/download/v${PV}/libostree-${PV}.tar.xz \ - file://0001-lib-repo-checkout-Add-ALLPERMS-for-musl.patch \ - file://0001-tests-Handle-musl-s-ERANGE-mapping.patch \ - file://run-ptest \ -" -SRC_URI[sha256sum] = "8be2a9261c94e8b9ec4113380ffc480f8598245fb321a009bad4fae4b822411f" - -UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+)" +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] = "bc593afb31fe1ac3d50419f917fafe321a0a3561d7bb2ba498a83740fe3adb14" S = "${WORKDIR}/libostree-${PV}" -inherit autotools bash-completion gobject-introspection gtk-doc manpages pkgconfig ptest-gnome systemd +inherit autotools bash-completion gobject-introspection github-releases gtk-doc manpages pkgconfig ptest-gnome systemd + +UNKNOWN_CONFIGURE_OPT_IGNORE = "--disable-introspection --enable-introspection" # Workaround compile failure: # |../git/src/libotutil/zbase32.c:37:1: error: function returns an aggregate [-Werror=aggregate-return] @@ -42,7 +41,7 @@ BUILD_OPTIMIZATION:append = " -O2" # Package configuration - match ostree defaults, but without rofiles-fuse # otherwise we introduce a dependendency on meta-filesystems and swap # soup for curl to avoid bringing in deprecated libsoup2 (though -# to run ptest requires that you have soup). +# to run ptest requires that you have soup2 or soup3). PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd libmount', '', d)} \ @@ -85,7 +84,8 @@ PACKAGECONFIG[openssl] = "--with-crypto=openssl, , openssl, , , glib gnutls" PACKAGECONFIG[rofiles-fuse] = "--enable-rofiles-fuse, --disable-rofiles-fuse, fuse3" PACKAGECONFIG[selinux] = "--with-selinux, --without-selinux, libselinux, bubblewrap" PACKAGECONFIG[smack] = "--with-smack, --without-smack, smack" -PACKAGECONFIG[soup] = "--with-soup, --without-soup --disable-glibtest, libsoup-2.4" +PACKAGECONFIG[soup2] = "--with-soup, --without-soup, libsoup-2.4, , , soup3" +PACKAGECONFIG[soup3] = "--with-soup3, --without-soup3, libsoup, , , soup2" PACKAGECONFIG[static] = "" PACKAGECONFIG[systemd] = "--with-libsystemd --with-systemdsystemunitdir=${systemd_system_unitdir}, --without-libsystemd, systemd" PACKAGECONFIG[trivial-httpd-cmdline] = "--enable-trivial-httpd-cmdline, --disable-trivial-httpd-cmdline" @@ -183,15 +183,14 @@ RDEPENDS:${PN}:class-target = " \ # ostree-trivial-httpd (requires soup - note soup and curl can coexist) # overlayfs in your kernel # busybox built statically -# C.UTF-8 locale available +# C.UTF-8 locale available (default) # Sufficient disk space/RAM (e.g. core-image-sato-sdk) # # Something like this in your local.conf: # -# PACKAGECONFIG:append:pn-ostree = " static soup" +# PACKAGECONFIG:append:pn-ostree = " static soup3" # KERNEL_EXTRA_FEATURES:append = " features/overlayfs/overlayfs.scc" # TARGET_CFLAGS:append:pn-busybox = " -static" -# IMAGE_LINGUAS:append:libc-glibc = " c" # RDEPENDS:${PN}-ptest += " \ attr \ diff --git a/meta-oe/recipes-extended/p7zip/files/CVE-2016-9296.patch b/meta-oe/recipes-extended/p7zip/files/CVE-2016-9296.patch new file mode 100644 index 0000000000..98e186cbf0 --- /dev/null +++ b/meta-oe/recipes-extended/p7zip/files/CVE-2016-9296.patch @@ -0,0 +1,27 @@ +p7zip: Update CVE-2016-9296 patch URL. +From: Robert Luberda <robert@debian.org> +Date: Sat, 19 Nov 2016 08:48:08 +0100 +Subject: Fix nullptr dereference (CVE-2016-9296) + +Patch taken from https://sourceforge.net/p/p7zip/bugs/185/ +This patch file taken from Debian's patch set for p7zip + +Upstream-Status: Backport [https://sourceforge.net/p/p7zip/bugs/185/] +CVE: CVE-2016-9296 + +Signed-off-by: Virendra Thakur <virendra.thakur@kpit.com> + +Index: p7zip_16.02/CPP/7zip/Archive/7z/7zIn.cpp +=================================================================== +--- p7zip_16.02.orig/CPP/7zip/Archive/7z/7zIn.cpp ++++ p7zip_16.02/CPP/7zip/Archive/7z/7zIn.cpp +@@ -1097,7 +1097,8 @@ HRESULT CInArchive::ReadAndDecodePackedS + if (CrcCalc(data, unpackSize) != folders.FolderCRCs.Vals[i]) + ThrowIncorrect(); + } +- HeadersSize += folders.PackPositions[folders.NumPackStreams]; ++ if (folders.PackPositions) ++ HeadersSize += folders.PackPositions[folders.NumPackStreams]; + return S_OK; + } + diff --git a/meta-oe/recipes-extended/p7zip/files/CVE-2018-5996.patch b/meta-oe/recipes-extended/p7zip/files/CVE-2018-5996.patch new file mode 100644 index 0000000000..47868c982e --- /dev/null +++ b/meta-oe/recipes-extended/p7zip/files/CVE-2018-5996.patch @@ -0,0 +1,227 @@ +From: Robert Luberda <robert@debian.org> +Date: Sun, 28 Jan 2018 23:47:40 +0100 +Subject: CVE-2018-5996 + +Hopefully fix Memory Corruptions via RAR PPMd (CVE-2018-5996) by +applying a few changes from 7Zip 18.00-beta. + +Bug-Debian: https://bugs.debian.org/#888314 + +Upstream-Status: Backport [https://sources.debian.org/data/non-free/p/p7zip-rar/16.02-3/debian/patches/06-CVE-2018-5996.patch] +CVE: CVE-2018-5996 + +Signed-off-by: Virendra Thakur <virendra.thakur@kpit.com> +--- + CPP/7zip/Compress/Rar1Decoder.cpp | 13 +++++++++---- + CPP/7zip/Compress/Rar1Decoder.h | 1 + + CPP/7zip/Compress/Rar2Decoder.cpp | 10 +++++++++- + CPP/7zip/Compress/Rar2Decoder.h | 1 + + CPP/7zip/Compress/Rar3Decoder.cpp | 23 ++++++++++++++++++++--- + CPP/7zip/Compress/Rar3Decoder.h | 2 ++ + 6 files changed, 42 insertions(+), 8 deletions(-) + +diff --git a/CPP/7zip/Compress/Rar1Decoder.cpp b/CPP/7zip/Compress/Rar1Decoder.cpp +index 1aaedcc..68030c7 100644 +--- a/CPP/7zip/Compress/Rar1Decoder.cpp ++++ b/CPP/7zip/Compress/Rar1Decoder.cpp +@@ -29,7 +29,7 @@ public: + }; + */ + +-CDecoder::CDecoder(): m_IsSolid(false) { } ++CDecoder::CDecoder(): m_IsSolid(false), _errorMode(false) { } + + void CDecoder::InitStructures() + { +@@ -406,9 +406,14 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream * + InitData(); + if (!m_IsSolid) + { ++ _errorMode = false; + InitStructures(); + InitHuff(); + } ++ ++ if (_errorMode) ++ return S_FALSE; ++ + if (m_UnpackSize > 0) + { + GetFlagsBuf(); +@@ -477,9 +482,9 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream + const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress) + { + try { return CodeReal(inStream, outStream, inSize, outSize, progress); } +- catch(const CInBufferException &e) { return e.ErrorCode; } +- catch(const CLzOutWindowException &e) { return e.ErrorCode; } +- catch(...) { return S_FALSE; } ++ catch(const CInBufferException &e) { _errorMode = true; return e.ErrorCode; } ++ catch(const CLzOutWindowException &e) { _errorMode = true; return e.ErrorCode; } ++ catch(...) { _errorMode = true; return S_FALSE; } + } + + STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size) +diff --git a/CPP/7zip/Compress/Rar1Decoder.h b/CPP/7zip/Compress/Rar1Decoder.h +index 630f089..01b606b 100644 +--- a/CPP/7zip/Compress/Rar1Decoder.h ++++ b/CPP/7zip/Compress/Rar1Decoder.h +@@ -39,6 +39,7 @@ public: + + Int64 m_UnpackSize; + bool m_IsSolid; ++ bool _errorMode; + + UInt32 ReadBits(int numBits); + HRESULT CopyBlock(UInt32 distance, UInt32 len); +diff --git a/CPP/7zip/Compress/Rar2Decoder.cpp b/CPP/7zip/Compress/Rar2Decoder.cpp +index b3f2b4b..0580c8d 100644 +--- a/CPP/7zip/Compress/Rar2Decoder.cpp ++++ b/CPP/7zip/Compress/Rar2Decoder.cpp +@@ -80,7 +80,8 @@ static const UInt32 kHistorySize = 1 << 20; + static const UInt32 kWindowReservSize = (1 << 22) + 256; + + CDecoder::CDecoder(): +- m_IsSolid(false) ++ m_IsSolid(false), ++ m_TablesOK(false) + { + } + +@@ -100,6 +101,8 @@ UInt32 CDecoder::ReadBits(unsigned numBits) { return m_InBitStream.ReadBits(numB + + bool CDecoder::ReadTables(void) + { ++ m_TablesOK = false; ++ + Byte levelLevels[kLevelTableSize]; + Byte newLevels[kMaxTableSize]; + m_AudioMode = (ReadBits(1) == 1); +@@ -170,6 +173,8 @@ bool CDecoder::ReadTables(void) + } + + memcpy(m_LastLevels, newLevels, kMaxTableSize); ++ m_TablesOK = true; ++ + return true; + } + +@@ -344,6 +349,9 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream * + return S_FALSE; + } + ++ if (!m_TablesOK) ++ return S_FALSE; ++ + UInt64 startPos = m_OutWindowStream.GetProcessedSize(); + while (pos < unPackSize) + { +diff --git a/CPP/7zip/Compress/Rar2Decoder.h b/CPP/7zip/Compress/Rar2Decoder.h +index 3a0535c..0e9005f 100644 +--- a/CPP/7zip/Compress/Rar2Decoder.h ++++ b/CPP/7zip/Compress/Rar2Decoder.h +@@ -139,6 +139,7 @@ class CDecoder : + + UInt64 m_PackSize; + bool m_IsSolid; ++ bool m_TablesOK; + + void InitStructures(); + UInt32 ReadBits(unsigned numBits); +diff --git a/CPP/7zip/Compress/Rar3Decoder.cpp b/CPP/7zip/Compress/Rar3Decoder.cpp +index 3bf2513..6cb8a6a 100644 +--- a/CPP/7zip/Compress/Rar3Decoder.cpp ++++ b/CPP/7zip/Compress/Rar3Decoder.cpp +@@ -92,7 +92,8 @@ CDecoder::CDecoder(): + _writtenFileSize(0), + _vmData(0), + _vmCode(0), +- m_IsSolid(false) ++ m_IsSolid(false), ++ _errorMode(false) + { + Ppmd7_Construct(&_ppmd); + } +@@ -545,6 +546,9 @@ HRESULT CDecoder::ReadTables(bool &keepDecompressing) + return InitPPM(); + } + ++ TablesRead = false; ++ TablesOK = false; ++ + _lzMode = true; + PrevAlignBits = 0; + PrevAlignCount = 0; +@@ -606,6 +610,9 @@ HRESULT CDecoder::ReadTables(bool &keepDecompressing) + } + } + } ++ if (InputEofError()) ++ return S_FALSE; ++ + TablesRead = true; + + // original code has check here: +@@ -623,6 +630,9 @@ HRESULT CDecoder::ReadTables(bool &keepDecompressing) + RIF(m_LenDecoder.Build(&newLevels[kMainTableSize + kDistTableSize + kAlignTableSize])); + + memcpy(m_LastLevels, newLevels, kTablesSizesSum); ++ ++ TablesOK = true; ++ + return S_OK; + } + +@@ -824,7 +834,12 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress) + PpmEscChar = 2; + PpmError = true; + InitFilters(); ++ _errorMode = false; + } ++ ++ if (_errorMode) ++ return S_FALSE; ++ + if (!m_IsSolid || !TablesRead) + { + bool keepDecompressing; +@@ -838,6 +853,8 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress) + bool keepDecompressing; + if (_lzMode) + { ++ if (!TablesOK) ++ return S_FALSE; + RINOK(DecodeLZ(keepDecompressing)) + } + else +@@ -901,8 +918,8 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream + _unpackSize = outSize ? *outSize : (UInt64)(Int64)-1; + return CodeReal(progress); + } +- catch(const CInBufferException &e) { return e.ErrorCode; } +- catch(...) { return S_FALSE; } ++ catch(const CInBufferException &e) { _errorMode = true; return e.ErrorCode; } ++ catch(...) { _errorMode = true; return S_FALSE; } + // CNewException is possible here. But probably CNewException is caused + // by error in data stream. + } +diff --git a/CPP/7zip/Compress/Rar3Decoder.h b/CPP/7zip/Compress/Rar3Decoder.h +index c130cec..2f72d7d 100644 +--- a/CPP/7zip/Compress/Rar3Decoder.h ++++ b/CPP/7zip/Compress/Rar3Decoder.h +@@ -192,6 +192,7 @@ class CDecoder: + UInt32 _lastFilter; + + bool m_IsSolid; ++ bool _errorMode; + + bool _lzMode; + bool _unsupportedFilter; +@@ -200,6 +201,7 @@ class CDecoder: + UInt32 PrevAlignCount; + + bool TablesRead; ++ bool TablesOK; + + CPpmd7 _ppmd; + int PpmEscChar; + diff --git a/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb b/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb index 04923116cf..e795482eb6 100644 --- a/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb +++ b/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb @@ -10,6 +10,8 @@ SRC_URI = "http://downloads.sourceforge.net/p7zip/p7zip/${PV}/p7zip_${PV}_src_al file://CVE-2017-17969.patch \ file://0001-Fix-narrowing-errors-Wc-11-narrowing.patch \ file://change_numMethods_from_bool_to_unsigned.patch \ + file://CVE-2018-5996.patch \ + file://CVE-2016-9296.patch \ " SRC_URI[md5sum] = "a0128d661cfe7cc8c121e73519c54fbf" diff --git a/meta-oe/recipes-extended/plocate/plocate.inc b/meta-oe/recipes-extended/plocate/plocate.inc new file mode 100644 index 0000000000..166fc2d561 --- /dev/null +++ b/meta-oe/recipes-extended/plocate/plocate.inc @@ -0,0 +1,9 @@ +SUMMARY = "plocate, a much faster locate" +HOMEPAGE = "https://plocate.sesse.net/" +DESCRIPTION = "plocate is a locate(1) based on posting lists, completely replacing mlocate with a much faster (and smaller) index. It is suitable as a default locate on your system." +SECTION = "base" +LICENSE = "GPL-2.0-only" + +inherit meson pkgconfig + +DEPENDS = "zstd liburing" diff --git a/meta-oe/recipes-extended/plocate/plocate_1.1.17.bb b/meta-oe/recipes-extended/plocate/plocate_1.1.17.bb new file mode 100644 index 0000000000..ef36754bac --- /dev/null +++ b/meta-oe/recipes-extended/plocate/plocate_1.1.17.bb @@ -0,0 +1,9 @@ +require plocate.inc +# GPL-2.0-only +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "git://git.sesse.net/plocate;protocol=https;branch=master" + +SRCREV = "7e5defd4e7e075cb9226e7d2d9a80f943c482d11" +S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-extended/pmdk/pmdk/0001-pmempool-Match-function-prototypes-of-enum_to_str_fn.patch b/meta-oe/recipes-extended/pmdk/pmdk/0001-pmempool-Match-function-prototypes-of-enum_to_str_fn.patch new file mode 100644 index 0000000000..b16b633a3b --- /dev/null +++ b/meta-oe/recipes-extended/pmdk/pmdk/0001-pmempool-Match-function-prototypes-of-enum_to_str_fn.patch @@ -0,0 +1,43 @@ +From de6425acaa50426883e85a599001ae5e927aec5b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 2 Mar 2023 16:23:56 -0800 +Subject: [PATCH] pmempool: Match function prototypes of enum_to_str_fn + function pointer + +This is flagged by clang 16+ +common.c:844:4: error: cast from 'const char *(*)(enum chunk_type)' to 'enum_to_str_fn' (aka 'const char *(*)(int)') converts to incompatible function type [-Werror,-Wcast-function-type-strict] + (enum_to_str_fn)out_get_chunk_type_str); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +1 error generated. + +Upstream-Status: Submitted [https://github.com/pmem/pmdk/pull/5543] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/tools/pmempool/common.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/tools/pmempool/common.c b/src/tools/pmempool/common.c +index 5e7e472cc..4b7e9b95f 100644 +--- a/src/tools/pmempool/common.c ++++ b/src/tools/pmempool/common.c +@@ -41,7 +41,7 @@ + + #define REQ_BUFF_SIZE 2048U + #define Q_BUFF_SIZE 8192 +-typedef const char *(*enum_to_str_fn)(int); ++typedef const char *(*enum_to_str_fn)(enum chunk_type); + + /* + * pmem_pool_type -- return pool type based on first two pages. +@@ -790,7 +790,7 @@ util_parse_enum(const char *str, int first, int max, uint64_t *bitmap, + enum_to_str_fn enum_to_str) + { + for (int i = first; i < max; i++) { +- if (strcmp(str, enum_to_str(i)) == 0) { ++ if (strcmp(str, enum_to_str((enum chunk_type)i)) == 0) { + *bitmap |= (uint64_t)1<<i; + return 0; + } +-- +2.39.2 + diff --git a/meta-oe/recipes-extended/pmdk/pmdk/0001-use-daxctl-libdaxctl.h-instead-of-ndctl-libdaxctl.h.patch b/meta-oe/recipes-extended/pmdk/pmdk/0001-use-daxctl-libdaxctl.h-instead-of-ndctl-libdaxctl.h.patch deleted file mode 100644 index 0b03ffdea5..0000000000 --- a/meta-oe/recipes-extended/pmdk/pmdk/0001-use-daxctl-libdaxctl.h-instead-of-ndctl-libdaxctl.h.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 932252c0ba54a51c8bcf58b747656e29cdebfa6a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 26 Mar 2022 13:06:50 -0700 -Subject: [PATCH] use daxctl/libdaxctl.h instead of ndctl/libdaxctl.h - -Upstream-Status: Submitted [https://github.com/pmem/pmdk/pull/5413] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/libpmem2/badblocks_ndctl.c | 2 +- - src/libpmem2/region_namespace_ndctl.c | 2 +- - src/libpmem2/usc_ndctl.c | 2 +- - src/tools/daxio/daxio.c | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/libpmem2/badblocks_ndctl.c b/src/libpmem2/badblocks_ndctl.c -index 9a5910bba..cc637f7f4 100644 ---- a/src/libpmem2/badblocks_ndctl.c -+++ b/src/libpmem2/badblocks_ndctl.c -@@ -16,7 +16,7 @@ - #include <sys/sysmacros.h> - #include <fcntl.h> - #include <ndctl/libndctl.h> --#include <ndctl/libdaxctl.h> -+#include <daxctl/libdaxctl.h> - - #include "libpmem2.h" - #include "pmem2_utils.h" -diff --git a/src/libpmem2/region_namespace_ndctl.c b/src/libpmem2/region_namespace_ndctl.c -index 1383796a9..e31185984 100644 ---- a/src/libpmem2/region_namespace_ndctl.c -+++ b/src/libpmem2/region_namespace_ndctl.c -@@ -6,7 +6,7 @@ - */ - - #include <ndctl/libndctl.h> --#include <ndctl/libdaxctl.h> -+#include <daxctl/libdaxctl.h> - #include <sys/sysmacros.h> - #include <fcntl.h> - -diff --git a/src/libpmem2/usc_ndctl.c b/src/libpmem2/usc_ndctl.c -index be63e879b..c58032a83 100644 ---- a/src/libpmem2/usc_ndctl.c -+++ b/src/libpmem2/usc_ndctl.c -@@ -5,7 +5,7 @@ - * usc_ndctl.c -- pmem2 usc function for platforms using ndctl - */ - #include <ndctl/libndctl.h> --#include <ndctl/libdaxctl.h> -+#include <daxctl/libdaxctl.h> - #include <sys/types.h> - #include <sys/sysmacros.h> - #include <fcntl.h> -diff --git a/src/tools/daxio/daxio.c b/src/tools/daxio/daxio.c -index 66cd0b7ae..7f2c89d48 100644 ---- a/src/tools/daxio/daxio.c -+++ b/src/tools/daxio/daxio.c -@@ -21,7 +21,7 @@ - #include <string.h> - - #include <ndctl/libndctl.h> --#include <ndctl/libdaxctl.h> -+#include <daxctl/libdaxctl.h> - #include <libpmem.h> - - #include "util.h" --- -2.35.1 - diff --git a/meta-oe/recipes-extended/pmdk/pmdk_1.11.1.bb b/meta-oe/recipes-extended/pmdk/pmdk_1.12.1.bb index 33d04099c9..5261922cdd 100644 --- a/meta-oe/recipes-extended/pmdk/pmdk_1.11.1.bb +++ b/meta-oe/recipes-extended/pmdk/pmdk_1.12.1.bb @@ -4,16 +4,16 @@ HOMEPAGE = "http://pmem.io" SECTION = "libs" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=b44ee63f162f9cdb18fff1224877aafd" -DEPENDS = "ndctl" +DEPENDS = "ndctl cmake-native" # Required to have the fts.h header for musl DEPENDS:append:libc-musl = " fts" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/pmem/pmdk.git;branch=stable-1.11;protocol=https \ - file://0001-use-daxctl-libdaxctl.h-instead-of-ndctl-libdaxctl.h.patch" -SRCREV = "5b21904a257eff47f2e87fcbf2de46111f03ddd8" +SRC_URI = "git://github.com/pmem/pmdk.git;branch=stable-1.12;protocol=https \ + file://0001-pmempool-Match-function-prototypes-of-enum_to_str_fn.patch" +SRCREV = "786098a024c6fe60e746f2cb1041bcfcd21386c9" inherit autotools-brokensep pkgconfig diff --git a/meta-oe/recipes-extended/polkit/polkit_122.bb b/meta-oe/recipes-extended/polkit/polkit_122.bb index b441da744e..2906406261 100644 --- a/meta-oe/recipes-extended/polkit/polkit_122.bb +++ b/meta-oe/recipes-extended/polkit/polkit_122.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.freedesktop.org/wiki/Software/polkit" LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb" -SRC_URI = "git://github.com/freedesktop/polkit.git;protocol=https;branch=master" +SRC_URI = "git://gitlab.freedesktop.org/polkit/polkit.git;protocol=https;branch=master" S = "${WORKDIR}/git" SRCREV = "da87c5698019897dd731bb2cbb54ebd9c9481f52" diff --git a/meta-oe/recipes-extended/rarpd/rarpd/0001-rarpd.8-add-man-file.patch b/meta-oe/recipes-extended/rarpd/rarpd/0001-rarpd.8-add-man-file.patch index 77c75b4a27..05483aa3eb 100644 --- a/meta-oe/recipes-extended/rarpd/rarpd/0001-rarpd.8-add-man-file.patch +++ b/meta-oe/recipes-extended/rarpd/rarpd/0001-rarpd.8-add-man-file.patch @@ -5,6 +5,8 @@ Subject: [PATCH 1/5] rarpd.8 : add man file Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + rarpd.8 | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 rarpd.8 diff --git a/meta-oe/recipes-extended/rarpd/rarpd/0002-Makefile-modify-compile-parameters.patch b/meta-oe/recipes-extended/rarpd/rarpd/0002-Makefile-modify-compile-parameters.patch index 0b3ebc468f..54b8e8181d 100644 --- a/meta-oe/recipes-extended/rarpd/rarpd/0002-Makefile-modify-compile-parameters.patch +++ b/meta-oe/recipes-extended/rarpd/rarpd/0002-Makefile-modify-compile-parameters.patch @@ -5,6 +5,8 @@ Subject: [PATCH 2/5] Makefile : modify compile parameters Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/rarpd/rarpd/0003-rarpd.c-bug-fix.patch b/meta-oe/recipes-extended/rarpd/rarpd/0003-rarpd.c-bug-fix.patch index 7ce1279090..82655644f0 100644 --- a/meta-oe/recipes-extended/rarpd/rarpd/0003-rarpd.c-bug-fix.patch +++ b/meta-oe/recipes-extended/rarpd/rarpd/0003-rarpd.c-bug-fix.patch @@ -5,6 +5,8 @@ Subject: [PATCH 3/5] rarpd.c : bug fix Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + rarpd.c | 98 +++++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 56 insertions(+), 42 deletions(-) diff --git a/meta-oe/recipes-extended/rarpd/rarpd/0004-rarpd.init-add-new-init-file.patch b/meta-oe/recipes-extended/rarpd/rarpd/0004-rarpd.init-add-new-init-file.patch index 3ba11ffe55..7a50ca3ce9 100644 --- a/meta-oe/recipes-extended/rarpd/rarpd/0004-rarpd.init-add-new-init-file.patch +++ b/meta-oe/recipes-extended/rarpd/rarpd/0004-rarpd.init-add-new-init-file.patch @@ -5,6 +5,8 @@ Subject: [PATCH 4/5] rarpd.init : add new init file Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + rarpd.init | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 rarpd.init diff --git a/meta-oe/recipes-extended/rarpd/rarpd/0005-ethernet.c-remove-it.patch b/meta-oe/recipes-extended/rarpd/rarpd/0005-ethernet.c-remove-it.patch index c77c806127..c651d656af 100644 --- a/meta-oe/recipes-extended/rarpd/rarpd/0005-ethernet.c-remove-it.patch +++ b/meta-oe/recipes-extended/rarpd/rarpd/0005-ethernet.c-remove-it.patch @@ -5,6 +5,8 @@ Subject: [PATCH 5/5] ethernet.c : remove it Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + ethernet.c | 224 ------------------------------------------------------------- 1 file changed, 224 deletions(-) delete mode 100644 ethernet.c diff --git a/meta-oe/recipes-extended/redis-plus-plus/files/0001-CMakeLists.txt-fix-substitution-for-static-libs.patch b/meta-oe/recipes-extended/redis-plus-plus/files/0001-CMakeLists.txt-fix-substitution-for-static-libs.patch new file mode 100644 index 0000000000..b652e6bb78 --- /dev/null +++ b/meta-oe/recipes-extended/redis-plus-plus/files/0001-CMakeLists.txt-fix-substitution-for-static-libs.patch @@ -0,0 +1,45 @@ +From 608d0f1caf43628c8260a994c277a040f1e616e0 Mon Sep 17 00:00:00 2001 +From: Peter Bergin <peter.bergin@windriver.com> +Date: Tue, 23 May 2023 13:19:55 +0200 +Subject: [PATCH] CMakeLists.txt: fix substitution for static libs + +During configuration the liibrary names are substitued for +the static build. When building with tls support the first +substitution will match both cases and trash the name for hiredis_ssl. + +Input string: 'hiredis::hiredis;hiredis::hiredis_ssl;' +Output string: 'hiredis::hiredis_static;hiredis::hiredis_static_ssl;' +Wanted string: 'hiredis::hiredis_static;hiredis::hiredis_ssl_static;' + +Fix string replacement by also including the ';' token to better match. + +Upstream-Status: Submitted [https://github.com/sewenew/redis-plus-plus/issues/486] + +Signed-off-by: Peter Bergin <peter.bergin@windriver.com> +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 23a1840..5478271 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -184,13 +184,13 @@ if(REDIS_PLUS_PLUS_BUILD_STATIC) + set(REDIS_PLUS_PLUS_HIREDIS_LIBS_STATIC ${REDIS_PLUS_PLUS_HIREDIS_LIBS}) + + if (TARGET hiredis::hiredis_static) +- string(REPLACE "hiredis::hiredis" "hiredis::hiredis_static" REDIS_PLUS_PLUS_HIREDIS_LIBS_STATIC ++ string(REPLACE "hiredis::hiredis;" "hiredis::hiredis_static;" REDIS_PLUS_PLUS_HIREDIS_LIBS_STATIC + "${REDIS_PLUS_PLUS_HIREDIS_LIBS_STATIC}") + endif() + + if (TARGET hiredis::hiredis_ssl_static) + # If SSL is not enabled, this line will have no effect +- string(REPLACE "hiredis::hiredis_static_ssl" "hiredis::hiredis_ssl_static" REDIS_PLUS_PLUS_HIREDIS_LIBS_STATIC ++ string(REPLACE "hiredis::hiredis_static_ssl;" "hiredis::hiredis_ssl_static;" REDIS_PLUS_PLUS_HIREDIS_LIBS_STATIC + "${REDIS_PLUS_PLUS_HIREDIS_LIBS_STATIC}") + endif() + +-- +2.34.1 + diff --git a/meta-oe/recipes-extended/redis-plus-plus/files/0001-include-cstdint.patch b/meta-oe/recipes-extended/redis-plus-plus/files/0001-include-cstdint.patch deleted file mode 100644 index bfe2412b5d..0000000000 --- a/meta-oe/recipes-extended/redis-plus-plus/files/0001-include-cstdint.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e74bb5a7ef87e697571181280e6108b89104c02d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 25 Jan 2023 20:40:56 -0800 -Subject: [PATCH] include <cstdint> - -gcc 13 libstdc++ moved some includes around and as a result <cstdint> -is no longer transitively included [1]. Explicitly include it for uintXX_t. - -Fixes - -../git/src/sw/redis++/utils.h:187:1: error: 'uint16_t' does not name a type - 187 | uint16_t crc16(const char *buf, int len); - | ^~~~~~~~ - -[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes - -Upstream-Status: Submitted [https://github.com/sewenew/redis-plus-plus/pull/449] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/sw/redis++/utils.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/sw/redis++/utils.h b/src/sw/redis++/utils.h -index f77f796..ff38f2d 100644 ---- a/src/sw/redis++/utils.h -+++ b/src/sw/redis++/utils.h -@@ -17,6 +17,7 @@ - #ifndef SEWENEW_REDISPLUSPLUS_UTILS_H - #define SEWENEW_REDISPLUSPLUS_UTILS_H - -+#include <cstdint> - #include <cstring> - #include <string> - #include <type_traits> --- -2.39.1 - diff --git a/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.10.bb b/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.10.bb new file mode 100644 index 0000000000..2df5e09194 --- /dev/null +++ b/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.10.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "C++ client for Redis based on hiredis" +HOMEPAGE = "https://github.com/sewenew/redis-plus-plus" +SECTION = "libs" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +DEPENDS += "hiredis" + +SRC_URI = "git://github.com/sewenew/redis-plus-plus;branch=master;protocol=https \ + file://0001-CMakeLists.txt-fix-substitution-for-static-libs.patch" +SRCREV = "8b9ce389099608cf9bae617d79d257d2cc05e12f" + +S = "${WORKDIR}/git" + +inherit cmake + +# if ssl is enabled for redis-plus-plus it must also be enabled for hiredis +PACKAGECONFIG ??= "ssl" +PACKAGECONFIG[ssl] = "-DREDIS_PLUS_PLUS_USE_TLS=ON, -DREDIS_PLUS_PLUS_USE_TLS=OFF, openssl" +PACKAGECONFIG[test] = "-DREDIS_PLUS_PLUS_BUILD_TEST=ON, -DREDIS_PLUS_PLUS_BUILD_TEST=OFF" + +do_install:append() { + # To remove absolute path in .cmake found by QA warning [buildpaths] + sed -i -e 's|${STAGING_LIBDIR}/libcrypto.so|crypto|g' ${D}${datadir}/cmake/redis++/redis++-targets.cmake + sed -i -e 's|${STAGING_LIBDIR}/libssl.so|ssl|g' ${D}${datadir}/cmake/redis++/redis++-targets.cmake +} diff --git a/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.7.bb b/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.7.bb deleted file mode 100644 index 8e906a4483..0000000000 --- a/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.7.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "C++ client for Redis based on hiredis" -HOMEPAGE = "https://github.com/sewenew/redis-plus-plus" -SECTION = "libs" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -SRC_URI = "git://github.com/sewenew/redis-plus-plus;branch=master;protocol=https \ - file://0001-include-cstdint.patch" -SRCREV = "f3b19a8a1f609d1a1b79002802e5cf8c336dc262" - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE += "-DREDIS_PLUS_PLUS_USE_TLS=ON" - -DEPENDS += "hiredis openssl" - -RDEPENDS:${PN} += "hiredis" - -FILES_SOLIBSDEV = "" -FILES:${PN} += " ${libdir}/libredis++.so*" - -INSANE_SKIP:${PN} += "dev-so" diff --git a/meta-oe/recipes-extended/redis/redis-7/0001-src-Do-not-reset-FINAL_LIBS.patch b/meta-oe/recipes-extended/redis/redis-7.0.12/0001-src-Do-not-reset-FINAL_LIBS.patch index e8d8b1d53f..e8d8b1d53f 100644 --- a/meta-oe/recipes-extended/redis/redis-7/0001-src-Do-not-reset-FINAL_LIBS.patch +++ b/meta-oe/recipes-extended/redis/redis-7.0.12/0001-src-Do-not-reset-FINAL_LIBS.patch diff --git a/meta-oe/recipes-extended/redis/redis-7/0006-Define-correct-gregs-for-RISCV32.patch b/meta-oe/recipes-extended/redis/redis-7.0.12/0006-Define-correct-gregs-for-RISCV32.patch index 385b0aeed0..385b0aeed0 100644 --- a/meta-oe/recipes-extended/redis/redis-7/0006-Define-correct-gregs-for-RISCV32.patch +++ b/meta-oe/recipes-extended/redis/redis-7.0.12/0006-Define-correct-gregs-for-RISCV32.patch diff --git a/meta-oe/recipes-extended/redis/redis-7/GNU_SOURCE-7.patch b/meta-oe/recipes-extended/redis/redis-7.0.12/GNU_SOURCE-7.patch index 6e07c25c6a..6e07c25c6a 100644 --- a/meta-oe/recipes-extended/redis/redis-7/GNU_SOURCE-7.patch +++ b/meta-oe/recipes-extended/redis/redis-7.0.12/GNU_SOURCE-7.patch diff --git a/meta-oe/recipes-extended/redis/redis-7/hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/redis/redis-7.0.12/hiredis-use-default-CC-if-it-is-set.patch index 657b0923e2..250fdd0ff4 100644 --- a/meta-oe/recipes-extended/redis/redis-7/hiredis-use-default-CC-if-it-is-set.patch +++ b/meta-oe/recipes-extended/redis/redis-7.0.12/hiredis-use-default-CC-if-it-is-set.patch @@ -18,6 +18,8 @@ Reworked for 6.0.4 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- +Upstream-Status: Pending + deps/hiredis/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-oe/recipes-extended/redis/redis-7.0.12/init-redis-server b/meta-oe/recipes-extended/redis/redis-7.0.12/init-redis-server new file mode 100755 index 0000000000..c5f335f57d --- /dev/null +++ b/meta-oe/recipes-extended/redis/redis-7.0.12/init-redis-server @@ -0,0 +1,71 @@ +#!/bin/sh +# +### BEGIN INIT INFO +# Provides: redis-server +# Required-Start: $network +# Required-Stop: $network +# Default-Start: S 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Redis, a key-value store +# Description: Redis is an open source, advanced key-value store. +# http://redis.io +### END INIT INFO + +test -f /usr/bin/redis-server || exit 0 + +ARGS="/etc/redis/redis.conf" + +case "$1" in + start) + echo "Starting redis-server..." + start-stop-daemon --start --quiet --exec /usr/bin/redis-server -- $ARGS + ;; + stop) + echo "Stopping redis-server..." + start-stop-daemon --stop --quiet --exec /usr/bin/redis-server + ;; + restart) + echo "Stopping redis-server..." + start-stop-daemon --stop --quiet --exec /usr/bin/redis-server + + # Since busybox implementation ignores --retry arguments repeatedly check + # if the process is still running and try another signal after a timeout, + # efectively simulating a stop with --retry=TERM/5/KILL/5 schedule. + waitAfterTerm=5000000 # us / 5000 ms / 5 s + waitAfterKill=5000000 # us / 5000 ms / 5 s + waitStep=100000 # us / 100 ms / 0.1 s + waited=0 + start-stop-daemon --stop --test --quiet --exec /usr/bin/redis-server + processOff=$? + while [ $processOff -eq 0 ] && [ $waited -le $waitAfterTerm ] ; do + usleep ${waitStep} + ((waited+=${waitStep})) + start-stop-daemon --stop --test --quiet --exec /usr/bin/redis-server + processOff=$? + done + if [ $processOff -eq 0 ] ; then + start-stop-daemon --stop --signal KILL --exec /usr/bin/redis-server + start-stop-daemon --stop --test --quiet --exec /usr/bin/redis-server + processOff=$? + fi + waited=0 + while [ $processOff -eq 0 ] && [ $waited -le $waitAfterKill ] ; do + usleep ${waitStep} + ((waited+=${waitStep})) + start-stop-daemon --stop --test --quiet --exec /usr/bin/redis-server + processOff=$? + done + # Here $processOff will indicate if waiting and retrying according to + # the schedule ended in a successfull stop or not. + + echo "Starting redis-server..." + start-stop-daemon --start --quiet --exec /usr/bin/redis-server -- $ARGS + ;; + *) + echo "Usage: /etc/init.d/redis-server {start|stop|restart}" + exit 1 + ;; +esac + +exit 0 + diff --git a/meta-oe/recipes-extended/redis/redis-7/lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/redis/redis-7.0.12/lua-update-Makefile-to-use-environment-build-setting.patch index c6c6fde162..bff07535de 100644 --- a/meta-oe/recipes-extended/redis/redis-7/lua-update-Makefile-to-use-environment-build-setting.patch +++ b/meta-oe/recipes-extended/redis/redis-7.0.12/lua-update-Makefile-to-use-environment-build-setting.patch @@ -16,6 +16,8 @@ updated to work wtih 6.2.1 Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> --- +Upstream-Status: Pending + deps/Makefile | 1 - deps/lua/Makefile | 1 - deps/lua/src/Makefile | 16 ++++++---------- diff --git a/meta-oe/recipes-extended/redis/redis-7/oe-use-libc-malloc.patch b/meta-oe/recipes-extended/redis/redis-7.0.12/oe-use-libc-malloc.patch index bf6d0cf3c1..bf05fc4c50 100644 --- a/meta-oe/recipes-extended/redis/redis-7/oe-use-libc-malloc.patch +++ b/meta-oe/recipes-extended/redis/redis-7.0.12/oe-use-libc-malloc.patch @@ -15,6 +15,8 @@ Update to work with 4.0.8 Signed-off-by: Alistair Francis <alistair.francis@wdc.com> --- +Upstream-Status: Pending + src/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/redis/redis-7/redis.conf b/meta-oe/recipes-extended/redis/redis-7.0.12/redis.conf index 75037d6dc8..75037d6dc8 100644 --- a/meta-oe/recipes-extended/redis/redis-7/redis.conf +++ b/meta-oe/recipes-extended/redis/redis-7.0.12/redis.conf diff --git a/meta-oe/recipes-extended/redis/redis-7/redis.service b/meta-oe/recipes-extended/redis/redis-7.0.12/redis.service index a52204cc70..a52204cc70 100644 --- a/meta-oe/recipes-extended/redis/redis-7/redis.service +++ b/meta-oe/recipes-extended/redis/redis-7.0.12/redis.service diff --git a/meta-oe/recipes-extended/redis/redis-7/init-redis-server b/meta-oe/recipes-extended/redis/redis-7/init-redis-server deleted file mode 100755 index 6014d70c0e..0000000000 --- a/meta-oe/recipes-extended/redis/redis-7/init-redis-server +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# -### BEGIN INIT INFO -# Provides: redis-server -# Required-Start: $network -# Required-Stop: $network -# Default-Start: S 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Redis, a key-value store -# Description: Redis is an open source, advanced key-value store. -# http://redis.io -### END INIT INFO - -test -f /usr/bin/redis-server || exit 0 - -ARGS="/etc/redis/redis.conf" - -case "$1" in - start) - echo "Starting redis-server..." - start-stop-daemon --start --quiet --exec /usr/bin/redis-server -- $ARGS - ;; - stop) - echo "Stopping redis-server..." - start-stop-daemon --stop --quiet --exec /usr/bin/redis-server - ;; - restart) - echo "Stopping redis-server..." - start-stop-daemon --stop --quiet --exec /usr/bin/redis-server - echo "Starting redis-server..." - start-stop-daemon --start --quiet --exec /usr/bin/redis-server -- $ARGS - ;; - *) - echo "Usage: /etc/init.d/redis-server {start|stop|restart}" - exit 1 - ;; -esac - -exit 0 - diff --git a/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch index 878cd36973..d2a1b45e66 100644 --- a/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch +++ b/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch @@ -14,6 +14,8 @@ Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Reworked for 6.0.4 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- +Upstream-Status: Pending + deps/hiredis/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-oe/recipes-extended/redis/redis/init-redis-server b/meta-oe/recipes-extended/redis/redis/init-redis-server index 6014d70c0e..c5f335f57d 100755 --- a/meta-oe/recipes-extended/redis/redis/init-redis-server +++ b/meta-oe/recipes-extended/redis/redis/init-redis-server @@ -27,6 +27,37 @@ case "$1" in restart) echo "Stopping redis-server..." start-stop-daemon --stop --quiet --exec /usr/bin/redis-server + + # Since busybox implementation ignores --retry arguments repeatedly check + # if the process is still running and try another signal after a timeout, + # efectively simulating a stop with --retry=TERM/5/KILL/5 schedule. + waitAfterTerm=5000000 # us / 5000 ms / 5 s + waitAfterKill=5000000 # us / 5000 ms / 5 s + waitStep=100000 # us / 100 ms / 0.1 s + waited=0 + start-stop-daemon --stop --test --quiet --exec /usr/bin/redis-server + processOff=$? + while [ $processOff -eq 0 ] && [ $waited -le $waitAfterTerm ] ; do + usleep ${waitStep} + ((waited+=${waitStep})) + start-stop-daemon --stop --test --quiet --exec /usr/bin/redis-server + processOff=$? + done + if [ $processOff -eq 0 ] ; then + start-stop-daemon --stop --signal KILL --exec /usr/bin/redis-server + start-stop-daemon --stop --test --quiet --exec /usr/bin/redis-server + processOff=$? + fi + waited=0 + while [ $processOff -eq 0 ] && [ $waited -le $waitAfterKill ] ; do + usleep ${waitStep} + ((waited+=${waitStep})) + start-stop-daemon --stop --test --quiet --exec /usr/bin/redis-server + processOff=$? + done + # Here $processOff will indicate if waiting and retrying according to + # the schedule ended in a successfull stop or not. + echo "Starting redis-server..." start-stop-daemon --start --quiet --exec /usr/bin/redis-server -- $ARGS ;; diff --git a/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch index 1619e9db35..aade7afd06 100644 --- a/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch +++ b/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch @@ -15,6 +15,8 @@ Signed-off-by: Armin Kuster <akust808@gmail.com> updated to work wtih 6.2.1 Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> --- +Upstream-Status: Pending + deps/Makefile | 1 - deps/lua/Makefile | 1 - deps/lua/src/Makefile | 16 ++++++---------- diff --git a/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch b/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch index a0f66b845e..e76bdbc263 100644 --- a/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch +++ b/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch @@ -15,6 +15,8 @@ Update to work with 4.0.8 Signed-off-by: Alistair Francis <alistair.francis@wdc.com> --- +Upstream-Status: Pending + src/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/redis/redis_6.2.9.bb b/meta-oe/recipes-extended/redis/redis_6.2.13.bb index 100c2a2a5d..640831c525 100644 --- a/meta-oe/recipes-extended/redis/redis_6.2.9.bb +++ b/meta-oe/recipes-extended/redis/redis_6.2.13.bb @@ -17,7 +17,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://GNU_SOURCE.patch \ file://0006-Define-correct-gregs-for-RISCV32.patch \ " -SRC_URI[sha256sum] = "9661b2c6b1cc9bf2999471b37a4d759fa5e747d408142c18af8792ebd8384a2a" +SRC_URI[sha256sum] = "89ff27c80d420456a721ccfb3beb7cc628d883c53059803513749e13214a23d1" inherit autotools-brokensep update-rc.d systemd useradd diff --git a/meta-oe/recipes-extended/redis/redis_7.0.8.bb b/meta-oe/recipes-extended/redis/redis_7.0.12.bb index fe1db9f986..321b90dadf 100644 --- a/meta-oe/recipes-extended/redis/redis_7.0.8.bb +++ b/meta-oe/recipes-extended/redis/redis_7.0.12.bb @@ -6,8 +6,6 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=8ffdd6c926faaece928cf9d9640132d2" DEPENDS = "readline lua ncurses" -FILESPATH =. "${FILE_DIRNAME}/${BPN}-7:" - SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://redis.conf \ file://init-redis-server \ @@ -19,7 +17,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://GNU_SOURCE-7.patch \ file://0006-Define-correct-gregs-for-RISCV32.patch \ " -SRC_URI[sha256sum] = "06a339e491306783dcf55b97f15a5dbcbdc01ccbde6dc23027c475cab735e914" +SRC_URI[sha256sum] = "9dd83d5b278bb2bf0e39bfeb75c3e8170024edbaf11ba13b7037b2945cf48ab7" inherit autotools-brokensep update-rc.d systemd useradd diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool_1.8.0.bb b/meta-oe/recipes-extended/rrdtool/rrdtool_1.8.0.bb index 961fe7cef7..f0c083c6db 100644 --- a/meta-oe/recipes-extended/rrdtool/rrdtool_1.8.0.bb +++ b/meta-oe/recipes-extended/rrdtool/rrdtool_1.8.0.bb @@ -10,7 +10,7 @@ SRCREV = "3af04acd38bbc61bbdcdd931dcf234c971aa5336" PV = "1.8.0" SRC_URI = "\ - git://github.com/oetiker/rrdtool-1.x.git;branch=master;protocol=http;;protocol=https \ + git://github.com/oetiker/rrdtool-1.x.git;protocol=https;branch=master \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb b/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb index da3e9a1377..e7b79ad03f 100644 --- a/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb +++ b/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb @@ -14,3 +14,7 @@ SRCREV = "b421f56d9ee31a966058d23bd23c966221c91396" S = "${WORKDIR}/git" inherit autotools pkgconfig + +DEBUG_OPTIMIZATION:append = " -Wno-error=inline" + + diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch index 552172d397..c1480406fe 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch @@ -12,7 +12,7 @@ since 2.6.13 [1]. (it would require installing the libc headers otherwise, for the test to detect /usr/include/sys/inotify.h.) -Upstream-Status: Inappropriate[OE-specific] +Upstream-Status: Inappropriate [OE-specific] Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> --- diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2212.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2306.0.bb index ed65bed0da..c639e81473 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2212.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2306.0.bb @@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=51d9635e646fb75e1b74c074f788e973 \ file://COPYING.ASL20;md5=052f8a09206615ab07326ff8ce2d9d32\ " -SRC_URI = "http://www.rsyslog.com/download/files/download/rsyslog/${BPN}-${PV}.tar.gz \ +SRC_URI = "https://www.rsyslog.com/files/download/rsyslog/${BPN}-${PV}.tar.gz \ file://initscript \ file://rsyslog.conf \ file://rsyslog.logrotate \ @@ -31,7 +31,7 @@ SRC_URI:append:libc-musl = " \ file://0001-Include-sys-time-h.patch \ " -SRC_URI[sha256sum] = "53b59a872e3dc7384cdc149abe9744916776f7057d905f3df6722d2eb1b04f35" +SRC_URI[sha256sum] = "f6283efaadc609540a56e6bec88a362c966e77f29fe48e6b734bd6c1123e0be5" UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" @@ -76,6 +76,8 @@ PACKAGECONFIG[mmjsonparse] = "--enable-mmjsonparse,--disable-mmjsonparse," PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5," PACKAGECONFIG[postgresql] = "--enable-pgsql,--disable-pgsql,postgresql," PACKAGECONFIG[libdbi] = "--enable-libdbi,--disable-libdbi,libdbi," +# For libcap-ng, see commit log and https://github.com/rsyslog/rsyslog/issues/5091 +PACKAGECONFIG[libcap-ng] = "--enable-libcap-ng,--disable-libcap-ng,libcap-ng," PACKAGECONFIG[mail] = "--enable-mail,--disable-mail,," PACKAGECONFIG[valgrind] = ",--without-valgrind-testbench,valgrind," PACKAGECONFIG[imhttp] = "--enable-imhttp,--disable-imhttp,civetweb," diff --git a/meta-oe/recipes-extended/sanlock/sanlock_3.8.5.bb b/meta-oe/recipes-extended/sanlock/sanlock_3.8.5.bb index c2a17d06b9..962d19574c 100644 --- a/meta-oe/recipes-extended/sanlock/sanlock_3.8.5.bb +++ b/meta-oe/recipes-extended/sanlock/sanlock_3.8.5.bb @@ -21,9 +21,7 @@ SRCREV = "b820c63093c4ae85d7da4f719cf3026d7fca5d09" S = "${WORKDIR}/git" -CVE_CHECK_IGNORE += "\ - CVE-2012-5638 \ -" +CVE_STATUS[CVE-2012-5638] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." DEPENDS = "libaio util-linux" diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-include-stdint.h-system-header-for-UINT16_MAX.patch b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-include-stdint.h-system-header-for-UINT16_MAX.patch index c2111a2c10..1c93d42f3c 100644 --- a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-include-stdint.h-system-header-for-UINT16_MAX.patch +++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-include-stdint.h-system-header-for-UINT16_MAX.patch @@ -9,6 +9,8 @@ error: 'UINT16_MAX' undeclared (first use in this function) Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + interopServerProvider.c | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.15-fix-provider-debugging.patch b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.15-fix-provider-debugging.patch index 4fbecaa63f..f21b3b9a5b 100644 --- a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.15-fix-provider-debugging.patch +++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.15-fix-provider-debugging.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -up sblim-sfcb-1.4.5/providerDrv.c.orig sblim-sfcb-1.4.5/providerDrv.c --- sblim-sfcb-1.4.5/providerDrv.c.orig 2013-09-04 12:59:22.140813239 +0200 +++ sblim-sfcb-1.4.5/providerDrv.c 2013-09-04 12:59:40.511870274 +0200 diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.16-maxMsgLen.patch b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.16-maxMsgLen.patch index a0dd81653d..941b522b17 100644 --- a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.16-maxMsgLen.patch +++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.16-maxMsgLen.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -up sblim-sfcb-1.3.16/sfcb.cfg.pre.in.old sblim-sfcb-1.3.16/sfcb.cfg.pre.in --- sblim-sfcb-1.3.16/sfcb.cfg.pre.in.old 2012-06-13 23:21:09.000000000 +0200 +++ sblim-sfcb-1.3.16/sfcb.cfg.pre.in 2013-06-24 15:34:38.881992781 +0200 diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.16-multilib-man-cfg.patch b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.16-multilib-man-cfg.patch index c8cece2c20..a175d1b063 100644 --- a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.16-multilib-man-cfg.patch +++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.16-multilib-man-cfg.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -up sblim-sfcb-1.3.16/man/sfcbd.1.pre.in.orig sblim-sfcb-1.3.16/man/sfcbd.1.pre.in --- sblim-sfcb-1.3.16/man/sfcbd.1.pre.in.orig 2014-02-26 14:05:32.213091734 +0100 +++ sblim-sfcb-1.3.16/man/sfcbd.1.pre.in 2014-02-26 15:10:54.476196379 +0100 diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch index 7f95a9da3f..83d4bbcd1e 100644 --- a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch +++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -up sblim-sfcb-1.3.9/man/sfcbrepos.1.pre.in.orig sblim-sfcb-1.3.9/man/sfcbrepos.1.pre.in --- sblim-sfcb-1.3.9/man/sfcbrepos.1.pre.in.orig 2009-10-13 21:54:13.000000000 +0200 +++ sblim-sfcb-1.3.9/man/sfcbrepos.1.pre.in 2010-09-06 14:01:57.294564062 +0200 diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.5-service.patch b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.5-service.patch index eaccfa594c..08b9a1403b 100644 --- a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.5-service.patch +++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.5-service.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -up sblim-sfcb-1.4.6/Makefile.in.orig sblim-sfcb-1.4.6/Makefile.in --- sblim-sfcb-1.4.6/Makefile.in.orig 2013-10-07 10:43:34.783228137 +0200 +++ sblim-sfcb-1.4.6/Makefile.in 2013-10-07 10:44:30.178533289 +0200 diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.8-default-ecdh-curve-name.patch b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.8-default-ecdh-curve-name.patch index 3268d49f43..f11cf925f5 100644 --- a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.8-default-ecdh-curve-name.patch +++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.8-default-ecdh-curve-name.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -up sblim-sfcb-1.4.8/control.c.orig sblim-sfcb-1.4.8/control.c --- sblim-sfcb-1.4.8/control.c.orig 2014-03-27 00:46:28.000000000 +0100 +++ sblim-sfcb-1.4.8/control.c 2014-05-15 12:31:38.304169409 +0200 diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.9-fix-ftbfs.patch b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.9-fix-ftbfs.patch index 9548b3c063..fd2d076b85 100644 --- a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.9-fix-ftbfs.patch +++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.9-fix-ftbfs.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -up sblim-sfcb-1.4.9/control.c.orig sblim-sfcb-1.4.9/control.c --- sblim-sfcb-1.4.9/control.c.orig 2015-07-13 15:06:21.331660336 +0200 +++ sblim-sfcb-1.4.9/control.c 2015-07-13 15:08:38.031308917 +0200 diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb index 2a89a549d1..2a7cf2285e 100644 --- a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb +++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb @@ -34,9 +34,7 @@ SRC_URI = "http://downloads.sourceforge.net/sblim/${BP}.tar.bz2 \ SRC_URI[md5sum] = "28021cdabc73690a94f4f9d57254ce30" SRC_URI[sha256sum] = "634a67b2f7ac3b386a79160eb44413d618e33e4e7fc74ae68b0240484af149dd" -CVE_CHECK_IGNORE += "\ - CVE-2012-3381 \ -" +CVE_STATUS[CVE-2012-3381] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." inherit autotools inherit systemd @@ -46,6 +44,7 @@ SYSTEMD_SERVICE:${PN} = "sblim-sfcb.service" SYSTEMD_AUTO_ENABLE = "enable" LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" +LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--allow-shlib-undefined ', '', d)}" EXTRA_OECONF = '--enable-debug \ --enable-ssl \ diff --git a/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-Fix-function-declararions.patch b/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-Fix-function-declararions.patch deleted file mode 100644 index c498c55692..0000000000 --- a/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-Fix-function-declararions.patch +++ /dev/null @@ -1,80 +0,0 @@ -From f97c26f5effd4372f7e03f9e4178d42a9ad8d4b3 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 2 Sep 2022 13:33:16 -0700 -Subject: [PATCH] Fix function declararions - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - TEST/v2test_ec.c | 2 ++ - TEST/v2test_ein.c | 1 + - backend/cimxml/cimXmlParser.c | 6 +++++- - backend/cimxml/grammar.c | 2 ++ - 4 files changed, 10 insertions(+), 1 deletion(-) - -diff --git a/TEST/v2test_ec.c b/TEST/v2test_ec.c -index ad34dcc..d3e566d 100644 ---- a/TEST/v2test_ec.c -+++ b/TEST/v2test_ec.c -@@ -6,6 +6,8 @@ - #include "cmcimacs.h" - - extern char *value2Chars(CMPIType type, CMPIValue * value); -+extern void showClass( CMPIConstClass * in_class ); -+ - /* - * comment out this define to use v2 http XML interface - */ -diff --git a/TEST/v2test_ein.c b/TEST/v2test_ein.c -index c1b4692..5d5ef5d 100644 ---- a/TEST/v2test_ein.c -+++ b/TEST/v2test_ein.c -@@ -6,6 +6,7 @@ - #include "cmcimacs.h" - - extern char *value2Chars(CMPIType type, CMPIValue * value); -+extern void showObjectPath( CMPIObjectPath * objectpath ); - void showProperty( CMPIData , char * ); - void showInstance( CMPIInstance * ); - static char * CMPIState_str(CMPIValueState); -diff --git a/backend/cimxml/cimXmlParser.c b/backend/cimxml/cimXmlParser.c -index d1ab86e..9f5d1ca 100644 ---- a/backend/cimxml/cimXmlParser.c -+++ b/backend/cimxml/cimXmlParser.c -@@ -34,6 +34,8 @@ - - #include <pthread.h> - -+void startParsing(ParserControl *parm); -+ - static int attrsOk(XmlBuffer * xb, const XmlElement * e, XmlAttr * r, - const char *tag, int etag); - static char *getValue(XmlBuffer * xb, const char *v); -@@ -1350,7 +1352,9 @@ ResponseHdr scanCimXmlResponse(const char *xmlData, CMPIObjectPath *cop) - - control.heap = parser_heap_init(); - -- control.respHdr.rc = startParsing(&control); -+ control.respHdr.rc = 0; -+ -+ startParsing(&control); - - parser_heap_term(control.heap); - -diff --git a/backend/cimxml/grammar.c b/backend/cimxml/grammar.c -index 6a0a969..a3dcdea 100644 ---- a/backend/cimxml/grammar.c -+++ b/backend/cimxml/grammar.c -@@ -23,6 +23,8 @@ - #include "sfcUtil/utilft.h" - #include "parserUtil.h" - -+CMPIType guessType(char *val); -+void setClassMethods(CMPIConstClass *cls, XtokMethods *ms); - - static int ct = 0; - static int dontLex = 0; --- -2.37.3 - diff --git a/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-Fix-implicit-function-declarations.patch b/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-Fix-implicit-function-declarations.patch new file mode 100644 index 0000000000..08cd15ab0c --- /dev/null +++ b/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-Fix-implicit-function-declarations.patch @@ -0,0 +1,80 @@ +From 1e1ed4d58909360997648ca9524ab16441f5474b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 6 Jul 2023 10:15:41 -0700 +Subject: [PATCH] Fix implicit function declarations + +Clang 17+ has been finding these errors since its enforcing C99 +more than other compilers + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + TEST/v2test_ec.c | 1 + + TEST/v2test_ein.c | 1 + + backend/cimxml/cimXmlParser.c | 2 +- + backend/cimxml/grammar.c | 2 ++ + backend/cimxml/grammar.h | 1 + + 5 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/TEST/v2test_ec.c b/TEST/v2test_ec.c +index ad34dcc..940ca57 100644 +--- a/TEST/v2test_ec.c ++++ b/TEST/v2test_ec.c +@@ -4,6 +4,7 @@ + #include <unistd.h> + #include <stdlib.h> + #include "cmcimacs.h" ++#include "show.h" + + extern char *value2Chars(CMPIType type, CMPIValue * value); + /* +diff --git a/TEST/v2test_ein.c b/TEST/v2test_ein.c +index c1b4692..ede95c1 100644 +--- a/TEST/v2test_ein.c ++++ b/TEST/v2test_ein.c +@@ -4,6 +4,7 @@ + #include <unistd.h> + #include <stdlib.h> + #include "cmcimacs.h" ++#include "show.h" + + extern char *value2Chars(CMPIType type, CMPIValue * value); + void showProperty( CMPIData , char * ); +diff --git a/backend/cimxml/cimXmlParser.c b/backend/cimxml/cimXmlParser.c +index d1ab86e..14f5f5c 100644 +--- a/backend/cimxml/cimXmlParser.c ++++ b/backend/cimxml/cimXmlParser.c +@@ -1350,7 +1350,7 @@ ResponseHdr scanCimXmlResponse(const char *xmlData, CMPIObjectPath *cop) + + control.heap = parser_heap_init(); + +- control.respHdr.rc = startParsing(&control); ++ startParsing(&control); + + parser_heap_term(control.heap); + +diff --git a/backend/cimxml/grammar.c b/backend/cimxml/grammar.c +index 6a0a969..522ca9e 100644 +--- a/backend/cimxml/grammar.c ++++ b/backend/cimxml/grammar.c +@@ -23,6 +23,8 @@ + #include "sfcUtil/utilft.h" + #include "parserUtil.h" + ++extern CMPIType guessType(char *val); ++extern void setClassMethods(CMPIConstClass *cls, XtokMethods *ms); + + static int ct = 0; + static int dontLex = 0; +diff --git a/backend/cimxml/grammar.h b/backend/cimxml/grammar.h +index 00d364f..bafdd42 100644 +--- a/backend/cimxml/grammar.h ++++ b/backend/cimxml/grammar.h +@@ -79,3 +79,4 @@ static void valueRefArray(ParserControl *parm, parseUnion *stateUnion); + static void valueReference(ParserControl *parm, parseUnion *stateUnion); + static void valueReferenceData(ParserControl *parm, parseUnion *stateUnion); + ++void startParsing(ParserControl *parm); +-- +2.41.0 + diff --git a/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb b/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb index 20bd2b6fc1..c9d3ddd6b2 100644 --- a/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb +++ b/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb @@ -4,7 +4,7 @@ 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-function-declararions.patch \ + file://0001-Fix-implicit-function-declarations.patch \ " SRC_URI[md5sum] = "0bac0dec19f17ec065b6c332a56d7bae" diff --git a/meta-oe/recipes-extended/scsirastools/scsirastools/mdadm.patch b/meta-oe/recipes-extended/scsirastools/scsirastools/mdadm.patch index 6edda08cdf..3dc9d4766c 100644 --- a/meta-oe/recipes-extended/scsirastools/scsirastools/mdadm.patch +++ b/meta-oe/recipes-extended/scsirastools/scsirastools/mdadm.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- mdadm.d/mdadm-1.3.0/mdadm.h.org 2017-06-20 00:35:55.366978372 -0700 +++ mdadm.d/mdadm-1.3.0/mdadm.h 2017-06-20 00:36:41.244363348 -0700 @@ -29,8 +29,9 @@ diff --git a/meta-oe/recipes-extended/scsirastools/scsirastools/print-format.patch b/meta-oe/recipes-extended/scsirastools/scsirastools/print-format.patch index ac81780582..4494ae1eef 100644 --- a/meta-oe/recipes-extended/scsirastools/scsirastools/print-format.patch +++ b/meta-oe/recipes-extended/scsirastools/scsirastools/print-format.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: scsirastools-1.6.6/src/sgcommon.c =================================================================== --- scsirastools-1.6.6.orig/src/sgcommon.c diff --git a/meta-oe/recipes-extended/sedutil/files/0001-Fix-build-on-big-endian-architectures.patch b/meta-oe/recipes-extended/sedutil/files/0001-Fix-build-on-big-endian-architectures.patch index 7351197e4f..0b78d238bb 100644 --- a/meta-oe/recipes-extended/sedutil/files/0001-Fix-build-on-big-endian-architectures.patch +++ b/meta-oe/recipes-extended/sedutil/files/0001-Fix-build-on-big-endian-architectures.patch @@ -5,6 +5,8 @@ Subject: [PATCH] Fix build on big endian architectures Signed-off-by: Primoz Fiser <primoz.fiser@norik.com> --- +Upstream-Status: Pending + Common/DtaEndianFixup.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/meta-oe/recipes-extended/sgpio/sgpio/0001-makefile-Add-LDFLAGS-to-linking-rule.patch b/meta-oe/recipes-extended/sgpio/sgpio/0001-makefile-Add-LDFLAGS-to-linking-rule.patch index 87fdd6058a..895916ceab 100644 --- a/meta-oe/recipes-extended/sgpio/sgpio/0001-makefile-Add-LDFLAGS-to-linking-rule.patch +++ b/meta-oe/recipes-extended/sgpio/sgpio/0001-makefile-Add-LDFLAGS-to-linking-rule.patch @@ -8,6 +8,8 @@ No GNU_HASH in the elf binary Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/sgpio/sgpio/Makefile-error-fix.patch b/meta-oe/recipes-extended/sgpio/sgpio/Makefile-error-fix.patch index 709f8316f1..40c85e2ce8 100644 --- a/meta-oe/recipes-extended/sgpio/sgpio/Makefile-error-fix.patch +++ b/meta-oe/recipes-extended/sgpio/sgpio/Makefile-error-fix.patch @@ -3,7 +3,7 @@ Fix Makefile: * change the file format from dos to unix to avoid do_patch failed. * override gcc,SBIN_DIR and INSTALL for cross-compilation. -Upstream-Status: pending +Upstream-Status: Pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- diff --git a/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb b/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb index fe2ebe4ff7..9b25745ed6 100644 --- a/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb +++ b/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb @@ -14,6 +14,7 @@ S = "${WORKDIR}/${BPN}" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE_GPL;md5=393a5ca445f6965873eca0259a17f833" +EXTRA_OEMAKE = "CFLAGS='${CFLAGS}'" do_compile:prepend() { oe_runmake clean } diff --git a/meta-oe/recipes-extended/socketcan/can-utils_git.bb b/meta-oe/recipes-extended/socketcan/can-utils_2023.03.bb index 07b80a5307..ca6cb7db58 100644 --- a/meta-oe/recipes-extended/socketcan/can-utils_git.bb +++ b/meta-oe/recipes-extended/socketcan/can-utils_2023.03.bb @@ -6,9 +6,7 @@ DEPENDS = "libsocketcan" SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=https;branch=master" -SRCREV = "3615bac17e539a06835dcb90855eae844ee18053" - -PV = "2021.08.0" +SRCREV = "cfe41963f3425e9adb01a70cfaddedf5e5982720" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-extended/sysdig/sysdig/0001-Add-cstdint-for-uintXX_t-types.patch b/meta-oe/recipes-extended/sysdig/sysdig/0001-Add-cstdint-for-uintXX_t-types.patch new file mode 100644 index 0000000000..e564958dad --- /dev/null +++ b/meta-oe/recipes-extended/sysdig/sysdig/0001-Add-cstdint-for-uintXX_t-types.patch @@ -0,0 +1,38 @@ +From 3d076ea588eb3c7f334133b4c31172a14beadf5b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 2 Feb 2023 20:18:27 -0800 +Subject: [PATCH] Add <cstdint> for uintXX_t types + +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://github.com/falcosecurity/libs/pull/862] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + userspace/libsinsp/filter/parser.h | 1 + + userspace/libsinsp/filter_value.h | 1 + + 2 files changed, 2 insertions(+) + +--- a/userspace/libsinsp/filter/parser.h ++++ b/userspace/libsinsp/filter/parser.h +@@ -18,6 +18,7 @@ limitations under the License. + #pragma once + + #include "ast.h" ++#include <cstdint> + + // + // Context-free Grammar for Sinsp Filters +--- a/userspace/libsinsp/filter_value.h ++++ b/userspace/libsinsp/filter_value.h +@@ -18,6 +18,7 @@ limitations under the License. + #pragma once + + #include <string.h> ++#include <cstdint> + #include <utility> + + // Used for CO_IN/CO_PMATCH filterchecks using PT_CHARBUFs to allow diff --git a/meta-oe/recipes-extended/sysdig/sysdig_0.28.0.bb b/meta-oe/recipes-extended/sysdig/sysdig_0.28.0.bb index 4181da732f..92897cd3fc 100644 --- a/meta-oe/recipes-extended/sysdig/sysdig_0.28.0.bb +++ b/meta-oe/recipes-extended/sysdig/sysdig_0.28.0.bb @@ -24,6 +24,7 @@ RDEPENDS:${PN} = "bash" SRC_URI = "git://github.com/draios/sysdig.git;branch=dev;protocol=https;name=sysdig \ git://github.com/falcosecurity/libs;protocol=https;branch=master;name=falco;subdir=git/falcosecurity-libs \ + file://0001-Add-cstdint-for-uintXX_t-types.patch;patchdir=./falcosecurity-libs \ file://0001-cmake-Pass-PROBE_NAME-via-CFLAGS.patch \ " SRCREV_sysdig = "4fb6288275f567f63515df0ff0a6518043ecfa9b" diff --git a/meta-oe/recipes-extended/tipcutils/tipcutils/0001-include-sys-select.h-for-FD_-definitions.patch b/meta-oe/recipes-extended/tipcutils/tipcutils/0001-include-sys-select.h-for-FD_-definitions.patch index 6c8ba9074a..9f0604892d 100644 --- a/meta-oe/recipes-extended/tipcutils/tipcutils/0001-include-sys-select.h-for-FD_-definitions.patch +++ b/meta-oe/recipes-extended/tipcutils/tipcutils/0001-include-sys-select.h-for-FD_-definitions.patch @@ -5,6 +5,8 @@ Subject: [PATCH 1/2] include sys/select.h for FD_* definitions Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + demos/inventory_sim/inventory_sim.c | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-extended/tipcutils/tipcutils/0002-replace-non-standard-uint-with-unsigned-int.patch b/meta-oe/recipes-extended/tipcutils/tipcutils/0002-replace-non-standard-uint-with-unsigned-int.patch index 03e711e9a4..89eae015c6 100644 --- a/meta-oe/recipes-extended/tipcutils/tipcutils/0002-replace-non-standard-uint-with-unsigned-int.patch +++ b/meta-oe/recipes-extended/tipcutils/tipcutils/0002-replace-non-standard-uint-with-unsigned-int.patch @@ -7,6 +7,8 @@ make it portable on musl Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + demos/benchmark/client_tipc.c | 34 +++++++++++++++++----------------- demos/benchmark/common_tipc.h | 2 +- demos/benchmark/server_tipc.c | 10 +++++----- diff --git a/meta-oe/recipes-extended/tmux/tmux_3.1c.bb b/meta-oe/recipes-extended/tmux/tmux_3.3a.bb index ec9fe34cf1..5187222838 100644 --- a/meta-oe/recipes-extended/tmux/tmux_3.1c.bb +++ b/meta-oe/recipes-extended/tmux/tmux_3.3a.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://tmux.c;beginline=3;endline=17;md5=f256b76d52e7b4d02bf DEPENDS = "ncurses libevent" SRC_URI = "https://github.com/tmux/tmux/releases/download/${PV}/tmux-${PV}.tar.gz" -SRC_URI[md5sum] = "7301d3fa12f35051edb185496766c745" -SRC_URI[sha256sum] = "918f7220447bef33a1902d4faff05317afd9db4ae1c9971bef5c787ac6c88386" +SRC_URI[md5sum] = "8eee5883b9f6550fa4efaad0c9ec38f3" +SRC_URI[sha256sum] = "e4fd347843bd0772c4f48d6dde625b0b109b7a380ff15db21e97c11a4dcdf93f" UPSTREAM_CHECK_URI = "https://github.com/tmux/tmux/releases" diff --git a/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-cow.c-Replace-stat64-with-stat.patch b/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-cow.c-Replace-stat64-with-stat.patch new file mode 100644 index 0000000000..348d7ce104 --- /dev/null +++ b/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-cow.c-Replace-stat64-with-stat.patch @@ -0,0 +1,34 @@ +From c4f85268da6c30b0aec3d9a0e951b2088887cff4 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 22 May 2023 18:35:37 -0700 +Subject: [PATCH] cow.c: Replace stat64 with stat + +LFS64 is deprecated in latest musl and this fails to build +therefore switch to using stat API which is same as stat64 these days + +Upstream-Status: Inappropriate [No upstream] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + moo/cow.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/moo/cow.c ++++ b/moo/cow.c +@@ -161,7 +161,7 @@ int write_cow_header(char *cow_file, int + int sectorsize, int alignment, long long *size) + { + struct cow_header_v3 *header; +- struct stat64 buf; ++ struct stat buf; + int err; + + err = cow_seek_file(fd, 0); +@@ -192,7 +192,7 @@ int write_cow_header(char *cow_file, int + backing_file)) + goto out_free; + +- err = stat64(header->backing_file, &buf); ++ err = stat(header->backing_file, &buf); + if(err < 0){ + cow_printf("Stat of backing file '%s' failed, errno = %d\n", + header->backing_file, errno); diff --git a/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-include-required-system-header-files-for-fd_set-and-.patch b/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-include-required-system-header-files-for-fd_set-and-.patch index 38e945d64d..02aca7da45 100644 --- a/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-include-required-system-header-files-for-fd_set-and-.patch +++ b/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-include-required-system-header-files-for-fd_set-and-.patch @@ -8,6 +8,8 @@ makedev macro is defined in sys/sysmacros.h Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + uml_net/ethertap.c | 1 + uml_net/host.c | 1 + 2 files changed, 2 insertions(+) diff --git a/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-makefiles-Append-to-CFLAGS-instead-of-re-assign.patch b/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-makefiles-Append-to-CFLAGS-instead-of-re-assign.patch new file mode 100644 index 0000000000..1962e84c7e --- /dev/null +++ b/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-makefiles-Append-to-CFLAGS-instead-of-re-assign.patch @@ -0,0 +1,122 @@ +From ac72fffe639d564f59ec1e1eafde83980acef1b5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 23 May 2023 14:40:31 -0700 +Subject: [PATCH] makefiles: Append to CFLAGS instead of re-assign + +This helps in inserting yocto provided CFLAGS from build environment + +Upstream-Status: Inappropriate [No upstream] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + jailtest/Makefile | 2 +- + mconsole/Makefile | 2 +- + moo/Makefile | 2 +- + port-helper/Makefile | 2 +- + tunctl/Makefile | 2 +- + uml_net/Makefile | 2 +- + uml_router/Makefile | 2 +- + watchdog/Makefile | 2 +- + 8 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/jailtest/Makefile b/jailtest/Makefile +index 610ca1a..025fca9 100644 +--- a/jailtest/Makefile ++++ b/jailtest/Makefile +@@ -1,6 +1,6 @@ + OBJS = jailtest.o + BIN = jailtest +-CFLAGS = -g -Wall ++CFLAGS += -g -Wall + + BIN_DIR ?= /usr/bin + +diff --git a/mconsole/Makefile b/mconsole/Makefile +index 9818d8a..74a2560 100644 +--- a/mconsole/Makefile ++++ b/mconsole/Makefile +@@ -1,6 +1,6 @@ + BIN = uml_mconsole + OBJS = $(BIN).o +-CFLAGS = -g -Wall ++CFLAGS += -g -Wall + + BIN_DIR ?= /usr/bin + +diff --git a/moo/Makefile b/moo/Makefile +index 6cdb591..60d300d 100644 +--- a/moo/Makefile ++++ b/moo/Makefile +@@ -3,7 +3,7 @@ BIN = uml_moo uml_mkcow + uml_moo_OBJS = uml_moo.o cow.o + uml_mkcow_OBJS = uml_mkcow.o cow.o + +-CFLAGS = -g -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE ++CFLAGS += -g -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE + + BIN_DIR ?= /usr/bin + +diff --git a/port-helper/Makefile b/port-helper/Makefile +index 8e33bdf..8b695f3 100644 +--- a/port-helper/Makefile ++++ b/port-helper/Makefile +@@ -1,6 +1,6 @@ + OBJS = port-helper.o + BIN = port-helper +-CFLAGS = -g -Wall ++CFLAGS += -g -Wall + + LIB_DIR ?= /usr/lib/uml + +diff --git a/tunctl/Makefile b/tunctl/Makefile +index 743bfea..a39ad2b 100644 +--- a/tunctl/Makefile ++++ b/tunctl/Makefile +@@ -1,6 +1,6 @@ + OBJS = tunctl.o + BIN = tunctl +-CFLAGS = -g -Wall ++CFLAGS += -g -Wall + + BIN_DIR ?= /usr/bin + +diff --git a/uml_net/Makefile b/uml_net/Makefile +index 36efec6..2e1ad0e 100644 +--- a/uml_net/Makefile ++++ b/uml_net/Makefile +@@ -1,7 +1,7 @@ + TUNTAP = $(shell [ -e /usr/include/linux/if_tun.h ] && echo -DTUNTAP) + + BIN = uml_net +-CFLAGS = -g -Wall $(TUNTAP) ++CFLAGS += -g -Wall $(TUNTAP) + + BIN_DIR ?= /usr/bin + +diff --git a/uml_router/Makefile b/uml_router/Makefile +index b7b5401..e399ea5 100644 +--- a/uml_router/Makefile ++++ b/uml_router/Makefile +@@ -2,7 +2,7 @@ TUNTAP = $(shell [ -e /usr/include/linux/if_tun.h ] && echo -DTUNTAP) + + OBJS = hash.o port.o uml_switch.o + BIN = uml_switch +-CFLAGS = -g -Wall $(TUNTAP) ++CFLAGS += -g -Wall $(TUNTAP) + + BIN_DIR ?= /usr/bin + +diff --git a/watchdog/Makefile b/watchdog/Makefile +index c26fd9f..5178cc6 100644 +--- a/watchdog/Makefile ++++ b/watchdog/Makefile +@@ -1,6 +1,6 @@ + BIN = uml_watchdog + OBJS = $(BIN).o +-CFLAGS = -g -Wall ++CFLAGS += -g -Wall + + BIN_DIR ?= /usr/bin + +-- +2.40.1 + diff --git a/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/fix-ldflags.patch b/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/fix-ldflags.patch index f4a175cdfd..a66d7d5906 100644 --- a/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/fix-ldflags.patch +++ b/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/fix-ldflags.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + # # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher diff --git a/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/unstrip.patch b/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/unstrip.patch index 868001dbd5..b6fce00986 100644 --- a/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/unstrip.patch +++ b/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/unstrip.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Dont strip during install let the packaging handle it Signed-off-by: Khem Raj <raj.khem@gmail.com> diff --git a/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb b/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb index 35ae5f777d..54bc1b21f1 100644 --- a/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb +++ b/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb @@ -8,6 +8,8 @@ SRC_URI = "http://downloads.sourceforge.net/project/user-mode-linux/tools/1/uml_ file://unstrip.patch \ file://0001-include-required-system-header-files-for-fd_set-and-.patch \ file://0001-Add-missing-standard-headers-for-str-and-exit-APIs.patch \ + file://0001-cow.c-Replace-stat64-with-stat.patch \ + file://0001-makefiles-Append-to-CFLAGS-instead-of-re-assign.patch \ " SRC_URI[md5sum] = "2c1ccd9efacbfb39e42d482b89b2550a" SRC_URI[sha256sum] = "4f179b1db021ef15ac7e9b2eed57c525db127a754c574f591c367460cded9f41" diff --git a/meta-oe/recipes-extended/upm/upm/0001-CMakeLists.txt-Use-SWIG_SUPPORT_FILES-to-find-the-li.patch b/meta-oe/recipes-extended/upm/upm/0001-CMakeLists.txt-Use-SWIG_SUPPORT_FILES-to-find-the-li.patch index 4b9a195e02..8c3b148369 100644 --- a/meta-oe/recipes-extended/upm/upm/0001-CMakeLists.txt-Use-SWIG_SUPPORT_FILES-to-find-the-li.patch +++ b/meta-oe/recipes-extended/upm/upm/0001-CMakeLists.txt-Use-SWIG_SUPPORT_FILES-to-find-the-li.patch @@ -10,6 +10,8 @@ cmake version 3.12 or higher Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> --- +Upstream-Status: Pending + src/CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/upm/upm/0001-include-missing-cstdint.patch b/meta-oe/recipes-extended/upm/upm/0001-include-missing-cstdint.patch new file mode 100644 index 0000000000..59f81bf3a2 --- /dev/null +++ b/meta-oe/recipes-extended/upm/upm/0001-include-missing-cstdint.patch @@ -0,0 +1,43 @@ +From 64f75806c04c2ee819cf2f92cb564ad316354823 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 29 Jan 2023 00:27:47 -0800 +Subject: [PATCH] include missing <cstdint> + +gcc 13 moved some includes around and as a result <cstdint> is no longer transitively included [1]. Explicitly include it for uint{32,64}_t. + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Upstream-Status: Submitted [https://github.com/eclipse/upm/pull/704] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/mcp9808/mcp9808.hpp | 1 + + src/micsv89/micsv89.hpp | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/mcp9808/mcp9808.hpp b/src/mcp9808/mcp9808.hpp +index b9e138d7..2509cd30 100644 +--- a/src/mcp9808/mcp9808.hpp ++++ b/src/mcp9808/mcp9808.hpp +@@ -13,6 +13,7 @@ + + #pragma once + ++#include <cstdint> + #include <iostream> + #include <string> + #include <interfaces/iTemperature.hpp> +diff --git a/src/micsv89/micsv89.hpp b/src/micsv89/micsv89.hpp +index 2f97dbce..c6e22ad8 100644 +--- a/src/micsv89/micsv89.hpp ++++ b/src/micsv89/micsv89.hpp +@@ -11,6 +11,7 @@ + + #pragma once + ++#include <cstdint> + #include <iostream> + #include <string> + +-- +2.39.1 + diff --git a/meta-oe/recipes-extended/upm/upm_git.bb b/meta-oe/recipes-extended/upm/upm_git.bb index 61e2e38b05..0695f99695 100644 --- a/meta-oe/recipes-extended/upm/upm_git.bb +++ b/meta-oe/recipes-extended/upm/upm_git.bb @@ -10,12 +10,13 @@ DEPENDS = "libjpeg-turbo mraa" SRCREV = "5cf20df96c6b35c19d5b871ba4e319e96b4df72d" PV = "2.0.0+git${SRCPV}" -SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=http;branch=master;protocol=https \ +SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=https;branch=master \ file://0001-CMakeLists.txt-Use-SWIG_SUPPORT_FILES-to-find-the-li.patch \ file://0001-Use-stdint-types.patch \ file://0001-initialize-local-variables-before-use.patch \ file://0001-cmake-Disable-Wno-misleading-indentation-with-clang-.patch \ file://0001-cmake-Disable-using-Wno-maybe-uninitialized.patch \ + file://0001-include-missing-cstdint.patch \ " SRC_URI:append:toolchain-clang:x86 = " file://0001-nmea_gps-Link-with-latomic.patch " diff --git a/meta-oe/recipes-extended/wtmpdb/files/0001-remove-lto-to-fix-link-error-of-clang.patch b/meta-oe/recipes-extended/wtmpdb/files/0001-remove-lto-to-fix-link-error-of-clang.patch new file mode 100644 index 0000000000..ef188e7a15 --- /dev/null +++ b/meta-oe/recipes-extended/wtmpdb/files/0001-remove-lto-to-fix-link-error-of-clang.patch @@ -0,0 +1,31 @@ +From 9840939789dec9153150e8f9ae34de4171a5c15e Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@fujitsu.com> +Date: Wed, 19 Jul 2023 07:31:32 +0000 +Subject: [PATCH] remove lto to fix link error of clang + +error message: +| tests/tst-dlopen.p/tst-dlopen.c.o: file not recognized: file format not recognized +| clang-16: error: linker command failed with exit code 1 (use -v to see invocation) + +Upstream-Status: Pending + +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> +--- + meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 6fe8045..166a15b 100644 +--- a/meson.build ++++ b/meson.build +@@ -28,7 +28,6 @@ add_project_arguments(['-D_GNU_SOURCE=1', + '-D_TIME_BITS=64'], language : 'c') + + possible_cc_flags = [ +- '-flto=auto', + '-ffat-lto-objects', + '-fstack-protector-strong', + '-funwind-tables', +-- +2.34.1 + diff --git a/meta-oe/recipes-extended/wtmpdb/wtmpdb_0.7.1.bb b/meta-oe/recipes-extended/wtmpdb/wtmpdb_0.7.1.bb new file mode 100644 index 0000000000..cffae2d432 --- /dev/null +++ b/meta-oe/recipes-extended/wtmpdb/wtmpdb_0.7.1.bb @@ -0,0 +1,36 @@ +SUMMARY = "Y2038 safe version of wtmp" +HOMEPAGE = "https://github.com/thkukuk/wtmpdb" +DESCRIPTION = "last reports the login and logout times of users and when the machine got rebooted." +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=020090a00b69dd2af9ab82eb0003ea2c" +SECTION = "libs" + +SRCREV = "502b19a41c7a3b1b5e70969b18088683825f71f8" + +SRC_URI = "git://github.com/thkukuk/wtmpdb.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} = "wtmpdb-update-boot.service wtmpdb-rotate.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-oe/recipes-extended/wxwidgets/wxwidgets/musl-locale-l.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/musl-locale-l.patch index f83d2d4458..e4ca6579f8 100644 --- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/musl-locale-l.patch +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/musl-locale-l.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + these macro'd away functions don't exist in musl (yet) diff --git a/include/wx/xlocale.h b/include/wx/xlocale.h index c433d25..3ab9d84 100644 diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb index 39b6a2bc7c..91653e2852 100644 --- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb @@ -74,7 +74,7 @@ PACKAGECONFIG[lzma] = "-DwxUSE_LIBLZMA=ON,-DwxUSE_LIBLZMA=OFF,xz" PACKAGECONFIG[mspack] = "-DwxUSE_LIBMSPACK=ON,-DwxUSE_LIBMSPACK=OFF,libmspack" PACKAGECONFIG[opengl] = "-DwxUSE_OPENGL=ON,-DwxUSE_OPENGL=OFF,libglu" PACKAGECONFIG[sdl_audio] = "-DwxUSE_LIBSDL=ON,-DwxUSE_LIBSDL=OFF,libsdl2" -PACKAGECONFIG[webkit] = "-DwxUSE_WEBVIEW_WEBKIT=ON,-DwxUSE_WEBVIEW_WEBKIT=OFF,webkitgtk,,,no_gui" +PACKAGECONFIG[webkit] = "-DwxUSE_WEBVIEW_WEBKIT=ON,-DwxUSE_WEBVIEW_WEBKIT=OFF,webkitgtk3,,,no_gui" PACKAGECONFIG[curl] = "-DwxUSE_WEBREQUEST_CURL=ON,-DwxUSE_WEBREQUEST_CURL=OFF,curl" # Support LFS unconditionally diff --git a/meta-oe/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch b/meta-oe/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch new file mode 100644 index 0000000000..d3c26d97ae --- /dev/null +++ b/meta-oe/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch @@ -0,0 +1,36 @@ +From 9b67bb18d8409e0e693cc6000507acbd73a30eab Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Wed, 16 Nov 2022 11:27:24 +0100 +Subject: [PATCH 1/2] meson.build: correctly handle disabled ssh_agent option + +Existing code produces these errors: +| gcr/meson.build:61:0: ERROR: Unable to get the path of a not-found external program +| gcr/meson.build:101:5: ERROR: Unknown variable "ssh_add_path". + +Signed-off-by: Alexander Kanavin <alex@linutronix.de> + +Upstream-Status: Backport [ https://gitlab.gnome.org/GNOME/gcr/-/commit/9b67bb18d8409e0e693cc6000507acbd73a30eab ] +--- + meson.build | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/meson.build b/meson.build +index 3f35173..11d7fa7 100644 +--- a/meson.build ++++ b/meson.build +@@ -96,8 +98,10 @@ conf.set('HAVE_TIMEGM', cc.has_function('timegm')) + conf.set('HAVE_MLOCK', cc.has_function('mlock')) + conf.set_quoted('GPG_EXECUTABLE', gpg_path) + conf.set_quoted('LIBGCRYPT_VERSION', libgcrypt_dep.version()) +-conf.set_quoted('SSH_ADD_EXECUTABLE', ssh_add_path) +-conf.set_quoted('SSH_AGENT_EXECUTABLE', ssh_agent_path) ++if get_option('ssh_agent') ++ conf.set_quoted('SSH_ADD_EXECUTABLE', ssh_add_path) ++ conf.set_quoted('SSH_AGENT_EXECUTABLE', ssh_agent_path) ++endif + conf.set10('WITH_SYSTEMD', with_systemd) + config_file = configure_file( + output: 'config.h', +-- +2.34.1 + diff --git a/meta-oe/recipes-gnome/gcr/gcr3_3.41.1.bb b/meta-oe/recipes-gnome/gcr/gcr3_3.41.1.bb new file mode 100644 index 0000000000..ba5660a5ed --- /dev/null +++ b/meta-oe/recipes-gnome/gcr/gcr3_3.41.1.bb @@ -0,0 +1,59 @@ +SUMMARY = "A library for bits of crypto UI and parsing etc" +DESCRIPTION = "GCR is a library for displaying certificates, and crypto UI, \ +accessing key stores. It also provides the viewer for crypto files on the \ +GNOME desktop." +HOMEPAGE = "https://gitlab.gnome.org/GNOME/gcr" +BUGTRACKER = "https://gitlab.gnome.org/GNOME/gcr/issues" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" + +DEPENDS = "p11-kit glib-2.0 libgcrypt gnupg-native \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'libxslt-native', '', d)}" + +CACHED_CONFIGUREVARS += "ac_cv_path_GPG='gpg2'" + +CFLAGS += "-D_GNU_SOURCE" + +GNOMEBASEBUILDCLASS = "meson" +GTKDOC_MESON_OPTION = "gtk_doc" +inherit gnomebase gtk-icon-cache gi-docgen features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg +UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>3.(?!9\d+)\d+(\.\d+)+)\.tar" + +SRC_URI = "https://download.gnome.org/sources/gcr/3.41/gcr-${PV}.tar.xz;name=archive" +SRC_URI += "file://0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch" +SRC_URI[archive.sha256sum] = "bb7128a3c2febbfee9c03b90d77d498d0ceb237b0789802d60185c71c4bea24f" + +S = "${WORKDIR}/gcr-${PV}" + +PACKAGECONFIG ??= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'gtk', '', d)} \ +" +PACKAGECONFIG[gtk] = "-Dgtk=true,-Dgtk=false,gtk+3" +PACKAGECONFIG[ssh_agent] = "-Dssh_agent=true,-Dssh_agent=false,libsecret,openssh" +#'Use systemd socket activation for server programs' +PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd" + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/gcr-3 \ + ${systemd_user_unitdir}/gcr-ssh-agent.socket \ + ${systemd_user_unitdir}/gcr-ssh-agent.service \ +" + +# http://errors.yoctoproject.org/Errors/Details/20229/ +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" +ARM_INSTRUCTION_SET:armv6 = "arm" + +EXTRA_OEMESON += "--cross-file ${WORKDIR}/meson-${PN}.cross" +do_write_config:append() { + cat >${WORKDIR}/meson-${PN}.cross <<EOF +[binaries] +gpg2 = '${bindir}/gpg2' +ssh-add = '${bindir}/ssh-add' +ssh-agent = '${bindir}/ssh-agent' +EOF +} diff --git a/meta-oe/recipes-gnome/gmime/gmime/nodolt.patch b/meta-oe/recipes-gnome/gmime/gmime/nodolt.patch deleted file mode 100644 index 1f9bdd3041..0000000000 --- a/meta-oe/recipes-gnome/gmime/gmime/nodolt.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -150,7 +150,6 @@ AC_EXEEXT - AC_PROG_LIBTOOL - dnl when using libtool 2.x create libtool early, because it's used in configure - m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) --DOLT - - dnl Checks for header files. - AC_CHECK_HEADERS(sys/mman.h) diff --git a/meta-oe/recipes-gnome/gmime/gmime_3.2.7.bb b/meta-oe/recipes-gnome/gmime/gmime_3.2.13.bb index 2677f5c615..c4738b25bc 100644 --- a/meta-oe/recipes-gnome/gmime/gmime_3.2.7.bb +++ b/meta-oe/recipes-gnome/gmime/gmime_3.2.13.bb @@ -7,11 +7,15 @@ DEPENDS = "glib-2.0 zlib" inherit gnomebase gobject-introspection vala -SRC_URI += "file://iconv-detect.h \ - file://nodolt.patch" -SRC_URI[archive.sha256sum] = "2aea96647a468ba2160a64e17c6dc6afe674ed9ac86070624a3f584c10737d44" +SRC_URI = "https://github.com/jstedfast/${BPN}/releases/download/${PV}/${BP}.tar.xz \ + file://iconv-detect.h \ +" +SRC_URI[sha256sum] = "2e10a54d4821daf8b16c019ad5d567e0fb8e766f8ffe5fec3d4c6a37373d6406" + +EXTRA_OECONF += "--enable-largefile" export ac_cv_have_iconv_detect_h="yes" +export ac_cv_sys_file_offset_bits="64" do_configure:append () { cp ${WORKDIR}/iconv-detect.h ${S} diff --git a/meta-oe/recipes-gnome/gnome-common/gnome-common_3.18.0.bb b/meta-oe/recipes-gnome/gnome-common/gnome-common_3.18.0.bb index 86a941f4a8..ceebe5ebd3 100644 --- a/meta-oe/recipes-gnome/gnome-common/gnome-common_3.18.0.bb +++ b/meta-oe/recipes-gnome/gnome-common/gnome-common_3.18.0.bb @@ -16,7 +16,7 @@ DEPENDS = "" # Default to enable autoconf-archive to avoid conflicts PACKAGECONFIG ??= "autoconf-archive" -PACKAGECONFIG[autoconf-archive] = "--with-autoconf-archive, --without-autoconf-archive, autoconf-archive" +PACKAGECONFIG[autoconf-archive] = "--with-autoconf-archive, --without-autoconf-archive, autoconf-archive,autoconf-archive" FILES:${PN} += "${datadir}/aclocal" FILES:${PN}-dev = "" diff --git a/meta-oe/recipes-gnome/gnome-themes/adw-gtk3_4.8.bb b/meta-oe/recipes-gnome/gnome-themes/adw-gtk3_4.8.bb new file mode 100644 index 0000000000..2a3f772f8f --- /dev/null +++ b/meta-oe/recipes-gnome/gnome-themes/adw-gtk3_4.8.bb @@ -0,0 +1,16 @@ +SUMMARY = "An unofficial GTK3 port of libadwaita." +HOMEPAGE = "http://github.com/lassekongo83/adw-gtk3" +SECTION = "graphics" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742" + +DEPENDS = "sassc-native" + +inherit meson + +SRC_URI = "git://github.com/lassekongo83/adw-gtk3.git;protocol=https;branch=main" + +S = "${WORKDIR}/git" +SRCREV = "7ee024ed79f68875e5dea3616be24a703cf72cc5" + +FILES:${PN} = "${datadir}/themes" diff --git a/meta-oe/recipes-gnome/libjcat/libjcat_0.1.12.bb b/meta-oe/recipes-gnome/libjcat/libjcat_0.1.14.bb index ff573ff7df..782833b228 100644 --- a/meta-oe/recipes-gnome/libjcat/libjcat_0.1.12.bb +++ b/meta-oe/recipes-gnome/libjcat/libjcat_0.1.14.bb @@ -11,7 +11,7 @@ SRC_URI = "\ git://github.com/hughsie/libjcat.git;branch=main;protocol=https \ file://run-ptest \ " -SRCREV = "898b80468288bc6278b73210783ba1f7c0219c71" +SRCREV = "d9cf9ebc4237252a82f88d9e99bea0c4b398c08a" S = "${WORKDIR}/git" inherit gobject-introspection gtk-doc meson ptest-gnome vala lib_package diff --git a/meta-oe/recipes-gnome/libpeas/libpeas/0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch b/meta-oe/recipes-gnome/libpeas/libpeas/0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch new file mode 100644 index 0000000000..6bb48777ec --- /dev/null +++ b/meta-oe/recipes-gnome/libpeas/libpeas/0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch @@ -0,0 +1,82 @@ +From d798af685e9e1166400acbdab082c17b02dad85b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 18 May 2023 23:28:10 -0700 +Subject: [PATCH] Remove builddir and srcdir paths from test binaries + +Encoding buildtime paths is not needed since if these tests are to be +run they will be run on target where builddir structure most certainly +wont be available. + +Fixes +WARNING: libpeas-1.36.0-r0 do_package_qa: QA Issue: File /usr/bin/peas-demo in package libpeas-demo contains reference to TMPDIR [buildpaths] + +Upstream-Status: Inappropriate [Cross-compile specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + peas-demo/meson.build | 2 +- + tests/libpeas-gtk/testing/meson.build | 4 ++-- + tests/libpeas/testing/meson.build | 4 ++-- + tests/testing-util/meson.build | 4 ++-- + 4 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/peas-demo/meson.build b/peas-demo/meson.build +index a3ec53b..855ebf2 100644 +--- a/peas-demo/meson.build ++++ b/peas-demo/meson.build +@@ -9,7 +9,7 @@ peas_demo_c = [ + + peas_demo_c_args = [ + '-DHAVE_CONFIG_H', +- '-DPEAS_BUILDDIR="@0@"'.format(builddir), ++ '-DPEAS_BUILDDIR="/usr/src/debug/libpeas"', + '-DPEAS_PREFIX="@0@"'.format(prefix), + '-DPEAS_LIBDIR="@0@"'.format(libdir), + ] +diff --git a/tests/libpeas-gtk/testing/meson.build b/tests/libpeas-gtk/testing/meson.build +index 646f42d..fd9a692 100644 +--- a/tests/libpeas-gtk/testing/meson.build ++++ b/tests/libpeas-gtk/testing/meson.build +@@ -19,8 +19,8 @@ libpeas_gtk_testing_deps = [ + + libpeas_gtk_testing_c_args = [ + '-DHAVE_CONFIG_H', +- '-DBUILDDIR="@0@"'.format(builddir), +- '-DSRCDIR="@0@"'.format(srcdir), ++ '-DBUILDDIR="/usr/src/debug/libpeas"', ++ '-DSRCDIR="/usr/src/debug/libpeas"', + ] + + libpeas_gtk_testing_lib = library( +diff --git a/tests/libpeas/testing/meson.build b/tests/libpeas/testing/meson.build +index 74ba7b1..084daa9 100644 +--- a/tests/libpeas/testing/meson.build ++++ b/tests/libpeas/testing/meson.build +@@ -21,8 +21,8 @@ libpeas_testing_deps = [ + + libpeas_testing_c_args = [ + '-DHAVE_CONFIG_H', +- '-DBUILDDIR="@0@"'.format(builddir), +- '-DSRCDIR="@0@"'.format(srcdir), ++ '-DBUILDDIR="/usr/src/debug/libpeas"', ++ '-DSRCDIR="/usr/src/debug/libpeas"', + ] + + libpeas_testing_lib = library( +diff --git a/tests/testing-util/meson.build b/tests/testing-util/meson.build +index 1c40740..83ad059 100644 +--- a/tests/testing-util/meson.build ++++ b/tests/testing-util/meson.build +@@ -17,8 +17,8 @@ libtesting_util_deps = [ + + libtesting_util_c_args = [ + '-DHAVE_CONFIG_H', +- '-DBUILDDIR="@0@"'.format(builddir), +- '-DSRCDIR="@0@"'.format(srcdir), ++ '-DBUILDDIR="/usr/src/debug/libpeas"', ++ '-DSRCDIR="/usr/src/debug/libpeas"', + '-UG_DISABLE_ASSERT', + '-UG_DISABLE_CAST_CHECKS', + ] +-- +2.40.1 + diff --git a/meta-oe/recipes-gnome/libpeas/libpeas_1.34.0.bb b/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb index 1bf6752e87..a32ea9b550 100644 --- a/meta-oe/recipes-gnome/libpeas/libpeas_1.34.0.bb +++ b/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb @@ -11,8 +11,11 @@ GTKDOC_MESON_OPTION = "gtk_doc" inherit gnomebase gobject-introspection gtk-doc gtk-icon-cache features_check ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +# FIXME: When upgrading to libpeas 2, g-i is no longer needed. +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -SRC_URI[archive.sha256sum] = "4305f715dab4b5ad3e8007daec316625e7065a94e63e25ef55eb1efb964a7bf0" +SRC_URI += "file://0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch" +SRC_URI[archive.sha256sum] = "297cb9c2cccd8e8617623d1a3e8415b4530b8e5a893e3527bbfd1edd13237b4c" PACKAGECONFIG[python3] = "-Dpython3=true,-Dpython3=false,python3-pygobject" diff --git a/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.10.bb b/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.10.bb index 3366b7e7f9..61abd07fda 100644 --- a/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.10.bb +++ b/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.10.bb @@ -8,6 +8,8 @@ SRC_URI = "git://github.com/hughsie/libxmlb.git;branch=main;protocol=https \ SRCREV = "a6cac6a715d57c393bbddee4d0381ad943341af9" S = "${WORKDIR}/git" +DEPENDS = "glib-2.0 xz" + inherit gobject-introspection gtk-doc meson ptest-gnome lib_package PACKAGECONFIG ??= "\ diff --git a/meta-oe/recipes-gnome/vte9/vte9.inc b/meta-oe/recipes-gnome/vte9/vte9.inc index 49b9740129..2a165391b6 100644 --- a/meta-oe/recipes-gnome/vte9/vte9.inc +++ b/meta-oe/recipes-gnome/vte9/vte9.inc @@ -1,7 +1,7 @@ SUMMARY = "Virtual terminal emulator GTK+ widget library" BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte" LICENSE = "LGPL-2.0-only" -DEPENDS = " glib-2.0 gtk+ intltool-native gnome-common-native ncurses" +DEPENDS = "glib-2.0-native glib-2.0 gtk+ intltool-native gnome-common-native ncurses" RDEPENDS:libvte = "vte-termcap" # help gnomebase get the SRC_URI correct diff --git a/meta-oe/recipes-graphics/cglm/cglm_0.8.7.bb b/meta-oe/recipes-graphics/cglm/cglm_0.8.9.bb index 95a651dd03..fbd267b16f 100644 --- a/meta-oe/recipes-graphics/cglm/cglm_0.8.7.bb +++ b/meta-oe/recipes-graphics/cglm/cglm_0.8.9.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8dc95c4110ba741c43832734b51b7de7" SRC_URI = "git://github.com/recp/cglm;branch=master;protocol=https" # Tag v0.8.5 -SRCREV = "8cfc98d2835a8cd1a9041f257c7ba0bfe4fbc1f3" +SRCREV = "c51040cd4139b628fba2a0e6751ad4aecbc0c81a" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/dietsplash/dietsplash/0001-configure.ac-Do-not-demand-linker-hash-style.patch b/meta-oe/recipes-graphics/dietsplash/dietsplash/0001-configure.ac-Do-not-demand-linker-hash-style.patch index 87e8637eec..aad393b1d9 100644 --- a/meta-oe/recipes-graphics/dietsplash/dietsplash/0001-configure.ac-Do-not-demand-linker-hash-style.patch +++ b/meta-oe/recipes-graphics/dietsplash/dietsplash/0001-configure.ac-Do-not-demand-linker-hash-style.patch @@ -8,6 +8,8 @@ is not supported Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch b/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch index 6a7b1bf31d..5740f4a819 100644 --- a/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch +++ b/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch @@ -5,6 +5,8 @@ Subject: [PATCH] Do not set PYTHON_INSTALL_DIR by running python. Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> --- +Upstream-Status: Pending + CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-To-fix-error-when-do_package.patch b/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-To-fix-error-when-do_package.patch index bef471189f..2951ee4555 100644 --- a/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-To-fix-error-when-do_package.patch +++ b/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-To-fix-error-when-do_package.patch @@ -11,6 +11,8 @@ shipped in any package: Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> --- +Upstream-Status: Pending + CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-disable-build-manpages.patch b/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-disable-build-manpages.patch index c8b105ea35..078f525117 100644 --- a/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-disable-build-manpages.patch +++ b/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-disable-build-manpages.patch @@ -5,6 +5,8 @@ Subject: [PATCH] disable build manpages. Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-oe/recipes-graphics/fbida/fbida_2.14.bb b/meta-oe/recipes-graphics/fbida/fbida_2.14.bb deleted file mode 100644 index 3d65399cd2..0000000000 --- a/meta-oe/recipes-graphics/fbida/fbida_2.14.bb +++ /dev/null @@ -1,80 +0,0 @@ -SUMMARY = "Framebuffer image and doc viewer tools" -DESCRIPTION = "The fbida project contains a few applications for viewing and editing images, \ - with the main focus being photos." -HOMEPAGE = "http://linux.bytesex.org/fbida/" -AUTHOR = "Gerd Hoffmann" -SECTION = "utils" - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=e8feb78a32950a909621bbb51f634b39" - -DEPENDS = "virtual/libiconv jpeg fontconfig freetype libexif libdrm pixman poppler libepoxy cairo" - -SRC_URI = "https://www.kraxel.org/releases/fbida/fbida-${PV}.tar.gz \ - file://0001-Avoid-using-host-path.patch \ - file://fix-preprocessor.patch \ - file://support-jpeg-turbo.patch \ - file://cairo-weak-detect.patch \ - file://fbida-gcc10.patch \ - " -SRC_URI[sha256sum] = "95b7c01556cb6ef9819f358b314ddfeb8a4cbe862b521a3ed62f03d163154438" - -inherit pkgconfig features_check - -# Depends on libepoxy -REQUIRED_DISTRO_FEATURES = "opengl" - -EXTRA_OEMAKE = "STRIP= 'srcdir=${S}' -f ${S}/GNUmakefile" - -PACKAGECONFIG ??= "gif png curl" -PACKAGECONFIG[curl] = ",,curl" -PACKAGECONFIG[gif] = ",,giflib" -PACKAGECONFIG[png] = ",,libpng" -PACKAGECONFIG[tiff] = ",,tiff" -PACKAGECONFIG[motif] = ",,libx11 libxext libxpm libxt openmotif" -PACKAGECONFIG[webp] = ",,libwebp" -PACKAGECONFIG[lirc] = ",,lirc" -# This can only be enabled when cairo has egl enabled in its packageconfig support too -PACKAGECONFIG[egl] = ",," - -EXTRA_OEMAKE += ""${@bb.utils.contains('PACKAGECONFIG', 'egl', 'HAVE_CAIRO_GL=yes', 'HAVE_CAIRO_GL=no', d)}"" - -CFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_NO_X11=1', d)}" - -do_compile() { - sed -i -e 's# fbgs# \$(srcdir)/fbgs#; s#-Ijpeg#-I\$(srcdir)/jpeg#; s# jpeg/# \$(srcdir)/jpeg/#' ${S}/GNUmakefile - sed -i -e 's:/sbin/ldconfig:echo x:' ${S}/mk/Autoconf.mk - sed -i -e 's: cpp: ${CPP}:' ${S}/GNUmakefile - - # Be sure to respect preferences (force to "no") - # Also avoid issues when ${BUILD_ARCH} == ${HOST_ARCH} - if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'curl', d)}" ]; then - sed -i -e '/^HAVE_LIBCURL/s/:=.*$/:= no/' ${S}/GNUmakefile - fi - if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'gif', d)}" ]; then - sed -i -e '/^HAVE_LIBGIF/s/:=.*$/:= no/' ${S}/GNUmakefile - fi - if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'png', d)}" ]; then - sed -i -e '/^HAVE_LIBPNG/s/:=.*$/:= no/' ${S}/GNUmakefile - fi - if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'tiff', d)}" ]; then - sed -i -e '/^HAVE_LIBTIFF/s/:=.*$/:= no/' ${S}/GNUmakefile - fi - if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'motif', d)}" ]; then - sed -i -e '/^HAVE_MOTIF/s/:=.*$/:= no/' ${S}/GNUmakefile - fi - if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'webp', d)}" ]; then - sed -i -e '/^HAVE_LIBWEBP/s/:=.*$/:= no/' ${S}/GNUmakefile - fi - if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'lirc', d)}" ]; then - sed -i -e '/^HAVE_LIBLIRC/s/:=.*$/:= no/' ${S}/GNUmakefile - fi - - oe_runmake -} - -do_install() { - oe_runmake 'DESTDIR=${D}' install -} - -RDEPENDS:${PN} = "ttf-dejavu-sans-mono" diff --git a/meta-oe/recipes-graphics/fbida/fbida_git.bb b/meta-oe/recipes-graphics/fbida/fbida_git.bb new file mode 100644 index 0000000000..ebf88cd0e1 --- /dev/null +++ b/meta-oe/recipes-graphics/fbida/fbida_git.bb @@ -0,0 +1,42 @@ +SUMMARY = "Framebuffer image and doc viewer tools" +DESCRIPTION = "The fbida project contains a few applications for viewing and editing images, \ + with the main focus being photos." +HOMEPAGE = "https://www.kraxel.org/blog/linux/fbida/" +AUTHOR = "Gerd Hoffmann" +SECTION = "utils" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=e8feb78a32950a909621bbb51f634b39" + +DEPENDS = "virtual/libiconv jpeg fontconfig freetype libexif libdrm pixman udev libinput cairo" + +PV = "2.14+git${SRCPV}" +SRC_URI = "git://github.com/kraxel/fbida;protocol=https;branch=master \ + file://fix-preprocessor.patch \ + file://support-jpeg-turbo.patch \ + file://fbida-gcc10.patch \ + file://0001-meson.build-install-fbgs-shell-script.patch \ + file://0002-meson.build-add-features-options-for-png-gif-tiff-we.patch \ + file://0003-meson.build-do-not-require-xkbcommon.patch \ + file://0001-meson.build-make-fbpdf-build-optional.patch \ + file://0001-fbida-Include-missing-sys-types.h.patch \ +" +SRCREV = "eb769e3d7f4a073d4c37ed524ebd5017c6a578f5" +S = "${WORKDIR}/git" + +inherit meson pkgconfig features_check + +# Depends on libepoxy +REQUIRED_DISTRO_FEATURES = "opengl" + +PACKAGECONFIG ??= "gif png pdf" +PACKAGECONFIG[gif] = "-Dgif=enabled,-Dgif=disabled,giflib" +PACKAGECONFIG[png] = "-Dpng=enabled,-Dpng=disabled,libpng" +PACKAGECONFIG[tiff] = "-Dtiff=enabled,-Dtiff=disabled,tiff" +PACKAGECONFIG[motif] = "-Dmotif=enabled,-Dmotif=disabled,libx11 libxext libxpm libxt openmotif" +PACKAGECONFIG[webp] = "-Dwebp=enabled,-Dwebp=disabled,libwebp" +PACKAGECONFIG[pdf] = "-Dpdf=enabled,-Dpdf=disabled,poppler libepoxy" + +CFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_NO_X11=1', d)}" + +RDEPENDS:${PN} = "ttf-dejavu-sans-mono" diff --git a/meta-oe/recipes-graphics/fbida/files/0001-Avoid-using-host-path.patch b/meta-oe/recipes-graphics/fbida/files/0001-Avoid-using-host-path.patch deleted file mode 100644 index cdf2c25d37..0000000000 --- a/meta-oe/recipes-graphics/fbida/files/0001-Avoid-using-host-path.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8d8fa9f22d9f6a95523bac63ac3af724faf5ff92 Mon Sep 17 00:00:00 2001 -From: Marek Vasut <marex@denx.de> -Date: Fri, 7 Apr 2017 23:26:09 +0200 -Subject: [PATCH] Avoid using host-path - -Remove the explicit reference to /usr/local/* , this is completely -bogus and causes trouble during cross-compilation. - -Signed-off-by: Marek Vasut <marex@denx.de> -Upstream-Status: Inappropriate [upstream requires this] ---- - mk/Variables.mk | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/mk/Variables.mk b/mk/Variables.mk -index 99f787c..3ffd87a 100644 ---- a/mk/Variables.mk -+++ b/mk/Variables.mk -@@ -42,12 +42,6 @@ CFLAGS += -Wall -Wmissing-prototypes -Wstrict-prototypes \ - -Wpointer-arith -Wunused - CXXFLAGS += -Wall -Wpointer-arith -Wunused - --# add /usr/local to the search path if something is in there ... --ifneq ($(wildcard /usr/local/include/*.h),) -- CFLAGS += -I/usr/local/include -- LDFLAGS += -L/usr/local/$(LIB) --endif -- - # fixup include path for $(srcdir) != "." - ifneq ($(srcdir),.) - CFLAGS += -I. -I$(srcdir) --- -2.11.0 - diff --git a/meta-oe/recipes-graphics/fbida/files/0001-fbida-Include-missing-sys-types.h.patch b/meta-oe/recipes-graphics/fbida/files/0001-fbida-Include-missing-sys-types.h.patch new file mode 100644 index 0000000000..0fb58f80e1 --- /dev/null +++ b/meta-oe/recipes-graphics/fbida/files/0001-fbida-Include-missing-sys-types.h.patch @@ -0,0 +1,31 @@ +From 17490e264e627ead81bf5840c8797de968485943 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 3 Jul 2023 11:25:26 -0700 +Subject: [PATCH] fbida: Include missing <sys/types.h> + +Fixes build on musl +../git/gfx.h:43:5: error: unknown type name 'dev_t'; did you mean 'div_t'? + dev_t devnum; + ^~~~~ + div_t +TOPDIR/build/tmp/work/cortexa57-yoe-linux-musl/fbida/2.14+gitAUTOINC+eb769e3d7f-r0/recipe-sysroot/usr/include/stdlib.h:64:35: note: 'div_t' declared here +typedef struct { int quot, rem; } div_t; + ^ +1 error generated + +Upstream-Status: Submitted [https://github.com/kraxel/fbida/pull/3] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gfx.h | 1 + + 1 file changed, 1 insertion(+) + +--- a/gfx.h ++++ b/gfx.h +@@ -1,5 +1,6 @@ + #include <stdbool.h> + #include <inttypes.h> ++#include <sys/types.h> + + #include <pixman.h> + #include <cairo.h> diff --git a/meta-oe/recipes-graphics/fbida/files/0001-meson.build-install-fbgs-shell-script.patch b/meta-oe/recipes-graphics/fbida/files/0001-meson.build-install-fbgs-shell-script.patch new file mode 100644 index 0000000000..d686def3d2 --- /dev/null +++ b/meta-oe/recipes-graphics/fbida/files/0001-meson.build-install-fbgs-shell-script.patch @@ -0,0 +1,28 @@ +From f9c455e81ad4d870c8ae20b9af8598139231ad26 Mon Sep 17 00:00:00 2001 +From: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> +Date: Fri, 9 Sep 2022 09:32:22 +0200 +Subject: [PATCH] meson.build: install fbgs shell script + +Upstream-Status: Pending +Signed-off-by: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> +--- + meson.build | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/meson.build b/meson.build +index cbed982..2129896 100644 +--- a/meson.build ++++ b/meson.build +@@ -126,6 +126,9 @@ executable('fbpdf', + sources : fbpdf_srcs, + dependencies : fbpdf_deps, + install : true) ++install_data('fbgs', ++ install_dir : get_option('bindir'), ++ install_mode : 'rwxr--r--') + + # build fbcon + fbcon_srcs = [ 'fbcon.c', 'drmtools.c', 'fbtools.c', 'gfx.c', 'vt.c', 'kbd.c' ] +-- +2.37.3 + diff --git a/meta-oe/recipes-graphics/fbida/files/0001-meson.build-make-fbpdf-build-optional.patch b/meta-oe/recipes-graphics/fbida/files/0001-meson.build-make-fbpdf-build-optional.patch new file mode 100644 index 0000000000..304c6600ca --- /dev/null +++ b/meta-oe/recipes-graphics/fbida/files/0001-meson.build-make-fbpdf-build-optional.patch @@ -0,0 +1,66 @@ +From c00a155e90a9b22bd6ab5fa5407bb9923ee16ca0 Mon Sep 17 00:00:00 2001 +From: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> +Date: Fri, 16 Sep 2022 18:45:58 +0200 +Subject: [PATCH] meson.build: make fbpdf build optional + +Upstream-Status: Pending +Signed-off-by: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> +--- + meson.build | 22 ++++++++++++---------- + meson_options.txt | 1 + + 2 files changed, 13 insertions(+), 10 deletions(-) + +diff --git a/meson.build b/meson.build +index 6b3daf3..289d1ec 100644 +--- a/meson.build ++++ b/meson.build +@@ -15,11 +15,11 @@ x11resdir = x11resrun.stdout().strip() + + # pkg-config deps + pixman_dep = dependency('pixman-1') +-poppler_dep = dependency('poppler-glib') ++poppler_dep = dependency('poppler-glib', required: get_option('pdf')) + cairo_dep = dependency('cairo') + drm_dep = dependency('libdrm') +-gbm_dep = dependency('gbm') +-epoxy_dep = dependency('epoxy') ++gbm_dep = dependency('gbm', required: get_option('pdf')) ++epoxy_dep = dependency('epoxy', required: get_option('pdf')) + exif_dep = dependency('libexif') + png_dep = dependency('libpng', required: get_option('png')) + tiff_dep = dependency('libtiff-4', required: get_option('tiff')) +@@ -132,13 +132,15 @@ fbpdf_deps = [ drm_dep, gbm_dep, epoxy_dep, + pixman_dep, poppler_dep, cairo_dep, + udev_dep, input_dep ] + +-executable('fbpdf', +- sources : fbpdf_srcs, +- dependencies : fbpdf_deps, +- install : true) +-install_data('fbgs', +- install_dir : get_option('bindir'), +- install_mode : 'rwxr--r--') ++if get_option('pdf').enabled() ++ executable('fbpdf', ++ sources : fbpdf_srcs, ++ dependencies : fbpdf_deps, ++ install : true) ++ install_data('fbgs', ++ install_dir : get_option('bindir'), ++ install_mode : 'rwxr--r--') ++endif + + # build fbcon + fbcon_srcs = [ 'fbcon.c', 'drmtools.c', 'fbtools.c', 'gfx.c', 'vt.c', 'kbd.c' ] +diff --git a/meson_options.txt b/meson_options.txt +index ce37188..74699ab 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -3,3 +3,4 @@ option('png', type: 'feature', value : 'enabled') + option('tiff', type: 'feature', value : 'enabled') + option('webp', type: 'feature', value : 'disabled') + option('motif', type: 'feature', value : 'disabled') ++option('pdf', type: 'feature', value : 'enabled') +-- +2.37.3 + diff --git a/meta-oe/recipes-graphics/fbida/files/0002-meson.build-add-features-options-for-png-gif-tiff-we.patch b/meta-oe/recipes-graphics/fbida/files/0002-meson.build-add-features-options-for-png-gif-tiff-we.patch new file mode 100644 index 0000000000..fe36fcb7cb --- /dev/null +++ b/meta-oe/recipes-graphics/fbida/files/0002-meson.build-add-features-options-for-png-gif-tiff-we.patch @@ -0,0 +1,124 @@ +From cdcde5c1fd106a69118dff98118600911392762f Mon Sep 17 00:00:00 2001 +From: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> +Date: Fri, 16 Sep 2022 16:25:38 +0200 +Subject: [PATCH] meson.build: add features options for png, gif, tiff, webp, and motif + +Upstream-Status: Pending +Signed-off-by: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> +--- + meson.build | 41 +++++++++++++++++++++++++++-------------- + meson_options.txt | 5 +++++ + selections.c | 4 ++++ + 3 files changed, 36 insertions(+), 14 deletions(-) + create mode 100644 meson_options.txt + +diff --git a/meson.build b/meson.build +index cd9cc49..b5e3ffc 100644 +--- a/meson.build ++++ b/meson.build +@@ -23,9 +23,9 @@ drm_dep = dependency('libdrm') + gbm_dep = dependency('gbm') + epoxy_dep = dependency('epoxy') + exif_dep = dependency('libexif') +-png_dep = dependency('libpng') +-tiff_dep = dependency('libtiff-4') +-webp_dep = dependency('libwebp', required : false) ++png_dep = dependency('libpng', required: get_option('png')) ++tiff_dep = dependency('libtiff-4', required: get_option('tiff')) ++webp_dep = dependency('libwebp', required : get_option('webp')) + udev_dep = dependency('libudev') + input_dep = dependency('libinput') + xkb_dep = dependency('xkbcommon') +@@ -36,20 +36,20 @@ jpeg_dep = cc.find_library('jpeg') + util_dep = cc.find_library('util') + math_dep = cc.find_library('m', required : false) + pcd_dep = cc.find_library('pcd', required : false) +-gif_dep = cc.find_library('gif', required : false) ++gif_dep = cc.find_library('gif', required: get_option('gif')) + + # motif + x11 libs +-motif_dep = cc.find_library('Xm', required : false) +-xpm_dep = cc.find_library('Xpm', required : false) +-xt_dep = cc.find_library('Xt', required : false) +-xext_dep = cc.find_library('Xext', required : false) +-x11_dep = cc.find_library('X11', required : false) ++motif_dep = cc.find_library('Xm', required : get_option('motif')) ++xpm_dep = cc.find_library('Xpm', required : get_option('motif')) ++xt_dep = cc.find_library('Xt', required : get_option('motif')) ++xext_dep = cc.find_library('Xext', required : get_option('motif')) ++x11_dep = cc.find_library('X11', required : get_option('motif')) + + # image formats + read_srcs = [ 'readers.c', 'rd/read-ppm.c', 'rd/read-bmp.c', +- 'rd/read-jpeg.c', 'rd/read-png.c', 'rd/read-tiff.c' ] ++ 'rd/read-jpeg.c' ] + write_srcs = [ 'writers.c', 'wr/write-ppm.c', 'wr/write-ps.c', +- 'wr/write-jpeg.c', 'wr/write-png.c', 'wr/write-tiff.c' ] ++ 'wr/write-jpeg.c' ] + image_deps = [ jpeg_dep, png_dep, tiff_dep, + pcd_dep, gif_dep, webp_dep ] + +@@ -57,11 +57,21 @@ if pcd_dep.found() + read_srcs += 'rd/read-pcd.c' + config.set('HAVE_LIBPCD', true) + endif +-if gif_dep.found() ++if get_option('png').enabled() ++ read_srcs += 'rd/read-png.c' ++ write_srcs += 'wr/write-png.c' ++ config.set('HAVE_LIBPNG', true) ++endif ++if get_option('tiff').enabled() ++ read_srcs += 'rd/read-tiff.c' ++ write_srcs += 'wr/write-tiff.c' ++ config.set('HAVE_LIBTIFF', true) ++endif ++if get_option('gif').enabled() + read_srcs += 'rd/read-gif.c' + config.set('HAVE_LIBGIF', true) + endif +-if webp_dep.found() ++if get_option('webp').enabled() + read_srcs += 'rd/read-webp.c' + config.set('HAVE_LIBWEBP', true) + endif +@@ -168,7 +181,7 @@ ida_srcs = [ 'ida.c', 'man.c', 'hex.c', 'x11.c', 'viewer.c', + ida_deps = [ pixman_dep, exif_dep, image_deps, math_dep, + motif_dep, xpm_dep, xt_dep, xext_dep, x11_dep ] + +-if motif_dep.found() ++if get_option('motif').enabled() + executable('ida', + sources : ida_srcs, + dependencies : ida_deps, +diff --git a/meson_options.txt b/meson_options.txt +new file mode 100644 +index 0000000..ce37188 +--- /dev/null ++++ b/meson_options.txt +@@ -0,0 +1,5 @@ ++option('gif', type: 'feature', value : 'enabled') ++option('png', type: 'feature', value : 'enabled') ++option('tiff', type: 'feature', value : 'enabled') ++option('webp', type: 'feature', value : 'disabled') ++option('motif', type: 'feature', value : 'disabled') +diff --git a/selections.c b/selections.c +index 7b16264..ccdc686 100644 +--- a/selections.c ++++ b/selections.c +@@ -609,8 +609,12 @@ void ipc_init() + #ifdef HAVE_LIBGIF + targets[ntargets++] = MIME_IMAGE_GIF; + #endif ++#ifdef HAVE_LIBPNG + targets[ntargets++] = MIME_IMAGE_PNG; ++#endif ++#ifdef HAVE_LIBTIFF + targets[ntargets++] = MIME_IMAGE_TIFF; ++#endif + targets[ntargets++] = XA_PIXMAP; + targets[ntargets++] = XA_STRING; + +-- +2.37.3 + diff --git a/meta-oe/recipes-graphics/fbida/files/0003-meson.build-do-not-require-xkbcommon.patch b/meta-oe/recipes-graphics/fbida/files/0003-meson.build-do-not-require-xkbcommon.patch new file mode 100644 index 0000000000..e769014131 --- /dev/null +++ b/meta-oe/recipes-graphics/fbida/files/0003-meson.build-do-not-require-xkbcommon.patch @@ -0,0 +1,27 @@ +From ec82a194f3454ac203a134c9a99bac6d63095d25 Mon Sep 17 00:00:00 2001 +From: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> +Date: Fri, 16 Sep 2022 18:29:03 +0200 +Subject: [PATCH] meson.build: do not require xkbcommon + +Upstream-Status: Pending +Signed-off-by: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 341939c..b5dab14 100644 +--- a/meson.build ++++ b/meson.build +@@ -26,7 +26,7 @@ tiff_dep = dependency('libtiff-4', required: get_option('tiff')) + webp_dep = dependency('libwebp', required : get_option('webp')) + udev_dep = dependency('libudev') + input_dep = dependency('libinput') +-xkb_dep = dependency('xkbcommon') ++xkb_dep = dependency('xkbcommon', required : false) + tsm_dep = dependency('libtsm', required : false) + + # other library deps +-- +2.37.3 + diff --git a/meta-oe/recipes-graphics/fbida/files/cairo-weak-detect.patch b/meta-oe/recipes-graphics/fbida/files/cairo-weak-detect.patch deleted file mode 100644 index c7c579cc41..0000000000 --- a/meta-oe/recipes-graphics/fbida/files/cairo-weak-detect.patch +++ /dev/null @@ -1,17 +0,0 @@ -OE configures cairo to disable EGL support, however fbida expects cairo with egl support -this patch therefore makes it possible to set HAVE_CAIRO_GL via recipe - -Upstream-Status: Inappropriate [OE-Specific] -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -67,7 +67,7 @@ define make-config - LIB := $(LIB) - RESDIR := $(call ac_resdir) - HAVE_LINUX_FB_H := $(call ac_header,linux/fb.h) --HAVE_CAIRO_GL := $(call ac_pkg_config,cairo-gl) -+HAVE_CAIRO_GL ?= $(call ac_pkg_config,cairo-gl) - HAVE_LIBPCD := $(call ac_lib,pcd_open,pcd) - HAVE_LIBGIF := $(call ac_lib,DGifOpenFileName,gif) - HAVE_LIBWEBP := $(call ac_pkg_config,libwebp) diff --git a/meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch b/meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch index cdeac996a1..ef70a070dd 100644 --- a/meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch +++ b/meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/scripts/jpeg-version.sh +++ b/scripts/jpeg-version.sh @@ -1,2 +1,2 @@ diff --git a/meta-oe/recipes-graphics/fbida/files/support-jpeg-turbo.patch b/meta-oe/recipes-graphics/fbida/files/support-jpeg-turbo.patch index 05cd74da92..719c096e2b 100644 --- a/meta-oe/recipes-graphics/fbida/files/support-jpeg-turbo.patch +++ b/meta-oe/recipes-graphics/fbida/files/support-jpeg-turbo.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Add patch by Ondrej Sury to migrate to libjpeg-turbo (Closes: #763263) Index: fbida-2.10/jpeg/62/jpegcomp.h diff --git a/meta-oe/recipes-graphics/fbida/files/use-jpeg-turbo.patch b/meta-oe/recipes-graphics/fbida/files/use-jpeg-turbo.patch deleted file mode 100644 index 99639554c2..0000000000 --- a/meta-oe/recipes-graphics/fbida/files/use-jpeg-turbo.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: fbida-2.10/GNUmakefile -=================================================================== ---- fbida-2.10.orig/GNUmakefile -+++ fbida-2.10/GNUmakefile -@@ -51,7 +51,7 @@ HAVE_LIBSANE := $(call ac_lib,sane_init, - HAVE_LIBCURL := $(call ac_lib,curl_easy_init,curl) - HAVE_LIBLIRC := $(call ac_lib,lirc_init,lirc_client) - HAVE_MOTIF := $(call ac_lib,XmStringGenerate,Xm,-L/usr/X11R6/$(LIB) -lXpm -lXt -lXext -lX11) --JPEG_VER := $(call ac_jpeg_ver) -+JPEG_VER := 62 - endef - - # transposing diff --git a/meta-oe/recipes-graphics/feh/feh_3.9.1.bb b/meta-oe/recipes-graphics/feh/feh_3.10.bb index d78fe7e17d..0f0e61893a 100644 --- a/meta-oe/recipes-graphics/feh/feh_3.9.1.bb +++ b/meta-oe/recipes-graphics/feh/feh_3.10.bb @@ -10,7 +10,7 @@ DEPENDS = "\ " SRC_URI = "https://feh.finalrewind.org/feh-${PV}.tar.bz2" -SRC_URI[sha256sum] = "455c92711b588af149b945edc5c145f3e9aa137ed9689dabed49d5e4acac75fa" +SRC_URI[sha256sum] = "1d71d1f6dcfe9ffee5e2766969a11978f7eb4fac7d7ae556f104c11f9c57cc98" inherit mime-xdg features_check # depends on virtual/libx11 diff --git a/meta-oe/recipes-graphics/freeglut/freeglut_3.4.0.bb b/meta-oe/recipes-graphics/freeglut/freeglut_3.4.0.bb index 86b94149bc..b433900bb0 100644 --- a/meta-oe/recipes-graphics/freeglut/freeglut_3.4.0.bb +++ b/meta-oe/recipes-graphics/freeglut/freeglut_3.4.0.bb @@ -16,8 +16,9 @@ PACKAGECONFIG[gles] = "-DFREEGLUT_GLES=ON,-DFREEGLUT_GLES=OFF," PACKAGECONFIG[wayland] = "-DFREEGLUT_WAYLAND=ON,-DFREEGLUT_WAYLAND=OFF,libxkbcommon" PACKAGECONFIG[demos] = "-DFREEGLUT_BUILD_DEMOS=ON,-DFREEGLUT_BUILD_DEMOS=OFF," PACKAGECONFIG[x11] = ",,virtual/libx11 libice libxmu libglu libxrandr libxext" -# Do not use -fno-common, check back when upgrading to new version it might not be needed -CFLAGS += "-fcommon" +# Add -Wno-implicit-function-declaration since it might be otherwise treated at +# error by clang16+ and this is not really a problem +CFLAGS += "-Wno-implicit-function-declaration" PROVIDES += "mesa-glut" diff --git a/meta-oe/recipes-graphics/ftgl/ftgl/0001-use-pkg-config-to-find-freetype2.patch b/meta-oe/recipes-graphics/ftgl/ftgl/0001-use-pkg-config-to-find-freetype2.patch index cf03cd0f29..e5ed0bdb86 100644 --- a/meta-oe/recipes-graphics/ftgl/ftgl/0001-use-pkg-config-to-find-freetype2.patch +++ b/meta-oe/recipes-graphics/ftgl/ftgl/0001-use-pkg-config-to-find-freetype2.patch @@ -6,7 +6,7 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Upstream-Status: inappropriate [OE specific] +Upstream-Status: Inappropriate [OE specific] Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- diff --git a/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch b/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch index 50003e3318..4886248233 100644 --- a/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch +++ b/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch @@ -10,7 +10,7 @@ COMPAT_OLD_KEYSYMDEF is a check for a legacy system, which our system most definitely is not. It is accomplished by trying to execute a program, which does not work when cross compiling. -Upstream-Status: inappropriate [OE specific] +Upstream-Status: Inappropriate [OE specific] Signed-off-by: Jarmo Jaakkola <jarmo.jaakkola@vincit.fi> Signed-off-by: Riku Hämäläinen <riku.hamalainen@ge.com> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> diff --git a/meta-oe/recipes-graphics/glm/glm/0001-Do-not-use-Werror-with-clang.patch b/meta-oe/recipes-graphics/glm/glm/0001-Do-not-use-Werror-with-clang.patch new file mode 100644 index 0000000000..dee2749898 --- /dev/null +++ b/meta-oe/recipes-graphics/glm/glm/0001-Do-not-use-Werror-with-clang.patch @@ -0,0 +1,32 @@ +From ee405855bca7d6399ff1a1aef952010056c84ff6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 1 Mar 2023 21:08:09 -0800 +Subject: [PATCH] Do not use -Werror with clang + +Too many warnings to handle for a distro build + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + test/CMakeLists.txt | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index e7f85f19..0b6fd980 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -197,10 +197,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") + message("GLM: Clang - ${CMAKE_CXX_COMPILER_ID} compiler") + endif() + +- add_compile_options(-Werror -Weverything) +- add_compile_options(-Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-c++11-long-long -Wno-padded -Wno-gnu-anonymous-struct -Wno-nested-anon-types) +- add_compile_options(-Wno-undefined-reinterpret-cast -Wno-sign-conversion -Wno-unused-variable -Wno-missing-prototypes -Wno-unreachable-code -Wno-missing-variable-declarations -Wno-sign-compare -Wno-global-constructors -Wno-unused-macros -Wno-format-nonliteral) +- + elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU") + if(NOT GLM_QUIET) + message("GLM: GCC - ${CMAKE_CXX_COMPILER_ID} compiler") +-- +2.39.2 + diff --git a/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch b/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch index 3a62fffe3a..10692dd423 100644 --- a/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch +++ b/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch @@ -26,8 +26,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> test/gtx/gtx_fast_trigonometry.cpp | 30 ++++++++++++------------------ 3 files changed, 14 insertions(+), 20 deletions(-) -diff --git a/glm/ext/quaternion_common.inl b/glm/ext/quaternion_common.inl -index 0e4a3bb2..6f99f52d 100644 --- a/glm/ext/quaternion_common.inl +++ b/glm/ext/quaternion_common.inl @@ -104,7 +104,7 @@ namespace glm @@ -39,21 +37,6 @@ index 0e4a3bb2..6f99f52d 100644 return (sin(angle - a * phi)* x + sin(a * phi) * z) / sin(angle); } } -diff --git a/glm/gtc/random.inl b/glm/gtc/random.inl -index 70485098..a4af2a06 100644 ---- a/glm/gtc/random.inl -+++ b/glm/gtc/random.inl -@@ -22,7 +22,7 @@ namespace detail - GLM_FUNC_QUALIFIER static vec<1, uint8, P> call() - { - return vec<1, uint8, P>( -- std::rand() % std::numeric_limits<uint8>::max()); -+ static_cast<uint8>(std::rand()) % std::numeric_limits<uint8>::max()); - } - }; - -diff --git a/test/gtx/gtx_fast_trigonometry.cpp b/test/gtx/gtx_fast_trigonometry.cpp -index 8bf86ba0..ddaa708b 100644 --- a/test/gtx/gtx_fast_trigonometry.cpp +++ b/test/gtx/gtx_fast_trigonometry.cpp @@ -19,15 +19,14 @@ namespace fastCos @@ -160,6 +143,3 @@ index 8bf86ba0..ddaa708b 100644 const std::clock_t timestamp3 = std::clock(); const std::clock_t time_fast = timestamp2 - timestamp1; const std::clock_t time_default = timestamp3 - timestamp2; --- -2.31.1 - diff --git a/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb b/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb index 9edcb2b6e1..3797314b47 100644 --- a/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb +++ b/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb @@ -11,19 +11,19 @@ LIC_FILES_CHKSUM = "file://copying.txt;md5=462e4b97f73ef12f8171c3c546ce4e8d" SRC_URI = " \ git://github.com/g-truc/glm;branch=master;protocol=https \ file://0001-Silence-clang-warnings.patch \ + file://0001-Do-not-use-Werror-with-clang.patch \ file://glmConfig.cmake.in \ file://glmConfigVersion.cmake.in \ file://glm.pc.in \ file://glmTargets.cmake \ " -SRCREV = "bf71a834948186f4097caa076cd2663c69a10e1e" +SRCREV = "efec5db081e3aad807d0731e172ac597f6a39447" +PV .= "+0.9.9.9+git${SRCPV}" S = "${WORKDIR}/git" inherit cmake -CXXFLAGS:append:toolchain-clang = " -Wno-error=invalid-utf8 -Wno-error=disabled-macro-expansion -Wno-error=reserved-identifier" - do_install() { install -d ${D}${includedir} ${D}${docdir}/glm ${D}${libdir}/pkgconfig ${D}${libdir}/cmake/glm cp -R --no-dereference --preserve=mode,links ${S}/glm ${D}${includedir} diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-Match-prototypes-of-callbacks-with-libgphoto.patch b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-Match-prototypes-of-callbacks-with-libgphoto.patch new file mode 100644 index 0000000000..abe38e12ce --- /dev/null +++ b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-Match-prototypes-of-callbacks-with-libgphoto.patch @@ -0,0 +1,50 @@ +From 366930ccc1a261c3eb883da2bf3c655162ccd75f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 1 Mar 2023 22:58:37 -0800 +Subject: [PATCH] Match prototypes of callbacks with libgphoto + +In https://github.com/gphoto/gphoto2/pull/535/commits/ccc4c1f092bd21ebc713f4d7b9be85be49f92f1e +we tried to fix by using pthread_t but it also needs to make changes in +libgphoto and these changes can be invasive, therefore lets revert to +older types and to fix musl problem fix it via type casts + +Upstream-Status: Submitted [https://github.com/gphoto/gphoto2/pull/569] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gphoto2/main.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/gphoto2/main.c b/gphoto2/main.c +index 0dac947..cd3c990 100644 +--- a/gphoto2/main.c ++++ b/gphoto2/main.c +@@ -1198,7 +1198,7 @@ thread_func (void *data) + pthread_cleanup_pop (1); + } + +-static pthread_t ++static unsigned int + start_timeout_func (Camera *camera, unsigned int timeout, + CameraTimeoutFunc func, void __unused__ *data) + { +@@ -1215,14 +1215,14 @@ start_timeout_func (Camera *camera, unsigned int timeout, + + pthread_create (&tid, NULL, thread_func, td); + +- return (tid); ++ return (unsigned int)tid; + } + + static void +-stop_timeout_func (Camera __unused__ *camera, pthread_t id, ++stop_timeout_func (Camera __unused__ *camera, unsigned int id, + void __unused__ *data) + { +- pthread_t tid = id; ++ pthread_t tid = (pthread_t)id; + + pthread_cancel (tid); + pthread_join (tid, NULL); +-- +2.39.2 + diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch index eaef8180ee..14976ffb72 100644 --- a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch +++ b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch @@ -6,6 +6,8 @@ Subject: [PATCH] configure.ac remove AM_PO_SUBDIRS This is done twice together with oe autotools.bbclass. --- +Upstream-Status: Pending + configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb b/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb index fe33940475..513845194d 100644 --- a/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb +++ b/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb @@ -9,6 +9,7 @@ RDEPENDS:gphoto2 = "libgphoto2" SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2;name=gphoto2 \ file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \ file://0001-gphoto2-Use-pthread_t-abstract-type-for-thead-IDs.patch \ + file://0001-Match-prototypes-of-callbacks-with-libgphoto.patch \ " SRC_URI[gphoto2.sha256sum] = "2a648dcdf12da19e208255df4ebed3e7d2a02f905be4165f2443c984cf887375" diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure-Filter-out-buildpaths-from-CC.patch b/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure-Filter-out-buildpaths-from-CC.patch new file mode 100644 index 0000000000..570bb3e4c1 --- /dev/null +++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure-Filter-out-buildpaths-from-CC.patch @@ -0,0 +1,48 @@ +From 06be633b8f4e2241bd37d4faf62b49606ad778e7 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 25 May 2023 19:01:36 -0700 +Subject: [PATCH] configure: Filter out buildpaths from CC + +Upstream-Status: Inappropriate [Cross-compile specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 4 +++- + libgphoto2_port/configure.ac | 6 ++++-- + 2 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 17216b1..39c8cc4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -261,7 +261,9 @@ GP_CONFIG_MSG([Compiler],[${CC}]) + GP_CONFIG_MSG([libltdl includes],[$LTDLINCL]) + GP_CONFIG_MSG([libltdl library],[$LIBLTDL]) + +-AC_DEFINE_UNQUOTED([HAVE_CC], ["$CC"], ++CC_NO_SYSROOT=`echo $CC | sed -e \ ++ 's|--sysroot=.*\b||g'` ++AC_DEFINE_UNQUOTED([HAVE_CC], ["$CC_NO_SYSROOT"], + [The C compiler we are using]) + + +diff --git a/libgphoto2_port/configure.ac b/libgphoto2_port/configure.ac +index 1086b8e..59f3c34 100644 +--- a/libgphoto2_port/configure.ac ++++ b/libgphoto2_port/configure.ac +@@ -103,8 +103,10 @@ GP_CONFIG_MSG([Compiler],[${CC}]) + GP_CONFIG_MSG([libltdl includes],[$LTDLINCL]) + GP_CONFIG_MSG([libltdl library],[$LIBLTDL]) + +-AC_DEFINE_UNQUOTED([HAVE_CC], ["$CC"], +- [The C compiler we're using]) ++CC_NO_SYSROOT=`echo $CC | sed -e \ ++ 's|--sysroot=.*\b||g'` ++AC_DEFINE_UNQUOTED([HAVE_CC], ["$CC_NO_SYSROOT"], ++ [The C compiler we are using]) + + AM_CPPFLAGS="" + +-- +2.40.1 + diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.30.bb b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.30.bb index 0f2800a95f..b1fb7579ee 100644 --- a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.30.bb +++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.30.bb @@ -12,6 +12,7 @@ DEPENDS = "libtool jpeg virtual/libusb0 libexif zlib libxml2" SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2;name=libgphoto2 \ file://40-libgphoto2.rules \ file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \ + file://0001-configure-Filter-out-buildpaths-from-CC.patch \ " SRC_URI[libgphoto2.sha256sum] = "ee61a1dac6ad5cf711d114e06b90a6d431961a6e7ec59f4b757a7cd77b1c0fb4" @@ -32,12 +33,6 @@ do_configure:append() { cp ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/libgphoto2_port/po/ cd ${S}/libgphoto2_port/ autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths - - # remove WORKDIR information from config to improve reproducibility - # libgphoto2_port recheck config will set the WORKDIR info again, so dont do that - sed -i 's/'$(echo ${WORKDIR} | sed 's_/_\\/_g')'/../g' ${B}/config.h - sed -i 's/'$(echo ${WORKDIR} | sed 's_/_\\/_g')'/../g' ${B}/libgphoto2_port/config.status - sed -i '/config\.status/ s/\-\-recheck//' ${B}/libgphoto2_port/Makefile cd ${S} } diff --git a/meta-oe/recipes-graphics/graphene/graphene_1.10.8.bb b/meta-oe/recipes-graphics/graphene/graphene_1.10.8.bb deleted file mode 100644 index 813ff74adf..0000000000 --- a/meta-oe/recipes-graphics/graphene/graphene_1.10.8.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "A thin layer of graphic data types" -HOMEPAGE = "http://ebassi.github.io/graphene/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a7d871d9e23c450c421a85bb2819f648" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gobject-introspection gtk-doc - -SRC_URI[archive.sha256sum] = "a37bb0e78a419dcbeaa9c7027bcff52f5ec2367c25ec859da31dfde2928f279a" - -# gtk4 & mutter 41.0 requires graphene build with introspection -PACKAGECONFIG ?= "introspection" -PACKAGECONFIG[introspection] = "-Dintrospection=enabled,-Dintrospection=disabled," - -GTKDOC_MESON_OPTION = "gtk_doc" - -EXTRA_OEMESON = "-Dinstalled_tests=false" - -FILES:${PN} += "${libdir}/graphene-1.0" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch b/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch index 6d1d441c57..99b53e2e12 100644 --- a/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch +++ b/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch @@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> --- a/configure.ac +++ b/configure.ac -@@ -1540,7 +1540,7 @@ AC_ARG_ENABLE(tcl, +@@ -1225,7 +1225,7 @@ AC_ARG_ENABLE(tcl, [], [enable_tcl=yes]) if test "x$enable_tcl" != "xyes"; then @@ -22,12 +22,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> if test "x$use_tcl" = "x"; then --- a/Makefile.am +++ b/Makefile.am -@@ -19,7 +19,7 @@ pkginclude_HEADERS = $(top_builddir)/gra - man_MANS = graphviz.7 +@@ -11,7 +11,7 @@ pkginclude_HEADERS = $(top_builddir)/gra + dist_man_MANS = graphviz.7 # $(subdirs) contains the list from: AC_CONFIG_SUBDIRS --SUBDIRS = $(subdirs) lib plugin cmd tclpkg doc contrib share graphs rtest tests -+SUBDIRS = $(subdirs) lib plugin cmd doc contrib share graphs rtest tests +-SUBDIRS = $(subdirs) lib plugin cmd tclpkg doc contrib share graphs tests ++SUBDIRS = $(subdirs) lib plugin cmd doc contrib share graphs tests .PHONY: doxygen doxygen: diff --git a/meta-oe/recipes-graphics/graphviz/graphviz/0001-Use-native-mkdefs.patch b/meta-oe/recipes-graphics/graphviz/graphviz/0001-Use-native-mkdefs.patch deleted file mode 100644 index 76ff08f63c..0000000000 --- a/meta-oe/recipes-graphics/graphviz/graphviz/0001-Use-native-mkdefs.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5e53b643615fd53f3ff960521bbe9d95641e5f68 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Sun, 20 Jan 2019 23:58:29 +0100 -Subject: [PATCH] Use native mkdefs -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - lib/gvpr/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/lib/gvpr/Makefile.am -+++ b/lib/gvpr/Makefile.am -@@ -59,7 +59,7 @@ mkdefs$(EXEEXT): - $(HOSTCC) $(srcdir)/mkdefs.c -o mkdefs$(EXEEXT) - - gdefs.h: $(top_srcdir)/lib/gvpr/gprdata mkdefs$(EXEEXT) -- ./mkdefs$(EXEEXT) gdefs.h < $(top_srcdir)/lib/gvpr/gprdata -+ mkdefs$(EXEEXT) gdefs.h < $(top_srcdir)/lib/gvpr/gprdata - - EXTRA_DIST = $(man_MANS) $(pdf_DATA) gprdata mkdefs.c gdefs.h trie.c gvprlib.vcxproj* - diff --git a/meta-oe/recipes-graphics/graphviz/graphviz/0001-plugin-pango-Include-freetype-headers-explicitly.patch b/meta-oe/recipes-graphics/graphviz/graphviz/0001-plugin-pango-Include-freetype-headers-explicitly.patch deleted file mode 100644 index dd79510560..0000000000 --- a/meta-oe/recipes-graphics/graphviz/graphviz/0001-plugin-pango-Include-freetype-headers-explicitly.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 926d9285f3367ae1bdb9ce1dce95f7de73b3a980 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 6 Aug 2019 12:42:19 -0700 -Subject: [PATCH] plugin/pango: Include freetype headers explicitly -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Do not depend on pango automatically adding these headers -Fixes -| gvtextlayout_pango.c:140:10: error: unknown type name ‘FT_Face’ -| FT_Face face; -| ^~~~~~~ - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - plugin/pango/gvtextlayout_pango.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/plugin/pango/gvtextlayout_pango.c -+++ b/plugin/pango/gvtextlayout_pango.c -@@ -15,6 +15,10 @@ - - #include <stdlib.h> - #include <string.h> -+ -+#include <ft2build.h> -+#include FT_FREETYPE_H -+ - #include "gvplugin_render.h" - #include "agxbuf.h" - #include "utils.h" diff --git a/meta-oe/recipes-graphics/graphviz/graphviz_2.50.0.bb b/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb index 967b9321b8..ccc114007c 100644 --- a/meta-oe/recipes-graphics/graphviz/graphviz_2.50.0.bb +++ b/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb @@ -4,7 +4,6 @@ LICENSE = "EPL-1.0" LIC_FILES_CHKSUM = "file://COPYING;md5=9109f5fc16cf963fb3cdd32781b3ce04" DEPENDS = " \ - intltool-native \ bison-native \ groff-native \ libtool \ @@ -28,17 +27,12 @@ SRC_URI:append:class-target = "\ SRC_URI:append:class-nativesdk = "\ file://graphviz-setup.sh \ " - -SRC_URI[sha256sum] = "6b16bf990df114195be669773a1dae975dbbffada45e1de2849ddeb5851bb9a8" - -CVE_CHECK_IGNORE += "\ - CVE-2014-9157 \ -" +SRC_URI[sha256sum] = "d593695fdaa8a19297523b679ad13d3ef2027b0b7f14cc2bc23e77969ed81565" PACKAGECONFIG ??= "librsvg" PACKAGECONFIG[librsvg] = "--with-librsvg,--without-librsvg,librsvg" -EXTRA_OECONF:append = " PS2PDF=/bin/echo" +EXTRA_OECONF:append = " PS2PDF=/bin/echo --disable-man-pdfs" EXTRA_OECONF:class-target = "\ --with-expatincludedir=${STAGING_INCDIR} \ diff --git a/meta-oe/recipes-graphics/gtkperf/gtkperf/0001-Include-stdlib.h-for-exit-API.patch b/meta-oe/recipes-graphics/gtkperf/gtkperf/0001-Include-stdlib.h-for-exit-API.patch index d529ddd234..949151a827 100644 --- a/meta-oe/recipes-graphics/gtkperf/gtkperf/0001-Include-stdlib.h-for-exit-API.patch +++ b/meta-oe/recipes-graphics/gtkperf/gtkperf/0001-Include-stdlib.h-for-exit-API.patch @@ -14,6 +14,8 @@ http://sources.debian.net/src/gtkperf/0.40%2Bds-2/debian/patches/01-include_stdl Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-graphics/gtkperf/gtkperf/0002-timing.c-Fix-format-security-errors.patch b/meta-oe/recipes-graphics/gtkperf/gtkperf/0002-timing.c-Fix-format-security-errors.patch index 0548040af7..f975acabad 100644 --- a/meta-oe/recipes-graphics/gtkperf/gtkperf/0002-timing.c-Fix-format-security-errors.patch +++ b/meta-oe/recipes-graphics/gtkperf/gtkperf/0002-timing.c-Fix-format-security-errors.patch @@ -5,6 +5,8 @@ Subject: [PATCH 2/2] timing.c: Fix format-security errors Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/timing.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-graphics/imlib2/imlib2_git.bb b/meta-oe/recipes-graphics/imlib2/imlib2_git.bb index 869f8123db..9b8849b589 100644 --- a/meta-oe/recipes-graphics/imlib2/imlib2_git.bb +++ b/meta-oe/recipes-graphics/imlib2/imlib2_git.bb @@ -37,3 +37,6 @@ PACKAGES =+ "${BPN}-loaders ${BPN}-filters ${BPN}-data" FILES:${PN}-data = "${datadir}" FILES:imlib2-loaders = "${libdir}/imlib2/loaders/*.so" FILES:imlib2-filters = "${libdir}/imlib2/filters/*.so" + +inherit multilib_script +MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/imlib2-config" diff --git a/meta-oe/recipes-graphics/jasper/jasper_2.0.33.bb b/meta-oe/recipes-graphics/jasper/jasper_2.0.33.bb index 27dff82df5..85da5bfb4d 100644 --- a/meta-oe/recipes-graphics/jasper/jasper_2.0.33.bb +++ b/meta-oe/recipes-graphics/jasper/jasper_2.0.33.bb @@ -6,9 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a80440d1d8f17d041c71c7271d6e06eb" SRC_URI = "git://github.com/jasper-software/jasper.git;protocol=https;branch=master" SRCREV = "fe00207dc10db1d7cc6f2757961c5c6bdfd10973" -CVE_CHECK_IGNORE += "\ - CVE-2015-8751 \ -" +CVE_STATUS[CVE-2015-8751] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/libdecor/libdecor/0001-libdecor-gtk.c-dont-skip-for-conflicting-symbols.patch b/meta-oe/recipes-graphics/libdecor/libdecor/0001-libdecor-gtk.c-dont-skip-for-conflicting-symbols.patch new file mode 100644 index 0000000000..9ecbdf3b37 --- /dev/null +++ b/meta-oe/recipes-graphics/libdecor/libdecor/0001-libdecor-gtk.c-dont-skip-for-conflicting-symbols.patch @@ -0,0 +1,33 @@ +From fb6eb15b34b5b07a431bb4c3585341411a3e088f Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Tue, 28 Feb 2023 13:42:18 +0100 +Subject: [PATCH] libdecor-gtk.c: dont skip for conflicting_symbols + +This is a hack that should be removed, once the underlying bug in glibc was fixed and +libdecor was updated to use dlmopen() instead of dlopen() + +https://gitlab.freedesktop.org/libdecor/libdecor/-/issues/47 +https://gitlab.freedesktop.org/libdecor/libdecor/-/issues/44 + +--- +Upstream-Status: Pending + + src/plugins/gtk/libdecor-gtk.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/gtk/libdecor-gtk.c b/src/plugins/gtk/libdecor-gtk.c +index 228161e..fd91afb 100644 +--- a/src/plugins/gtk/libdecor-gtk.c ++++ b/src/plugins/gtk/libdecor-gtk.c +@@ -2606,7 +2606,7 @@ libdecor_plugin_description = { + .priorities = priorities, + .constructor = libdecor_plugin_new, + .conflicting_symbols = { +- "png_free", ++ //"png_free", + NULL, + }, + }; +-- +2.34.1 + diff --git a/meta-oe/recipes-graphics/libdecor/libdecor_0.1.1.bb b/meta-oe/recipes-graphics/libdecor/libdecor_0.1.99.bb index 4e396d83e9..ed0b05f41f 100644 --- a/meta-oe/recipes-graphics/libdecor/libdecor_0.1.1.bb +++ b/meta-oe/recipes-graphics/libdecor/libdecor_0.1.99.bb @@ -2,25 +2,28 @@ SUMMARY = "libdecor - A client-side decorations library for Wayland clients" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=7ae2be7fb1637141840314b51970a9f7" -SRC_URI = "git://gitlab.gnome.org/jadahl/libdecor.git;protocol=https;branch=master" +SRC_URI = " \ + git://gitlab.freedesktop.org/libdecor/libdecor.git;protocol=https;branch=master \ + file://0001-libdecor-gtk.c-dont-skip-for-conflicting-symbols.patch \ +" DEPENDS = " \ - cairo \ - pango \ - wayland \ - wayland-native \ - wayland-protocols \ + cairo \ + pango \ + wayland \ + wayland-native \ + wayland-protocols \ " S = "${WORKDIR}/git" -SRCREV = "e87dcfdaf83f332fa83b43c804fcf93c151ff0f5" +SRCREV = "a254d0c2ff0cbfcf0bbf14cc67cc403640880c01" -PACKAGECONFIG ?= "dbus ${@bb.utils.filter('DISTRO_FEATURES', 'gtk3 opengl', d)}" +PACKAGECONFIG ?= "dbus ${@bb.utils.filter('DISTRO_FEATURES', 'gtk+3', d)}" PACKAGECONFIG[dbus] = "-Ddbus=enabled,-Ddbus=disabled,dbus" PACKAGECONFIG[demo] = "-Ddemo=true,-Ddemo=false,virtual/libegl libxkbcommon" -PACKAGECONFIG[gtk3] = "-Dgtk=enabled,-Dgtk=disabled,gtk+3" -PACKAGECONFIG[opengl] = ",,virtual/libgl" +PACKAGECONFIG[install_demo] = "-Dinstall_demo=true,-Dinstall_demo=false" +PACKAGECONFIG[gtk+3] = "-Dgtk=enabled,-Dgtk=disabled,gtk+3" inherit meson pkgconfig diff --git a/meta-oe/recipes-graphics/libforms/files/add-absolute-path-for-include-dir.patch b/meta-oe/recipes-graphics/libforms/files/add-absolute-path-for-include-dir.patch index db400f7022..4836b46b11 100644 --- a/meta-oe/recipes-graphics/libforms/files/add-absolute-path-for-include-dir.patch +++ b/meta-oe/recipes-graphics/libforms/files/add-absolute-path-for-include-dir.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -Naur xforms-1.2.3.orig/fdesign/Makefile.am xforms-1.2.3/fdesign/Makefile.am --- xforms-1.2.3.orig/fdesign/Makefile.am 2019-02-24 12:58:51.968645873 +0000 +++ xforms-1.2.3/fdesign/Makefile.am 2019-02-24 13:00:48.500635163 +0000 diff --git a/meta-oe/recipes-graphics/libforms/files/fix-link-to-xforms-man.patch b/meta-oe/recipes-graphics/libforms/files/fix-link-to-xforms-man.patch index c95bd18da8..9ab67b35ac 100644 --- a/meta-oe/recipes-graphics/libforms/files/fix-link-to-xforms-man.patch +++ b/meta-oe/recipes-graphics/libforms/files/fix-link-to-xforms-man.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -Naur xforms-1.2.3.orig/lib/Makefile.am xforms-1.2.3/lib/Makefile.am --- xforms-1.2.3.orig/lib/Makefile.am 2019-02-24 12:53:58.340678373 +0000 +++ xforms-1.2.3/lib/Makefile.am 2019-02-24 12:54:33.096674102 +0000 diff --git a/meta-oe/recipes-graphics/libforms/files/fix-path-fdesign_LDADD.patch b/meta-oe/recipes-graphics/libforms/files/fix-path-fdesign_LDADD.patch index 73956dee9f..dc494281b2 100644 --- a/meta-oe/recipes-graphics/libforms/files/fix-path-fdesign_LDADD.patch +++ b/meta-oe/recipes-graphics/libforms/files/fix-path-fdesign_LDADD.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -Naur xforms-1.2.3.orig/fdesign/Makefile.am xforms-1.2.3/fdesign/Makefile.am --- xforms-1.2.3.orig/fdesign/Makefile.am 2019-02-24 13:08:48.412603250 +0000 +++ xforms-1.2.3/fdesign/Makefile.am 2019-02-24 13:09:18.412601874 +0000 diff --git a/meta-oe/recipes-graphics/libforms/libforms_1.2.5pre1.bb b/meta-oe/recipes-graphics/libforms/libforms_1.2.5pre1.bb index 52bddbd0de..251c07adf0 100644 --- a/meta-oe/recipes-graphics/libforms/libforms_1.2.5pre1.bb +++ b/meta-oe/recipes-graphics/libforms/libforms_1.2.5pre1.bb @@ -20,7 +20,7 @@ REQUIRED_DISTRO_FEATURES = "opengl x11" S = "${WORKDIR}/xforms-${PV}" -DEPENDS = "libxpm jpeg libx11 mesa" +DEPENDS = "libxpm jpeg libx11 virtual/libgl" RDEPENDS:${PN} = "bash" EXTRA_OECONF = "--with-extra-inc=${S}/lib" diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-13616.patch b/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-13616.patch index 2db67966cf..d4166a16ab 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-13616.patch +++ b/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-13616.patch @@ -3,6 +3,8 @@ From: Sam Lantinga <slouken@libsdl.org> Date: Tue, 30 Jul 2019 11:00:00 -0700 Subject: [PATCH] Fixed bug 4538 - validate image size when loading BMP files --- +Upstream-Status: Pending + src/video/SDL_bmp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-image/0001-png-img-Fix-prototypes-of-callbacks.patch b/meta-oe/recipes-graphics/libsdl/libsdl-image/0001-png-img-Fix-prototypes-of-callbacks.patch new file mode 100644 index 0000000000..1bbfa99210 --- /dev/null +++ b/meta-oe/recipes-graphics/libsdl/libsdl-image/0001-png-img-Fix-prototypes-of-callbacks.patch @@ -0,0 +1,52 @@ +From 41791738221fdb7574fc8e23f84214910cdce098 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 1 Mar 2023 21:51:40 -0800 +Subject: [PATCH] png-img: Fix prototypes of callbacks + +Clang-16 is flagging function pointer mismatches + +Upstream-Status: Inappropriate [No upstream] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + IMG_png.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/IMG_png.c b/IMG_png.c +index 5f91f15..4d5bdb6 100644 +--- a/IMG_png.c ++++ b/IMG_png.c +@@ -78,15 +78,15 @@ + static struct { + int loaded; + void *handle; +- png_infop (*png_create_info_struct) (png_structp png_ptr); ++ png_infop (*png_create_info_struct) (png_const_structp png_ptr); + png_structp (*png_create_read_struct) (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warn_fn); + void (*png_destroy_read_struct) (png_structpp png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr); +- png_uint_32 (*png_get_IHDR) (png_structp png_ptr, png_infop info_ptr, png_uint_32 *width, png_uint_32 *height, int *bit_depth, int *color_type, int *interlace_method, int *compression_method, int *filter_method); +- png_voidp (*png_get_io_ptr) (png_structp png_ptr); +- png_byte (*png_get_channels) (png_structp png_ptr, png_infop info_ptr); +- png_uint_32 (*png_get_PLTE) (png_structp png_ptr, png_infop info_ptr, png_colorp *palette, int *num_palette); +- png_uint_32 (*png_get_tRNS) (png_structp png_ptr, png_infop info_ptr, png_bytep *trans, int *num_trans, png_color_16p *trans_values); +- png_uint_32 (*png_get_valid) (png_structp png_ptr, png_infop info_ptr, png_uint_32 flag); ++ png_uint_32 (*png_get_IHDR) (png_const_structp png_ptr, png_const_infop info_ptr, png_uint_32 *width, png_uint_32 *height, int *bit_depth, int *color_type, int *interlace_method, int *compression_method, int *filter_method); ++ png_voidp (*png_get_io_ptr) (png_const_structp png_ptr); ++ png_byte (*png_get_channels) (png_const_structp png_ptr, png_const_infop info_ptr); ++ png_uint_32 (*png_get_PLTE) (png_const_structp png_ptr, png_infop info_ptr, png_colorp *palette, int *num_palette); ++ png_uint_32 (*png_get_tRNS) (png_const_structp png_ptr, png_infop info_ptr, png_bytep *trans, int *num_trans, png_color_16p *trans_values); ++ png_uint_32 (*png_get_valid) (png_const_structp png_ptr, png_const_infop info_ptr, png_uint_32 flag); + void (*png_read_image) (png_structp png_ptr, png_bytepp image); + void (*png_read_info) (png_structp png_ptr, png_infop info_ptr); + void (*png_read_update_info) (png_structp png_ptr, png_infop info_ptr); +@@ -95,7 +95,7 @@ static struct { + void (*png_set_packing) (png_structp png_ptr); + void (*png_set_read_fn) (png_structp png_ptr, png_voidp io_ptr, png_rw_ptr read_data_fn); + void (*png_set_strip_16) (png_structp png_ptr); +- int (*png_sig_cmp) (png_bytep sig, png_size_t start, png_size_t num_to_check); ++ int (*png_sig_cmp) (png_const_bytep sig, png_size_t start, png_size_t num_to_check); + #ifndef LIBPNG_VERSION_12 + jmp_buf* (*png_set_longjmp_fn) (png_structp, png_longjmp_ptr, size_t); + #endif +-- +2.39.2 + diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-image/configure.patch b/meta-oe/recipes-graphics/libsdl/libsdl-image/configure.patch index 5299d378eb..102cec7288 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl-image/configure.patch +++ b/meta-oe/recipes-graphics/libsdl/libsdl-image/configure.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: SDL_image-1.2.12/configure.in =================================================================== --- SDL_image-1.2.12.orig/configure.in 2012-01-21 01:51:33.000000000 +0000 diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb b/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb index 5a93dc19a8..01137bb0ca 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb +++ b/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=613734b7586e1580ef944961c6d62227" DEPENDS = "tiff zlib libpng jpeg libsdl" SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz \ + file://0001-png-img-Fix-prototypes-of-callbacks.patch \ file://configure.patch" -SRC_URI[md5sum] = "a0f9098ebe5400f0bdc9b62e60797ecb" SRC_URI[sha256sum] = "0b90722984561004de84847744d566809dbb9daf732a9e503b91a1b5a84e5699" S = "${WORKDIR}/SDL_image-${PV}" diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-mixer/configure.patch b/meta-oe/recipes-graphics/libsdl/libsdl-mixer/configure.patch index 4c9e8d094c..7330ef61aa 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl-mixer/configure.patch +++ b/meta-oe/recipes-graphics/libsdl/libsdl-mixer/configure.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -Nurd SDL_mixer-1.2.12/configure.in SDL_mixer-1.2.12/configure.in --- SDL_mixer-1.2.12/configure.in 2012-01-16 00:01:05.000000000 +0200 +++ SDL_mixer-1.2.12/configure.in 2012-12-15 04:08:04.627871456 +0200 diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-net/am_foreign.patch b/meta-oe/recipes-graphics/libsdl/libsdl-net/am_foreign.patch index fb3ff7e689..7911a2aa75 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl-net/am_foreign.patch +++ b/meta-oe/recipes-graphics/libsdl/libsdl-net/am_foreign.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -Nurd SDL_net-1.2.8/Makefile.am SDL_net-1.2.8/Makefile.am --- SDL_net-1.2.8/Makefile.am 2012-01-15 18:20:10.000000000 +0200 +++ SDL_net-1.2.8/Makefile.am 2014-08-01 21:18:52.720815807 +0300 diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-net/libtool2.patch b/meta-oe/recipes-graphics/libsdl/libsdl-net/libtool2.patch index 9718a3b94a..e491c1abce 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl-net/libtool2.patch +++ b/meta-oe/recipes-graphics/libsdl/libsdl-net/libtool2.patch @@ -3,6 +3,8 @@ From: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> Date: Wed, 17 Oct 2012 20:51:51 +0200 --- +Upstream-Status: Pending + configure.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-ttf/use.pkg-config.for.freetype2.patch b/meta-oe/recipes-graphics/libsdl/libsdl-ttf/use.pkg-config.for.freetype2.patch index 1116c34d07..d174d7ab5c 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl-ttf/use.pkg-config.for.freetype2.patch +++ b/meta-oe/recipes-graphics/libsdl/libsdl-ttf/use.pkg-config.for.freetype2.patch @@ -8,6 +8,8 @@ commit 5870bd272b0b077d0826fb900b251884c1c05061 binconfig-disabled: Add class and use --- +Upstream-Status: Pending + configure.in | 38 +++++--------------------------------- 1 file changed, 5 insertions(+), 33 deletions(-) diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/0001-freetype-Fix-function-signatures-to-match-without-ca.patch b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/0001-freetype-Fix-function-signatures-to-match-without-ca.patch new file mode 100644 index 0000000000..8cb76c35d6 --- /dev/null +++ b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/0001-freetype-Fix-function-signatures-to-match-without-ca.patch @@ -0,0 +1,69 @@ +From 6c52693d264ca3dc8e15a92f56cf3a636639bb6c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st> +Date: Fri, 28 Oct 2022 22:17:15 +0300 +Subject: [PATCH] freetype: Fix function signatures to match without casts + +Clang 16 has got a new stricter warning for casts of function types +(see https://github.com/llvm/llvm-project/commit/1aad641c793090b4d036c03e737df2ebe2c32c57). + +This new warning gets included as part of the existing error +diagnostic setting of -Wcast-function-type. + +This fixes errors like these: + +../src/hb-ft.cc:1011:34: error: cast from 'void (*)(FT_Face)' (aka 'void (*)(FT_FaceRec_ *)') to 'FT_Generic_Finalizer' (aka 'void (*)(void *)') converts to incompatible function type [-Werror,-Wcast-function-type-strict] + ft_face->generic.finalizer = (FT_Generic_Finalizer) hb_ft_face_finalize; + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Backport [https://github.com/harfbuzz/harfbuzz/commit/d88269c827895b38f99f7cf741fa60210d4d5169] +--- + src/hb-ft.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/hb-ft.cc b/src/hb-ft.cc +index a6beb9f0f..a35e75b18 100644 +--- a/src/hb-ft.cc ++++ b/src/hb-ft.cc +@@ -729,8 +729,9 @@ hb_ft_face_create_referenced (FT_Face ft_face) + } + + static void +-hb_ft_face_finalize (FT_Face ft_face) ++hb_ft_face_finalize (void *arg) + { ++ FT_Face ft_face = (FT_Face) arg; + hb_face_destroy ((hb_face_t *) ft_face->generic.data); + } + +@@ -762,7 +763,7 @@ hb_ft_face_create_cached (FT_Face ft_face) + ft_face->generic.finalizer (ft_face); + + ft_face->generic.data = hb_ft_face_create (ft_face, nullptr); +- ft_face->generic.finalizer = (FT_Generic_Finalizer) hb_ft_face_finalize; ++ ft_face->generic.finalizer = hb_ft_face_finalize; + } + + return hb_face_reference ((hb_face_t *) ft_face->generic.data); +@@ -949,8 +950,9 @@ get_ft_library () + } + + static void +-_release_blob (FT_Face ft_face) ++_release_blob (void *arg) + { ++ FT_Face ft_face = (FT_Face) arg; + hb_blob_destroy ((hb_blob_t *) ft_face->generic.data); + } + +@@ -1032,7 +1034,7 @@ hb_ft_font_set_funcs (hb_font_t *font) + #endif + + ft_face->generic.data = blob; +- ft_face->generic.finalizer = (FT_Generic_Finalizer) _release_blob; ++ ft_face->generic.finalizer = _release_blob; + + _hb_ft_font_set_funcs (font, ft_face, true); + hb_ft_font_set_load_flags (font, FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING); +-- +2.39.2 + diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/automake_foreign.patch b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/automake_foreign.patch index 962c119791..bc9371553f 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/automake_foreign.patch +++ b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/automake_foreign.patch @@ -3,6 +3,8 @@ From: Khem Raj <raj.khem@gmail.com> Date: Tue, 9 May 2017 00:57:10 -0700 --- +Upstream-Status: Pending + Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.20.1.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.20.2.bb index b8732b4c86..7d352f4218 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.20.1.bb +++ b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.20.2.bb @@ -2,17 +2,18 @@ SUMMARY = "Simple DirectMedia Layer truetype font library" SECTION = "libs" DEPENDS = "libsdl2 freetype virtual/egl" LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=771dca8728b18d39b130e19b36514371" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a41cbf59bdea749fe34c1af6d3615f68" SRC_URI = " \ git://github.com/libsdl-org/SDL_ttf.git;branch=release-2.20.x;protocol=https \ git://github.com/libsdl-org/freetype.git;branch=VER-2-12-1-SDL;destsuffix=git/external/freetype;name=freetype;protocol=https \ git://github.com/libsdl-org/harfbuzz.git;branch=2.9.1-SDL;destsuffix=git/external/harfbuzz;name=harfbuzz;protocol=https \ + file://0001-freetype-Fix-function-signatures-to-match-without-ca.patch;patchdir=external/harfbuzz \ file://automake_foreign.patch \ " -SRCREV = "0a652b598625d16ea7016665095cb1e9bce9ef4f" +SRCREV = "89d1692fd8fe91a679bb943d377bfbd709b52c23" SRCREV_freetype = "6fc77cee03e078e97afcee0c0e06a2d3274b9a29" -SRCREV_harfbuzz = "6022fe2f68d028ee178284f297b3902ffdf65b03" +SRCREV_harfbuzz = "43931e3e596c04044861770b831c8f9452e2d3b0" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb index 50c501574b..814e6cd0dd 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb +++ b/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb @@ -81,5 +81,4 @@ do_configure:prepend() { BBCLASSEXTEND = "native nativesdk" -#CVE-2019-14906 is a RHEL specific vulnerability. -CVE_CHECK_IGNORE += "CVE-2019-14906" +CVE_STATUS[CVE-2019-14906] = "not-applicable-platform: Applies on RHEL only" diff --git a/meta-oe/recipes-graphics/lvgl/dialog-lvgl/0001-wayland-Switch-to-custom-timer-tick.patch b/meta-oe/recipes-graphics/lvgl/dialog-lvgl/0001-wayland-Switch-to-custom-timer-tick.patch new file mode 100644 index 0000000000..5149002ff5 --- /dev/null +++ b/meta-oe/recipes-graphics/lvgl/dialog-lvgl/0001-wayland-Switch-to-custom-timer-tick.patch @@ -0,0 +1,72 @@ +From 1d92e1854c19c06c553243d29170bb4d1a9e3863 Mon Sep 17 00:00:00 2001 +From: Marek Vasut <marex@denx.de> +Date: Tue, 9 May 2023 02:57:30 +0200 +Subject: [PATCH 1/2] wayland: Switch to custom timer tick + +The OE LVGL is configured to obtain timer tick from system timer +instead of using ad-hoc mechanisms to emulate timer tick using +threads or such. Use system timer to provide the tick. + +The tick handling implementation comes from: +https://github.com/lvgl/lv_port_linux_frame_buffer.git +as of commit adf2c4490e17a1b9ec1902cc412a24b3b8235c8e + +Upstream-Status: Inappropriate [Upstream repo is archived] +Signed-off-by: Marek Vasut <marex@denx.de> +--- + src/drivers/wayland.c | 24 ++++++++++++++++-------- + 1 file changed, 16 insertions(+), 8 deletions(-) + +diff --git a/src/drivers/wayland.c b/src/drivers/wayland.c +index 633dc18..bcebf4d 100644 +--- a/src/drivers/wayland.c ++++ b/src/drivers/wayland.c +@@ -6,6 +6,7 @@ + #if defined(USE_WAYLAND) && USE_WAYLAND + + #include <pthread.h> ++#include <sys/time.h> + #include <unistd.h> + + #include <lv_drivers/wayland/wayland.h> +@@ -18,13 +19,22 @@ + #define WAYLAND_VER_RES 320 + #endif + +-static void * tick_thread(void * data) ++uint32_t custom_tick_get(void) + { +- (void) data; +- while(true) { +- usleep(5 * 1000); +- lv_tick_inc(5); +- } ++ static uint64_t start_ms = 0; ++ if(start_ms == 0) { ++ struct timeval tv_start; ++ gettimeofday(&tv_start, NULL); ++ start_ms = (tv_start.tv_sec * 1000000 + tv_start.tv_usec) / 1000; ++ } ++ ++ struct timeval tv_now; ++ gettimeofday(&tv_now, NULL); ++ uint64_t now_ms; ++ now_ms = (tv_now.tv_sec * 1000000 + tv_now.tv_usec) / 1000; ++ ++ uint32_t time_ms = now_ms - start_ms; ++ return time_ms; + } + + +@@ -47,8 +57,6 @@ void hal_init(void) + + lv_group_t * g = lv_group_create(); + lv_group_set_default(g); +- static pthread_t hal_thread; +- pthread_create(&hal_thread, NULL, tick_thread, NULL); + } + + #endif +-- +2.39.2 + diff --git a/meta-oe/recipes-graphics/lvgl/dialog-lvgl/0002-wayland-Fix-callback-data-type.patch b/meta-oe/recipes-graphics/lvgl/dialog-lvgl/0002-wayland-Fix-callback-data-type.patch new file mode 100644 index 0000000000..8919a1a2ad --- /dev/null +++ b/meta-oe/recipes-graphics/lvgl/dialog-lvgl/0002-wayland-Fix-callback-data-type.patch @@ -0,0 +1,30 @@ +From b7af695d79820adf53e7d612120bda12ed2886e2 Mon Sep 17 00:00:00 2001 +From: Marek Vasut <marex@denx.de> +Date: Tue, 9 May 2023 02:57:38 +0200 +Subject: [PATCH 2/2] wayland: Fix callback data type + +The LVGL 8.3.y changed the callback data type, update it accordingly. + +Upstream-Status: Inappropriate [Upstream repo is archived] +Signed-off-by: Marek Vasut <marex@denx.de> +--- + src/drivers/wayland.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/drivers/wayland.c b/src/drivers/wayland.c +index bcebf4d..cfefa88 100644 +--- a/src/drivers/wayland.c ++++ b/src/drivers/wayland.c +@@ -37,8 +37,7 @@ uint32_t custom_tick_get(void) + return time_ms; + } + +- +-static lv_wayland_display_close_f_t close_cb() ++static bool close_cb(lv_disp_t * disp) + { + } + +-- +2.39.2 + diff --git a/meta-oe/recipes-graphics/lvgl/dialog-lvgl_git.bb b/meta-oe/recipes-graphics/lvgl/dialog-lvgl_git.bb index 7e24c51f28..9e820d0dbf 100644 --- a/meta-oe/recipes-graphics/lvgl/dialog-lvgl_git.bb +++ b/meta-oe/recipes-graphics/lvgl/dialog-lvgl_git.bb @@ -1,8 +1,11 @@ # SPDX-FileCopyrightText: Huawei Inc. # SPDX-License-Identifier: MIT -SRC_URI = "gitsm://git.ostc-eu.org/rzr/dialog-lvgl;destsuffix=${S};protocol=https;nobranch=1" -SRCREV = "5d2121457a6988c97cacb0790594440693fc3d29" +SRC_URI = "git://git.ostc-eu.org/rzr/dialog-lvgl;destsuffix=${S};protocol=https;nobranch=1 \ + file://0001-wayland-Switch-to-custom-timer-tick.patch \ + file://0002-wayland-Fix-callback-data-type.patch \ + " +SRCREV = "cdf8d38acca87e871c3a488fd07f1e4779590f8e" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=8ce0a84e5276f01364119c873b712c4f" diff --git a/meta-oe/recipes-graphics/lvgl/lv-drivers.inc b/meta-oe/recipes-graphics/lvgl/lv-drivers.inc new file mode 100644 index 0000000000..dcf1ad14ba --- /dev/null +++ b/meta-oe/recipes-graphics/lvgl/lv-drivers.inc @@ -0,0 +1,46 @@ +PACKAGECONFIG[drm] = ",,libdrm" +PACKAGECONFIG[fbdev] = ",," +PACKAGECONFIG[sdl] = ",,virtual/libsdl2" +PACKAGECONFIG[wayland] = ",,libxkbcommon wayland" + +LVGL_CONFIG_USE_DRM = "${@bb.utils.contains('PACKAGECONFIG', 'drm', '1', '0', d)}" +LVGL_CONFIG_DRM_CARD ?= "/dev/dri/card0" + +LVGL_CONFIG_USE_EVDEV = "${@bb.utils.contains_any('PACKAGECONFIG', 'drm fbdev', '1', '0', d)}" +LVGL_CONFIG_EVDEV_INPUT ?= "/dev/input/touchscreen" + +LVGL_CONFIG_USE_FBDEV = "${@bb.utils.contains('PACKAGECONFIG', 'fbdev', '1', '0', d)}" + +LVGL_CONFIG_USE_SDL = "${@bb.utils.contains('PACKAGECONFIG', 'sdl', '1', '0', d)}" + +LVGL_CONFIG_USE_WAYLAND = "${@bb.utils.contains('PACKAGECONFIG', 'wayland', '1', '0', d)}" +LVGL_CONFIG_WAYLAND_HOR_RES ?= "480" +LVGL_CONFIG_WAYLAND_VER_RES ?= "320" + +EXTRA_OECMAKE += "-Dinstall:BOOL=ON -DLIB_INSTALL_DIR=${baselib}" + +do_configure:append() { + # If there is a configuration template, start from that + [ -r "${S}/lv_drv_conf_template.h" ] && cp -Lv "${S}/lv_drv_conf_template.h" "${S}/lv_drv_conf.h" + + # Configure the software using sed + sed -e "s|#if 0 .*Set it to \"1\" to enable the content.*|#if 1 // Enabled by ${PN}|g" \ + \ + -e "s|\(^# define USE_DRM \).*|# define USE_DRM ${LVGL_CONFIG_USE_DRM}|g" \ + -e "s|\(^# define DRM_CARD \).*|# define DRM_CARD \"${LVGL_CONFIG_DRM_CARD}\"|g" \ + \ + -e "s|\(^# define USE_EVDEV \).*|# define USE_EVDEV ${LVGL_CONFIG_USE_EVDEV}|g" \ + -e "s|\(^# define EVDEV_NAME \).*|# define EVDEV_NAME \"${LVGL_CONFIG_EVDEV_INPUT}\"|g" \ + \ + -e "s|\(^# define USE_FBDEV \).*|# define USE_FBDEV ${LVGL_CONFIG_USE_FBDEV}|g" \ + \ + -e "s|\(^# define USE_SDL \).*|# define USE_SDL ${LVGL_CONFIG_USE_SDL}|g" \ + -e "s|\(^# define USE_SDL_GPU \).*|# define USE_SDL_GPU 1|g" \ + -e "s|\(^# define SDL_DOUBLE_BUFFERED \).*|# define SDL_DOUBLE_BUFFERED 1|g" \ + \ + -e "s|\(^# define USE_WAYLAND \).*|# define USE_WAYLAND ${LVGL_CONFIG_USE_WAYLAND}|g" \ + -e "s|\(^ *# *define *WAYLAND_HOR_RES *\).*|\1${LVGL_CONFIG_WAYLAND_HOR_RES}|g" \ + -e "s|\(^ *# *define *WAYLAND_VER_RES *\).*|\1${LVGL_CONFIG_WAYLAND_VER_RES}|g" \ + \ + -i "${S}/lv_drv_conf.h" +} diff --git a/meta-oe/recipes-graphics/lvgl/lv-drivers_7.11.0.bb b/meta-oe/recipes-graphics/lvgl/lv-drivers_7.11.0.bb deleted file mode 100644 index 1a94215839..0000000000 --- a/meta-oe/recipes-graphics/lvgl/lv-drivers_7.11.0.bb +++ /dev/null @@ -1,46 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: MIT - -HOMEPAGE = "https://docs.lvgl.io/latest/en/html/porting/index.html" -SUMMARY = "LVGL's Display and Touch pad drivers" -DESCRIPTION = "Collection of drivers: SDL, framebuffer, wayland and more..." -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d6fc0df890c5270ef045981b516bb8f2" - -# TODO: Pin upstream release (current v7.11.0-80-g419a757) -SRC_URI = "git://github.com/lvgl/lv_drivers;destsuffix=${S};protocol=https;nobranch=1" -SRCREV = "419a757c23aaa67c676fe3a2196d64808fcf2254" - -DEPENDS = "libxkbcommon lvgl wayland" - -REQUIRED_DISTRO_FEATURES = "wayland" - -inherit cmake -inherit features_check - -S = "${WORKDIR}/${PN}-${PV}" - -LVGL_CONFIG_WAYLAND_HOR_RES ?= "480" -LVGL_CONFIG_WAYLAND_VER_RES ?= "320" - -EXTRA_OECMAKE += "-Dinstall:BOOL=ON -DLIB_INSTALL_DIR=${BASELIB}" - -TARGET_CFLAGS += "-DLV_CONF_INCLUDE_SIMPLE=1" -TARGET_CFLAGS += "-I${RECIPE_SYSROOT}/${includedir}/lvgl" - -# Upstream does not support a default configuration -# but propose a default "disabled" template, which is used as reference -# More configuration can be done using external configuration variables -do_configure:append() { - [ -r "${S}/lv_drv_conf.h" ] \ - || sed -e "s|#if 0 .*Set it to \"1\" to enable the content.*|#if 1 // Enabled by ${PN}|g" \ - -e "s|# define USE_WAYLAND 0|# define USE_WAYLAND 1|g" \ - -e "s|\(^ *# *define *WAYLAND_HOR_RES *\).*|\1${LVGL_CONFIG_WAYLAND_HOR_RES}|g" \ - -e "s|\(^ *# *define *WAYLAND_VER_RES *\).*|\1${LVGL_CONFIG_WAYLAND_VER_RES}|g" \ - < "${S}/lv_drv_conf_template.h" > "${S}/lv_drv_conf.h" -} - -FILES:${PN}-dev += "\ - ${includedir}/lvgl/lv_drivers/ \ - " diff --git a/meta-oe/recipes-graphics/lvgl/lv-drivers_8.3.0.bb b/meta-oe/recipes-graphics/lvgl/lv-drivers_8.3.0.bb new file mode 100644 index 0000000000..e2c5a342a1 --- /dev/null +++ b/meta-oe/recipes-graphics/lvgl/lv-drivers_8.3.0.bb @@ -0,0 +1,28 @@ +# SPDX-FileCopyrightText: Huawei Inc. +# +# SPDX-License-Identifier: MIT + +HOMEPAGE = "https://docs.lvgl.io/latest/en/html/porting/index.html" +SUMMARY = "LVGL's Display and Touch pad drivers" +DESCRIPTION = "Collection of drivers: SDL, framebuffer, wayland and more..." +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d6fc0df890c5270ef045981b516bb8f2" + +SRC_URI = "git://github.com/lvgl/lv_drivers;protocol=https;branch=release/v8.3" +SRCREV = "71830257710f430b6d8d1c324f89f2eab52488f1" + +DEPENDS = "lvgl" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland fbdev', d)}" +require lv-drivers.inc + +inherit cmake + +S = "${WORKDIR}/git" + +TARGET_CFLAGS += "-DLV_CONF_INCLUDE_SIMPLE=1" +TARGET_CFLAGS += "-I${STAGING_INCDIR}/lvgl" + +FILES:${PN}-dev += "\ + ${includedir}/lvgl/lv_drivers/ \ + " diff --git a/meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb b/meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb index 032e85f522..22b4826403 100644 --- a/meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb +++ b/meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb @@ -8,21 +8,23 @@ DESCRIPTION = "Allow the use of PNG images in LVGL. This implementation uses lod LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=d6fc0df890c5270ef045981b516bb8f2" -SRC_URI = "git://github.com/lvgl/lv_lib_png;destsuffix=${S};protocol=https;nobranch=1" +SRC_URI = "git://github.com/lvgl/lv_lib_png;;protocol=https;nobranch=1" SRCREV = "bf1531afe07c9f861107559e29ab8a2d83e4715a" +S = "${WORKDIR}/git" + # because of lvgl dependency REQUIRED_DISTRO_FEATURES = "wayland" DEPENDS += "lvgl" -EXTRA_OECMAKE += "-DLIB_INSTALL_DIR=${BASELIB}" +EXTRA_OECMAKE += "-DLIB_INSTALL_DIR=${baselib}" inherit cmake inherit features_check TARGET_CFLAGS += "-DLV_CONF_INCLUDE_SIMPLE=1" -TARGET_CFLAGS += "-I${RECIPE_SYSROOT}/${includedir}/lvgl" +TARGET_CFLAGS += "-I${STAGING_INCDIR}/lvgl" FILES:${PN}-dev = "\ ${includedir}/lvgl/lv_lib_png/ \ diff --git a/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb.bb b/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb.bb deleted file mode 100644 index 3430c2491c..0000000000 --- a/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "LVGL Demo Application for Framebuffer" -HOMEPAGE = "https://github.com/lvgl/lv_port_linux_frame_buffer" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=802d3d83ae80ef5f343050bf96cce3a4 \ - file://lv_drivers/LICENSE;md5=d6fc0df890c5270ef045981b516bb8f2 \ - file://lvgl/LICENCE.txt;md5=bf1198c89ae87f043108cea62460b03a" - -SRC_URI = "gitsm://github.com/lvgl/lv_port_linux_frame_buffer.git;branch=master;protocol=https" -SRCREV = "dd010430b959f40b8f25a51c76bc920cbc2550cc" - -S = "${WORKDIR}/git" - -EXTRA_OEMAKE = "DESTDIR=${D}" - -do_install() { - oe_runmake install -} diff --git a/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_8.3.0.bb b/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_8.3.0.bb new file mode 100644 index 0000000000..32f833a026 --- /dev/null +++ b/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_8.3.0.bb @@ -0,0 +1,46 @@ +SUMMARY = "LVGL Demo Application for Framebuffer" +HOMEPAGE = "https://github.com/lvgl/lv_port_linux_frame_buffer" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=802d3d83ae80ef5f343050bf96cce3a4 \ + file://lv_drivers/LICENSE;md5=d6fc0df890c5270ef045981b516bb8f2 \ + file://lvgl/LICENCE.txt;md5=bf1198c89ae87f043108cea62460b03a" + +SRC_URI = "gitsm://github.com/lvgl/lv_port_linux_frame_buffer.git;branch=master;protocol=https" +SRCREV = "adf2c4490e17a1b9ec1902cc412a24b3b8235c8e" + +EXTRA_OEMAKE = "DESTDIR=${D}" + +PACKAGECONFIG ??= "drm" +require lv-drivers.inc + +inherit cmake + +S = "${WORKDIR}/git" + +TARGET_CFLAGS += "-I${STAGING_INCDIR}/libdrm" + +do_configure:prepend() { + if [ "${LVGL_CONFIG_USE_DRM}" -eq 1 ] ; then + # Add libdrm build dependency + sed -i '/^target_link_libraries/ s@lvgl::drivers@& drm@' "${S}/CMakeLists.txt" + # Switch from fbdev to drm usage + sed -i 's@fbdev@drm@g' "${S}/main.c" + # Pull resolution from DRM instead of hardcoding it + sed -i '/disp_drv.hor_res/ d' "${S}/main.c" + sed -i '/disp_drv.ver_res/ s@disp_drv.ver_res.*@drm_get_sizes(\&disp_drv.hor_res, \&disp_drv.ver_res, NULL);@' "${S}/main.c" + fi + + if [ "${LVGL_CONFIG_USE_SDL}" -eq 1 ] ; then + # Add libsdl build dependency + sed -i '/^target_link_libraries/ s@lvgl::drivers@& SDL2@' "${S}/CMakeLists.txt" + # Switch from fbdev to sdl usage + sed -i 's@fbdev_flush@sdl_display_flush@g' "${S}/main.c" + sed -i 's@lv_drivers/display/fbdev.h@lv_drivers/sdl/sdl.h@g' "${S}/main.c" + sed -i 's@fbdev@sdl@g' "${S}/main.c" + fi +} + +do_install:append() { + install -d ${D}${bindir} + install -m 0755 ${B}/lvgl_fb ${D}${bindir}/ +} diff --git a/meta-oe/recipes-graphics/lvgl/lvgl_8.1.0.bb b/meta-oe/recipes-graphics/lvgl/lvgl_8.3.8.bb index 2005afa2fd..6103a02948 100644 --- a/meta-oe/recipes-graphics/lvgl/lvgl_8.1.0.bb +++ b/meta-oe/recipes-graphics/lvgl/lvgl_8.3.8.bb @@ -8,18 +8,16 @@ SUMMARY = "Light and Versatile Graphics Library" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=bf1198c89ae87f043108cea62460b03a" -SRC_URI = "gitsm://github.com/lvgl/lvgl;destsuffix=${S};protocol=https;nobranch=1" -SRCREV = "d38eb1e689fa5a64c25e677275172d9c8a4ab2f0" - -REQUIRED_DISTRO_FEATURES = "wayland" +SRC_URI = "git://github.com/lvgl/lvgl;protocol=https;branch=release/v8.3" +SRCREV = "e6d7be00bfa5e1df450c7b713003a9effa03c614" inherit cmake -inherit features_check -EXTRA_OECMAKE = "-DLIB_INSTALL_DIR=${BASELIB}" -S = "${WORKDIR}/${PN}-${PV}" +EXTRA_OECMAKE = "-DLIB_INSTALL_DIR=${baselib}" +S = "${WORKDIR}/git" LVGL_CONFIG_LV_MEM_CUSTOM ?= "0" +LVGL_CONFIG_LV_COLOR_DEPTH ?= "32" # Upstream does not support a default configuration # but propose a default "disabled" template, which is used as reference @@ -27,7 +25,14 @@ LVGL_CONFIG_LV_MEM_CUSTOM ?= "0" do_configure:prepend() { [ -r "${S}/lv_conf.h" ] \ || sed -e 's|#if 0 .*Set it to "1" to enable .*|#if 1 // Enabled|g' \ + -e "s|\(#define LV_COLOR_DEPTH \).*|\1 ${LVGL_CONFIG_LV_COLOR_DEPTH}|g" \ + \ -e "s|\(#define LV_MEM_CUSTOM .*\)0|\1${LVGL_CONFIG_LV_MEM_CUSTOM}|g" \ + \ + -e "s|\(#define LV_TICK_CUSTOM \).*|\1 1|g" \ + -e "s|\(#define LV_TICK_CUSTOM_INCLUDE \).*|\1 <stdint.h>|g" \ + -e "s|\(#define LV_TICK_CUSTOM_SYS_TIME_EXPR \).*|extern uint32_t custom_tick_get(void);\n\1 (custom_tick_get())|g" \ + \ < "${S}/lv_conf_template.h" > "${S}/lv_conf.h" } diff --git a/meta-oe/recipes-graphics/lxdm/lxdm/0002-let-autotools-create-lxdm.conf.patch b/meta-oe/recipes-graphics/lxdm/lxdm/0002-let-autotools-create-lxdm.conf.patch index 75dc10c979..5af4e5233c 100644 --- a/meta-oe/recipes-graphics/lxdm/lxdm/0002-let-autotools-create-lxdm.conf.patch +++ b/meta-oe/recipes-graphics/lxdm/lxdm/0002-let-autotools-create-lxdm.conf.patch @@ -8,9 +8,7 @@ Content-Transfer-Encoding: 8bit in out of tree builds lxdm.conf is empty -Upstream-Status: submitted [1] - -[1] http://sourceforge.net/p/lxde/mailman/message/32901417/ +Upstream-Status: Submitted [http://sourceforge.net/p/lxde/mailman/message/32901417/] Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- diff --git a/meta-oe/recipes-graphics/lxdm/lxdm/0003-check-for-libexecinfo-providing-backtrace-APIs.patch b/meta-oe/recipes-graphics/lxdm/lxdm/0003-check-for-libexecinfo-providing-backtrace-APIs.patch index f9fd4970fb..31b12f8078 100644 --- a/meta-oe/recipes-graphics/lxdm/lxdm/0003-check-for-libexecinfo-providing-backtrace-APIs.patch +++ b/meta-oe/recipes-graphics/lxdm/lxdm/0003-check-for-libexecinfo-providing-backtrace-APIs.patch @@ -8,6 +8,8 @@ unlike glibc where it is bundled in Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + configure.ac | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-graphics/lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch b/meta-oe/recipes-graphics/lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch index afe11f3536..d232f6913e 100644 --- a/meta-oe/recipes-graphics/lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch +++ b/meta-oe/recipes-graphics/lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch @@ -3,9 +3,7 @@ From: dgod <dgod.osa@gmail.com> Date: Mon, 21 Mar 2016 19:25:25 +0800 Subject: [PATCH] fix css under gtk 3.20 -Upstream-Status: Applied [1] - -[1] https://git.lxde.org/gitweb/?p=lxde/lxdm.git;a=patch;h=72812894cfd9454d70e4b0753531e46580416771 +Upstream-Status: Backport [https://git.lxde.org/gitweb/?p=lxde/lxdm.git;a=patch;h=72812894cfd9454d70e4b0753531e46580416771] --- data/themes/Industrial/gtk.css | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner/0001-meson.build-WORKAROUND-Remove-vulkan-dependency.patch b/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner/0001-meson.build-WORKAROUND-Remove-vulkan-dependency.patch index 0fedfad132..02ef3cce76 100644 --- a/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner/0001-meson.build-WORKAROUND-Remove-vulkan-dependency.patch +++ b/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner/0001-meson.build-WORKAROUND-Remove-vulkan-dependency.patch @@ -11,6 +11,8 @@ contains vulkan. Signed-off-by: Aníbal Limón <anibal.limon@linaro.org> --- +Upstream-Status: Pending + meson.build | 6 ------ 1 file changed, 6 deletions(-) diff --git a/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb b/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb index 143ab6a0be..225619ed66 100644 --- a/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb +++ b/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb @@ -12,4 +12,9 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig -EXTRA_OECONF += "--without-tools --without-tests" +BBCLASSEXTEND = "native" + +EXTRA_OECONF += "--without-tests" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[tools] = "--with-tools,--without-tools,libpng" diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.13.bb b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.27.bb index 0bc03941fa..c89b2d1c99 100644 --- a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.13.bb +++ b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.27.bb @@ -2,11 +2,11 @@ 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=5486c0df458c74c85828e0cdbffd499e" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=36d34a46cb71546195d2b0c626a52e5d" -SRCREV = "cc05b288b6d1660ab04c6cf01173f1bb62e6f5dd" +SRCREV = "35b13a8e8fd2a331854dba6da81a20452e142d6f" SRC_URI = " \ - git://github.com/baldurk/${BPN}.git;protocol=http;branch=v1.x;protocol=https \ + git://github.com/baldurk/${BPN}.git;protocol=https;branch=v1.x \ file://0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/surf/surf/0001-config.mk-Fix-compiler-and-linker.patch b/meta-oe/recipes-graphics/surf/surf/0001-config.mk-Fix-compiler-and-linker.patch index 93f1a9f42e..6011f4e3ac 100644 --- a/meta-oe/recipes-graphics/surf/surf/0001-config.mk-Fix-compiler-and-linker.patch +++ b/meta-oe/recipes-graphics/surf/surf/0001-config.mk-Fix-compiler-and-linker.patch @@ -7,6 +7,8 @@ Fix LIBS Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> --- +Upstream-Status: Pending + config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-graphics/surf/surf/0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch b/meta-oe/recipes-graphics/surf/surf/0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch index 2fb44eb0e7..d273d1459f 100644 --- a/meta-oe/recipes-graphics/surf/surf/0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch +++ b/meta-oe/recipes-graphics/surf/surf/0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch @@ -5,28 +5,38 @@ Subject: [PATCH] config.ml: make compatible with webkitgtk 2.34.0 Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- +Upstream-Status: Pending + config.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/config.mk b/config.mk -index 032bf9f..850afbf 100644 --- a/config.mk +++ b/config.mk -@@ -12,10 +12,10 @@ LIBDIR = $(LIBPREFIX)/surf - X11INC = `pkg-config --cflags x11` - X11LIB = `pkg-config --libs x11` +@@ -2,6 +2,7 @@ + VERSION = 2.1 + + # Customize below to fit your system ++PKG_CONFIG ?= pkg-config + + # paths + PREFIX = /usr/local +@@ -9,13 +10,13 @@ MANPREFIX = $(PREFIX)/share/man + LIBPREFIX = $(PREFIX)/lib + LIBDIR = $(LIBPREFIX)/surf + +-X11INC = `pkg-config --cflags x11` +-X11LIB = `pkg-config --libs x11` ++X11INC = $(shell $(PKG_CONFIG) --cflags x11) ++X11LIB = $(shell $(PKG_CONFIG) --libs x11) -GTKINC = `pkg-config --cflags gtk+-3.0 gcr-3 webkit2gtk-4.0` -GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.0` -WEBEXTINC = `pkg-config --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0` -WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0` -+GTKINC = `pkg-config --cflags gtk+-3.0 gcr-3 webkit2gtk-4.1` -+GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.1` -+WEBEXTINC = `pkg-config --cflags webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0` -+WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0` ++GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gcr-3 webkit2gtk-4.1) ++GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gcr-3 webkit2gtk-4.1) ++WEBEXTINC = $(shell $(PKG_CONFIG) --cflags webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0) ++WEBEXTLIBS = $(shell $(PKG_CONFIG) --libs webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0) # includes and libs INCS = $(X11INC) $(GTKINC) --- -2.20.1 - diff --git a/meta-oe/recipes-graphics/surf/surf_2.1.bb b/meta-oe/recipes-graphics/surf/surf_2.1.bb index 7523ed5877..4d9d4d3dd0 100644 --- a/meta-oe/recipes-graphics/surf/surf_2.1.bb +++ b/meta-oe/recipes-graphics/surf/surf_2.1.bb @@ -5,11 +5,11 @@ SECTION = "x11/graphics" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=2a6f86d002ae9ae1eb1ccc466289f146" -DEPENDS = "webkitgtk gtk+3 glib-2.0 gcr3" +DEPENDS = "webkitgtk3 gtk+3 glib-2.0 gcr3" REQUIRED_DISTRO_FEATURES = "x11 opengl" -SRCREV = "bcd7d74e613fb8af11b40c351f0a6c1a771b2d2b" +SRCREV = "665a709b522a6fa18c671f1fc41297603292d0e8" SRC_URI = "git://git.suckless.org/surf;branch=surf-webkit2 \ " SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'soup3', 'file://0001-config.mk-Fix-compiler-and-linker.patch file://0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch', '', d)}" diff --git a/meta-oe/recipes-graphics/tesseract/tesseract_5.3.0.bb b/meta-oe/recipes-graphics/tesseract/tesseract_5.3.2.bb index f791ad546b..db66e890fa 100644 --- a/meta-oe/recipes-graphics/tesseract/tesseract_5.3.0.bb +++ b/meta-oe/recipes-graphics/tesseract/tesseract_5.3.2.bb @@ -5,9 +5,8 @@ BUGTRACKER = "https://github.com/tesseract-ocr/tesseract/issues" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRCREV = "080da83cc51c4ef8b324a7e03146fe0bd7e0944b" -SRC_URI = "git://github.com/${BPN}-ocr/${BPN}.git;branch=main;protocol=https \ - " +SRCREV = "489f101c7e2276c00490f3ab70e9e7926fc6b481" +SRC_URI = "git://github.com/${BPN}-ocr/${BPN}.git;branch=main;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/tigervnc/files/0001-tigervnc-remove-includedir.patch b/meta-oe/recipes-graphics/tigervnc/files/0001-tigervnc-remove-includedir.patch deleted file mode 100644 index f0056d6561..0000000000 --- a/meta-oe/recipes-graphics/tigervnc/files/0001-tigervnc-remove-includedir.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 47f175618a0b0817714ea557c9e93f22f327421e Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Tue, 31 Jul 2018 16:39:52 +0800 -Subject: [PATCH 1/4] tigervnc: remove includedir - -Upstream-Status: Pending - -Signed-off-by: Chong Lu <Chong.Lu@windriver.com> - -It fixes host contamination - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - unix/xserver/hw/vnc/Makefile.am | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am -index 470424b..ee18bf9 100644 ---- a/unix/xserver/hw/vnc/Makefile.am -+++ b/unix/xserver/hw/vnc/Makefile.am -@@ -23,7 +23,7 @@ libvnccommon_la_SOURCES = $(HDRS) \ - - libvnccommon_la_CPPFLAGS = -DVENDOR_RELEASE="$(VENDOR_RELEASE)" -I$(TIGERVNC_SRCDIR)/unix/common \ - -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common -UHAVE_CONFIG_H \ -- -I$(TIGERVNC_SRCDIR)/unix/vncconfig $(XVNC_CPPFLAGS) ${XSERVERLIBS_CFLAGS} -I$(includedir) \ -+ -I$(TIGERVNC_SRCDIR)/unix/vncconfig $(XVNC_CPPFLAGS) ${XSERVERLIBS_CFLAGS} \ - -I$(top_srcdir)/include - - bin_PROGRAMS = Xvnc -@@ -43,7 +43,7 @@ Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DTIGERVNC -DNO_MODULE_EXTS \ - -UHAVE_CONFIG_H \ - -DXFree86Server -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ - -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common -I$(TIGERVNC_SRCDIR)/unix/common \ -- -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} -I$(includedir) -+ -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} - - Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \ - $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XVNC_SYS_LIBS) -lX11 -@@ -64,7 +64,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I$(TIGERVNC_SRCDIR)/common -UHAVE_CONFIG_ - -I$(top_srcdir)/hw/xfree86/os-support \ - -I$(top_srcdir)/hw/xfree86/os-support/bus \ - -I$(top_srcdir)/include \ -- ${XSERVERLIBS_CFLAGS} -I$(includedir) -+ ${XSERVERLIBS_CFLAGS} - - libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now - --- -2.7.4 - diff --git a/meta-oe/recipes-graphics/tslib/tslib_1.22.bb b/meta-oe/recipes-graphics/tslib/tslib_1.22.bb index c2000b264b..cb2563225f 100644 --- a/meta-oe/recipes-graphics/tslib/tslib_1.22.bb +++ b/meta-oe/recipes-graphics/tslib/tslib_1.22.bb @@ -81,3 +81,5 @@ FILES:tslib-uinput += "${bindir}/ts_uinput" FILES:tslib-tests = "${bindir}/ts_harvest ${bindir}/ts_print ${bindir}/ts_print_raw ${bindir}/ts_print_mt \ ${bindir}/ts_test ${bindir}/ts_test_mt ${bindir}/ts_verify ${bindir}/ts_finddev ${bindir}/ts_conf" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb index 73c8eb41a1..3fc7f39e85 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb @@ -8,12 +8,11 @@ PR = "r6" FONT_PACKAGES = "${PN}" -SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/main/t/ttf-arphic-uming/ttf-arphic-uming_0.2.${PV}.1.orig.tar.gz" -S = "${WORKDIR}" +SRC_URI = "https://deb.debian.org/debian/pool/main/f/fonts-arphic-uming/fonts-arphic-uming_0.2.${PV}.2.orig.tar.bz2" +S = "${WORKDIR}/ttf-arphic-uming-0.2.20080216.2" require ttf.inc FILES:${PN} = "${datadir}" -SRC_URI[md5sum] = "d219fcaf953f3eb1889399955a00379f" -SRC_URI[sha256sum] = "8038a6db9e832456d5da5559aff8d15130243be1091bf24f3243503a6f1bda98" +SRC_URI[sha256sum] = "e3c19e04ea7a565b4acff6f1e4248084d2e10752e305bf7dd6c76e80860dc1db" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb index 5e355eefa7..eb13b47b56 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://OFL;md5=33a5bf7b98a9c0ae87430760ba762295 \ " PR = "r8" -SRC_URI = "${DEBIAN_MIRROR}/main/t/ttf-gentium/ttf-gentium_${PV}.orig.tar.gz " +SRC_URI = "https://archive.debian.org/debian/pool/main/t/ttf-gentium/ttf-gentium_${PV}.orig.tar.gz " S = "${WORKDIR}/ttf-sil-gentium-${PV}" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-lklug_0.6-14.20090803cvs.fc24.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-lklug_0.6-14.20090803cvs.fc24.bb index 8a7c1f333b..3951647337 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-lklug_0.6-14.20090803cvs.fc24.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-lklug_0.6-14.20090803cvs.fc24.bb @@ -5,9 +5,8 @@ HOMEPAGE = "http://rpms.famillecollet.com/rpmphp/zoom.php?rpm=lklug-fonts" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRC_URI = "http://dl.fedoraproject.org/pub/fedora/linux/releases/24/Everything/source/tree/Packages/l/lklug-fonts-0.6-14.20090803cvs.fc24.src.rpm;extract=lklug-20090803.tar.gz" -SRC_URI[md5sum] = "3341dfb997043d234ab3f6e5a965e759" -SRC_URI[sha256sum] = "f54c1f3b4df08995982657fed290b562556191fee2a0386afd9e8bf228f72b1a" +SRC_URI = "https://src.fedoraproject.org/repo/pkgs/lklug-fonts/lklug-20090803.tar.gz/b6e0daaf8cf41208fd2a7bc04fb23f84/lklug-20090803.tar.gz" +SRC_URI[sha256sum] = "de5750f7048973f851961050f76b8b58e9bda400d5007c3078d9317fbe2ff5fd" DEPENDS = "fontforge-native" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb index d8236ce434..a048075fc4 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb @@ -7,8 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE_E;md5=ac161e96eda00db9a3aec7870b5d9658 \ file://LICENSE_J;md5=a120ca8d7c8e4a475d5277c9aeb95221 \ " PR = "r4" - -SRC_URI = "http://osdn.dl.sourceforge.jp/mplus-fonts/6650/mplus-TESTFLIGHT-${PV}.tar.gz" +SRC_URI = "http://downloads.sourceforge.jp/mplus-fonts/6650/mplus-TESTFLIGHT-${PV}.tar.gz" S = "${WORKDIR}/mplus-TESTFLIGHT-${PV}" PACKAGESPLITFUNCS:prepend = "split_ttf_mplus_packages " diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-missing-cstdint.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkan-cts-include-missing-cstdint.patch index 0dd59713a1..0dd59713a1 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-missing-cstdint.patch +++ b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkan-cts-include-missing-cstdint.patch diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch index ea7659c698..4ecc371ca4 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch +++ b/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/external/glslang/src/glslang/Include/PoolAlloc.h +++ b/external/glslang/src/glslang/Include/PoolAlloc.h @@ -240,8 +240,9 @@ protected: diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch index 99cb87b301..58dc1f24dd 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch +++ b/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/framework/delibs/dethread/CMakeLists.txt +++ b/framework/delibs/dethread/CMakeLists.txt @@ -42,6 +42,7 @@ if (DE_OS_IS_UNIX) diff --git a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc index 01f4a572f8..097acc1a0b 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +++ b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc @@ -4,12 +4,14 @@ 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=master \ - git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/external/spirv-headers/src;name=spirv-headers;branch=master \ - git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=git/external/spirv-tools/src;name=spirv-tools;branch=master \ + 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/fcdea67879fa1991e56cf7734ce0ce27866b665f/renderdoc/api/app/renderdoc_app.h;subdir=git/external/renderdoc/src;name=renderdoc \ + 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/nvpro-samples/vk_video_samples.git;protocol=https;destsuffix=git/external/video-parser/src;name=video-parser;branch=main \ file://gen-framework-path.patch \ " @@ -21,7 +23,7 @@ S = "${WORKDIR}/git" inherit pkgconfig cmake features_check python3native qemu -ANY_OF_DISTRO_FEATURES += "opengl wayland" +ANY_OF_DISTRO_FEATURES += "opengl vulkan" DEPENDS += "python3-lxml-native libpng zlib virtual/libgles2 qemu-native" diff --git a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.8.0.bb b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.9.3.bb index edfeda2bef..67ce5f2b9d 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.8.0.bb +++ b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.9.3.bb @@ -1,20 +1,19 @@ DESCRIPTION = "OpenGL CTS" require khronos-cts.inc -# opengl-es-cts-3.2.8.0 -SRCREV_vk-gl-cts = "317f467fac032b88a4789e4345421f92c4e8716d" -SRCREV_amber = "209d92e2c27a333e723d24497e8c7a07b2f2eb39" -SRCREV_glslang = "9158061398a96033c990e69156bd28c67114544b" -SRCREV_spirv-headers = "449bc986ba6f4c5e10e32828783f9daef2a77644" -SRCREV_spirv-tools = "ee30773650eca50b1cd3c913babcc2b50d7b91fd" +# 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" +SRCREV_ESExtractor = "ce5d7ebcf0ebb0d78385ee4cc34653eb6764bfc4" # Not yet needed SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1" -SRCREV_vulkan-docs = "d70e01c0be7b8a7d20b186b30b29a75b18bba75d" +SRCREV_vulkan-docs = "9a2e576a052a1e65a5d41b593e693ff02745604b" +SRCREV_video-parser = "7d68747d3524842afaf050c5e00a10f5b8c07904" SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" -SRC_URI += "file://0001-Remove-dead-variable-984.patch;patchdir=external/amber/src \ - file://0001-include-missing-cstdint.patch;patchdir=external/amber/src" - S = "${WORKDIR}/git" do_install() { diff --git a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.3.1.bb b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.3.1.bb index 862963dd0d..f491385b33 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.3.1.bb +++ b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.3.1.bb @@ -10,9 +10,12 @@ SRCREV_spirv-tools = "b930e734ea198b7aabbbf04ee1562cf6f57962f0" SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1" SRCREV_vulkan-docs = "9b5562187a8ad72c171410b036ceedbc450153ba" SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" +# Not yet needed +SRCREV_ESExtractor = "ce5d7ebcf0ebb0d78385ee4cc34653eb6764bfc4" +SRCREV_video-parser = "7d68747d3524842afaf050c5e00a10f5b8c07904" SRC_URI += "file://0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch \ - file://0001-Include-missing-cstdint.patch \ + file://0001-vulkan-cts-include-missing-cstdint.patch \ file://0001-include-missing-cstdint.patch;patchdir=external/amber/src \ " diff --git a/meta-oe/recipes-graphics/wayland/waylandpp_1.0.0.bb b/meta-oe/recipes-graphics/wayland/waylandpp_1.0.0.bb index 5ba5aa7940..eb8ec4f5ff 100644 --- a/meta-oe/recipes-graphics/wayland/waylandpp_1.0.0.bb +++ b/meta-oe/recipes-graphics/wayland/waylandpp_1.0.0.bb @@ -13,7 +13,7 @@ SRCREV = "4321ed5c7b4bffa41b8a2a13dc7f3ece1191f4f3" inherit cmake pkgconfig features_check -REQUIRED_DISTRO_FEATURES = "opengl" +REQUIRED_DISTRO_FEATURES:class-target = "opengl" EXTRA_OECMAKE:class-native = " \ -DBUILD_SCANNER=ON \ diff --git a/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb b/meta-oe/recipes-graphics/xdotool/xdotool_3.20211022.1.bb index 259c640523..cef82bd348 100644 --- a/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb +++ b/meta-oe/recipes-graphics/xdotool/xdotool_3.20211022.1.bb @@ -1,23 +1,19 @@ SUMMARY = "xdotool - command-line X11 automation tool - utilising X11 XTEST interface" -HOMEPAGE = "http://www.semicomplete.com/projects/xdotool" +HOMEPAGE = "https://github.com/jordansissel/xdotool" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=2f9cbf7e9401cec8a38666a08851ce6b" SECTION = "x11" -DEPENDS = "virtual/libx11 libxtst" - -PR = "r1" +DEPENDS = "virtual/libx11 libxtst libxinerama libxkbcommon" inherit features_check pkgconfig perlnative # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "http://semicomplete.googlecode.com/files/xdotool-${PV}.tar.gz" -SRC_URI[md5sum] = "1d5be641e512c343abfe5f78b39e6f19" -SRC_URI[sha256sum] = "42d7271fbc796e53db71bb221f311b9ff3c51d90a71c9487a9bd3101ca39894f" +SRC_URI = "https://github.com/jordansissel/${BPN}/releases/download/v${PV}/${BP}.tar.gz" +SRC_URI[sha256sum] = "96f0facfde6d78eacad35b91b0f46fecd0b35e474c03e00e30da3fdd345f9ada" EXTRA_OEMAKE = "PREFIX=${prefix} INSTALLLIB=${libdir} INSTALLMAN=${mandir}" do_install() { - oe_runmake -e install DESTDIR=${D} PREFIX=${prefix} + oe_runmake install DESTDIR=${D} PREFIX=${prefix} } - diff --git a/meta-oe/recipes-graphics/xorg-app/sessreg/0001-Makefile.am-Error-Fix.patch b/meta-oe/recipes-graphics/xorg-app/sessreg/0001-Makefile.am-Error-Fix.patch index c5a70f5d08..bfda2dfe71 100644 --- a/meta-oe/recipes-graphics/xorg-app/sessreg/0001-Makefile.am-Error-Fix.patch +++ b/meta-oe/recipes-graphics/xorg-app/sessreg/0001-Makefile.am-Error-Fix.patch @@ -8,7 +8,7 @@ Do not compile man dir since error always occur. | make[2]: *** [sessreg.1] Error 1 It is not a good way.But can remove it from SKIP_RECIPE. -Upstream-Status: pending +Upstream-Status: Pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- diff --git a/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.3.3.bb b/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.3.4.bb index 18fa63ead6..9c522d6ae1 100644 --- a/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.3.3.bb +++ b/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.3.4.bb @@ -16,4 +16,4 @@ DEPENDS += "libxkbfile xrandr" BBCLASSEXTEND = "native" SRC_URI_EXT = "xz" -SRC_URI[sha256sum] = "b560c678da6930a0da267304fa3a41cc5df39a96a5e23d06f14984c87b6f587b" +SRC_URI[sha256sum] = "be8d8554d40e981d1b93b5ff82497c9ad2259f59f675b38f1b5e84624c07fade" diff --git a/meta-oe/recipes-graphics/xorg-app/xrdb_1.2.1.bb b/meta-oe/recipes-graphics/xorg-app/xrdb_1.2.2.bb index a8c5b3d0a4..53214c8fe8 100644 --- a/meta-oe/recipes-graphics/xorg-app/xrdb_1.2.1.bb +++ b/meta-oe/recipes-graphics/xorg-app/xrdb_1.2.2.bb @@ -5,4 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d1167c4f586bd41f0c62166db4384a69" DEPENDS += "libxmu" -SRC_URI[sha256sum] = "4f5d031c214ffb88a42ae7528492abde1178f5146351ceb3c05f3b8d5abee8b4" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "31f5fcab231b38f255b00b066cf7ea3b496df712c9eb2d0d50c670b63e5033f4" + +EXTRA_OECONF += "--with-cpp=${bindir}/cpp" diff --git a/meta-oe/recipes-graphics/xorg-app/xsetmode_1.0.0.bb b/meta-oe/recipes-graphics/xorg-app/xsetmode_1.0.0.bb deleted file mode 100644 index b757329d94..0000000000 --- a/meta-oe/recipes-graphics/xorg-app/xsetmode_1.0.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -require recipes-graphics/xorg-app/xorg-app-common.inc - -SUMMARY = "X.Org X11 X client utilities" -HOMEPAGE = "http://cgit.freedesktop.org/xorg/app/xsetmode/" -DESCRIPTION = "xsetmode sets the mode of an XInput device to either absolute \ -or relative." -SECTION = "x11/app" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=9b37e00e7793b667cbc64f9df7b6d733" - -DEPENDS += "libxi" -BBCLASSEXTEND = "native" - -SRC_URI[md5sum] = "d074e79d380b031d2f60e4cd56538c93" -SRC_URI[sha256sum] = "988b47cd922991c6e6adbce15dc386ac75690b61744b526c3af5a4eaa9afa0aa" diff --git a/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch b/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch index 92ecdac224..a6cf16e4e9 100644 --- a/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch +++ b/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch @@ -1,4 +1,4 @@ -From 3730a38efad969fb6f8227df07eb4461a078f5a3 Mon Sep 17 00:00:00 2001 +From b23d38f1216c4d70738edaa367cf9ecd2dd4b660 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 13 Dec 2019 12:59:26 -0800 Subject: [PATCH] Add configure time check for setsid @@ -7,18 +7,19 @@ Do not assume glibc == linux Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- configure | 1 + configure.in | 1 + main.c | 4 ++-- xtermcfg.hin | 1 + - 5 files changed, 6 insertions(+), 2 deletions(-) + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index 0aafefc..03e8df0 100755 +index 72342c7..c2ec2ac 100755 --- a/configure +++ b/configure -@@ -5605,6 +5605,7 @@ for ac_func in \ +@@ -5803,6 +5803,7 @@ for ac_func in \ unsetenv \ sched_yield \ setpgid \ @@ -27,7 +28,7 @@ index 0aafefc..03e8df0 100755 tcgetattr \ waitpid \ diff --git a/configure.in b/configure.in -index d2fee88..74d65df 100644 +index 56dbc25..0608c80 100644 --- a/configure.in +++ b/configure.in @@ -99,6 +99,7 @@ AC_CHECK_FUNCS( \ @@ -39,10 +40,10 @@ index d2fee88..74d65df 100644 tcgetattr \ waitpid \ diff --git a/main.c b/main.c -index 5e60589..b81d2be 100644 +index 24da0eb..332174c 100644 --- a/main.c +++ b/main.c -@@ -2903,7 +2903,7 @@ main(int argc, char *argv[]ENVP_ARG) +@@ -2956,7 +2956,7 @@ main(int argc, char *argv[]ENVP_ARG) } } @@ -51,7 +52,7 @@ index 5e60589..b81d2be 100644 #define USE_OPENPTY 1 static int opened_tty = -1; #endif -@@ -4074,7 +4074,7 @@ spawnXTerm(XtermWidget xw, unsigned line_speed) +@@ -4205,7 +4205,7 @@ spawnXTerm(XtermWidget xw, unsigned line_speed) /* * now in child process */ @@ -61,17 +62,14 @@ index 5e60589..b81d2be 100644 #else int pgrp = getpid(); diff --git a/xtermcfg.hin b/xtermcfg.hin -index 1dbc3b8..4f3ff5b 100644 +index 19048cd..e54d2cd 100644 --- a/xtermcfg.hin +++ b/xtermcfg.hin -@@ -95,6 +95,7 @@ - #undef HAVE_PUTENV /* AC_CHECK_FUNCS(putenv) */ +@@ -98,6 +98,7 @@ #undef HAVE_SCHED_YIELD /* AC_CHECK_FUNCS(sched_yield) */ + #undef HAVE_SETITIMER /* CF_SETITIMER */ #undef HAVE_SETPGID /* AC_CHECK_FUNCS(setpgid) */ +#undef HAVE_SETSID /* AC_CHECK_FUNCS(setsid) */ #undef HAVE_STDINT_H /* AC_PROG_CC_STDC */ #undef HAVE_STDLIB_H /* AC_CHECK_HEADERS(stdlib.h) */ #undef HAVE_STDNORETURN_H /* CF_C11_NORETURN */ --- -2.24.1 - diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_378.bb b/meta-oe/recipes-graphics/xorg-app/xterm_384.bb index c82042b215..ae046b18c2 100644 --- a/meta-oe/recipes-graphics/xorg-app/xterm_378.bb +++ b/meta-oe/recipes-graphics/xorg-app/xterm_384.bb @@ -8,7 +8,7 @@ SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ file://0001-Add-configure-time-check-for-setsid.patch \ " -SRC_URI[sha256sum] = "649dfbfd5edd0ed9e47cf8e4d953b4b0d3c30bc280166dfc4ffd14973fec3e92" +SRC_URI[sha256sum] = "31ef870740ceae020c3c4b4a9601c7f47bfd46672c1aaf2d213a565d64cbc373" PACKAGECONFIG ?= "" PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" diff --git a/meta-oe/recipes-graphics/xorg-app/xwd_1.0.8.bb b/meta-oe/recipes-graphics/xorg-app/xwd_1.0.9.bb index 44b9c80d73..4a05a4437a 100644 --- a/meta-oe/recipes-graphics/xorg-app/xwd_1.0.8.bb +++ b/meta-oe/recipes-graphics/xorg-app/xwd_1.0.9.bb @@ -7,4 +7,5 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c0cdb783e9a0198237371fdaa26a18bf" DEPENDS = "libxmu libxkbfile" -SRC_URI[sha256sum] = "fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "dc121b84947eb4a3d1131bff1e9844cfa2124d95b47b35f9932340fa931fbd3f" diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-amdgpu_22.0.0.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-amdgpu_23.0.0.bb index 3082e2e6bf..c417e95d0a 100644 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-amdgpu_22.0.0.bb +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-amdgpu_23.0.0.bb @@ -6,8 +6,7 @@ SUMMARY = "X.Org X server -- AMD Radeon GPU display driver" DESCRIPTION = "Xorg driver for AMD Radeon GPUs using the amdgpu kernel driver" -SRC_URI[md5sum] = "73efb437f5eb29b2c52a9d82c7e15d72" -SRC_URI[sha256sum] = "bc47a1a8854e790270fa5de2fb9dfe8558139b03d8f68ac1057dcd235d572dcc" +SRC_URI[sha256sum] = "08c38287d39b999fd61ecb6e7b23d5079762e2b4b2179b3567973ed9aaf71222" XORG_DRIVER_COMPRESSOR = ".tar.gz" DEPENDS += "virtual/libx11 libdrm virtual/libgbm xorgproto" diff --git a/meta-oe/recipes-graphics/xorg-lib/liblbxutil-1.1.0/0001-lbx_zlib-Mark-declration-with-extern.patch b/meta-oe/recipes-graphics/xorg-lib/liblbxutil-1.1.0/0001-lbx_zlib-Mark-declration-with-extern.patch deleted file mode 100644 index 32a24b4be1..0000000000 --- a/meta-oe/recipes-graphics/xorg-lib/liblbxutil-1.1.0/0001-lbx_zlib-Mark-declration-with-extern.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 95ed4b743f197e20f1884a326d5a7128187a7ba6 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 13 Aug 2020 17:56:30 -0700 -Subject: [PATCH] lbx_zlib: Mark declration with extern - -Fixes build with gcc10/-fno-common - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/lbx_zlib/lbx_zlib.h | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/lbx_zlib/lbx_zlib.h b/src/lbx_zlib/lbx_zlib.h -index 8ae8956..bec3b96 100644 ---- a/src/lbx_zlib/lbx_zlib.h -+++ b/src/lbx_zlib/lbx_zlib.h -@@ -136,9 +136,9 @@ extern void Xfree(pointer /*ptr*/); - #endif - - /* lbx_zlib.c */ --unsigned long stream_out_compressed; --unsigned long stream_out_uncompressed; --unsigned long stream_out_plain; --unsigned long stream_in_compressed; --unsigned long stream_in_uncompressed; --unsigned long stream_in_plain; -+extern unsigned long stream_out_compressed; -+extern unsigned long stream_out_uncompressed; -+extern unsigned long stream_out_plain; -+extern unsigned long stream_in_compressed; -+extern unsigned long stream_in_uncompressed; -+extern unsigned long stream_in_plain; --- -2.28.0 - diff --git a/meta-oe/recipes-graphics/xorg-lib/liblbxutil-1.1.0/mkg3states-1.1.patch b/meta-oe/recipes-graphics/xorg-lib/liblbxutil-1.1.0/mkg3states-1.1.patch deleted file mode 100644 index f9f4a6382c..0000000000 --- a/meta-oe/recipes-graphics/xorg-lib/liblbxutil-1.1.0/mkg3states-1.1.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -uNr liblbxutil-1.1.0.orig/configure.ac liblbxutil-1.1.0/configure.ac ---- liblbxutil-1.1.0.orig/configure.ac 2009-12-04 23:52:04.000000000 +0100 -+++ liblbxutil-1.1.0/configure.ac 2009-12-16 10:45:00.000000000 +0100 -@@ -50,4 +50,5 @@ - - AC_OUTPUT([Makefile - src/Makefile -+ src/image/Makefile - lbxutil.pc]) -diff -uNr liblbxutil-1.1.0.orig/src/image/Makefile.am liblbxutil-1.1.0/src/image/Makefile.am ---- liblbxutil-1.1.0.orig/src/image/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ liblbxutil-1.1.0/src/image/Makefile.am 2009-12-16 10:45:00.000000000 +0100 -@@ -0,0 +1,15 @@ -+# evil hack -+CFLAGS=$(CFLAGS_FOR_BUILD) -+CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -+LDFLAGS=$(LDFLAGS_FOR_BUILD) -+ -+CC=$(CC_FOR_BUILD) -+LIBTOOL = @LIBTOOL@ --tag=CC -+ -+noinst_PROGRAMS = mkg3states -+ -+mkg3states_SOURCES = \ -+ mkg3states.c -+ -+mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD) -+mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD) -diff -uNr liblbxutil-1.1.0.orig/src/Makefile.am liblbxutil-1.1.0/src/Makefile.am ---- liblbxutil-1.1.0.orig/src/Makefile.am 2009-12-16 10:48:11.000000000 +0100 -+++ liblbxutil-1.1.0/src/Makefile.am 2009-12-16 10:46:47.000000000 +0100 -@@ -3,10 +3,7 @@ - AM_CFLAGS = $(CWARNFLAGS) $(LBXUTIL_CFLAGS) - INCLUDES = -I$(top_srcdir)/include - --noinst_PROGRAMS = mkg3states -- --mkg3states_SOURCES = \ -- $(srcdir)/image/mkg3states.c -+SUBDIRS = image - - liblbxutil_la_SOURCES = \ - $(srcdir)/lbx_zlib/reqstats.h \ -@@ -38,9 +35,8 @@ - - $(srcdir)/image/dfaxg42d.c: g3states.h - --g3states.h: mkg3states -- -rm -f g3states.h -- $(AM_V_GEN) ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h -+g3states.h: image/mkg3states -+ $(AM_V_GEN) ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h - - liblbxutil_la_LDFLAGS = -version-number 1:0:0 -no-undefined - diff --git a/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb b/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb deleted file mode 100644 index ce064903b9..0000000000 --- a/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -require recipes-graphics/xorg-lib/xorg-lib-common.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=b0d5bdc98f7ebab3b6c3791d9bf40907" - -SUMMARY = "XFIXES Extension" -DEPENDS += " xorgproto zlib" -PE = "1" -PR = "r11" - -XORG_EXT = "tar.bz2" - -SRC_URI += "file://mkg3states-1.1.patch \ - file://0001-lbx_zlib-Mark-declration-with-extern.patch \ - " -SRC_URI[md5sum] = "273329a78c2e9ea189ac416c7fde94a1" -SRC_URI[sha256sum] = "c6b6ff7858ec619cafa8205debca6bf78c5610a2844a782ed643c7fd017cf8ae" - -export CC_FOR_BUILD = "gcc" diff --git a/meta-oe/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb b/meta-oe/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb deleted file mode 100644 index e7c9b64e83..0000000000 --- a/meta-oe/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb +++ /dev/null @@ -1,12 +0,0 @@ -require recipes-graphics/xorg-lib/xorg-lib-common.inc -SUMMARY = "X11 keyboard UI presentation library" -LICENSE = "SGI-1" -LIC_FILES_CHKSUM = "file://COPYING;md5=4641deddaa80fe7ca88e944e1fd94a94" -DEPENDS += "virtual/libx11 libxt libxkbfile" -PE = "1" -PR = "r10" - -XORG_EXT = "tar.bz2" - -SRC_URI[md5sum] = "1143e456f7429e18e88f2eadb2f2b6b1" -SRC_URI[sha256sum] = "20c23101d63234ee5f6d696dfa069b29c6c58e39eff433bcd7705b50b3ffa214" diff --git a/meta-oe/recipes-graphics/xorg-lib/xcb-util-cursor_0.1.4.bb b/meta-oe/recipes-graphics/xorg-lib/xcb-util-cursor_0.1.4.bb deleted file mode 100644 index 047697845c..0000000000 --- a/meta-oe/recipes-graphics/xorg-lib/xcb-util-cursor_0.1.4.bb +++ /dev/null @@ -1,10 +0,0 @@ -require recipes-graphics/xorg-lib/xcb-util.inc - -SUMMARY = "XCB port of libXcursor" - -DEPENDS += "xcb-util xcb-util-renderutil xcb-util-image" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=ce469b61c70ff8d7cce0547476891974" - -SRC_URI[sha256sum] = "28dcfe90bcab7b3561abe0dd58eb6832aa9cc77cfe42fcdfa4ebe20d605231fb" diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-COPYING-add-GPLv2-license-file.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-COPYING-add-GPLv2-license-file.patch index 2bfe85b285..6f738e7376 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-COPYING-add-GPLv2-license-file.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-COPYING-add-GPLv2-license-file.patch @@ -11,6 +11,8 @@ Signed-off-by: Yu Ke <ke.yu@intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- +Upstream-Status: Pending + COPYING | 339 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 339 insertions(+) create mode 100644 COPYING diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-Don-t-install-Xsession-or-Xserver.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-Don-t-install-Xsession-or-Xserver.patch index 0ed12d106f..ea7c7d6a94 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-Don-t-install-Xsession-or-Xserver.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-Don-t-install-Xsession-or-Xserver.patch @@ -10,6 +10,8 @@ be used as before. Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> --- +Upstream-Status: Pending + Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0002-add-setdpi-Xinit.d-script.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0002-add-setdpi-Xinit.d-script.patch index 0be3fa5b39..b408234ecb 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0002-add-setdpi-Xinit.d-script.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0002-add-setdpi-Xinit.d-script.patch @@ -6,6 +6,8 @@ Subject: [PATCH] add setdpi Xinit.d script Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- +Upstream-Status: Pending + X11/Xinit.d/50setdpi | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 X11/Xinit.d/50setdpi diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0006-add-support-for-etc-X11-xserver-system.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0006-add-support-for-etc-X11-xserver-system.patch index 53a283feae..4a9342c934 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0006-add-support-for-etc-X11-xserver-system.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0006-add-support-for-etc-X11-xserver-system.patch @@ -6,6 +6,8 @@ Subject: [PATCH] add support for /etc/X11/xserver-system Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- +Upstream-Status: Pending + X11/xserver-common | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch index 94a35407af..ba35d1cf6c 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch @@ -8,6 +8,8 @@ Subject: [PATCH] use own functions file instead /etc/init.d/functions Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- +Upstream-Status: Pending + Makefile | 1 + X11/Xinit.d/11zaurus | 2 +- X11/Xinit.d/12keymap | 2 +- diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch index 90d0f25843..a04e563f82 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch @@ -7,6 +7,8 @@ Subject: [PATCH] xserver-common: add dpi and nocursor params for gta01 and Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- +Upstream-Status: Pending + X11/xserver-common | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch index 8fb69b3561..993b320154 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch @@ -6,6 +6,8 @@ Subject: [PATCH] xserver-common: add support for n900 alias nokia_rx-51_board Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- +Upstream-Status: Pending + X11/xserver-common | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0010-xserver-common-add-support-for-nexus-S-alias-herring.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0010-xserver-common-add-support-for-nexus-S-alias-herring.patch index d30c7bbdcb..2948cd611b 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0010-xserver-common-add-support-for-nexus-S-alias-herring.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0010-xserver-common-add-support-for-nexus-S-alias-herring.patch @@ -6,6 +6,8 @@ Subject: [PATCH] xserver-common: add support for nexus S alias herring Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- +Upstream-Status: Pending + X11/xserver-common | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch index 23e17f0988..342d49becd 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch @@ -6,6 +6,8 @@ Subject: [PATCH] xserver-common: add support for nexus one alias mahimahi Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- +Upstream-Status: Pending + X11/xserver-common | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch index 5e794f6b31..94f9d2ca6f 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch @@ -6,6 +6,8 @@ Subject: [PATCH] xserver-common: add support for gta04 alias OpenPhoenux Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- +Upstream-Status: Pending + X11/xserver-common | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch index 78d2e40297..c023b583b0 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch @@ -6,6 +6,8 @@ Subject: [PATCH] xserver-common: add support for tuna alias Galaxy Nexus Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- +Upstream-Status: Pending + X11/xserver-common | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta-oe/recipes-kernel/bpftool/bpftool.bb b/meta-oe/recipes-kernel/bpftool/bpftool.bb index 67a821c07c..bbfab47aae 100644 --- a/meta-oe/recipes-kernel/bpftool/bpftool.bb +++ b/meta-oe/recipes-kernel/bpftool/bpftool.bb @@ -7,7 +7,7 @@ PROVIDES = "virtual/bpftool" inherit bash-completion kernelsrc kernel-arch -do_populate_lic[depends] += "virtual/kernel:do_patch" +do_populate_lic[depends] += "virtual/kernel:do_shared_workdir" EXTRA_OEMAKE = "\ V=1 \ diff --git a/meta-oe/recipes-kernel/crash/crash/0001-cross_add_configure_option.patch b/meta-oe/recipes-kernel/crash/crash/0001-cross_add_configure_option.patch index 26a34e5c16..fc99ff5187 100644 --- a/meta-oe/recipes-kernel/crash/crash/0001-cross_add_configure_option.patch +++ b/meta-oe/recipes-kernel/crash/crash/0001-cross_add_configure_option.patch @@ -1,27 +1,29 @@ -From 73269df4d8196abe81112acaa2613155b308a8b8 Mon Sep 17 00:00:00 2001 +From e3ba432243d9be4e845daabc78a0ae7c03c680f5 Mon Sep 17 00:00:00 2001 From: Lei Maohui <leimaohui@cn.fujitsu.com> Date: Fri, 9 Jan 2015 11:51:18 +0900 -Subject: [PATCH 1/9] cross_add_configure_option +Subject: [PATCH] cross_add_configure_option + -%% original patch: 0001-cross_add_configure_option.patch --- +Upstream-Status: Pending + Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index a2baec1..f1972c8 100644 +index 7266e305..390fc0ef 100644 --- a/Makefile +++ b/Makefile -@@ -232,7 +232,7 @@ gdb_merge: force +@@ -260,7 +260,7 @@ gdb_merge: force @echo "../../${PROGRAM} ../../${PROGRAM}lib.a" > ${GDB}/gdb/mergeobj @rm -f ${PROGRAM} @if [ ! -f ${GDB}/config.status ]; then \ - (cd ${GDB}; ./configure ${GDB_CONF_FLAGS} --with-separate-debug-dir=/usr/lib/debug \ + (cd ${GDB}; ./configure --host=${GDB_TARGET} --build=${GDB_HOST} --with-separate-debug-dir=/usr/lib/debug \ --with-bugurl="" --with-expat=no --with-python=no --disable-sim; \ - make --no-print-directory CRASH_TARGET=${TARGET}; echo ${TARGET} > crash.target) \ - else make --no-print-directory rebuild; fi -@@ -283,7 +283,7 @@ force: + $(MAKE) CRASH_TARGET=${TARGET}; echo ${TARGET} > crash.target) \ + else $(MAKE) rebuild; fi +@@ -306,7 +306,7 @@ force: make_configure: force @rm -f configure @@ -30,6 +32,3 @@ index a2baec1..f1972c8 100644 clean: make_configure @./configure ${CONF_TARGET_FLAG} -q -b --- -2.8.1 - diff --git a/meta-oe/recipes-kernel/crash/crash/0001-make-src-string-const-in-strlcpy.patch b/meta-oe/recipes-kernel/crash/crash/0001-make-src-string-const-in-strlcpy.patch new file mode 100644 index 0000000000..546973e0ac --- /dev/null +++ b/meta-oe/recipes-kernel/crash/crash/0001-make-src-string-const-in-strlcpy.patch @@ -0,0 +1,69 @@ +From 4ee56105881d7bb1da1e668ac5bb47a4e0846676 Mon Sep 17 00:00:00 2001 +From: Lianbo Jiang <lijiang@redhat.com> +Date: Wed, 5 Jul 2023 10:02:59 +0800 +Subject: [PATCH] Fix compilation error due to new strlcpy function that glibc + added +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The crash-utility has its own strlcpy(), but recently the latest glibc +has also implemented the strlcpy function, which is derived from +OpenBSD. Eventually this caused the following compilation error: + + # make -j8 lzo + ... + In file included from global_data.c:18: + defs.h:5556:8: error: conflicting types for ‘strlcpy’; have ‘size_t(char *, char *, size_t)’ {aka ‘long unsigned int(char *, char *, long unsigned int)’} + 5556 | size_t strlcpy(char *, char *, size_t); + | ^~~~~~~ + In file included from memory.c:19: + defs.h:5556:8: error: conflicting types for ‘strlcpy’; have ‘size_t(char *, char *, size_t)’ {aka ‘long unsigned int(char *, char *, long unsigned int)’} + 5556 | size_t strlcpy(char *, char *, size_t); + | ^~~~~~~ + ... + +To fix the issue, let's declare the strlcpy() as a weak function and +keep the same parameter types as the glibc function has. + +Related glibc commits: +454a20c8756c ("Implement strlcpy and strlcat [BZ #178]") +d2fda60e7c40 ("manual: Manual update for strlcat, strlcpy, wcslcat, wclscpy") +388ae538ddcb ("hurd: Add strlcpy, strlcat, wcslcpy, wcslcat to libc.abilist") + +Upstream-Status: Backport [https://github.com/kraj/crash/commit/4ee56105881d7bb1da1e668ac5bb47a4e0846676] +Signed-off-by: Lianbo Jiang <lijiang@redhat.com> +--- + defs.h | 2 +- + tools.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/defs.h b/defs.h +index 8f7d1fa..26afe23 100644 +--- a/defs.h ++++ b/defs.h +@@ -5553,7 +5553,7 @@ uint32_t swap32(uint32_t, int); + uint64_t swap64(uint64_t, int); + ulong *get_cpumask_buf(void); + int make_cpumask(char *, ulong *, int, int *); +-size_t strlcpy(char *, char *, size_t); ++size_t strlcpy(char *, const char *, size_t) __attribute__ ((__weak__)); + struct rb_node *rb_first(struct rb_root *); + struct rb_node *rb_parent(struct rb_node *, struct rb_node *); + struct rb_node *rb_right(struct rb_node *, struct rb_node *); +diff --git a/tools.c b/tools.c +index 392a797..0f2db10 100644 +--- a/tools.c ++++ b/tools.c +@@ -6795,7 +6795,7 @@ make_cpumask_error: + * always be NULL-terminated. + */ + size_t +-strlcpy(char *dest, char *src, size_t size) ++strlcpy(char *dest, const char *src, size_t size) + { + size_t ret = strlen(src); + +-- +2.41.0 + diff --git a/meta-oe/recipes-kernel/crash/crash/7001force_define_architecture.patch b/meta-oe/recipes-kernel/crash/crash/7001force_define_architecture.patch index 0d44c7f176..b5f97228de 100644 --- a/meta-oe/recipes-kernel/crash/crash/7001force_define_architecture.patch +++ b/meta-oe/recipes-kernel/crash/crash/7001force_define_architecture.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -uprN crash-5.1.8.org/configure.c crash-5.1.8/configure.c --- crash-5.1.8.org/configure.c 2011-09-17 04:01:12.000000000 +0900 +++ crash-5.1.8/configure.c 2012-09-13 13:28:45.393344108 +0900 diff --git a/meta-oe/recipes-kernel/crash/crash/7003cross_ranlib.patch b/meta-oe/recipes-kernel/crash/crash/7003cross_ranlib.patch index d567fa0a82..2d01453059 100644 --- a/meta-oe/recipes-kernel/crash/crash/7003cross_ranlib.patch +++ b/meta-oe/recipes-kernel/crash/crash/7003cross_ranlib.patch @@ -1,8 +1,21 @@ ---- crash-5.1.8/Makefile.orig 2011-12-27 11:21:58.220652105 +0900 -+++ crash-5.1.8/Makefile 2011-12-27 11:22:29.563651593 +0900 -@@ -285,6 +285,7 @@ +From 2f200ceed289f935b5e7ec230454a22dd76e42b0 Mon Sep 17 00:00:00 2001 +From: leimaohui <leimaohui@cn.fujitsu.com> +Date: Mon, 12 Jan 2015 11:52:35 +0800 +Subject: [PATCH] crash: add new recipe + +--- +Upstream-Status: Pending + + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index 79aef176..7266e305 100644 +--- a/Makefile ++++ b/Makefile +@@ -295,6 +295,7 @@ gdb_patch: - library: make_build_data ${OBJECT_FILES} + library: ${OBJECT_FILES} ar -rs ${PROGRAM}lib.a ${OBJECT_FILES} + ${RANLIB} ${PROGRAM}lib.a diff --git a/meta-oe/recipes-kernel/crash/crash/donnot-extract-gdb-during-do-compile.patch b/meta-oe/recipes-kernel/crash/crash/donnot-extract-gdb-during-do-compile.patch index 7133cf0aa2..16382877d0 100644 --- a/meta-oe/recipes-kernel/crash/crash/donnot-extract-gdb-during-do-compile.patch +++ b/meta-oe/recipes-kernel/crash/crash/donnot-extract-gdb-during-do-compile.patch @@ -1,33 +1,45 @@ +From 8b882650b730cb6e025d47d65574f43549b7a1a3 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Thu, 9 Mar 2023 10:28:28 +0800 +Subject: [PATCH] Makefile: Put gdb source tarball in SRC_URI + Put gdb source tarball in SRC_URI and don't fetch and extract it during do_compile. Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Kai Kang <kai.kang@windriver.com> +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> --- + Makefile | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + diff --git a/Makefile b/Makefile -index bb0a34e..5eb7604 100644 +index 79aef17..146da6a 100644 --- a/Makefile +++ b/Makefile -@@ -228,7 +228,7 @@ all: make_configure - # @make --no-print-directory extensions +@@ -254,7 +254,7 @@ all: make_configure + # @$(MAKE) extensions gdb_merge: force - @if [ ! -f ${GDB}/README ]; then \ + @if [ ! -f ${GDB}/${GDB}.patch ]; then \ - make --no-print-directory gdb_unzip; fi + $(MAKE) gdb_unzip; fi @echo "${LDFLAGS} -lz -ldl -rdynamic" > ${GDB}/gdb/mergelibs @echo "../../${PROGRAM} ../../${PROGRAM}lib.a" > ${GDB}/gdb/mergeobj -@@ -255,12 +255,6 @@ gdb_unzip: - @rm -f gdb.files - @for FILE in ${GDB_FILES} dummy; do\ - echo $$FILE >> gdb.files; done +@@ -281,12 +281,6 @@ gdb_unzip: + @rm -f gdb.files + @for FILE in ${GDB_FILES} dummy; do\ + echo $$FILE >> gdb.files; done - @if [ ! -f ${GDB}.tar.gz ] && [ ! -f /usr/bin/wget ]; then \ - echo /usr/bin/wget is required to download ${GDB}.tar.gz; echo; exit 1; fi - @if [ ! -f ${GDB}.tar.gz ] && [ -f /usr/bin/wget ]; then \ - [ ! -t 2 ] && WGET_OPTS="--progress=dot:mega"; \ - wget $$WGET_OPTS http://ftp.gnu.org/gnu/gdb/${GDB}.tar.gz; fi - @tar --exclude-from gdb.files -xzmf ${GDB}.tar.gz - @make --no-print-directory gdb_patch - + @$(MAKE) gdb_patch + gdb_patch: +-- +2.25.1 + diff --git a/meta-oe/recipes-kernel/crash/crash/gdb_build_jobs_and_not_write_crash_target.patch b/meta-oe/recipes-kernel/crash/crash/gdb_build_jobs_and_not_write_crash_target.patch index aa5f44dd42..257b4dd2bf 100644 --- a/meta-oe/recipes-kernel/crash/crash/gdb_build_jobs_and_not_write_crash_target.patch +++ b/meta-oe/recipes-kernel/crash/crash/gdb_build_jobs_and_not_write_crash_target.patch @@ -1,3 +1,8 @@ +From af49d8df559aa18f97d14ab7971f211238a16041 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Thu, 9 Mar 2023 10:50:10 +0800 +Subject: [PATCH] Makefile: Don't write ${TARGET} to crash.target + This enables parallel building (multiple jobs in gdb) by reading the value from GDB_MAKE_JOBS. @@ -8,19 +13,26 @@ Upstream-Status: Pending Don't write ${TARGET} to crash.target which causes rebuild fails. Signed-off-by: Kai Kang <kai.kang@windriver.com> --- +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + diff --git a/Makefile b/Makefile -index 27a1d47..bcf2d2f 100644 +index cd25c7d..d61c4c5 100644 --- a/Makefile +++ b/Makefile -@@ -232,8 +232,8 @@ gdb_merge: force +@@ -262,8 +262,8 @@ gdb_merge: force @if [ ! -f ${GDB}/config.status ]; then \ (cd ${GDB}; ./configure --host=${GDB_TARGET} --build=${GDB_HOST} --with-separate-debug-dir=/usr/lib/debug \ --with-bugurl="" --with-expat=no --with-python=no --disable-sim; \ -- make --no-print-directory CRASH_TARGET=${TARGET}; echo ${TARGET} > crash.target) \ -- else make --no-print-directory rebuild; fi -+ make --no-print-directory CRASH_TARGET=${TARGET} ${GDB_MAKE_JOBS}; ) \ -+ else make --no-print-directory ${GDB_MAKE_JOBS} rebuild; fi +- $(MAKE) CRASH_TARGET=${TARGET}; echo ${TARGET} > crash.target) \ +- else $(MAKE) rebuild; fi ++ $(MAKE) CRASH_TARGET=${TARGET} ${GDB_MAKE_JOBS}; ) \ ++ else $(MAKE) ${GDB_MAKE_JOBS} rebuild; fi @if [ ! -f ${PROGRAM} ]; then \ echo; echo "${PROGRAM} build failed"; \ echo; exit 1; fi +-- +2.25.1 + diff --git a/meta-oe/recipes-kernel/crash/crash_8.0.0.bb b/meta-oe/recipes-kernel/crash/crash_8.0.2.bb index 55de6a604b..f8a460b8ce 100644 --- a/meta-oe/recipes-kernel/crash/crash_8.0.0.bb +++ b/meta-oe/recipes-kernel/crash/crash_8.0.2.bb @@ -20,8 +20,9 @@ SRC_URI = "git://github.com/crash-utility/${BPN}.git;branch=master;protocol=http file://0001-cross_add_configure_option.patch \ file://donnot-extract-gdb-during-do-compile.patch \ file://gdb_build_jobs_and_not_write_crash_target.patch \ + file://0001-make-src-string-const-in-strlcpy.patch \ " -SRCREV = "ec568e2ea515b66343d3488d5d4b9a625d55b7ae" +SRCREV = "f1cd581d1c4afa5b8ffdfaa6a3ea9f545fe4ec91" SRC_URI[gdb.sha256sum] = "b33ad58d687487a821ec8d878daab0f716be60d0936f2e3ac5cf08419ce70350" diff --git a/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb b/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb index 0340901c22..ab9074bba5 100644 --- a/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb +++ b/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb @@ -14,7 +14,7 @@ Log (SEL), printing Field Replaceable Unit (FRU) information, reading and \ setting LAN configuration, and chassis power control. \ " -HOMEPAGE = "http://ipmitool.sourceforge.net/" +HOMEPAGE = "http://codeberg.org/IPMITool/ipmitool" SECTION = "kernel/userland" LICENSE = "BSD-3-Clause" @@ -22,14 +22,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9aa91e13d644326bf281924212862184" DEPENDS = "openssl readline ncurses" SRCREV = "19d78782d795d0cf4ceefe655f616210c9143e62" -SRC_URI = "git://github.com/ipmitool/ipmitool;protocol=https;branch=master \ +SRC_URI = "git://codeberg.org/ipmitool/ipmitool;protocol=https;branch=master \ ${IANA_ENTERPRISE_NUMBERS} \ file://0001-configure-Remove-the-logic-to-download-IANA-PEN-data.patch \ " IANA_ENTERPRISE_NUMBERS ?= "" # Add these via bbappend if this database is needed by the system -#IANA_ENTERPRISE_NUMBERS = "http://www.iana.org/assignments/enterprise-numbers;name=iana-enterprise-numbers;downloadfilename=iana-enterprise-numbers" +#IANA_ENTERPRISE_NUMBERS = "http://www.iana.org/assignments/enterprise-numbers.txt;name=iana-enterprise-numbers;downloadfilename=iana-enterprise-numbers" #SRC_URI[iana-enterprise-numbers.sha256sum] = "cdd97fc08325667434b805eb589104ae63f7a9eb720ecea73cb55110b383934c" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-kernel/ipmiutil/ipmiutil/0001-Prevent-access-times-from-changing-resulting-gzip-md.patch b/meta-oe/recipes-kernel/ipmiutil/ipmiutil/0001-Prevent-access-times-from-changing-resulting-gzip-md.patch deleted file mode 100644 index 78c05ef32c..0000000000 --- a/meta-oe/recipes-kernel/ipmiutil/ipmiutil/0001-Prevent-access-times-from-changing-resulting-gzip-md.patch +++ /dev/null @@ -1,25 +0,0 @@ -From da668e5bf1a721797361ab866d09913ee8e157c4 Mon Sep 17 00:00:00 2001 -From: Jeremy Puhlman <jpuhlman@mvista.com> -Date: Sat, 22 Feb 2020 04:37:04 +0000 -Subject: [PATCH] Prevent access times from changing resulting gzip md5sum - -Upstream-Status: Pending -https://github.com/ipmitool/ipmitool/pull/186 ---- - doc/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/doc/Makefile.am b/doc/Makefile.am -index b792762..2c52ce6 100644 ---- a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -59,5 +59,5 @@ install: - ${INSTALL_DATA_SH} iuser.8 ${manto} - ${INSTALL_DATA_SH} iseltime.8 ${manto} - ${INSTALL_DATA_SH} bmclanpet.mib ${datato} -- cd ${manto}; gzip -f *.8 -+ cd ${manto}; gzip -nf *.8 - --- -2.13.3 - diff --git a/meta-oe/recipes-kernel/ipmiutil/ipmiutil/fix_systemd_path.patch b/meta-oe/recipes-kernel/ipmiutil/ipmiutil/fix_systemd_path.patch index dd9230dd4e..2862793b05 100644 --- a/meta-oe/recipes-kernel/ipmiutil/ipmiutil/fix_systemd_path.patch +++ b/meta-oe/recipes-kernel/ipmiutil/ipmiutil/fix_systemd_path.patch @@ -4,13 +4,11 @@ The configure probes the host for systemd path information. Upstream-Status: Inappropriate [Embedded] -Signed-off-By: Armin Kuster <akuster@mvista.com> +Signed-off-by: Armin Kuster <akuster@mvista.com> -Index: ipmiutil-3.0.5/configure.ac -=================================================================== ---- ipmiutil-3.0.5.orig/configure.ac -+++ ipmiutil-3.0.5/configure.ac -@@ -149,7 +149,6 @@ CROSS_LFLAGS="" +--- a/configure.ac ++++ b/configure.ac +@@ -151,7 +151,6 @@ CROSS_LFLAGS="" CROSS_CFLAGS="" LIBSENSORS="" SAM2OBJ="isensor2.o ievents2.o" @@ -18,7 +16,7 @@ Index: ipmiutil-3.0.5/configure.ac AC_ARG_ENABLE([useflags], [ --enable-useflags include environment CFLAGS and LDFLAGS.], -@@ -200,29 +199,42 @@ AC_ARG_ENABLE([gpl], +@@ -211,29 +210,42 @@ AC_ARG_ENABLE([gpl], dnl Does this Linux have systemd enabled? Otherwise use sysv init. AC_ARG_ENABLE([systemd], @@ -83,7 +81,7 @@ Index: ipmiutil-3.0.5/configure.ac fi dnl start main logic -@@ -528,7 +540,7 @@ AC_SUBST(INS_LIB) +@@ -563,7 +575,7 @@ AC_SUBST(INS_LIB) AC_SUBST(SUBDIR_S) AC_SUBST(CROSS_CFLAGS) AC_SUBST(CROSS_LFLAGS) @@ -92,10 +90,8 @@ Index: ipmiutil-3.0.5/configure.ac AC_SUBST(SHR_LINK) AC_SUBST(pkgconfigdir) -Index: ipmiutil-3.0.5/scripts/Makefile.am -=================================================================== ---- ipmiutil-3.0.5.orig/scripts/Makefile.am -+++ ipmiutil-3.0.5/scripts/Makefile.am +--- a/scripts/Makefile.am ++++ b/scripts/Makefile.am @@ -17,7 +17,8 @@ cronto = ${DESTDIR}${etcdir}/cron.daily sbinto = ${DESTDIR}${sbindir} varto = ${DESTDIR}/var/lib/ipmiutil @@ -106,7 +102,7 @@ Index: ipmiutil-3.0.5/scripts/Makefile.am sysvinit = ${datato} sbinfls = ialarms ihealth ifru igetevent ireset icmd isol ilan isensor isel iserial iwdt iconfig ipicmg ifirewall ifwum ihpm iuser -@@ -47,10 +48,14 @@ install: +@@ -47,10 +48,13 @@ install: ${INSTALL_SCRIPT_SH} ipmi_port.sh ${sysvinit}/ipmi_port ${INSTALL_SCRIPT_SH} ipmi_info ${sysvinit}/ipmi_info ${INSTALL_SCRIPT_SH} checksel ${datato} @@ -114,7 +110,6 @@ Index: ipmiutil-3.0.5/scripts/Makefile.am - ${INSTALL_DATA_SH} ipmiutil_asy.service ${sysdto} - ${INSTALL_DATA_SH} ipmiutil_evt.service ${sysdto} - ${INSTALL_DATA_SH} ipmi_port.service ${sysdto} -+ + if [ ! -z "${systemddir}" ]; then \ + $(MKDIR) ${sysdto}; \ + ${INSTALL_DATA_SH} ipmiutil_wdt.service ${sysdto}; \ @@ -122,6 +117,6 @@ Index: ipmiutil-3.0.5/scripts/Makefile.am + ${INSTALL_DATA_SH} ipmiutil_evt.service ${sysdto}; \ + ${INSTALL_DATA_SH} ipmi_port.service ${sysdto}; \ + fi - ${INSTALL_SCRIPT_SH} ipmiutil.env ${datato} + ${INSTALL_SCRIPT_SH} ipmiutil.env.template ${datato} + ${INSTALL_SCRIPT_SH} ipmiutil.env.template ${datato}/ipmiutil.env ${INSTALL_SCRIPT_SH} ipmiutil.pre ${datato} - ${INSTALL_SCRIPT_SH} ipmiutil.setup ${datato} diff --git a/meta-oe/recipes-kernel/ipmiutil/ipmiutil_3.1.5.bb b/meta-oe/recipes-kernel/ipmiutil/ipmiutil_3.1.9.bb index 64bcf5f764..c85bfc13af 100644 --- a/meta-oe/recipes-kernel/ipmiutil/ipmiutil_3.1.5.bb +++ b/meta-oe/recipes-kernel/ipmiutil/ipmiutil_3.1.9.bb @@ -21,11 +21,9 @@ PARALLEL_MAKE = "" SRC_URI = "${SOURCEFORGE_MIRROR}/ipmiutil/ipmiutil-${PV}.tar.gz \ file://fix_systemd_path.patch \ - file://0001-Prevent-access-times-from-changing-resulting-gzip-md.patch \ file://0001-ihpm-Include-stdlib.h-for-malloc-free-atoi-functions.patch \ " -SRC_URI[md5sum] = "292d6df25cad678bb27e5c8cdc6748f9" -SRC_URI[sha256sum] = "58ccdbd5755d7dd72478756715af09e9c73330dfad2b91dbf03d2ac504b301a3" +SRC_URI[sha256sum] = "5ae99bdd1296a8e25cea839784ec39ebca57b0e3701b2d440b8e02e22dc4bc95" inherit autotools-brokensep pkgconfig systemd @@ -45,4 +43,5 @@ PACKAGECONFIG[standalone] = "--enable-standalone, --enable-standalone=no" CFLAGS += "-I${STAGING_INCDIR}" LDFLAGS += "-L${STAGING_LIBDIR}" +EXTRA_OECONF += "--enable-useflags" COMPATIBLE_HOST = '(x86_64|i.86).*-linux' diff --git a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/userfaultfd.patch b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/userfaultfd.patch index bed20510e8..d34c54754e 100644 --- a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/userfaultfd.patch +++ b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/userfaultfd.patch @@ -5,6 +5,8 @@ Subject: [PATCH] vm: add some funtions to support musl libc Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com> --- +Upstream-Status: Pending + tools/testing/selftests/vm/userfaultfd.c | 298 +++++++++++++++++++++++++++++++ 1 file changed, 298 insertions(+) diff --git a/meta-oe/recipes-kernel/libbpf/libbpf_0.8.0.bb b/meta-oe/recipes-kernel/libbpf/libbpf_1.2.0.bb index 3aea7c0796..71ca10e5a0 100644 --- a/meta-oe/recipes-kernel/libbpf/libbpf_0.8.0.bb +++ b/meta-oe/recipes-kernel/libbpf/libbpf_1.2.0.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://../LICENSE.LGPL-2.1;md5=b370887980db5dd40659b50909238 DEPENDS = "zlib elfutils" SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=master" -SRCREV = "86eb09863c1c0177e99c2c703092042d3cdba910" +SRCREV = "fbd60dbff51c870f5e80a17c4f2fd639eb80af90" PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_HOST = "(x86_64|i.86|aarch64|riscv64|powerpc64).*-linux" @@ -17,6 +17,7 @@ COMPATIBLE_HOST = "(x86_64|i.86|aarch64|riscv64|powerpc64).*-linux" S = "${WORKDIR}/git/src" EXTRA_OEMAKE += "DESTDIR=${D} LIBDIR=${libdir} INCLUDEDIR=${includedir}" +EXTRA_OEMAKE:append:class-native = " UAPIDIR=${includedir}" inherit pkgconfig @@ -28,4 +29,8 @@ do_install() { oe_runmake install } +do_install:append:class-native() { + oe_runmake install_uapi_headers +} + BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-kernel/libpfm/libpfm4_4.12.0.bb b/meta-oe/recipes-kernel/libpfm/libpfm4_4.13.0.bb index 4baed62145..be0659ad2a 100644 --- a/meta-oe/recipes-kernel/libpfm/libpfm4_4.12.0.bb +++ b/meta-oe/recipes-kernel/libpfm/libpfm4_4.13.0.bb @@ -16,7 +16,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/perfmon2/${BPN}/libpfm-${PV}.tar.gz \ file://0001-Include-poll.h-instead-of-sys-poll.h.patch \ file://0002-perf_examples-Remove-unused-sum-variable.patch \ " -SRC_URI[sha256sum] = "4b0c1f53f39a61525b69bebf532c68040c1b984d7544a8ae0844b13cd91e1ee4" +SRC_URI[sha256sum] = "d18b97764c755528c1051d376e33545d0eb60c6ebf85680436813fa5b04cc3d1" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/perfmon2/files/libpfm4/" diff --git a/meta-oe/recipes-kernel/libtraceevent/libtraceevent/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch b/meta-oe/recipes-kernel/libtraceevent/libtraceevent/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch deleted file mode 100644 index 5e88048817..0000000000 --- a/meta-oe/recipes-kernel/libtraceevent/libtraceevent/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch +++ /dev/null @@ -1,40 +0,0 @@ -From ed0a31000305d937abe47c44d705b5b52bb36f79 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 22 Dec 2022 18:32:17 -0800 -Subject: [PATCH] makefile: Do not preserve ownership in cp command - -Fixes - -ERROR: libtraceevent-1.7.0-r0 do_package_qa: QA Issue: libtraceevent: /usr/lib/libtraceevent.a is owned by uid 1000, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated] - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 965ff47..0e782cb 100644 ---- a/Makefile -+++ b/Makefile -@@ -287,7 +287,7 @@ $(BUILD_PREFIX): force - $(Q)$(call build_prefix,$(prefix)) - - define do_make_pkgconfig_file -- cp -f ${PKG_CONFIG_SOURCE_FILE}.template ${PKG_CONFIG_FILE}; \ -+ install -m 0644 ${PKG_CONFIG_SOURCE_FILE}.template ${PKG_CONFIG_FILE}; \ - sed -i "s|INSTALL_PREFIX|${1}|g" ${PKG_CONFIG_FILE}; \ - sed -i "s|LIB_VERSION|${EVENT_PARSE_VERSION}|g" ${PKG_CONFIG_FILE}; \ - sed -i "s|LIB_DIR|${libdir_relative}|g" ${PKG_CONFIG_FILE}; \ -@@ -335,7 +335,7 @@ install: install_libs install_plugins - - install_libs: libs install_headers install_pkgconfig - $(Q)$(call do_install,$(LIBTRACEEVENT_SHARED),$(libdir_SQ)); \ -- cp -fpR $(LIB_INSTALL) $(DESTDIR)$(libdir_SQ) -+ cp --no-preserve=ownership --recursive $(LIB_INSTALL) $(DESTDIR)$(libdir_SQ) - $(Q)$(call install_ld_config) - - install_pkgconfig: $(PKG_CONFIG_FILE) --- -2.39.0 - diff --git a/meta-oe/recipes-kernel/libtraceevent/libtraceevent_1.7.1.bb b/meta-oe/recipes-kernel/libtraceevent/libtraceevent_1.7.1.bb deleted file mode 100644 index f876f7534f..0000000000 --- a/meta-oe/recipes-kernel/libtraceevent/libtraceevent_1.7.1.bb +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (C) 2022 Khem Raj <raj.khem@gmail.com> -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = "API to access the kernel tracefs directory" -HOMEPAGE = "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/" -LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97 \ - file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd" -SECTION = "libs" - -SRCREV = "4e51588b1f4d6617df7e39a38acc0d0daa3d8a3f" -SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;branch=${BPN};protocol=https \ - file://0001-makefile-Do-not-preserve-ownership-in-cp-command.patch" - -S = "${WORKDIR}/git" - -inherit pkgconfig - -do_install() { - oe_runmake install DESTDIR=${D} pkgconfig_dir=${libdir}/pkgconfig -} - -PACKAGES += "${PN}-plugins" - -FILES:${PN}-plugins += "${libdir}/traceevent/plugins" diff --git a/meta-oe/recipes-kernel/libtracefs/libtracefs/0001-tracefs-perf-Add-missing-headers-for-syscall-and-SYS.patch b/meta-oe/recipes-kernel/libtracefs/libtracefs/0001-tracefs-perf-Add-missing-headers-for-syscall-and-SYS.patch new file mode 100644 index 0000000000..a24dd1315b --- /dev/null +++ b/meta-oe/recipes-kernel/libtracefs/libtracefs/0001-tracefs-perf-Add-missing-headers-for-syscall-and-SYS.patch @@ -0,0 +1,31 @@ +From f539d96ef4a34ad23d33c552d1770ab429b0220e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 14 Jun 2023 00:24:36 -0700 +Subject: [PATCH] tracefs-perf: Add missing headers for syscall() and SYS_* + defines + +These headers are needed to provide prototype definitions for functions +e.g. close(), syscall(), getpagesize(), getpid() + +The issue is observed with clang-16+ compiler on musl systems + +Upstream-Status: Submitted [https://lore.kernel.org/linux-trace-devel/20230614072759.316154-1-raj.khem@gmail.com/T/#u] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/tracefs-perf.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/tracefs-perf.c b/src/tracefs-perf.c +index 96d12cd..62c1508 100644 +--- a/src/tracefs-perf.c ++++ b/src/tracefs-perf.c +@@ -1,4 +1,5 @@ +-#include <asm/unistd.h> ++#include <unistd.h> ++#include <sys/syscall.h> + #include <sys/mman.h> + #include <signal.h> + #include <linux/perf_event.h> +-- +2.41.0 + diff --git a/meta-oe/recipes-kernel/libtracefs/libtracefs_1.6.4.bb b/meta-oe/recipes-kernel/libtracefs/libtracefs_1.7.0.bb index 73620f37a6..9a408ba13c 100644 --- a/meta-oe/recipes-kernel/libtracefs/libtracefs_1.6.4.bb +++ b/meta-oe/recipes-kernel/libtracefs/libtracefs_1.7.0.bb @@ -9,9 +9,10 @@ LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97 SECTION = "libs" DEPENDS = "libtraceevent bison-native flex-native" -SRCREV = "af49d832f46631597e0aabb2302bd0f56a9cad29" +SRCREV = "aebab37379d0fbadc702d64aca0fe5cf18676404" 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 \ + file://0001-tracefs-perf-Add-missing-headers-for-syscall-and-SYS.patch \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch index f3dc8a466a..15ced551db 100644 --- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch +++ b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch @@ -10,7 +10,7 @@ Subject: [PATCH] makedumpfile: replace hardcode CFLAGS * Forcibly to link dynamic library as the poky build system doesn't build static library by default -Upstream-Status: Inappropriate[oe specific] +Upstream-Status: Inappropriate [oe specific] Signed-off-by: Mingli Yu <mingli.yu@windriver.com> diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.2.bb b/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.3.bb index 1c3538a3da..0ae691b39b 100644 --- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.2.bb +++ b/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.3.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" LICENSE = "GPL-2.0-only" SRCBRANCH ?= "master" -SRCREV = "9fefc6848d0b3765760e709cfe92fb9d76d5d452" +SRCREV = "ecc9355e1344d3de94870e855e380ee84224e552" DEPENDS = "bzip2 zlib elfutils xz" RDEPENDS:${PN}-tools = "perl ${PN}" diff --git a/meta-oe/recipes-kernel/minicoredumper/files/0001-minicoredumper-retry-elf-parsing-as-long-as-needed.patch b/meta-oe/recipes-kernel/minicoredumper/files/0001-minicoredumper-retry-elf-parsing-as-long-as-needed.patch deleted file mode 100644 index 8d5b8b6cbb..0000000000 --- a/meta-oe/recipes-kernel/minicoredumper/files/0001-minicoredumper-retry-elf-parsing-as-long-as-needed.patch +++ /dev/null @@ -1,128 +0,0 @@ -From 7a8c6a06c86e133e4346b1dc66483bd8d0d3c716 Mon Sep 17 00:00:00 2001 -From: John Ogness <john.ogness@linutronix.de> -Date: Tue, 24 Aug 2021 21:10:43 +0200 -Subject: [PATCH] minicoredumper: retry elf parsing as long as needed - -As was reported in github issue #2 ("maximum number of tries -insufficient, in rare cases, for elf parse"), the number of retries -for parsing a process may be insufficient. Rather than setting an -upper limit on the maximum number of retries, track the number of -headers seen. As long as the number of seen headers is greater than -the previous try, try again. - -In order to avoid introducing any new issues, preserve the behavior -of retrying at least 10 times, even if no new headers are seen. - -Reported-by: github.com/ssajal-wr -Signed-off-by: John Ogness <john.ogness@linutronix.de> - -Upstream-Status: Backport [7a8c6a06c86e133e4346b1dc66483bd8d0d3c716] - -Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> ---- - src/minicoredumper/corestripper.c | 30 +++++++++++++++++++++++------- - 1 file changed, 23 insertions(+), 7 deletions(-) - -diff --git a/src/minicoredumper/corestripper.c b/src/minicoredumper/corestripper.c -index d96d1df..c96b350 100644 ---- a/src/minicoredumper/corestripper.c -+++ b/src/minicoredumper/corestripper.c -@@ -761,7 +761,7 @@ static int init_log(struct dump_info *di) - typedef int elf_parse_cb(struct dump_info *di, Elf *elf, GElf_Phdr *phdr); - - static int do_elf_ph_parse(struct dump_info *di, GElf_Phdr *type, -- elf_parse_cb *callback) -+ elf_parse_cb *callback, size_t *phnum_found) - { - GElf_Ehdr ehdr_mem; - GElf_Ehdr *ehdr; -@@ -770,6 +770,9 @@ static int do_elf_ph_parse(struct dump_info *di, GElf_Phdr *type, - size_t phnum; - size_t cnt; - -+ if (phnum_found) -+ *phnum_found = 0; -+ - /* start from beginning of core */ - if (lseek64(di->elf_fd, 0, SEEK_SET) == -1) { - info("lseek failed: %s", strerror(errno)); -@@ -809,6 +812,9 @@ static int do_elf_ph_parse(struct dump_info *di, GElf_Phdr *type, - goto out; - } - -+ if (phnum_found) -+ *phnum_found = phnum; -+ - for (cnt = 0; cnt < phnum; cnt++) { - GElf_Phdr phdr_mem; - GElf_Phdr *phdr; -@@ -891,7 +897,7 @@ static int vma_cb(struct dump_info *di, Elf *elf, GElf_Phdr *phdr) - /* - * Tries to parse the found ELF headers and reads all vmas from it. - */ --static int parse_vma_info(struct dump_info *di) -+static int parse_vma_info(struct dump_info *di, size_t *phnum_found) - { - unsigned long min_off = ULONG_MAX; - unsigned long max_len = 0; -@@ -911,7 +917,7 @@ static int parse_vma_info(struct dump_info *di) - memset(&type, 0, sizeof(type)); - type.p_type = PT_LOAD; - type.p_flags = PF_R; -- if (do_elf_ph_parse(di, &type, vma_cb) != 0) -+ if (do_elf_ph_parse(di, &type, vma_cb, phnum_found) != 0) - return -1; - - for (v = di->vma; v; v = v->next) { -@@ -1614,8 +1620,10 @@ int add_core_data(struct dump_info *di, off64_t dest_offset, size_t len, - */ - static int init_src_core(struct dump_info *di, int src) - { -+ size_t last_phnum = 0; - int tries = 0; - int ret = -1; -+ size_t phnum; - size_t len; - char *buf; - long pos; -@@ -1642,7 +1650,7 @@ again: - goto out; - - /* try to elf-parse the core to read vma info */ -- ret = parse_vma_info(di); -+ ret = parse_vma_info(di, &phnum); - - /* restore our position */ - if (lseek64(di->elf_fd, pos, SEEK_SET) == -1) -@@ -1653,9 +1661,17 @@ again: - - tries++; - -- /* maybe try again */ -- if (tries < 10) -+ if (phnum > last_phnum) { -+ /* new headers found, keep trying */ -+ last_phnum = phnum; - goto again; -+ } else if (tries < 10) { -+ /* -+ * even if no new headers are found, -+ * retry at least 10 times -+ */ -+ goto again; -+ } - - goto out; - } -@@ -2106,7 +2122,7 @@ static int dump_stacks(struct dump_info *di) - /* find and set the first task */ - memset(&type, 0, sizeof(type)); - type.p_type = PT_NOTE; -- do_elf_ph_parse(di, &type, note_cb); -+ do_elf_ph_parse(di, &type, note_cb, NULL); - } - - if (di->first_pid) --- -2.25.1 - diff --git a/meta-oe/recipes-kernel/minicoredumper/files/0001-replace-pthread_mutexattr_setrobust_np-with-pthread_.patch b/meta-oe/recipes-kernel/minicoredumper/files/0001-replace-pthread_mutexattr_setrobust_np-with-pthread_.patch deleted file mode 100644 index 455e6f3181..0000000000 --- a/meta-oe/recipes-kernel/minicoredumper/files/0001-replace-pthread_mutexattr_setrobust_np-with-pthread_.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5895caba6573e84f73f159d9e84cd1aa7e969f18 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 9 May 2021 14:37:00 -0700 -Subject: [PATCH] replace pthread_mutexattr_setrobust_np with - pthread_mutexattr_setrobust - -This is now part of standard POSIX function [1] - -Upstream-Status: Submitted [https://github.com/diamon/minicoredumper/pull/3] - -[1] https://man7.org/linux/man-pages/man3/pthread_mutexattr_setrobust_np.3.html - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/minicoredumper_regd/daemon.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/minicoredumper_regd/daemon.c b/src/minicoredumper_regd/daemon.c -index 115ec92..b9ad1ea 100644 ---- a/src/minicoredumper_regd/daemon.c -+++ b/src/minicoredumper_regd/daemon.c -@@ -224,7 +224,7 @@ static int setup_shm(void) - - pthread_mutexattr_init(&attr); - pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT); -- pthread_mutexattr_setrobust_np(&attr, PTHREAD_MUTEX_ROBUST_NP); -+ pthread_mutexattr_setrobust(&attr, PTHREAD_MUTEX_ROBUST); - pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED); - pthread_mutex_init(&sh->m, &attr); - --- -2.31.1 - diff --git a/meta-oe/recipes-kernel/minicoredumper/files/run-ptest b/meta-oe/recipes-kernel/minicoredumper/files/run-ptest new file mode 100644 index 0000000000..fbddc0774d --- /dev/null +++ b/meta-oe/recipes-kernel/minicoredumper/files/run-ptest @@ -0,0 +1,12 @@ +#!/bin/sh + +echo minicoredumper_demo +echo expecting Segmentation fault with core dump ... + +minicoredumper_demo 6 & sleep 3 && minicoredumper_demo + +if ls /var/crash/ | grep minicoredumper; then + echo SUCCESS +else + echo FAIL +fi diff --git a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.6.bb index 0b934ee2d8..dfe9f7b51d 100644 --- a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb +++ b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.6.bb @@ -7,17 +7,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=71827c617ec7b45a0dd23658347cc1e9 \ " DEPENDS = "elfutils dbus dbus-glib-native glib-2.0 dbus-glib util-linux json-c" -inherit autotools pkgconfig systemd update-rc.d +inherit autotools pkgconfig ptest systemd update-rc.d -SRCREV = "16a0d44f1725eaa93096eaa0e086f42ef4c2712c" - -PR .= "+git${SRCPV}" +SRCREV = "da62115c0fab3a4608e4b0ee0c8aa0cf134c14ca" SRC_URI = "git://github.com/diamon/minicoredumper;protocol=https;branch=master \ - file://0001-replace-pthread_mutexattr_setrobust_np-with-pthread_.patch \ file://minicoredumper.service \ file://minicoredumper.init \ - file://0001-minicoredumper-retry-elf-parsing-as-long-as-needed.patch \ + file://run-ptest \ " S = "${WORKDIR}/git" @@ -29,6 +26,9 @@ INITSCRIPT_PACKAGES = "${PN}" INITSCRIPT_NAME:${PN} = "minicoredumper" INITSCRIPT_PARAMS:${PN} = "defaults 89" +EXTRA_OECONF:append = " \ + ${@bb.utils.contains('PTEST_ENABLED', '1', '--with-minicoredumper_demo', '--without-libminicoredumper', d)} \ +" do_install:append() { rmdir ${D}${localstatedir}/run install -d ${D}/${sysconfdir}/minicoredumper @@ -37,7 +37,7 @@ do_install:append() { install -d ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/minicoredumper.service ${D}${systemd_system_unitdir} install -d ${D}${sysconfdir}/init.d - install -m 0644 ${WORKDIR}/minicoredumper.init ${D}${sysconfdir}/init.d/minicoredumper + install -m 0755 ${WORKDIR}/minicoredumper.init ${D}${sysconfdir}/init.d/minicoredumper # correct path of minicoredumper sed -i -e s:/usr/bin/minicoredumper:${sbindir}/minicoredumper:g ${D}${sysconfdir}/init.d/minicoredumper diff --git a/meta-oe/recipes-kernel/oprofile/oprofile/0001-Replace-std-bind2nd-with-generic-lambda.patch b/meta-oe/recipes-kernel/oprofile/oprofile/0001-Replace-std-bind2nd-with-generic-lambda.patch new file mode 100644 index 0000000000..930b90e289 --- /dev/null +++ b/meta-oe/recipes-kernel/oprofile/oprofile/0001-Replace-std-bind2nd-with-generic-lambda.patch @@ -0,0 +1,34 @@ +From 5d879cb4f23c613e16b3f479ab09bbb5ff340201 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 6 Feb 2023 17:02:41 -0800 +Subject: [PATCH] Replace std::bind2nd with generic lambda + +std::bind2nd is gone in c++17, therefore stop using it and replace it +with generic lambda from c++14 onwards + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libutil++/growable_vector.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libutil++/growable_vector.h b/libutil++/growable_vector.h +index 350246a..9846e1e 100644 +--- a/libutil++/growable_vector.h ++++ b/libutil++/growable_vector.h +@@ -93,9 +93,9 @@ public: + + /// return true if all elements have the default constructed value + bool zero() const { +- return std::find_if(container.begin(), container.end(), +- std::bind2nd(std::not_equal_to<T>(), T())) +- == container.end(); ++ return std::find_if(begin(container), end(container), ++ [&](auto const& elem) {return elem != T();}) ++ == end(container); + } + + private: +-- +2.39.1 + diff --git a/meta-oe/recipes-kernel/oprofile/oprofile_1.4.0.bb b/meta-oe/recipes-kernel/oprofile/oprofile_1.4.0.bb index e6eec0ab05..335ab48bb2 100644 --- a/meta-oe/recipes-kernel/oprofile/oprofile_1.4.0.bb +++ b/meta-oe/recipes-kernel/oprofile/oprofile_1.4.0.bb @@ -31,6 +31,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ file://0009-Prevent-running-check-tests-on-host-if-cross-compili.patch \ file://0010-oprofile-Determine-the-root-home-directory-dynamical.patch \ file://0001-configure-Include-unistd.h-for-getpid-API.patch \ + file://0001-Replace-std-bind2nd-with-generic-lambda.patch \ " SRC_URI[sha256sum] = "7ba06f99d7c188389d20d1d5e53ee690c7733f87aa9af62bd664fa0ca235a412" diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch b/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch index 33557275fb..fc5991d464 100644 --- a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch +++ b/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch @@ -11,7 +11,7 @@ lock_torture_wr-96 was split to different line due to limited buffer size(1k) set in kernel, check this case and re-parse the unfinished line. -Upstream-Status: [Submitted: https://github.com/intel/pm-graph/pull/20] +Upstream-Status: Submitted [https://github.com/intel/pm-graph/pull/20] Signed-off-by: Liwei Song <liwei.song@windriver.com> --- diff --git a/meta-oe/recipes-kernel/spidev-test/spidev-test.bb b/meta-oe/recipes-kernel/spidev-test/spidev-test.bb index 81e8327032..2e8c5cbb8d 100644 --- a/meta-oe/recipes-kernel/spidev-test/spidev-test.bb +++ b/meta-oe/recipes-kernel/spidev-test/spidev-test.bb @@ -23,7 +23,7 @@ do_install() { PACKAGE_ARCH = "${MACHINE_ARCH}" python do_package:prepend() { - d.setVar('PKGV', d.getVar("KERNEL_VERSION", True).split("-")[0]) + d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0]) } B = "${WORKDIR}/${BPN}-${PV}" diff --git a/meta-oe/recipes-kernel/usbip-tools/usbip-tools.bb b/meta-oe/recipes-kernel/usbip-tools/usbip-tools.bb index 47938969bb..e7e4ca50af 100644 --- a/meta-oe/recipes-kernel/usbip-tools/usbip-tools.bb +++ b/meta-oe/recipes-kernel/usbip-tools/usbip-tools.bb @@ -65,5 +65,5 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" # Even though the libusbip is set to version 0.0.1, set the package version to match kernel # e.g. usbip-tools-5.14.21-r0.qemux86_64.rpm for qemu package using kernel 5.14.21 python do_package:prepend() { - d.setVar('PKGV', d.getVar("KERNEL_VERSION", True).split("-")[0]) + d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0]) }
\ No newline at end of file diff --git a/meta-oe/recipes-multimedia/audiofile/files/0001-fix-negative-shift-constants.patch b/meta-oe/recipes-multimedia/audiofile/files/0001-fix-negative-shift-constants.patch index ecb3108050..4792a15e86 100644 --- a/meta-oe/recipes-multimedia/audiofile/files/0001-fix-negative-shift-constants.patch +++ b/meta-oe/recipes-multimedia/audiofile/files/0001-fix-negative-shift-constants.patch @@ -14,6 +14,8 @@ Upstrem-Status: Pending Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- +Upstream-Status: Pending + libaudiofile/modules/SimpleModule.h | 2 +- test/FloatToInt.cpp | 2 +- test/IntToFloat.cpp | 2 +- diff --git a/meta-oe/recipes-multimedia/audiofile/files/0002-fix-build-on-gcc6.patch b/meta-oe/recipes-multimedia/audiofile/files/0002-fix-build-on-gcc6.patch index 2c66cf4d00..dea8187ccb 100644 --- a/meta-oe/recipes-multimedia/audiofile/files/0002-fix-build-on-gcc6.patch +++ b/meta-oe/recipes-multimedia/audiofile/files/0002-fix-build-on-gcc6.patch @@ -14,6 +14,8 @@ Upstrem-Status: Pending Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- +Upstream-Status: Pending + test/NeXT.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/meta-oe/recipes-multimedia/cdrkit/files/0001-define-__THROW-to-avoid-build-issue-with-musl.patch b/meta-oe/recipes-multimedia/cdrkit/files/0001-define-__THROW-to-avoid-build-issue-with-musl.patch index b3beb069eb..95a5ddd7dd 100644 --- a/meta-oe/recipes-multimedia/cdrkit/files/0001-define-__THROW-to-avoid-build-issue-with-musl.patch +++ b/meta-oe/recipes-multimedia/cdrkit/files/0001-define-__THROW-to-avoid-build-issue-with-musl.patch @@ -8,6 +8,8 @@ http://autobuild.buildroot.net/results/d27/d2781e70b04a207e2e9397d888032294c7285 Signed-off-by: Romain Naour <romain.naour@openwide.fr> --- +Upstream-Status: Pending + genisoimage/sha256.h | 4 ++++ genisoimage/sha512.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Fix-fprintf-format-errors.patch b/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Fix-fprintf-format-errors.patch index f52f71b632..1a2c1a91cf 100644 --- a/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Fix-fprintf-format-errors.patch +++ b/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Fix-fprintf-format-errors.patch @@ -5,6 +5,8 @@ Subject: [PATCH] genisoimage: Fix fprintf format errors Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + genisoimage/genisoimage.c | 4 ++-- genisoimage/tree.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-multimedia/cdrkit/files/0002-Do-not-use-rcmd-on-build-with-musl.patch b/meta-oe/recipes-multimedia/cdrkit/files/0002-Do-not-use-rcmd-on-build-with-musl.patch index 547a21c67f..47c12928b7 100644 --- a/meta-oe/recipes-multimedia/cdrkit/files/0002-Do-not-use-rcmd-on-build-with-musl.patch +++ b/meta-oe/recipes-multimedia/cdrkit/files/0002-Do-not-use-rcmd-on-build-with-musl.patch @@ -8,6 +8,8 @@ on musl. Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + include/xconfig.h.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-multimedia/id3lib/id3lib/acdefine.patch b/meta-oe/recipes-multimedia/id3lib/id3lib/acdefine.patch index 09edecc964..c8b546b179 100644 --- a/meta-oe/recipes-multimedia/id3lib/id3lib/acdefine.patch +++ b/meta-oe/recipes-multimedia/id3lib/id3lib/acdefine.patch @@ -1,6 +1,6 @@ Add a description to the AC_DEFINE statements so that it appears in config.h and silences a fatal warning. -Upstream-Status:Pending +Upstream-Status: Pending Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com> --- configure.in | 6 +++--- diff --git a/meta-oe/recipes-multimedia/jack/jack/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch b/meta-oe/recipes-multimedia/jack/jack/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch deleted file mode 100644 index d3b203111f..0000000000 --- a/meta-oe/recipes-multimedia/jack/jack/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 415d50fc56b82963e5570c7738c61b22f4a83748 Mon Sep 17 00:00:00 2001 -From: Daan De Meyer <daan.j.demeyer@gmail.com> -Date: Mon, 11 Jul 2022 00:56:28 +0200 -Subject: [PATCH] Remove usage of 'U' mode bit for opening files in python - -The 'U' mode bit is removed in python 3.11. It has been -deprecated for a long time. The 'U' mode bit has no effect -so this change doesn't change any behavior. - -See https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api - -Upstream-Status: Submitted [https://github.com/jackaudio/jack2/pull/884] ---- - waflib/ConfigSet.py | 2 +- - waflib/Context.py | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/waflib/ConfigSet.py b/waflib/ConfigSet.py -index b300bb56..84736c9c 100644 ---- a/waflib/ConfigSet.py -+++ b/waflib/ConfigSet.py -@@ -312,7 +312,7 @@ class ConfigSet(object): - :type filename: string - """ - tbl = self.table -- code = Utils.readf(filename, m='rU') -+ code = Utils.readf(filename, m='r') - for m in re_imp.finditer(code): - g = m.group - tbl[g(2)] = eval(g(3)) -diff --git a/waflib/Context.py b/waflib/Context.py -index 9fee3fa1..761b521f 100644 ---- a/waflib/Context.py -+++ b/waflib/Context.py -@@ -266,7 +266,7 @@ class Context(ctx): - cache[node] = True - self.pre_recurse(node) - try: -- function_code = node.read('rU', encoding) -+ function_code = node.read('r', encoding) - exec(compile(function_code, node.abspath(), 'exec'), self.exec_dict) - finally: - self.post_recurse(node) -@@ -662,7 +662,7 @@ def load_module(path, encoding=None): - - module = imp.new_module(WSCRIPT_FILE) - try: -- code = Utils.readf(path, m='rU', encoding=encoding) -+ code = Utils.readf(path, m='r', encoding=encoding) - except EnvironmentError: - raise Errors.WafError('Could not read the file %r' % path) - diff --git a/meta-oe/recipes-multimedia/jack/jack_1.19.21.bb b/meta-oe/recipes-multimedia/jack/jack_1.19.22.bb index 808b8259f0..b85b7993d0 100644 --- a/meta-oe/recipes-multimedia/jack/jack_1.19.21.bb +++ b/meta-oe/recipes-multimedia/jack/jack_1.19.22.bb @@ -14,10 +14,8 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "libsamplerate0 libsndfile1 readline" -SRC_URI = "git://github.com/jackaudio/jack2.git;branch=master;protocol=https \ - file://0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch \ -" -SRCREV = "6b3c96d8aeef8aeb4b20f3aa647e6d01b4000ff8" +SRC_URI = "git://github.com/jackaudio/jack2.git;branch=master;protocol=https" +SRCREV = "4f58969432339a250ce87fe855fb962c67d00ddb" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-multimedia/libass/libass_0.17.0.bb b/meta-oe/recipes-multimedia/libass/libass_0.17.1.bb index c052239cbf..800ad1b15e 100644 --- a/meta-oe/recipes-multimedia/libass/libass_0.17.0.bb +++ b/meta-oe/recipes-multimedia/libass/libass_0.17.1.bb @@ -7,8 +7,8 @@ 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 = "bef4b43ef1882b77f789f611d9cd24271ccdd65b" +SRC_URI = "git://github.com/libass/libass.git;protocol=https;branch=0.17.1-branch" +SRCREV = "e8ad72accd3a84268275a9385beb701c9284e5b3" S = "${WORKDIR}/git" inherit autotools pkgconfig diff --git a/meta-oe/recipes-multimedia/libburn/libburn_1.5.4.bb b/meta-oe/recipes-multimedia/libburn/libburn_1.5.4.bb deleted file mode 100644 index 99eda69643..0000000000 --- a/meta-oe/recipes-multimedia/libburn/libburn_1.5.4.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Library for reading, mastering and writing optical discs" -HOMEPAGE = "http://libburnia-project.org/" - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" - -SRC_URI = "http://files.libburnia-project.org/releases/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "454d03ce31addb5b7dca62d213c9660e" -SRC_URI[sha256sum] = "525059d10759c5cb8148eebc863bb510e311c663603da7bd2d21c46b7cf63b54" - -inherit autotools pkgconfig diff --git a/meta-oe/recipes-multimedia/libcdio/libcdio/Drop-LIBCDIO_SOURCE_PATH-by-dropping-STRIP_FROM_PATH.patch b/meta-oe/recipes-multimedia/libcdio/libcdio/Drop-LIBCDIO_SOURCE_PATH-by-dropping-STRIP_FROM_PATH.patch new file mode 100644 index 0000000000..0b25dff75e --- /dev/null +++ b/meta-oe/recipes-multimedia/libcdio/libcdio/Drop-LIBCDIO_SOURCE_PATH-by-dropping-STRIP_FROM_PATH.patch @@ -0,0 +1,43 @@ +From 08c1768aaeea86c522c0ef1705b9b6d434ebd3ae Mon Sep 17 00:00:00 2001 +From: Chris Lamb <chris@chris-lamb.co.uk> +Date: Fri, 28 Jul 2017 11:49:13 +0100 +Subject: [PATCH] Drop LIBCDIO_SOURCE_PATH by dropping STRIP_FROM_PATH Doxygen + setup; it's not used as FULL_PATH_NAMES = no + +Source: https://sources.debian.org/data/main/libc/libcdio/2.1.0-4/debian/patches/Drop-LIBCDIO_SOURCE_PATH-by-dropping-STRIP_FROM_PATH.patch +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 5 ----- + doc/doxygen/Doxyfile.in | 2 +- + 2 files changed, 1 insertion(+), 6 deletions(-) + +Index: b/configure.ac +=================================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -557,11 +557,6 @@ AC_SUBST(HAVE_SOLARIS_CDROM) + AC_SUBST(HAVE_WIN32_CDROM) + AC_SUBST(HAVE_OS2_CDROM) + +-LIBCDIO_SOURCE_PATH="`pwd`" +-AC_DEFINE_UNQUOTED(LIBCDIO_SOURCE_PATH, "$LIBCDIO_SOURCE_PATH", +- [Full path to libcdio top_sourcedir.]) +-AC_SUBST(LIBCDIO_SOURCE_PATH) +- + AC_CHECK_FUNCS( [chdir drand48 fseeko fseeko64 ftruncate geteuid getgid \ + getuid getpwuid gettimeofday lseek64 lstat memcpy memset mkstemp rand \ + seteuid setegid snprintf setenv strndup unsetenv tzset sleep \ +Index: b/doc/doxygen/Doxyfile.in +=================================================================== +--- a/doc/doxygen/Doxyfile.in ++++ b/doc/doxygen/Doxyfile.in +@@ -138,7 +138,7 @@ FULL_PATH_NAMES = NO + # If left blank the directory from which doxygen is run is used as the + # path to strip. + +-STRIP_FROM_PATH = @LIBCDIO_SOURCE_PATH@ ++STRIP_FROM_PATH = + + # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of + # the path mentioned in the documentation of a class, which tells diff --git a/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb b/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb index 62004ac440..8562462cba 100644 --- a/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb +++ b/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.bz2 \ file://0001-Fix-a-few-Werror-format-security-errors-with-mvprint.patch \ + file://Drop-LIBCDIO_SOURCE_PATH-by-dropping-STRIP_FROM_PATH.patch \ " SRC_URI[md5sum] = "aa7629e8f73662a762f64c444b901055" diff --git a/meta-oe/recipes-multimedia/libmad/libmad/0001-configure-Respect-the-cflags-from-environment.patch b/meta-oe/recipes-multimedia/libmad/libmad/0001-configure-Respect-the-cflags-from-environment.patch new file mode 100644 index 0000000000..586782a348 --- /dev/null +++ b/meta-oe/recipes-multimedia/libmad/libmad/0001-configure-Respect-the-cflags-from-environment.patch @@ -0,0 +1,47 @@ +From 26342d1c775205f661f5cf005b7e054a04f5d32e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 16 May 2023 10:14:57 -0700 +Subject: [PATCH] configure: Respect the cflags from environment + +This is needed with OE like cross-build envs where certain important +flags maybe passed as global policy to aid cross compiling or +reproducibility etc. + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -73,12 +73,9 @@ debug="" + optimize="" + profile="" + +-set -- $CFLAGS +-CFLAGS="" +- + if test "$GCC" = yes + then +- CFLAGS="-Wall" ++ CFLAGS="$CFLAGS -Wall" + fi + + while test $# -gt 0 +@@ -115,10 +112,13 @@ do + optimize="$optimize $1" + shift + ;; +- *) ++ -*) + CFLAGS="$CFLAGS $1" + shift + ;; ++ *) ++ shift ++ ;; + esac + done + diff --git a/meta-oe/recipes-multimedia/libmad/libmad/0004-Remove-clang-unsupported-compiler-flags.patch b/meta-oe/recipes-multimedia/libmad/libmad/0004-Remove-clang-unsupported-compiler-flags.patch index 70723f2d08..b9a444dc32 100644 --- a/meta-oe/recipes-multimedia/libmad/libmad/0004-Remove-clang-unsupported-compiler-flags.patch +++ b/meta-oe/recipes-multimedia/libmad/libmad/0004-Remove-clang-unsupported-compiler-flags.patch @@ -4,6 +4,8 @@ Date: Tue, 16 Sep 2014 12:28:47 +0300 Subject: [PATCH 4/4] Remove clang unsupported compiler flags --- +Upstream-Status: Pending + configure.ac | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb b/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb index d3ac85ee0b..5b089a0b33 100644 --- a/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb +++ b/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb @@ -16,6 +16,7 @@ SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libmad-${PV}.tar.gz \ file://fix_for_mips_with_gcc-4.5.0.patch \ file://obsolete_automake_macros.patch \ file://automake-foreign.patch \ + file://0001-configure-Respect-the-cflags-from-environment.patch \ " SRC_URI:append:toolchain-clang = " file://0004-Remove-clang-unsupported-compiler-flags.patch " diff --git a/meta-oe/recipes-multimedia/libopus/libopus_1.3.1.bb b/meta-oe/recipes-multimedia/libopus/libopus_1.4.bb index 830bc04734..2002117746 100644 --- a/meta-oe/recipes-multimedia/libopus/libopus_1.3.1.bb +++ b/meta-oe/recipes-multimedia/libopus/libopus_1.4.bb @@ -9,8 +9,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=e304cdf74c2a1b0a33a5084c128a23a3" SRC_URI = "http://downloads.xiph.org/releases/opus/opus-${PV}.tar.gz" -SRC_URI[md5sum] = "d7c07db796d21c9cf1861e0c2b0c0617" -SRC_URI[sha256sum] = "65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d" +SRC_URI[sha256sum] = "c9b32b4253be5ae63d1ff16eea06b94b5f0f2951b7a02aceef58e3a3ce49c51f" S = "${WORKDIR}/opus-${PV}" diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.34.1.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.35.1.bb index c600e88f88..0f50a6e8fe 100644 --- a/meta-oe/recipes-multimedia/mplayer/mpv_0.34.1.bb +++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.35.1.bb @@ -11,18 +11,14 @@ DEPENDS = " \ libass \ " -DEPENDS += " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' virtual/libx11 xsp libxv libxscrnsaver libxinerama', '', d)} \ -" - LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV_mpv = "349e437466163cb52f7d0aa227d4606edd9db501" -SRC_URI = "git://github.com/mpv-player/mpv;name=mpv;branch=release/0.34;protocol=https \ - https://waf.io/waf-2.0.20;name=waf;subdir=git \ +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 \ " -SRC_URI[waf.sha256sum] = "bf971e98edc2414968a262c6aa6b88541a26c3cd248689c89f4c57370955ee7f" +SRC_URI[waf.sha256sum] = "21199cd220ccf60434133e1fd2ab8c8e5217c3799199c82722543970dc8e38d5" S = "${WORKDIR}/git" @@ -46,7 +42,7 @@ PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)} \ " -PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11" +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" @@ -102,8 +98,12 @@ EXTRA_OECONF = " \ ${PACKAGECONFIG_CONFARGS} \ " +do_configure:append() { + sed -i -e 's#${WORKDIR}#<WORKDIR>#g' ${B}/config.h +} + link_waf() { - ln -s waf-2.0.20 ${S}/waf + ln -s waf-2.0.25 ${S}/waf } do_unpack[postfuncs] += "link_waf" @@ -111,5 +111,6 @@ FILES:${PN} += " \ ${datadir}/icons \ ${datadir}/zsh \ ${datadir}/bash-completion \ + ${datadir}/metainfo \ " EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "0", "1", d)}" diff --git a/meta-oe/recipes-multimedia/pulseaudio/paprefs_1.2.bb b/meta-oe/recipes-multimedia/pulseaudio/paprefs_1.2.bb new file mode 100644 index 0000000000..6e4321dd7d --- /dev/null +++ b/meta-oe/recipes-multimedia/pulseaudio/paprefs_1.2.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "PulseAudio Preferences (paprefs) is a simple GTK based configuration dialog for the PulseAudio sound server." +HOMEPAGE = "https://freedesktop.org/software/pulseaudio/paprefs/" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = "pulseaudio gtkmm3 gtk+3 libsigc++-3 glibmm" + +inherit meson pkgconfig features_check + +# paprefs.cc includes gdk/gdkx.h and gdkx.h isn't provided by gtk3 without x11 in DISTRO_FEATURES +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI = "http://freedesktop.org/software/pulseaudio/paprefs/${BP}.tar.xz" + +SRC_URI[sha256sum] = "b3f21e40dc3936d15e3ffc910fb0c07c14b88e8c287715b456a948c17638f633" + +EXTRA_OEMESON = "-Dlynx=false" + +RDEPENDS:${PN} += "pulseaudio-server" diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch index 8ac8fbe19e..52f0cd3388 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch @@ -13,6 +13,8 @@ Conflicts: utils/media-ctl/Makefile.am --- +Upstream-Status: Pending + utils/media-ctl/Makefile.am | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-info-Include-missing-cstdint-for-uintptr_t.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-info-Include-missing-cstdint-for-uintptr_t.patch deleted file mode 100644 index 032bf00c7d..0000000000 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-info-Include-missing-cstdint-for-uintptr_t.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 1d9ce7cd799770981043f656373cbd1bf7558b9a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 26 Jan 2023 17:00:00 -0800 -Subject: [PATCH] media-info: Include missing <cstdint> for uintptr_t - -gcc 13 moved some includes around and as a result <cstdint> is no longer -transitively included [1]. Explicitly include it. - -[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes - -Upstream-Status: Submitted [https://lore.kernel.org/linux-media/20230127010741.3883339-1-raj.khem@gmail.com/] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - utils/common/media-info.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/utils/common/media-info.cpp b/utils/common/media-info.cpp -index 53e132f5..1a25a4b6 100644 ---- a/utils/common/media-info.cpp -+++ b/utils/common/media-info.cpp -@@ -3,6 +3,7 @@ - * Copyright 2018 Cisco Systems, Inc. and/or its affiliates. All rights reserved. - */ - -+#include <cstdint> - #include <cstring> - #include <fstream> - #include <iostream> --- -2.39.1 - diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-original-patch-mediactl-pkgconfig.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-original-patch-mediactl-pkgconfig.patch index 52fc2d7a8d..d52475974f 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-original-patch-mediactl-pkgconfig.patch +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-original-patch-mediactl-pkgconfig.patch @@ -4,6 +4,8 @@ Date: Sun, 1 Mar 2015 22:25:07 +0000 Subject: [PATCH] %% original patch: mediactl-pkgconfig.patch --- +Upstream-Status: Pending + utils/media-ctl/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-original-patch-export-mediactl-headers.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-original-patch-export-mediactl-headers.patch index 39dc338350..f6fcee92ea 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-original-patch-export-mediactl-headers.patch +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-original-patch-export-mediactl-headers.patch @@ -4,6 +4,8 @@ Date: Sun, 1 Mar 2015 22:25:07 +0000 Subject: [PATCH] %% original patch: export-mediactl-headers.patch --- +Upstream-Status: Pending + utils/media-ctl/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-configure.ac-Makefile.am-Support-building-without-NL.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-configure.ac-Makefile.am-Support-building-without-NL.patch deleted file mode 100644 index 0548e4fba1..0000000000 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-configure.ac-Makefile.am-Support-building-without-NL.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 4fe9f6071cd24bcab157a9398adcca474f619f8d Mon Sep 17 00:00:00 2001 -From: Peter Kjellerstedt <pkj@axis.com> -Date: Sat, 15 Oct 2022 02:45:26 +0200 -Subject: [PATCH] configure.ac, Makefile.am: Support building without NLS - -Avoid entering the v4l-utils-po and libdvbv5-po directories if NLS -support is disabled, as the generated Makefiles in those directories are -empty then. - -Upstream-Status: Submitted [https://patchwork.linuxtv.org/project/linux-media/patch/20221015010541.688322-1-pkj@axis.com/] -Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> ---- - Makefile.am | 6 +++++- - configure.ac | 1 + - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 7fb443ab..8e924af8 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -2,7 +2,11 @@ AUTOMAKE_OPTIONS = foreign - ACLOCAL_AMFLAGS = -I m4 - AM_MAKEFLAGS = $(word 1, $(subst 1, -w, $(filter 1, $(V))) --no-print-directory) - --SUBDIRS = v4l-utils-po libdvbv5-po lib -+SUBDIRS = lib -+ -+if USE_NLS -+SUBDIRS += v4l-utils-po libdvbv5-po -+endif - - if WITH_V4LUTILS - SUBDIRS += utils contrib -diff --git a/configure.ac b/configure.ac -index 05298981..7c78467f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -99,6 +99,7 @@ DX_INIT_DOXYGEN($PACKAGE_NAME, doxygen_libdvbv5.cfg) - ALL_LINGUAS="" - m4_ifdef(AM_GNU_GETTEXT_REQUIRE_VERSION,[AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8])],[AM_GNU_GETTEXT_VERSION([0.19.8])]) - AM_GNU_GETTEXT([external]) -+AM_CONDITIONAL([USE_NLS], [test "$USE_NLS" = "yes"]) - - LIBDVBV5_DOMAIN="libdvbv5" - AC_DEFINE([LIBDVBV5_DOMAIN], "libdvbv5", [libdvbv5 domain]) diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.23.0.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb index b42300f096..c02645a6b8 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.23.0.bb +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb @@ -26,27 +26,23 @@ PACKAGECONFIG[qv4l2] = ",--disable-qv4l2" PACKAGECONFIG[qvidcap] = ",--disable-qvidcap" SRC_URI = "\ - git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=master \ + git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.24 \ file://0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch \ file://0002-original-patch-mediactl-pkgconfig.patch \ file://0003-original-patch-export-mediactl-headers.patch \ file://0004-Do-not-use-getsubopt.patch \ - file://0005-configure.ac-Makefile.am-Support-building-without-NL.patch \ - file://0001-media-info-Include-missing-cstdint-for-uintptr_t.patch \ " -SRCREV = "fd544473800d02e90bc289434cc44e5aa8fadd0f" +SRCREV = "8799081b143627c9c09dea0c60ad3d1cc17cc848" + +PV .= "+git${SRCPV}" S = "${WORKDIR}/git" -B = "${S}" do_configure:prepend() { - ${S}/bootstrap.sh + cd ${S}; ./bootstrap.sh; cd - } -SRC_URI[md5sum] = "8aa73287320a49e9170a8255d7b2c7e6" -SRC_URI[sha256sum] = "65c6fbe830a44ca105c443b027182c1b2c9053a91d1e72ad849dfab388b94e31" - EXTRA_OECONF = "--enable-shared --with-udevdir=${base_libdir}/udev \ --disable-v4l2-compliance-32 --disable-v4l2-ctl-32" diff --git a/meta-oe/recipes-multimedia/wavpack/wavpack_4.60.1.bb b/meta-oe/recipes-multimedia/wavpack/wavpack_4.60.1.bb deleted file mode 100644 index 021496bd43..0000000000 --- a/meta-oe/recipes-multimedia/wavpack/wavpack_4.60.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "WavPack is a completely open audio compression format providing lossless, high-quality lossy, and a unique hybrid compression mode." -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://license.txt;md5=f596650807588c61fcab60bec8242df8" - -SRC_URI = "http://wavpack.com/wavpack-${PV}.tar.bz2" -SRC_URI[md5sum] = "7bb1528f910e4d0003426c02db856063" -SRC_URI[sha256sum] = "175ee4f2effd6f51e6ec487956f41177256bf892c2e8e07de5d27ed4ee6888c5" - -inherit autotools lib_package - diff --git a/meta-oe/recipes-multimedia/wavpack/wavpack_5.1.0.bb b/meta-oe/recipes-multimedia/wavpack/wavpack_5.1.0.bb new file mode 100644 index 0000000000..9096123939 --- /dev/null +++ b/meta-oe/recipes-multimedia/wavpack/wavpack_5.1.0.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "WavPack is a completely open audio compression format providing lossless, high-quality lossy, and a unique hybrid compression mode." +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://license.txt;md5=8c1a910e5c2a8b30ec8ffb2ffa63d9b2" + +SRC_URI = "git://github.com/dbry/WavPack.git;branch=master;protocol=https" +SRCREV = "9ccc3fe4a37d069137ceabe513a4dd9b0a09c1c2" +S = "${WORKDIR}/git" + +inherit autotools lib_package diff --git a/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch b/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch index 6ad7f2b478..e0fd4fea1b 100644 --- a/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch +++ b/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch @@ -6,6 +6,8 @@ Subject: [PATCH] Upstream: not yet Fix configure to accept "--prefix=" (a blank prefix). --- +Upstream-Status: Pending + build/make/configure.sh | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-multimedia/webm/libvpx_1.12.0.bb b/meta-oe/recipes-multimedia/webm/libvpx_1.13.0.bb index 066d7cc815..79b330c315 100644 --- a/meta-oe/recipes-multimedia/webm/libvpx_1.12.0.bb +++ b/meta-oe/recipes-multimedia/webm/libvpx_1.13.0.bb @@ -7,7 +7,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4" -SRCREV = "03265cd42b3783532de72f2ded5436652e6f5ce3" +SRCREV = "d6eb9696aa72473c1a11d34d928d35a3acc0c9a9" SRC_URI += "git://chromium.googlesource.com/webm/libvpx;protocol=https;branch=main \ file://libvpx-configure-support-blank-prefix.patch \ " @@ -19,6 +19,7 @@ S = "${WORKDIR}/git" ARM_INSTRUCTION_SET = "arm" CFLAGS += "-fPIC" +BUILD_LDFLAGS += "-pthread" export CC export LD = "${CC}" @@ -48,3 +49,5 @@ do_install() { oe_runmake install DESTDIR=${D} chown -R root:root ${D} } + +BBCLASSEXTEND += "native" diff --git a/meta-oe/recipes-multimedia/xpext/xpext/auxdir.patch b/meta-oe/recipes-multimedia/xpext/xpext/auxdir.patch index da5841a132..ea9326946e 100644 --- a/meta-oe/recipes-multimedia/xpext/xpext/auxdir.patch +++ b/meta-oe/recipes-multimedia/xpext/xpext/auxdir.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- configure.ac.old 2005-06-03 12:53:28.000000000 +0200 +++ configure.ac 2005-06-03 12:54:29.000000000 +0200 @@ -25,9 +25,9 @@ diff --git a/meta-oe/recipes-multimedia/xsp/xsp/xsp-fix-pc.patch b/meta-oe/recipes-multimedia/xsp/xsp/xsp-fix-pc.patch index 18bc67cdd9..995f03113b 100644 --- a/meta-oe/recipes-multimedia/xsp/xsp/xsp-fix-pc.patch +++ b/meta-oe/recipes-multimedia/xsp/xsp/xsp-fix-pc.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- Xsp/xsp.pc.in~ 2009-01-07 13:06:07.000000000 +0100 +++ Xsp/xsp.pc.in 2009-01-07 13:06:07.000000000 +0100 @@ -6,5 +6,5 @@ diff --git a/meta-oe/recipes-navigation/geoclue/geoclue/0001-libgeoclue-don-t-try-to-use-g-ir-scanner-when-intros.patch b/meta-oe/recipes-navigation/geoclue/geoclue/0001-libgeoclue-don-t-try-to-use-g-ir-scanner-when-intros.patch new file mode 100644 index 0000000000..18e7185649 --- /dev/null +++ b/meta-oe/recipes-navigation/geoclue/geoclue/0001-libgeoclue-don-t-try-to-use-g-ir-scanner-when-intros.patch @@ -0,0 +1,30 @@ +From 6c434bdd31d674f85a82cb83248571813c7a37ff Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Wed, 3 May 2023 18:06:46 +0200 +Subject: [PATCH] libgeoclue: don't try to use g-ir-scanner when introspection + isn't enabled + +* it finds target g-ir-scanner, so gir is found(), but when it tries to call it, it fails: + 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 + + libgeoclue/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libgeoclue/meson.build b/libgeoclue/meson.build +index 5f05dad..7ed06a1 100644 +--- a/libgeoclue/meson.build ++++ b/libgeoclue/meson.build +@@ -77,7 +77,7 @@ gir_sources = [ libgeoclue_sources, + libgeoclue_headers, + libgeoclue_public_api_gen_sources[1] ] + +-if gir.found() ++if gir.found() and get_option('introspection') + geo_gir = gnome.generate_gir(libgeoclue, + sources: gir_sources, + namespace: 'Geoclue', diff --git a/meta-oe/recipes-navigation/geoclue/geoclue_2.6.0.bb b/meta-oe/recipes-navigation/geoclue/geoclue_2.7.0.bb index 798a9c16b6..6784b099aa 100644 --- a/meta-oe/recipes-navigation/geoclue/geoclue_2.6.0.bb +++ b/meta-oe/recipes-navigation/geoclue/geoclue_2.7.0.bb @@ -12,8 +12,10 @@ DEPENDS = "glib-2.0 dbus json-glib libsoup-3.0 intltool-native" inherit meson pkgconfig gtk-doc gobject-introspection vala useradd -SRCREV = "becfa5837cfafa064219a5ab2c2a4eaf35b24c0b" -SRC_URI = "git://gitlab.freedesktop.org/geoclue/geoclue.git;protocol=https;nobranch=1" +SRCREV = "bbfb6289dedb88cb8155d9f6868787d5432e1f90" +SRC_URI = "git://gitlab.freedesktop.org/geoclue/geoclue.git;protocol=https;nobranch=1 \ + file://0001-libgeoclue-don-t-try-to-use-g-ir-scanner-when-intros.patch \ +" S = "${WORKDIR}/git" @@ -25,7 +27,7 @@ PACKAGECONFIG[3g] = "-D3g-source=true,-D3g-source=false,modemmanager" PACKAGECONFIG[modem-gps] = "-Dmodem-gps-source=true,-Dmodem-gps-source=false,modemmanager" PACKAGECONFIG[cdma] = "-Dcdma-source=true,-Dcdma-source=false,modemmanager" PACKAGECONFIG[nmea] = "-Dnmea-source=true,-Dnmea-source=false,avahi,avahi-daemon" -PACKAGECONFIG[lib] = "-Dlibgeoclue=true,-Dlibgeoclue=false,gobject-introspection" +PACKAGECONFIG[lib] = "-Dlibgeoclue=true,-Dlibgeoclue=false" GTKDOC_MESON_OPTION = "gtk-doc" diff --git a/meta-oe/recipes-navigation/geos/geos/0001-include-missing-cstdint.patch b/meta-oe/recipes-navigation/geos/geos/0001-include-missing-cstdint.patch deleted file mode 100644 index 6cfd2e81bc..0000000000 --- a/meta-oe/recipes-navigation/geos/geos/0001-include-missing-cstdint.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 11b9ef265a942cb3fdd373520d0c3fce67d3cdf9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 26 Jan 2023 18:05:33 -0800 -Subject: [PATCH] include missing <cstdint> - -gcc 13 moved some includes around and as a result <cstdint> is no longer transitively included [1]. Explicitly include it for uint{32,64}_t. - -[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes - -Upstream-Status: Backport [https://github.com/kraj/geos/commit/0e8d4368b] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - include/geos/geomgraph/TopologyLocation.h | 1 + - include/geos/io/WKTWriter.h | 1 + - include/geos/shape/fractal/HilbertCode.h | 1 + - include/geos/shape/fractal/HilbertEncoder.h | 1 + - include/geos/shape/fractal/MortonCode.h | 1 + - 5 files changed, 5 insertions(+) - -diff --git a/include/geos/geomgraph/TopologyLocation.h b/include/geos/geomgraph/TopologyLocation.h -index 4cbbacb3..a3ecd212 100644 ---- a/include/geos/geomgraph/TopologyLocation.h -+++ b/include/geos/geomgraph/TopologyLocation.h -@@ -25,6 +25,7 @@ - #include <geos/inline.h> - #include <geos/geom/Location.h> - -+#include <cstdint> - #include <vector> - #include <array> - #include <string> -diff --git a/include/geos/io/WKTWriter.h b/include/geos/io/WKTWriter.h -index c0af8e71..0d60e975 100644 ---- a/include/geos/io/WKTWriter.h -+++ b/include/geos/io/WKTWriter.h -@@ -25,6 +25,7 @@ - - #include <string> - #include <cctype> -+#include <cstdint> - - #ifdef _MSC_VER - #pragma warning(push) -diff --git a/include/geos/shape/fractal/HilbertCode.h b/include/geos/shape/fractal/HilbertCode.h -index 46012efc..beeb28c6 100644 ---- a/include/geos/shape/fractal/HilbertCode.h -+++ b/include/geos/shape/fractal/HilbertCode.h -@@ -17,6 +17,7 @@ - - #include <geos/export.h> - #include <string> -+#include <cstdint> - - // Forward declarations - namespace geos { -diff --git a/include/geos/shape/fractal/HilbertEncoder.h b/include/geos/shape/fractal/HilbertEncoder.h -index 61c0010d..0126d3d9 100644 ---- a/include/geos/shape/fractal/HilbertEncoder.h -+++ b/include/geos/shape/fractal/HilbertEncoder.h -@@ -16,6 +16,7 @@ - #pragma once - - #include <geos/export.h> -+#include <cstdint> - #include <string> - #include <vector> - -diff --git a/include/geos/shape/fractal/MortonCode.h b/include/geos/shape/fractal/MortonCode.h -index 6743f87c..ad4a42e7 100644 ---- a/include/geos/shape/fractal/MortonCode.h -+++ b/include/geos/shape/fractal/MortonCode.h -@@ -17,6 +17,7 @@ - - #include <geos/export.h> - #include <string> -+#include <cstdint> - - // Forward declarations - namespace geos { --- -2.39.1 - diff --git a/meta-oe/recipes-navigation/geos/geos_3.9.4.bb b/meta-oe/recipes-navigation/geos/geos_3.12.0.bb index 558acd92bf..95cb29775a 100644 --- a/meta-oe/recipes-navigation/geos/geos_3.9.4.bb +++ b/meta-oe/recipes-navigation/geos/geos_3.12.0.bb @@ -5,13 +5,10 @@ SECTION = "libs" LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = "http://download.osgeo.org/${BPN}/${BP}.tar.bz2 \ - file://0001-include-missing-cstdint.patch" -SRC_URI[sha256sum] = "70dff2530d8cd2dfaeeb91a5014bd17afb1baee8f0e3eb18e44d5b4dbea47b14" +SRC_URI = "http://download.osgeo.org/${BPN}/${BP}.tar.bz2" +SRC_URI[sha256sum] = "d96db96011259178a35555a0f6d6e75a739e52a495a6b2aa5efb3d75390fbc39" -inherit autotools pkgconfig binconfig - -EXTRA_OECONF += "--enable-inline=no" +inherit cmake pkgconfig binconfig PACKAGES =+ "geoslib ${PN}-c1" diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_geos.patch b/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_geos.patch index 7d8d2c2e46..569ea76bb5 100644 --- a/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_geos.patch +++ b/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_geos.patch @@ -1,3 +1,5 @@ +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:19.015858195 +0100 +++ libspatialite-5.0.1-new/configure.ac 2021-03-08 08:57:19.017858195 +0100 diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_macros.patch b/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_macros.patch index 9b71ab7658..6f1c165f58 100644 --- a/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_macros.patch +++ b/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_macros.patch @@ -1,3 +1,5 @@ +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 diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_pkgconfig.patch b/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_pkgconfig.patch index 149c126768..de6e50a58d 100644 --- a/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_pkgconfig.patch +++ b/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_pkgconfig.patch @@ -1,3 +1,5 @@ +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 diff --git a/meta-oe/recipes-navigation/orrery/orrery/0001-Append-cflags-instead-of-overriding-in-Makefile.am.patch b/meta-oe/recipes-navigation/orrery/orrery/0001-Append-cflags-instead-of-overriding-in-Makefile.am.patch new file mode 100644 index 0000000000..829ace09b5 --- /dev/null +++ b/meta-oe/recipes-navigation/orrery/orrery/0001-Append-cflags-instead-of-overriding-in-Makefile.am.patch @@ -0,0 +1,28 @@ +From e13f15205425c67e1101031a33107fa9cd2d65f9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 26 May 2023 10:32:53 -0700 +Subject: [PATCH] Append cflags instead of overriding in Makefile.am + +Fixes +WARNING: orrery-2.7-r0 do_package_qa: QA Issue: File /usr/bin/.debug/orrery in package orrery-dbg contains reference to TMPDIR [buildpaths] + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index b64449f..23637b3 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,4 @@ +-CFLAGS = -g -O3 -Wall ++CFLAGS += -g -O3 -Wall + + bin_PROGRAMS = orrery + orrery_SOURCES = planetInfo.c orrery.c orrery.h phaseConstants.h +-- +2.40.1 + diff --git a/meta-oe/recipes-navigation/orrery/orrery/0001-orrery-Fix-sprintf-format.patch b/meta-oe/recipes-navigation/orrery/orrery/0001-orrery-Fix-sprintf-format.patch index eb6241fdd0..3d5828011a 100644 --- a/meta-oe/recipes-navigation/orrery/orrery/0001-orrery-Fix-sprintf-format.patch +++ b/meta-oe/recipes-navigation/orrery/orrery/0001-orrery-Fix-sprintf-format.patch @@ -5,6 +5,8 @@ Subject: [PATCH] orrery: Fix sprintf format Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + orrery.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch b/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch index 92d194de08..2abb320d83 100644 --- a/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch +++ b/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + From: Benjamin Deering Subject: orrery crashing X Date: Thursday, September 2, 2010 - 5:25 pm diff --git a/meta-oe/recipes-navigation/orrery/orrery_2.7.bb b/meta-oe/recipes-navigation/orrery/orrery_2.7.bb index 100ecb1331..96a7018de2 100644 --- a/meta-oe/recipes-navigation/orrery/orrery_2.7.bb +++ b/meta-oe/recipes-navigation/orrery/orrery_2.7.bb @@ -13,6 +13,7 @@ SRC_URI = "http://projects.openmoko.org/frs/download.php/923/orrery_2.7_clean.ta file://orrery.png \ file://use.GdkPixbuf.patch \ file://0001-orrery-Fix-sprintf-format.patch \ + file://0001-Append-cflags-instead-of-overriding-in-Makefile.am.patch \ " SRC_URI[md5sum] = "bd62a33e7554ee1030313dfcdefcda8b" @@ -22,7 +23,7 @@ S = "${WORKDIR}/${BPN}" do_configure:prepend() { # fix DSO issue with binutils-2.22 - sed -i 's/ -lrt/ -lrt -lm/g' ${S}/Makefile.am + sed -i 's/ -lrt$/ -lrt -lm/g' ${S}/Makefile.am } do_install:append() { install -d ${D}${datadir}/orrery @@ -30,6 +31,7 @@ do_install:append() { chown -R root:root ${D}${datadir}/orrery install -d ${D}${datadir}/icons install -m 0755 ${WORKDIR}/orrery.png ${D}${datadir}/icons + rm -rf ${D}${datadir}/orrery/Makefile* } FILES:${PN} += "${datadir}/icons/orrery.png" diff --git a/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/0001-Fix-time.h-check.patch b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/0001-Fix-time.h-check.patch index a6df213fee..3b7054a799 100644 --- a/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/0001-Fix-time.h-check.patch +++ b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/0001-Fix-time.h-check.patch @@ -28,11 +28,9 @@ Signed-off-by: Sam James <sam@gentoo.org> plugins/cram.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index e1bf53b6..ad781830 100644 --- a/configure.ac +++ b/configure.ac -@@ -1290,7 +1290,7 @@ AC_CHECK_HEADERS_ONCE([sys/time.h]) +@@ -1231,7 +1231,7 @@ AC_CHECK_HEADERS_ONCE([sys/time.h]) AC_HEADER_DIRENT AC_HEADER_SYS_WAIT @@ -41,8 +39,6 @@ index e1bf53b6..ad781830 100644 IPv6_CHECK_SS_FAMILY() IPv6_CHECK_SA_LEN() -diff --git a/plugins/cram.c b/plugins/cram.c -index d02e9baa..695aaa91 100644 --- a/plugins/cram.c +++ b/plugins/cram.c @@ -53,6 +53,10 @@ @@ -56,6 +52,3 @@ index d02e9baa..695aaa91 100644 #include <sasl.h> #include <saslplug.h> #include <saslutil.h> --- -2.37.3 - diff --git a/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/CVE-2019-19906.patch b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/CVE-2019-19906.patch index 33a9e3f6e6..8c95268bb5 100644 --- a/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/CVE-2019-19906.patch +++ b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/CVE-2019-19906.patch @@ -14,6 +14,8 @@ Upstream-Stauts: Backport [https://github.com/cyrusimap/cyrus-sasl Signed-off-by: Changqing Li <changqing.li@windriver.com> --- +Upstream-Status: Pending + lib/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/Fix-hardcoded-libdir.patch b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/Fix-hardcoded-libdir.patch deleted file mode 100644 index f172362f4e..0000000000 --- a/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/Fix-hardcoded-libdir.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 188ad4497947259811ad32faeee95c20f9a44046 Mon Sep 17 00:00:00 2001 -From: "Roy.Li" <rongqing.li@windriver.com> -Date: Fri, 19 Jul 2013 14:29:31 +0800 -Subject: [PATCH] Fix hardcoded libdir. - -Upstream-Status: Pending - -Signed-off-by: Roy.Li <rongqing.li@windriver.com> - ---- - plugins/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/Makefile.am b/plugins/Makefile.am -index 2b02a52..929f6a4 100644 ---- a/plugins/Makefile.am -+++ b/plugins/Makefile.am -@@ -65,7 +65,7 @@ LIB_MYSQL = @LIB_MYSQL@ - - plugindir = @plugindir@ - --sasldir = $(prefix)/lib/sasl2 -+sasldir = $(libdir)/sasl2 - sasl_LTLIBRARIES = @SASL_MECHS@ - EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la \ - libgs2.la libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \ diff --git a/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch index 1e6f99603c..308d88204f 100644 --- a/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch +++ b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch @@ -1,50 +1,39 @@ -From 288430d3c2d3f36a4c9d40c4fffa85288f44549a Mon Sep 17 00:00:00 2001 -From: "Roy.Li" <rongqing.li@windriver.com> -Date: Tue, 25 Jun 2013 09:22:59 +0800 -Subject: [PATCH] Avoid to call AC_TRY_RUN +Remove AC_TRY_RUN -Upstream-Status: Inappropriate [configuration] +It can not be run during cross compile -Avoid to call AC_TRY_RUN to check if GSSAPI libraries support SPNEGO -on cross-compile environment by definition AC_ARG_ENABLE enable-spnego - -Signed-off-by: Roy.Li <rongqing.li@windriver.com> ---- - m4/sasl2.m4 | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/m4/sasl2.m4 b/m4/sasl2.m4 -index 80371ef..ff70083 100644 +Upstream-Status: Inappropriate [Cross-compile specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> --- a/m4/sasl2.m4 +++ b/m4/sasl2.m4 -@@ -316,6 +316,18 @@ if test "$gssapi" != no; then +@@ -316,28 +316,8 @@ if test "$gssapi" != no; then AC_CACHE_CHECK([for SPNEGO support in GSSAPI libraries],[ac_cv_gssapi_supports_spnego],[ cmu_save_LIBS="$LIBS" LIBS="$LIBS $GSSAPIBASE_LIBS" -+ AC_ARG_ENABLE([spnego], -+ [AC_HELP_STRING([--enable-spnego=<DIR>], -+ [enable SPNEGO support in GSSAPI libraries [no]])], -+ [spnego=$enableval], -+ [spnego=no]) -+ -+ if test "$spnego" = no; then -+ echo "no" -+ elif test "$spnego" = yes; then -+ AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO]) -+ else -+ AC_MSG_CHECKING([for SPNEGO support in GSSAPI libraries]) - AC_TRY_RUN([ - #ifdef HAVE_GSSAPI_H - #include <gssapi.h> -@@ -343,7 +355,7 @@ int main(void) - AS_IF([test "$ac_cv_gssapi_supports_spnego" = yes],[ - AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO]) - ]) +- AC_TRY_RUN([ +-#ifdef HAVE_GSSAPI_H +-#include <gssapi.h> +-#else +-#include <gssapi/gssapi.h> +-#endif - -+ fi - else - AC_MSG_RESULT([disabled]) - fi --- -2.25.1 - +-int main(void) +-{ +- gss_OID_desc spnego_oid = { 6, (void *) "\x2b\x06\x01\x05\x05\x02" }; +- gss_OID_set mech_set; +- OM_uint32 min_stat; +- int have_spnego = 0; +- +- if (gss_indicate_mechs(&min_stat, &mech_set) == GSS_S_COMPLETE) { +- gss_test_oid_set_member(&min_stat, &spnego_oid, mech_set, &have_spnego); +- gss_release_oid_set(&min_stat, &mech_set); +- } +- +- return (!have_spnego); // 0 = success, 1 = failure +-} +-],[ac_cv_gssapi_supports_spnego=yes],[ac_cv_gssapi_supports_spnego=no]) ++ AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO]) ++ AC_MSG_RESULT(yes) + LIBS="$cmu_save_LIBS" + ]) + AS_IF([test "$ac_cv_gssapi_supports_spnego" = yes],[ diff --git a/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/debian_patches_0014_avoid_pic_overwrite.diff b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/debian_patches_0014_avoid_pic_overwrite.diff index 0479acfb09..a5f2f5dd91 100644 --- a/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/debian_patches_0014_avoid_pic_overwrite.diff +++ b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/debian_patches_0014_avoid_pic_overwrite.diff @@ -10,6 +10,8 @@ the non-PIC version in the current directory. This ensures that both non-PIC and PIC versions are available in the correct locations. --- +Upstream-Status: Pending + lib/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl_2.1.28.bb b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl_2.1.28.bb index 3277fb1099..11b53e7b61 100644 --- a/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl_2.1.28.bb +++ b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl_2.1.28.bb @@ -95,6 +95,3 @@ FILES:${PN}-dbg += "${libdir}/sasl2/.debug" FILES:${PN}-staticdev += "${libdir}/sasl2/*.a" INSANE_SKIP:${PN} += "dev-so" - -# CVE-2020-8032 affects only openSUSE -CVE_CHECK_IGNORE += "CVE-2020-8032" diff --git a/meta-oe/recipes-printing/cups/cups-filters/0001-use-noexcept-false-instead-of-throw-from-c-17-onward.patch b/meta-oe/recipes-printing/cups/cups-filters/0001-use-noexcept-false-instead-of-throw-from-c-17-onward.patch new file mode 100644 index 0000000000..5de8dae006 --- /dev/null +++ b/meta-oe/recipes-printing/cups/cups-filters/0001-use-noexcept-false-instead-of-throw-from-c-17-onward.patch @@ -0,0 +1,36 @@ +From 104fba23b1c0c67c92777b3165c6dca99558a656 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 6 Feb 2023 18:13:52 -0800 +Subject: [PATCH] use noexcept(false) instead of throw() from c++17 onwards + +C++17 removed dynamic exception specifications [1] +they had been deprecated since C++11, replace +throw(whatever) with noexcept(false). + +[1] https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0003r5.html + +Upstream-Status: Submitted [https://github.com/OpenPrinting/cups-filters/pull/505] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + filter/pdftoraster.cxx | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/filter/pdftoraster.cxx b/filter/pdftoraster.cxx +index e8af184fb..e91e22459 100755 +--- a/filter/pdftoraster.cxx ++++ b/filter/pdftoraster.cxx +@@ -2148,7 +2148,11 @@ int main(int argc, char *argv[]) { + /* For compatibility with g++ >= 4.7 compilers _GLIBCXX_THROW + * should be used as a guard, otherwise use traditional definition */ + #ifndef _GLIBCXX_THROW ++#if __cplusplus < 201703L + #define _GLIBCXX_THROW throw ++#else ++#define _GLIBCXX_THROW(x) noexcept(false) ++#endif + #endif + + void * operator new(size_t size) _GLIBCXX_THROW (std::bad_alloc) +-- +2.39.1 + diff --git a/meta-oe/recipes-printing/cups/cups-filters_1.28.11.bb b/meta-oe/recipes-printing/cups/cups-filters_1.28.11.bb deleted file mode 100644 index bfe5375b28..0000000000 --- a/meta-oe/recipes-printing/cups/cups-filters_1.28.11.bb +++ /dev/null @@ -1,3 +0,0 @@ -include cups-filters.inc - -SRC_URI[sha256sum] = "472418f1a1e12c9ad91b01caa020eb668626776d85de9da488be38e6663102ca" diff --git a/meta-oe/recipes-printing/cups/cups-filters.inc b/meta-oe/recipes-printing/cups/cups-filters_1.28.17.bb index f0f915e946..fd82bb39c2 100644 --- a/meta-oe/recipes-printing/cups/cups-filters.inc +++ b/meta-oe/recipes-printing/cups/cups-filters_1.28.17.bb @@ -6,14 +6,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d77679ce6a2cc4d873d4ebbf2a401e6" SECTION = "console/utils" -DEPENDS = "cups glib-2.0 glib-2.0-native dbus dbus-glib lcms ghostscript poppler qpdf libpng" +DEPENDS = "cups glib-2.0 glib-2.0-native dbus dbus-glib lcms poppler qpdf libpng libexif" DEPENDS:class-native = "poppler-native glib-2.0-native dbus-native pkgconfig-native gettext-native libpng-native" -SRC_URI = "http://openprinting.org/download/cups-filters/cups-filters-${PV}.tar.gz" +SRC_URI = "https://github.com/OpenPrinting/${BPN}/releases/download/${PV}/${BP}.tar.xz \ + file://0001-use-noexcept-false-instead-of-throw-from-c-17-onward.patch" +SRC_URI[sha256sum] = "270a3752a960368aa99d431fb5d34f4039b2ac943c576d840612d1d8185c9bb9" -inherit autotools-brokensep gettext pkgconfig +inherit autotools-brokensep gettext pkgconfig github-releases -EXTRA_OECONF += " --enable-ghostscript --disable-ldap \ +EXTRA_OECONF += " --disable-ldap \ --with-pdftops=hybrid --enable-imagefilters \ --enable-ghostscript --with-gs-path=${bindir}/gs \ --with-pdftops-path=${bindir}/gs \ @@ -49,6 +51,7 @@ PACKAGES =+ "\ FILES:${PN}-gst = "\ ${libexecdir}/cups/filter/gsto* \ " +RDEPENDS:${PN}-gst += "ghostscript" FILES:${PN}-data = "\ ${datadir}/cups/data \ @@ -69,6 +72,8 @@ FILES:${PN} += "\ ${datadir}/cups/ppdc \ ${datadir}/cups/banners \ " +RDEPENDS:${PN} += "bash" +RDEPENDS:${PN} += "ghostscript" do_install:append() { # remove braille dir @@ -77,5 +82,3 @@ do_install:append() { # remove sysroot path contamination from pkgconfig file sed -i -e 's:${STAGING_DIR_TARGET}::' ${D}/${libdir}/pkgconfig/libcupsfilters.pc } - -RDEPENDS:${PN} += "bash" diff --git a/meta-oe/recipes-printing/cups/cups-pk-helper/dont-localize-org.opensuse.CupsPkHelper.Mechanism.service.patch b/meta-oe/recipes-printing/cups/cups-pk-helper/dont-localize-org.opensuse.CupsPkHelper.Mechanism.service.patch index 86c09c9f84..371ce01181 100644 --- a/meta-oe/recipes-printing/cups/cups-pk-helper/dont-localize-org.opensuse.CupsPkHelper.Mechanism.service.patch +++ b/meta-oe/recipes-printing/cups/cups-pk-helper/dont-localize-org.opensuse.CupsPkHelper.Mechanism.service.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/src/meson.build 2023-01-24 09:22:59.874074134 +0100 +++ b/src/meson.build 2023-01-24 09:27:00.494627305 +0100 @@ -73,12 +73,12 @@ diff --git a/meta-oe/recipes-printing/cups/python3-pycups.bb b/meta-oe/recipes-printing/cups/python3-pycups.bb new file mode 100644 index 0000000000..6968170d93 --- /dev/null +++ b/meta-oe/recipes-printing/cups/python3-pycups.bb @@ -0,0 +1,11 @@ +SUMMARY = "CUPS bindings for Python" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3961efb54421653518521529853444c4" + +RDEPENDS:${PN} = "python3" + +inherit setuptools3 pypi + +PV = "2.0.1" + +SRC_URI[sha256sum] = "e880d7d7147959ead5cb34764f08b97b41385b36eb8256e8af1ce163dbcccce8" diff --git a/meta-oe/recipes-printing/gutenprint/gutenprint-native_git.bb b/meta-oe/recipes-printing/gutenprint/gutenprint-native_git.bb deleted file mode 100644 index c6e00c340a..0000000000 --- a/meta-oe/recipes-printing/gutenprint/gutenprint-native_git.bb +++ /dev/null @@ -1,42 +0,0 @@ -# Recipe for building gutenprint-native -# -# Native part is for generating strings - xmli18n-tmp.h used by target recipe -# We don't depend on cups as this is for generating the string header. -# -# Copyright (c) Ambu A/S - All rights reserved -# SPDX-License-Identifier: MIT -# -# Author(s) -# clst@ambu.com (Claus Stovgaard) -# - -require gutenprint.inc - -# We could consider switching to BBCLASSEXTEND native instead of inherit -# Using devtool with this results in warning, as devtool append externalsrc to -# inheritance, making native not being inherited last. -inherit autotools-brokensep pkgconfig native - -SECTION = "libs" - -# binutils is for xz etc. -# gettext-native for configuration -# flex-native is used for compilation -# byacc-native is for yacc command (compilation) -DEPENDS += "binutils-native gettext-native flex-native byacc-native" - -EXTRA_OECONF = "--without-doc --without-cups" - -# gutenprint does not have a configure file in its root folder. -# Rather it has a autogen.sh in its root folder. We just use it -do_configure() { - ${S}/autogen.sh || bbnote "${PN} failed to autogen.sh" - oe_runconf -} - -# Currently we only uses the string header, even though we compile the complete -# native version of the library. So we limit the install to the needed. -do_install() { - install -d ${D}${datadir}/gutenprint/ - install -m644 ${B}/src/xml/xmli18n-tmp.h ${D}${datadir}/gutenprint/ -}
\ No newline at end of file diff --git a/meta-oe/recipes-printing/gutenprint/gutenprint.inc b/meta-oe/recipes-printing/gutenprint/gutenprint.inc deleted file mode 100644 index 1f712585f7..0000000000 --- a/meta-oe/recipes-printing/gutenprint/gutenprint.inc +++ /dev/null @@ -1,22 +0,0 @@ -# common part for gutenprint-native / gutenprint -# -# As we are using the native part for generating string header to the target -# version, it is important they use the same version. -# So we set the SRC_URI and SRCREV here. -# -# Copyright (c) Ambu A/S - All rights reserved -# SPDX-License-Identifier: MIT -# -# Author(s) -# clst@ambu.com (Claus Stovgaard) -# - -DESCRIPTION = "Gutenprint printer drivers" -HOMEPAGE = "http://gimp-print.sourceforge.net/" -LICENSE = "GPL-2.0-or-later" - -SRC_URI = "git://git.code.sf.net/p/gimp-print/source;protocol=https;branch=master" -SRCREV = "8e47dc44dd7738302ba9e8fbc1f918461fed0236" -S = "${WORKDIR}/git" - -LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
\ No newline at end of file diff --git a/meta-oe/recipes-printing/gutenprint/gutenprint_git.bb b/meta-oe/recipes-printing/gutenprint/gutenprint_git.bb index 7779793948..f0dc6adea0 100644 --- a/meta-oe/recipes-printing/gutenprint/gutenprint_git.bb +++ b/meta-oe/recipes-printing/gutenprint/gutenprint_git.bb @@ -9,38 +9,66 @@ # clst@ambu.com (Claus Stovgaard) # -require gutenprint.inc +DESCRIPTION = "Gutenprint printer drivers" +HOMEPAGE = "http://gimp-print.sourceforge.net/" +LICENSE = "GPL-2.0-or-later" -inherit autotools-brokensep pkgconfig +SRC_URI = "git://git.code.sf.net/p/gimp-print/source;protocol=https;branch=master" +SRCREV = "66b0a7bc3fd25659a3f295db0ebb39d04e413c01" +PV = "5.3.3+git${SRCPV}" -DEPENDS += "cups gutenprint-native" +S = "${WORKDIR}/git" -# cups-genppdupdate depend on perl -# We also set the path to PERL as else the version in hosttools would be used -# with full path -RDEPENDS:${PN} = "perl " +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -EXTRA_OECONF = "--without-doc --disable-test --disable-nls PERL=/usr/bin/perl" +inherit autotools gettext pkgconfig -# gutenprint does not have a configure file in its root folder. -# Rather it has a autogen.sh in its root folder. We just use it -# together with adapting for cross compilation -do_configure() { +DEPENDS += "glib-2.0-native cups gutenprint-native" +# autogen.sh needs autopoint +DEPENDS:class-native = "glib-2.0-native gettext-native" + +EXTRA_OECONF = "--without-doc --disable-test PERL=/usr/bin/perl" +EXTRA_OECONF:append:class-native = " --without-cups" + +do_configure:prepend:class-target() { # Disable the xmli18n-tmp.h rule # It depend on the local build extract-strings, we are not able to run this # So we are using the xmli18n-tmp.h created by gutenprint-native sed -i 's/all-local: xmli18n-tmp.h xml-stamp/all-local: xml-stamp/' ${S}/src/xml/Makefile.am sed -i 's/dist-hook: xmli18n-tmp.h xml-stamp/dist-hook: xml-stamp/' ${S}/src/xml/Makefile.am - cp ${RECIPE_SYSROOT_NATIVE}${datadir}/gutenprint/xmli18n-tmp.h ${S}/src/xml/ + # Despite being a generated file, this needs to be in S. + cp ${STAGING_DATADIR_NATIVE}/gutenprint/xmli18n-tmp.h ${S}/src/xml/ +} - ${S}/autogen.sh || bbnote "${PN} failed to autogen.sh" +do_configure() { + # Need to call autogen.sh as that creates m4/stp_release.m4 + cd ${S} + NOCONFIGURE=1 ./autogen.sh + cd ${B} oe_runconf } -# gutenprint install the calibrate.ppm and net.sf.gimp-print.usb-quirks in -# /usr/share/cups +do_install:append() { + # This file contains build paths and isn't very useful, remove it + rm -f ${D}${libdir}/gutenprint/*/config.summary + # Match ownership to cups + chgrp lp ${D}${sysconfdir}/cups +} + +do_compile:class-native() { + oe_runmake -C ${B}/src/xml +} + +do_install:class-native() { + install -d ${D}${datadir}/gutenprint/ + install -m644 ${B}/src/xml/xmli18n-tmp.h ${D}${datadir}/gutenprint/ +} + FILES:${PN} += "${datadir}/cups/*" +RDEPENDS:${PN} = "perl" + +BBCLASSEXTEND = "native" -# Install in /etc/cups when RPM needs DIRFILES to not conflict -# https://stackoverflow.com/questions/44762430/why-do-i-get-etc-cups-conflicts-between-attempted-installs-in-yocto -DIRFILES = "1"
\ No newline at end of file +# Pull in base-passwd for the lp user +DEPENDS:append:class-target = " base-passwd" +PACKAGE_WRITE_DEPS += "base-passwd" diff --git a/meta-oe/recipes-security/audit/audit/0001-Add-substitue-functions-for-strndupa-rawmemchr.patch b/meta-oe/recipes-security/audit/audit/0001-Add-substitue-functions-for-strndupa-rawmemchr.patch deleted file mode 100644 index ed1c0e2b57..0000000000 --- a/meta-oe/recipes-security/audit/audit/0001-Add-substitue-functions-for-strndupa-rawmemchr.patch +++ /dev/null @@ -1,133 +0,0 @@ -From d5a4b800a696b8b8d2c0f0bad098b1a8ff94333f Mon Sep 17 00:00:00 2001 -From: Steve Grubb <sgrubb@redhat.com> -Date: Tue, 26 Feb 2019 18:33:33 -0500 -Subject: [PATCH] Add substitue functions for strndupa & rawmemchr - -Upstream-Status: Backport -[https://github.com/linux-audit/audit-userspace/commit/d579a08bb1cde71f939c13ac6b2261052ae9f77e] ---- - auparse/auparse.c | 12 +++++++++++- - auparse/interpret.c | 9 ++++++++- - configure.ac | 14 +++++++++++++- - src/ausearch-lol.c | 12 +++++++++++- - 4 files changed, 43 insertions(+), 4 deletions(-) - -diff --git a/auparse/auparse.c b/auparse/auparse.c -index 650db02..2e1c737 100644 ---- a/auparse/auparse.c -+++ b/auparse/auparse.c -@@ -1,5 +1,5 @@ - /* auparse.c -- -- * Copyright 2006-08,2012-17 Red Hat Inc., Durham, North Carolina. -+ * Copyright 2006-08,2012-19 Red Hat Inc., Durham, North Carolina. - * All Rights Reserved. - * - * This library is free software; you can redistribute it and/or -@@ -1118,6 +1118,16 @@ static int str2event(char *s, au_event_t *e) - return 0; - } - -+#ifndef HAVE_STRNDUPA -+static inline char *strndupa(const char *old, size_t n) -+{ -+ size_t len = strnlen(old, n); -+ char *tmp = alloca(len + 1); -+ tmp[len] = 0; -+ return memcpy(tmp, old, len); -+} -+#endif -+ - /* Returns 0 on success and 1 on error */ - static int extract_timestamp(const char *b, au_event_t *e) - { -diff --git a/auparse/interpret.c b/auparse/interpret.c -index 51c4a5e..67b7b77 100644 ---- a/auparse/interpret.c -+++ b/auparse/interpret.c -@@ -853,6 +853,13 @@ err_out: - return print_escaped(id->val); - } - -+// rawmemchr is faster. Let's use it if we have it. -+#ifdef HAVE_RAWMEMCHR -+#define STRCHR rawmemchr -+#else -+#define STRCHR strchr -+#endif -+ - static const char *print_proctitle(const char *val) - { - char *out = (char *)print_escaped(val); -@@ -863,7 +870,7 @@ static const char *print_proctitle(const char *val) - // Proctitle has arguments separated by NUL bytes - // We need to write over the NUL bytes with a space - // so that we can see the arguments -- while ((ptr = rawmemchr(ptr, '\0'))) { -+ while ((ptr = STRCHR(ptr, '\0'))) { - if (ptr >= end) - break; - *ptr = ' '; -diff --git a/configure.ac b/configure.ac -index 6e345f1..6f3007e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1,7 +1,7 @@ - dnl - define([AC_INIT_NOTICE], - [### Generated automatically using autoconf version] AC_ACVERSION [ --### Copyright 2005-18 Steve Grubb <sgrubb@redhat.com> -+### Copyright 2005-19 Steve Grubb <sgrubb@redhat.com> - ### - ### Permission is hereby granted, free of charge, to any person obtaining a - ### copy of this software and associated documentation files (the "Software"), -@@ -72,6 +72,18 @@ dnl; posix_fallocate is used in audisp-remote - AC_CHECK_FUNCS([posix_fallocate]) - dnl; signalfd is needed for libev - AC_CHECK_FUNC([signalfd], [], [ AC_MSG_ERROR([The signalfd system call is necessary for auditd]) ]) -+dnl; check if rawmemchr is available -+AC_CHECK_FUNCS([rawmemchr]) -+dnl; check if strndupa is available -+AC_LINK_IFELSE( -+ [AC_LANG_SOURCE( -+ [[ -+ #define _GNU_SOURCE -+ #include <string.h> -+ int main() { (void) strndupa("test", 10); return 0; }]])], -+ [AC_DEFINE(HAVE_STRNDUPA, 1, [Let us know if we have it or not])], -+ [] -+) - - ALLWARNS="" - ALLDEBUG="-g" -diff --git a/src/ausearch-lol.c b/src/ausearch-lol.c -index 5d17a72..758c33e 100644 ---- a/src/ausearch-lol.c -+++ b/src/ausearch-lol.c -@@ -1,6 +1,6 @@ - /* - * ausearch-lol.c - linked list of linked lists library --* Copyright (c) 2008,2010,2014,2016 Red Hat Inc., Durham, North Carolina. -+* Copyright (c) 2008,2010,2014,2016,2019 Red Hat Inc., Durham, North Carolina. - * All Rights Reserved. - * - * This software may be freely redistributed and/or modified under the -@@ -152,6 +152,16 @@ static int compare_event_time(event *e1, event *e2) - return 0; - } - -+#ifndef HAVE_STRNDUPA -+static inline char *strndupa(const char *old, size_t n) -+{ -+ size_t len = strnlen(old, n); -+ char *tmp = alloca(len + 1); -+ tmp[len] = 0; -+ return memcpy(tmp, old, len); -+} -+#endif -+ - /* - * This function will look at the line and pick out pieces of it. - */ --- -2.17.1 - diff --git a/meta-oe/recipes-security/audit/audit/0001-Make-IPX-packet-interpretation-dependent-on-the-ipx-header.patch b/meta-oe/recipes-security/audit/audit/0001-Make-IPX-packet-interpretation-dependent-on-the-ipx-header.patch deleted file mode 100644 index 054f50ab23..0000000000 --- a/meta-oe/recipes-security/audit/audit/0001-Make-IPX-packet-interpretation-dependent-on-the-ipx-header.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 6b09724c69d91668418ddb3af00da6db6755208c Mon Sep 17 00:00:00 2001 -From: Steve Grubb <sgrubb@redhat.com> -Date: Thu, 2 Sep 2021 15:01:12 -0400 -Subject: [PATCH] Make IPX packet interpretation dependent on the ipx header - file existing - -Upstream-Status: Backport [https://github.com/linux-audit/audit-userspace/commit/6b09724c69d91668418ddb3af00da6db6755208c.patch] -Comment: Remove one hunk from changelog file and refresh rest hunks as per codebase of audit_2.8.5 -Signed-off-by: Akash Hadke <akash.hadke@kpit.com> ---- - auparse/interpret.c | 8 ++++++-- - configure.ac | 6 ++++++ - 2 files changed, 12 insertions(+), 2 deletions(-) - -diff --git a/auparse/interpret.c b/auparse/interpret.c -index 63829aa0e..6c316456d 100644 ---- a/auparse/interpret.c 2022-10-14 11:22:20.833880000 +0200 -+++ b/auparse/interpret.c 2022-10-14 11:35:13.196455950 +0200 -@@ -44,8 +44,10 @@ - #include <linux/ax25.h> - #include <linux/atm.h> - #include <linux/x25.h> --#include <linux/if.h> // FIXME: remove when ipx.h is fixed --#include <linux/ipx.h> -+#ifdef HAVE_IPX_HEADERS -+ #include <linux/if.h> // FIXME: remove when ipx.h is fixed -+ #include <linux/ipx.h> -+#endif - #include <linux/capability.h> - #include <sys/personality.h> - #include <sys/prctl.h> -@@ -1158,6 +1160,7 @@ - x->sax25_call.ax25_call[6]); - } - break; -+#ifdef HAVE_IPX_HEADERS - case AF_IPX: - { - const struct sockaddr_ipx *ip = -@@ -1167,6 +1170,7 @@ - str, ip->sipx_port, ip->sipx_network); - } - break; -+#endif - case AF_ATMPVC: - { - const struct sockaddr_atmpvc* at = -diff --git a/configure.ac b/configure.ac -index 8f541e4c0..005eb0b5b 100644 ---- a/configure.ac 2022-10-14 11:22:20.833880000 +0200 -+++ b/configure.ac 2022-10-14 11:36:32.391044084 +0200 -@@ -414,6 +414,12 @@ - AC_DEFINE_UNQUOTED(HAVE_LIBWRAP, [], Define if tcp_wrappers support is enabled ) - fi - -+# linux/ipx.h - deprecated in 2018 -+AC_CHECK_HEADER(linux/ipx.h, ipx_headers=yes, ipx_headers=no) -+if test $ipx_headers = yes ; then -+ AC_DEFINE(HAVE_IPX_HEADERS,1,[IPX packet interpretation]) -+fi -+ - # See if we want to support lower capabilities for plugins - LIBCAP_NG_PATH - - diff --git a/meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch b/meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch index c2080e156d..23747c45f0 100644 --- a/meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch +++ b/meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch @@ -13,6 +13,8 @@ Fixes Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + auparse/auparse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-security/audit/audit/0002-Fixed-swig-host-contamination-issue.patch b/meta-oe/recipes-security/audit/audit/0002-Fixed-swig-host-contamination-issue.patch deleted file mode 100644 index 39a090c83b..0000000000 --- a/meta-oe/recipes-security/audit/audit/0002-Fixed-swig-host-contamination-issue.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 3467abce1f3cfc96f9bdace7c09d95218cbcaeb1 Mon Sep 17 00:00:00 2001 -From: Li xin <lixin.fnst@cn.fujitsu.com> -Date: Sun, 19 Jul 2015 02:42:58 +0900 -Subject: [PATCH] audit: Fixed swig host contamination issue - -The audit build uses swig to generate a python wrapper. -Unfortunately, the swig info file references host include -directories. Some of these were previously noticed and -eliminated, but the one fixed here was not. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Anders Hedlund <anders.hedlund@windriver.com> -Signed-off-by: Joe Slater <jslater@windriver.com> -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> - -Comment: Refresh hunk from auditswig.i to fix build with linux 5.17+ -Reference-Commit: ee3c680c3 audit: Upgrade to 3.0.8 and fix build with linux 5.17+ -Signed-off-by: Akash Hadke <akash.hadke@kpit.com> -Signed-off-by: Akash Hadke <hadkeakash4@gmail.com> ---- - bindings/swig/python3/Makefile.am | 3 ++- - bindings/swig/src/auditswig.i | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/bindings/swig/python3/Makefile.am b/bindings/swig/python3/Makefile.am -index 9938418..fa46aac 100644 ---- a/bindings/swig/python3/Makefile.am -+++ b/bindings/swig/python3/Makefile.am -@@ -22,6 +22,7 @@ - CONFIG_CLEAN_FILES = *.loT *.rej *.orig - AM_CFLAGS = -fPIC -DPIC -fno-strict-aliasing $(PYTHON3_CFLAGS) - AM_CPPFLAGS = -I. -I$(top_builddir) -I${top_srcdir}/lib $(PYTHON3_INCLUDES) -+STDINC ?= /usr/include - LIBS = $(top_builddir)/lib/libaudit.la - SWIG_FLAGS = -python -py3 -modern - SWIG_INCLUDES = -I. -I$(top_builddir) -I${top_srcdir}/lib $(PYTHON3_INCLUDES) -@@ -37,7 +38,7 @@ _audit_la_DEPENDENCIES =${top_srcdir}/lib/libaudit.h ${top_builddir}/lib/libaudi - _audit_la_LIBADD = ${top_builddir}/lib/libaudit.la - nodist__audit_la_SOURCES = audit_wrap.c - audit.py audit_wrap.c: ${srcdir}/../src/auditswig.i -- swig -o audit_wrap.c ${SWIG_FLAGS} ${SWIG_INCLUDES} ${srcdir}/../src/auditswig.i -+ swig -o audit_wrap.c ${SWIG_FLAGS} ${SWIG_INCLUDES} -I$(STDINC) ${srcdir}/../src/auditswig.i - - CLEANFILES = audit.py* audit_wrap.c *~ - -diff --git a/bindings/swig/src/auditswig.i b/bindings/swig/src/auditswig.i -index 7ebb373..424fb68 100644 ---- a/bindings/swig/src/auditswig.i -+++ b/bindings/swig/src/auditswig.i -@@ -39,7 +39,7 @@ - #define __attribute(X) /*nothing*/ - typedef unsigned __u32; - typedef unsigned uid_t; --%include "/usr/include/linux/audit.h" -+%include "../lib/audit.h" - #define __extension__ /*nothing*/ - #include <stdint.h> - %include "../lib/libaudit.h" --- -2.17.1 - diff --git a/meta-oe/recipes-security/audit/audit/0003-Header-definitions-need-to-be-external-when-building.patch b/meta-oe/recipes-security/audit/audit/0003-Header-definitions-need-to-be-external-when-building.patch deleted file mode 100644 index f209e560bd..0000000000 --- a/meta-oe/recipes-security/audit/audit/0003-Header-definitions-need-to-be-external-when-building.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2938f46d318df4a09565db837b60bafd0300f858 Mon Sep 17 00:00:00 2001 -From: Steve Grubb <sgrubb@redhat.com> -Date: Fri, 10 Jan 2020 21:13:50 -0500 -Subject: [PATCH] Header definitions need to be external when building with - -fno-common (which is default in GCC 10) - Tony Jones - -Upstream-Status: Backport -[https://github.com/linux-audit/audit-userspace/commit/017e6c6ab95df55f34e339d2139def83e5dada1f] - -Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> ---- - src/ausearch-common.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ausearch-common.h b/src/ausearch-common.h -index 6669203..3040547 100644 ---- a/src/ausearch-common.h -+++ b/src/ausearch-common.h -@@ -50,7 +50,7 @@ extern pid_t event_pid; - extern int event_exact_match; - extern uid_t event_uid, event_euid, event_loginuid; - extern const char *event_tuid, *event_teuid, *event_tauid; --slist *event_node_list; -+extern slist *event_node_list; - extern const char *event_comm; - extern const char *event_filename; - extern const char *event_hostname; --- -2.17.1 - diff --git a/meta-oe/recipes-security/audit/audit_2.8.5.bb b/meta-oe/recipes-security/audit/audit_2.8.5.bb deleted file mode 100644 index f846b27f90..0000000000 --- a/meta-oe/recipes-security/audit/audit_2.8.5.bb +++ /dev/null @@ -1,115 +0,0 @@ -SUMMARY = "User space tools for kernel auditing" -DESCRIPTION = "The audit package contains the user space utilities for \ -storing and searching the audit records generated by the audit subsystem \ -in the Linux kernel." -HOMEPAGE = "http://people.redhat.com/sgrubb/audit/" -SECTION = "base" -LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=2.8_maintenance;protocol=https \ - file://0001-Add-substitue-functions-for-strndupa-rawmemchr.patch \ - file://0002-Fixed-swig-host-contamination-issue.patch \ - file://0003-Header-definitions-need-to-be-external-when-building.patch \ - file://auditd \ - file://auditd.service \ - file://audit-volatile.conf \ - file://0001-Make-IPX-packet-interpretation-dependent-on-the-ipx-header.patch \ -" - -S = "${WORKDIR}/git" -SRCREV = "5fae55c1ad15b3cefe6890eba7311af163e9133c" - -inherit autotools python3native update-rc.d systemd - -UPDATERCPN = "auditd" -INITSCRIPT_NAME = "auditd" -INITSCRIPT_PARAMS = "defaults" - -SYSTEMD_PACKAGES = "auditd" -SYSTEMD_SERVICE:auditd = "auditd.service" - -DEPENDS = "python3 tcp-wrappers libcap-ng linux-libc-headers swig-native" - -EXTRA_OECONF = "--without-prelude \ - --with-libwrap \ - --enable-gssapi-krb5=no \ - --with-libcap-ng=yes \ - --with-python3=yes \ - --libdir=${base_libdir} \ - --sbindir=${base_sbindir} \ - --without-python \ - --without-golang \ - --disable-zos-remote \ - --with-arm=yes \ - --with-aarch64=yes \ - " - -EXTRA_OEMAKE = "PYLIBVER='python${PYTHON_BASEVERSION}' \ - PYINC='${STAGING_INCDIR}/$(PYLIBVER)' \ - pyexecdir=${libdir}/python${PYTHON_BASEVERSION}/site-packages \ - STDINC='${STAGING_INCDIR}' \ - pkgconfigdir=${libdir}/pkgconfig \ - " - -SUMMARY:audispd-plugins = "Plugins for the audit event dispatcher" -DESCRIPTION:audispd-plugins = "The audispd-plugins package provides plugins for the real-time \ -interface to the audit system, audispd. These plugins can do things \ -like relay events to remote machines or analyze events for suspicious \ -behavior." - -PACKAGES =+ "audispd-plugins" -PACKAGES += "auditd ${PN}-python" - -FILES:${PN} = "${sysconfdir}/libaudit.conf ${base_libdir}/libaudit.so.1* ${base_libdir}/libauparse.so.*" -FILES:auditd = "${bindir}/* ${base_sbindir}/* ${sysconfdir}/*" -FILES:audispd-plugins = "${sysconfdir}/audisp/audisp-remote.conf \ - ${sysconfdir}/audisp/plugins.d/au-remote.conf \ - ${base_sbindir}/audisp-remote ${localstatedir}/spool/audit \ - " -FILES:${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/*/.debug" -FILES:${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}" - -CONFFILES:auditd = "${sysconfdir}/audit/audit.rules" -RDEPENDS:auditd = "bash" - -do_configure:prepend() { - sed -e 's|buf\[];|buf[0];|g' ${STAGING_INCDIR}/linux/audit.h > ${S}/lib/audit.h - sed -i -e 's|#include <linux/audit.h>|#include "audit.h"|g' ${S}/lib/libaudit.h -} - -do_install:append() { - rm -f ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.a - rm -f ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.la - - # reuse auditd config - [ ! -e ${D}/etc/default ] && mkdir ${D}/etc/default - mv ${D}/etc/sysconfig/auditd ${D}/etc/default - rmdir ${D}/etc/sysconfig/ - - # replace init.d - install -D -m 0755 ${WORKDIR}/auditd ${D}/etc/init.d/auditd - rm -rf ${D}/etc/rc.d - - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - # install systemd unit files - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/auditd.service ${D}${systemd_unitdir}/system - - install -d ${D}${sysconfdir}/tmpfiles.d/ - install -m 0644 ${WORKDIR}/audit-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ - fi - - # audit-2.5 doesn't install any rules by default, so we do that here - mkdir -p ${D}/etc/audit ${D}/etc/audit/rules.d - cp ${S}/rules/10-base-config.rules ${D}/etc/audit/rules.d/audit.rules - - chmod 750 ${D}/etc/audit ${D}/etc/audit/rules.d - chmod 640 ${D}/etc/audit/auditd.conf ${D}/etc/audit/rules.d/audit.rules - - # Based on the audit.spec "Copy default rules into place on new installation" - cp ${D}/etc/audit/rules.d/audit.rules ${D}/etc/audit/audit.rules - - # Create /var/spool/audit directory for audisp-remote - install -m 0700 -d ${D}${localstatedir}/spool/audit -} diff --git a/meta-oe/recipes-security/audit/audit_3.0.9.bb b/meta-oe/recipes-security/audit/audit_3.1.1.bb index 9621d9e335..7ed2fd2dec 100644 --- a/meta-oe/recipes-security/audit/audit_3.0.9.bb +++ b/meta-oe/recipes-security/audit/audit_3.1.1.bb @@ -16,9 +16,9 @@ SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=master;proto " S = "${WORKDIR}/git" -SRCREV = "81fa28e0e8b4be83ddba03de8b816a3df510c17e" +SRCREV = "6e367585a899231da05797c6126f8bb01febb2f5" -inherit autotools python3native python3targetconfig update-rc.d systemd +inherit autotools python3targetconfig update-rc.d systemd UPDATERCPN = "auditd" INITSCRIPT_NAME = "auditd" @@ -74,11 +74,11 @@ CONFFILES:auditd = "${sysconfdir}/audit/audit.rules" do_configure:prepend() { sed -e 's|buf\[];|buf[0];|g' ${STAGING_INCDIR}/linux/audit.h > ${S}/lib/audit.h - sed -i -e 's|#include <linux/audit.h>|#include "audit.h"|g' ${S}/lib/libaudit.h + sed -i -e 's|#include <linux/audit.h>|#include "audit.h"|g' ${S}/lib/libaudit.h } do_install:append() { - sed -i -e 's|#include "audit.h"|#include <linux/audit.h>|g' ${D}${includedir}/libaudit.h + sed -i -e 's|#include "audit.h"|#include <linux/audit.h>|g' ${D}${includedir}/libaudit.h rm -f ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.a rm -f ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.la diff --git a/meta-oe/recipes-security/bubblewrap/bubblewrap_0.7.0.bb b/meta-oe/recipes-security/bubblewrap/bubblewrap_0.8.0.bb index 4d053b54cb..06c42addbf 100644 --- a/meta-oe/recipes-security/bubblewrap/bubblewrap_0.7.0.bb +++ b/meta-oe/recipes-security/bubblewrap/bubblewrap_0.8.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] = "764ab7100bd037ea53d440d362e099d7a425966bc62d1f00ab26b8fbb882a9dc" +SRC_URI[sha256sum] = "957ad1149db9033db88e988b12bcebe349a445e1efc8a9b59ad2939a113d333a" inherit autotools bash-completion github-releases manpages pkgconfig diff --git a/meta-oe/recipes-security/keyutils/files/0001-Adhere-to-the-SOURCE_DATE_EPOCH-standard.patch b/meta-oe/recipes-security/keyutils/files/0001-Adhere-to-the-SOURCE_DATE_EPOCH-standard.patch index 8984e6502f..ecc5b00967 100644 --- a/meta-oe/recipes-security/keyutils/files/0001-Adhere-to-the-SOURCE_DATE_EPOCH-standard.patch +++ b/meta-oe/recipes-security/keyutils/files/0001-Adhere-to-the-SOURCE_DATE_EPOCH-standard.patch @@ -9,6 +9,8 @@ otherwise fall back to the default behaviour. Signed-off-by: Jelle van der Waa <jelle@vdwaa.nl> Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> --- +Upstream-Status: Pending + Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-security/nmap/files/0001-Include-time.h-header-to-pass-clang-compilation.patch b/meta-oe/recipes-security/nmap/files/0001-Include-time.h-header-to-pass-clang-compilation.patch index f93af2d793..5ee28031b8 100644 --- a/meta-oe/recipes-security/nmap/files/0001-Include-time.h-header-to-pass-clang-compilation.patch +++ b/meta-oe/recipes-security/nmap/files/0001-Include-time.h-header-to-pass-clang-compilation.patch @@ -4,6 +4,8 @@ Date: Fri, 20 Sep 2019 15:02:45 -0400 Subject: [PATCH] Include time.h header to pass clang compilation --- +Upstream-Status: Pending + nmap_error.cc | 11 +---------- nping/EchoServer.cc | 1 + osscan2.cc | 1 + diff --git a/meta-oe/recipes-security/nmap/nmap_7.80.bb b/meta-oe/recipes-security/nmap/nmap_7.80.bb index 030f033485..52c62cde30 100644 --- a/meta-oe/recipes-security/nmap/nmap_7.80.bb +++ b/meta-oe/recipes-security/nmap/nmap_7.80.bb @@ -59,4 +59,8 @@ do_install:append() { FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR} ${datadir}/ncat" -RDEPENDS:${PN} += "python3-core" +RDEPENDS:${PN} += " \ + python3-difflib \ + python3-asyncio \ + python3-xml \ +" diff --git a/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch b/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch index 6e4803f4f3..4e9659aa58 100644 --- a/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch +++ b/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch @@ -3,10 +3,15 @@ Add LDFLAGS variable to Makefile so that extra linker flags can be sent via this Upstream-Status: Pending Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + Makefile | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +diff --git a/Makefile b/Makefile +index 404f036..a9b18f0 100644 --- a/Makefile +++ b/Makefile -@@ -68,18 +68,17 @@ XGETTEXT = xgettext +@@ -75,13 +75,12 @@ XGETTEXT = xgettext XGETTEXT_OPTS = --keyword=_ --keyword=P2_:1,1 --keyword=P3_:1,2 --language=C --add-comments MSGMERGE = msgmerge @@ -21,9 +26,15 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> -Wl,--soname,$(SHARED_LIB),--version-script,$(MAP_LIB) LDFLAGS_lib_SUN = $(LDFLAGS_shared_SUN) LDFLAGS_lib_HP = $(LDFLAGS_shared_HP) +@@ -90,7 +89,7 @@ LDFLAGS_lib_CYGWIN = $(LDFLAGS_shared) \ + -Wl,--export-all-symbols \ + -Wl,--enable-auto-import LDFLAGS_pam = $(LDFLAGS_shared) -LDFLAGS_pam_LINUX = $(LDFLAGS_shared_LINUX) \ +LDFLAGS_pam_LINUX = $(LDFLAGS) $(LDFLAGS_shared_LINUX) \ -Wl,--version-script,$(MAP_PAM) LDFLAGS_pam_SUN = $(LDFLAGS_shared_SUN) LDFLAGS_pam_HP = $(LDFLAGS_shared_HP) +-- +2.34.1 + diff --git a/meta-oe/recipes-security/passwdqc/passwdqc_2.0.2.bb b/meta-oe/recipes-security/passwdqc/passwdqc_2.0.3.bb index 8462701b31..8694052e61 100644 --- a/meta-oe/recipes-security/passwdqc/passwdqc_2.0.2.bb +++ b/meta-oe/recipes-security/passwdqc/passwdqc_2.0.3.bb @@ -30,7 +30,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ac99c8678577a1c2f9f04cccee411d5d" SRC_URI = "http://www.openwall.com/${BPN}/${BP}.tar.gz \ file://makefile-add-ldflags.patch \ " -SRC_URI[sha256sum] = "ff1f505764c020f6a4484b1e0cc4fdbf2e3f71b522926d90b4709104ca0604ab" +SRC_URI[sha256sum] = "53b0f4bc49369f06195e9e13abb6cff352d5acb79e861004ec95973896488cf4" # explicitly define LINUX_PAM in case DISTRO_FEATURES no pam # this package's pam_passwdqc.so needs pam diff --git a/meta-oe/recipes-security/softhsm/files/0001-avoid-unnecessary-check-for-sqlite3-binary.patch b/meta-oe/recipes-security/softhsm/files/0001-avoid-unnecessary-check-for-sqlite3-binary.patch new file mode 100644 index 0000000000..7dddcdb78b --- /dev/null +++ b/meta-oe/recipes-security/softhsm/files/0001-avoid-unnecessary-check-for-sqlite3-binary.patch @@ -0,0 +1,40 @@ +From 88d968346184058df18dc69171dcd4fd612c2341 Mon Sep 17 00:00:00 2001 +From: Jan Luebbe <sho@stratum0.net> +Date: Mon, 30 Jan 2023 12:48:23 +0100 +Subject: [PATCH] avoid unnecessary check for sqlite3 binary + +Only the library is used, not the sqlite3 binary. Drop this check to simplify +cross-compilation (as no native sqlite3 binary is needed). + +Upstream-Status: Submitted [https://github.com/opendnssec/SoftHSMv2/pull/694] +--- + m4/acx_sqlite3.m4 | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/m4/acx_sqlite3.m4 b/m4/acx_sqlite3.m4 +index fd942a75e1a6..17c126d161f5 100644 +--- a/m4/acx_sqlite3.m4 ++++ b/m4/acx_sqlite3.m4 +@@ -4,19 +4,13 @@ AC_DEFUN([ACX_SQLITE3],[ + [ + SQLITE3_INCLUDES="-I$withval/include" + SQLITE3_LIBDIRS="-L$withval/lib" +- AC_PATH_PROGS(SQLITE3, sqlite3, sqlite3, $withval/bin) + + ],[ + SQLITE3_INCLUDES="" + SQLITE3_LIBDIRS="" +- AC_PATH_PROGS(SQLITE3, sqlite3, sqlite3, $PATH) + ]) + + +- if ! test -x "$SQLITE3"; then +- AC_MSG_ERROR([sqlite3 command not found]) +- fi +- + AC_MSG_CHECKING(what are the SQLite3 includes) + AC_MSG_RESULT($SQLITE3_INCLUDES) + +-- +2.30.2 + diff --git a/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb b/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb index d7bcd4f03b..2c68ba984f 100644 --- a/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb +++ b/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb @@ -5,12 +5,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ef3f77a3507c3d91e75b9f2bdaee4210" DEPENDS = "sqlite3" -SRC_URI = "https://dist.opendnssec.org/source/softhsm-2.6.1.tar.gz" +SRC_URI = "https://dist.opendnssec.org/source/softhsm-2.6.1.tar.gz \ + file://0001-avoid-unnecessary-check-for-sqlite3-binary.patch \ +" SRC_URI[sha256sum] = "61249473054bcd1811519ef9a989a880a7bdcc36d317c9c25457fc614df475f2" inherit autotools pkgconfig siteinfo EXTRA_OECONF += " --with-sqlite3=${STAGING_DIR_HOST}/usr" +EXTRA_OECONF += " --with-objectstore-backend-db" EXTRA_OECONF += "${@oe.utils.conditional('SITEINFO_BITS', '64', ' --enable-64bit', '', d)}" PACKAGECONFIG ?= "ecc eddsa pk11 openssl" diff --git a/meta-oe/recipes-shells/tcsh/tcsh/0001-Enable-system-malloc-on-all-linux.patch b/meta-oe/recipes-shells/tcsh/tcsh/0001-Enable-system-malloc-on-all-linux.patch index ff2f6a3b68..3a3970ba95 100644 --- a/meta-oe/recipes-shells/tcsh/tcsh/0001-Enable-system-malloc-on-all-linux.patch +++ b/meta-oe/recipes-shells/tcsh/tcsh/0001-Enable-system-malloc-on-all-linux.patch @@ -9,22 +9,24 @@ as well. So switch to using system malloc Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + config_f.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config_f.h b/config_f.h -index 6a632a5..0a66960 100644 +index fb9e69b..c207c25 100644 --- a/config_f.h +++ b/config_f.h -@@ -139,7 +139,7 @@ +@@ -147,7 +147,7 @@ * This can be much slower and no memory statistics will be * provided. */ --#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__GLIBC__) || defined(__OpenBSD__) || defined(__APPLE__) || defined (__ANDROID__) -+#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__linux__) || defined(__OpenBSD__) || defined(__APPLE__) +-#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__GLIBC__) || defined(__OpenBSD__) || defined(__APPLE__) || defined (__ANDROID__) || defined(__NetBSD__) || !defined(HAVE_WORKING_SBRK) ++#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__linux__) || defined(__OpenBSD__) || defined(__APPLE__) || defined (__ANDROID__) || defined(__NetBSD__) || !defined(HAVE_WORKING_SBRK) # define SYSMALLOC #else # undef SYSMALLOC -- -2.12.1 +2.34.1 diff --git a/meta-oe/recipes-shells/tcsh/tcsh/0002-Add-debian-csh-scripts.patch b/meta-oe/recipes-shells/tcsh/tcsh/0002-Add-debian-csh-scripts.patch index e4de6f7fe5..63b22075af 100644 --- a/meta-oe/recipes-shells/tcsh/tcsh/0002-Add-debian-csh-scripts.patch +++ b/meta-oe/recipes-shells/tcsh/tcsh/0002-Add-debian-csh-scripts.patch @@ -5,6 +5,8 @@ Subject: [PATCH 2/2] Add debian csh scripts Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + csh.cshrc | 15 +++++++++++++++ csh.login | 8 ++++++++ csh.logout | 1 + diff --git a/meta-oe/recipes-shells/tcsh/tcsh_6.22.04.bb b/meta-oe/recipes-shells/tcsh/tcsh_6.24.10.bb index 49d7c3f755..abeb6e803b 100644 --- a/meta-oe/recipes-shells/tcsh/tcsh_6.22.04.bb +++ b/meta-oe/recipes-shells/tcsh/tcsh_6.24.10.bb @@ -13,8 +13,7 @@ SRC_URI = " \ file://0001-Enable-system-malloc-on-all-linux.patch \ file://0002-Add-debian-csh-scripts.patch \ " -SRC_URI[md5sum] = "fa2b347fa9ae866eb036e6e4bb85fe1a" -SRC_URI[sha256sum] = "eb16356243218c32f39e07258d72bf8b21e62ce94bb0e8a95e318b151397e231" +SRC_URI[sha256sum] = "13475c0fbeb74139d33ed793bf00ffbbb2ac2dc9fb1d44467a410760aba36664" EXTRA_OEMAKE += "CC_FOR_GETHOST='${BUILD_CC}'" inherit autotools diff --git a/meta-oe/recipes-shells/zsh/zsh_5.8.bb b/meta-oe/recipes-shells/zsh/zsh_5.8.bb index b023e8d297..7602ff9f64 100644 --- a/meta-oe/recipes-shells/zsh/zsh_5.8.bb +++ b/meta-oe/recipes-shells/zsh/zsh_5.8.bb @@ -22,8 +22,8 @@ inherit autotools-brokensep gettext update-alternatives manpages EXTRA_OECONF = " \ --bindir=${base_bindir} \ --enable-etcdir=${sysconfdir} \ - --enable-fndir=${datadir}/${PN}/${PV}/functions \ - --enable-site-fndir=${datadir}/${PN}/site-functions \ + --enable-fndir=${datadir}/${BPN}/${PV}/functions \ + --enable-site-fndir=${datadir}/${BPN}/site-functions \ --with-term-lib='ncursesw ncurses' \ --with-tcsetpgrp \ --enable-cap \ diff --git a/meta-oe/recipes-support/anthy/anthy/2ch_t.patch b/meta-oe/recipes-support/anthy/anthy/2ch_t.patch index bf9bdb63d7..a0d3f9c25e 100644 --- a/meta-oe/recipes-support/anthy/anthy/2ch_t.patch +++ b/meta-oe/recipes-support/anthy/anthy/2ch_t.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + source: shamelessly stolen from debian ;-) purpose: add some entries particularly useful in Japanese 2channel anonymous website (at least that is my understanding ;-)) diff --git a/meta-oe/recipes-support/anthy/anthy/native-helpers.patch b/meta-oe/recipes-support/anthy/anthy/native-helpers.patch index 47ce007b7f..0b2df01aba 100644 --- a/meta-oe/recipes-support/anthy/anthy/native-helpers.patch +++ b/meta-oe/recipes-support/anthy/anthy/native-helpers.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + upstream: not applicable author: pH5 comment: Stage the native anthy helpers mkfiledic, mkdepgraph, mkworddic, diff --git a/meta-oe/recipes-support/anthy/anthy/not_build_elc.patch b/meta-oe/recipes-support/anthy/anthy/not_build_elc.patch index 1c5c494003..bedb5e0498 100644 --- a/meta-oe/recipes-support/anthy/anthy/not_build_elc.patch +++ b/meta-oe/recipes-support/anthy/anthy/not_build_elc.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + upstream: not applicable source: stolen from debian diff --git a/meta-oe/recipes-support/anthy/anthy/target-helpers.patch b/meta-oe/recipes-support/anthy/anthy/target-helpers.patch index d22c3562a5..fc5c72c051 100644 --- a/meta-oe/recipes-support/anthy/anthy/target-helpers.patch +++ b/meta-oe/recipes-support/anthy/anthy/target-helpers.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -Nurp anthy-9100h.org/calctrans/Makefile.am anthy-9100h/calctrans/Makefile.am --- anthy-9100h.org/calctrans/Makefile.am 2007-10-27 23:02:59.000000000 +0900 +++ anthy-9100h/calctrans/Makefile.am 2014-11-11 17:14:42.152999991 +0900 diff --git a/meta-oe/recipes-support/appstream/appstream_0.15.5.bb b/meta-oe/recipes-support/appstream/appstream_0.16.2.bb index e8637b5eef..1ba4521834 100644 --- a/meta-oe/recipes-support/appstream/appstream_0.15.5.bb +++ b/meta-oe/recipes-support/appstream/appstream_0.16.2.bb @@ -11,7 +11,6 @@ DEPENDS = " \ gperf-native \ glib-2.0 \ libyaml \ - libstemmer \ libxml2 \ libxmlb \ libxslt-native \ @@ -22,14 +21,19 @@ DEPENDS = " \ inherit meson gobject-introspection gettext gtk-doc pkgconfig vala -GIR_MESON_OPTION = "" +GIR_MESON_OPTION = "gir" SRC_URI = "https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz" SRC_URI:append:class-target = " file://0001-fix-crosscompile.patch" -SRC_URI[sha256sum] = "cb15ed62cc2729683879a2dbf98c0a3267ea2b4d57bba6bc55e70a25500e04c2" +SRC_URI[sha256sum] = "f9cb80bd388fbf06be268afa7f2d65863c85d605ad874b905094f3982d03f232" S = "${WORKDIR}/AppStream-${PV}" +PACKAGECONFIG ?= "stemming ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" + +PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" +PACKAGECONFIG[stemming] = "-Dstemming=true,-Dstemming=false,libstemmer" + FILES:${PN} += "${datadir}" EXTRA_OEMESON:class-target += "--cross-file=${WORKDIR}/meson-${PN}.cross" diff --git a/meta-oe/recipes-support/asio/asio_1.20.0.bb b/meta-oe/recipes-support/asio/asio_1.28.0.bb index cedcf9fee0..ae721263dd 100644 --- a/meta-oe/recipes-support/asio/asio_1.20.0.bb +++ b/meta-oe/recipes-support/asio/asio_1.28.0.bb @@ -9,17 +9,18 @@ LICENSE = "BSL-1.0" DEPENDS = "openssl" -SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2" +SRC_URI = " \ + ${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2 \ + file://0001-Add-the-pkgconfigdir-location.patch \ +" inherit autotools ALLOW_EMPTY:${PN} = "1" -LIC_FILES_CHKSUM = "file://COPYING;md5=416f4cc4f79551b690babb14ef1a5799" +LIC_FILES_CHKSUM = "file://COPYING;md5=ff668366bbdb687b6029d33a5fe4b999" -SRC_URI[sha256sum] = "204374d3cadff1b57a63f4c343cbadcee28374c072dc04b549d772dbba9f650c" - -SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2" +SRC_URI[sha256sum] = "d0ddc2361abd2f4c823e970aaf8e28b4b31ab21b1a68af16b114fc093661e232" PACKAGECONFIG ??= "boost" diff --git a/meta-oe/recipes-support/asio/files/0001-Add-the-pkgconfigdir-location.patch b/meta-oe/recipes-support/asio/files/0001-Add-the-pkgconfigdir-location.patch new file mode 100644 index 0000000000..75f083b0ed --- /dev/null +++ b/meta-oe/recipes-support/asio/files/0001-Add-the-pkgconfigdir-location.patch @@ -0,0 +1,30 @@ +From 248e87869d748cfb72d3a5d3b2b91ad178172e30 Mon Sep 17 00:00:00 2001 +From: Vasileios Anagnostopoulos <anagnwstopoulos@hotmail.com> +Date: Tue, 9 May 2023 12:48:29 +0200 +Subject: [PATCH] Add the pkgconfigdir location + +This change is necessary, because while building asio in yocto the +compilation is failing and is complaining because the variable is +undefined + +Signed-off-by: Vasileios Anagnostopoulos <anagnwstopoulos@hotmail.com> +Upstream-Status: Submitted [https://github.com/chriskohlhoff/asio/pull/1294] +--- + asio/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile.am b/Makefile.am +index b7760851..bc4f75b3 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,7 @@ + AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip + + pkgconfig_DATA = asio.pc ++pkgconfigdir = $(libdir)/pkgconfig + + SUBDIRS = include src + +-- +2.34.1 + diff --git a/meta-oe/recipes-support/atop/atop_2.4.0.bb b/meta-oe/recipes-support/atop/atop_2.4.0.bb index b1d2abde73..bb1f53624a 100644 --- a/meta-oe/recipes-support/atop/atop_2.4.0.bb +++ b/meta-oe/recipes-support/atop/atop_2.4.0.bb @@ -24,9 +24,7 @@ SRC_URI = "http://www.atoptool.nl/download/${BP}.tar.gz \ SRC_URI[md5sum] = "1077da884ed94f2bc3c81ac3ab970436" SRC_URI[sha256sum] = "be1c010a77086b7d98376fce96514afcd73c3f20a8d1fe01520899ff69a73d69" -CVE_CHECK_IGNORE += "\ - CVE-2011-3618 \ -" +CVE_STATUS[CVE-2011-3618] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." do_compile() { oe_runmake all diff --git a/meta-oe/recipes-support/avro/avro-c_1.11.1.bb b/meta-oe/recipes-support/avro/avro-c_1.11.2.bb index bb0bd7d752..9b6a52e2e2 100644 --- a/meta-oe/recipes-support/avro/avro-c_1.11.1.bb +++ b/meta-oe/recipes-support/avro/avro-c_1.11.2.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=6d502b41f76179fc84e536236f359cae" DEPENDS = "jansson zlib xz" BRANCH = "branch-1.11" -SRCREV = "3a9e5a789b5165e0c8c4da799c387fdf84bfb75e" +SRCREV = "44d1c4f221ccc4571a4b4b9edb023ed1e89354b7" SRC_URI = "git://github.com/apache/avro;branch=${BRANCH};protocol=https \ " diff --git a/meta-oe/recipes-support/bdwgc/bdwgc_8.2.2.bb b/meta-oe/recipes-support/bdwgc/bdwgc_8.2.4.bb index d980eccc3c..f02c457284 100644 --- a/meta-oe/recipes-support/bdwgc/bdwgc_8.2.2.bb +++ b/meta-oe/recipes-support/bdwgc/bdwgc_8.2.4.bb @@ -16,14 +16,14 @@ DESCRIPTION = "The Boehm-Demers-Weiser conservative garbage collector can be\ by replacing malloc with GC_malloc calls, replacing realloc with GC_realloc\ calls, and removing free calls." -HOMEPAGE = "http://www.hboehm.info/gc/" +HOMEPAGE = "https://www.hboehm.info/gc/" SECTION = "devel" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://README.QUICK;md5=dd27361ad00943bb27bc3e0589037075" DEPENDS = "libatomic-ops" -SRCREV = "cd1fbc1dbfd2cc888436944dd2784f39820698d7" +SRCREV = "d1ff06cc503a74dca0150d5e988f2c93158b0cdf" SRC_URI = "git://github.com/ivmai/bdwgc.git;branch=release-8_2;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/boost-sml/boost-sml_git.bb b/meta-oe/recipes-support/boost-sml/boost-sml_git.bb index c83181cfea..a06122a644 100644 --- a/meta-oe/recipes-support/boost-sml/boost-sml_git.bb +++ b/meta-oe/recipes-support/boost-sml/boost-sml_git.bb @@ -9,10 +9,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=e4224ccaecb14d942c71d31bef20d78c" DEPENDS += "boost qemu-native" -PV = "1.1.6" +PV = "1.1.8" SRC_URI = "git://github.com/boost-ext/sml.git;protocol=https;branch=master" -SRCREV = "23e9a24e434cac9922039cbb43ca54ab70bef72c" +SRCREV = "8eb63a8b77bb662075dd36b316e53f75e605fd0f" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/c-ares/c-ares_1.18.1.bb b/meta-oe/recipes-support/c-ares/c-ares_1.19.1.bb index 2cd00cb578..1440d72711 100644 --- a/meta-oe/recipes-support/c-ares/c-ares_1.18.1.bb +++ b/meta-oe/recipes-support/c-ares/c-ares_1.19.1.bb @@ -6,7 +6,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fb997454c8d62aa6a47f07a8cd48b006" SRC_URI = "git://github.com/c-ares/c-ares.git;branch=main;protocol=https" -SRCREV = "2aa086f822aad5017a6f2061ef656f237a62d0ed" +SRCREV = "6360e96b5cf8e5980c887ce58ef727e53d77243a" UPSTREAM_CHECK_GITTAGREGEX = "cares-(?P<pver>\d+_(\d_?)+)" diff --git a/meta-oe/recipes-support/c-periphery/c-periphery_2.3.1.bb b/meta-oe/recipes-support/c-periphery/c-periphery_2.4.2.bb index b5bdcd5b19..8e38517448 100644 --- a/meta-oe/recipes-support/c-periphery/c-periphery_2.3.1.bb +++ b/meta-oe/recipes-support/c-periphery/c-periphery_2.4.2.bb @@ -6,10 +6,10 @@ HOMEPAGE = "https://github.com/vsergeev/c-periphery" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4097ec544cf01e9c7cfc4bdf8e4ed887" +LIC_FILES_CHKSUM = "file://LICENSE;md5=be30d45bdc453f70a494c149c2168289" SRC_URI = "git://github.com/vsergeev/c-periphery;protocol=https;branch=master" -SRCREV = "23bfa4ab481edbad82a69ee385fc58ce03b63084" +SRCREV = "91f9678d2a35a3af3c633f20165bdde8bea32209" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/canonical-multitouch/geis/0001-libgeis-Compare-the-first-character-of-string-to-nul.patch b/meta-oe/recipes-support/canonical-multitouch/geis/0001-libgeis-Compare-the-first-character-of-string-to-nul.patch index 3b3acab245..4a9d25f326 100644 --- a/meta-oe/recipes-support/canonical-multitouch/geis/0001-libgeis-Compare-the-first-character-of-string-to-nul.patch +++ b/meta-oe/recipes-support/canonical-multitouch/geis/0001-libgeis-Compare-the-first-character-of-string-to-nul.patch @@ -13,6 +13,8 @@ fixes Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + libgeis/geis_v1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/canonical-multitouch/geis/fix-indentation-for-gcc6.patch b/meta-oe/recipes-support/canonical-multitouch/geis/fix-indentation-for-gcc6.patch index 389e1b3fd7..7f55ed9eaf 100644 --- a/meta-oe/recipes-support/canonical-multitouch/geis/fix-indentation-for-gcc6.patch +++ b/meta-oe/recipes-support/canonical-multitouch/geis/fix-indentation-for-gcc6.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- geis-2.2.17/libgeis/geis_subscription.c.orig 2016-06-17 12:04:21.062938443 -0400 +++ geis-2.2.17/libgeis/geis_subscription.c 2016-06-17 12:05:02.934939172 -0400 @@ -237,9 +237,10 @@ diff --git a/meta-oe/recipes-support/ccid/ccid/0001-Add-build-rule-for-README.patch b/meta-oe/recipes-support/ccid/ccid/0001-Add-build-rule-for-README.patch index 586ff18c32..46d30e8c16 100644 --- a/meta-oe/recipes-support/ccid/ccid/0001-Add-build-rule-for-README.patch +++ b/meta-oe/recipes-support/ccid/ccid/0001-Add-build-rule-for-README.patch @@ -5,6 +5,8 @@ Makefile.am: required file `./README' not found Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-support/ccid/ccid_1.5.1.bb b/meta-oe/recipes-support/ccid/ccid_1.5.2.bb index 42bc957721..0802e80f7b 100644 --- a/meta-oe/recipes-support/ccid/ccid_1.5.1.bb +++ b/meta-oe/recipes-support/ccid/ccid_1.5.2.bb @@ -10,7 +10,7 @@ SRC_URI = "https://ccid.apdu.fr/files/ccid-${PV}.tar.bz2 \ file://0001-Add-build-rule-for-README.patch \ " -SRC_URI[sha256sum] = "e7a78c398ec0d617a4f98bac70d5b64f78689284dd0ae87d4692e2857f117377" +SRC_URI[sha256sum] = "13934487e6f8b48f699a16d367cc7a1af7a3ca874de721ac6e9633beb86e7219" inherit autotools pkgconfig diff --git a/meta-oe/recipes-support/cli11/cli11_2.3.2.bb b/meta-oe/recipes-support/cli11/cli11_2.3.2.bb index 313973326d..7c6b2547cb 100644 --- a/meta-oe/recipes-support/cli11/cli11_2.3.2.bb +++ b/meta-oe/recipes-support/cli11/cli11_2.3.2.bb @@ -15,11 +15,12 @@ S = "${WORKDIR}/git" do_configure:prepend() { mkdir -p ${S}/tests/catch2 - cp ${DL_DIR}/catch.hpp ${S}/tests/catch2/catch.hpp + cp ${DL_DIR}/catch.hpp ${S}/tests/catch2/catch.hpp } inherit cmake -inherit ptest # cli11 is a header only C++ library, so the main package will be empty. RDEPENDS:${PN}-dev = "" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/cmark/cmark_0.30.2.bb b/meta-oe/recipes-support/cmark/cmark_0.30.3.bb index 6d6d3e5850..6697dfe07f 100644 --- a/meta-oe/recipes-support/cmark/cmark_0.30.2.bb +++ b/meta-oe/recipes-support/cmark/cmark_0.30.3.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 = "a8da5a2f252b96eca60ae8bada1a9ba059a38401" +SRCREV = "5ba25ff40eba44c811f79ab6a792baf945b8307c" S = "${WORKDIR}/git" inherit cmake lib_package diff --git a/meta-oe/recipes-support/consolation/consolation_0.0.8.bb b/meta-oe/recipes-support/consolation/consolation_0.0.9.bb index 0936b1ae19..17981b6e9b 100644 --- a/meta-oe/recipes-support/consolation/consolation_0.0.8.bb +++ b/meta-oe/recipes-support/consolation/consolation_0.0.9.bb @@ -6,7 +6,7 @@ software include gpm and jamd." HOMEPAGE = "https://salsa.debian.org/consolation-team/consolation" SECTION = "console/utils" LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://LICENSE;md5=73ca626e1d9048abfc7d599370650827" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7df9eea2f4dfdda489c116099e6fc062" DEPENDS = " \ libevdev \ @@ -15,7 +15,7 @@ DEPENDS = " \ " SRC_URI = "git://salsa.debian.org/consolation-team/consolation.git;branch=master" -SRCREV = "4581eaece6e49fa2b687efbdbe23b2de452e7902" +SRCREV = "5ef08f0cd6ede62de14de477b74fc3611108c676" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/cpprest/cpprest/disable-float-tests.patch b/meta-oe/recipes-support/cpprest/cpprest/disable-float-tests.patch index 3ff7f0dd31..b956db22fd 100644 --- a/meta-oe/recipes-support/cpprest/cpprest/disable-float-tests.patch +++ b/meta-oe/recipes-support/cpprest/cpprest/disable-float-tests.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: new toolchain might have increased the float precision Author: Gianfranco Costamagna <locutusofborg@debian.org> Last-Update: 2017-10-28 diff --git a/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch b/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch index 5f1f8a9f9c..961eaf7646 100644 --- a/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch +++ b/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: Debian forbids calls to external websites. Author: Gianfranco Costamagna <locutus@debian.org> diff --git a/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb b/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb index 86a58beda4..58e4fd6e88 100644 --- a/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb +++ b/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb @@ -4,7 +4,7 @@ LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=86c1c0d961a437e529db93aa3bb32dc4" SRCREV ?= "f4d2682804931e7aea02a869137344bb5452a3cd" -SRC_URI = "git://g...@github.com/opsengine/cpulimit.git;protocol=https;branch=master \ +SRC_URI = "git://github.com/opsengine/cpulimit.git;protocol=https;branch=master \ file://0001-Remove-sys-sysctl.h-and-add-missing-libgen.h-include.patch \ " @@ -15,7 +15,7 @@ do_compile() { } do_install() { install -d ${D}${sbindir} - install -m 0755 ${B}/src/${PN} ${D}${sbindir}/ + install -m 0755 ${B}/src/${BPN} ${D}${sbindir}/ } CFLAGS += "-D_GNU_SOURCE ${LDFLAGS}" diff --git a/meta-oe/recipes-support/crucible/crucible_2022.12.06.bb b/meta-oe/recipes-support/crucible/crucible_2023.04.12.bb index 111b4955cb..4830acff1d 100644 --- a/meta-oe/recipes-support/crucible/crucible_2022.12.06.bb +++ b/meta-oe/recipes-support/crucible/crucible_2023.04.12.bb @@ -9,7 +9,7 @@ GO_INSTALL = "\ ${GO_IMPORT}/cmd/crucible \ ${GO_IMPORT}/cmd/habtool \ " -SRCREV = "6fc8c38cd1ae61b3855a3bd43b042dc5cdad7252" +SRCREV = "269c90b0067e469c20b11e7fc5f4681ad5f0af7e" # Workaround for network access issue during compile step. # This needs to be fixed in the recipes buildsystem so that diff --git a/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb b/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb index 25d5b09e7f..0e994d8b09 100644 --- a/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb +++ b/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb @@ -4,9 +4,8 @@ SECTION = "System Environment/Libraries" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://../ctapi-common.LICENSE;md5=8744cd52545ecb45befebd0da6f70f0a" -SRC_URI = "http://ftp.riken.jp/Linux/fedora/releases/23/Everything/source/SRPMS/c/${BPN}-${PV}.fc23.src.rpm;extract=ctapi-common.LICENSE \ - http://ftp.riken.jp/Linux/fedora/releases/23/Everything/source/SRPMS/c/${BPN}-${PV}.fc23.src.rpm;extract=ctapi-common.README" -SRC_URI[md5sum] = "5b7259ef1c8cd9ae801fca7a5cb548c1" +SRC_URI = "https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Everything/source/SRPMS/c/${BPN}-${PV}.fc23.src.rpm;extract=ctapi-common.LICENSE \ + 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" do_compile() { diff --git a/meta-oe/recipes-support/daemontools/daemontools/0001-Fix-signature-of-main-function.patch b/meta-oe/recipes-support/daemontools/daemontools/0001-Fix-signature-of-main-function.patch index 19f0ae7f21..4b332a000e 100644 --- a/meta-oe/recipes-support/daemontools/daemontools/0001-Fix-signature-of-main-function.patch +++ b/meta-oe/recipes-support/daemontools/daemontools/0001-Fix-signature-of-main-function.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix signature of main function Clang-15 errors out otherewise. Include needed headers for missing functions -Upstream-Status:Pending +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- src/chkshsgr.c | 2 +- diff --git a/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-Fix-QA-Issue.patch b/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-Fix-QA-Issue.patch index 30e37cb1d3..139ff30f2e 100644 --- a/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-Fix-QA-Issue.patch +++ b/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-Fix-QA-Issue.patch @@ -9,6 +9,8 @@ ERROR: daemontools-0.76-r0 do_package_qa: QA Issue: No GNU_HASH in the elf binar Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> --- +Upstream-Status: Pending + src/conf-ld | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/daemontools/daemontools/0001-error.h-include-errno.h-instead-of-extern-int.diff b/meta-oe/recipes-support/daemontools/daemontools/0001-error.h-include-errno.h-instead-of-extern-int.diff index ce1959782a..b5eb7d8b1a 100644 --- a/meta-oe/recipes-support/daemontools/daemontools/0001-error.h-include-errno.h-instead-of-extern-int.diff +++ b/meta-oe/recipes-support/daemontools/daemontools/0001-error.h-include-errno.h-instead-of-extern-int.diff @@ -4,6 +4,8 @@ Date: Wed, 12 Dec 2007 13:44:15 +0000 Subject: [PATCH] error.h: '#include <errno.h>' instead of 'extern int errno;' --- +Upstream-Status: Pending + daemontools-0.76/src/error.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta-oe/recipes-support/daemontools/daemontools/0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff b/meta-oe/recipes-support/daemontools/daemontools/0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff index 73dce90726..16a0148546 100644 --- a/meta-oe/recipes-support/daemontools/daemontools/0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff +++ b/meta-oe/recipes-support/daemontools/daemontools/0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff @@ -4,6 +4,8 @@ Date: Sun, 24 Feb 2008 10:54:26 +0000 Subject: [PATCH] supervise.c: ./supervise may be a symlink, if it's dangling, create link target --- +Upstream-Status: Pending + daemontools-0.76/src/supervise.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch b/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch index 9c07d758ae..98d4a5e45b 100644 --- a/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch +++ b/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + make sure it can be compiled for cross target 1. never try to compile target binary by native gcc diff --git a/meta-oe/recipes-support/daemontools/daemontools/warnings.patch b/meta-oe/recipes-support/daemontools/daemontools/warnings.patch index 2fd18f6f1c..5c9c7114b9 100644 --- a/meta-oe/recipes-support/daemontools/daemontools/warnings.patch +++ b/meta-oe/recipes-support/daemontools/daemontools/warnings.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Fixup misc warnings Patch by RiverRat diff --git a/meta-oe/recipes-support/dc/double-conversion_3.2.1.bb b/meta-oe/recipes-support/dc/double-conversion_3.2.1.bb deleted file mode 100644 index cc54dc6481..0000000000 --- a/meta-oe/recipes-support/dc/double-conversion_3.2.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Double conversion libraries" -DESCRIPTION = "This provides binary-decimal and decimal-binary routines for IEEE doubles." -HOMEPAGE = "https://github.com/google/double-conversion.git" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1ea35644f0ec0d9767897115667e901f" - - -S = "${WORKDIR}/git" - -SRC_URI = " \ - git://github.com/google/double-conversion.git;protocol=https;branch=master \ -" -SRCREV = "af09fd65fcf24eee95dc62813ba9123414635428" - -inherit cmake - -EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON" diff --git a/meta-oe/recipes-support/dc/double-conversion_3.3.0.bb b/meta-oe/recipes-support/dc/double-conversion_3.3.0.bb new file mode 100644 index 0000000000..a8fd88a9ad --- /dev/null +++ b/meta-oe/recipes-support/dc/double-conversion_3.3.0.bb @@ -0,0 +1,41 @@ +SUMMARY = "Double conversion libraries" +DESCRIPTION = "This provides binary-decimal and decimal-binary routines for IEEE doubles." +HOMEPAGE = "https://github.com/google/double-conversion.git" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1ea35644f0ec0d9767897115667e901f" + + +S = "${WORKDIR}/git" + +SRC_URI = " \ + git://github.com/google/double-conversion.git;protocol=https;branch=master \ + file://run-ptest \ +" +SRCREV = "4f7a25d8ced8c7cf6eee6fd09d6788eaa23c9afe" + +inherit cmake ptest + +EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON" + +# These ptest use ctest (provided by cmake) +RDEPENDS:${PN}-ptest += "cmake" +# Build tests only if ptest is enabled +EXTRA_OECMAKE += "${@bb.utils.contains('PTEST_ENABLED', '1', '-DBUILD_TESTING=ON', '', d)}" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/test + cp -rf ${B}/test ${D}${PTEST_PATH} + install -m 0644 ${B}/CTestTestfile.cmake ${D}${PTEST_PATH}/ + files=" + CTestTestfile.cmake + test/CTestTestfile.cmake + test/cmake_install.cmake + test/cctest/CTestTestfile.cmake + test/cctest/cmake_install.cmake + " + for file in $files; do + sed -i -e "s|${B}|${PTEST_PATH}|g" -e "s|${S}|${PTEST_PATH}|g" -e "s|${WORKDIR}/recipe-sysroot-native||g" "${D}${PTEST_PATH}/${file}" + done + +} diff --git a/meta-oe/recipes-support/dc/files/run-ptest b/meta-oe/recipes-support/dc/files/run-ptest new file mode 100644 index 0000000000..9240a3f851 --- /dev/null +++ b/meta-oe/recipes-support/dc/files/run-ptest @@ -0,0 +1,23 @@ +#!/bin/sh + +# This script runs tests taken from the github CI for the Double-Conversion library. +# For more information, please see: https://github.com/google/double-conversion/blob/master/.github/workflows/ci.yml#L60 + +# Count the number of failed tests +NUM_FAILS=0 + +# Run all tests using ctest +ctest -V + +# VCount the number of failed tests by checking the LastTest.log file generated by ctest +NUM_FAILS=$(grep -c "Failed" Testing/Temporary/LastTest.log) + +# Run the tests directly as well, just in case we forgot to add it to ctest +test/cctest/cctest +if [ $? -ne 0 ]; then + # If the test failed, increment the number of failed tests + NUM_FAILS=$(expr $NUM_FAILS + 1) +fi + +# Return the number of failed tests +exit $NUM_FAILS diff --git a/meta-oe/recipes-support/eject/eject/eject-timeout.patch b/meta-oe/recipes-support/eject/eject/eject-timeout.patch index de8146f32a..4511e17069 100644 --- a/meta-oe/recipes-support/eject/eject/eject-timeout.patch +++ b/meta-oe/recipes-support/eject/eject/eject-timeout.patch @@ -1,6 +1,6 @@ allow a longer timeout -Upstream-Status: Backport +Upstream-Status: Backport Signed-off-by: Morgan Little <morgan.little@windriver.com> diff --git a/meta-oe/recipes-support/emacs/emacs_28.2.bb b/meta-oe/recipes-support/emacs/emacs_28.2.bb index 7b0a422be6..137c29beea 100644 --- a/meta-oe/recipes-support/emacs/emacs_28.2.bb +++ b/meta-oe/recipes-support/emacs/emacs_28.2.bb @@ -5,14 +5,13 @@ LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" SRC_URI = "https://ftp.gnu.org/pub/gnu/emacs/emacs-${PV}.tar.xz \ + file://0001-largefile.m4-Update-from-latest-gnulib.patch \ " SRC_URI:append:class-target = " file://usemake-docfile-native.patch" SRC_URI[sha256sum] = "ee21182233ef3232dc97b486af2d86e14042dbb65bbc535df562c3a858232488" -CVE_CHECK_IGNORE = "\ - CVE-2007-6109 \ -" +CVE_CHECK_STATUS[CVE-2007-6109] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." PACKAGECONFIG[gnutls] = "--with-gnutls=yes,--with-gnutls=no,gnutls" PACKAGECONFIG[kerberos] = "--with-kerberos=yes,--with-kerberos=no,krb5" diff --git a/meta-oe/recipes-support/emacs/files/0001-largefile.m4-Update-from-latest-gnulib.patch b/meta-oe/recipes-support/emacs/files/0001-largefile.m4-Update-from-latest-gnulib.patch new file mode 100644 index 0000000000..72c0c0e413 --- /dev/null +++ b/meta-oe/recipes-support/emacs/files/0001-largefile.m4-Update-from-latest-gnulib.patch @@ -0,0 +1,390 @@ +From c2bea3d033b5abd44698722d8eedc2b87373b33b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 2 Apr 2023 10:42:43 -0700 +Subject: [PATCH] largefile.m4: Update from latest gnulib + +brings in latest largefile specific changes which autoconf 2.72+ requires + +Upstream-Status: Inappropriate [Drop it with new emacs release which has it] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + m4/largefile.m4 | 330 ++++++++++++++++++++++++++++++++++++++---------- + 1 file changed, 263 insertions(+), 67 deletions(-) + +diff --git a/m4/largefile.m4 b/m4/largefile.m4 +index 3e8b5e3..7fb81b8 100644 +--- a/m4/largefile.m4 ++++ b/m4/largefile.m4 +@@ -1,7 +1,7 @@ + # Enable large files on systems where this is not the default. + # Enable support for files on Linux file systems with 64-bit inode numbers. + +-# Copyright 1992-1996, 1998-2022 Free Software Foundation, Inc. ++# Copyright 1992-1996, 1998-2023 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -10,8 +10,9 @@ + # It does not set _LARGEFILE_SOURCE=1 on HP-UX/ia64 32-bit, although this + # setting of _LARGEFILE_SOURCE is needed so that <stdio.h> declares fseeko + # and ftello in C++ mode as well. ++# Fixed in Autoconf 2.72, which has AC_SYS_YEAR2038. + AC_DEFUN([gl_SET_LARGEFILE_SOURCE], +-[ ++ m4_ifndef([AC_SYS_YEAR2038], [[ + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_FUNC_FSEEKO + case "$host_os" in +@@ -20,10 +21,10 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], + [Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2).]) + ;; + esac +-]) ++ ]]) ++) + +-# Work around a problem in Autoconf through at least 2.71 on glibc 2.34+ +-# with _TIME_BITS. Also, work around a problem in autoconf <= 2.69: ++# Work around a problem in autoconf <= 2.69: + # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, + # or configures them incorrectly in some cases. + m4_version_prereq([2.70], [], [ +@@ -43,33 +44,258 @@ m4_define([_AC_SYS_LARGEFILE_TEST_INCLUDES], + ]) + ])# m4_version_prereq 2.70 + ++# Support AC_SYS_YEAR2038, even if Autoconf 2.71 or earlier. ++# This code is taken from Autoconf master. ++m4_ifndef([AC_SYS_YEAR2038], [ ++ ++# _AC_SYS_YEAR2038_TEST_CODE ++# -------------------------- ++# C code used to probe for time_t that can represent time points more ++# than 2**31 - 1 seconds after the epoch. With the usual Unix epoch, ++# these correspond to dates after 2038-01-18 22:14:07 +0000 (Gregorian), ++# hence the name. ++AC_DEFUN([_AC_SYS_YEAR2038_TEST_CODE], ++[[ ++ #include <time.h> ++ /* Check that time_t can represent 2**32 - 1 correctly. */ ++ #define LARGE_TIME_T \\ ++ ((time_t) (((time_t) 1 << 30) - 1 + 3 * ((time_t) 1 << 30))) ++ int verify_time_t_range[(LARGE_TIME_T / 65537 == 65535 ++ && LARGE_TIME_T % 65537 == 0) ++ ? 1 : -1]; ++]]) ++ ++# _AC_SYS_YEAR2038_OPTIONS ++# ------------------------ ++# List of known ways to enable support for large time_t. If you change ++# this list you probably also need to change the AS_CASE at the end of ++# _AC_SYS_YEAR2038_PROBE. ++m4_define([_AC_SYS_YEAR2038_OPTIONS], m4_normalize( ++ ["none needed"] dnl 64-bit and newer 32-bit Unix ++ ["-D_TIME_BITS=64"] dnl glibc 2.34 with some 32-bit ABIs ++ ["-D__MINGW_USE_VC2005_COMPAT"] dnl 32-bit MinGW ++ ["-U_USE_32_BIT_TIME_T -D__MINGW_USE_VC2005_COMPAT"] ++ dnl 32-bit MinGW (misconfiguration) ++)) ++ ++# _AC_SYS_YEAR2038_PROBE([IF-NOT-DETECTED]) ++# ----------------------------------------- ++# Subroutine of AC_SYS_YEAR2038. Probe for time_t that can represent ++# time points more than 2**31 - 1 seconds after the epoch (dates after ++# 2038-01-18, see above) and set the cache variable ac_cv_sys_year2038_opts ++# to one of the values in the _AC_SYS_YEAR2038_OPTIONS list, or to ++# "support not detected" if none of them worked. Then, set compilation ++# options and #defines as necessary to enable large time_t support. ++# ++# Note that we do not test whether mktime, localtime, etc. handle ++# large values of time_t correctly, as that would require use of ++# AC_TRY_RUN. Note also that some systems only support large time_t ++# together with large off_t. ++# ++# If support is not detected, the behavior depends on which of the ++# top-level AC_SYS_YEAR2038 macros was used (see below). ++# ++# If you change this macro you may also need to change ++# _AC_SYS_YEAR2038_OPTIONS. ++AC_DEFUN([_AC_SYS_YEAR2038_PROBE], ++[AC_CACHE_CHECK([for $CC option to enable timestamps after Jan 2038], ++ [ac_cv_sys_year2038_opts], ++ [ac_save_CPPFLAGS="$CPPFLAGS" ++ ac_opt_found=no ++ for ac_opt in _AC_SYS_YEAR2038_OPTIONS; do ++ AS_IF([test x"$ac_opt" != x"none needed"], ++ [CPPFLAGS="$ac_save_CPPFLAGS $ac_opt"]) ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([_AC_SYS_YEAR2038_TEST_CODE])], ++ [ac_cv_sys_year2038_opts="$ac_opt" ++ ac_opt_found=yes]) ++ test $ac_opt_found = no || break ++ done ++ CPPFLAGS="$ac_save_CPPFLAGS" ++ test $ac_opt_found = yes || ac_cv_sys_year2038_opts="support not detected"]) ++ ++ac_have_year2038=yes ++AS_CASE([$ac_cv_sys_year2038_opts], ++ ["none needed"], [], ++ ["support not detected"], ++ [ac_have_year2038=no ++ AS_CASE([$enable_year2038], ++ [yes], ++ [# If we're not cross compiling and 'touch' works with a large ++ # timestamp, then we can presume the system supports wider time_t ++ # *somehow* and we just weren't able to detect it. One common ++ # case that we deliberately *don't* probe for is a system that ++ # supports both 32- and 64-bit ABIs but only the 64-bit ABI offers ++ # wide time_t. (It would be inappropriate for us to override an ++ # intentional use of -m32.) Error out, demanding use of ++ # --disable-year2038 if this is intentional. ++ AS_IF([test $cross_compiling = no], ++ [AS_IF([TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null], ++ [AS_CASE([`TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null`], ++ [*'Feb 7 2106'* | *'Feb 7 17:10'*], ++ [AC_MSG_FAILURE(m4_text_wrap( ++ [this system appears to support timestamps after January 2038, ++ but no mechanism for enabling wide 'time_t' was detected. ++ Did you mean to build a 64-bit binary? (e.g. 'CC="${CC} -m64"'.) ++ To proceed with 32-bit time_t, configure with '--disable-year2038'.], ++ [], [], [55]))])])])])], ++ ++ ["-D_TIME_BITS=64"], ++ [AC_DEFINE([_TIME_BITS], [64], ++ [Number of bits in time_t, on hosts where this is settable.])], ++ ++ ["-D__MINGW_USE_VC2005_COMPAT=1"], ++ [AC_DEFINE([__MINGW_USE_VC2005_COMPAT], [1], ++ [Define to 1 on platforms where this makes time_t a 64-bit type.])], + +-# _AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, +-# CACHE-VAR, +-# DESCRIPTION, +-# PROLOGUE, [FUNCTION-BODY]) +-# -------------------------------------------------------- +-m4_define([_AC_SYS_LARGEFILE_MACRO_VALUE], +-[AC_CACHE_CHECK([for $1 value needed for large files], [$3], +-[while :; do +- m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])( +- [AC_LANG_PROGRAM([$5], [$6])], +- [$3=no; break]) +- m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])( +- [AC_LANG_PROGRAM([#undef $1 +-#define $1 $2 +-$5], [$6])], +- [$3=$2; break]) +- $3=unknown +- break +-done]) +-case $$3 in #( +- no | unknown) ;; +- *) AC_DEFINE_UNQUOTED([$1], [$$3], [$4]);; +-esac +-rm -rf conftest*[]dnl +-])# _AC_SYS_LARGEFILE_MACRO_VALUE ++ ["-U_USE_32_BIT_TIME_T"*], ++ [AC_MSG_FAILURE(m4_text_wrap( ++ [the 'time_t' type is currently forced to be 32-bit. ++ It will stop working after January 2038. ++ Remove _USE_32BIT_TIME_T from the compiler flags.], ++ [], [], [55]))], ++ ++ [AC_MSG_ERROR( ++ [internal error: bad value for \$ac_cv_sys_year2038_opts])]) ++]) ++ ++# _AC_SYS_YEAR2038_ENABLE ++# ----------------------- ++# Subroutine of AC_SYS_YEAR2038 and _AC_SYS_YEAR2038_OPT_IN. ++# Depending on which of the YEAR2038 macros was used, add either an ++# --enable-year2038, or a --disable-year2038, or no option at all to ++# the configure script. Note that this is expanded very late and ++# therefore there cannot be any code in the AC_ARG_ENABLE. The ++# default value for enable_year2038 is emitted unconditionally ++# because the generated code always looks at this variable. ++m4_define([_AC_SYS_YEAR2038_ENABLE], ++[m4_divert_text([DEFAULTS], ++ m4_provide_if([AC_SYS_YEAR2038], ++ [enable_year2038=yes], ++ [enable_year2038=no]))]dnl ++[AC_ARG_ENABLE([year2038], ++ m4_provide_if([AC_SYS_YEAR2038], ++ [AS_HELP_STRING([--disable-year2038], ++ [do not support timestamps after 2038])], ++ [AS_HELP_STRING([--enable-year2038], ++ [support timestamps after 2038])]))]) ++ ++# _AC_SYS_YEAR2038_OPT_IN ++# ----------------------- ++# If the --enable-year2038 option is given to configure, attempt to ++# detect and activate support for large time_t on 32-bit systems. ++# This macro is automatically invoked by AC_SYS_LARGEFILE when large ++# *file* support is detected. It does not AC_REQUIRE AC_SYS_LARGEFILE ++# to avoid a dependency loop, and is therefore unsafe to expose as a ++# documented macro. ++AC_DEFUN([_AC_SYS_YEAR2038_OPT_IN], ++[m4_provide_if([_AC_SYS_YEAR2038_PROBE], [], [dnl ++ AS_IF([test "$enable_year2038" != no], [_AC_SYS_YEAR2038_PROBE]) ++ AC_CONFIG_COMMANDS_PRE([_AC_SYS_YEAR2038_ENABLE]) ++])]) ++ ++# AC_SYS_YEAR2038 ++# --------------- ++# Attempt to detect and activate support for large time_t. ++# On systems where time_t is not always 64 bits, this probe can be ++# skipped by passing the --disable-year2038 option to configure. ++AC_DEFUN([AC_SYS_YEAR2038], ++[AC_REQUIRE([AC_SYS_LARGEFILE])]dnl ++[m4_provide_if([_AC_SYS_YEAR2038_PROBE], [], [dnl ++ AS_IF([test "$enable_year2038" != no], [_AC_SYS_YEAR2038_PROBE]) ++ AC_CONFIG_COMMANDS_PRE([_AC_SYS_YEAR2038_ENABLE]) ++])]) ++ ++# _AC_SYS_LARGEFILE_TEST_CODE ++# --------------------------- ++# C code used to probe for large file support. ++m4_define([_AC_SYS_LARGEFILE_TEST_CODE], ++[@%:@include <sys/types.h> ++ /* Check that off_t can represent 2**63 - 1 correctly. ++ We can't simply define LARGE_OFF_T to be 9223372036854775807, ++ since some C++ compilers masquerading as C compilers ++ incorrectly reject 9223372036854775807. */ ++@%:@define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) ++ int off_t_is_large[[(LARGE_OFF_T % 2147483629 == 721 ++ && LARGE_OFF_T % 2147483647 == 1) ++ ? 1 : -1]];[]dnl ++]) ++ ++# _AC_SYS_LARGEFILE_OPTIONS ++# ------------------------- ++# List of known ways to enable support for large files. If you change ++# this list you probably also need to change the AS_CASE at the end of ++# _AC_SYS_LARGEFILE_PROBE. ++m4_define([_AC_SYS_LARGEFILE_OPTIONS], m4_normalize( ++ ["none needed"] dnl Most current systems ++ ["-D_FILE_OFFSET_BITS=64"] dnl X/Open LFS spec ++ ["-D_LARGE_FILES=1"] dnl AIX (which versions?) ++ ["-n32"] dnl Irix 6.2 w/ SGI compiler ++)) ++ ++# _AC_SYS_LARGEFILE_PROBE ++# ----------------------- ++# Subroutine of AC_SYS_LARGEFILE. Probe for large file support and set ++# the cache variable ac_cv_sys_largefile_opts to one of the values in ++# the _AC_SYS_LARGEFILE_OPTIONS list, or to "support not detected" if ++# none of the options in that list worked. Then, set compilation ++# options and #defines as necessary to enable large file support. ++# ++# If large file support is not detected, the behavior depends on which of ++# the top-level AC_SYS_LARGEFILE macros was used (see below). ++# ++# If you change this macro you may also need to change ++# _AC_SYS_LARGEFILE_OPTIONS. ++AC_DEFUN([_AC_SYS_LARGEFILE_PROBE], ++[AC_CACHE_CHECK([for $CC option to enable large file support], ++ [ac_cv_sys_largefile_opts], ++ [ac_save_CC="$CC" ++ ac_opt_found=no ++ for ac_opt in _AC_SYS_LARGEFILE_OPTIONS; do ++ AS_IF([test x"$ac_opt" != x"none needed"], ++ [CC="$ac_save_CC $ac_opt"]) ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([_AC_SYS_LARGEFILE_TEST_CODE])], ++ [ac_cv_sys_largefile_opts="$ac_opt" ++ ac_opt_found=yes]) ++ test $ac_opt_found = no || break ++ done ++ CC="$ac_save_CC" ++ test $ac_opt_found = yes || ac_cv_sys_largefile_opts="support not detected"]) ++ ++ac_have_largefile=yes ++AS_CASE([$ac_cv_sys_largefile_opts], ++ ["none needed"], [], ++ ["support not detected"], ++ [ac_have_largefile=no], ++ ++ ["-D_FILE_OFFSET_BITS=64"], ++ [AC_DEFINE([_FILE_OFFSET_BITS], [64], ++ [Number of bits in a file offset, on hosts where this is settable.])], ++ ++ ["-D_LARGE_FILES=1"], ++ [AC_DEFINE([_LARGE_FILES], [1], ++ [Define to 1 on platforms where this makes off_t a 64-bit type.])], ++ ++ ["-n32"], ++ [CC="$CC -n32"], ++ ++ [AC_MSG_ERROR( ++ [internal error: bad value for \$ac_cv_sys_largefile_opts])]) ++ ++_AC_SYS_YEAR2038_OPT_IN ++]) + ++# _AC_SYS_LARGEFILE_ENABLE ++# ------------------------ ++# Subroutine of AC_SYS_LARGEFILE. Note that this ++# is expanded very late and therefore there cannot be any code in the ++# AC_ARG_ENABLE. The default value for enable_largefile is emitted ++# unconditionally because the generated shell code always looks at ++# this variable. ++m4_define([_AC_SYS_LARGEFILE_ENABLE], ++[m4_divert_text([DEFAULTS], ++ enable_largefile=yes)]dnl ++[AC_ARG_ENABLE([largefile], ++ [AS_HELP_STRING([--disable-largefile], [omit support for large files])])]) + + # AC_SYS_LARGEFILE + # ---------------- +@@ -80,44 +306,14 @@ rm -rf conftest*[]dnl + # Additionally, on Linux file systems with 64-bit inodes a file that happens + # to have a 64-bit inode number cannot be accessed by 32-bit applications on + # Linux x86/x86_64. This can occur with file systems such as XFS and NFS. ++# This macro allows configuration to continue if the system doesn't support ++# large files. + AC_DEFUN([AC_SYS_LARGEFILE], +-[AC_ARG_ENABLE(largefile, +- [ --disable-largefile omit support for large files]) +-AS_IF([test "$enable_largefile" != no], +- [AC_CACHE_CHECK([for special C compiler options needed for large files], +- ac_cv_sys_largefile_CC, +- [ac_cv_sys_largefile_CC=no +- if test "$GCC" != yes; then +- ac_save_CC=$CC +- while :; do +- # IRIX 6.2 and later do not support large files by default, +- # so use the C compiler's -n32 option if that helps. +- AC_LANG_CONFTEST([AC_LANG_PROGRAM([_AC_SYS_LARGEFILE_TEST_INCLUDES])]) +- AC_COMPILE_IFELSE([], [break]) +- CC="$CC -n32" +- AC_COMPILE_IFELSE([], [ac_cv_sys_largefile_CC=' -n32'; break]) +- break +- done +- CC=$ac_save_CC +- rm -f conftest.$ac_ext +- fi]) +- if test "$ac_cv_sys_largefile_CC" != no; then +- CC=$CC$ac_cv_sys_largefile_CC +- fi +- +- _AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64, +- ac_cv_sys_file_offset_bits, +- [Number of bits in a file offset, on hosts where this is settable.], +- [_AC_SYS_LARGEFILE_TEST_INCLUDES]) +- AS_CASE([$ac_cv_sys_file_offset_bits], +- [unknown], +- [_AC_SYS_LARGEFILE_MACRO_VALUE([_LARGE_FILES], [1], +- [ac_cv_sys_large_files], +- [Define for large files, on AIX-style hosts.], +- [_AC_SYS_LARGEFILE_TEST_INCLUDES])], +- [64], +- [gl_YEAR2038_BODY([])])]) +-])# AC_SYS_LARGEFILE ++[m4_provide_if([_AC_SYS_LARGEFILE_PROBE], [], [dnl ++ AS_IF([test "$enable_largefile" != no], [_AC_SYS_LARGEFILE_PROBE]) ++ AC_CONFIG_COMMANDS_PRE([_AC_SYS_LARGEFILE_ENABLE]) ++])]) ++])# m4_ifndef AC_SYS_YEAR2038 + + # Enable large files on systems where this is implemented by Gnulib, not by the + # system headers. +-- +2.40.0 + diff --git a/meta-oe/recipes-support/enca/enca/0001-Do-not-use-MKTEMP_PROG-in-cross-build.patch b/meta-oe/recipes-support/enca/enca/0001-Do-not-use-MKTEMP_PROG-in-cross-build.patch new file mode 100644 index 0000000000..32fa239084 --- /dev/null +++ b/meta-oe/recipes-support/enca/enca/0001-Do-not-use-MKTEMP_PROG-in-cross-build.patch @@ -0,0 +1,30 @@ +From c6a59d512706978e8c67f9a2d84ec650f8763368 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 8 May 2023 18:02:52 -0700 +Subject: [PATCH] Do not use $MKTEMP_PROG in cross-build + +$MKTEMP_PROG points to native location which could be absolute path that +wont exist on target rootfs. Therefore use it from PATH + +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 4852a2f..d23b384 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -186,7 +186,7 @@ ye_PATH_LOCALE_ALIAS + + dnl Random filename generation in scripts + if test -n "$MKTEMP_PROG"; then +- SHELL_RANDOM_FILENAME='`'$MKTEMP_PROG' /tmp/enca-$$-XXXXXXXX`' ++ SHELL_RANDOM_FILENAME='`mktemp /tmp/enca-$$-XXXXXXXX`' + else + SHELL_RANDOM_FILENAME='/tmp/enca-$$-$RANDOM' + fi +-- +2.40.1 + diff --git a/meta-oe/recipes-support/enca/enca/dont-run-tests.patch b/meta-oe/recipes-support/enca/enca/dont-run-tests.patch index 321d1e6201..1d0170bd73 100644 --- a/meta-oe/recipes-support/enca/enca/dont-run-tests.patch +++ b/meta-oe/recipes-support/enca/enca/dont-run-tests.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: enca-1.9/Makefile.am =================================================================== --- enca-1.9.orig/Makefile.am 2005-11-24 11:21:32.000000000 +0100 diff --git a/meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch b/meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch index baf5547642..2112d8cfab 100644 --- a/meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch +++ b/meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch @@ -8,6 +8,8 @@ This patch come straight from the Buildroot source tree. Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com> Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com> --- +Upstream-Status: Pending + m4/libiconv.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch b/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch index 48497d68c8..756745d839 100644 --- a/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch +++ b/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- enca-1.19/Makefile.am.orig 2006-06-29 15:34:55.000000000 +0100 +++ enca-1.19/Makefile.am 2006-06-29 15:35:20.000000000 +0100 @@ -1,7 +1,7 @@ diff --git a/meta-oe/recipes-support/enca/enca_1.19.bb b/meta-oe/recipes-support/enca/enca_1.19.bb index eed0ad1b93..774f05f7c4 100644 --- a/meta-oe/recipes-support/enca/enca_1.19.bb +++ b/meta-oe/recipes-support/enca/enca_1.19.bb @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=24b9569831c46d4818450b55282476b4" SRC_URI = "https://dl.cihar.com/enca/enca-${PV}.tar.gz \ file://dont-run-tests.patch \ file://makefile-remove-tools.patch \ - file://libenca-003-iconv.patch " - + file://libenca-003-iconv.patch \ + file://0001-Do-not-use-MKTEMP_PROG-in-cross-build.patch" SRC_URI[sha256sum] = "4c305cc59f3e57f2cfc150a6ac511690f43633595760e1cb266bf23362d72f8a" inherit autotools diff --git a/meta-oe/recipes-support/espeak/files/0001-Fix-build-of-shared-library-on-architectures-needing.patch b/meta-oe/recipes-support/espeak/files/0001-Fix-build-of-shared-library-on-architectures-needing.patch index 2590e15841..144c30a62f 100644 --- a/meta-oe/recipes-support/espeak/files/0001-Fix-build-of-shared-library-on-architectures-needing.patch +++ b/meta-oe/recipes-support/espeak/files/0001-Fix-build-of-shared-library-on-architectures-needing.patch @@ -10,6 +10,8 @@ patch doesn't affect such architectures. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- +Upstream-Status: Pending + src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/farsight/libnice/0001-agent-meson-Replace-filename-with-basename.patch b/meta-oe/recipes-support/farsight/libnice/0001-agent-meson-Replace-filename-with-basename.patch new file mode 100644 index 0000000000..897de4a6ce --- /dev/null +++ b/meta-oe/recipes-support/farsight/libnice/0001-agent-meson-Replace-filename-with-basename.patch @@ -0,0 +1,40 @@ +From 7c510cd20bb443064ab4a0d2c6d917e807b2671b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 22 May 2023 19:45:28 -0700 +Subject: [PATCH] agent/meson: Replace filename with basename + +This avoids emitting absolute paths into generated sourcecode, it +improves reproducibility. See [1] + +[1] https://developer-old.gnome.org/gobject/stable/glib-mkenums.html + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/libnice/libnice/-/merge_requests/258] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + agent/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/agent/meson.build b/agent/meson.build +index 2e5b272..44fcd6b 100644 +--- a/agent/meson.build ++++ b/agent/meson.build +@@ -29,14 +29,14 @@ gnome = import('gnome') + + agent_enum_types_c = gnome.mkenums('agent-enum-types.c', sources : agent_headers, + fhead: '#include <config.h>\n#include <glib-object.h>\n#include "agent.h"\n#include "pseudotcp.h"\n#include "agent-enum-types.h"', +- fprod: '\n/* enumerations from "@filename@" */', ++ fprod: '\n/* enumerations from "@basename@" */', + vhead: 'GType\n@enum_name@_get_type (void)\n{\n static GType type = 0;\n if (!type) {\n static const G@Type@Value values[] = {', + vprod: ' { @VALUENAME@, "@VALUENAME@", "@valuenick@" },', + vtail: ' { 0, NULL, NULL }\n };\n type = g_@type@_register_static ("@EnumName@", values);\n }\n return type;\n}\n\n') + + agent_enum_types_h = gnome.mkenums('agent-enum-types.h', sources : agent_headers, + fhead: '#ifndef __AGENT_ENUM_TYPES_H__\n#define __AGENT_ENUM_TYPES_H__ 1\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n', +- fprod: '/* enumerations from "@filename@" */\n', ++ fprod: '/* enumerations from "@basename@" */\n', + vhead: 'GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define NICE_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n', + ftail: 'G_END_DECLS\n\n#endif /* !AGENT_ENUM_TYPES_H */') + +-- +2.40.1 + diff --git a/meta-oe/recipes-support/farsight/libnice_0.1.18.bb b/meta-oe/recipes-support/farsight/libnice_0.1.21.bb index e7eaf03921..f319b994bd 100644 --- a/meta-oe/recipes-support/farsight/libnice_0.1.18.bb +++ b/meta-oe/recipes-support/farsight/libnice_0.1.21.bb @@ -8,8 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9c42325015702feda4f4d2f19a55b767 \ file://COPYING.MPL;md5=3c617710e51cdbe0fc00716f056dfb1a \ " -SRC_URI = "http://nice.freedesktop.org/releases/libnice-${PV}.tar.gz" -SRC_URI[sha256sum] = "5eabd25ba2b54e817699832826269241abaa1cf78f9b240d1435f936569273f4" +SRC_URI = "http://nice.freedesktop.org/releases/libnice-${PV}.tar.gz \ + file://0001-agent-meson-Replace-filename-with-basename.patch" +SRC_URI[sha256sum] = "72e73a2acf20f59093e21d5601606e405873503eb35f346fa621de23e99b3b39" DEPENDS = "glib-2.0 gnutls" diff --git a/meta-oe/recipes-support/fbset/fbset-2.1/makefile.patch b/meta-oe/recipes-support/fbset/fbset-2.1/makefile.patch index 82b1c61e9c..730bb7a965 100644 --- a/meta-oe/recipes-support/fbset/fbset-2.1/makefile.patch +++ b/meta-oe/recipes-support/fbset/fbset-2.1/makefile.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- fbset-2.1/Makefile.orig 2006-05-28 04:04:27.412095480 +0200 +++ fbset-2.1/Makefile 2006-05-28 04:14:05.379231120 +0200 @@ -2,7 +2,7 @@ diff --git a/meta-oe/recipes-support/fftw/fftw/install-bench.patch b/meta-oe/recipes-support/fftw/fftw/install-bench.patch index ef570b19d8..237c1c0c5c 100644 --- a/meta-oe/recipes-support/fftw/fftw/install-bench.patch +++ b/meta-oe/recipes-support/fftw/fftw/install-bench.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- ./tests/Makefile.am.orig 2021-03-23 11:45:12.756371739 -0400 +++ ./tests/Makefile.am 2021-03-23 19:29:19.692180793 -0400 @@ -1,21 +1,21 @@ diff --git a/meta-oe/recipes-support/fftw/fftw_3.3.10.bb b/meta-oe/recipes-support/fftw/fftw_3.3.10.bb index cb45e2b91f..33e8279880 100644 --- a/meta-oe/recipes-support/fftw/fftw_3.3.10.bb +++ b/meta-oe/recipes-support/fftw/fftw_3.3.10.bb @@ -55,6 +55,7 @@ do_configure() { do_compile() { for lib in fftw fftwl fftwf; do cd ${WORKDIR}/build-$lib + test -n "${TOOLCHAIN_OPTIONS}" && sed -i -e 's|${TOOLCHAIN_OPTIONS}||g' config.h autotools_do_compile done } diff --git a/meta-oe/recipes-support/fltk/fltk-native.bb b/meta-oe/recipes-support/fltk/fltk-native.bb index 8d3992a6ec..3e8e2cdf77 100644 --- a/meta-oe/recipes-support/fltk/fltk-native.bb +++ b/meta-oe/recipes-support/fltk/fltk-native.bb @@ -2,6 +2,8 @@ require ${BPN}.inc DEPENDS = "zlib-native jpeg-native libpng-native libxext-native libxft-native" +SRC_URI += "file://fltk-native-link-libdl.patch" + inherit native EXTRA_OECMAKE += " \ @@ -15,9 +17,6 @@ EXTRA_OECMAKE += " \ -DOPTION_USE_XCURSOR=OFF \ " -# lib/libfltk.a(Fl_Native_File_Chooser.cxx.o): undefined reference to symbol 'dlsym@@GLIBC_2.2.5' -LDFLAGS += "-ldl" - do_install:append() { # make sure native fltk-config is not used accidentaly rm -f ${D}${bindir}/fltk-config diff --git a/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch b/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch index e6e68a0cb8..d1cbb35479 100644 --- a/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch +++ b/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch @@ -18,6 +18,8 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- +Upstream-Status: Pending + src/Fl_Preferences.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/fltk/fltk/disable_test.patch b/meta-oe/recipes-support/fltk/fltk/disable_test.patch index 1f5fd25e04..fe8be5a652 100644 --- a/meta-oe/recipes-support/fltk/fltk/disable_test.patch +++ b/meta-oe/recipes-support/fltk/fltk/disable_test.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/Makefile.orig 2015-11-26 15:35:31.485357862 +0800 +++ b/Makefile 2015-11-26 15:35:37.037357764 +0800 @@ -18,7 +18,7 @@ diff --git a/meta-oe/recipes-support/fltk/fltk/fltk-native-link-libdl.patch b/meta-oe/recipes-support/fltk/fltk/fltk-native-link-libdl.patch new file mode 100644 index 0000000000..e140ce2166 --- /dev/null +++ b/meta-oe/recipes-support/fltk/fltk/fltk-native-link-libdl.patch @@ -0,0 +1,44 @@ +Upstream-Status: Inappropriate [cross build specific] + +It fails to build fltk-native on Ubuntu 20.04 with glibc 2.31: + +| /path_to/tmp/hosttools/ld: lib/libfltk.a(Fl_Native_File_Chooser.cxx.o): in function `fl_dlopen(char const*, char const*)': +| Fl_Native_File_Chooser.cxx:(.text+0x61a): undefined reference to `dlopen' +| /path_to/tmp/hosttools/ld: lib/libfltk.a(Fl_Native_File_Chooser.cxx.o): in function `Fl_GTK_File_Chooser::probe_for_GTK_libs()': +| Fl_Native_File_Chooser.cxx:(.text+0xf92): undefined reference to `dlerror' + +The original fix in fltk-native recipe does not work any more because '-ldl' +appears before lib/libfltk.a and causes dlopen() unresolved. The reason why it +doesn't fail on other hosts is that the functions dlopen(), dlerror() etc. have +been moved to libc.so since glibc 2.34 via the commits in glibc: + +0c1c3a771e dlfcn: Move dlopen into libc +add8d7ea01 dlfcn: Move dlvsym into libc +6dfc0207eb dlfcn: Move dlinfo into libc +492560a32e dlfcn: Move dladdr1 into libc +6a1ed32789 dlfcn: Move dlmopen into libc +77f876c0e3 dlfcn: Move dlsym into libc +602252b553 dlfcn: Move dladdr into libc +d8cce17d2a dlfcn: Move dlclose into libc + +Append 'dl' to fltk link items explictly to fix the error. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + +--- + src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index d153b1c..0fe5c11 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -306,7 +306,7 @@ endif (USE_XFT) + ####################################################################### + + FL_ADD_LIBRARY (fltk STATIC "${STATIC_FILES}") +-target_link_libraries (fltk ${OPTIONAL_LIBS}) ++target_link_libraries (fltk ${OPTIONAL_LIBS} dl) + + ####################################################################### + diff --git a/meta-oe/recipes-support/fmt/fmt_9.1.0.bb b/meta-oe/recipes-support/fmt/fmt_10.0.0.bb index 34896153c2..a8e6e563da 100644 --- a/meta-oe/recipes-support/fmt/fmt_9.1.0.bb +++ b/meta-oe/recipes-support/fmt/fmt_10.0.0.bb @@ -2,10 +2,10 @@ SUMMARY = "open-source formatting library for C++" DESCRIPTION = "{fmt} is an open-source formatting library for C++. It can be used as a safe and fast alternative to (s)printf and iostreams." HOMEPAGE = "https://fmt.dev" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=af88d758f75f3c5c48a967501f24384b" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=b9257785fc4f3803a4b71b76c1412729" SRC_URI = "git://github.com/fmtlib/fmt;branch=master;protocol=https" -SRCREV = "a33701196adfad74917046096bf5a2aa0ab0bb50" +SRCREV = "a0b8a92e3d1532361c2f7feb63babc5c18d00ef2" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-incompatible-function-pointer-types.patch b/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-incompatible-function-pointer-types.patch deleted file mode 100644 index ce230dbf22..0000000000 --- a/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-incompatible-function-pointer-types.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 9c785ca0535d9c24e6699ee1243b427c1407acb5 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 17 Jan 2023 19:31:17 -0800 -Subject: [PATCH] Fix incompatible function pointer types - -clang 16+ is flagging the function pointer prototype mismatches, -therefore fix it. - -Fixes Issue #8487 - -Upstream-Status: Submitted [https://github.com/FreeRDP/FreeRDP/pull/8622] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - client/X11/xf_disp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/client/X11/xf_disp.c b/client/X11/xf_disp.c -index 32ddb626c..ef0cb93ff 100644 ---- a/client/X11/xf_disp.c -+++ b/client/X11/xf_disp.c -@@ -248,7 +248,7 @@ static void xf_disp_OnTimer(void* context, TimerEventArgs* e) - xf_disp_sendResize(xfDisp); - } - --static void xf_disp_OnWindowStateChange(void* context, const WindowStateChangeEventArgs* e) -+static void xf_disp_OnWindowStateChange(void* context, WindowStateChangeEventArgs* e) - { - xfContext* xfc; - xfDispContext* xfDisp; --- -2.39.1 - diff --git a/meta-oe/recipes-support/freerdp/freerdp/winpr-makecert-Build-with-install-RPATH.patch b/meta-oe/recipes-support/freerdp/freerdp/winpr-makecert-Build-with-install-RPATH.patch index 0f6f575d02..914f08087b 100644 --- a/meta-oe/recipes-support/freerdp/freerdp/winpr-makecert-Build-with-install-RPATH.patch +++ b/meta-oe/recipes-support/freerdp/freerdp/winpr-makecert-Build-with-install-RPATH.patch @@ -9,6 +9,8 @@ Update it for 2.0.0. Signed-off-by: Manuel Bachmann <manuel.bachmann@iot.bzh> Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + winpr/tools/makecert-cli/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-oe/recipes-support/freerdp/freerdp_2.9.0.bb b/meta-oe/recipes-support/freerdp/freerdp_2.10.0.bb index 3b8fee0f5f..4cb452608e 100644 --- a/meta-oe/recipes-support/freerdp/freerdp_2.9.0.bb +++ b/meta-oe/recipes-support/freerdp/freerdp_2.10.0.bb @@ -13,11 +13,10 @@ inherit pkgconfig cmake gitpkgv PE = "1" PKGV = "${GITPKGVTAG}" -SRCREV = "fa8e1b1c765a4466030ac52240f052c0b440a4d1" +SRCREV = "7471ae383e7b7a613f275e19f7b54958a193c891" SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \ - file://winpr-makecert-Build-with-install-RPATH.patch \ - file://0001-Fix-incompatible-function-pointer-types.patch \ -" + file://winpr-makecert-Build-with-install-RPATH.patch \ + " S = "${WORKDIR}/git" @@ -29,6 +28,7 @@ EXTRA_OECMAKE += " \ -DBUILD_STATIC_LIBS=OFF \ -DCMAKE_POSITION_INDEPENDANT_CODE=ON \ -DWITH_MANPAGES=OFF \ + -DPROXY_PLUGINDIR=${libdir}/freerdp/proxy/plugins \ " PACKAGECONFIG ??= " \ @@ -54,6 +54,10 @@ FILES:libfreerdp = "${libdir}/lib*${SOLIBS}" PACKAGES_DYNAMIC += "^libfreerdp-plugin-.*" +do_configure:append() { + sed -i -e 's|${WORKDIR}||g' ${B}/buildflags.h +} + # we will need winpr-makecert to generate TLS certificates do_install:append () { install -d ${D}${bindir} diff --git a/meta-oe/recipes-support/function2/function2_4.2.2.bb b/meta-oe/recipes-support/function2/function2_4.2.3.bb index 31cd077d91..599c490359 100644 --- a/meta-oe/recipes-support/function2/function2_4.2.2.bb +++ b/meta-oe/recipes-support/function2/function2_4.2.3.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Provides improved implementations of std::function." HOMEPAGE = "https://naios.github.io/function2" LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" -SRCREV = "2d3a878ef19dd5d2fb188898513610fac0a48621" +SRCREV = "9e303865d14f1204f09379e37bbeb30c4375139a" PV .= "+git${SRCPV}" SRC_URI += "gitsm://github.com/Naios/function2;branch=master;protocol=https" diff --git a/meta-oe/recipes-support/glog/glog/0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch b/meta-oe/recipes-support/glog/glog/0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch new file mode 100644 index 0000000000..3732c62cd0 --- /dev/null +++ b/meta-oe/recipes-support/glog/glog/0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch @@ -0,0 +1,33 @@ +From 176230435cb4b64ff7f2d97f77a04579ad9ca239 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 18 Feb 2023 13:14:14 -0800 +Subject: [PATCH] Change SleepForMilliseconds parameter from unsigned int -> long + +Fixes following error on 32bit platforms + +src/googletest.h:631:35: error: non-constant-expression cannot be narrowed from type 'unsigned int' to 'long' in initializer list [-Wc++11-narrowing] + const struct timespec req = {0, t * 1000 * 1000}; + ^~~~~~~~~~~~~~~ + +Upstream-Status: Submitted [https://github.com/google/glog/pull/894] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/googletest.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/googletest.h b/src/googletest.h +index 5761361..836b06c 100644 +--- a/src/googletest.h ++++ b/src/googletest.h +@@ -625,7 +625,7 @@ class Thread { + #endif + }; + +-static inline void SleepForMilliseconds(unsigned t) { ++static inline void SleepForMilliseconds(long t) { + #ifndef GLOG_OS_WINDOWS + # if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 199309L + const struct timespec req = {0, t * 1000 * 1000}; +-- +2.39.2 + diff --git a/meta-oe/recipes-support/glog/glog/libexecinfo.patch b/meta-oe/recipes-support/glog/glog/libexecinfo.patch index 927c269a6a..a791a40dbc 100644 --- a/meta-oe/recipes-support/glog/glog/libexecinfo.patch +++ b/meta-oe/recipes-support/glog/glog/libexecinfo.patch @@ -1,4 +1,8 @@ -Link libexecinfo if its found, this is needed for musl based systems +From 19d00c15710840910a7397252c14d612746631fe Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 8 Mar 2021 14:58:40 -0800 +Subject: [PATCH] Link libexecinfo if its found, this is needed for musl based + systems Fixes ld: libglog.so.0.4.0: undefined reference to `backtrace' @@ -6,17 +10,24 @@ ld: libglog.so.0.4.0: undefined reference to `backtrace' Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 846b444..1553358 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -144,6 +144,7 @@ check_cxx_compiler_flag (-Wunnamed-type- - check_symbol_exists (snprintf cstdio HAVE_SNPRINTF) +@@ -162,6 +162,7 @@ cmake_pop_check_state () + check_cxx_symbol_exists (snprintf cstdio HAVE_SNPRINTF) check_library_exists (dbghelp UnDecorateSymbolName "" HAVE_DBGHELP) +check_library_exists (execinfo backtrace "" HAVE_EXECINFO) check_cxx_source_compiles (" #include <cstdlib> -@@ -584,6 +585,10 @@ if (Unwind_FOUND) +@@ -629,6 +630,10 @@ if (Unwind_FOUND) set (Unwind_DEPENDENCY "find_dependency (Unwind ${Unwind_VERSION})") endif (Unwind_FOUND) @@ -25,5 +36,5 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> +endif (HAVE_EXECINFO) + if (HAVE_DBGHELP) - target_link_libraries (glog PUBLIC dbghelp) - endif (HAVE_DBGHELP) + target_link_libraries (glog PRIVATE dbghelp) + set (glog_libraries_options_for_static_linking "${glog_libraries_options_for_static_linking} -ldbghelp") diff --git a/meta-oe/recipes-support/glog/glog_0.5.0.bb b/meta-oe/recipes-support/glog/glog_0.6.0.bb index 61581d96d7..1c8867f049 100644 --- a/meta-oe/recipes-support/glog/glog_0.5.0.bb +++ b/meta-oe/recipes-support/glog/glog_0.6.0.bb @@ -9,23 +9,27 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dc9db360e0bbd4e46672f3fd91dd6c4b" SRC_URI = " \ git://github.com/google/glog.git;nobranch=1;protocol=https \ file://libexecinfo.patch \ + file://0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch \ " -SRCREV = "8f9ccfe770add9e4c64e9b25c102658e3c763b73" +SRCREV = "b33e3bad4c46c8a6345525fd822af355e5ef9446" S = "${WORKDIR}/git" inherit cmake -PACKAGECONFIG ?= "shared unwind" +PACKAGECONFIG ?= "shared unwind 64bit-atomics" PACKAGECONFIG:remove:riscv64 = "unwind" -PACKAGECONFIG:remove:riscv32 = "unwind" +PACKAGECONFIG:remove:riscv32 = "unwind 64bit-atomics" +PACKAGECONFIG:remove:mipsarch = "64bit-atomics" + PACKAGECONFIG:append:libc-musl:riscv64 = " execinfo" PACKAGECONFIG:append:libc-musl:riscv32 = " execinfo" PACKAGECONFIG[unwind] = "-DWITH_UNWIND=ON,-DWITH_UNWIND=OFF,libunwind,libunwind" PACKAGECONFIG[execinfo] = ",,libexecinfo" PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF,," +PACKAGECONFIG[64bit-atomics] = ",-DCMAKE_CXX_STANDARD_LIBRARIES='-latomic',," do_configure:append() { # remove WORKDIR info to improve reproducibility @@ -33,3 +37,5 @@ do_configure:append() { sed -i 's/'$(echo ${WORKDIR} | sed 's_/_\\/_g')'/../g' ${B}/config.h fi } + +FILES:${PN}-dev += "${datadir}/${BPN}/cmake" diff --git a/meta-oe/recipes-support/gnulib/gnulib_2018-03-07.03.bb b/meta-oe/recipes-support/gnulib/gnulib_2018-12-18.bb index a27968079e..a27968079e 100644 --- a/meta-oe/recipes-support/gnulib/gnulib_2018-03-07.03.bb +++ b/meta-oe/recipes-support/gnulib/gnulib_2018-12-18.bb diff --git a/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.7.1.bb b/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.0.bb index 1a565636d5..209f51ea3d 100644 --- a/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.7.1.bb +++ b/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.0.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "git://github.com/google/benchmark.git;protocol=https;branch=main" -SRCREV = "d572f4777349d43653b21d6c2fc63020ab326db2" +SRCREV = "2dd015dfef425c866d9a43f2c67d8b52d709acb6" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/gosu/gosu_1.14.bb b/meta-oe/recipes-support/gosu/gosu_1.16.bb index 624adf3099..b209de16a4 100644 --- a/meta-oe/recipes-support/gosu/gosu_1.14.bb +++ b/meta-oe/recipes-support/gosu/gosu_1.16.bb @@ -8,10 +8,13 @@ GO_IMPORT = "github.com/tianon/gosu" SRC_URI = "git://${GO_IMPORT}.git;branch=master;protocol=https \ git://github.com/opencontainers/runc;name=runc;destsuffix=${S}/src/github.com/opencontainers/runc;branch=main;protocol=https \ " -SRCREV = "9f7cd138a1ebc0684d43ef6046bf723978e8741f" -SRCREV_runc = "d7f7b22a85a2387557bdcda125710c2506f8d5c5" +SRCREV = "0e7347714352cd7f2e5edc9d2cf838d9934e6036" +#v1.1.0 +SRCREV_runc = "067aaf8548d78269dcb2c13b856775e27c410f9c" inherit go +CGO_ENABLED = "1" + do_compile:prepend() { # New Go versions has Go modules support enabled by default export GO111MODULE=off diff --git a/meta-oe/recipes-support/gperftools/gperftools/ppc-musl.patch b/meta-oe/recipes-support/gperftools/gperftools/ppc-musl.patch index d06b6af229..3034e20176 100644 --- a/meta-oe/recipes-support/gperftools/gperftools/ppc-musl.patch +++ b/meta-oe/recipes-support/gperftools/gperftools/ppc-musl.patch @@ -4,6 +4,8 @@ Date: Sat, 13 Mar 2021 00:42:25 -0800 Subject: [PATCH] Compatibility fixes for musl. --- +Upstream-Status: Pending + m4/pc_from_ucontext.m4 | 4 +++- src/getpc.h | 3 +++ src/stacktrace_powerpc-linux-inl.h | 8 ++++++-- diff --git a/meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch b/meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch index 09a60127a4..5ef39ea33d 100644 --- a/meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch +++ b/meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch @@ -5,6 +5,8 @@ Subject: [PATCH] Makefile: Append instead of overriding LDFLAGS Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/gsoap/gsoap/0001-Simplify-check-for-gethostbyname_r.patch b/meta-oe/recipes-support/gsoap/gsoap/0001-Simplify-check-for-gethostbyname_r.patch new file mode 100644 index 0000000000..6ae02deb24 --- /dev/null +++ b/meta-oe/recipes-support/gsoap/gsoap/0001-Simplify-check-for-gethostbyname_r.patch @@ -0,0 +1,96 @@ +From fa923a50790c907725c822b2fc7d63b2da62b4ad Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 12 Mar 2023 13:34:55 -0700 +Subject: [PATCH] Simplify check for gethostbyname_r() + +This helps build fix with musl. + +Imported from Alpine: https://git.alpinelinux.org/aports/tree/community/gsoap/musl-fixes.patch + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + gsoap/stdsoap2.c | 6 ++---- + gsoap/stdsoap2.cpp | 10 ++-------- + 2 files changed, 4 insertions(+), 12 deletions(-) + +diff --git a/gsoap/stdsoap2.c b/gsoap/stdsoap2.c +index 654a1e1..fa31d02 100644 +--- a/gsoap/stdsoap2.c ++++ b/gsoap/stdsoap2.c +@@ -5463,7 +5463,7 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent, + hostent = NULL; + soap->errnum = h_errno; + } +-#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && defined(HAVE_GETHOSTBYNAME_R) ++#elif defined(HAVE_GETHOSTBYNAME_R) + while ((r = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &hostent, &soap->errnum)) < 0) + { + if (tmpbuf != soap->tmpbuf) +@@ -5478,8 +5478,6 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent, + if (!tmpbuf) + break; + } +-#elif defined(HAVE_GETHOSTBYNAME_R) +- hostent = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &soap->errnum); + #elif defined(VXWORKS) + /* vxWorks compatible */ + /* If the DNS resolver library resolvLib has been configured in the vxWorks +@@ -23112,7 +23110,7 @@ soap_strerror(struct soap *soap) + { + #ifndef WIN32 + # ifdef HAVE_STRERROR_R +-# if !defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) ++# if 1 + err = strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */ + if (err != 0) + soap_strcpy(soap->msgbuf, sizeof(soap->msgbuf), "unknown error"); +diff --git a/gsoap/stdsoap2.cpp b/gsoap/stdsoap2.cpp +index 654a1e1..5fd5fd6 100644 +--- a/gsoap/stdsoap2.cpp ++++ b/gsoap/stdsoap2.cpp +@@ -5430,7 +5430,7 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent, + { + #if (defined(_AIX43) || defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R) + struct hostent_data ht_data; +-#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && defined(HAVE_GETHOSTBYNAME_R) ++#elif defined(HAVE_GETHOSTBYNAME_R) + int r; + char *tmpbuf = soap->tmpbuf; + size_t tmplen = sizeof(soap->tmpbuf); +@@ -5463,7 +5463,7 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent, + hostent = NULL; + soap->errnum = h_errno; + } +-#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && defined(HAVE_GETHOSTBYNAME_R) ++#elif defined(HAVE_GETHOSTBYNAME_R) + while ((r = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &hostent, &soap->errnum)) < 0) + { + if (tmpbuf != soap->tmpbuf) +@@ -5478,8 +5478,6 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent, + if (!tmpbuf) + break; + } +-#elif defined(HAVE_GETHOSTBYNAME_R) +- hostent = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &soap->errnum); + #elif defined(VXWORKS) + /* vxWorks compatible */ + /* If the DNS resolver library resolvLib has been configured in the vxWorks +@@ -23112,13 +23110,9 @@ soap_strerror(struct soap *soap) + { + #ifndef WIN32 + # ifdef HAVE_STRERROR_R +-# if !defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) + err = strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */ + if (err != 0) + soap_strcpy(soap->msgbuf, sizeof(soap->msgbuf), "unknown error"); +-# else +- return strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* GNU-specific */ +-# endif + # else + return strerror(err); + # endif +-- +2.39.2 + diff --git a/meta-oe/recipes-support/gsoap/gsoap_2.8.106.bb b/meta-oe/recipes-support/gsoap/gsoap_2.8.126.bb index 15c0f6faf8..6d8b53d308 100644 --- a/meta-oe/recipes-support/gsoap/gsoap_2.8.106.bb +++ b/meta-oe/recipes-support/gsoap/gsoap_2.8.126.bb @@ -5,10 +5,9 @@ LICENSE = "GPL-2.0-with-OpenSSL-exception" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4f40a941379143186f9602242c3fb729 \ file://GPLv2_license.txt;md5=a33672dbe491b6517750a0389063508b" -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}2/${BPN}_${PV}.zip \ - " -SRC_URI[md5sum] = "0925d25bc455047b01d4fe9814d30173" -SRC_URI[sha256sum] = "4e74838baf5437e95ae17aa3efb48bd0621f483bff4424f6255fcf327ff80765" +SRC_URI = "https://prdownloads.sourceforge.net/${BPN}2/${BPN}_${PV}.zip" +SRC_URI:append:libc-musl = " file://0001-Simplify-check-for-gethostbyname_r.patch" +SRC_URI[sha256sum] = "b65190ebf8c2517d6fafbdc2000bc7bc650d921a02f4aa53eb1e3df267592c4a" inherit autotools @@ -16,6 +15,7 @@ BBCLASSEXTEND = "native" S = "${WORKDIR}/${BPN}-2.8" +EXTRA_OECONF += "--enable-ipv6 --enable-c-locale" PARALLEL_MAKE = "" EXTRA_OEMAKE:class-target = "SOAP=${STAGING_BINDIR_NATIVE}/soapcpp2" diff --git a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-0.3-beta15-autodetect-717479.patch b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-0.3-beta15-autodetect-717479.patch index 1ec6a61b31..1a541e32fd 100644 --- a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-0.3-beta15-autodetect-717479.patch +++ b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-0.3-beta15-autodetect-717479.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Auto-detect disks if none specified Refer to: diff --git a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-no-nls-support.patch b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-no-nls-support.patch index 8f6b9c3c4b..78de64c99d 100644 --- a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-no-nls-support.patch +++ b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-no-nls-support.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -ru hddtemp-0.3-beta15.orig/configure.in hddtemp-0.3-beta15/configure.in --- hddtemp-0.3-beta15.orig/configure.in 2005-10-17 20:14:19.000000000 +0100 +++ hddtemp-0.3-beta15/configure.in 2008-06-27 00:00:46.000000000 +0100 diff --git a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff index 057b1fd1d3..60953381a1 100644 --- a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff +++ b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff @@ -6,7 +6,7 @@ Filtered with: filterdiff -p1 -x README -x 'debian/*' -Upstream-Status: unmaintained +Upstream-Status: Inappropriate [unmaintained] Index: hddtemp-0.3-beta15/doc/hddtemp.8 =================================================================== diff --git a/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch b/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch index b896770d91..a8050cc55b 100644 --- a/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch +++ b/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch @@ -5,7 +5,7 @@ Subject: [PATCH] cmake: remove build flags Remove the build flags to improve reproducibility. -Upstream-Status: Inappropriate[oe specific] +Upstream-Status: Inappropriate [oe specific] Signed-off-by: Mingli Yu <mingli.yu@windriver.com> --- @@ -15,7 +15,7 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> --- a/config/cmake/libh5cc.in +++ b/config/cmake/libh5cc.in -@@ -45,7 +45,7 @@ for arg in $@ ; do +@@ -44,7 +44,7 @@ for arg in $@ ; do exit $status ;; *) @@ -45,8 +45,8 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> H5_CPPFLAGS: @H5_CPPFLAGS@ AM_CPPFLAGS: @AM_CPPFLAGS@ CFLAGS: @CMAKE_C_FLAGS@ -@@ -52,8 +52,8 @@ Languages: - @BUILD_FORTRAN_CONDITIONAL_TRUE@ Static Fortran Library: @H5_ENABLE_STATIC_LIB@ +@@ -53,8 +53,8 @@ Languages: + @BUILD_FORTRAN_CONDITIONAL_TRUE@ Module Directory: @CMAKE_Fortran_MODULE_DIRECTORY@ C++: @HDF5_BUILD_CPP_LIB@ -@BUILD_CXX_CONDITIONAL_TRUE@ C++ Compiler: @CMAKE_CXX_COMPILER@ @CMAKE_CXX_COMPILER_VERSION@ diff --git a/meta-oe/recipes-support/hdf5/files/0002-Remove-suffix-shared-from-shared-library-name.patch b/meta-oe/recipes-support/hdf5/files/0002-Remove-suffix-shared-from-shared-library-name.patch index de052451bd..f0eb05a1e7 100644 --- a/meta-oe/recipes-support/hdf5/files/0002-Remove-suffix-shared-from-shared-library-name.patch +++ b/meta-oe/recipes-support/hdf5/files/0002-Remove-suffix-shared-from-shared-library-name.patch @@ -12,7 +12,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -196,19 +196,19 @@ set (HDF5_HL_F90_C_LIB_TARGET "${HDF +@@ -191,19 +191,19 @@ set (HDF5_HL_F90_C_LIB_TARGET "${HDF set (HDF5_JAVA_JNI_LIB_TARGET "${HDF5_JAVA_JNI_LIB_CORENAME}") set (HDF5_JAVA_HDF5_LIB_TARGET "${HDF5_JAVA_HDF5_LIB_CORENAME}") set (HDF5_JAVA_TEST_LIB_TARGET "${HDF5_JAVA_TEST_LIB_CORENAME}") diff --git a/meta-oe/recipes-support/hdf5/hdf5_1.13.2.bb b/meta-oe/recipes-support/hdf5/hdf5_1.14.0.bb index 80611c6714..d0ff2ef487 100644 --- a/meta-oe/recipes-support/hdf5/hdf5_1.13.2.bb +++ b/meta-oe/recipes-support/hdf5/hdf5_1.14.0.bb @@ -7,16 +7,16 @@ SECTION = "libs" LICENSE = "HDF5" LIC_FILES_CHKSUM = "file://COPYING;md5=ac1039f6bf7c9ab2b3693836f46d0735" -inherit cmake siteinfo qemu +inherit cmake siteinfo qemu multilib_header DEPENDS += "qemu-native" SRC_URI = " \ - https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.13/hdf5-${PV}/src/${BPN}-${PV}.tar.bz2 \ + https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.14/hdf5-${PV}/src/${BPN}-${PV}.tar.bz2 \ file://0002-Remove-suffix-shared-from-shared-library-name.patch \ file://0001-cmake-remove-build-flags.patch \ " -SRC_URI[sha256sum] = "9c51b3da426977ec622a43dca8adaf4e81eabf838c1ff80c6225ad1d3ed54b5c" +SRC_URI[sha256sum] = "e4e79433450edae2865a4c6328188bb45391b29d74f8c538ee699f0b116c2ba0" FILES:${PN} += "${libdir}/libhdf5.settings ${datadir}/*" @@ -44,6 +44,7 @@ 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 } BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/hidapi/hidapi_0.13.1.bb b/meta-oe/recipes-support/hidapi/hidapi_0.14.0.bb index 2e62612e37..91e5b55bea 100644 --- a/meta-oe/recipes-support/hidapi/hidapi_0.13.1.bb +++ b/meta-oe/recipes-support/hidapi/hidapi_0.14.0.bb @@ -12,5 +12,5 @@ RDEPENDS:${PN}:append:libc-glibc = " glibc-gconv-utf-16" inherit autotools pkgconfig SRC_URI = "git://github.com/libusb/hidapi.git;protocol=https;branch=master" -SRCREV = "4ebce6b5059b086d05ca7e091ce04a5fd08ac3ac" +SRCREV = "d3013f0af3f4029d82872c1a9487ea461a56dee4" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/hstr/files/0001-Use-OE-specific-checks-for-ncurses.patch b/meta-oe/recipes-support/hstr/files/0001-Use-OE-specific-checks-for-ncurses.patch index d7eb558a9f..421d824ee0 100644 --- a/meta-oe/recipes-support/hstr/files/0001-Use-OE-specific-checks-for-ncurses.patch +++ b/meta-oe/recipes-support/hstr/files/0001-Use-OE-specific-checks-for-ncurses.patch @@ -3,7 +3,7 @@ From: Changqing Li <changqing.li@windriver.com> Date: Wed, 2 Mar 2022 06:22:15 +0000 Subject: [PATCH] Use OE-specific checks for ncurses -Upstream-Status: Inappropriate[oe specific] +Upstream-Status: Inappropriate [oe specific] Signed-off-by: Changqing Li <changqing.li@windriver.com> --- diff --git a/meta-oe/recipes-support/hstr/files/0001-configure.ac-Don-t-use-AC_CHECK_FILE.patch b/meta-oe/recipes-support/hstr/files/0001-configure.ac-Don-t-use-AC_CHECK_FILE.patch index e9b44c4c91..832d768ff3 100644 --- a/meta-oe/recipes-support/hstr/files/0001-configure.ac-Don-t-use-AC_CHECK_FILE.patch +++ b/meta-oe/recipes-support/hstr/files/0001-configure.ac-Don-t-use-AC_CHECK_FILE.patch @@ -7,7 +7,7 @@ AC_CHECK_FILE is not suitable for cross-compile, so remove it to fix configure error: cannot check for file existence when cross compiling -Upstream-Status: Inappropriate[oe specific] +Upstream-Status: Inappropriate [oe specific] Signed-off-by: Changqing Li <changqing.li@windriver.com> --- diff --git a/meta-oe/recipes-support/htop/htop_3.2.1.bb b/meta-oe/recipes-support/htop/htop_3.2.2.bb index 233a1eeb57..68d4a3f8f4 100644 --- a/meta-oe/recipes-support/htop/htop_3.2.1.bb +++ b/meta-oe/recipes-support/htop/htop_3.2.2.bb @@ -9,7 +9,7 @@ DEPENDS = "ncurses" SRC_URI = "git://github.com/htop-dev/htop.git;branch=main;protocol=https \ file://0001-Use-pkg-config.patch \ " -SRCREV = "4e6ec4a0873c56ca9de63eadf730c5bd677bd8da" +SRCREV = "55c10eccd71b6b016a50237bc8c8508b7bf66783" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/hunspell/hunspell_1.7.2.bb b/meta-oe/recipes-support/hunspell/hunspell_1.7.2.bb index 910bd4c158..afe75472a5 100644 --- a/meta-oe/recipes-support/hunspell/hunspell_1.7.2.bb +++ b/meta-oe/recipes-support/hunspell/hunspell_1.7.2.bb @@ -13,6 +13,9 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig gettext -RDEPENDS:${PN} = "perl" +# ispellaff2myspell: A program to convert ispell affix tables to myspell format +PACKAGES =+ "${PN}-ispell" +FILES:${PN}-ispell = "${bindir}/ispellaff2myspell" +RDEPENDS:${PN}-ispell = "perl" BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/hwdata/hwdata_0.366.bb b/meta-oe/recipes-support/hwdata/hwdata_0.370.bb index 4cab9b0fbe..56d4253772 100644 --- a/meta-oe/recipes-support/hwdata/hwdata_0.366.bb +++ b/meta-oe/recipes-support/hwdata/hwdata_0.370.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 = "2fa514ff86da425726dea8629bcf4ceac9d8e7ff" +SRCREV = "21cb47beb1716545b25dfe8ae1b9e079c73b85d9" SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb b/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb index d7c76a5971..2a0a129fee 100644 --- a/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb +++ b/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb @@ -10,7 +10,7 @@ DEPENDS = "libirecovery libimobiledevice libzip curl libimobiledevice-glue opens PV = "1.0.1+git${SRCPV}" -SRCREV = "7d622d916be16f2df5a72bf53a42f3a326bbfaa4" +SRCREV = "163a1647dedb7ca4656c0f072e4733573f9f982b" SRC_URI = "git://github.com/libimobiledevice/idevicerestore;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/imagemagick/imagemagick/0001-m4-Use-autconf-provided-AC_FUNC_FSEEKO.patch b/meta-oe/recipes-support/imagemagick/imagemagick/0001-m4-Use-autconf-provided-AC_FUNC_FSEEKO.patch new file mode 100644 index 0000000000..6b225a10cf --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/imagemagick/0001-m4-Use-autconf-provided-AC_FUNC_FSEEKO.patch @@ -0,0 +1,42 @@ +From 0912e49d58c2a5f455fabf76ab7dc61cfc44cfb9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 30 Mar 2023 20:50:26 -0700 +Subject: [PATCH] m4: Use autconf provided AC_FUNC_FSEEKO + +This helps in building with autoconf 2.72 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + m4/ac_func_fseeko.m4 | 18 +----------------- + 1 file changed, 1 insertion(+), 17 deletions(-) + +diff --git a/m4/ac_func_fseeko.m4 b/m4/ac_func_fseeko.m4 +index eaeabb978..f9b8859cf 100644 +--- a/m4/ac_func_fseeko.m4 ++++ b/m4/ac_func_fseeko.m4 +@@ -53,20 +53,4 @@ + # -------------- + AN_FUNCTION([ftello], [AC_FUNC_FSEEKO]) + AN_FUNCTION([fseeko], [AC_FUNC_FSEEKO]) +-AC_DEFUN([AC_FUNC_FSEEKO], +-[_AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1, +- [ac_cv_sys_largefile_source], +- [Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2).], +- [[#include <sys/types.h> /* for off_t */ +- #include <stdio.h>]], +- [[int (*fp) (FILE *, off_t, int) = fseeko; +- return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);]]) +- +-# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug +-# in glibc 2.1.3, but that breaks too many other things. +-# If you want fseeko and ftello with glibc, upgrade to a fixed glibc. +-if test $ac_cv_sys_largefile_source != unknown; then +- AC_DEFINE(HAVE_FSEEKO, 1, +- [Define to 1 if fseeko (and presumably ftello) exists and is declared.]) +-fi +-])# AC_FUNC_FSEEKO ++AC_FUNC_FSEEKO +-- +2.40.0 + diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb index b6344a381f..e59b511a72 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb @@ -4,25 +4,25 @@ HOMEPAGE = "https://www.imagemagick.org/" DESCRIPTION = "ImageMagick is a collection of tools for displaying, converting, and \ editing raster and vector image files. It can read and write over 200 image file formats." LICENSE = "ImageMagick" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b97c12a9213df1499565d69b92c73dd7 \ - file://NOTICE;md5=d8b9d2ccf273687ad12ebd06e5d8478f" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ac58ac14f9d9d02cafd2d81ef38fb2cc \ + file://NOTICE;md5=bcbf1f1897b40ec8df39700cb560e9ed" # FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results. DEPENDS = "lcms bzip2 jpeg libpng tiff zlib fftw freetype libtool" BASE_PV := "${PV}" -PV .= "-62" -SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=https" -SRCREV = "35b4991eb0939a327f3489988c366e21068b0178" +PV .= "-8" +SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=https \ + file://0001-m4-Use-autconf-provided-AC_FUNC_FSEEKO.patch" +SRCREV = "920f79206ff59f30a4cff22c9c9c393508b82663" S = "${WORKDIR}/git" inherit autotools pkgconfig update-alternatives +export ac_cv_sys_file_offset_bits="64" -# xml disabled because it's using xml2-config --prefix to determine prefix which returns just /usr with our libxml2 -# if someone needs xml support then fix it first -EXTRA_OECONF = "--program-prefix= --program-suffix=.im7 --without-perl --disable-openmp --without-xml --disable-opencl" +EXTRA_OECONF = "--program-prefix= --program-suffix=.im7 --without-perl --enable-largefile" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} cxx webp xml" PACKAGECONFIG[cxx] = "--with-magick-plus-plus,--without-magick-plus-plus" PACKAGECONFIG[graphviz] = "--with-gvc,--without-gvc,graphviz" PACKAGECONFIG[jp2] = "--with-jp2,,jasper" @@ -34,6 +34,17 @@ PACKAGECONFIG[tcmalloc] = "--with-tcmalloc=yes,--with-tcmalloc=no,gperftools" PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp" PACKAGECONFIG[wmf] = "--with-wmf,--without-wmf,libwmf" PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxt" +PACKAGECONFIG[xml] = "--with-xml,--without-xml,libxml2" + +do_install:append:class-target() { + for file in MagickCore-config.im7 MagickWand-config.im7 Magick++-config.im7; do + sed -i 's,${STAGING_DIR_NATIVE},,g' ${D}${bindir}/"$file" + done + sed -i 's,${S},,g' ${D}${libdir}/ImageMagick-${BASE_PV}/config-Q16HDRI/configure.xml + sed -i 's,${B},,g' ${D}${libdir}/ImageMagick-${BASE_PV}/config-Q16HDRI/configure.xml + sed -i 's,${RECIPE_SYSROOT},,g' ${D}${libdir}/ImageMagick-${BASE_PV}/config-Q16HDRI/configure.xml + sed -i 's,${HOSTTOOLS_DIR},${bindir},g' ${D}${sysconfdir}/ImageMagick-7/delegates.xml +} FILES:${PN} += "${libdir}/ImageMagick-${BASE_PV}/config-Q16* \ ${datadir}/ImageMagick-7" diff --git a/meta-oe/recipes-support/inih/files/0001-include-install-header-files-without-prefix-dir-inih.patch b/meta-oe/recipes-support/inih/files/0001-include-install-header-files-without-prefix-dir-inih.patch deleted file mode 100644 index fb7b85cfd4..0000000000 --- a/meta-oe/recipes-support/inih/files/0001-include-install-header-files-without-prefix-dir-inih.patch +++ /dev/null @@ -1,24 +0,0 @@ -include: install header files without prefix dir inih - -The other flavor of inih which adapted by Fedora and Ubuntu installs -header files to /usr/include directly. And xfsprogs 5.10.0 also checks -ini.h without extra search path and fails. So install header files -without prefix dir inih. - -Upstream-Status: Submitted [https://github.com/OSSystems/inih/pull/4] - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- - include/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt -index 7a46ee7..4a9033f 100644 ---- a/include/CMakeLists.txt -+++ b/include/CMakeLists.txt -@@ -1 +1 @@ --install(FILES ini.h INIReader.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/inih) -+install(FILES ini.h INIReader.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include) --- -2.17.1 - diff --git a/meta-oe/recipes-support/inih/libinih_56.bb b/meta-oe/recipes-support/inih/libinih_57.bb index 89d68c6e16..08957e18fb 100644 --- a/meta-oe/recipes-support/inih/libinih_56.bb +++ b/meta-oe/recipes-support/inih/libinih_57.bb @@ -9,6 +9,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a7a95d2af90376e85a05318794e6f202" SRC_URI = "git://github.com/benhoyt/inih.git;protocol=https;branch=master" S = "${WORKDIR}/git" -SRCREV = "5e1d9e2625842dddb3f9c086a50f22e4f45dfc2b" +SRCREV = "9cecf0643da0846e77f64d10a126d9f48b9e05e8" inherit meson pkgconfig diff --git a/meta-oe/recipes-support/iniparser/iniparser/Add-CMake-support.patch b/meta-oe/recipes-support/iniparser/iniparser/Add-CMake-support.patch index b666f00f70..46c1b0f7ac 100644 --- a/meta-oe/recipes-support/iniparser/iniparser/Add-CMake-support.patch +++ b/meta-oe/recipes-support/iniparser/iniparser/Add-CMake-support.patch @@ -4,6 +4,8 @@ Date: Thu, 13 Feb 2014 07:03:26 -0500 Subject: Add CMake support. --- +Upstream-Status: Pending + CMakeLists.txt | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 CMakeLists.txt diff --git a/meta-oe/recipes-support/lcms/lcms_2.14.bb b/meta-oe/recipes-support/lcms/lcms_2.15.bb index eb671449fd..3656e1cfdc 100644 --- a/meta-oe/recipes-support/lcms/lcms_2.14.bb +++ b/meta-oe/recipes-support/lcms/lcms_2.15.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=ac638b4bc6b67582a11379cfbaeb93dd" SRC_URI = "${SOURCEFORGE_MIRROR}/lcms/lcms2-${PV}.tar.gz" -SRC_URI[sha256sum] = "28474ea6f6591c4d4cee972123587001a4e6e353412a41b3e9e82219818d5740" +SRC_URI[sha256sum] = "b20cbcbd0f503433be2a4e81462106fa61050a35074dc24a4e356792d971ab39" DEPENDS = "tiff" diff --git a/meta-oe/recipes-support/lcov/files/0001-geninfo-Add-intermediate-text-format-support.patch b/meta-oe/recipes-support/lcov/files/0001-geninfo-Add-intermediate-text-format-support.patch deleted file mode 100644 index 9ac0770f96..0000000000 --- a/meta-oe/recipes-support/lcov/files/0001-geninfo-Add-intermediate-text-format-support.patch +++ /dev/null @@ -1,898 +0,0 @@ -From ec3e1f411c332cbc2f2bc7ab7e2175ebf918b37a Mon Sep 17 00:00:00 2001 -From: Peter Oberparleiter <oberpar@linux.ibm.com> -Date: Fri, 24 May 2019 16:56:52 +0200 -Subject: [PATCH 1/2] geninfo: Add intermediate text format support - -This change adds support for parsing the output of gcov's intermediate -text file format as implemented by GCC versions 5 to 8. The use of the -gcov intermediate format should increase processing speed. It also -provides branch coverage data when using the --initial command line -option. - -Users can control whether geninfo uses the intermediate format via the -geninfo_intermediate configuration file option. Valid values are: - - 0: Use normal text format - 1: Use intermediate format - auto: Use intermediate format if available. This is the default. - -Signed-off-by: Peter Oberparleiter <oberpar@linux.ibm.com> ---- - bin/geninfo | 567 ++++++++++++++++++++++++++++++++++++++++++++------- - lcovrc | 3 + - man/lcovrc.5 | 24 +++ - 3 files changed, 521 insertions(+), 73 deletions(-) - -Upstream-Status: Backport -Download URL: https://github.com/linux-test-project/lcov/commit/ebfeb3e179e450c69c3532f98cd5ea1fbf6ccba7 - -diff --git a/bin/geninfo b/bin/geninfo -index f41eaec..0276666 100755 ---- a/bin/geninfo -+++ b/bin/geninfo -@@ -54,6 +54,8 @@ use warnings; - use File::Basename; - use File::Spec::Functions qw /abs2rel catdir file_name_is_absolute splitdir - splitpath catpath/; -+use File::Temp qw(tempfile tempdir); -+use File::Copy qw(copy); - use Getopt::Long; - use Digest::MD5 qw(md5_base64); - use Cwd qw/abs_path/; -@@ -163,13 +165,13 @@ sub solve_relative_path($$); - sub read_gcov_header($); - sub read_gcov_file($); - sub info(@); -+sub process_intermediate($$$); - sub map_llvm_version($); - sub version_to_str($); - sub get_gcov_version(); - sub system_no_output($@); - sub read_config($); - sub apply_config($); --sub get_exclusion_data($); - sub apply_exclusion_data($$); - sub process_graphfile($$); - sub filter_fn_name($); -@@ -264,6 +266,8 @@ our $gcno_split_crc; - our $func_coverage = 1; - our $br_coverage = 0; - our $rc_auto_base = 1; -+our $rc_intermediate = "auto"; -+our $intermediate; - our $excl_line = "LCOV_EXCL_LINE"; - our $excl_br_line = "LCOV_EXCL_BR_LINE"; - -@@ -331,6 +335,7 @@ if ($config || %opt_rc) - "geninfo_compat" => \$opt_compat, - "geninfo_adjust_src_path" => \$rc_adjust_src_path, - "geninfo_auto_base" => \$rc_auto_base, -+ "geninfo_intermediate" => \$rc_intermediate, - "lcov_function_coverage" => \$func_coverage, - "lcov_branch_coverage" => \$br_coverage, - "lcov_excl_line" => \$excl_line, -@@ -460,15 +465,38 @@ if (system_no_output(3, $gcov_tool, "--help") == -1) - } - - ($gcov_version, $gcov_version_string) = get_gcov_version(); -+$gcov_caps = get_gcov_capabilities(); -+ -+# Determine intermediate mode -+if ($rc_intermediate eq "0") { -+ $intermediate = 0; -+} elsif ($rc_intermediate eq "1") { -+ $intermediate = 1; -+} elsif (lc($rc_intermediate) eq "auto") { -+ # Use intermediate format if supported by gcov -+ $intermediate = $gcov_caps->{'intermediate-format'} ? 1 : 0; -+} else { -+ die("ERROR: invalid value for geninfo_intermediate: ". -+ "'$rc_intermediate'\n"); -+} -+ -+if ($intermediate) { -+ info("Using intermediate gcov format\n"); -+ if ($opt_derive_func_data) { -+ warn("WARNING: --derive-func-data is not compatible with ". -+ "intermediate format - ignoring\n"); -+ $opt_derive_func_data = 0; -+ } -+} - - # Determine gcov options --$gcov_caps = get_gcov_capabilities(); - push(@gcov_options, "-b") if ($gcov_caps->{'branch-probabilities'} && - ($br_coverage || $func_coverage)); - push(@gcov_options, "-c") if ($gcov_caps->{'branch-counts'} && - $br_coverage); - push(@gcov_options, "-a") if ($gcov_caps->{'all-blocks'} && -- $opt_gcov_all_blocks && $br_coverage); -+ $opt_gcov_all_blocks && $br_coverage && -+ !$intermediate); - if ($gcov_caps->{'hash-filenames'}) - { - push(@gcov_options, "-x"); -@@ -599,7 +627,7 @@ foreach my $entry (@data_directory) { - gen_info($entry); - } - --if ($initial && $br_coverage) { -+if ($initial && $br_coverage && !$intermediate) { - warn("Note: --initial does not generate branch coverage ". - "data\n"); - } -@@ -768,6 +796,7 @@ sub gen_info($) - my $prefix; - my $type; - my $ext; -+ my $tempdir; - - if ($initial) { - $type = "graph"; -@@ -798,16 +827,22 @@ sub gen_info($) - $prefix = ""; - } - -+ $tempdir = tempdir(CLEANUP => 1); -+ - # Process all files in list - foreach $file (@file_list) { - # Process file -- if ($initial) { -+ if ($intermediate) { -+ process_intermediate($file, $prefix, $tempdir); -+ } elsif ($initial) { - process_graphfile($file, $prefix); - } else { - process_dafile($file, $prefix); - } - } - -+ unlink($tempdir); -+ - # Report whether files were excluded. - if (%excluded_files) { - info("Excluded data for %d files due to include/exclude options\n", -@@ -1058,10 +1093,12 @@ sub process_dafile($$) - - # Try to find base directory automatically if requested by user - if ($rc_auto_base) { -- $base_dir = find_base_from_graph($base_dir, $instr, $graph); -+ $base_dir = find_base_from_source($base_dir, -+ [ keys(%{$instr}), keys(%{$graph}) ]); - } - -- ($instr, $graph) = adjust_graph_filenames($base_dir, $instr, $graph); -+ adjust_source_filenames($instr, $base_dir); -+ adjust_source_filenames($graph, $base_dir); - - # Set $object_dir to real location of object files. This may differ - # from $da_dir if the graph file is just a link to the "real" object -@@ -2017,6 +2054,299 @@ sub read_gcov_file($) - } - - -+# -+# read_intermediate_text(gcov_filename, data) -+# -+# Read gcov intermediate text format in GCOV_FILENAME and add the resulting -+# data to DATA in the following format: -+# -+# data: source_filename -> file_data -+# file_data: concatenated lines of intermediate text data -+# -+ -+sub read_intermediate_text($$) -+{ -+ my ($gcov_filename, $data) = @_; -+ my $fd; -+ my $filename; -+ -+ open($fd, "<", $gcov_filename) or -+ die("ERROR: Could not read $gcov_filename: $!\n"); -+ while (my $line = <$fd>) { -+ if ($line =~ /^file:(.*)$/) { -+ $filename = $1; -+ chomp($filename); -+ } elsif (defined($filename)) { -+ $data->{$filename} .= $line; -+ } -+ } -+ close($fd); -+} -+ -+ -+# -+# intermediate_text_to_info(fd, data, srcdata) -+# -+# Write DATA in info format to file descriptor FD. -+# -+# data: filename -> file_data: -+# file_data: concatenated lines of intermediate text data -+# -+# srcdata: filename -> [ excl, brexcl, checksums ] -+# excl: lineno -> 1 for all lines for which to exclude all data -+# brexcl: lineno -> 1 for all lines for which to exclude branch data -+# checksums: lineno -> source code checksum -+# -+# Note: To simplify processing, gcov data is not combined here, that is counts -+# that appear multiple times for the same lines/branches are not added. -+# This is done by lcov/genhtml when reading the data files. -+# -+ -+sub intermediate_text_to_info($$$) -+{ -+ my ($fd, $data, $srcdata) = @_; -+ my $branch_num = 0; -+ my $c; -+ -+ return if (!%{$data}); -+ -+ print($fd "TN:$test_name\n"); -+ for my $filename (keys(%{$data})) { -+ my ($excl, $brexcl, $checksums); -+ -+ if (defined($srcdata->{$filename})) { -+ ($excl, $brexcl, $checksums) = @{$srcdata->{$filename}}; -+ } -+ -+ print($fd "SF:$filename\n"); -+ for my $line (split(/\n/, $data->{$filename})) { -+ if ($line =~ /^lcount:(\d+),(\d+),?/) { -+ # lcount:<line>,<count> -+ # lcount:<line>,<count>,<has_unexecuted_blocks> -+ if ($checksum && exists($checksums->{$1})) { -+ $c = ",".$checksums->{$1}; -+ } else { -+ $c = ""; -+ } -+ print($fd "DA:$1,$2$c\n") if (!$excl->{$1}); -+ -+ # Intermediate text format does not provide -+ # branch numbers, and the same branch may appear -+ # multiple times on the same line (e.g. in -+ # template instances). Synthesize a branch -+ # number based on the assumptions: -+ # a) the order of branches is fixed across -+ # instances -+ # b) an instance starts with an lcount line -+ $branch_num = 0; -+ } elsif ($line =~ /^function:(\d+),(\d+),([^,]+)$/) { -+ next if (!$func_coverage || $excl->{$1}); -+ -+ # function:<line>,<count>,<name> -+ print($fd "FN:$1,$3\n"); -+ print($fd "FNDA:$2,$3\n"); -+ } elsif ($line =~ /^function:(\d+),\d+,(\d+),([^,]+)$/) { -+ next if (!$func_coverage || $excl->{$1}); -+ -+ # function:<start_line>,<end_line>,<count>, -+ # <name> -+ print($fd "FN:$1,$3\n"); -+ print($fd "FNDA:$2,$3\n"); -+ } elsif ($line =~ /^branch:(\d+),(taken|nottaken|notexec)/) { -+ next if (!$br_coverage || $excl->{$1} || -+ $brexcl->{$1}); -+ -+ # branch:<line>,taken|nottaken|notexec -+ if ($2 eq "taken") { -+ $c = 1; -+ } elsif ($2 eq "nottaken") { -+ $c = 0; -+ } else { -+ $c = "-"; -+ } -+ print($fd "BRDA:$1,0,$branch_num,$c\n"); -+ $branch_num++; -+ } -+ } -+ print($fd "end_of_record\n"); -+ } -+} -+ -+ -+sub get_output_fd($$) -+{ -+ my ($outfile, $file) = @_; -+ my $fd; -+ -+ if (!defined($outfile)) { -+ open($fd, ">", "$file.info") or -+ die("ERROR: Cannot create file $file.info: $!\n"); -+ } elsif ($outfile eq "-") { -+ open($fd, ">&STDOUT") or -+ die("ERROR: Cannot duplicate stdout: $!\n"); -+ } else { -+ open($fd, ">>", $outfile) or -+ die("ERROR: Cannot write to file $outfile: $!\n"); -+ } -+ -+ return $fd; -+} -+ -+ -+# -+# print_gcov_warnings(stderr_file, is_graph, map) -+# -+# Print GCOV warnings in file STDERR_FILE to STDERR. If IS_GRAPH is non-zero, -+# suppress warnings about missing as these are expected. Replace keys found -+# in MAP with their values. -+# -+ -+sub print_gcov_warnings($$$) -+{ -+ my ($stderr_file, $is_graph, $map) = @_; -+ my $fd; -+ -+ if (!open($fd, "<", $stderr_file)) { -+ warn("WARNING: Could not open GCOV stderr file ". -+ "$stderr_file: $!\n"); -+ return; -+ } -+ while (my $line = <$fd>) { -+ next if ($is_graph && $line =~ /cannot open data file/); -+ -+ for my $key (keys(%{$map})) { -+ $line =~ s/\Q$key\E/$map->{$key}/g; -+ } -+ -+ print(STDERR $line); -+ } -+ close($fd); -+} -+ -+ -+# -+# process_intermediate(file, dir, tempdir) -+# -+# Create output for a single file (either a data file or a graph file) using -+# gcov's intermediate option. -+# -+ -+sub process_intermediate($$$) -+{ -+ my ($file, $dir, $tempdir) = @_; -+ my ($fdir, $fbase, $fext); -+ my $data_file; -+ my $errmsg; -+ my %data; -+ my $fd; -+ my $base; -+ my $srcdata; -+ my $is_graph = 0; -+ my ($out, $err, $rc); -+ -+ info("Processing %s\n", abs2rel($file, $dir)); -+ -+ $file = solve_relative_path($cwd, $file); -+ ($fdir, $fbase, $fext) = split_filename($file); -+ -+ $is_graph = 1 if (".$fext" eq $graph_file_extension); -+ -+ if ($is_graph) { -+ # Process graph file - copy to temp directory to prevent -+ # accidental processing of associated data file -+ $data_file = "$tempdir/$fbase$graph_file_extension"; -+ if (!copy($file, $data_file)) { -+ $errmsg = "ERROR: Could not copy file $file"; -+ goto err; -+ } -+ } else { -+ # Process data file in place -+ $data_file = $file; -+ } -+ -+ # Change directory -+ if (!chdir($tempdir)) { -+ $errmsg = "Could not change to directory $tempdir: $!"; -+ goto err; -+ } -+ -+ # Run gcov on data file -+ ($out, $err, $rc) = system_no_output(1 + 2 + 4, $gcov_tool, -+ $data_file, @gcov_options, "-i"); -+ defined($out) && unlink($out); -+ if (defined($err)) { -+ print_gcov_warnings($err, $is_graph, { -+ $data_file => $file, -+ }); -+ unlink($err); -+ } -+ if ($rc) { -+ $errmsg = "GCOV failed for $file"; -+ goto err; -+ } -+ -+ if ($is_graph) { -+ # Remove graph file copy -+ unlink($data_file); -+ } -+ -+ # Parse resulting file(s) -+ for my $gcov_filename (glob("*.gcov")) { -+ read_intermediate_text($gcov_filename, \%data); -+ unlink($gcov_filename); -+ } -+ -+ if (!%data) { -+ warn("WARNING: GCOV did not produce any data for $file\n"); -+ return; -+ } -+ -+ # Determine base directory -+ if (defined($base_directory)) { -+ $base = $base_directory; -+ } else { -+ $base = $fdir; -+ -+ if (is_compat($COMPAT_MODE_LIBTOOL)) { -+ # Avoid files from .libs dirs -+ $base =~ s/\.libs$//; -+ } -+ -+ # Try to find base directory automatically if requested by user -+ if ($rc_auto_base) { -+ $base = find_base_from_source($base, [ keys(%data) ]); -+ } -+ } -+ -+ # Apply base file name to relative source files -+ adjust_source_filenames(\%data, $base); -+ -+ # Remove excluded source files -+ filter_source_files(\%data); -+ -+ # Get data on exclusion markers and checksums if requested -+ if (!$no_markers || $checksum) { -+ $srcdata = get_all_source_data(keys(%data)); -+ } -+ -+ # Generate output -+ $fd = get_output_fd($output_filename, $file); -+ intermediate_text_to_info($fd, \%data, $srcdata); -+ close($fd); -+ -+ chdir($cwd); -+ -+ return; -+ -+err: -+ if ($ignore[$ERROR_GCOV]) { -+ warn("WARNING: $errmsg!\n"); -+ } else { -+ die("ERROR: $errmsg!\n") -+ } -+} -+ -+ - # Map LLVM versions to the version of GCC gcov which they emulate. - - sub map_llvm_version($) -@@ -2151,8 +2481,12 @@ sub int_handler() - # - # MODE & 1: suppress STDOUT - # MODE & 2: suppress STDERR -+# MODE & 4: redirect to temporary files instead of suppressing - # --# Return 0 on success, non-zero otherwise. -+# Return (stdout, stderr, rc): -+# stdout: path to tempfile containing stdout or undef -+# stderr: path to tempfile containing stderr or undef -+# 0 on success, non-zero otherwise - # - - sub system_no_output($@) -@@ -2161,14 +2495,31 @@ sub system_no_output($@) - my $result; - local *OLD_STDERR; - local *OLD_STDOUT; -+ my $stdout_file; -+ my $stderr_file; -+ my $fd; - - # Save old stdout and stderr handles - ($mode & 1) && open(OLD_STDOUT, ">>&", "STDOUT"); - ($mode & 2) && open(OLD_STDERR, ">>&", "STDERR"); - -- # Redirect to /dev/null -- ($mode & 1) && open(STDOUT, ">", "/dev/null"); -- ($mode & 2) && open(STDERR, ">", "/dev/null"); -+ if ($mode & 4) { -+ # Redirect to temporary files -+ if ($mode & 1) { -+ ($fd, $stdout_file) = tempfile(UNLINK => 1); -+ open(STDOUT, ">", $stdout_file) || warn("$!\n"); -+ close($fd); -+ } -+ if ($mode & 2) { -+ ($fd, $stderr_file) = tempfile(UNLINK => 1); -+ open(STDERR, ">", $stderr_file) || warn("$!\n"); -+ close($fd); -+ } -+ } else { -+ # Redirect to /dev/null -+ ($mode & 1) && open(STDOUT, ">", "/dev/null"); -+ ($mode & 2) && open(STDERR, ">", "/dev/null"); -+ } - - debug("system(".join(' ', @_).")\n"); - system(@_); -@@ -2181,8 +2532,18 @@ sub system_no_output($@) - # Restore old handles - ($mode & 1) && open(STDOUT, ">>&", "OLD_STDOUT"); - ($mode & 2) && open(STDERR, ">>&", "OLD_STDERR"); -+ -+ # Remove empty output files -+ if (defined($stdout_file) && -z $stdout_file) { -+ unlink($stdout_file); -+ $stdout_file = undef; -+ } -+ if (defined($stderr_file) && -z $stderr_file) { -+ unlink($stderr_file); -+ $stderr_file = undef; -+ } - -- return $result; -+ return ($stdout_file, $stderr_file, $result); - } - - -@@ -2260,23 +2621,28 @@ sub apply_config($) - - - # --# get_exclusion_data(filename) -+# get_source_data(filename) - # --# Scan specified source code file for exclusion markers and return --# linenumber -> 1 --# for all lines which should be excluded. -+# Scan specified source code file for exclusion markers and checksums. Return -+# ( excl, brexcl, checksums ) where -+# excl: lineno -> 1 for all lines for which to exclude all data -+# brexcl: lineno -> 1 for all lines for which to exclude branch data -+# checksums: lineno -> source code checksum - # - --sub get_exclusion_data($) -+sub get_source_data($) - { - my ($filename) = @_; - my %list; - my $flag = 0; -+ my %brdata; -+ my $brflag = 0; -+ my %checksums; - local *HANDLE; - - if (!open(HANDLE, "<", $filename)) { - warn("WARNING: could not open $filename\n"); -- return undef; -+ return; - } - while (<HANDLE>) { - if (/$EXCL_STOP/) { -@@ -2287,14 +2653,62 @@ sub get_exclusion_data($) - if (/$excl_line/ || $flag) { - $list{$.} = 1; - } -+ if (/$EXCL_BR_STOP/) { -+ $brflag = 0; -+ } elsif (/$EXCL_BR_START/) { -+ $brflag = 1; -+ } -+ if (/$excl_br_line/ || $brflag) { -+ $brdata{$.} = 1; -+ } -+ if ($checksum) { -+ chomp(); -+ $checksums{$.} = md5_base64($_); -+ } - } - close(HANDLE); - -- if ($flag) { -+ if ($flag || $brflag) { - warn("WARNING: unterminated exclusion section in $filename\n"); - } - -- return \%list; -+ return (\%list, \%brdata, \%checksums); -+} -+ -+ -+# -+# get_all_source_data(filenames) -+# -+# Scan specified source code files for exclusion markers and return -+# filename -> [ excl, brexcl, checksums ] -+# excl: lineno -> 1 for all lines for which to exclude all data -+# brexcl: lineno -> 1 for all lines for which to exclude branch data -+# checksums: lineno -> source code checksum -+# -+ -+sub get_all_source_data(@) -+{ -+ my @filenames = @_; -+ my %data; -+ my $failed = 0; -+ -+ for my $filename (@filenames) { -+ my @d; -+ next if (exists($data{$filename})); -+ -+ @d = get_source_data($filename); -+ if (@d) { -+ $data{$filename} = [ @d ]; -+ } else { -+ $failed = 1; -+ } -+ } -+ -+ if ($failed) { -+ warn("WARNING: some exclusion markers may be ignored\n"); -+ } -+ -+ return \%data; - } - - -@@ -2318,35 +2732,17 @@ sub apply_exclusion_data($$) - { - my ($instr, $graph) = @_; - my $filename; -- my %excl_data; -- my $excl_read_failed = 0; -+ my $excl_data; - -- # Collect exclusion marker data -- foreach $filename (sort_uniq_lex(keys(%{$graph}), keys(%{$instr}))) { -- my $excl = get_exclusion_data($filename); -- -- # Skip and note if file could not be read -- if (!defined($excl)) { -- $excl_read_failed = 1; -- next; -- } -- -- # Add to collection if there are markers -- $excl_data{$filename} = $excl if (keys(%{$excl}) > 0); -- } -- -- # Warn if not all source files could be read -- if ($excl_read_failed) { -- warn("WARNING: some exclusion markers may be ignored\n"); -- } -+ ($excl_data) = get_all_source_data(keys(%{$graph}), keys(%{$instr})); - - # Skip if no markers were found -- return ($instr, $graph) if (keys(%excl_data) == 0); -+ return ($instr, $graph) if (!%$excl_data); - - # Apply exclusion marker data to graph -- foreach $filename (keys(%excl_data)) { -+ foreach $filename (keys(%$excl_data)) { - my $function_data = $graph->{$filename}; -- my $excl = $excl_data{$filename}; -+ my $excl = $excl_data->{$filename}->[0]; - my $function; - - next if (!defined($function_data)); -@@ -2384,9 +2780,9 @@ sub apply_exclusion_data($$) - } - - # Apply exclusion marker data to instr -- foreach $filename (keys(%excl_data)) { -+ foreach $filename (keys(%$excl_data)) { - my $line_data = $instr->{$filename}; -- my $excl = $excl_data{$filename}; -+ my $excl = $excl_data->{$filename}->[0]; - my $line; - my @new_data; - -@@ -2468,10 +2864,12 @@ sub process_graphfile($$) - - # Try to find base directory automatically if requested by user - if ($rc_auto_base) { -- $base_dir = find_base_from_graph($base_dir, $instr, $graph); -+ $base_dir = find_base_from_source($base_dir, -+ [ keys(%{$instr}), keys(%{$graph}) ]); - } - -- ($instr, $graph) = adjust_graph_filenames($base_dir, $instr, $graph); -+ adjust_source_filenames($instr, $base_dir); -+ adjust_source_filenames($graph, $base_dir); - - if (!$no_markers) { - # Apply exclusion marker data to graph file data -@@ -2767,11 +3165,11 @@ sub parent_dir($) - } - - # --# find_base_from_graph(base_dir, instr, graph) -+# find_base_from_source(base_dir, source_files) - # --# Try to determine the base directory of the graph file specified by INSTR --# and GRAPH. The base directory is the base for all relative filenames in --# the graph file. It is defined by the current working directory at time -+# Try to determine the base directory of the object file built from -+# SOURCE_FILES. The base directory is the base for all relative filenames in -+# the gcov data. It is defined by the current working directory at time - # of compiling the source file. - # - # This function implements a heuristic which relies on the following -@@ -2781,16 +3179,16 @@ sub parent_dir($) - # - files by the same name are not present in multiple parent directories - # - --sub find_base_from_graph($$$) -+sub find_base_from_source($$) - { -- my ($base_dir, $instr, $graph) = @_; -+ my ($base_dir, $source_files) = @_; - my $old_base; - my $best_miss; - my $best_base; - my %rel_files; - - # Determine list of relative paths -- foreach my $filename (keys(%{$instr}), keys(%{$graph})) { -+ foreach my $filename (@$source_files) { - next if (file_name_is_absolute($filename)); - - $rel_files{$filename} = 1; -@@ -2829,17 +3227,17 @@ sub find_base_from_graph($$$) - } - - # --# adjust_graph_filenames(base_dir, instr, graph) -+# adjust_source_filenames(hash, base_dir) - # --# Make relative paths in INSTR and GRAPH absolute and apply --# geninfo_adjust_src_path setting to graph file data. -+# Transform all keys of HASH to absolute form and apply requested -+# transformations. - # - --sub adjust_graph_filenames($$$) -+sub adjust_source_filenames($$$) - { -- my ($base_dir, $instr, $graph) = @_; -+ my ($hash, $base_dir) = @_; - -- foreach my $filename (keys(%{$instr})) { -+ foreach my $filename (keys(%{$hash})) { - my $old_filename = $filename; - - # Convert to absolute canonical form -@@ -2851,28 +3249,50 @@ sub adjust_graph_filenames($$$) - } - - if ($filename ne $old_filename) { -- $instr->{$filename} = delete($instr->{$old_filename}); -+ $hash->{$filename} = delete($hash->{$old_filename}); - } - } -+} - -- foreach my $filename (keys(%{$graph})) { -- my $old_filename = $filename; - -- # Make absolute -- # Convert to absolute canonical form -- $filename = solve_relative_path($base_dir, $filename); -+# -+# filter_source_files(hash) -+# -+# Remove unwanted source file data from HASH. -+# - -- # Apply adjustment -- if (defined($adjust_src_pattern)) { -- $filename =~ s/$adjust_src_pattern/$adjust_src_replace/g; -+sub filter_source_files($) -+{ -+ my ($hash) = @_; -+ -+ foreach my $filename (keys(%{$hash})) { -+ # Skip external files if requested -+ goto del if (!$opt_external && is_external($filename)); -+ -+ # Apply include patterns -+ if (@include_patterns) { -+ my $keep; -+ -+ foreach my $pattern (@include_patterns) { -+ if ($filename =~ (/^$pattern$/)) { -+ $keep = 1; -+ last; -+ } -+ } -+ goto del if (!$keep); - } - -- if ($filename ne $old_filename) { -- $graph->{$filename} = delete($graph->{$old_filename}); -+ # Apply exclude patterns -+ foreach my $pattern (@exclude_patterns) { -+ goto del if ($filename =~ (/^$pattern$/)); - } -- } -+ next; - -- return ($instr, $graph); -+del: -+ # Remove file data -+ delete($hash->{$filename}); -+ $excluded_files{$filename} = 1; -+ } - } - - # -@@ -3784,6 +4204,7 @@ sub get_gcov_capabilities() - 'c' => 'branch-counts', - 'f' => 'function-summaries', - 'h' => 'help', -+ 'i' => 'intermediate-format', - 'l' => 'long-file-names', - 'n' => 'no-output', - 'o' => 'object-directory', -diff --git a/lcovrc b/lcovrc -index 40f364f..bd4bc3b 100644 ---- a/lcovrc -+++ b/lcovrc -@@ -134,6 +134,9 @@ genhtml_desc_html=0 - # when collecting coverage data. - geninfo_auto_base = 1 - -+# Use gcov intermediate format? Valid values are 0, 1, auto -+geninfo_intermediate = auto -+ - # Directory containing gcov kernel files - # lcov_gcov_dir = /proc/gcov - -diff --git a/man/lcovrc.5 b/man/lcovrc.5 -index f20d273..bf0ce7a 100644 ---- a/man/lcovrc.5 -+++ b/man/lcovrc.5 -@@ -223,6 +223,11 @@ geninfo_compat_libtool = 0 - geninfo_auto_base = 1 - .br - -+# Use gcov intermediate format? Valid values are 0, 1, auto -+.br -+geninfo_intermediate = auto -+.br -+ - # Directory containing gcov kernel files - .br - lcov_gcov_dir = /proc/gcov -@@ -789,6 +794,25 @@ located, and in addition, is different between files of the same project. - Default is 1. - .PP - -+.BR geninfo_intermediate " =" -+.IR 0 | 1 | auto -+.IP -+Specify whether to use gcov intermediate format -+.br -+ -+Use this option to control whether geninfo should use the gcov intermediate -+format while collecting coverage data. The use of the gcov intermediate format -+should increase processing speed. It also provides branch coverage data when -+using the \-\-initial command line option. -+.br -+ -+Valid values are 0 for off, 1 for on, and "auto" to let geninfo automatically -+use immediate format when supported by gcov. -+.br -+ -+Default is "auto". -+.PP -+ - .BR lcov_gcov_dir " =" - .I path_to_kernel_coverage_data - .IP --- -2.17.1 - diff --git a/meta-oe/recipes-support/lcov/files/0002-geninfo-Add-intermediate-JSON-format-support.patch b/meta-oe/recipes-support/lcov/files/0002-geninfo-Add-intermediate-JSON-format-support.patch deleted file mode 100644 index 7b180635cd..0000000000 --- a/meta-oe/recipes-support/lcov/files/0002-geninfo-Add-intermediate-JSON-format-support.patch +++ /dev/null @@ -1,247 +0,0 @@ -From e13b2b6f8443da660cafa0679c3b16240843ce9f Mon Sep 17 00:00:00 2001 -From: Peter Oberparleiter <oberpar@linux.ibm.com> -Date: Fri, 24 May 2019 17:16:56 +0200 -Subject: [PATCH 2/2] geninfo: Add intermediate JSON format support - -This change adds support for parsing the output of gcov's intermediate -JSON file format as implemented by GCC version 9. - -Note: The way that the intermediate file format support is implemented -in geninfo removes the need to parse .gcno files directly. Since geninfo -does not include support for parsing GCC 9 .gcno files, using the -intermediate format is the only option for geninfo to collect coverage -data generated by GCC version 9. - -Signed-off-by: Peter Oberparleiter <oberpar@linux.ibm.com> ---- - bin/geninfo | 162 +++++++++++++++++++++++++++++++++++++++++++++++++++- - 1 file changed, 160 insertions(+), 2 deletions(-) - -Upstream-Status: Backport -Download URL: https://github.com/linux-test-project/lcov/commit/75fbae1cfc5027f818a0bb865bf6f96fab3202da - -diff --git a/bin/geninfo b/bin/geninfo -index 0276666..cceb782 100755 ---- a/bin/geninfo -+++ b/bin/geninfo -@@ -59,6 +59,9 @@ use File::Copy qw(copy); - use Getopt::Long; - use Digest::MD5 qw(md5_base64); - use Cwd qw/abs_path/; -+use PerlIO::gzip; -+use JSON qw(decode_json); -+ - if( $^O eq "msys" ) - { - require File::Spec::Win32; -@@ -474,7 +477,8 @@ if ($rc_intermediate eq "0") { - $intermediate = 1; - } elsif (lc($rc_intermediate) eq "auto") { - # Use intermediate format if supported by gcov -- $intermediate = $gcov_caps->{'intermediate-format'} ? 1 : 0; -+ $intermediate = ($gcov_caps->{'intermediate-format'} || -+ $gcov_caps->{'json-format'}) ? 1 : 0; - } else { - die("ERROR: invalid value for geninfo_intermediate: ". - "'$rc_intermediate'\n"); -@@ -2084,6 +2088,48 @@ sub read_intermediate_text($$) - } - - -+# -+# read_intermediate_json(gcov_filename, data, basedir_ref) -+# -+# Read gcov intermediate JSON format in GCOV_FILENAME and add the resulting -+# data to DATA in the following format: -+# -+# data: source_filename -> file_data -+# file_data: GCOV JSON data for file -+# -+# Also store the value for current_working_directory to BASEDIR_REF. -+# -+ -+sub read_intermediate_json($$$) -+{ -+ my ($gcov_filename, $data, $basedir_ref) = @_; -+ my $fd; -+ my $text; -+ my $json; -+ -+ open($fd, "<:gzip", $gcov_filename) or -+ die("ERROR: Could not read $gcov_filename: $!\n"); -+ local $/; -+ $text = <$fd>; -+ close($fd); -+ -+ $json = decode_json($text); -+ if (!defined($json) || !exists($json->{"files"}) || -+ ref($json->{"files"} ne "ARRAY")) { -+ die("ERROR: Unrecognized JSON output format in ". -+ "$gcov_filename\n"); -+ } -+ -+ $$basedir_ref = $json->{"current_working_directory"}; -+ -+ for my $file (@{$json->{"files"}}) { -+ my $filename = $file->{"file"}; -+ -+ $data->{$filename} = $file; -+ } -+} -+ -+ - # - # intermediate_text_to_info(fd, data, srcdata) - # -@@ -2173,6 +2219,104 @@ sub intermediate_text_to_info($$$) - } - - -+# -+# intermediate_json_to_info(fd, data, srcdata) -+# -+# Write DATA in info format to file descriptor FD. -+# -+# data: filename -> file_data: -+# file_data: GCOV JSON data for file -+# -+# srcdata: filename -> [ excl, brexcl, checksums ] -+# excl: lineno -> 1 for all lines for which to exclude all data -+# brexcl: lineno -> 1 for all lines for which to exclude branch data -+# checksums: lineno -> source code checksum -+# -+# Note: To simplify processing, gcov data is not combined here, that is counts -+# that appear multiple times for the same lines/branches are not added. -+# This is done by lcov/genhtml when reading the data files. -+# -+ -+sub intermediate_json_to_info($$$) -+{ -+ my ($fd, $data, $srcdata) = @_; -+ my $branch_num = 0; -+ -+ return if (!%{$data}); -+ -+ print($fd "TN:$test_name\n"); -+ for my $filename (keys(%{$data})) { -+ my ($excl, $brexcl, $checksums); -+ my $file_data = $data->{$filename}; -+ -+ if (defined($srcdata->{$filename})) { -+ ($excl, $brexcl, $checksums) = @{$srcdata->{$filename}}; -+ } -+ -+ print($fd "SF:$filename\n"); -+ -+ # Function data -+ if ($func_coverage) { -+ for my $d (@{$file_data->{"functions"}}) { -+ my $line = $d->{"start_line"}; -+ my $count = $d->{"execution_count"}; -+ my $name = $d->{"name"}; -+ -+ next if (!defined($line) || !defined($count) || -+ !defined($name) || $excl->{$line}); -+ -+ print($fd "FN:$line,$name\n"); -+ print($fd "FNDA:$count,$name\n"); -+ } -+ } -+ -+ # Line data -+ for my $d (@{$file_data->{"lines"}}) { -+ my $line = $d->{"line_number"}; -+ my $count = $d->{"count"}; -+ my $c; -+ my $branches = $d->{"branches"}; -+ my $unexec = $d->{"unexecuted_block"}; -+ -+ next if (!defined($line) || !defined($count) || -+ $excl->{$line}); -+ -+ if (defined($unexec) && $unexec && $count == 0) { -+ $unexec = 1; -+ } else { -+ $unexec = 0; -+ } -+ -+ if ($checksum && exists($checksums->{$line})) { -+ $c = ",".$checksums->{$line}; -+ } else { -+ $c = ""; -+ } -+ print($fd "DA:$line,$count$c\n"); -+ -+ $branch_num = 0; -+ # Branch data -+ if ($br_coverage && !$brexcl->{$line}) { -+ for my $b (@$branches) { -+ my $brcount = $b->{"count"}; -+ -+ if (!defined($brcount) || $unexec) { -+ $brcount = "-"; -+ } -+ print($fd "BRDA:$line,0,$branch_num,". -+ "$brcount\n"); -+ -+ $branch_num++; -+ } -+ } -+ -+ } -+ -+ print($fd "end_of_record\n"); -+ } -+} -+ -+ - sub get_output_fd($$) - { - my ($outfile, $file) = @_; -@@ -2243,6 +2387,8 @@ sub process_intermediate($$$) - my $srcdata; - my $is_graph = 0; - my ($out, $err, $rc); -+ my $json_basedir; -+ my $json_format; - - info("Processing %s\n", abs2rel($file, $dir)); - -@@ -2296,6 +2442,12 @@ sub process_intermediate($$$) - unlink($gcov_filename); - } - -+ for my $gcov_filename (glob("*.gcov.json.gz")) { -+ read_intermediate_json($gcov_filename, \%data, \$json_basedir); -+ unlink($gcov_filename); -+ $json_format = 1; -+ } -+ - if (!%data) { - warn("WARNING: GCOV did not produce any data for $file\n"); - return; -@@ -2304,6 +2456,8 @@ sub process_intermediate($$$) - # Determine base directory - if (defined($base_directory)) { - $base = $base_directory; -+ } elsif (defined($json_basedir)) { -+ $base = $json_basedir; - } else { - $base = $fdir; - -@@ -2331,7 +2485,11 @@ sub process_intermediate($$$) - - # Generate output - $fd = get_output_fd($output_filename, $file); -- intermediate_text_to_info($fd, \%data, $srcdata); -+ if ($json_format) { -+ intermediate_json_to_info($fd, \%data, $srcdata); -+ } else { -+ intermediate_text_to_info($fd, \%data, $srcdata); -+ } - close($fd); - - chdir($cwd); --- -2.17.1 - diff --git a/meta-oe/recipes-support/lcov/lcov_1.14.bb b/meta-oe/recipes-support/lcov/lcov_1.16.bb index 47062cca52..22d68814ee 100755 --- a/meta-oe/recipes-support/lcov/lcov_1.14.bb +++ b/meta-oe/recipes-support/lcov/lcov_1.16.bb @@ -1,5 +1,5 @@ SUMMARY = "A graphical front-end for gcov" -HOMEPAGE = "http://ltp.sourceforge.net/coverage/lcov.php" +HOMEPAGE = "https://github.com/linux-test-project/lcov" DESCRIPTION = "LCOV is a graphical front-end for GCC's coverage testing \ tool gcov. It collects gcov data for multiple source files and creates \ HTML pages containing the source code annotated with coverage information. \ @@ -9,8 +9,6 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" RDEPENDS:${PN} += " \ - libjson-perl \ - libperlio-gzip-perl \ perl \ perl-module-filehandle \ perl-module-getopt-std \ @@ -48,18 +46,12 @@ RDEPENDS:${PN}:append:class-target = " \ gcov \ gcov-symlinks \ " - -SRC_URI = " \ - http://downloads.sourceforge.net/ltp/${BP}.tar.gz \ - file://0001-geninfo-Add-intermediate-text-format-support.patch \ - file://0002-geninfo-Add-intermediate-JSON-format-support.patch \ - " - -SRC_URI[md5sum] = "0220d01753469f83921f8f41ae5054c1" -SRC_URI[sha256sum] = "14995699187440e0ae4da57fe3a64adc0a3c5cf14feab971f8db38fb7d8f071a" +SRC_URI = "https://github.com/linux-test-project/lcov/releases/download/v${PV}/lcov-${PV}.tar.gz" +SRC_URI[md5sum] = "bfee0cef50d7b7bd1df03bfadf68dcef" +SRC_URI[sha256sum] = "987031ad5528c8a746d4b52b380bc1bffe412de1f2b9c2ba5224995668e3240b" do_install() { - oe_runmake install PREFIX=${D}${prefix} CFG_DIR=${D}${sysconfdir} + oe_runmake install PREFIX=${D}${prefix} CFG_DIR=${D}${sysconfdir} LCOV_PERL_PATH="/usr/bin/env perl" } BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch b/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch index ea3ddfb64b..b3ee24d9d5 100644 --- a/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch +++ b/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch @@ -3,7 +3,7 @@ From: Khem Raj <raj.khem@gmail.com> Date: Sat, 27 Mar 2021 21:41:04 -0700 Subject: [PATCH] example: Do not run the tests -Upstream-Status: Inappropritate [Cross-compile specific] +Upstream-Status: Inappropriate [Cross-compile specific] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- examples/Makefile | 3 --- diff --git a/meta-oe/recipes-support/libb64/libb64/0002-use-BUFSIZ-as-buffer-size.patch b/meta-oe/recipes-support/libb64/libb64/0002-use-BUFSIZ-as-buffer-size.patch new file mode 100644 index 0000000000..f2b8f599c6 --- /dev/null +++ b/meta-oe/recipes-support/libb64/libb64/0002-use-BUFSIZ-as-buffer-size.patch @@ -0,0 +1,57 @@ +From 9ec49389f56816d7ac2331296c03d147531a421a Mon Sep 17 00:00:00 2001 +From: Jakub Wilk <jwilk@debian.org> +Date: Sat, 27 Mar 2021 22:01:13 -0700 +Subject: [PATCH] use BUFSIZ as buffer size + +Bug: http://sourceforge.net/tracker/?func=detail&atid=785907&aid=3591336&group_id=152942 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + include/b64/decode.h | 3 ++- + include/b64/encode.h | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/include/b64/decode.h b/include/b64/decode.h +index b2362e5..8db1d09 100644 +--- a/include/b64/decode.h ++++ b/include/b64/decode.h +@@ -8,6 +8,7 @@ For details, see http://sourceforge.net/projects/libb64 + #ifndef BASE64_DECODE_H + #define BASE64_DECODE_H + ++#include <cstdio> + #include <iostream> + + namespace base64 +@@ -22,7 +23,7 @@ namespace base64 + base64_decodestate _state; + int _buffersize; + +- decoder(int buffersize_in = BUFFERSIZE) ++ decoder(int buffersize_in = BUFSIZ) + : _buffersize(buffersize_in) + { + base64_init_decodestate(&_state); +diff --git a/include/b64/encode.h b/include/b64/encode.h +index c1a5f88..644e4dd 100644 +--- a/include/b64/encode.h ++++ b/include/b64/encode.h +@@ -8,6 +8,7 @@ For details, see http://sourceforge.net/projects/libb64 + #ifndef BASE64_ENCODE_H + #define BASE64_ENCODE_H + ++#include <cstdio> + #include <iostream> + + namespace base64 +@@ -22,7 +23,7 @@ namespace base64 + base64_encodestate _state; + int _buffersize; + +- encoder(int buffersize_in = BUFFERSIZE) ++ encoder(int buffersize_in = BUFSIZ) + : _buffersize(buffersize_in) + { + base64_init_encodestate(&_state); diff --git a/meta-oe/recipes-support/libb64/libb64_2.0.0.1.bb b/meta-oe/recipes-support/libb64/libb64_2.0.0.1.bb index 8122419c5e..6a1e7b75e1 100644 --- a/meta-oe/recipes-support/libb64/libb64_2.0.0.1.bb +++ b/meta-oe/recipes-support/libb64/libb64_2.0.0.1.bb @@ -11,6 +11,7 @@ SRCREV = "ce864b17ea0e24a91e77c7dd3eb2d1ac4175b3f0" SRC_URI = "git://github.com/libb64/libb64;protocol=https;branch=master \ file://0001-example-Do-not-run-the-tests.patch \ + file://0002-use-BUFSIZ-as-buffer-size.patch \ file://0001-Makefile-fix-parallel-build-of-examples.patch \ file://0001-examples-Use-proper-function-prototype-for-main.patch \ " diff --git a/meta-oe/recipes-support/libbytesize/libbytesize_2.7.bb b/meta-oe/recipes-support/libbytesize/libbytesize_2.9.bb index c83ee926d0..dfc7b42dca 100644 --- a/meta-oe/recipes-support/libbytesize/libbytesize_2.7.bb +++ b/meta-oe/recipes-support/libbytesize/libbytesize_2.9.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" S = "${WORKDIR}/git" B = "${S}" -SRCREV = "0f47dde41f92f00b12160387659501edefd05b38" +SRCREV = "2fa27aa3acccc70b9f6c3bf2e569e3d33a381e83" SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master;protocol=https" inherit gettext autotools pkgconfig python3native diff --git a/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch b/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch index 4e0984f364..89f31f7946 100644 --- a/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch +++ b/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch @@ -8,6 +8,8 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- +Upstream-Status: Pending + src/Makefile.am | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/meta-oe/recipes-support/libcanberra/files/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch b/meta-oe/recipes-support/libcanberra/files/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch index ba6fa2c643..1e45441ff9 100644 --- a/meta-oe/recipes-support/libcanberra/files/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch +++ b/meta-oe/recipes-support/libcanberra/files/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -5,6 +5,8 @@ Subject: [PATCH] gtk: Don't assume all GdkDisplays are GdkX11Displays: broadway/wayland --- +Upstream-Status: Pending + src/canberra-gtk-module.c | 15 +++++++++++++++ src/canberra-gtk.c | 5 +++++ 2 files changed, 20 insertions(+) diff --git a/meta-oe/recipes-support/libcereal/files/0001-doctest-Do-not-use-unnamed-class.patch b/meta-oe/recipes-support/libcereal/files/0001-doctest-Do-not-use-unnamed-class.patch new file mode 100644 index 0000000000..9396cc5d01 --- /dev/null +++ b/meta-oe/recipes-support/libcereal/files/0001-doctest-Do-not-use-unnamed-class.patch @@ -0,0 +1,38 @@ +From 03bbb1b055c41ec652470f775b55a7cf80d664ef Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 17 Apr 2023 16:46:12 -0700 +Subject: [PATCH] doctest: Do not use unnamed class + +When compiling with clang this results in emitting absolute path into +debug info, especially .debug_str section has + +~(unnamed class at /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/libcereal/1.3.2+gitAUTOINC+ebef1e9298-r0/git/unittests/doctest.h:6428:5) +(unnamed class at /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/libcereal/1.3.2+gitAUTOINC+ebef1e9298-r0/git/unittests/doctest.h:6428:5) + +Therefore use a name for the class instead and help get rid of this +absolute path in debug info. This fixes + +File /usr/lib/libcereal/ptest/tests/.debug/test_unordered_map in package libcereal-dbg contains reference to TMPDIR + +Upstream-Status: Submitted [https://github.com/USCiLab/cereal/pull/788] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + unittests/doctest.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/unittests/doctest.h b/unittests/doctest.h +index cd5b44d6..e6d8f7f9 100644 +--- a/unittests/doctest.h ++++ b/unittests/doctest.h +@@ -6424,7 +6424,7 @@ void Context::setCout(std::ostream* out) { p->cout = out; } + static class DiscardOStream : public std::ostream + { + private: +- class : public std::streambuf ++ class discardBufStream: public std::streambuf + { + private: + // allowing some buffering decreases the amount of calls to overflow +-- +2.40.0 + diff --git a/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb b/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb index f15927554b..c5f26ecb4e 100644 --- a/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb +++ b/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb @@ -21,6 +21,7 @@ SRCREV = "ebef1e929807629befafbb2918ea1a08c7194554" 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://run-ptest \ " diff --git a/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb b/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb index 0cb33fcd50..fd57e4e283 100644 --- a/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb +++ b/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb @@ -21,4 +21,5 @@ S = "${WORKDIR}/git" do_install:append(){ chrpath -d ${D}${libdir}/libcppkafka.so.0.3.1 + sed -i -e 's|${STAGING_INCDIR}|\$\{includedir\}|g' ${D}${datadir}/pkgconfig/cppkafka.pc } diff --git a/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch b/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch index 25e5c6ae02..8bb23aafca 100644 --- a/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch +++ b/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch @@ -3,7 +3,7 @@ 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 +Upstream-Status: Pending Signed-off-by: Yao Zhao <yao.zhao@windriver.com> --- diff --git a/meta-oe/recipes-support/libftdi/libftdi_1.5.bb b/meta-oe/recipes-support/libftdi/libftdi_1.5.bb index bc5897413f..7f0cfa237c 100644 --- a/meta-oe/recipes-support/libftdi/libftdi_1.5.bb +++ b/meta-oe/recipes-support/libftdi/libftdi_1.5.bb @@ -27,6 +27,11 @@ EXTRA_OECMAKE = "-DSTATICLIBS=off -DEXAMPLES=off \ -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so \ -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}" +do_install:append() { + # remove absolute paths + sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/libftdi1/LibFTDI1Config.cmake +} + BBCLASSEXTEND = "native nativesdk" PACKAGES =+ "${PN}-python ftdi-eeprom" diff --git a/meta-oe/recipes-support/libgpiod/files/0001-build-don-t-expect-automake-to-set-PYTHON.patch b/meta-oe/recipes-support/libgpiod/files/0001-build-don-t-expect-automake-to-set-PYTHON.patch deleted file mode 100644 index a3dc381882..0000000000 --- a/meta-oe/recipes-support/libgpiod/files/0001-build-don-t-expect-automake-to-set-PYTHON.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 3c461786feb1d5aa1ed2a911942a5f9fbc8b8086 Mon Sep 17 00:00:00 2001 -From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> -Date: Tue, 24 Jan 2023 17:38:43 +0100 -Subject: [libgpiod v1.6.x][PATCH] build: don't expect automake to set $PYTHON - -It seems that the implementation of AM_PATH_PYTHON() changed in automake -recently and no longer sets $PYTHON variable which breaks the build on -some systems. - -We know we use python3 so use python3-config explicitly. - -Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> ---- -Upstream-Status: Accepted - - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 3149384..0460810 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -204,9 +204,9 @@ then - AC_MSG_ERROR([python3-config not found - needed for python bindings]) - fi - AS_IF([test -z "$PYTHON_CPPFLAGS"], -- [AC_SUBST(PYTHON_CPPFLAGS, [`$PYTHON-config --includes`])]) -+ [AC_SUBST(PYTHON_CPPFLAGS, [`python3-config --includes`])]) - AS_IF([test -z "$PYTHON_LIBS"], -- [AC_SUBST(PYTHON_LIBS, [`$PYTHON-config --libs`])]) -+ [AC_SUBST(PYTHON_LIBS, [`python3-config --libs`])]) - fi - - AC_CHECK_PROG([has_doxygen], [doxygen], [true], [false]) --- -2.37.2 - diff --git a/meta-oe/recipes-support/libgpiod/files/run-ptest b/meta-oe/recipes-support/libgpiod/libgpiod-1.x/run-ptest index 61b9b69fc6..61b9b69fc6 100644 --- a/meta-oe/recipes-support/libgpiod/files/run-ptest +++ b/meta-oe/recipes-support/libgpiod/libgpiod-1.x/run-ptest diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/gpio-tools-test-bats-modify.patch b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/gpio-tools-test-bats-modify.patch new file mode 100644 index 0000000000..0b2a5e6a8c --- /dev/null +++ b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/gpio-tools-test-bats-modify.patch @@ -0,0 +1,67 @@ +From 53f9670d6af1bd0745c1df9c469b269c72607b23 Mon Sep 17 00:00:00 2001 +From: Joe Slater <joe.slater@windriver.com> +Date: Tue, 6 Jun 2023 08:04:27 -0700 +Subject: [PATCH] tools: tests: modify delays in toggle test + +The test "gpioset: toggle (continuous)" uses fixed delays to test +toggling values. This is not reliable, so we switch to looking +for transitions from one value to another. + +We wait for a transition up to 1.5 seconds. + +Signed-off-by: Joe Slater <joe.slater@windriver.com> +Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> + +Upstream-Status: Accepted + +Signed-off-by: Joe Slater <joe.slater@windriver.com> +--- + tools/gpio-tools-test.bats | 21 ++++++++++++++++----- + 1 file changed, 16 insertions(+), 5 deletions(-) + +diff --git a/tools/gpio-tools-test.bats b/tools/gpio-tools-test.bats +index c83ca7d..929c35a 100755 +--- a/tools/gpio-tools-test.bats ++++ b/tools/gpio-tools-test.bats +@@ -141,6 +141,20 @@ gpiosim_check_value() { + [ "$VAL" = "$EXPECTED" ] + } + ++gpiosim_wait_value() { ++ local OFFSET=$2 ++ local EXPECTED=$3 ++ local DEVNAME=${GPIOSIM_DEV_NAME[$1]} ++ local CHIPNAME=${GPIOSIM_CHIP_NAME[$1]} ++ local PORT=$GPIOSIM_SYSFS/$DEVNAME/$CHIPNAME/sim_gpio$OFFSET/value ++ ++ for i in {1..15}; do ++ [ "$(<$PORT)" = "$EXPECTED" ] && return ++ sleep 0.1 ++ done ++ return 1 ++} ++ + gpiosim_cleanup() { + for CHIP in ${!GPIOSIM_CHIP_NAME[@]} + do +@@ -1567,15 +1581,12 @@ request_release_line() { + gpiosim_check_value sim0 4 0 + gpiosim_check_value sim0 7 0 + +- sleep 1 +- +- gpiosim_check_value sim0 1 0 ++ gpiosim_wait_value sim0 1 0 + gpiosim_check_value sim0 4 1 + gpiosim_check_value sim0 7 1 + +- sleep 1 + +- gpiosim_check_value sim0 1 1 ++ gpiosim_wait_value sim0 1 1 + gpiosim_check_value sim0 4 0 + gpiosim_check_value sim0 7 0 + } +-- +2.25.1 + diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/run-ptest b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/run-ptest new file mode 100644 index 0000000000..9475f02535 --- /dev/null +++ b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/run-ptest @@ -0,0 +1,24 @@ +#!/bin/sh + +testbins="gpiod-test gpio-tools-test gpiod-cxx-test" + +ptestdir=$(dirname "$(readlink -f "$0")") +cd $ptestdir/tests + +# libgpiod v2 uses gpio-sim - a configfs-based testing module. We need to +# make sure configfs is mounted before running any tests. +modprobe configfs +mountpoint /sys/kernel/config > /dev/null || mount -t configfs configfs /sys/kernel/config + +for testbin in $testbins; do + if test -e ./$testbin; then + ./$testbin > ./$testbin.out 2>&1 + if [ $? -ne 0 ]; then + echo "FAIL: $testbin" + else + echo "PASS: $testbin" + fi + else + echo "SKIP: $testbin" + fi +done diff --git a/meta-oe/recipes-support/libgpiod/libgpiod.inc b/meta-oe/recipes-support/libgpiod/libgpiod.inc new file mode 100644 index 0000000000..cb19bc5fb8 --- /dev/null +++ b/meta-oe/recipes-support/libgpiod/libgpiod.inc @@ -0,0 +1,64 @@ +SUMMARY = "C library and tools for interacting with the linux GPIO character device" +AUTHOR = "Bartosz Golaszewski <brgl@bgdev.pl>" +RECIPE_MAINTAINER = "Bartosz Golaszewski <brgl@bgdev.pl>" + +inherit autotools pkgconfig ptest + +SRC_URI += " \ + https://www.kernel.org/pub/software/libs/libgpiod/libgpiod-${PV}.tar.xz \ + file://run-ptest \ +" + +PACKAGECONFIG[cxx] = "--enable-bindings-cxx,--disable-bindings-cxx" + +# Enable cxx bindings by default. +PACKAGECONFIG ?= " \ + cxx \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ +" + +# Always build tools - they don't have any additional +# requirements over the library. +EXTRA_OECONF = "--enable-tools" + +DEPENDS += "autoconf-archive-native" + +PACKAGES =+ "${PN}-tools libgpiodcxx" +FILES:${PN}-tools += " \ + ${bindir}/gpiodetect \ + ${bindir}/gpioinfo \ + ${bindir}/gpioget \ + ${bindir}/gpioset \ + ${bindir}/gpiomon \ +" +FILES:libgpiodcxx = "${libdir}/libgpiodcxx.so.*" + +RRECOMMENDS:${PN}-ptest += "coreutils" +RDEPENDS:${PN}-ptest += "${@bb.utils.contains('PTEST_ENABLED', '1', 'bats', '', d)}" + +do_install:append() { + rm -f ${D}${bindir}/gpiod-test + rm -f ${D}${bindir}/gpio-tools-test + rm -f ${D}${bindir}/gpio-tools-test.bats + rm -f ${D}${bindir}/gpiod-cxx-test +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests/ + + # These are the core C library tests + install -m 0755 ${B}/tests/.libs/gpiod-test ${D}${PTEST_PATH}/tests/ + + # Tools are always built so let's always install them for ptest even if + # we're not selecting libgpiod-tools. + install -m 0755 ${S}/tools/gpio-tools-test ${D}${PTEST_PATH}/tests/ + install -m 0755 ${S}/tools/gpio-tools-test.bats ${D}${PTEST_PATH}/tests/ + for tool in ${FILES:${PN}-tools}; do + install ${B}/tools/.libs/$(basename $tool) ${D}${PTEST_PATH}/tests/ + done + + if ${@bb.utils.contains('PACKAGECONFIG', 'cxx', 'true', 'false', d)}; then + install -m 0755 ${B}/bindings/cxx/tests/.libs/gpiod-cxx-test ${D}${PTEST_PATH}/tests/ + fi +} + diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_1.6.3.bb b/meta-oe/recipes-support/libgpiod/libgpiod_1.6.3.bb deleted file mode 100644 index 5164e7e021..0000000000 --- a/meta-oe/recipes-support/libgpiod/libgpiod_1.6.3.bb +++ /dev/null @@ -1,82 +0,0 @@ -SUMMARY = "C library and tools for interacting with the linux GPIO character device" -AUTHOR = "Bartosz Golaszewski <brgl@bgdev.pl>" - -LICENSE = "LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de" - -SRC_URI = " \ - https://www.kernel.org/pub/software/libs/${BPN}/${BP}.tar.xz \ - file://run-ptest \ - file://0001-build-don-t-expect-automake-to-set-PYTHON.patch \ -" - -SRC_URI[md5sum] = "28e79f6f70fee1da9079558d8b7b3736" -SRC_URI[sha256sum] = "841be9d788f00bab08ef22c4be5c39866f0e46cb100a3ae49ed816ac9c5dddc7" - -inherit autotools pkgconfig python3native ptest - -PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev glib-2.0 catch2" -PACKAGECONFIG[cxx] = "--enable-bindings-cxx,--disable-bindings-cxx" -PACKAGECONFIG[python3] = "--enable-bindings-python,--disable-bindings-python,python3" - -# Enable cxx bindings by default. -PACKAGECONFIG ?= "cxx \ - ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" - -# Always build tools - they don't have any additional -# requirements over the library. -EXTRA_OECONF = "--enable-tools" - -DEPENDS += "autoconf-archive-native" - -PACKAGES =+ "${PN}-tools libgpiodcxx ${PN}-python" -FILES:${PN}-tools = " \ - ${bindir}/gpiodetect \ - ${bindir}/gpioinfo \ - ${bindir}/gpioget \ - ${bindir}/gpioset \ - ${bindir}/gpiofind \ - ${bindir}/gpiomon \ -" -FILES:${PN}-ptest += " \ - ${bindir}/gpiod-test \ - ${bindir}/gpio-tools-test \ - ${bindir}/gpio-tools-test.bats \ - ${bindir}/gpiod-cxx-test \ - ${bindir}/gpiod_py_test.py \ - ${libdir}/libgpiomockup.so.* \ -" -FILES:libgpiodcxx = "${libdir}/libgpiodcxx.so.*" -FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*.so" -FILES:${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" - -RRECOMMENDS:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'python3', '${PN}-python', '', d)}" -RRECOMMENDS:${PN}-ptest += " \ - kernel-module-gpio-mockup \ - coreutils \ - ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-unittest', '', d)} \ -" -RDEPENDS:${PN}-ptest += "bats python3-packaging" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - - # These are the core C library tests - install -m 0755 ${B}/tests/.libs/gpiod-test ${D}${PTEST_PATH}/tests/ - - # Tools are always built so let's always install them for ptest even if - # we're not selecting libgpiod-tools. - install -m 0755 ${S}/tools/gpio-tools-test ${D}${PTEST_PATH}/tests/ - install -m 0755 ${S}/tools/gpio-tools-test.bats ${D}${PTEST_PATH}/tests/ - for tool in ${FILES:${PN}-tools}; do - install ${B}/tools/.libs/$(basename $tool) ${D}${PTEST_PATH}/tests/ - done - - if ${@bb.utils.contains('PACKAGECONFIG', 'cxx', 'true', 'false', d)}; then - install -m 0755 ${B}/bindings/cxx/tests/.libs/gpiod-cxx-test ${D}${PTEST_PATH}/tests/ - fi - - if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then - install -m 0755 ${S}/bindings/python/tests/gpiod_py_test.py ${D}${PTEST_PATH}/tests/ - fi -} diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_1.6.4.bb b/meta-oe/recipes-support/libgpiod/libgpiod_1.6.4.bb new file mode 100644 index 0000000000..b28aa8e698 --- /dev/null +++ b/meta-oe/recipes-support/libgpiod/libgpiod_1.6.4.bb @@ -0,0 +1,39 @@ +require libgpiod.inc + +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de" + +SRC_URI[sha256sum] = "7b146e12f28fbca3df7557f176eb778c5ccf952ca464698dba8a61b2e1e3f9b5" + +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-1.x:" + +inherit python3native + +PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev glib-2.0 catch2" +PACKAGECONFIG[python3] = "--enable-bindings-python,--disable-bindings-python,python3" + +# Always build tools - they don't have any additional +# requirements over the library. +EXTRA_OECONF = "--enable-tools" + +PACKAGES =+ "${PN}-python" +FILES:${PN}-tools += "${bindir}/gpiofind" +FILES:${PN}-ptest += " \ + ${bindir}/gpiod_py_test.py \ + ${libdir}/libgpiomockup.so.* \ +" +FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*.so" +FILES:${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" + +RRECOMMENDS:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'python3', '${PN}-python', '', d)}" +RRECOMMENDS:${PN}-ptest += " \ + kernel-module-gpio-mockup \ + ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-unittest', '', d)} \ +" +RDEPENDS:${PN}-ptest += "python3-packaging" + +do_install_ptest:append() { + if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then + install -m 0755 ${S}/bindings/python/tests/gpiod_py_test.py ${D}${PTEST_PATH}/tests/ + fi +} diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_2.0.1.bb b/meta-oe/recipes-support/libgpiod/libgpiod_2.0.1.bb new file mode 100644 index 0000000000..6958f2d841 --- /dev/null +++ b/meta-oe/recipes-support/libgpiod/libgpiod_2.0.1.bb @@ -0,0 +1,29 @@ +require libgpiod.inc + +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & CC-BY-SA-4.0" +LIC_FILES_CHKSUM = " \ + file://LICENSES/GPL-2.0-or-later.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LICENSES/LGPL-2.1-or-later.txt;md5=4b54a1fd55a448865a0b32d41598759d \ + file://LICENSES/CC-BY-SA-4.0.txt;md5=fba3b94d88bfb9b81369b869a1e9a20f \ +" + +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-2.x:" + +SRC_URI += "file://gpio-tools-test-bats-modify.patch" + +SRC_URI[sha256sum] = "b5367d28d045b36007a4ffd42cceda4c358737ef4f2ce22b0c1d05ec57a38392" + +# 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" +PACKAGECONFIG[gpioset-interactive] = "--enable-gpioset-interactive,--disable-gpioset-interactive,libedit" + +PACKAGES =+ "${PN}-ptest-dev" +FILES:${PN}-tools += "${bindir}/gpionotify" +FILES:${PN}-ptest += "${libdir}/libgpiosim.so.*" +FILES:${PN}-ptest-dev += "${includedir}/gpiosim.h" + +RRECOMMENDS:${PN}-ptest += "kernel-module-gpio-sim" + +do_install_ptest:append() { + install -m 0644 ${S}/tests/gpiosim/gpiosim.h ${D}${includedir}/gpiosim.h +} diff --git a/meta-oe/recipes-support/libgusb/libgusb_0.3.10.bb b/meta-oe/recipes-support/libgusb/libgusb_0.3.10.bb index c208a2090c..491b6a7a1d 100644 --- a/meta-oe/recipes-support/libgusb/libgusb_0.3.10.bb +++ b/meta-oe/recipes-support/libgusb/libgusb_0.3.10.bb @@ -6,9 +6,13 @@ DEPENDS = "glib-2.0 libusb" inherit meson gobject-introspection gtk-doc gettext vala -PACKAGECONFIG ??= "${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'vapi', '', d)}" +PACKAGECONFIG:class-target ??= "${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'vapi', '', d)}" PACKAGECONFIG[vapi] = "-Dvapi=true,-Dvapi=false" +EXTRA_OEMESON:append:class-native = " -Dtests=false -Dintrospection=false" + SRC_URI = "git://github.com/hughsie/libgusb.git;branch=main;protocol=https" SRCREV = "332d5b987ffecb824426e88518e05547faf2b520" S = "${WORKDIR}/git" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/libharu/libharu/libharu-RELEASE_2_3_0_cmake.patch b/meta-oe/recipes-support/libharu/libharu/libharu-RELEASE_2_3_0_cmake.patch index 332be1b3f7..05f78ed735 100644 --- a/meta-oe/recipes-support/libharu/libharu/libharu-RELEASE_2_3_0_cmake.patch +++ b/meta-oe/recipes-support/libharu/libharu/libharu-RELEASE_2_3_0_cmake.patch @@ -3,7 +3,7 @@ https://src.fedoraproject.org/rpms/libharu Fix the install destination of some files. -Upstream-Status: inappropriate +Upstream-Status: Inappropriate Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> diff --git a/meta-oe/recipes-support/libiio/libiio/0001-CMake-Move-include-CheckCSourceCompiles-before-its-m.patch b/meta-oe/recipes-support/libiio/libiio/0001-CMake-Move-include-CheckCSourceCompiles-before-its-m.patch deleted file mode 100644 index a2cfd47f18..0000000000 --- a/meta-oe/recipes-support/libiio/libiio/0001-CMake-Move-include-CheckCSourceCompiles-before-its-m.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 758ba58c81273d9075a539216f8a322935c2e434 Mon Sep 17 00:00:00 2001 -From: Paul Cercueil <paul@crapouillou.net> -Date: Fri, 12 Nov 2021 16:49:21 +0000 -Subject: [PATCH] CMake: Move include(CheckCSourceCompiles) before its macros - are used - -Move include(CheckCSourceCompiles) before any of the -check_c_source_compiles() macros is called. - -This fixes a CMake error when compiling with WITH_NETWORK_GET_BUFFER -disabled. - -Upstream-Status: Accepted [https://github.com/analogdevicesinc/libiio/commit/758ba58c81273d9075a539216f8a322935c2e434] - -Signed-off-by: Paul Cercueil <paul@crapouillou.net> ---- - CMakeLists.txt | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7437136c8210..05b4feff233b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -296,9 +296,10 @@ if(WITH_NETWORK_BACKEND) - endif() - - if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") -+ include(CheckCSourceCompiles) -+ - option(WITH_NETWORK_GET_BUFFER "Enable experimental zero-copy transfers" OFF) - if (WITH_NETWORK_GET_BUFFER) -- include(CheckCSourceCompiles) - check_c_source_compiles("#define _GNU_SOURCE=1\n#include <fcntl.h>\nint main(void) { return O_TMPFILE; }" - HAS_O_TMPFILE) - --- -2.34.1 - diff --git a/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-oe/recipes-support/libiio/libiio_git.bb index bb253f421a..7907dcfc24 100644 --- a/meta-oe/recipes-support/libiio/libiio_git.bb +++ b/meta-oe/recipes-support/libiio/libiio_git.bb @@ -4,12 +4,10 @@ SECTION = "libs" LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7c13b3376cea0ce68d2d2da0a1b3a72c" -SRCREV = "92d6a35f3d8d721cda7d6fe664b435311dd368b4" -PV = "0.23" +SRCREV = "c4498c27761d04d4ac631ec59c1613bfed079da5" +PV = "0.24" -SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https;branch=master \ - file://0001-CMake-Move-include-CheckCSourceCompiles-before-its-m.patch \ -" +SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https;branch=master" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" @@ -20,10 +18,13 @@ DEPENDS = " \ flex-native bison-native libaio \ " -inherit cmake python3native systemd setuptools3 +inherit cmake python3native systemd setuptools3 pkgconfig EXTRA_OECMAKE = " \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCPP_BINDINGS=ON \ + -DFLEX_TARGET_ARG_COMPILE_FLAGS='--noline' \ + -DBISON_TARGET_ARG_COMPILE_FLAGS='--no-lines' \ -DUDEV_RULES_INSTALL_DIR=${nonarch_base_libdir}/udev/rules.d \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DWITH_SYSTEMD=ON -DSYSTEMD_UNIT_INSTALL_DIR=${systemd_system_unitdir}', '', d)} \ " diff --git a/meta-oe/recipes-support/libiodbc/libiodbc_3.52.15.bb b/meta-oe/recipes-support/libiodbc/libiodbc_3.52.15.bb index bc4bd5344c..ff976ed975 100644 --- a/meta-oe/recipes-support/libiodbc/libiodbc_3.52.15.bb +++ b/meta-oe/recipes-support/libiodbc/libiodbc_3.52.15.bb @@ -18,9 +18,13 @@ SRC_URI[sha256sum] = "c74541e3327fc9a1c7ccf103645471c67bc014542d70f572476eb07c0b inherit autotools EXTRA_OECONF += " --prefix=/usr/local \ + --includedir=/usr/include/iodbc \ --with-iodbc-inidir=/etc \ --enable-odbc3 \ --enable-pthreads \ --disable-libodbc \ --disable-static \ " + +inherit multilib_script +MULTILIB_SCRIPTS = "${PN}:${bindir}/iodbc-config" diff --git a/meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.1.bb b/meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.5.bb index 2db16e114e..38ffd032ab 100644 --- a/meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.1.bb +++ b/meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.5.bb @@ -3,9 +3,9 @@ HOMEPAGE = "https://github.com/js-cookie/js-cookie" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=e16cf0e247d84f8999bf55865a9c98cf" -SRC_URI = "git://github.com/js-cookie/js-cookie.git;protocol=http;branch=master;protocol=https" +SRC_URI = "git://github.com/js-cookie/js-cookie.git;protocol=https;branch=main" -SRCREV = "0ba77141dd215782cc7770347a457906908c66ff" +SRCREV = "ab3f67fc4fad88cdf07b258c08e4164e06bf7506" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/libmimetic/libmimetic/0001-libmimetic-Removing-test-directory-from-the-Makefile.patch b/meta-oe/recipes-support/libmimetic/libmimetic/0001-libmimetic-Removing-test-directory-from-the-Makefile.patch index 50cd4d4270..717e3f1f8b 100644 --- a/meta-oe/recipes-support/libmimetic/libmimetic/0001-libmimetic-Removing-test-directory-from-the-Makefile.patch +++ b/meta-oe/recipes-support/libmimetic/libmimetic/0001-libmimetic-Removing-test-directory-from-the-Makefile.patch @@ -15,6 +15,8 @@ aarch64-yoe-linux-musl. Signed-off-by: asmitk01-in <asmitk01@in.ibm.com> Change-Id: I1822b36ad4a1fa5e7b165d8cac3a6e96aca11c35 --- +Upstream-Status: Pending + Makefile.am | 2 +- mimetic/codec/other_codecs.h | 4 ++++ mimetic/contenttype.cxx | 4 ++++ diff --git a/meta-oe/recipes-support/libnvme/libnvme_1.5.bb b/meta-oe/recipes-support/libnvme/libnvme_1.5.bb new file mode 100644 index 0000000000..4b6f1e30be --- /dev/null +++ b/meta-oe/recipes-support/libnvme/libnvme_1.5.bb @@ -0,0 +1,22 @@ +SUMMARY = "libnvme development C library" +DESCRIPTION = "\ +libnvme provides type definitions for NVMe specification structures, \ +enumerations, and bit fields, helper functions to construct, dispatch, \ +and decode commands and payloads, and utilities to connect, scan, and \ +manage nvme devices on a Linux system." +HOMEPAGE = "https://github.com/linux-nvme/${BPN}" +SECTION = "libs" +LICENSE = "LGPL-2.1-only & CC0-1.0 & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ + file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" +DEPENDS = "json-c" +SRCREV = "4fea83db8328ea788ea8f1001e8ce1cb80ef5fae" + +SRC_URI = "git://github.com/linux-nvme/libnvme;protocol=https;branch=master" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig + +EXTRA_OEMESON += "-Dkeyutils=disabled -Dopenssl=disabled -Dpython=disabled" diff --git a/meta-oe/recipes-support/liboauth/liboauth/0001-Support-OpenSSL-1.1.0.patch b/meta-oe/recipes-support/liboauth/liboauth/0001-Support-OpenSSL-1.1.0.patch index 8691eae2b5..2631f4ae73 100644 --- a/meta-oe/recipes-support/liboauth/liboauth/0001-Support-OpenSSL-1.1.0.patch +++ b/meta-oe/recipes-support/liboauth/liboauth/0001-Support-OpenSSL-1.1.0.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Support OpenSSL 1.1.0 Taken from https://github.com/x42/liboauth/issues/9 -Upstream-Status: Submitted[https://github.com/x42/liboauth/issues/9] +Upstream-Status: Submitted [https://github.com/x42/liboauth/issues/9] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- src/hash.c | 65 ++++++++++++++++++++++++++++++++++++------------------ diff --git a/meta-oe/recipes-support/liboop/liboop/tcl_dev.patch b/meta-oe/recipes-support/liboop/liboop/tcl_dev.patch index e00cf80141..0521aaeaff 100644 --- a/meta-oe/recipes-support/liboop/liboop/tcl_dev.patch +++ b/meta-oe/recipes-support/liboop/liboop/tcl_dev.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/configure.ac +++ b/configure.ac @@ -71,7 +71,7 @@ diff --git a/meta-oe/recipes-support/libpaper/libpaper_2.1.0.bb b/meta-oe/recipes-support/libpaper/libpaper_2.1.0.bb new file mode 100644 index 0000000000..911582553c --- /dev/null +++ b/meta-oe/recipes-support/libpaper/libpaper_2.1.0.bb @@ -0,0 +1,9 @@ +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] = "474e9575e1235a0d8e3661f072de0193bab6ea1023363772f698a2cc39d640cf" + +inherit perlnative autotools + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/librsync/librsync_2.3.2.bb b/meta-oe/recipes-support/librsync/librsync_2.3.4.bb index ccc68967b9..cb30f4c31b 100644 --- a/meta-oe/recipes-support/librsync/librsync_2.3.2.bb +++ b/meta-oe/recipes-support/librsync/librsync_2.3.4.bb @@ -5,7 +5,7 @@ LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" SRC_URI = "git://github.com/librsync/librsync.git;branch=master;protocol=https" -SRCREV = "42b636d2a65ab6914ea7cac50886da28192aaf9b" +SRCREV = "e364852674780e43d578e4239128ff7014190ed3" S = "${WORKDIR}/git" DEPENDS = "popt" diff --git a/meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch b/meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch new file mode 100644 index 0000000000..19775fa529 --- /dev/null +++ b/meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch @@ -0,0 +1,46 @@ +From 0cade4573334571055127a2d4fe3641e2397948d 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 da5588ad..e482b654 100644 +--- a/src/libgcrypt.c ++++ b/src/libgcrypt.c +@@ -469,12 +469,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); + } + +-- +2.40.0 + diff --git a/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch b/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch new file mode 100644 index 0000000000..0c7f53029e --- /dev/null +++ b/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch @@ -0,0 +1,38 @@ +From d2525ba0bc7b11de12c54ea1a3d1eb862537136d 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 + +It will search ssh/sshd commands on host when configure. Since they are +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 22a36f37..aa32ca2e 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -86,6 +86,7 @@ set(TEST_TARGET_LIBRARIES + + add_subdirectory(unittests) + ++if (CLIENT_TESTING OR SERVER_TESTING) + # OpenSSH Capabilities are required for all unit tests + find_program(SSH_EXECUTABLE NAMES ssh) + if (SSH_EXECUTABLE) +@@ -293,6 +294,7 @@ if (CLIENT_TESTING OR SERVER_TESTING) + + message(STATUS "TORTURE_ENVIRONMENT=${TORTURE_ENVIRONMENT}") + endif () ++endif () + + configure_file(tests_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/tests_config.h) + +-- +2.25.1 + diff --git a/meta-oe/recipes-support/libssh/libssh/run-ptest b/meta-oe/recipes-support/libssh/libssh/run-ptest new file mode 100644 index 0000000000..159994e9bb --- /dev/null +++ b/meta-oe/recipes-support/libssh/libssh/run-ptest @@ -0,0 +1,53 @@ +#!/bin/sh + +# Valid tests to run +tests="torture_bind_config \ + torture_buffer \ + torture_bytearray \ + torture_callbacks \ + torture_channel \ + torture_config \ + torture_crypto \ + torture_hashes \ + torture_init \ + torture_isipaddr \ + torture_keyfiles \ + torture_knownhosts_parsing \ + torture_list \ + torture_misc \ + torture_moduli \ + torture_options \ + torture_packet \ + torture_packet_filter \ + torture_pki \ + torture_pki_ecdsa \ + torture_pki_ed25519 \ + torture_pki_rsa \ + torture_push_pop_dir \ + torture_rand \ + torture_session_keys \ + torture_temp_dir \ + torture_temp_file \ + torture_threads_buffer \ + torture_threads_crypto \ + torture_threads_init \ + torture_threads_pki_rsa \ + torture_tokens \ + " + +ptestdir=$(dirname "$(readlink -f "$0")") +cd "$ptestdir"/tests || exit + +# Run specified tests +for f in $tests +do + if test -e ./"$f"; then + if ./"$f" > ./"$f".out 2> ./"$f".err; then + echo "PASS: $f" + else + echo "FAIL: $f" + fi + else + echo "SKIP: $f" + fi +done diff --git a/meta-oe/recipes-support/libssh/libssh_0.10.4.bb b/meta-oe/recipes-support/libssh/libssh_0.10.4.bb new file mode 100644 index 0000000000..4b2ced5e50 --- /dev/null +++ b/meta-oe/recipes-support/libssh/libssh_0.10.4.bb @@ -0,0 +1,45 @@ +SUMMARY = "Multiplatform C library implementing the SSHv2 and SSHv1 protocol" +HOMEPAGE = "http://www.libssh.org" +SECTION = "libs" +LICENSE = "LGPL-2.1-only" +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 \ + 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 = "e8322817a9e5aaef0698d779ddd467a209a85d85" + +S = "${WORKDIR}/git" + +inherit cmake ptest + +PACKAGECONFIG ??= "gcrypt ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" +PACKAGECONFIG[gssapi] = "-DWITH_GSSAPI=1, -DWITH_GSSAPI=0, krb5, " +PACKAGECONFIG[gcrypt] = "-DWITH_GCRYPT=1, -DWITH_GCRYPT=0, libgcrypt, " +PACKAGECONFIG[tests] = "-DUNIT_TESTING=1, -DUNIT_TESTING=0, cmocka" + +ARM_INSTRUCTION_SET:armv5 = "arm" + +EXTRA_OECMAKE = " \ + -DWITH_PCAP=1 \ + -DWITH_SFTP=1 \ + -DWITH_ZLIB=1 \ + -DWITH_EXAMPLES=0 \ + " + +do_compile:prepend () { + if [ ${PTEST_ENABLED} = "1" ]; then + sed -i -e 's|${B}|${PTEST_PATH}|g' ${B}/config.h + fi +} + +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + cp -f ${B}/tests/unittests/torture_* ${D}${PTEST_PATH}/tests/ +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libssh/libssh_0.8.9.bb b/meta-oe/recipes-support/libssh/libssh_0.8.9.bb deleted file mode 100644 index c7e9c3320c..0000000000 --- a/meta-oe/recipes-support/libssh/libssh_0.8.9.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "Multiplatform C library implementing the SSHv2 and SSHv1 protocol" -HOMEPAGE = "http://www.libssh.org" -SECTION = "libs" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=dabb4958b830e5df11d2b0ed8ea255a0" - -DEPENDS = "zlib openssl" - -SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable-0.8" -SRCREV = "04685a74df9ce1db1bc116a83a0da78b4f4fa1f8" - -S = "${WORKDIR}/git" - -inherit cmake - -PACKAGECONFIG ??= "gcrypt" -PACKAGECONFIG[gssapi] = "-DWITH_GSSAPI=1, -DWITH_GSSAPI=0, krb5, " -PACKAGECONFIG[gcrypt] = "-DWITH_GCRYPT=1, -DWITH_GCRYPT=0, libgcrypt, " - -ARM_INSTRUCTION_SET:armv5 = "arm" - -EXTRA_OECMAKE = " \ - -DWITH_PCAP=1 \ - -DWITH_SFTP=1 \ - -DWITH_ZLIB=1 \ - -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ - " - -do_configure:prepend () { - # Disable building of examples - sed -i -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' ${S}/CMakeLists.txt \ - || bbfatal "Failed to disable examples" -} - -TOOLCHAIN = "gcc" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch b/meta-oe/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch index 37c5c3dc02..2529d5d9d1 100644 --- a/meta-oe/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch +++ b/meta-oe/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch @@ -8,7 +8,7 @@ Content-Transfer-Encoding: 8bit Stolen from [1] -[1] https://aur.archlinux.org/cgit/aur.git/commit/dynamiclib.patch?h=snowball-git&id=a9cbf4f42f3661e4b8f791cd4374233821716ea1 +[1] https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/snowball/trunk/dynamiclib.diff Upstream-Status: Pending @@ -19,36 +19,33 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 libstemmer/symbol.map -diff --git a/GNUmakefile b/GNUmakefile -index cbd6ff7..a85230b 100644 --- a/GNUmakefile +++ b/GNUmakefile -@@ -162,10 +162,10 @@ C_OTHER_OBJECTS = $(C_OTHER_SOURCES:.c=.o) +@@ -170,12 +170,12 @@ C_OTHER_OBJECTS = $(C_OTHER_SOURCES:.c=. JAVA_CLASSES = $(JAVA_SOURCES:.java=.class) JAVA_RUNTIME_CLASSES=$(JAVARUNTIME_SOURCES:.java=.class) -CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations +CFLAGS=-O2 -fPIC -W -Wall -Wmissing-prototypes -Wmissing-declarations - CPPFLAGS=-Iinclude + CPPFLAGS= --all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS) -+all: snowball libstemmer.o libstemmer.so stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS) + INCLUDES=-Iinclude - clean: - rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \ -@@ -212,6 +212,9 @@ libstemmer/libstemmer.o: libstemmer/modules.h $(C_LIB_HEADERS) - libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) +-all: snowball$(EXEEXT) libstemmer.a stemwords$(EXEEXT) $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS) ++all: snowball$(EXEEXT) libstemmer.a libstemmer.so stemwords$(EXEEXT) $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS) + + algorithms.mk: libstemmer/mkalgorithms.pl libstemmer/modules.txt + libstemmer/mkalgorithms.pl algorithms.mk libstemmer/modules.txt +@@ -225,6 +225,9 @@ libstemmer/libstemmer.o: libstemmer/modu + libstemmer.a: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) $(AR) -cru $@ $^ +libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) + $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,libstemmer.so.0,-version-script,libstemmer/symbol.map -o $@.0.0.0 $^ + - stemwords: $(STEMWORDS_OBJECTS) libstemmer.o - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ + examples/%.o: examples/%.c + $(CC) $(CFLAGS) $(INCLUDES) $(CPPFLAGS) -c -o $@ $< -diff --git a/libstemmer/symbol.map b/libstemmer/symbol.map -new file mode 100644 -index 0000000..7a3d423 --- /dev/null +++ b/libstemmer/symbol.map @@ -0,0 +1,6 @@ @@ -58,6 +55,3 @@ index 0000000..7a3d423 + local: + *; +}; --- -2.20.1 - diff --git a/meta-oe/recipes-support/libstemmer/libstemmer_git.bb b/meta-oe/recipes-support/libstemmer/libstemmer_2.2.0.bb index 7f0706e207..be2935a385 100644 --- a/meta-oe/recipes-support/libstemmer/libstemmer_git.bb +++ b/meta-oe/recipes-support/libstemmer/libstemmer_2.2.0.bb @@ -3,21 +3,18 @@ HOMEPAGE = "https://snowballstem.org/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=19139aaf3c8c8fa1ca6edd59c072fb9f" -DEPENDS:class-target = "${BPN}-native" +DEPENDS:append:class-target = " ${BPN}-native" -SRC_URI = "\ - git://github.com/snowballstem/snowball.git;branch=master;protocol=https \ - file://0001-Build-so-lib.patch \ -" -SRCREV = "4764395431c8f2a0b4fe18b816ab1fc966a45837" +SRC_URI = "git://github.com/snowballstem/snowball.git;branch=master;protocol=https \ + file://0001-Build-so-lib.patch \ + " +SRCREV = "48a67a2831005f49c48ec29a5837640e23e54e6b" S = "${WORKDIR}/git" -PV = "2.1.0" + LIBVER = "0.0.0" inherit lib_package -BBCLASSEXTEND = "native" - do_compile:prepend:class-target() { # use native tools sed -i 's:./snowball :snowball :g' ${S}/GNUmakefile @@ -34,5 +31,7 @@ do_install() { ln -s libstemmer.so.${LIBVER} ${D}${libdir}/libstemmer.so install -d ${D}${includedir} - install -m 644 ${S}/include/*.h ${D}${includedir} + install -m 644 ${S}/include/*.h ${D}${includedir} } + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/libtar/files/0002-Do-not-strip-libtar.patch b/meta-oe/recipes-support/libtar/files/0002-Do-not-strip-libtar.patch index 31c0d29e93..4929eece06 100644 --- a/meta-oe/recipes-support/libtar/files/0002-Do-not-strip-libtar.patch +++ b/meta-oe/recipes-support/libtar/files/0002-Do-not-strip-libtar.patch @@ -4,6 +4,8 @@ Date: Wed, 2 Nov 2016 05:43:43 -0400 Subject: [PATCH] Do not strip libtar. --- +Upstream-Status: Pending + libtar/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/libtar/files/fix_libtool_sysroot.patch b/meta-oe/recipes-support/libtar/files/fix_libtool_sysroot.patch index 178a970299..efde754be7 100644 --- a/meta-oe/recipes-support/libtar/files/fix_libtool_sysroot.patch +++ b/meta-oe/recipes-support/libtar/files/fix_libtool_sysroot.patch @@ -1,4 +1,6 @@ --- +Upstream-Status: Pending + configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch b/meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch index a4a17ed85b..f0bd53ee8e 100644 --- a/meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch +++ b/meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch @@ -8,6 +8,8 @@ teamnl.c:160:2: error: unknown type name 'fd_set'; did you mean 'fpos_t'? Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + utils/teamnl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch b/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch index beabf63ca3..ed877a721e 100644 --- a/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch +++ b/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch @@ -12,6 +12,8 @@ tinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr' Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + teamd/teamd_runner_lacp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/libtinyxml2/files/run-ptest b/meta-oe/recipes-support/libtinyxml2/files/run-ptest new file mode 100644 index 0000000000..870912672e --- /dev/null +++ b/meta-oe/recipes-support/libtinyxml2/files/run-ptest @@ -0,0 +1,10 @@ +#!/bin/sh + +for i in `ls xmltest`; do + ./$i + if [ $? -eq 0 ]; then + echo "PASS: $i" + else + echo "FAIL: $i" + fi +done diff --git a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_9.0.0.bb b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_9.0.0.bb index 7f205987f4..7ef4d89ce0 100644 --- a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_9.0.0.bb +++ b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_9.0.0.bb @@ -4,14 +4,22 @@ SECTION = "libs" LICENSE = "Zlib" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=135624eef03e1f1101b9ba9ac9b5fffd" -SRC_URI = "git://github.com/leethomason/tinyxml2.git;branch=master;protocol=https" - SRCREV = "1dee28e51f9175a31955b9791c74c430fe13dc82" +SRC_URI = "git://github.com/leethomason/tinyxml2.git;branch=master;protocol=https \ + file://run-ptest" S = "${WORKDIR}/git" -inherit cmake +inherit meson ptest -BBCLASSEXTEND = "native" +EXTRA_OEMESON += "${@bb.utils.contains('PTEST_ENABLED', '1', '-Dtests=true', '', d)}" + +CXXFLAGS:append:libc-musl = " -D_LARGEFILE64_SOURCE" -EXTRA_OECMAKE += "-Dtinyxml2_SHARED_LIBS=YES" +do_install_ptest() { + install -Dm 0755 ${B}/xmltest ${D}${PTEST_PATH}/xmltest + install -d ${D}${PTEST_PATH}/resources/out + install -Dm 0644 ${B}/resources/*.xml ${D}${PTEST_PATH}/resources/ +} + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/libtommath/libtommath_1.2.0.bb b/meta-oe/recipes-support/libtommath/libtommath_1.2.0.bb new file mode 100644 index 0000000000..1efccdd843 --- /dev/null +++ b/meta-oe/recipes-support/libtommath/libtommath_1.2.0.bb @@ -0,0 +1,23 @@ +SUMMARY = "LibTomMath is a number theoretic multiple-precision integer library" +HOMEPAGE = "https://www.libtom.net/LibTomMath" +SECTION = "libs" +LICENSE = "Unlicense" +LIC_FILES_CHKSUM = "file://LICENSE;md5=23e7e0a32e53a2b1d35f5fd9ef053402" + +DEPENDS = "libtool-cross" + +SRC_URI = "git://github.com/libtom/libtommath.git;protocol=https;branch=master" + +SRCREV = "6ca6898bf37f583c4cc9943441cd60dd69f4b8f2" + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = "'PREFIX=${prefix}' 'DESTDIR=${D}' 'LIBPATH=${libdir}' 'CFLAGS=${CFLAGS}'" + +do_compile() { + oe_runmake -f makefile.shared +} + +do_install() { + oe_runmake -f makefile.shared install +} diff --git a/meta-oe/recipes-support/liburing/liburing/0001-examples-test-Remove-unused-linux-errqueue.h.patch b/meta-oe/recipes-support/liburing/liburing/0001-examples-test-Remove-unused-linux-errqueue.h.patch new file mode 100644 index 0000000000..21aaf8d991 --- /dev/null +++ b/meta-oe/recipes-support/liburing/liburing/0001-examples-test-Remove-unused-linux-errqueue.h.patch @@ -0,0 +1,47 @@ +From 0fbcc44fe1fb2dc6807660b2cff1c2995add095b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 18 Feb 2023 18:01:22 -0800 +Subject: [PATCH] examples,test: Remove unused linux/errqueue.h + +This header is not needed therefore remove it, this cleanup also helps +compiling on musl/clang + +/usr/include/linux/errqueue.h:57:20: error: array has incomplete element typ +e 'struct timespec' + struct timespec ts[3]; + ^ + +Upstream-Status: Submitted [https://github.com/axboe/liburing/pull/798] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + examples/send-zerocopy.c | 1 - + test/send-zerocopy.c | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/examples/send-zerocopy.c b/examples/send-zerocopy.c +index 6092af9..cf1fa8b 100644 +--- a/examples/send-zerocopy.c ++++ b/examples/send-zerocopy.c +@@ -13,7 +13,6 @@ + #include <string.h> + + #include <arpa/inet.h> +-#include <linux/errqueue.h> + #include <linux/if_packet.h> + #include <linux/ipv6.h> + #include <linux/socket.h> +diff --git a/test/send-zerocopy.c b/test/send-zerocopy.c +index 86a31cd..5d578c6 100644 +--- a/test/send-zerocopy.c ++++ b/test/send-zerocopy.c +@@ -11,7 +11,6 @@ + #include <string.h> + + #include <arpa/inet.h> +-#include <linux/errqueue.h> + #include <linux/if_packet.h> + #include <linux/ipv6.h> + #include <linux/socket.h> +-- +2.39.2 + diff --git a/meta-oe/recipes-support/liburing/liburing_2.2.bb b/meta-oe/recipes-support/liburing/liburing_2.3.bb index 8cc7d74f9f..7d8c2f596d 100644 --- a/meta-oe/recipes-support/liburing/liburing_2.2.bb +++ b/meta-oe/recipes-support/liburing/liburing_2.3.bb @@ -9,11 +9,13 @@ 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" +SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https \ + file://0001-examples-test-Remove-unused-linux-errqueue.h.patch" SRC_URI:append:libc-musl:riscv64 = " file://0001-do-not-build-examples.patch " SRC_URI:append:libc-musl:riscv32 = " file://0001-do-not-build-examples.patch " -SRCREV = "dda4848a9911120a903bef6284fb88286f4464c9" +SRCREV = "f5cac78e621ab452d3035902085f66d2bf73243b" +PV .= "+2.4+git${SRCPV}" S = "${WORKDIR}/git" DEPENDS:append:libc-musl = " libucontext" @@ -27,3 +29,5 @@ do_configure() { do_install () { oe_runmake install DESTDIR=${D} } + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch b/meta-oe/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch index f4f759c85e..7df44737ad 100644 --- a/meta-oe/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch +++ b/meta-oe/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch @@ -8,21 +8,23 @@ We need the definitions for things like u_intX_t Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> - --- libusb/usb.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libusb/usb.h b/libusb/usb.h -index fa0e6c6..4e88eb8 100644 +index ea62543..18b610a 100644 --- a/libusb/usb.h +++ b/libusb/usb.h -@@ -45,6 +45,8 @@ typedef unsigned __int32 uint32_t; +@@ -46,6 +46,8 @@ typedef unsigned __int32 uint32_t; #include <stdint.h> #endif +#include <sys/types.h> + - /* - * USB spec information - * + /* On linux PATH_MAX is defined in linux/limits.h. */ + #if defined(__linux__) + #include <linux/limits.h> +-- +2.34.1 + diff --git a/meta-oe/recipes-support/libusb/libusb-compat/0002-automake-make-example-programs-installable.patch b/meta-oe/recipes-support/libusb/libusb-compat/0002-automake-make-example-programs-installable.patch new file mode 100644 index 0000000000..faf532cad2 --- /dev/null +++ b/meta-oe/recipes-support/libusb/libusb-compat/0002-automake-make-example-programs-installable.patch @@ -0,0 +1,24 @@ +From 9dcdfa716e3c3831d9b70472b39dab2fd370f503 Mon Sep 17 00:00:00 2001 +From: Yoann Congal <yoann.congal@smile.fr> +Date: Sun, 26 Feb 2023 16:04:35 +0100 +Subject: [PATCH] automake: make example programs installable + +The example programs are used as tests for ptest, so we need a way to +install them on the rootfs. + +Upstream-Status: Inappropriate [oe-core specific] +--- + examples/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/Makefile.am b/examples/Makefile.am +index 9bd3efc..f4324c2 100644 +--- a/examples/Makefile.am ++++ b/examples/Makefile.am +@@ -1,5 +1,5 @@ + AM_CPPFLAGS = -I$(top_srcdir)/libusb +-noinst_PROGRAMS = lsusb testlibusb ++bin_PROGRAMS = lsusb testlibusb + + lsusb_SOURCES = lsusb.c + lsusb_LDADD = ../libusb/libusb.la diff --git a/meta-oe/recipes-support/libusb/libusb-compat/run-ptest b/meta-oe/recipes-support/libusb/libusb-compat/run-ptest new file mode 100644 index 0000000000..901662d696 --- /dev/null +++ b/meta-oe/recipes-support/libusb/libusb-compat/run-ptest @@ -0,0 +1,14 @@ +#!/bin/sh + +rc=0 +for TEST in lsusb testlibusb; do + if ! ./$TEST ; then + echo "FAIL: $TEST" + rc=$((rc + 1)) + else + echo "PASS: $TEST" + fi +done + +# return number of failed tests +exit $rc diff --git a/meta-oe/recipes-support/libusb/libusb-compat_0.1.7.bb b/meta-oe/recipes-support/libusb/libusb-compat_0.1.8.bb index 5ab08f6e50..57f1f54387 100644 --- a/meta-oe/recipes-support/libusb/libusb-compat_0.1.7.bb +++ b/meta-oe/recipes-support/libusb/libusb-compat_0.1.8.bb @@ -9,6 +9,9 @@ LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=f2ac5f3ac4835e8f91324a26a590a423" DEPENDS = "libusb1" +# libusb-compat dlopen() libusb1 so we need to explicitly RDEPENDS on it +RDEPENDS:${PN} += "libusb1" + # Few packages are known not to work with libusb-compat (e.g. libmtp-1.0.0), # so here libusb-0.1 is removed completely instead of adding virtual/libusb0. # Besides, libusb-0.1 uses a per 1ms polling that hurts a lot to power @@ -21,21 +24,24 @@ PE = "1" SRC_URI = " \ git://github.com/libusb/libusb-compat-0.1.git;protocol=https;branch=master \ file://0001-usb.h-Include-sys-types.h.patch \ + file://0002-automake-make-example-programs-installable.patch \ + file://run-ptest \ " -SRCREV = "4a27760ec5954ec8605e052a3207afbe0979eeef" +SRCREV = "c497eff1ae8c4cfd4fdff370f04c78fa0584f4f3" S = "${WORKDIR}/git" UPSTREAM_CHECK_URI = "https://github.com/libusb/libusb-compat-0.1/releases" BINCONFIG = "${bindir}/libusb-config" -inherit autotools pkgconfig binconfig-disabled lib_package +inherit autotools pkgconfig binconfig-disabled lib_package ptest -EXTRA_OECONF = "--libdir=${base_libdir}" +# examples are used as ptest so enable them at configuration if needed +EXTRA_OECONF += "${@bb.utils.contains('PTEST_ENABLED', '1', '--enable-examples-build', '', d)}" -do_install:append() { - install -d ${D}${libdir} - if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then - mv ${D}${base_libdir}/pkgconfig ${D}${libdir} - fi +# Move test binaries out of bindir to avoid clashing with a "real" lsusb. +do_install_ptest() { + for bin in lsusb testlibusb; do + mv ${D}${bindir}/$bin ${D}${PTEST_PATH} + done } diff --git a/meta-oe/recipes-support/libusbgx/libusbgx/0001-fix-stack-buffer-overflow-in-usbg_f_foo_attr_val-pro.patch b/meta-oe/recipes-support/libusbgx/libusbgx/0001-fix-stack-buffer-overflow-in-usbg_f_foo_attr_val-pro.patch new file mode 100644 index 0000000000..1ab3494e18 --- /dev/null +++ b/meta-oe/recipes-support/libusbgx/libusbgx/0001-fix-stack-buffer-overflow-in-usbg_f_foo_attr_val-pro.patch @@ -0,0 +1,796 @@ +From fc7855891c66599487265701294963bb0772bb80 Mon Sep 17 00:00:00 2001 +From: Wlodzimierz Lipert <wlodzimierz.lipert@gmail.com> +Date: Mon, 28 Nov 2022 08:29:54 +0100 +Subject: [PATCH] fix: stack-buffer-overflow in usbg_f_foo_attr_val processing. + Changed ABI version from 2 to 3. + +Upstream-Status: Submitted [https://github.com/linux-usb-gadgets/libusbgx/pull/72] + +Signed-off-by: Wlodzimierz Lipert <wlodzimierz.lipert@gmail.com> +Signed-off-by: Ming Liu <liu.ming50@gmail.com> +--- + include/usbg/function/hid.h | 28 ++++++++++++---------------- + include/usbg/function/midi.h | 35 +++++++++++++---------------------- + include/usbg/function/ms.h | 30 +++++++++++------------------- + include/usbg/function/net.h | 34 ++++++++++++++-------------------- + include/usbg/function/uac2.h | 29 +++++++++++++---------------- + include/usbg/usbg_internal.h | 10 +++++----- + src/Makefile.am | 2 +- + src/function/ether.c | 10 +++++----- + src/function/hid.c | 12 ++++++------ + src/function/midi.c | 10 +++++----- + src/function/ms.c | 10 +++++----- + src/function/uac2.c | 10 +++++----- + src/function/uvc.c | 10 +++++----- + src/usbg_common.c | 2 +- + 14 files changed, 101 insertions(+), 131 deletions(-) + +diff --git a/include/usbg/function/hid.h b/include/usbg/function/hid.h +index 3463140..3b3907b 100644 +--- a/include/usbg/function/hid.h ++++ b/include/usbg/function/hid.h +@@ -56,11 +56,6 @@ union usbg_f_hid_attr_val { + unsigned int subclass; + }; + +-#define USBG_F_HID_UINT_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_hid_attr_val, protocol, WHAT) +- +-#define USBG_F_HID_RDESC_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_hid_attr_val, report_desc, WHAT) + /** + * @brief Cast from generic function to hid function + * @param[in] f function to be converted to hid funciton. +@@ -137,7 +132,7 @@ int usbg_f_hid_get_attr_val(usbg_f_hid *hf, enum usbg_f_hid_attr attr, + * @return 0 on success usbg_error if error occurred. + */ + int usbg_f_hid_set_attr_val(usbg_f_hid *hf, enum usbg_f_hid_attr attr, +- union usbg_f_hid_attr_val val); ++ const union usbg_f_hid_attr_val *val); + + /** + * @brief Get the minor and major of corresponding character device +@@ -173,8 +168,9 @@ static inline int usbg_f_hid_get_protocol(usbg_f_hid *hf, + static inline int usbg_f_hid_set_protocol(usbg_f_hid *hf, + unsigned int protocol) + { +- return usbg_f_hid_set_attr_val(hf, USBG_F_HID_PROTOCOL, +- USBG_F_HID_UINT_TO_ATTR_VAL(protocol)); ++ ++ union usbg_f_hid_attr_val val = {.protocol = protocol}; ++ return usbg_f_hid_set_attr_val(hf, USBG_F_HID_PROTOCOL, &val); + } + + /** +@@ -199,8 +195,8 @@ static inline int usbg_f_hid_get_report_desc(usbg_f_hid *hf, + static inline int usbg_f_hid_set_report_desc(usbg_f_hid *hf, + struct usbg_f_hid_report_desc report_desc) + { +- return usbg_f_hid_set_attr_val(hf, USBG_F_HID_REPORT_DESC, +- USBG_F_HID_RDESC_TO_ATTR_VAL(report_desc)); ++ union usbg_f_hid_attr_val val = {.report_desc = report_desc}; ++ return usbg_f_hid_set_attr_val(hf, USBG_F_HID_REPORT_DESC, &val); + } + + /** +@@ -242,8 +238,8 @@ static inline int usbg_f_hid_set_report_desc_raw(usbg_f_hid *hf, + .len = len, + }; + +- return usbg_f_hid_set_attr_val(hf, USBG_F_HID_REPORT_DESC, +- USBG_F_HID_RDESC_TO_ATTR_VAL(report_desc)); ++ union usbg_f_hid_attr_val val = {.report_desc = report_desc}; ++ return usbg_f_hid_set_attr_val(hf, USBG_F_HID_REPORT_DESC, &val); + } + + /** +@@ -268,8 +264,8 @@ static inline int usbg_f_hid_get_report_length(usbg_f_hid *hf, + static inline int usbg_f_hid_set_report_length(usbg_f_hid *hf, + unsigned int report_length) + { +- return usbg_f_hid_set_attr_val(hf, USBG_F_HID_REPORT_LENGTH, +- USBG_F_HID_UINT_TO_ATTR_VAL(report_length)); ++ union usbg_f_hid_attr_val val = {.report_length = report_length}; ++ return usbg_f_hid_set_attr_val(hf, USBG_F_HID_REPORT_LENGTH, &val); + } + + /** +@@ -294,8 +290,8 @@ static inline int usbg_f_hid_get_subclass(usbg_f_hid *hf, + static inline int usbg_f_hid_set_subclass(usbg_f_hid *hf, + unsigned int subclass) + { +- return usbg_f_hid_set_attr_val(hf, USBG_F_HID_SUBCLASS, +- USBG_F_HID_UINT_TO_ATTR_VAL(subclass)); ++ union usbg_f_hid_attr_val val = {.subclass = subclass}; ++ return usbg_f_hid_set_attr_val(hf, USBG_F_HID_SUBCLASS, &val); + } + + #ifdef __cplusplus +diff --git a/include/usbg/function/midi.h b/include/usbg/function/midi.h +index 39df047..b9d9d4f 100644 +--- a/include/usbg/function/midi.h ++++ b/include/usbg/function/midi.h +@@ -53,15 +53,6 @@ union usbg_f_midi_attr_val { + unsigned int qlen; + }; + +-#define USBG_F_MIDI_INT_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_midi_attr_val, index, WHAT) +- +-#define USBG_F_MIDI_UINT_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_midi_attr_val, qlen, WHAT) +- +-#define USBG_F_MIDI_CCHAR_PTR_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_midi_attr_val, id, WHAT) +- + /** + * @brief Cast from generic function to midi function + * @param[in] f function to be converted to midi funciton. +@@ -126,7 +117,7 @@ int usbg_f_midi_get_attr_val(usbg_f_midi *mf, enum usbg_f_midi_attr attr, + * @return 0 on success usbg_error if error occurred. + */ + int usbg_f_midi_set_attr_val(usbg_f_midi *mf, enum usbg_f_midi_attr attr, +- union usbg_f_midi_attr_val val); ++ const union usbg_f_midi_attr_val *val); + + /** + * @brief Get the index value of MIDI adapter +@@ -148,8 +139,8 @@ static inline int usbg_f_midi_get_index(usbg_f_midi *mf, int *index) + */ + static inline int usbg_f_midi_set_index(usbg_f_midi *mf, int index) + { +- return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_INDEX, +- USBG_F_MIDI_INT_TO_ATTR_VAL(index)); ++ union usbg_f_midi_attr_val val = {.index = index}; ++ return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_INDEX, &val); + } + + /** +@@ -188,8 +179,8 @@ int usbg_f_midi_get_id_s(usbg_f_midi *mf, char *buf, int len); + */ + static inline int usbg_f_midi_set_id(usbg_f_midi *mf, const char *id) + { +- return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_ID, +- USBG_F_MIDI_CCHAR_PTR_TO_ATTR_VAL(id)); ++ union usbg_f_midi_attr_val val = {.id = id}; ++ return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_ID, &val); + } + + /** +@@ -212,8 +203,8 @@ static inline int usbg_f_midi_get_in_ports(usbg_f_midi *mf, unsigned *in_ports) + */ + static inline int usbg_f_midi_set_in_ports(usbg_f_midi *mf, unsigned in_ports) + { +- return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_IN_PORTS, +- USBG_F_MIDI_UINT_TO_ATTR_VAL(in_ports)); ++ union usbg_f_midi_attr_val val = {.in_ports = in_ports}; ++ return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_IN_PORTS, &val); + } + + /** +@@ -236,8 +227,8 @@ static inline int usbg_f_midi_get_out_ports(usbg_f_midi *mf, unsigned *out_ports + */ + static inline int usbg_f_midi_set_out_ports(usbg_f_midi *mf, unsigned out_ports) + { +- return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_OUT_PORTS, +- USBG_F_MIDI_UINT_TO_ATTR_VAL(out_ports)); ++ union usbg_f_midi_attr_val val = {.out_ports = out_ports}; ++ return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_OUT_PORTS, &val); + } + + /** +@@ -264,8 +255,8 @@ static inline int usbg_f_midi_get_buflen(usbg_f_midi *mf, int *buflen) + */ + static inline int usbg_f_midi_set_buflen(usbg_f_midi *mf, unsigned buflen) + { +- return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_BUFLEN, +- USBG_F_MIDI_UINT_TO_ATTR_VAL(buflen)); ++ union usbg_f_midi_attr_val val = {.buflen = buflen}; ++ return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_BUFLEN, &val); + } + + /** +@@ -288,8 +279,8 @@ static inline int usbg_f_midi_get_qlen(usbg_f_midi *mf, unsigned *qlen) + */ + static inline int usbg_f_midi_set_qlen(usbg_f_midi *mf, unsigned qlen) + { +- return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_QLEN, +- USBG_F_MIDI_UINT_TO_ATTR_VAL(qlen)); ++ union usbg_f_midi_attr_val val = {.qlen = qlen}; ++ return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_QLEN, &val); + } + + #ifdef __cplusplus +diff --git a/include/usbg/function/ms.h b/include/usbg/function/ms.h +index 780464c..f52eb78 100644 +--- a/include/usbg/function/ms.h ++++ b/include/usbg/function/ms.h +@@ -56,14 +56,6 @@ union usbg_f_ms_lun_attr_val { + const char *file; + }; + +-#define USBG_F_MS_LUN_BOOL_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_ms_lun_attr_val, cdrom, WHAT) +- +-#define USBG_F_MS_LUN_CCHAR_PTR_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_ms_lun_attr_val, file, WHAT) +- +- +- + /** + * @brief Cast from generic function to mass storage function + * @param[in] f function to be converted to ms funciton. +@@ -157,7 +149,7 @@ int usbg_f_ms_get_lun_attr_val(usbg_f_ms *mf, int lun_id, + */ + int usbg_f_ms_set_lun_attr_val(usbg_f_ms *mf, int lun_id, + enum usbg_f_ms_lun_attr lattr, +- const union usbg_f_ms_lun_attr_val val); ++ const union usbg_f_ms_lun_attr_val *val); + + /** + * @brief Get the value which determines if lun is visible as a cdrom +@@ -183,8 +175,8 @@ static inline int usbg_f_ms_get_lun_cdrom(usbg_f_ms *mf, int lun_id, + static inline int usbg_f_ms_set_lun_cdrom(usbg_f_ms *mf, int lun_id, + bool cdrom) + { +- return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_CDROM, +- USBG_F_MS_LUN_BOOL_TO_ATTR_VAL(cdrom)); ++ union usbg_f_ms_lun_attr_val val = {.cdrom = cdrom}; ++ return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_CDROM, &val); + } + + /** +@@ -209,8 +201,8 @@ static inline int usbg_f_ms_get_lun_ro(usbg_f_ms *mf, int lun_id, bool *ro) + */ + static inline int usbg_f_ms_set_lun_ro(usbg_f_ms *mf, int lun_id, bool ro) + { +- return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_RO, +- USBG_F_MS_LUN_BOOL_TO_ATTR_VAL(ro)); ++ union usbg_f_ms_lun_attr_val val = {.ro = ro}; ++ return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_RO, &val); + } + + /** +@@ -239,8 +231,8 @@ static inline int usbg_f_ms_get_lun_nofua(usbg_f_ms *mf, int lun_id, + static inline int usbg_f_ms_set_lun_nofua(usbg_f_ms *mf, int lun_id, + bool nofua) + { +- return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_NOFUA, +- USBG_F_MS_LUN_BOOL_TO_ATTR_VAL(nofua)); ++ union usbg_f_ms_lun_attr_val val = {.nofua = nofua}; ++ return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_NOFUA, &val); + } + + /** +@@ -267,8 +259,8 @@ static inline int usbg_f_ms_get_lun_removable(usbg_f_ms *mf, int lun_id, + static inline int usbg_f_ms_set_lun_removable(usbg_f_ms *mf, int lun_id, + bool removable) + { +- return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_REMOVABLE, +- USBG_F_MS_LUN_BOOL_TO_ATTR_VAL(removable)); ++ union usbg_f_ms_lun_attr_val val = {.removable = removable}; ++ return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_REMOVABLE, &val); + } + + /** +@@ -313,8 +305,8 @@ int usbg_f_ms_get_lun_file_s(usbg_f_ms *mf, int lun_id, + static inline int usbg_f_ms_set_lun_file(usbg_f_ms *mf, int lun_id, + const char *file) + { +- return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_FILE, +- USBG_F_MS_LUN_CCHAR_PTR_TO_ATTR_VAL(file)); ++ union usbg_f_ms_lun_attr_val val = {.file = file}; ++ return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_FILE, &val); + } + + /** +diff --git a/include/usbg/function/net.h b/include/usbg/function/net.h +index b0409f1..06cee30 100644 +--- a/include/usbg/function/net.h ++++ b/include/usbg/function/net.h +@@ -56,12 +56,6 @@ union usbg_f_net_attr_val { + unsigned int protocol; + }; + +-#define USBG_F_NET_ETHER_ADDR_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_net_attr_val, dev_addr, WHAT) +- +-#define USBG_F_NET_INT_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_net_attr_val, qmult, WHAT) +- + /** + * @brief Cast from generic function to net function + * @param[in] f function to be converted to net funciton. +@@ -125,7 +119,7 @@ int usbg_f_net_get_attr_val(usbg_f_net *nf, enum usbg_f_net_attr attr, + * @return 0 on success usbg_error if error occurred. + */ + int usbg_f_net_set_attr_val(usbg_f_net *nf, enum usbg_f_net_attr attr, +- const union usbg_f_net_attr_val val); ++ const union usbg_f_net_attr_val *val); + + /** + * @brief Get the value of device side MAC address +@@ -136,7 +130,7 @@ int usbg_f_net_set_attr_val(usbg_f_net *nf, enum usbg_f_net_attr attr, + static inline int usbg_f_net_get_dev_addr(usbg_f_net *nf, + struct ether_addr *addr) + { +- union usbg_f_net_attr_val val = { .dev_addr = *addr, }; ++ union usbg_f_net_attr_val val = {.dev_addr = *addr}; + return usbg_f_net_get_attr_val(nf, USBG_F_NET_DEV_ADDR, &val); + } + +@@ -149,8 +143,8 @@ static inline int usbg_f_net_get_dev_addr(usbg_f_net *nf, + static inline int usbg_f_net_set_dev_addr(usbg_f_net *nf, + const struct ether_addr *addr) + { +- return usbg_f_net_set_attr_val(nf, USBG_F_NET_DEV_ADDR, +- USBG_F_NET_ETHER_ADDR_TO_ATTR_VAL(*addr)); ++ union usbg_f_net_attr_val val = {.dev_addr = *addr}; ++ return usbg_f_net_set_attr_val(nf, USBG_F_NET_DEV_ADDR, &val); + } + + /** +@@ -175,8 +169,8 @@ static inline int usbg_f_net_get_host_addr(usbg_f_net *nf, + static inline int usbg_f_net_set_host_addr(usbg_f_net *nf, + const struct ether_addr *addr) + { +- return usbg_f_net_set_attr_val(nf, USBG_F_NET_HOST_ADDR, +- USBG_F_NET_ETHER_ADDR_TO_ATTR_VAL(*addr)); ++ union usbg_f_net_attr_val val = {.host_addr = *addr}; ++ return usbg_f_net_set_attr_val(nf, USBG_F_NET_HOST_ADDR, &val); + } + + /** +@@ -226,8 +220,8 @@ static inline int usbg_f_net_get_qmult(usbg_f_net *nf, int *qmult) + */ + static inline int usbg_f_net_set_qmult(usbg_f_net *nf, int qmult) + { +- return usbg_f_net_set_attr_val(nf, USBG_F_NET_QMULT, +- USBG_F_NET_INT_TO_ATTR_VAL(qmult)); ++ union usbg_f_net_attr_val val = {.qmult = qmult}; ++ return usbg_f_net_set_attr_val(nf, USBG_F_NET_QMULT, &val); + } + + /** +@@ -250,8 +244,8 @@ static inline int usbg_f_net_get_class(usbg_f_net *nf, unsigned int *class_) + */ + static inline int usbg_f_net_set_class(usbg_f_net *nf, unsigned int class_) + { +- return usbg_f_net_set_attr_val(nf, USBG_F_NET_CLASS, +- USBG_F_NET_INT_TO_ATTR_VAL(class_)); ++ union usbg_f_net_attr_val val = {.class_ = class_}; ++ return usbg_f_net_set_attr_val(nf, USBG_F_NET_CLASS, &val); + } + + /** +@@ -274,8 +268,8 @@ static inline int usbg_f_net_get_subclass(usbg_f_net *nf, int *subclass) + */ + static inline int usbg_f_net_set_subclass(usbg_f_net *nf, unsigned int subclass) + { +- return usbg_f_net_set_attr_val(nf, USBG_F_NET_SUBCLASS, +- USBG_F_NET_INT_TO_ATTR_VAL(subclass)); ++ union usbg_f_net_attr_val val = {.subclass = subclass}; ++ return usbg_f_net_set_attr_val(nf, USBG_F_NET_SUBCLASS, &val); + } + + /** +@@ -298,8 +292,8 @@ static inline int usbg_f_net_get_protocol(usbg_f_net *nf, int *protocol) + */ + static inline int usbg_f_net_set_protocol(usbg_f_net *nf, unsigned int protocol) + { +- return usbg_f_net_set_attr_val(nf, USBG_F_NET_PROTOCOL, +- USBG_F_NET_INT_TO_ATTR_VAL(protocol)); ++ union usbg_f_net_attr_val val = {.protocol = protocol}; ++ return usbg_f_net_set_attr_val(nf, USBG_F_NET_PROTOCOL, &val); + } + + #ifdef __cplusplus +diff --git a/include/usbg/function/uac2.h b/include/usbg/function/uac2.h +index c1bbb14..1ea55dc 100644 +--- a/include/usbg/function/uac2.h ++++ b/include/usbg/function/uac2.h +@@ -53,9 +53,6 @@ union usbg_f_uac2_attr_val { + int p_ssize; + }; + +-#define USBG_F_UAC2_INT_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_uac2_attr_val, c_chmask, WHAT) +- + /** + * @brief Cast from generic function to uac2 function + * @param[in] f function to be converted to uac2 funciton. +@@ -115,7 +112,7 @@ int usbg_f_uac2_get_attr_val(usbg_f_uac2 *af, enum usbg_f_uac2_attr attr, + * @return 0 on success usbg_error if error occurred. + */ + int usbg_f_uac2_set_attr_val(usbg_f_uac2 *af, enum usbg_f_uac2_attr attr, +- union usbg_f_uac2_attr_val val); ++ const union usbg_f_uac2_attr_val *val); + + /** + * @brief Get the capture channel mask of UAC2 adapter +@@ -137,8 +134,8 @@ static inline int usbg_f_uac2_get_c_chmask(usbg_f_uac2 *af, int *c_chmask) + */ + static inline int usbg_f_uac2_set_c_chmask(usbg_f_uac2 *af, int c_chmask) + { +- return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_C_CHMASK, +- USBG_F_UAC2_INT_TO_ATTR_VAL(c_chmask)); ++ union usbg_f_uac2_attr_val val = {.c_chmask = c_chmask}; ++ return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_C_CHMASK, &val); + } + + /** +@@ -161,8 +158,8 @@ static inline int usbg_f_uac2_get_c_srate(usbg_f_uac2 *af, int *c_srate) + */ + static inline int usbg_f_uac2_set_c_srate(usbg_f_uac2 *af, int c_srate) + { +- return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_C_SRATE, +- USBG_F_UAC2_INT_TO_ATTR_VAL(c_srate)); ++ union usbg_f_uac2_attr_val val = {.c_srate = c_srate}; ++ return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_C_SRATE, &val); + } + + /** +@@ -185,8 +182,8 @@ static inline int usbg_f_uac2_get_c_ssize(usbg_f_uac2 *af, int *c_ssize) + */ + static inline int usbg_f_uac2_set_c_ssize(usbg_f_uac2 *af, int c_ssize) + { +- return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_C_SSIZE, +- USBG_F_UAC2_INT_TO_ATTR_VAL(c_ssize)); ++ union usbg_f_uac2_attr_val val = {.c_ssize = c_ssize}; ++ return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_C_SSIZE, &val); + } + + /** +@@ -209,8 +206,8 @@ static inline int usbg_f_uac2_get_p_chmask(usbg_f_uac2 *af, int *p_chmask) + */ + static inline int usbg_f_uac2_set_p_chmask(usbg_f_uac2 *af, int p_chmask) + { +- return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_P_CHMASK, +- USBG_F_UAC2_INT_TO_ATTR_VAL(p_chmask)); ++ union usbg_f_uac2_attr_val val = {.p_chmask = p_chmask}; ++ return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_P_CHMASK, &val); + } + + /** +@@ -233,8 +230,8 @@ static inline int usbg_f_uac2_get_p_srate(usbg_f_uac2 *af, int *p_srate) + */ + static inline int usbg_f_uac2_set_p_srate(usbg_f_uac2 *af, int p_srate) + { +- return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_P_SRATE, +- USBG_F_UAC2_INT_TO_ATTR_VAL(p_srate)); ++ union usbg_f_uac2_attr_val val = {.p_srate = p_srate}; ++ return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_P_SRATE, &val); + } + + /** +@@ -257,8 +254,8 @@ static inline int usbg_f_uac2_get_p_ssize(usbg_f_uac2 *af, int *p_ssize) + */ + static inline int usbg_f_uac2_set_p_ssize(usbg_f_uac2 *af, int p_ssize) + { +- return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_P_SSIZE, +- USBG_F_UAC2_INT_TO_ATTR_VAL(p_ssize)); ++ union usbg_f_uac2_attr_val val = {.p_ssize = p_ssize}; ++ return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_P_SSIZE, &val); + } + + #ifdef __cplusplus +diff --git a/include/usbg/usbg_internal.h b/include/usbg/usbg_internal.h +index 1d8dfe2..d6a3e3a 100644 +--- a/include/usbg/usbg_internal.h ++++ b/include/usbg/usbg_internal.h +@@ -322,7 +322,7 @@ void usbg_cleanup_function(struct usbg_function *f); + } + + typedef int (*usbg_attr_get_func)(const char *, const char *, const char *, void *); +-typedef int (*usbg_attr_set_func)(const char *, const char *, const char *, void *); ++typedef int (*usbg_attr_set_func)(const char *, const char *, const char *, const void *); + + static inline int usbg_get_dec(const char *path, const char *name, + const char *attr, void *val) +@@ -331,7 +331,7 @@ static inline int usbg_get_dec(const char *path, const char *name, + } + + static inline int usbg_set_dec(const char *path, const char *name, +- const char *attr, void *val) ++ const char *attr, const void *val) + { + return usbg_write_dec(path, name, attr, *((int *)val)); + } +@@ -343,7 +343,7 @@ static inline int usbg_get_bool(const char *path, const char *name, + } + + static inline int usbg_set_bool(const char *path, const char *name, +- const char *attr, void *val) ++ const char *attr, const void *val) + { + return usbg_write_bool(path, name, attr, *((bool *)val)); + } +@@ -355,7 +355,7 @@ static inline int usbg_get_string(const char *path, const char *name, + } + + static inline int usbg_set_string(const char *path, const char *name, +- const char *attr, void *val) ++ const char *attr, const void *val) + { + return usbg_write_string(path, name, attr, *(char **)val); + } +@@ -364,7 +364,7 @@ int usbg_get_ether_addr(const char *path, const char *name, const char *attr, + void *val); + + int usbg_set_ether_addr(const char *path, const char *name, const char *attr, +- void *val); ++ const void *val); + + int usbg_get_dev(const char *path, const char *name, const char *attr, + void *val); +diff --git a/src/Makefile.am b/src/Makefile.am +index 634209f..ac97bc8 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -7,6 +7,6 @@ else + libusbgx_la_SOURCES += usbg_schemes_none.c + endif + libusbgx_la_LDFLAGS = $(LIBCONFIG_LIBS) +-libusbgx_la_LDFLAGS += -version-info 2:0:0 ++libusbgx_la_LDFLAGS += -version-info 3:0:0 + libusbgx_la_CFLAGS = $(LIBCONFIG_CFLAGS) + AM_CPPFLAGS=-I$(top_srcdir)/include/ -I$(top_builddir)/include/usbg +diff --git a/src/function/ether.c b/src/function/ether.c +index ab91af9..d7dcd5d 100644 +--- a/src/function/ether.c ++++ b/src/function/ether.c +@@ -124,7 +124,7 @@ static int ether_libconfig_import(struct usbg_function *f, + if (ret < 0) + break; + +- ret = usbg_f_net_set_attr_val(nf, i, val); ++ ret = usbg_f_net_set_attr_val(nf, i, &val); + if (ret) + break; + } +@@ -258,8 +258,8 @@ int usbg_f_net_set_attrs(usbg_f_net *nf, + continue; + + ret = usbg_f_net_set_attr_val(nf, i, +- *(union usbg_f_net_attr_val *) +- ((char *)attrs ++ (const union usbg_f_net_attr_val *) ++ ((const char *)attrs + + net_attr[i].offset)); + if (ret) + break; +@@ -277,12 +277,12 @@ int usbg_f_net_get_attr_val(usbg_f_net *nf, enum usbg_f_net_attr attr, + } + + int usbg_f_net_set_attr_val(usbg_f_net *nf, enum usbg_f_net_attr attr, +- union usbg_f_net_attr_val val) ++ const union usbg_f_net_attr_val *val) + { + return net_attr[attr].ro ? + USBG_ERROR_INVALID_PARAM : + net_attr[attr].set(nf->func.path, nf->func.name, +- net_attr[attr].name, &val); ++ net_attr[attr].name, val); + } + + int usbg_f_net_get_ifname_s(usbg_f_net *nf, char *buf, int len) +diff --git a/src/function/hid.c b/src/function/hid.c +index 4d075cf..895c2c6 100644 +--- a/src/function/hid.c ++++ b/src/function/hid.c +@@ -69,9 +69,9 @@ static int hid_get_report(const char *path, const char *name, const char *attr, + } + + static int hid_set_report(const char *path, const char *name, const char *attr, +- void *val) ++ const void *val) + { +- struct usbg_f_hid_report_desc *report_desc = val; ++ const struct usbg_f_hid_report_desc *report_desc = val; + char *buf = report_desc->desc; + int len = report_desc->len; + int ret; +@@ -239,7 +239,7 @@ static int hid_libconfig_import(struct usbg_function *f, + if (ret < 0) + break; + +- ret = usbg_f_hid_set_attr_val(hf, i, val); ++ ret = usbg_f_hid_set_attr_val(hf, i, &val); + if (ret) + break; + } +@@ -327,7 +327,7 @@ int usbg_f_hid_set_attrs(usbg_f_hid *hf, + continue; + + ret = usbg_f_hid_set_attr_val(hf, i, +- *(union usbg_f_hid_attr_val *) ++ (union usbg_f_hid_attr_val *) + ((char *)attrs + + hid_attr[i].offset)); + if (ret) +@@ -346,11 +346,11 @@ int usbg_f_hid_get_attr_val(usbg_f_hid *hf, enum usbg_f_hid_attr attr, + } + + int usbg_f_hid_set_attr_val(usbg_f_hid *hf, enum usbg_f_hid_attr attr, +- union usbg_f_hid_attr_val val) ++ const union usbg_f_hid_attr_val *val) + { + return hid_attr[attr].ro ? + USBG_ERROR_INVALID_PARAM : + hid_attr[attr].set(hf->func.path, hf->func.name, +- hid_attr[attr].name, &val); ++ hid_attr[attr].name, val); + } + +diff --git a/src/function/midi.c b/src/function/midi.c +index 1cedb97..2318b49 100644 +--- a/src/function/midi.c ++++ b/src/function/midi.c +@@ -100,7 +100,7 @@ static int midi_libconfig_import(struct usbg_function *f, + if (ret < 0) + break; + +- ret = usbg_f_midi_set_attr_val(mf, i, val); ++ ret = usbg_f_midi_set_attr_val(mf, i, &val); + if (ret) + break; + } +@@ -185,8 +185,8 @@ int usbg_f_midi_set_attrs(usbg_f_midi *mf, + + for (i = USBG_F_MIDI_ATTR_MIN; i < USBG_F_MIDI_ATTR_MAX; ++i) { + ret = usbg_f_midi_set_attr_val(mf, i, +- *(union usbg_f_midi_attr_val *) +- ((char *)attrs ++ (const union usbg_f_midi_attr_val *) ++ ((const char *)attrs + + midi_attr[i].offset)); + if (ret) + break; +@@ -204,10 +204,10 @@ int usbg_f_midi_get_attr_val(usbg_f_midi *mf, enum usbg_f_midi_attr attr, + } + + int usbg_f_midi_set_attr_val(usbg_f_midi *mf, enum usbg_f_midi_attr attr, +- union usbg_f_midi_attr_val val) ++ const union usbg_f_midi_attr_val *val) + { + return midi_attr[attr].set(mf->func.path, mf->func.name, +- midi_attr[attr].name, &val); ++ midi_attr[attr].name, val); + } + + int usbg_f_midi_get_id_s(usbg_f_midi *mf, char *buf, int len) +diff --git a/src/function/ms.c b/src/function/ms.c +index 519b012..5cdd814 100644 +--- a/src/function/ms.c ++++ b/src/function/ms.c +@@ -207,7 +207,7 @@ static int ms_import_lun_attrs(struct usbg_f_ms *mf, int lun_id, + if (ret < 0) + break; + +- ret = usbg_f_ms_set_lun_attr_val(mf, lun_id, i, val); ++ ret = usbg_f_ms_set_lun_attr_val(mf, lun_id, i, &val); + if (ret) + break; + } +@@ -605,8 +605,8 @@ int usbg_f_ms_set_lun_attrs(usbg_f_ms *mf, int lun_id, + + for (i = USBG_F_MS_LUN_ATTR_MIN; i < USBG_F_MS_LUN_ATTR_MAX; ++i) { + ret = usbg_f_ms_set_lun_attr_val(mf, lun_id, i, +- *(union usbg_f_ms_lun_attr_val *) +- ((char *)lattrs ++ (const union usbg_f_ms_lun_attr_val *) ++ ((const char *)lattrs + + ms_lun_attr[i].offset)); + if (ret) + break; +@@ -633,7 +633,7 @@ int usbg_f_ms_get_lun_attr_val(usbg_f_ms *mf, int lun_id, + + int usbg_f_ms_set_lun_attr_val(usbg_f_ms *mf, int lun_id, + enum usbg_f_ms_lun_attr lattr, +- union usbg_f_ms_lun_attr_val val) ++ const union usbg_f_ms_lun_attr_val *val) + { + char lpath[USBG_MAX_PATH_LENGTH]; + int ret; +@@ -644,7 +644,7 @@ int usbg_f_ms_set_lun_attr_val(usbg_f_ms *mf, int lun_id, + return USBG_ERROR_PATH_TOO_LONG; + + return ms_lun_attr[lattr].set(lpath, "", +- ms_lun_attr[lattr].name, &val); ++ ms_lun_attr[lattr].name, val); + } + + int usbg_f_ms_get_lun_file_s(usbg_f_ms *mf, int lun_id, +diff --git a/src/function/uac2.c b/src/function/uac2.c +index f2c1a49..38a9b0f 100644 +--- a/src/function/uac2.c ++++ b/src/function/uac2.c +@@ -89,7 +89,7 @@ static int uac2_libconfig_import(struct usbg_function *f, + if (ret < 0) + break; + +- ret = usbg_f_uac2_set_attr_val(af, i, val); ++ ret = usbg_f_uac2_set_attr_val(af, i, &val); + if (ret) + break; + } +@@ -174,8 +174,8 @@ int usbg_f_uac2_set_attrs(usbg_f_uac2 *af, + + for (i = USBG_F_UAC2_ATTR_MIN; i < USBG_F_UAC2_ATTR_MAX; ++i) { + ret = usbg_f_uac2_set_attr_val(af, i, +- *(union usbg_f_uac2_attr_val *) +- ((char *)attrs ++ (const union usbg_f_uac2_attr_val *) ++ ((const char *)attrs + + uac2_attr[i].offset)); + if (ret) + break; +@@ -193,8 +193,8 @@ int usbg_f_uac2_get_attr_val(usbg_f_uac2 *af, enum usbg_f_uac2_attr attr, + } + + int usbg_f_uac2_set_attr_val(usbg_f_uac2 *af, enum usbg_f_uac2_attr attr, +- union usbg_f_uac2_attr_val val) ++ const union usbg_f_uac2_attr_val *val) + { + return uac2_attr[attr].set(af->func.path, af->func.name, +- uac2_attr[attr].name, &val); ++ uac2_attr[attr].name, val); + } +diff --git a/src/function/uvc.c b/src/function/uvc.c +index f39594b..947b94e 100644 +--- a/src/function/uvc.c ++++ b/src/function/uvc.c +@@ -303,7 +303,7 @@ int usbg_f_uvc_get_config_attr_val(usbg_f_uvc *uvcf, enum usbg_f_uvc_config_attr + } + + int usbg_f_uvc_set_config_attr_val(usbg_f_uvc *uvcf, enum usbg_f_uvc_config_attr iattr, +- union usbg_f_uvc_config_attr_val val) ++ const union usbg_f_uvc_config_attr_val *val) + { + char ipath[USBG_MAX_PATH_LENGTH]; + int nmb; +@@ -314,7 +314,7 @@ int usbg_f_uvc_set_config_attr_val(usbg_f_uvc *uvcf, enum usbg_f_uvc_config_attr + return USBG_ERROR_PATH_TOO_LONG; + + return uvc_config_attr[iattr].set(ipath, "", +- uvc_config_attr[iattr].name, &val); ++ uvc_config_attr[iattr].name, val); + } + + int usbg_f_uvc_get_config_attrs(usbg_f_uvc *uvcf, struct usbg_f_uvc_config_attrs *iattrs) +@@ -341,8 +341,8 @@ int usbg_f_uvc_set_config_attrs(usbg_f_uvc *uvcf, const struct usbg_f_uvc_config + + for (i = USBG_F_UVC_FRAME_ATTR_MIN; i < USBG_F_UVC_FRAME_ATTR_MAX; ++i) { + ret = usbg_f_uvc_set_config_attr_val(uvcf, i, +- *(union usbg_f_uvc_config_attr_val *) +- ((char *)iattrs ++ (const union usbg_f_uvc_config_attr_val *) ++ ((const char *)iattrs + + uvc_config_attr[i].offset)); + if (ret) + break; +@@ -774,7 +774,7 @@ static int uvc_import_config(struct usbg_f_uvc *uvcf, config_setting_t *root) + if (ret < 0) + break; + +- ret = usbg_f_uvc_set_config_attr_val(uvcf, i, val); ++ ret = usbg_f_uvc_set_config_attr_val(uvcf, i, &val); + if (ret) + break; + } +diff --git a/src/usbg_common.c b/src/usbg_common.c +index 5f7f4e5..7234649 100644 +--- a/src/usbg_common.c ++++ b/src/usbg_common.c +@@ -337,7 +337,7 @@ int usbg_get_ether_addr(const char *path, const char *name, + } + + int usbg_set_ether_addr(const char *path, const char *name, +- const char *attr, void *val) ++ const char *attr, const void *val) + { + char str_addr[USBG_MAX_STR_LENGTH]; + +-- +2.25.1 + diff --git a/meta-oe/recipes-support/libusbgx/libusbgx/0001-libusbgx-Add-interface-name-for-NCM-Feature-Descript.patch b/meta-oe/recipes-support/libusbgx/libusbgx/0001-libusbgx-Add-interface-name-for-NCM-Feature-Descript.patch new file mode 100644 index 0000000000..cc122c844c --- /dev/null +++ b/meta-oe/recipes-support/libusbgx/libusbgx/0001-libusbgx-Add-interface-name-for-NCM-Feature-Descript.patch @@ -0,0 +1,52 @@ +From 4f3f2ad08e6ca132bd1dd388e02b57223bf4219d Mon Sep 17 00:00:00 2001 +From: Ming Liu <liu.ming50@gmail.com> +Date: Sun, 11 Dec 2022 14:11:49 +0100 +Subject: [PATCH] libusbgx: Add interface name for NCM Feature Descriptors + +In commit: abf422bffca4a4767e7e242c44910dbf5ef7094f +[ +Author: Stefan Agner <stefan.agner@toradex.com> +Date: Tue Jan 24 14:22:25 2017 -0800 + + libusbgx: Add interface name for Feature Descriptors + + This adds interface name required for "Feature Descriptors". If + specified, we can assume that a Feature Descriptor with the + interface name of the specified string is understood by the + kernel (e.g. interface.rndis). +] + +it only added Feature Descriptors for RNDIS, NCM also needs that, or +else it could not be recognized by Windows systems. + +Add Feature Descriptors interface name for NCM. + +Upstream-Status: Submitted [https://github.com/linux-usb-gadgets/libusbgx/pull/73] + +Signed-off-by: Ming Liu <liu.ming50@gmail.com> +--- + src/function/ether.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/function/ether.c b/src/function/ether.c +index b1fe1d2..a9eaf33 100644 +--- a/src/function/ether.c ++++ b/src/function/ether.c +@@ -184,8 +184,14 @@ struct usbg_function_type usbg_f_type_subset = { + ETHER_FUNCTION_OPTS + }; + ++static char *ncm_os_desc_ifnames[] = { ++ "ncm", ++ NULL ++}; ++ + struct usbg_function_type usbg_f_type_ncm = { + .name = "ncm", ++ .os_desc_iname = ncm_os_desc_ifnames, + ETHER_FUNCTION_OPTS + }; + +-- +2.25.1 + diff --git a/meta-oe/recipes-support/libusbgx/libusbgx/gadget-start b/meta-oe/recipes-support/libusbgx/libusbgx/gadget-start index 9e22671a9e..e80cb2c340 100755 --- a/meta-oe/recipes-support/libusbgx/libusbgx/gadget-start +++ b/meta-oe/recipes-support/libusbgx/libusbgx/gadget-start @@ -6,6 +6,10 @@ for i in $IMPORT_SCHEMAS; do /usr/bin/gadget-import "$i" /etc/usbgx/"$i".schema done +for script in $(find -L /etc/usbgx.d -type f -exec test -e {} \; -print 2>/dev/null); do + $script +done + for i in $ENABLED_SCHEMAS; do configured_udc=$(eval 'echo ${UDC_FOR_SCHEMA_'"$i"'}') if [ -n "${configured_udc}" ] && [ -e "/sys/class/udc/${configured_udc}" ]; then diff --git a/meta-oe/recipes-support/libusbgx/libusbgx/usbgx.service b/meta-oe/recipes-support/libusbgx/libusbgx/usbgx.service index 74541d3c2d..ba92f1ab83 100644 --- a/meta-oe/recipes-support/libusbgx/libusbgx/usbgx.service +++ b/meta-oe/recipes-support/libusbgx/libusbgx/usbgx.service @@ -1,9 +1,11 @@ [Unit] Description=Load USB gadget schemas +Requires=sys-kernel-config.mount +After=sys-kernel-config.mount [Service] -Type=oneshot +Type=simple ExecStart=/usr/bin/gadget-start [Install] -WantedBy=multi-user.target +WantedBy=usb-gadget.target diff --git a/meta-oe/recipes-support/libusbgx/libusbgx_git.bb b/meta-oe/recipes-support/libusbgx/libusbgx_git.bb index 11e88935ef..7998b0c155 100644 --- a/meta-oe/recipes-support/libusbgx/libusbgx_git.bb +++ b/meta-oe/recipes-support/libusbgx/libusbgx_git.bb @@ -6,10 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ inherit autotools pkgconfig systemd update-rc.d update-alternatives PV = "0.2.0+git${SRCPV}" -SRCREV = "45c14ef4d5d7ced0fbf984208de44ced6d5ed898" +SRCREV = "721e3a1cbd7e2b6361bb439d3959e7403e4f0092" SRCBRANCH = "master" SRC_URI = " \ git://github.com/libusbgx/libusbgx.git;branch=${SRCBRANCH};protocol=https \ + file://0001-libusbgx-Add-interface-name-for-NCM-Feature-Descript.patch \ + file://0001-fix-stack-buffer-overflow-in-usbg_f_foo_attr_val-pro.patch \ file://gadget-start \ file://usbgx.initd \ file://usbgx.service \ @@ -35,7 +37,9 @@ INITSCRIPT_PARAMS = "defaults" INHIBIT_UPDATERCD_BBCLASS = "${@bb.utils.contains('PACKAGECONFIG', 'examples', '1', '0', d)}" do_install:append() { - install -Dm 0755 ${WORKDIR}/gadget-start ${D}/${bindir}/gadget-start + install -Dm 0755 ${WORKDIR}/gadget-start ${D}${bindir}/gadget-start + sed -i -e 's,/usr/bin,${bindir},g' -e 's,/etc,${sysconfdir},g' ${D}${bindir}/gadget-start + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -Dm 0644 ${WORKDIR}/usbgx.service ${D}${systemd_system_unitdir}/usbgx.service fi diff --git a/meta-oe/recipes-support/libutempter/libutempter/0002-Proper-macro-path-generation.patch b/meta-oe/recipes-support/libutempter/libutempter/0002-Proper-macro-path-generation.patch index 2a866c0796..f43f54eaab 100644 --- a/meta-oe/recipes-support/libutempter/libutempter/0002-Proper-macro-path-generation.patch +++ b/meta-oe/recipes-support/libutempter/libutempter/0002-Proper-macro-path-generation.patch @@ -5,6 +5,8 @@ Subject: [PATCH] Proper macro path generation. Signed-off-by: iddinev <xidinev@gmail.com> --- +Upstream-Status: Pending + libutempter/iface.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-support/links/files/ac-prog-cxx.patch b/meta-oe/recipes-support/links/files/ac-prog-cxx.patch index 2dc57a5c83..0406b700d7 100644 --- a/meta-oe/recipes-support/links/files/ac-prog-cxx.patch +++ b/meta-oe/recipes-support/links/files/ac-prog-cxx.patch @@ -3,6 +3,8 @@ From: Martin Jansa <Martin.Jansa@gmail.com> Date: Mon, 30 Jul 2012 23:52:49 +0200 --- +Upstream-Status: Pending + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/links/links_2.28.bb b/meta-oe/recipes-support/links/links_2.29.bb index a36393f1c4..e3a15d1819 100644 --- a/meta-oe/recipes-support/links/links_2.28.bb +++ b/meta-oe/recipes-support/links/links_2.29.bb @@ -8,4 +8,4 @@ EXTRA_OECONF = "--enable-graphics \ --without-libtiff --without-svgalib --with-fb \ --without-directfb --without-pmshell --without-atheos \ --without-x" -SRC_URI[sha256sum] = "2fd5499b13dee59457c132c167b8495c40deda75389489c6cccb683193f454b4" +SRC_URI[sha256sum] = "22aa96c0b38e1a6f8f7ed9d7a4167a47fc37246097759ef6059ecf8f9ead7998" diff --git a/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch b/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch index 9608b7e753..86edcc2e42 100644 --- a/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch +++ b/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch @@ -8,6 +8,8 @@ Fixes QA errors about GNU_HASH Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + mib-modules/Makefile | 10 +++++----- tools/Makefile | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-oe/recipes-support/lockdev/lockdev/build.patch b/meta-oe/recipes-support/lockdev/lockdev/build.patch index f9fe48b2a6..36daea79af 100644 --- a/meta-oe/recipes-support/lockdev/lockdev/build.patch +++ b/meta-oe/recipes-support/lockdev/lockdev/build.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + commit 0dd47123655c52d68185f06b9da8fb0e1b925400 Author: Ludwig Nussel <ludwig.nussel@suse.de> Date: Tue Feb 9 14:56:23 2010 +0100 diff --git a/meta-oe/recipes-support/lockdev/lockdev/cross_compile.patch b/meta-oe/recipes-support/lockdev/lockdev/cross_compile.patch index aa8b0f6923..886af121b3 100644 --- a/meta-oe/recipes-support/lockdev/lockdev/cross_compile.patch +++ b/meta-oe/recipes-support/lockdev/lockdev/cross_compile.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/Makefile +++ b/Makefile @@ -15,17 +15,18 @@ shared = ${libname}.${VER}.so diff --git a/meta-oe/recipes-support/log4c/log4c/0001-Use-the-API-properly-in-the-example-format-security-.patch b/meta-oe/recipes-support/log4c/log4c/0001-Use-the-API-properly-in-the-example-format-security-.patch index 9ff9d70025..405104a0fc 100644 --- a/meta-oe/recipes-support/log4c/log4c/0001-Use-the-API-properly-in-the-example-format-security-.patch +++ b/meta-oe/recipes-support/log4c/log4c/0001-Use-the-API-properly-in-the-example-format-security-.patch @@ -5,6 +5,8 @@ Subject: [PATCH] Use the API properly in the example (format security error fixed). --- +Upstream-Status: Pending + examples/helloworld1/mylog.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/log4cpp/files/fix-pc.patch b/meta-oe/recipes-support/log4cpp/files/fix-pc.patch index b8fb42e5fd..b57b5a263c 100644 --- a/meta-oe/recipes-support/log4cpp/files/fix-pc.patch +++ b/meta-oe/recipes-support/log4cpp/files/fix-pc.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -Nurd ./log4cpp.orig/configure.in ./log4cpp/configure.in --- ./log4cpp.orig/configure.in 2009-09-07 16:57:46.000000000 -0400 +++ ./log4cpp/configure.in 2016-02-23 12:57:11.567240018 -0500 diff --git a/meta-oe/recipes-support/log4cpp/log4cpp_1.1.3.bb b/meta-oe/recipes-support/log4cpp/log4cpp_1.1.4.bb index 8e6d455174..729857eb62 100644 --- a/meta-oe/recipes-support/log4cpp/log4cpp_1.1.3.bb +++ b/meta-oe/recipes-support/log4cpp/log4cpp_1.1.4.bb @@ -6,8 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" SRC_URI = "http://downloads.sourceforge.net/${BPN}/${BP}.tar.gz \ file://fix-pc.patch;striplevel=2 \ " -SRC_URI[md5sum] = "b9e2cee932da987212f2c74b767b4d8b" -SRC_URI[sha256sum] = "2cbbea55a5d6895c9f0116a9a9ce3afb86df383cd05c9d6c1a4238e5e5c8f51d" +SRC_URI[sha256sum] = "696113659e426540625274a8b251052cc04306d8ee5c42a0c7639f39ca90c9d6" S = "${WORKDIR}/${BPN}" diff --git a/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch b/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch index bb582ed1ff..f46d7f7014 100644 --- a/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch +++ b/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch @@ -15,6 +15,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Dengke Du <dengke.du@windriver.com> --- +Upstream-Status: Pending + lib/log/log.c | 6 ++++++ tools/lvmcmdline.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch b/meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch index ce8a97ab6f..1fbaf0c9ae 100644 --- a/meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch +++ b/meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch @@ -9,6 +9,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Dengke Du <dengke.du@windriver.com> --- +Upstream-Status: Pending + lib/mm/memlock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/mailcap/mailcap_2.1.53.bb b/meta-oe/recipes-support/mailcap/mailcap_2.1.54.bb index 34588380ae..8385b63543 100644 --- a/meta-oe/recipes-support/mailcap/mailcap_2.1.53.bb +++ b/meta-oe/recipes-support/mailcap/mailcap_2.1.54.bb @@ -18,8 +18,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8dce08227d135cfda1f19d4c0c6689de" SRC_URI = "https://releases.pagure.org/${BPN}/${BP}.tar.xz" -SRC_URI[md5sum] = "ee02da867389d290923cc138487176f9" -SRC_URI[sha256sum] = "5eea2ef17b304977ba3ecb87afad4319fa0440f825e4f6fba6e8fa2ffeb88785" +SRC_URI[sha256sum] = "9a4032202fc0d2b0858f41b167389a9cfe52ac24ec282e6479b90765319de113" inherit update-alternatives diff --git a/meta-oe/recipes-support/mcelog/mce-inject_git.bb b/meta-oe/recipes-support/mcelog/mce-inject_git.bb index d440a53d87..a228c3cc06 100644 --- a/meta-oe/recipes-support/mcelog/mce-inject_git.bb +++ b/meta-oe/recipes-support/mcelog/mce-inject_git.bb @@ -21,4 +21,4 @@ COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' inherit autotools-brokensep -EXTRA_OEMAKE = "destdir=${D}" +EXTRA_OEMAKE = "destdir=${D} CFLAGS='${CFLAGS}'" diff --git a/meta-oe/recipes-support/mcelog/mce-test_git.bb b/meta-oe/recipes-support/mcelog/mce-test_git.bb index f4f1b37d78..fd302db897 100644 --- a/meta-oe/recipes-support/mcelog/mce-test_git.bb +++ b/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 = "7643baf6c3919b3d727e6ba6c2e545dc6a653307" -PV = "20190917+git${SRCPV}" +SRCREV = "025014dedca39d2b8a57a82e52286e72e157d73a" +PV = "20222810+git${SRCPV}" RDEPENDS:${PN} = "mcelog mce-inject dialog bash" @@ -23,6 +23,8 @@ COMPATIBLE_HOST = '(i.86|x86_64).*-linux' S ="${WORKDIR}/git" +EXTRA_OEMAKE += "CFLAGS='${CFLAGS}'" + do_install:append(){ install -d ${D}/opt/mce-test cp -rf ${S}/* ${D}/opt/mce-test/ diff --git a/meta-oe/recipes-support/mcelog/mcelog/run-ptest b/meta-oe/recipes-support/mcelog/mcelog/run-ptest index ba7a2c7683..320240f276 100644 --- a/meta-oe/recipes-support/mcelog/mcelog/run-ptest +++ b/meta-oe/recipes-support/mcelog/mcelog/run-ptest @@ -1,3 +1,9 @@ #!/bin/sh -make -C tests test +make -C tests test | sed -e '/\[PASS\]/ s/^/PASS: /g' \ + -e '/\[FAIL\]/ s/^/FAIL: /g' \ + -e '/\[IGNORE\]/ s/^/SKIP: /g' \ + -e 's/IGNORE:/SKIP:/' \ + -e 's/: \[PASS\]//' \ + -e 's/: \[FAIL\]//' \ + -e 's/: \[IGNORE\]//' diff --git a/meta-oe/recipes-support/mcelog/mcelog_189.bb b/meta-oe/recipes-support/mcelog/mcelog_194.bb index 2f8af9aa3f..9b5c554d86 100644 --- a/meta-oe/recipes-support/mcelog/mcelog_189.bb +++ b/meta-oe/recipes-support/mcelog/mcelog_194.bb @@ -11,18 +11,25 @@ SRC_URI = "\ file://run-ptest \ " -SRCREV = "b8dfb1fa34eb627a03adfb315326a29ec51214b3" +SRCREV = "8f33fdc47160edce09d75e1316b4d88129ca60a0" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" S = "${WORKDIR}/git" -inherit autotools-brokensep ptest +inherit ptest COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' -do_install:append() { +EXTRA_OEMAKE += "CFLAGS='${CFLAGS}'" + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake install DESTDIR=${D} install -d ${D}${sysconfdir}/cron.hourly install -m 0755 ${S}/mcelog.cron ${D}${sysconfdir}/cron.hourly/ sed -i 's/bash/sh/' ${D}${sysconfdir}/cron.hourly/mcelog.cron diff --git a/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch b/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch index 9c154a1734..ce139a6387 100644 --- a/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch +++ b/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch @@ -5,6 +5,8 @@ Subject: [PATCH] Undefine REGEX for musl based systems Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + GNUmakefile | 1 - Makefile | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch b/meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch index 8e8c2b9025..4eeb1d97dc 100644 --- a/meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch +++ b/meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch @@ -5,6 +5,8 @@ Subject: [PATCH 1/2] fileio: Include sys/param.h for MAXNAMLEN Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + fileio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch b/meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch index bdd7632be6..ef7811081b 100644 --- a/meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch +++ b/meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch @@ -5,6 +5,8 @@ Subject: [PATCH 2/2] fileio: Define DEFFILEMODE if platform is missing Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + fileio.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-oe/recipes-support/mg/mg_20221112.bb b/meta-oe/recipes-support/mg/mg_20230501.bb index 2d0afe8a94..ee00003977 100644 --- a/meta-oe/recipes-support/mg/mg_20221112.bb +++ b/meta-oe/recipes-support/mg/mg_20230501.bb @@ -1,11 +1,11 @@ SUMMARY = "A portable version of the mg maintained by the OpenBSD team" HOMEPAGE = "http://homepage.boetes.org/software/mg/" LICENSE = "PD" -LIC_FILES_CHKSUM = "file://version.c;md5=43616508f42ab3fdb082c5f932bd2eb4" +LIC_FILES_CHKSUM = "file://version.c;md5=a8e0b53d89d277bf3b40878ac568bedd" DEPENDS = "ncurses libbsd" SECTION = "console/editors" -SRCREV = "5dbacce10b4cc5fe0785840c09398fc5b19fb96a" +SRCREV = "f21c2ba36772ffa68d9cfa55305e427d37903b4a" SRC_URI = "git://github.com/hboetes/mg;branch=master;protocol=https \ file://0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch \ file://0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch \ diff --git a/meta-oe/recipes-support/monit/monit_5.32.0.bb b/meta-oe/recipes-support/monit/monit_5.33.0.bb index e4ec9d5262..66d4079a94 100644 --- a/meta-oe/recipes-support/monit/monit_5.32.0.bb +++ b/meta-oe/recipes-support/monit/monit_5.33.0.bb @@ -15,7 +15,7 @@ SRC_URI = " \ file://monitrc \ " -SRC_URI[sha256sum] = "1077052d4c4e848ac47d14f9b37754d46419aecbe8c9a07e1f869c914faf3216" +SRC_URI[sha256sum] = "1ace889c0183473a9d70160df6533bb6e1338dc1354f5928507803e1e2a863b5" DEPENDS = "zlib bison-native libnsl2 flex-native openssl virtual/crypt" diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch b/meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch index 97425fe9b8..bc07d75cc1 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch @@ -12,6 +12,8 @@ Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> [OP: Drop dependencies that are already present in the 0.9.3 Makefile] Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> --- +Upstream-Status: Pending + Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/meta-oe/recipes-support/multipath-tools/files/0021-RH-fixup-udev-rules-for-redhat.patch b/meta-oe/recipes-support/multipath-tools/files/0021-RH-fixup-udev-rules-for-redhat.patch index 0b9971dc99..395f9a9b03 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0021-RH-fixup-udev-rules-for-redhat.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0021-RH-fixup-udev-rules-for-redhat.patch @@ -17,6 +17,8 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> [OP: Rebase to 0.9.3] Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> --- +Upstream-Status: Pending + Makefile.inc | 2 +- kpartx/kpartx.rules | 2 +- multipath/Makefile | 4 ++-- diff --git a/meta-oe/recipes-support/multipath-tools/files/0022-RH-Remove-the-property-blacklist-exception-builtin.patch b/meta-oe/recipes-support/multipath-tools/files/0022-RH-Remove-the-property-blacklist-exception-builtin.patch index 0eff18b853..c15444a85d 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0022-RH-Remove-the-property-blacklist-exception-builtin.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0022-RH-Remove-the-property-blacklist-exception-builtin.patch @@ -20,6 +20,8 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> [OP: Rebase to 0.9.3] Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> --- +Upstream-Status: Pending + libmultipath/blacklist.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-oe/recipes-support/multipath-tools/files/0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch b/meta-oe/recipes-support/multipath-tools/files/0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch index 407dff507a..ec123b212b 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch @@ -15,6 +15,8 @@ Signed-off-by: Geoff Parker <geoffrey.parker@arthrex.com> [OP: Rebase to 0.9.3] Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> --- +Upstream-Status: Pending + libdmmp/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-support/nano/nano_7.1.bb b/meta-oe/recipes-support/nano/nano_7.2.bb index c601354151..0642287c98 100644 --- a/meta-oe/recipes-support/nano/nano_7.1.bb +++ b/meta-oe/recipes-support/nano/nano_7.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] = "57ba751e9b7519f0f6ddee505202e387c75dde440c1f7aa1b9310cc381406836" +SRC_URI[sha256sum] = "86f3442768bd2873cec693f83cdf80b4b444ad3cc14760b74361474fc87a4526" UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano" diff --git a/meta-oe/recipes-support/ne10/ne10/0001-CMakeLists.txt-Remove-mthumb-interwork.patch b/meta-oe/recipes-support/ne10/ne10/0001-CMakeLists.txt-Remove-mthumb-interwork.patch index 9f2faaa529..6b51f992f5 100644 --- a/meta-oe/recipes-support/ne10/ne10/0001-CMakeLists.txt-Remove-mthumb-interwork.patch +++ b/meta-oe/recipes-support/ne10/ne10/0001-CMakeLists.txt-Remove-mthumb-interwork.patch @@ -12,6 +12,8 @@ where this option is absent Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-support/ne10/ne10/0001-Dont-specify-march-explicitly.patch b/meta-oe/recipes-support/ne10/ne10/0001-Dont-specify-march-explicitly.patch index a8fea82dc3..cb99daf78c 100644 --- a/meta-oe/recipes-support/ne10/ne10/0001-Dont-specify-march-explicitly.patch +++ b/meta-oe/recipes-support/ne10/ne10/0001-Dont-specify-march-explicitly.patch @@ -15,6 +15,8 @@ Fixes Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/neon/neon/0001-Disable-installing-documentation.patch b/meta-oe/recipes-support/neon/neon/0001-Disable-installing-documentation.patch index 1f63df27ac..177a71ec0a 100644 --- a/meta-oe/recipes-support/neon/neon/0001-Disable-installing-documentation.patch +++ b/meta-oe/recipes-support/neon/neon/0001-Disable-installing-documentation.patch @@ -7,6 +7,8 @@ It does not build Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/neon/neon_0.32.4.bb b/meta-oe/recipes-support/neon/neon_0.32.5.bb index d281bfde62..c364aab360 100644 --- a/meta-oe/recipes-support/neon/neon_0.32.4.bb +++ b/meta-oe/recipes-support/neon/neon_0.32.5.bb @@ -11,7 +11,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/n/neon27/neon27_${PV}.orig.tar.gz \ file://run-ptest \ " -SRC_URI[sha256sum] = "1bcdaabb63206b5e00c9a8c4b3672168b523b49eb559c5a486e3256463af34fd" +SRC_URI[sha256sum] = "4872e12f802572dedd4b02f870065814b2d5141f7dbdaf708eedab826b51a58a" inherit autotools-brokensep binconfig-disabled lib_package pkgconfig ptest diff --git a/meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch b/meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch index 5a8b046039..6721d2b5e5 100644 --- a/meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch +++ b/meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch @@ -9,6 +9,8 @@ defines from sys/cdefs.h is used Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + lmon16m.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/nss/nss/0001-Bug-1750624-Pin-validation-date-for-PayPalEE-test-ce.patch b/meta-oe/recipes-support/nss/nss/0001-Bug-1750624-Pin-validation-date-for-PayPalEE-test-ce.patch new file mode 100644 index 0000000000..d905bf10e3 --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/0001-Bug-1750624-Pin-validation-date-for-PayPalEE-test-ce.patch @@ -0,0 +1,64 @@ +From 1109c1b8259ad840ac1688d533f76ca268c67b6b Mon Sep 17 00:00:00 2001 +From: "John M. Schanck" <jschanck@mozilla.com> +Date: Sat, 5 Feb 2022 11:12:43 +0000 +Subject: [PATCH] Bug 1750624 - Pin validation date for PayPalEE test cert. + r=nss-reviewers,bbeurdouche,rrelyea + +Differential Revision: https://phabricator.services.mozilla.com/D136289 + +--HG-- +extra : moz-landing-system : lando + +Upstream-Status: Backport + +--- + tests/chains/chains.sh | 6 +++++- + tests/chains/scenarios/realcerts.cfg | 1 + + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/tests/chains/chains.sh b/tests/chains/chains.sh +index 32c7ef54c..e13ae52f9 100755 +--- a/nss/tests/chains/chains.sh ++++ b/nss/tests/chains/chains.sh +@@ -917,7 +917,7 @@ verify_cert() + done + + VFY_OPTS_TNAME="${DB_OPT} ${ENGINE} ${TRUST_AND_DB_OPT} ${REV_OPTS} ${FETCH_OPT} ${USAGE_OPT} ${POLICY_OPT} ${TRUST_OPT}" +- VFY_OPTS_ALL="${DB_OPT} ${ENGINE} -vv ${TRUST_AND_DB_OPT} ${REV_OPTS} ${FETCH_OPT} ${USAGE_OPT} ${POLICY_OPT} ${VFY_CERTS} ${TRUST_OPT}" ++ VFY_OPTS_ALL="${DB_OPT} ${ENGINE} -vv ${VFY_TIME_OPT} ${TRUST_AND_DB_OPT} ${REV_OPTS} ${FETCH_OPT} ${USAGE_OPT} ${POLICY_OPT} ${VFY_CERTS} ${TRUST_OPT}" + + TESTNAME="Verifying certificate(s) ${VFY_LIST} with flags ${VFY_OPTS_TNAME}" + echo "${SCRIPTNAME}: ${TESTNAME}" +@@ -1118,6 +1118,7 @@ parse_config() + ;; + "verify") + VERIFY="${VALUE}" ++ VFY_TIME_OPT= + TRUST= + TRUST_AND_DB= + POLICY= +@@ -1126,6 +1127,9 @@ parse_config() + REV_OPTS= + USAGE_OPT= + ;; ++ "at_time") ++ VFY_TIME_OPT="-b ${VALUE}" ++ ;; + "cert") + VERIFY="${VERIFY} ${VALUE}" + ;; +diff --git a/tests/chains/scenarios/realcerts.cfg b/tests/chains/scenarios/realcerts.cfg +index 305443fc3..f8b0fc452 100644 +--- a/nss/tests/chains/scenarios/realcerts.cfg ++++ b/nss/tests/chains/scenarios/realcerts.cfg +@@ -22,6 +22,7 @@ verify TestUser51:x + + verify PayPalEE:x + policy OID.2.16.840.1.114412.2.1 ++ at_time 2201010000Z + result pass + + verify BrAirWaysBadSig:x +-- +2.25.1 + diff --git a/meta-oe/recipes-support/nss/nss_3.74.bb b/meta-oe/recipes-support/nss/nss_3.74.bb index 4a9482fca4..ea5abe07fb 100644 --- a/meta-oe/recipes-support/nss/nss_3.74.bb +++ b/meta-oe/recipes-support/nss/nss_3.74.bb @@ -32,6 +32,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/security/nss/releases/${VERSION_DIR}/src/$ file://system-pkcs11.txt \ file://nss-fix-nsinstall-build.patch \ file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ + file://0001-Bug-1750624-Pin-validation-date-for-PayPalEE-test-ce.patch \ " SRC_URI[sha256sum] = "88928811f9f40f87d42e2eaccdf6e454562e51486067f2ddbe90aa47ea6cd056" @@ -282,9 +283,8 @@ BBCLASSEXTEND = "native nativesdk" CVE_PRODUCT += "network_security_services" -# CVE-2006-5201 affects only Sun Solaris -CVE_CHECK_IGNORE += "CVE-2006-5201" +CVE_STATUS_GROUPS += "CVE_STATUS_NSS" +CVE_STATUS_NSS[status] = "not-applicable-config: This only affect the legacy db (libnssdbm), only compiled with --enable-legacy-db" +CVE_STATUS_NSS = "CVE-2017-11695 CVE-2017-11696 CVE-2017-11697 CVE-2017-11698" -# CVES CVE-2017-11695 CVE-2017-11696 CVE-2017-11697 CVE-2017-11698 only affect -# the legacy db (libnssdbm), only compiled with --enable-legacy-db. -CVE_CHECK_IGNORE += "CVE-2017-11695 CVE-2017-11696 CVE-2017-11697 CVE-2017-11698" +CVE_STATUS[CVE-2022-3479] = "not-applicable-config: vulnerability was introduced in 3.77 and fixed in 3.87" diff --git a/meta-oe/recipes-support/onig/onig/0002-build-enable-serial-tests-automake-option-for-ptest.patch b/meta-oe/recipes-support/onig/onig/0002-build-enable-serial-tests-automake-option-for-ptest.patch index a7a28536fb..096b8baa79 100644 --- a/meta-oe/recipes-support/onig/onig/0002-build-enable-serial-tests-automake-option-for-ptest.patch +++ b/meta-oe/recipes-support/onig/onig/0002-build-enable-serial-tests-automake-option-for-ptest.patch @@ -15,6 +15,8 @@ former being what we want. Signed-off-by: André Draszik <git@andred.net> --- +Upstream-Status: Pending + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/onig/onig/run-ptest b/meta-oe/recipes-support/onig/onig/run-ptest index 2574d7efa5..fbce336990 100755 --- a/meta-oe/recipes-support/onig/onig/run-ptest +++ b/meta-oe/recipes-support/onig/onig/run-ptest @@ -17,7 +17,7 @@ workdir=$(mktemp -d -t onig.ptest.XXXXXX) status="${workdir}/failed" touch "${status}" -find tests/ -perm -111 -type f -exec sh -c ' +find tests/ -perm -111 -type f ! -path "tests/.debug/*" -exec sh -c ' workdir="${1}" status="${2}" t="${3}" diff --git a/meta-oe/recipes-support/openct/openct/0001-m4-Just-emit-the-first-line-of-compiler-version.patch b/meta-oe/recipes-support/openct/openct/0001-m4-Just-emit-the-first-line-of-compiler-version.patch new file mode 100644 index 0000000000..9bd3d18d6e --- /dev/null +++ b/meta-oe/recipes-support/openct/openct/0001-m4-Just-emit-the-first-line-of-compiler-version.patch @@ -0,0 +1,31 @@ +From 146b5116140d719e4e9ae19748c0b6dee7d82f96 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 22 May 2023 22:01:28 -0700 +Subject: [PATCH] m4: Just emit the first line of compiler version + +Avoids emitting buildpaths into comments +Fixes +WARNING: openct-0.6.20-r0 do_package_qa: QA Issue: File /usr/include/openct/types.h in package openct-dev contains reference to TMPDIR [buildpaths] + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + m4/ac_create_stdint_h.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/ac_create_stdint_h.m4 b/m4/ac_create_stdint_h.m4 +index 66de704..4b7223a 100644 +--- a/m4/ac_create_stdint_h.m4 ++++ b/m4/ac_create_stdint_h.m4 +@@ -110,7 +110,7 @@ echo "#define" $_ac_stdint_h "1" >>$ac_stdint_h + echo "#ifndef" _GENERATED_STDINT_H >>$ac_stdint_h + echo "#define" _GENERATED_STDINT_H '"'$PACKAGE $VERSION'"' >>$ac_stdint_h + if test "$GCC" = "yes" ; then +- echo "/* generated using a gnu compiler version" `$CC --version` "*/" \ ++ echo "/* generated using a gnu compiler version" `$CC --version|head -1` "*/" \ + >>$ac_stdint_h + else + echo "/* generated using $CC */" >>$ac_stdint_h +-- +2.40.1 + diff --git a/meta-oe/recipes-support/openct/openct_0.6.20.bb b/meta-oe/recipes-support/openct/openct_0.6.20.bb index a873da6339..0d3ea4186a 100644 --- a/meta-oe/recipes-support/openct/openct_0.6.20.bb +++ b/meta-oe/recipes-support/openct/openct_0.6.20.bb @@ -14,6 +14,7 @@ SRC_URI = " \ https://downloads.sourceforge.net/project/opensc/${BPN}/${BPN}-${PV}.tar.gz \ file://etc-openct.udev.in-disablePROGRAM.patch \ file://etc-openct_usb.in-modify-UDEVINFO.patch \ + file://0001-m4-Just-emit-the-first-line-of-compiler-version.patch \ file://openct.init \ file://openct.sysconfig \ file://openct.service \ diff --git a/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch b/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch deleted file mode 100644 index 9e6a613713..0000000000 --- a/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9b4959b97d2e95d4b49cf6ca2a3fce3cdb484f2d Mon Sep 17 00:00:00 2001 -From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> -Date: Thu, 31 Mar 2016 00:20:15 +0200 -Subject: [PATCH] 3rdparty/ippicv: Use pre-downloaded ipp - -Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> -Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com> - ---- - 3rdparty/ippicv/ippicv.cmake | 15 +-------------- - 1 file changed, 1 insertion(+), 14 deletions(-) - -diff --git a/3rdparty/ippicv/ippicv.cmake b/3rdparty/ippicv/ippicv.cmake -index 257af6fcc6..f88460450f 100644 ---- a/3rdparty/ippicv/ippicv.cmake -+++ b/3rdparty/ippicv/ippicv.cmake -@@ -34,18 +34,5 @@ function(download_ippicv root_var) - endif() - - set(THE_ROOT "${OpenCV_BINARY_DIR}/3rdparty/ippicv") -- ocv_download(FILENAME ${OPENCV_ICV_NAME} -- HASH ${OPENCV_ICV_HASH} -- URL -- "${OPENCV_IPPICV_URL}" -- "$ENV{OPENCV_IPPICV_URL}" -- "https://raw.githubusercontent.com/opencv/opencv_3rdparty/${IPPICV_COMMIT}/ippicv/" -- DESTINATION_DIR "${THE_ROOT}" -- ID IPPICV -- STATUS res -- UNPACK RELATIVE_URL) -- -- if(res) -- set(${root_var} "${THE_ROOT}/${OPENCV_ICV_PACKAGE_SUBDIR}" PARENT_SCOPE) -- endif() -+ set(${root_var} "${THE_ROOT}/${OPENCV_ICV_PACKAGE_SUBDIR}" PARENT_SCOPE) - endfunction() diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch b/meta-oe/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch deleted file mode 100644 index 59da6ab320..0000000000 --- a/meta-oe/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d6bdd0a91eb0ed57688c0af5ba5088cf0afdc0a0 Mon Sep 17 00:00:00 2001 -From: Jochen Sprickerhof <jspricke@debian.org> -Date: Mon, 8 Aug 2022 21:10:13 +0200 -Subject: [PATCH] Add missing header for LIBAVCODEC_VERSION_INT - -Upstream-Status: Backport [https://github.com/opencv/opencv/pull/22357] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - modules/videoio/src/ffmpeg_codecs.hpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/modules/videoio/src/ffmpeg_codecs.hpp b/modules/videoio/src/ffmpeg_codecs.hpp -index 61788e0345..faad2596ed 100644 ---- a/modules/videoio/src/ffmpeg_codecs.hpp -+++ b/modules/videoio/src/ffmpeg_codecs.hpp -@@ -60,6 +60,7 @@ extern "C" { - #include <errno.h> - #endif - -+#include <libavcodec/version.h> - #include <libavformat/avformat.h> - - #ifdef __cplusplus --- -2.38.1 - diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch b/meta-oe/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch index 1e47f8b162..a3bbefaabe 100644 --- a/meta-oe/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch +++ b/meta-oe/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch @@ -7,6 +7,8 @@ Subject: [PATCH] Temporarliy work around deprecated ffmpeg RAW function Signed-off-by: Jason Wessel <jason.wessel@windriver.com> --- +Upstream-Status: Pending + modules/videoio/src/cap_ffmpeg_impl.hpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta-oe/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch b/meta-oe/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch index bb47ef2bab..9df419d0b8 100644 --- a/meta-oe/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch +++ b/meta-oe/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch @@ -15,6 +15,8 @@ ts module. Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com> --- +Upstream-Status: Pending + modules/ts/include/opencv2/ts.hpp | 4 ++-- modules/ts/include/opencv2/ts/ocl_test.hpp | 2 +- modules/ts/include/opencv2/ts/ts_ext.hpp | 2 +- diff --git a/meta-oe/recipes-support/opencv/opencv_4.6.0.bb b/meta-oe/recipes-support/opencv/opencv_4.8.0.bb index fcbafd78a9..9564bbbe9d 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.6.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.8.0.bb @@ -10,48 +10,26 @@ ARM_INSTRUCTION_SET:armv5 = "arm" DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" -SRCREV_opencv = "b0dc474160e389b9c9045da5db49d03ae17c6a6b" -SRCREV_contrib = "7b77c355a8fdc97667b3fa1e7a0d37e4973fc868" -SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274" +SRCREV_opencv = "f9a59f2592993d3dcc080e495f4f5e02dd8ec7ef" +SRCREV_contrib = "f10c84d48b0714f2b408c9e5cccfac1277c8e6cc" SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" SRCREV_wechat-qrcode = "a8b69ccc738421293254aec5ddb38bd523503252" -def ipp_filename(d): - import re - arch = d.getVar('TARGET_ARCH') - if re.match("i.86$", arch): - return "ippicv_2020_lnx_ia32_20191018_general.tgz" - else: - return "ippicv_2020_lnx_intel64_20191018_general.tgz" - -def ipp_md5sum(d): - import re - arch = d.getVar('TARGET_ARCH') - if re.match("i.86$", arch): - return "ad189a940fb60eb71f291321322fe3e8" - else: - return "7421de0095c7a39162ae13a6098782f9" - -IPP_FILENAME = "${@ipp_filename(d)}" -IPP_MD5 = "${@ipp_md5sum(d)}" SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg" -SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol=https \ - git://github.com/opencv/opencv_contrib.git;destsuffix=git/contrib;name=contrib;branch=master;protocol=https \ - git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=git/ipp;name=ipp;protocol=https \ +SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=4.x;protocol=https \ + git://github.com/opencv/opencv_contrib.git;destsuffix=git/contrib;name=contrib;branch=4.x;protocol=https \ git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=git/boostdesc;name=boostdesc;protocol=https \ git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=git/vgg;name=vgg;protocol=https \ git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=git/face;name=face;protocol=https \ git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=git/wechat_qrcode;name=wechat-qrcode;protocol=https \ - file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ file://0003-To-fix-errors-as-following.patch \ file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ file://0001-Dont-use-isystem.patch \ file://download.patch \ file://0001-Make-ts-module-external.patch \ - file://0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch \ file://0008-Do-not-embed-build-directory-in-binaries.patch \ " SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib" @@ -63,7 +41,6 @@ S = "${WORKDIR}/git" OPENCV_DLDIR = "${WORKDIR}/downloads" do_unpack_extra() { - tar xzf ${S}/ipp/ippicv/${IPP_FILENAME} -C ${S} md5() { # Return the MD5 of $1 @@ -92,8 +69,7 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${S}/contrib/modules \ -DWITH_1394=OFF \ -DENABLE_PRECOMPILED_HEADERS=OFF \ -DCMAKE_SKIP_RPATH=ON \ - -DOPENCV_ICV_HASH=${IPP_MD5} \ - -DIPPROOT=${S}/ippicv_lnx \ + -DWITH_IPP=OFF \ -DOPENCV_GENERATE_PKGCONFIG=ON \ -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \ -DOPENCV_ALLOW_DOWNLOADS=OFF \ @@ -134,6 +110,7 @@ PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg," PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav," PACKAGECONFIG[libv4l] = "-DWITH_LIBV4L=ON,-DWITH_LIBV4L=OFF,v4l-utils," PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers virtual/opencl-icd," +PACKAGECONFIG[openvino] = "-DWITH_OPENVINO=ON,-DWITH_OPENVINO=OFF,openvino-inference-engine,openvino-inference-engine" PACKAGECONFIG[oracle-java] = "-DJAVA_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${ORACLE_JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native oracle-jse-jdk oracle-jse-jdk-native," PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng," PACKAGECONFIG[python2] = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python-numpy," @@ -185,7 +162,7 @@ python populate_packages:prepend () { metapkg = pn d.setVar('ALLOW_EMPTY:' + metapkg, "1") - blacklist = [ metapkg, "libopencv-ts" ] + blacklist = [ metapkg ] metapkg_rdepends = [ ] for pkg in packages[1:]: if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.endswith('-doc') and not pkg.endswith('-locale') and not pkg.endswith('-staticdev'): diff --git a/meta-oe/recipes-support/openldap/openldap_2.5.13.bb b/meta-oe/recipes-support/openldap/openldap_2.5.13.bb index b117677f9b..7dc926c61c 100644 --- a/meta-oe/recipes-support/openldap/openldap_2.5.13.bb +++ b/meta-oe/recipes-support/openldap/openldap_2.5.13.bb @@ -233,6 +233,3 @@ python populate_packages:prepend () { } BBCLASSEXTEND = "native" - -# CVE-2015-3276 has no target code. -CVE_CHECK_IGNORE += "CVE-2015-3276" diff --git a/meta-oe/recipes-support/opensc/files/0001-pkcs11-tool-Fix-private-key-import.patch b/meta-oe/recipes-support/opensc/files/0001-pkcs11-tool-Fix-private-key-import.patch new file mode 100644 index 0000000000..e270a8e2e6 --- /dev/null +++ b/meta-oe/recipes-support/opensc/files/0001-pkcs11-tool-Fix-private-key-import.patch @@ -0,0 +1,33 @@ +From 6f868bbcd9e65447f459f74381c09d1e315a32f6 Mon Sep 17 00:00:00 2001 +From: Jakub Jelen <jjelen@redhat.com> +Date: Thu, 1 Dec 2022 20:08:53 +0100 +Subject: [PATCH 1/2] pkcs11-tool: Fix private key import + +Upstream-Status: Backport +--- + src/tools/pkcs11-tool.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/tools/pkcs11-tool.c b/src/tools/pkcs11-tool.c +index aae205fe2cd6..cfee8526d5b0 100644 +--- a/src/tools/pkcs11-tool.c ++++ b/src/tools/pkcs11-tool.c +@@ -3669,13 +3669,13 @@ parse_rsa_pkey(EVP_PKEY *pkey, int private, struct rsakey_info *rsa) + RSA_get0_factors(r, &r_p, &r_q); + RSA_get0_crt_params(r, &r_dmp1, &r_dmq1, &r_iqmp); + #else +- if (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR1, &r_d) != 1 || ++ if (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_D, &r_d) != 1 || + EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR1, &r_p) != 1 || + EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR2, &r_q) != 1 || + EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT1, &r_dmp1) != 1 || + EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT2, &r_dmq1) != 1 || +- EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT3, &r_iqmp) != 1) { + util_fatal("OpenSSL error during RSA private key parsing"); ++ EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_COEFFICIENT1, &r_iqmp) != 1) { + } + #endif + RSA_GET_BN(rsa, private_exponent, r_d); +-- +2.30.2 + diff --git a/meta-oe/recipes-support/opensc/files/0002-pkcs11-tool-Log-more-information-on-OpenSSL-errors.patch b/meta-oe/recipes-support/opensc/files/0002-pkcs11-tool-Log-more-information-on-OpenSSL-errors.patch new file mode 100644 index 0000000000..880a13ac61 --- /dev/null +++ b/meta-oe/recipes-support/opensc/files/0002-pkcs11-tool-Log-more-information-on-OpenSSL-errors.patch @@ -0,0 +1,54 @@ +From 4b5702409e7feea8cb410254285c120c57c10e1b Mon Sep 17 00:00:00 2001 +From: Jakub Jelen <jjelen@redhat.com> +Date: Thu, 1 Dec 2022 20:11:41 +0100 +Subject: [PATCH 2/2] pkcs11-tool: Log more information on OpenSSL errors + +Upstream-Status: Backport +--- + src/tools/pkcs11-tool.c | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) + +diff --git a/src/tools/pkcs11-tool.c b/src/tools/pkcs11-tool.c +index cfee8526d5b0..f2e6b1dd91cd 100644 +--- a/src/tools/pkcs11-tool.c ++++ b/src/tools/pkcs11-tool.c +@@ -3641,10 +3641,8 @@ parse_rsa_pkey(EVP_PKEY *pkey, int private, struct rsakey_info *rsa) + const BIGNUM *r_dmp1, *r_dmq1, *r_iqmp; + r = EVP_PKEY_get1_RSA(pkey); + if (!r) { +- if (private) +- util_fatal("OpenSSL error during RSA private key parsing"); +- else +- util_fatal("OpenSSL error during RSA public key parsing"); ++ util_fatal("OpenSSL error during RSA %s key parsing: %s", private ? "private" : "public", ++ ERR_error_string(ERR_peek_last_error(), NULL)); + } + + RSA_get0_key(r, &r_n, &r_e, NULL); +@@ -3654,10 +3652,8 @@ parse_rsa_pkey(EVP_PKEY *pkey, int private, struct rsakey_info *rsa) + BIGNUM *r_dmp1 = NULL, *r_dmq1 = NULL, *r_iqmp = NULL; + if (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_N, &r_n) != 1 || + EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_E, &r_e) != 1) { +- if (private) +- util_fatal("OpenSSL error during RSA private key parsing"); +- else +- util_fatal("OpenSSL error during RSA public key parsing"); ++ util_fatal("OpenSSL error during RSA %s key parsing: %s", private ? "private" : "public", ++ ERR_error_string(ERR_peek_last_error(), NULL)); + } + #endif + RSA_GET_BN(rsa, modulus, r_n); +@@ -3674,8 +3670,9 @@ parse_rsa_pkey(EVP_PKEY *pkey, int private, struct rsakey_info *rsa) + EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR2, &r_q) != 1 || + EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT1, &r_dmp1) != 1 || + EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT2, &r_dmq1) != 1 || +- util_fatal("OpenSSL error during RSA private key parsing"); + EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_COEFFICIENT1, &r_iqmp) != 1) { ++ util_fatal("OpenSSL error during RSA private key parsing: %s", ++ ERR_error_string(ERR_peek_last_error(), NULL)); + } + #endif + RSA_GET_BN(rsa, private_exponent, r_d); +-- +2.30.2 + diff --git a/meta-oe/recipes-support/opensc/opensc_0.23.0.bb b/meta-oe/recipes-support/opensc/opensc_0.23.0.bb index b0f147c798..f68107df87 100644 --- a/meta-oe/recipes-support/opensc/opensc_0.23.0.bb +++ b/meta-oe/recipes-support/opensc/opensc_0.23.0.bb @@ -14,6 +14,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=cb8aedd3bced19bd8026d96a8b6876d7" #v0.21.0 SRCREV = "5497519ea6b4af596628f8f8f2f904bacaa3148f" SRC_URI = "git://github.com/OpenSC/OpenSC;branch=master;protocol=https \ + file://0001-pkcs11-tool-Fix-private-key-import.patch \ + file://0002-pkcs11-tool-Log-more-information-on-OpenSSL-errors.patch \ " DEPENDS = "virtual/libiconv openssl" diff --git a/meta-oe/recipes-support/p910nd/p910nd_0.97.bb b/meta-oe/recipes-support/p910nd/p910nd_0.97.bb index a27edb1410..cd7f79ea60 100644 --- a/meta-oe/recipes-support/p910nd/p910nd_0.97.bb +++ b/meta-oe/recipes-support/p910nd/p910nd_0.97.bb @@ -2,21 +2,28 @@ DESCRIPTION = "A small network printer daemon for embedded situations that passe HOMEPAGE = "http://p910nd.sourceforge.net/" SECTION = "console/utils" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=3d82780e8917b360cbee7b9ec3e40734" PR = "r2" -SRC_URI = "${SOURCEFORGE_MIRROR}/p910nd/p910nd-${PV}.tar.bz2 \ +# v0.97 +SRCREV = "57ebc07ad8723ea4106090536c58c7f7160743e2" +SRC_URI = "git://github.com/kenyapcomau/p910nd;protocol=https;branch=master \ file://fix-var-lock.patch" -SRC_URI[md5sum] = "69461a6c54dca0b13ecad5b83864b43e" -SRC_URI[sha256sum] = "4ac980a3ae24babae6f70f0a692625ece03a4a92c357fbb10d2e368386c3c26f" +S = "${WORKDIR}/git" + +inherit update-rc.d + +INITSCRIPT_NAME = "p910nd" +INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ." do_compile () { - ${CC} ${LDFLAGS} -o p910nd p910nd.c + ${CC} ${CFLAGS} ${LDFLAGS} -o p910nd p910nd.c } do_install () { install -D -m 0755 ${S}/p910nd ${D}${sbindir}/p910nd - install -D -m 0644 ${S}/p910nd.conf ${D}${sysconfdir}/p910nd.conf + install -D -m 0644 ${S}/aux/p910nd.conf ${D}${sysconfdir}/sysconfig/p910nd.conf + install -D -m 0644 ${S}/aux/p910nd.init ${D}${sysconfdir}/init.d/p910nd } diff --git a/meta-oe/recipes-support/pcp/pcp-native_5.3.6.bb b/meta-oe/recipes-support/pcp/pcp-native_6.0.5.bb index 5f3c9b6f00..2f37b099b4 100644 --- a/meta-oe/recipes-support/pcp/pcp-native_5.3.6.bb +++ b/meta-oe/recipes-support/pcp/pcp-native_6.0.5.bb @@ -46,8 +46,3 @@ do_install () { PCP_MAN_DIR=${D}/${mandir} \ PCP_DOC_DIR=${D}/${docdir} } -#| chkacc1.c:8:10: fatal error: localconfig.h: No such file or directory -#| 8 | #include "localconfig.h" -#| | ^~~~~~~~~~~~~~~ -PARALLEL_MAKE = "" - diff --git a/meta-oe/recipes-support/pcp/pcp.inc b/meta-oe/recipes-support/pcp/pcp.inc index 708ebfe7ab..4cafa7234b 100644 --- a/meta-oe/recipes-support/pcp/pcp.inc +++ b/meta-oe/recipes-support/pcp/pcp.inc @@ -9,24 +9,32 @@ COMPATIBLE_HOST:libc-musl = "null" SRC_URI = "https://performancecopilot.jfrog.io/artifactory/pcp-source-release/${BP}.src.tar.gz \ file://0001-configure-Limit-the-header-search-to-sysroot.patch \ + file://0001-htop-Change-dependency-order-of-header-and-sourcefil.patch \ file://config.linux \ " -SRC_URI[sha256sum] = "6ef33b7aa14c09860ba7cd8873e76d38ccd24eab0c94a50e235f813e77fe3610" +SRC_URI[sha256sum] = "dacf92ba195f1f2ea8f40bf0c455d2cd2456273a1e30dcc3ee5b5bfd099a99ee" inherit setuptools3-base pkgconfig autotools-brokensep # Specify any options you want to pass to the configure script using EXTRA_OECONF: CACHED_CONFIGUREVARS = "PACKAGE_DISTRIBUTION=arch" -EXTRA_OECONF:append = " --with-dstat-symlink=yes --with-infiniband=no \ - --with-pmdapodman=no --with-python=no --with-python3=yes --with-perl=no \ - --with-pmdabcc=no --with-pmdajson=no --with-perfevent=no \ - --with-pmdabcc=yes \ - --with-rundir=${localstatedir}/run \ - --with-sysconfigdir=${sysconfdir} \ - --with-logdir=${localstatedir}/log \ - --with-docdir=${docdir} \ - " +EXTRA_OECONF:append = "\ + --with-dstat-symlink=yes \ + --with-infiniband=no \ + --with-python=no \ + --with-perl=no \ + --with-python3=yes \ + --with-pmdajson=no \ + --with-perfevent=no \ + --with-pmdabcc=yes \ + --with-rundir=${localstatedir}/run \ + --with-sysconfigdir=${sysconfdir} \ + --with-logdir=${localstatedir}/log \ + --with-docdir=${docdir} \ + " PACKAGECONFIG[qt5] = "--with-qt=yes --with-qt3d=yes,--with-qt=no --with-qt3d=no,qtbase qt3d" PACKAGECONFIG ?= "" + +PARALLEL_MAKE = "" diff --git a/meta-oe/recipes-support/pcp/pcp/0001-Remove-unsuitble-part-for-cross-compile.patch b/meta-oe/recipes-support/pcp/pcp/0001-Remove-unsuitble-part-for-cross-compile.patch index 292499850e..abf4aee61d 100644 --- a/meta-oe/recipes-support/pcp/pcp/0001-Remove-unsuitble-part-for-cross-compile.patch +++ b/meta-oe/recipes-support/pcp/pcp/0001-Remove-unsuitble-part-for-cross-compile.patch @@ -11,11 +11,9 @@ Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> src/libpcp/src/GNUmakefile | 1 - 2 files changed, 7 deletions(-) -diff --git a/configure.ac b/configure.ac -index 5b25382..5d24714 100644 --- a/configure.ac +++ b/configure.ac -@@ -623,12 +623,6 @@ fi +@@ -607,12 +607,6 @@ fi which=$WHICH AC_SUBST(which) @@ -28,18 +26,14 @@ index 5b25382..5d24714 100644 ar=$AR AC_SUBST(ar) -diff --git a/src/libpcp/src/GNUmakefile b/src/libpcp/src/GNUmakefile -index 3c4ccd6..d1eba19 100644 --- a/src/libpcp/src/GNUmakefile +++ b/src/libpcp/src/GNUmakefile -@@ -176,7 +176,6 @@ exports: exports.in mk.exports - # cases +@@ -179,8 +179,6 @@ exports: exports.in mk.exports + # consistent in all placess. # check.done: $(OBJECTS) - ./check-statics +- ./check-errorcodes touch check.done ifneq ($(LIBTARGET),) --- -2.25.1 - diff --git a/meta-oe/recipes-support/pcp/pcp/0001-configure-Limit-the-header-search-to-sysroot.patch b/meta-oe/recipes-support/pcp/pcp/0001-configure-Limit-the-header-search-to-sysroot.patch index 591f94f374..b03c48e581 100644 --- a/meta-oe/recipes-support/pcp/pcp/0001-configure-Limit-the-header-search-to-sysroot.patch +++ b/meta-oe/recipes-support/pcp/pcp/0001-configure-Limit-the-header-search-to-sysroot.patch @@ -14,11 +14,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> configure.ac | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) -diff --git a/configure.ac b/configure.ac -index 5d24714..4e2d8ec 100644 --- a/configure.ac +++ b/configure.ac -@@ -913,7 +913,7 @@ AC_DEFUN([PCP_CHECK_PYTHON_HEADER], +@@ -907,7 +907,7 @@ AC_DEFUN([PCP_CHECK_PYTHON_HEADER], [ PY_MAJOR="$1" PY_MINOR="$2" PY_VERSION="python$PY_MAJOR.$PY_MINOR" @@ -27,7 +25,7 @@ index 5d24714..4e2d8ec 100644 saved_CFLAGS="$CFLAGS" saved_CPPFLAGS="$CPPFLAGS" CFLAGS="$CFLAGS $PY_INCLUDE_DIRS" -@@ -1524,7 +1524,7 @@ AC_SUBST(qmake) +@@ -1603,7 +1603,7 @@ AC_SUBST(qmake) enable_qt3d=false AS_IF([test "x$do_qt3d" != "xno"], [ @@ -36,45 +34,7 @@ index 5d24714..4e2d8ec 100644 then enable_qt3d=$enable_qt elif test x"$do_qt3d" = x"yes" -@@ -3810,13 +3810,13 @@ then - - saved_CFLAGS="$CFLAGS" - saved_CPPFLAGS="$CPPFLAGS" -- NSS_INC_DIRS="-I/usr/include/nss -I/usr/include/nss3" -- NSPR_INC_DIRS="-I/usr/include/nspr -I/usr/include/nspr4" -+ NSS_INC_DIRS="-I${STAGING_INCDIR}/nss -I${STAGING_INCDIR}/nss3" -+ NSPR_INC_DIRS="-I${STAGING_INCDIR}/nspr -I${STAGING_INCDIR}/nspr4" - CFLAGS="$CFLAGS $NSS_INC_DIRS $NSPR_INC_DIRS" - CPPFLAGS="$CPPFLAGS $NSS_INC_DIRS $NSPR_INC_DIRS" - -- AC_CHECK_HEADERS([nss/nss.h], [NSSCFLAGS=-I/usr/include/nss], [ -- AC_CHECK_HEADERS([nss3/nss.h], [NSSCFLAGS=-I/usr/include/nss3], [ -+ AC_CHECK_HEADERS([nss/nss.h], [NSSCFLAGS=-I${STAGING_INCDIR}/nss], [ -+ AC_CHECK_HEADERS([nss3/nss.h], [NSSCFLAGS=-I${STAGING_INCDIR}/nss3], [ - enable_secure=false - if test "$do_secure" = "yes" - then -@@ -3826,8 +3826,8 @@ then - ]) - AC_SUBST(NSSCFLAGS) - -- AC_CHECK_HEADERS([nspr/nspr.h], [NSPRCFLAGS=-I/usr/include/nspr], [ -- AC_CHECK_HEADERS([nspr4/nspr.h], [NSPRCFLAGS=-I/usr/include/nspr4], [ -+ AC_CHECK_HEADERS([nspr/nspr.h], [NSPRCFLAGS=-I${STAGING_INCDIR}/nspr], [ -+ AC_CHECK_HEADERS([nspr4/nspr.h], [NSPRCFLAGS=-I${STAGING_INCDIR}/nspr4], [ - enable_secure=false - if test "$do_secure" = "yes" - then -@@ -3837,7 +3837,7 @@ then - ]) - AC_SUBST(NSPRCFLAGS) - -- AC_CHECK_HEADERS([sasl/sasl.h], [SASLCFLAGS=-I/usr/include/sasl], [ -+ AC_CHECK_HEADERS([sasl/sasl.h], [SASLCFLAGS=-I${STAGING_INCDIR}/sasl], [ - enable_secure=false - if test "$do_secure" = "yes" - then -@@ -3938,7 +3938,7 @@ AC_SUBST(enable_decompression) +@@ -3699,7 +3699,7 @@ AC_SUBST(enable_decompression) AC_SUBST(enable_lzma) dnl check for array sessions @@ -83,6 +43,3 @@ index 5d24714..4e2d8ec 100644 then pcp_mpi_dirs=libpcp_mpi\ libpcp_mpiread else --- -2.35.1 - diff --git a/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch b/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch new file mode 100644 index 0000000000..009dfe2d04 --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch @@ -0,0 +1,36 @@ +From c123980d6bf1bc2bf93ee0dd0d7f8fee3d4ddc96 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 5 Jul 2023 08:45:14 -0700 +Subject: [PATCH] htop: Change dependency order of header and sourcefiles + +Fixes build race +| pcp/Platform.h:29:10: fatal error: DiskIOMeter.h: No such file or directory +| 29 | #include "DiskIOMeter.h" +| | ^~~~~~~~~~~~~~~ +| compilation terminated. +| make[3]: *** [<builtin>: pcp-htop.o] Error 1 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/pcp/htop/GNUmakefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/pcp/htop/GNUmakefile b/src/pcp/htop/GNUmakefile +index 6b7c0c5..5153c63 100644 +--- a/src/pcp/htop/GNUmakefile ++++ b/src/pcp/htop/GNUmakefile +@@ -186,8 +186,8 @@ CFGMETERS = $(patsubst %,pcp/meters/%,$(METERS)) + CFGCOLUMNS = $(patsubst %,pcp/columns/%,$(COLUMNS)) + + CFGXFILES = $(CFGMETERS) $(CFGCOLUMNS) +-TOPXFILES = $(TOPCFILES) $(TOPHFILES) $(DOCFILES) +-SUBXFILES = $(SUBCFILES) $(SUBHFILES) ++TOPXFILES = $(TOPHFILES) $(TOPCFILES) $(DOCFILES) ++SUBXFILES = $(SUBHFILES) $(SUBCFILES) + CFILES = $(TOPCFILES) $(SUBCFILES) + HFILES = $(TOPHFILES) $(SUBHFILES) + LDIRT = $(TOPXFILES) $(SUBXFILES) $(CFGXFILES) \ +-- +2.41.0 + diff --git a/meta-oe/recipes-support/pcp/pcp/fix_parallel_make.patch b/meta-oe/recipes-support/pcp/pcp/fix_parallel_make.patch index 630f51a494..9cb649a594 100644 --- a/meta-oe/recipes-support/pcp/pcp/fix_parallel_make.patch +++ b/meta-oe/recipes-support/pcp/pcp/fix_parallel_make.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/qa/src/GNUlocaldefs +++ b/qa/src/GNUlocaldefs @@ -728,7 +728,7 @@ scale.o: localconfig.h diff --git a/meta-oe/recipes-support/pcp/pcp_5.3.6.bb b/meta-oe/recipes-support/pcp/pcp_6.0.5.bb index 0543d77a78..b337df6ea4 100644 --- a/meta-oe/recipes-support/pcp/pcp_5.3.6.bb +++ b/meta-oe/recipes-support/pcp/pcp_6.0.5.bb @@ -18,17 +18,26 @@ SRC_URI += "file://0001-Remove-unsuitble-part-for-cross-compile.patch \ export PCP_DIR="${RECIPE_SYSROOT_NATIVE}" #export PCP_RUN_DIR="${RECIPE_SYSROOT_NATIVE}" EXTRA_OEMAKE = "CC="${CC}" LD="${LD}"" -inherit useradd systemd features_check +inherit useradd systemd features_check python3targetconfig # Needs libx11 REQUIRED_DISTRO_FEATURES = "x11" SYSTEMD_AUTO_ENABLE:${PN} = "enable" -SYSTEMD_SERVICE:${PN} = "pmcd.service pmcd.service pmie_check.service pmie_farm_check.service \ - pmlogger_daily.service pmlogger_farm_check.service pmfind.service \ - pmie_daily.service pmlogger.service pmlogger_daily_report.service \ - pmproxy.service pmie.service pmie_farm.service pmlogger_check.service \ - pmlogger_farm.service" +SYSTEMD_SERVICE:${PN} = "\ + pmie_farm_check.service \ + pmie_farm.service \ + pmfind.service \ + pmlogger_farm_check.service \ + pmcd.service \ + pmie.service \ + pmlogger_daily.service \ + pmlogger.service \ + pmlogger_farm.service \ + pmie_check.service \ + pmproxy.service \ + pmlogger_check.service \ + pmie_daily.service" USERADD_PACKAGES = "${PN}" USERADD_PARAM:${PN} = "--system --home ${localstatedir}/lib/pcp --no-create-home \ @@ -88,7 +97,7 @@ do_install () { PACKAGES += " ${PN}-export-zabbix-agent ${PN}-testsuite \ libpcp-gui2 libpcp-gui2-dev \ - libpcp-import1 \ + libpcp-import1 libpcp-archive1 \ libpcp-mmv1 libpcp-mmv1-dev \ libpcp-pmda3 libpcp-pmda3-dev \ libpcp-trace2 libpcp-trace2-dev \ @@ -97,6 +106,8 @@ PACKAGES += " ${PN}-export-zabbix-agent ${PN}-testsuite \ " FILES:libpcp-gui2 = "${libdir}/libpcp_gui.so.2 \ " +FILES:libpcp-archive1 = "${libdir}/libpcp_archive.so.1 \ +" FILES:libpcp-gui2-dev = " \ ${libdir}/libpcp_gui.so \ ${libdir}/libpcp_gui.a \ @@ -166,6 +177,7 @@ FILES:${PN} = " \ ${datadir}/zsh \ ${systemd_system_unitdir}/ \ ${libdir}/pcp/ \ + ${libdir}/sysusers.d/pcp.conf \ ${datadir}/pcp \ ${libdir}/*.sh \ ${datadir}/man \ @@ -184,7 +196,7 @@ FILES:${PN}-export-zabbix-agent += " \ ${mandir}/man3/zbxpcp.3.gz \ ${libdir}/zabbix \ " -FILES:${PN}-testsuite = "${localstatedir}/lib/pcp/testsuite/" +FILES:${PN}-testsuite = "${localstatedir}/lib/pcp/testsuite/ ${libdir}/sysusers.d/pcp-testsuite.conf" FILES:python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}" FILES:${PN}-dev += " \ ${includedir}/pcp \ @@ -222,7 +234,3 @@ FILES:${PN}-dev += " \ ${datadir}/man/man3/pms* \ ${datadir}/man/man3/pmt* \ " -#| chkacc1.c:8:10: fatal error: localconfig.h: No such file or directory -#| 8 | #include "localconfig.h" -#| | ^~~~~~~~~~~~~~~ -PARALLEL_MAKE = "" diff --git a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.9.bb b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.0.0.bb index c84c94dd5b..e7f4551afa 100644 --- a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.9.bb +++ b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.0.0.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=628c01ba985ecfa21677f5ee2d5202f6" DEPENDS = "autoconf-archive-native flex-native" SRC_URI = "https://pcsclite.apdu.fr/files/${BP}.tar.bz2" -SRC_URI[sha256sum] = "cbcc3b34c61f53291cecc0d831423c94d437b188eb2b97b7febc08de1c914e8a" +SRC_URI[sha256sum] = "d6c3e2b64510e5ed6fcd3323febf2cc2a8e5fda5a6588c7671f2d77f9f189356" inherit autotools systemd pkgconfig perlnative diff --git a/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.6.1.bb b/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.6.2.bb index 6a2e1b2e0e..b71fb0427b 100644 --- a/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.6.1.bb +++ b/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.6.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 = "63e532cfa97932aac76ca5f7473d1ce11602a139" +SRCREV = "b1018b83346f8a3bc3d42c96f2ed4dc62147cb24" inherit autotools pkgconfig @@ -13,4 +13,12 @@ S = "${WORKDIR}/git" DEPENDS = "pcsc-lite" +RDEPENDS:${PN} += " \ + ${@bb.utils.contains('DISTRO_FEATURES','systemd','pcsc-lite-systemd', 'pcsc-lite', d)} \ + perl \ + perl-module-getopt-std \ + perl-module-file-stat \ + libpcsc-perl \ +" + FILES:${PN} += "${datadir}/pcsc/smartcard_list.txt" diff --git a/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb b/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb index c0e1790ec2..6ce42ec187 100644 --- a/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb +++ b/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb @@ -25,6 +25,8 @@ PACKAGECONFIG[krb5] = "--with-krb5=yes,--with-krb5=no,krb5" PACKAGECONFIG[telepathy] = "--enable-telepathy=yes,--enable-telepathy=no,telepathy-glib" #PACKAGECONFIG[gssapi_only] = "--enable-gssapi-only=yes,--enable-gssapi-only=no,krb5" PACKAGECONFIG[debug] = "--enable-debug=yes,--enable-debug=no,valgrind" +# disable Werror by default, useful for dev mode +PACKAGECONFIG[quality] = "--enable-quality-check=yes,--enable-quality-check=no," FILES:${PN}-dev += " \ ${libdir}/purple-2/*.la \ diff --git a/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch b/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch index 0a1baa9183..1c4daa9f67 100644 --- a/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch +++ b/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch @@ -3,6 +3,8 @@ 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/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch b/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch index 84dbcdc276..cf6207423d 100644 --- a/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch +++ b/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch @@ -3,6 +3,8 @@ From: Herrie <github.com@herrie.org> Date: Mon, 24 Jul 2017 21:30:16 +0200 --- +Upstream-Status: Pending + configure.ac | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb b/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb index 3d8a45786d..3a0cc02299 100644 --- a/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb +++ b/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb @@ -15,10 +15,8 @@ SRC_URI = "\ SRC_URI[sha256sum] = "19654ad276b149646371fbdac21bc7620742f2975f7399fed0ffc1a18fbaf603" -CVE_CHECK_IGNORE += "\ - CVE-2010-1624 \ - CVE-2011-3594 \ -" +CVE_CHECK_STATUS[CVE-2010-1624] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." +CVE_CHECK_STATUS[CVE-2011-3594] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." PACKAGECONFIG ??= "gnutls consoleui avahi dbus idn nss \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtk startup-notification', '', d)} \ diff --git a/meta-oe/recipes-support/pngcheck/pngcheck/0001-make-Respect-variables-from-environement.patch b/meta-oe/recipes-support/pngcheck/pngcheck/0001-make-Respect-variables-from-environement.patch index 2d0ea0252c..12333cc1f1 100644 --- a/meta-oe/recipes-support/pngcheck/pngcheck/0001-make-Respect-variables-from-environement.patch +++ b/meta-oe/recipes-support/pngcheck/pngcheck/0001-make-Respect-variables-from-environement.patch @@ -7,6 +7,8 @@ link with shared zlib Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + Makefile.unx | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/meta-oe/recipes-support/pngcheck/pngcheck/0001-png-fix-IDAT-windowsize-Fix-format-string-errors-in-.patch b/meta-oe/recipes-support/pngcheck/pngcheck/0001-png-fix-IDAT-windowsize-Fix-format-string-errors-in-.patch index 6d4465fbed..0fc5a8e0d2 100644 --- a/meta-oe/recipes-support/pngcheck/pngcheck/0001-png-fix-IDAT-windowsize-Fix-format-string-errors-in-.patch +++ b/meta-oe/recipes-support/pngcheck/pngcheck/0001-png-fix-IDAT-windowsize-Fix-format-string-errors-in-.patch @@ -6,6 +6,8 @@ Subject: [PATCH 1/2] png-fix-IDAT-windowsize: Fix format string errors in Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + gpl/png-fix-IDAT-windowsize.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/pngcheck/pngcheck/10-pngsplit-format-strings.patch b/meta-oe/recipes-support/pngcheck/pngcheck/10-pngsplit-format-strings.patch index f2c86689ec..2ff6d664c0 100644 --- a/meta-oe/recipes-support/pngcheck/pngcheck/10-pngsplit-format-strings.patch +++ b/meta-oe/recipes-support/pngcheck/pngcheck/10-pngsplit-format-strings.patch @@ -2,6 +2,8 @@ From: Jari Aalto <jari.aalto@cante.net> Subject: Correct fomat strings fro hardened build flags --- +Upstream-Status: Pending + gpl/pngsplit.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-oe/recipes-support/poco/poco/run-ptest b/meta-oe/recipes-support/poco/poco/run-ptest index c479f7ac10..c9896eadee 100644 --- a/meta-oe/recipes-support/poco/poco/run-ptest +++ b/meta-oe/recipes-support/poco/poco/run-ptest @@ -1,9 +1,8 @@ #!/bin/sh while read runner; do - pushd . >/dev/null + oldpath=`pwd` >/dev/null cd bin echo Testing $runner ./$runner-testrunner -all - popd >/dev/null + cd $oldpath >/dev/null done < testrunners - diff --git a/meta-oe/recipes-support/poppler/poppler-data_0.4.11.bb b/meta-oe/recipes-support/poppler/poppler-data_0.4.12.bb index b0c0869a04..eed21ad54a 100644 --- a/meta-oe/recipes-support/poppler/poppler-data_0.4.11.bb +++ b/meta-oe/recipes-support/poppler/poppler-data_0.4.12.bb @@ -18,7 +18,7 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.gz \ ${CMAP_RESOURCES_BASE}/Identity-H;name=idh \ ${CMAP_RESOURCES_BASE}/Identity-V;name=idv" -SRC_URI[sha256sum] = "2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c" +SRC_URI[sha256sum] = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74" SRC_URI[idh.md5sum] = "009c93cf0141ab7bd6acb7eea14306cc" SRC_URI[idh.sha256sum] = "ae702c203a82ea124e9b96590f821db6fbf8754e2c4547a9dba0e82f94739e95" SRC_URI[idv.md5sum] = "2f32a45d43d001c26eeac6b878855fbf" diff --git a/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch b/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch index 44a22963af..adbe82263f 100644 --- a/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch +++ b/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch @@ -1,4 +1,4 @@ -From 51a2a1e4d8ca4040a6a7eac398cb704da35f39e5 Mon Sep 17 00:00:00 2001 +From 04686340c4cd375a17d60d31bf6943367cc33214 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 21 Jan 2023 03:09:08 -0800 Subject: [PATCH] cmake: Do not use -isystem @@ -28,7 +28,10 @@ but instead of prepending, it will append to system headers and the issue is addressed Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- +Upstream-Status: Pending + CMakeLists.txt | 4 ++-- glib/CMakeLists.txt | 4 ++-- qt5/src/CMakeLists.txt | 4 ++-- @@ -38,7 +41,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4768ac8..cdc014d 100644 +index c6c757c..5f1c540 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -603,10 +603,10 @@ add_library(poppler ${poppler_SRCS}) @@ -53,7 +56,7 @@ index 4768ac8..cdc014d 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 126.0.0 SOVERSION 126) + 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 --- a/glib/CMakeLists.txt @@ -187,6 +190,3 @@ index 1c3ebcb..bc1840a 100644 endif() install(TARGETS pdftops DESTINATION bin) install(FILES pdftops.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) --- -2.39.1 - diff --git a/meta-oe/recipes-support/poppler/poppler/jpeg-stdio.patch b/meta-oe/recipes-support/poppler/poppler/jpeg-stdio.patch new file mode 100644 index 0000000000..70ba1cf123 --- /dev/null +++ b/meta-oe/recipes-support/poppler/poppler/jpeg-stdio.patch @@ -0,0 +1,41 @@ +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-oe/recipes-support/poppler/poppler_23.01.0.bb b/meta-oe/recipes-support/poppler/poppler_23.04.0.bb index 4d1a089d7b..896176801b 100644 --- a/meta-oe/recipes-support/poppler/poppler_23.01.0.bb +++ b/meta-oe/recipes-support/poppler/poppler_23.04.0.bb @@ -7,10 +7,11 @@ 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 \ " -SRC_URI[sha256sum] = "fae9b88d3d5033117d38477b79220cfd0d8e252c278ec870ab1832501741fd94" +SRC_URI[sha256sum] = "b6d893dc7dcd4138b9e9df59a13c59695e50e80dc5c2cacee0674670693951a1" -DEPENDS = "fontconfig zlib cairo lcms glib-2.0" +DEPENDS = "fontconfig zlib cairo lcms glib-2.0 glib-2.0-native" inherit cmake pkgconfig gobject-introspection diff --git a/meta-oe/recipes-support/portaudio/portaudio-v19/0001-Find-jack.patch b/meta-oe/recipes-support/portaudio/portaudio-v19/0001-Find-jack.patch deleted file mode 100644 index d6c6300ecd..0000000000 --- a/meta-oe/recipes-support/portaudio/portaudio-v19/0001-Find-jack.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8ec1b100afda5b3e31f9d44af04b04b16dfff2e4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Tue, 18 May 2021 00:15:46 +0200 -Subject: [PATCH] Find jack with pkgconfig -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@gmail.com> ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 122fe93..ab7d7f5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -274,7 +274,8 @@ ELSE() - - ELSEIF(UNIX) - -- FIND_PACKAGE(Jack) -+ find_package(PkgConfig REQUIRED) -+ pkg_check_modules (JACK jack) - IF(JACK_FOUND) - OPTION(PA_USE_JACK "Enable support for Jack" ON) - ELSE() --- -2.31.1 - diff --git a/meta-oe/recipes-support/portaudio/portaudio-v19/0001-cmake-Use-GNUInstallDirs.patch b/meta-oe/recipes-support/portaudio/portaudio-v19/0001-cmake-Use-GNUInstallDirs.patch deleted file mode 100644 index 892399de70..0000000000 --- a/meta-oe/recipes-support/portaudio/portaudio-v19/0001-cmake-Use-GNUInstallDirs.patch +++ /dev/null @@ -1,49 +0,0 @@ -From ced7af0420c1df0ac02f0c25e7c3534431ebd7fd Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 4 Jul 2021 17:09:49 -0700 -Subject: [PATCH] cmake: Use GNUInstallDirs - -Helps install cmakefiles in right libdir - -Upstream-Status: Submitted [https://github.com/PortAudio/portaudio/pull/610] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - CMakeLists.txt | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,6 +6,8 @@ - - CMAKE_MINIMUM_REQUIRED(VERSION 2.8) - -+include(GNUInstallDirs) -+ - # Check if the user is building PortAudio stand-alone or as part of a larger - # project. If this is part of a larger project (i.e. the CMakeLists.txt has - # been imported by some other CMakeLists.txt), we don't want to trump over -@@ -452,18 +454,18 @@ IF(NOT PA_OUTPUT_OSX_FRAMEWORK AND NOT P - CONFIGURE_FILE(cmake_support/portaudio-2.0.pc.in ${CMAKE_CURRENT_BINARY_DIR}/portaudio-2.0.pc @ONLY) - INSTALL(FILES README.md DESTINATION share/doc/portaudio) - INSTALL(FILES LICENSE.txt DESTINATION share/doc/portaudio) -- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/portaudio-2.0.pc DESTINATION lib/pkgconfig) -+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/portaudio-2.0.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - INSTALL(FILES ${PA_PUBLIC_INCLUDES} DESTINATION include) - INSTALL(TARGETS ${PA_TARGETS} - EXPORT portaudio-targets -- RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib) -- INSTALL(EXPORT portaudio-targets FILE "portaudioTargets.cmake" DESTINATION "lib/cmake/portaudio") -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ INSTALL(EXPORT portaudio-targets FILE "portaudioTargets.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/portaudio") - EXPORT(TARGETS ${PA_TARGETS} FILE "${PROJECT_BINARY_DIR}/cmake/portaudio/portaudioTargets.cmake") - INSTALL(FILES "${CMAKE_BINARY_DIR}/cmake/portaudio/portaudioConfig.cmake" - "${CMAKE_BINARY_DIR}/cmake/portaudio/portaudioConfigVersion.cmake" -- DESTINATION "lib/cmake/portaudio") -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/portaudio") - - IF (NOT TARGET uninstall) - CONFIGURE_FILE( diff --git a/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb b/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb index f34912ed28..c49a2599ac 100644 --- a/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb +++ b/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb @@ -3,18 +3,17 @@ SECTION = "libs/multimedia" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=26107732c2ab637c5710446fcfaf02df" -PV = "v190700" +PV .= "+git${SRCPV}" + +SRC_URI = "git://github.com/PortAudio/portaudio.git;branch=master;protocol=https" +SRCREV = "929e2e8f7af281c5eb4fa07758930d542ec43d97" -SRC_URI = " \ - git://github.com/PortAudio/portaudio.git;branch=master;protocol=https \ - file://0001-Find-jack.patch \ - file://0001-cmake-Use-GNUInstallDirs.patch \ -" -SRCREV = "147dd722548358763a8b649b3e4b41dfffbcfbb6" S = "${WORKDIR}/git" inherit cmake pkgconfig +EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON" + PACKAGECONFIG ??= "alsa jack" PACKAGECONFIG[alsa] = ",,alsa-lib" PACKAGECONFIG[jack] = ",,jack" @@ -28,6 +27,3 @@ do_install:append() { done fi } - -FILES_SOLIBSDEV = "" -FILES:${PN} += "${libdir}/libportaudio.so" diff --git a/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-compile-errors.patch b/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-compile-errors.patch index 8341a8ecde..c1f9ce7eca 100644 --- a/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-compile-errors.patch +++ b/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-compile-errors.patch @@ -5,6 +5,8 @@ Subject: [PATCH 1/3] From debian to fix compile errors Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + src/Makefile.0 | 7 +++---- src/autoconf | 64 +++++++++++++------------------------------------------- src/comsat.c | 65 +++++++++++++++++++-------------------------------------- diff --git a/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-man-file.patch b/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-man-file.patch index 7b3c643b2b..78ac6241d0 100644 --- a/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-man-file.patch +++ b/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-man-file.patch @@ -5,6 +5,8 @@ Subject: [PATCH 2/3] From debian to fix man file Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + man/procmail.man | 24 +++++++++++++++++------- man/procmailrc.man | 2 +- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/meta-oe/recipes-support/procmail/procmail/from-debian-to-modify-parameters.patch b/meta-oe/recipes-support/procmail/procmail/from-debian-to-modify-parameters.patch index a94e436703..2bebccc0b2 100644 --- a/meta-oe/recipes-support/procmail/procmail/from-debian-to-modify-parameters.patch +++ b/meta-oe/recipes-support/procmail/procmail/from-debian-to-modify-parameters.patch @@ -5,6 +5,8 @@ Subject: [PATCH 3/3] From debian to modify parameters Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + Makefile | 16 ++++++++-------- config.h | 13 +++++++------ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/meta-oe/recipes-support/procmail/procmail/man-file-mailstat.1-from-debian.patch b/meta-oe/recipes-support/procmail/procmail/man-file-mailstat.1-from-debian.patch index 46d973e060..72fa27a834 100644 --- a/meta-oe/recipes-support/procmail/procmail/man-file-mailstat.1-from-debian.patch +++ b/meta-oe/recipes-support/procmail/procmail/man-file-mailstat.1-from-debian.patch @@ -5,6 +5,8 @@ Subject: [PATCH] man file mailstat.1 from debian Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + debian/mailstat.1 | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 debian/mailstat.1 diff --git a/meta-oe/recipes-support/psutils/psutils_2.10.bb b/meta-oe/recipes-support/psutils/psutils_2.10.bb new file mode 100644 index 0000000000..1f1894a5f2 --- /dev/null +++ b/meta-oe/recipes-support/psutils/psutils_2.10.bb @@ -0,0 +1,24 @@ +LICENSE = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=87212b5f1ae096371049a12f80034f32" + +SRC_URI = "https://github.com/rrthomas/psutils/releases/download/v${PV}/psutils-${PV}.tar.gz" +SRC_URI[sha256sum] = "6f8339fd5322df5c782bfb355d9f89e513353220fca0700a5a28775404d7e98b" + +inherit perlnative autotools + +export PERL="/usr/bin/env perl" + +DEPENDS += "libpaper-native" + +do_install:append() { + sed -i -e 's|${STAGING_BINDIR_NATIVE}/perl-native/|/usr/bin/env |g' ${D}${bindir}/pstops + for f in psbook psresize psnup psselect; do + grep -v '${B}' ${D}${bindir}/$f > ${D}${bindir}/$f.temp + install -m 0755 ${D}${bindir}/$f.temp ${D}${bindir}/$f + rm -f ${D}${bindir}/$f.temp + done +} + +BBCLASSEXTEND += "native" +# /usr/bin/pstops contained in package psutils requires perl +RDEPENDS:${PN} += "perl" diff --git a/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch b/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch new file mode 100644 index 0000000000..3c364dcc4e --- /dev/null +++ b/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch @@ -0,0 +1,38 @@ +From c5cd932fb08e7ce90cdbf9ae6c5cc7e65ac0738e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michael=20Wei=C3=9F?= <michael.weiss@aisec.fraunhofer.de> +Date: Tue, 9 May 2023 20:00:26 +0200 +Subject: [PATCH] pv/display: handle error of tcgetpgrp() in pv_in_foreground() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Show pv progress bar even if no terminal is set, e.g., in a busybox +init script. The description of pv_in_forground() states it will +return true "if we aren't outputting to a terminal". However, this +is not the case since tcgetpgrg() will return an error and set ERRNO +to ENOTTY if the output fd is not an tty. We now handle this error +correctly and pv_in_foreground() returns also true in that case. + +Signed-off-by: Michael Weiß <michael.weiss@aisec.fraunhofer.de> +--- + src/pv/display.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/pv/display.c b/src/pv/display.c +index aff643b..8d1f4c9 100644 +--- a/src/pv/display.c ++++ b/src/pv/display.c +@@ -48,6 +48,10 @@ bool pv_in_foreground(void) + + our_process_group = getpgrp(); + tty_process_group = tcgetpgrp(STDERR_FILENO); ++ ++ if (tty_process_group == -1 && errno == ENOTTY) ++ return true; ++ + if (our_process_group == tty_process_group) + return true; + +-- +2.30.2 + diff --git a/meta-oe/recipes-support/pv/pv_1.6.20.bb b/meta-oe/recipes-support/pv/pv_1.6.20.bb index 867a621d1a..6d449a945b 100644 --- a/meta-oe/recipes-support/pv/pv_1.6.20.bb +++ b/meta-oe/recipes-support/pv/pv_1.6.20.bb @@ -5,6 +5,7 @@ LICENSE = "Artistic-2.0" LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02" SRC_URI = "https://www.ivarch.com/programs/sources/${BP}.tar.bz2 \ + file://0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch \ file://run-ptest \ " SRC_URI[sha256sum] = "e831951eff0718fba9b1ef286128773b9d0e723e1fbfae88d5a3188814fdc603" diff --git a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/i2c.patch b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/i2c.patch index 36983ec479..2b5b5caa6f 100644 --- a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/i2c.patch +++ b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/i2c.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: pxaregs-1.14/pxaregs.c =================================================================== --- pxaregs-1.14.orig/pxaregs.c diff --git a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/munmap.patch b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/munmap.patch index a9c4b95cf0..c0f81725d9 100644 --- a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/munmap.patch +++ b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/munmap.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: pxaregs-1.14/pxaregs.c =================================================================== --- pxaregs-1.14.orig/pxaregs.c diff --git a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/serial.patch b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/serial.patch index 06853851d0..fba2e7f513 100644 --- a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/serial.patch +++ b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/serial.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: pxaregs-1.14/pxaregs.c =================================================================== --- pxaregs-1.14.orig/pxaregs.c diff --git a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/usb.patch b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/usb.patch index 59f21fe3c1..91ca0a7742 100644 --- a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/usb.patch +++ b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/usb.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: pxaregs-1.14/pxaregs.c =================================================================== --- pxaregs-1.14.orig/pxaregs.c diff --git a/meta-oe/recipes-support/raptor2/files/0001-Match-reutrn-type-from-RAPTOR_ASSERT_OBJECT_POINTER_.patch b/meta-oe/recipes-support/raptor2/files/0001-Match-reutrn-type-from-RAPTOR_ASSERT_OBJECT_POINTER_.patch deleted file mode 100644 index 4c1afb46eb..0000000000 --- a/meta-oe/recipes-support/raptor2/files/0001-Match-reutrn-type-from-RAPTOR_ASSERT_OBJECT_POINTER_.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 97b5dcaa6b221eb403cc92e953225d38aee18f70 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 1 Sep 2022 14:48:39 -0700 -Subject: [PATCH] Match reutrn type from - RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE - -This ensures that integer type 0 is returned and not NULL -Fixes -raptor_serialize.c:243:66: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'int' [-Wint-conversion] - RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, NULL); - ^~~~ -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/raptor_parse.c | 2 +- - src/raptor_serialize.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/raptor_parse.c b/src/raptor_parse.c -index 26911f4..0091e1e 100644 ---- a/src/raptor_parse.c -+++ b/src/raptor_parse.c -@@ -257,7 +257,7 @@ raptor_world_get_parser_factory(raptor_world *world, const char *name) - int - raptor_world_get_parsers_count(raptor_world* world) - { -- RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, NULL); -+ RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, 0); - - raptor_world_open(world); - -diff --git a/src/raptor_serialize.c b/src/raptor_serialize.c -index a1f29d7..2bf4ab2 100644 ---- a/src/raptor_serialize.c -+++ b/src/raptor_serialize.c -@@ -240,7 +240,7 @@ raptor_get_serializer_factory(raptor_world* world, const char *name) - int - raptor_world_get_serializers_count(raptor_world* world) - { -- RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, NULL); -+ RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, 0); - - raptor_world_open(world); - --- -2.37.3 - diff --git a/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch b/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch deleted file mode 100644 index 7faeb130a7..0000000000 --- a/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3f97aac5a1f43ef57b02fb9ccdcadd41a6b69fa9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Tue, 27 Oct 2015 10:21:24 +0100 -Subject: [PATCH] configure.ac: do additional checks on libxml2 also when - detected by pkg-config -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Applied [1] - -[1] https://github.com/dajobe/raptor/pull/33 - -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 10ff870..35fa08e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -601,7 +601,7 @@ have_libxml=0 - need_libxml=0 - - oCPPFLAGS="$CPPFLAGS" --if test "X$XML_CONFIG" != X; then -+if test "X$libxml_source" != X; then - CPPFLAGS="$LIBXML_CFLAGS $CPPFLAGS" - LIBS="$LIBS $LIBXML_LIBS" - AC_CHECK_FUNC(xmlCreatePushParserCtxt, have_xmlCreatePushParserCtxt=yes, have_xmlCreatePushParserCtxt=no) --- -2.1.0 - diff --git a/meta-oe/recipes-support/raptor2/raptor2/0001-Remove-the-access-to-entities-checked-private-symbol.patch b/meta-oe/recipes-support/raptor2/raptor2/0001-Remove-the-access-to-entities-checked-private-symbol.patch new file mode 100644 index 0000000000..e709616797 --- /dev/null +++ b/meta-oe/recipes-support/raptor2/raptor2/0001-Remove-the-access-to-entities-checked-private-symbol.patch @@ -0,0 +1,34 @@ +From da171e12d961b41b89196627ef5e5baae1e637ce Mon Sep 17 00:00:00 2001 +From: David Anes <david.anes@suse.com> +Date: Thu, 4 May 2023 11:54:02 +0200 +Subject: [PATCH] Remove the access to entities 'checked' private symbol for + libxml2 2.11.0 + +Since version 2.11.0, some private symbols that were never intended +as public API/ABI have been removed from libxml2, therefore the field +'checked' is no longer present and raptor fails to build in this +scenario. + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Upstream-Status: Backport [https://github.com/dajobe/raptor/commit/ac914399b9013c54572833d4818e6ce008136dc9] +--- + src/raptor_libxml.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/raptor_libxml.c b/src/raptor_libxml.c +index 538c2c8..8bcee13 100644 +--- a/src/raptor_libxml.c ++++ b/src/raptor_libxml.c +@@ -246,10 +246,11 @@ raptor_libxml_getEntity(void* user_data, const xmlChar *name) + + ret->owner = 1; + +-#if LIBXML_VERSION >= 20627 ++#if LIBXML_VERSION >= 20627 && LIBXML_VERSION < 21100 + /* Checked field was released in 2.6.27 on 2006-10-25 + * http://git.gnome.org/browse/libxml2/commit/?id=a37a6ad91a61d168ecc4b29263def3363fff4da6 + * ++ * and was later removed in version 2.11.0 + */ + + /* Mark this entity as having been checked - never do this again */ diff --git a/meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb b/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb index 22306a5c1b..30df8e0648 100644 --- a/meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb +++ b/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb @@ -1,7 +1,7 @@ SUMMARY = "Library for parsing and serializing RDF syntaxes" LICENSE = "GPL-2.0-only | LGPL-2.1-only | Apache-2.0" LIC_FILES_CHKSUM = " \ - file://LICENSE.txt;md5=b840e5ae3aeb897f45b473341348cd9c \ + file://LICENSE.txt;md5=f7fed8b6ab9289b77f5c14f3f79572cc \ file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ @@ -11,11 +11,9 @@ DEPENDS = "libxml2 libxslt curl yajl" SRC_URI = " \ http://download.librdf.org/source/${BPN}-${PV}.tar.gz \ - file://0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch \ - file://0001-Match-reutrn-type-from-RAPTOR_ASSERT_OBJECT_POINTER_.patch \ + file://0001-Remove-the-access-to-entities-checked-private-symbol.patch \ " -SRC_URI[md5sum] = "a39f6c07ddb20d7dd2ff1f95fa21e2cd" -SRC_URI[sha256sum] = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed" +SRC_URI[sha256sum] = "089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680" inherit autotools pkgconfig diff --git a/meta-oe/recipes-support/rdfind/rdfind/0001-configure-Fix-check-for-AC_CHECK_LIB.patch b/meta-oe/recipes-support/rdfind/rdfind/0001-configure-Fix-check-for-AC_CHECK_LIB.patch deleted file mode 100644 index a65d8cb77b..0000000000 --- a/meta-oe/recipes-support/rdfind/rdfind/0001-configure-Fix-check-for-AC_CHECK_LIB.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 823a4deb61f6f9b91b0cfc4a7e7b20922c635777 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 1 Sep 2022 13:13:50 -0700 -Subject: [PATCH] configure: Fix check for AC_CHECK_LIB - -Check for nettle_pbkdf2_hmac_sha256 from libnettle instead of main() -which is not in nettle library - -Upstream-Status: Submitted [https://github.com/pauldreik/rdfind/pull/115] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -46,7 +46,7 @@ AC_CHECK_HEADER(nettle/sha.h,,[AC_MSG_ER - On Debian-ish systems, use "apt-get install nettle-dev" to get a system - wide nettle install. - ])]) --AC_CHECK_LIB(nettle,main,,[AC_MSG_ERROR([ -+AC_CHECK_LIB(nettle,nettle_pbkdf2_hmac_sha256,,[AC_MSG_ERROR([ - Could not link to libnettle. Please install nettle - first. If you have already done so; please run ldconfig - as root or check whether the path libnettle was installed diff --git a/meta-oe/recipes-support/rdfind/rdfind/0001-include-standard-headers-limits-and-cstdint.patch b/meta-oe/recipes-support/rdfind/rdfind/0001-include-standard-headers-limits-and-cstdint.patch deleted file mode 100644 index bd59b74412..0000000000 --- a/meta-oe/recipes-support/rdfind/rdfind/0001-include-standard-headers-limits-and-cstdint.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 8c317f0fd5fde95a9aae2319053a196a166aec88 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 25 Jan 2023 21:12:47 -0800 -Subject: [PATCH] include standard headers <limits> and <cstdint> - -gcc 13 moved some includes around and as a result <cstdint> is no longer -transitively included [1]. Explicitly include it for uint64_t. - -Fixes errors like below - -../rdfind-1.5.0/rdfind.cc:225:30: error: 'numeric_limits' is not a member of 'std' - 225 | o.maximumfilesize = std::numeric_limits<decltype(o.maximumfilesize)>::max(); - | ^~~~~~~~~~~~~~ - -... - -| ../rdfind-1.5.0/Fileinfo.hh:70:20: error: 'std::int64_t' has not been declared - -[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes - -Upstream-Status: Submitted [https://github.com/pauldreik/rdfind/pull/129] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - Fileinfo.hh | 1 + - rdfind.cc | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/Fileinfo.hh b/Fileinfo.hh -index 3ffb837..23ed54e 100644 ---- a/Fileinfo.hh -+++ b/Fileinfo.hh -@@ -8,6 +8,7 @@ - #define Fileinfo_hh - - #include <array> -+#include <cstdint> - #include <string> - - // os specific headers -diff --git a/rdfind.cc b/rdfind.cc -index fbd6cb8..64dd8f6 100644 ---- a/rdfind.cc -+++ b/rdfind.cc -@@ -9,6 +9,7 @@ - // std - #include <algorithm> - #include <iostream> -+#include <limits> - #include <string> - #include <vector> - --- -2.39.1 - diff --git a/meta-oe/recipes-support/rdfind/rdfind_1.5.0.bb b/meta-oe/recipes-support/rdfind/rdfind_1.5.0.bb deleted file mode 100644 index 8f2c5e8852..0000000000 --- a/meta-oe/recipes-support/rdfind/rdfind_1.5.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Rdfind is a program that finds duplicate files" -HOMEPAGE = "https://rdfind.pauldreik.se/" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=fa22e16ebbe6638b2bd253338fbded9f" - -DEPENDS = "nettle autoconf-archive" - -SRC_URI = "https://rdfind.pauldreik.se/${BP}.tar.gz \ - file://0001-configure-Fix-check-for-AC_CHECK_LIB.patch \ - file://0001-include-standard-headers-limits-and-cstdint.patch \ -" - -SRC_URI[sha256sum] = "4150ed1256f7b12b928c65113c485761552b9496c433778aac3f9afc3e767080" - -inherit autotools - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/rdfind/rdfind_1.6.0.bb b/meta-oe/recipes-support/rdfind/rdfind_1.6.0.bb new file mode 100644 index 0000000000..3a15fe6c9a --- /dev/null +++ b/meta-oe/recipes-support/rdfind/rdfind_1.6.0.bb @@ -0,0 +1,13 @@ +SUMMARY = "Rdfind is a program that finds duplicate files" +HOMEPAGE = "https://rdfind.pauldreik.se/" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=fa22e16ebbe6638b2bd253338fbded9f" + +DEPENDS = "nettle autoconf-archive" + +SRC_URI = "https://rdfind.pauldreik.se/${BP}.tar.gz" +SRC_URI[sha256sum] = "7a406e8ef1886a5869655604618dd98f672f12c6a6be4926d053be65070f3279" + +inherit autotools + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/re2/re2_2020.11.01.bb b/meta-oe/recipes-support/re2/re2_2023.03.01.bb index 5ec1c6b5ab..78bf695a4a 100644 --- a/meta-oe/recipes-support/re2/re2_2020.11.01.bb +++ b/meta-oe/recipes-support/re2/re2_2023.03.01.bb @@ -3,7 +3,8 @@ HOMEPAGE = "https://github.com/google/re2/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b5c31eb512bdf3cb11ffd5713963760" -SRCREV = "166dbbeb3b0ab7e733b278e8f42a84f6882b8a25" +# tag 2023-03-01 +SRCREV = "241e2e430836e80f93d704d1f06cd3e7fe3100f5" SRC_URI = "git://github.com/google/re2.git;branch=main;protocol=https" @@ -16,8 +17,11 @@ EXTRA_OECMAKE += " \ -DRE2_BUILD_TESTING=OFF \ " -# Don't include so files in dev package +# ignore .so in /usr/lib64 FILES:${PN} = "${libdir}" +INSANE_SKIP:${PN} += "dev-so" + +# Don't include so files in dev package FILES:${PN}-dev = "${includedir} ${libdir}/cmake" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/reboot-mode/reboot-mode_git.bb b/meta-oe/recipes-support/reboot-mode/reboot-mode_git.bb new file mode 100644 index 0000000000..4c3436823a --- /dev/null +++ b/meta-oe/recipes-support/reboot-mode/reboot-mode_git.bb @@ -0,0 +1,18 @@ +SUMMARY = "Reboot the device to a specific mode." +AUTHOR = "Daniele Debernardi <drebrez@gmail.com>" + +LICENSE = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" + +SRC_URI = "git://gitlab.com/postmarketOS/reboot-mode.git;protocol=http;branch=master" +SRCREV = "84831b20512abd9033414ca5f5a023f333525335" + +S = "${WORKDIR}/git" + +do_compile() { + ${CC} ${CFLAGS} ${LDFLAGS} ${S}/reboot-mode.c -o ${B}/reboot-mode +} + +do_install() { + install -D -m 0755 ${B}/reboot-mode ${D}${bindir}/reboot-mode +} diff --git a/meta-oe/recipes-support/remmina/remmina_1.4.29.bb b/meta-oe/recipes-support/remmina/remmina_1.4.31.bb index a92a3b2783..56ad32ce37 100644 --- a/meta-oe/recipes-support/remmina/remmina_1.4.29.bb +++ b/meta-oe/recipes-support/remmina/remmina_1.4.31.bb @@ -25,7 +25,7 @@ DEPENDS = " \ DEPENDS:append:libc-musl = " libexecinfo" LDFLAGS:append:libc-musl = " -lexecinfo" -SRCREV = "fb19eb5f11f206ffb442a9e0c519cb0f2cb3fd8b" +SRCREV = "7407cc3a27eb25ba4ddddeab565f67fd688324ed" SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https;branch=master" S = "${WORKDIR}/git" @@ -38,6 +38,10 @@ PACKAGECONFIG[spice] = "-DWITH_SPICE=ON, -DWITH_SPICE=OFF, spice spice-protocol" # Switch on gtk support in avahi recipe if you want to enable avahi support PACKAGECONFIG[avahi] = "-DWITH_AVAHI=ON, -DWITH_AVAHI=OFF, avahi" +do_configure:append() { + sed -i -e 's|${WORKDIR}|<WORKDIR>|g' ${B}/generated/buildflags.h +} + RDEPENDS:${PN} = "bash" FILES:${PN}+= " \ diff --git a/meta-oe/recipes-support/rtkit/rtkit_0.13.bb b/meta-oe/recipes-support/rtkit/rtkit_0.13.bb new file mode 100644 index 0000000000..7ae9925038 --- /dev/null +++ b/meta-oe/recipes-support/rtkit/rtkit_0.13.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "REALTIMEKIT Realtime Policy and Watchdog Daemon" +LICENSE = "GPL-3.0-only & BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a8e768468b658b3ed44971b53d4a6716" + +SRC_URI = "git://github.com/heftig/rtkit.git;protocol=https;branch=master" + +SRCREV = "b9169402fe5e82d20efb754509eb0b191f214599" +S = "${WORKDIR}/git" + +inherit meson pkgconfig features_check useradd + +REQUIRED_DISTRO_FEATURES = "polkit" + +DEPENDS = "dbus libcap polkit xxd-native" + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = ",,systemd" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --no-create-home --user-group --shell /bin/nologin rtkit" + +FILES:${PN} += "${libdir} ${datadir}" + diff --git a/meta-oe/recipes-support/satyr/satyr_0.40.bb b/meta-oe/recipes-support/satyr/satyr_0.42.bb index 1ce28f1f04..62cdad6fb0 100644 --- a/meta-oe/recipes-support/satyr/satyr_0.40.bb +++ b/meta-oe/recipes-support/satyr/satyr_0.42.bb @@ -10,7 +10,7 @@ inherit autotools-brokensep python3native python3targetconfig pkgconfig SRC_URI = "git://github.com/abrt/satyr.git;branch=master;protocol=https \ file://0002-fix-compile-failure-against-musl-C-library.patch \ " -SRCREV = "61addf12d15ef9d0bff5e3cc26e08d08a4f88094" +SRCREV = "23483cebb238df86cda8b6529e3c58080dc2029d" S = "${WORKDIR}/git" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" diff --git a/meta-oe/recipes-support/serial-utils/serial-forward/0001-serial_forward-Disable-default-static-linking.patch b/meta-oe/recipes-support/serial-utils/serial-forward/0001-serial_forward-Disable-default-static-linking.patch index 7dcc67d114..a3fb678965 100644 --- a/meta-oe/recipes-support/serial-utils/serial-forward/0001-serial_forward-Disable-default-static-linking.patch +++ b/meta-oe/recipes-support/serial-utils/serial-forward/0001-serial_forward-Disable-default-static-linking.patch @@ -7,6 +7,8 @@ This does not work with ssp turned on with hardening flags on musl Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + tools/serial_forward/src/Makefile.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta-oe/recipes-support/serial/serial/Findcatkin.cmake b/meta-oe/recipes-support/serial/serial/Findcatkin.cmake new file mode 100644 index 0000000000..2f93564be3 --- /dev/null +++ b/meta-oe/recipes-support/serial/serial/Findcatkin.cmake @@ -0,0 +1,5 @@ +# Work-around for https://github.com/wjwwood/serial/issues/135 + +function(catkin_package) +endfunction() + diff --git a/meta-oe/recipes-support/serial/serial_1.2.1.bb b/meta-oe/recipes-support/serial/serial_1.2.1.bb new file mode 100644 index 0000000000..8c1fb063b3 --- /dev/null +++ b/meta-oe/recipes-support/serial/serial_1.2.1.bb @@ -0,0 +1,28 @@ +SUMMARY = "Cross-platform library for interfacing with rs-232 serial like ports" +HOMEPAGE = "http://wjwwood.io/serial/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://README.md;beginline=53;endline=62;md5=049c68d559533f90250404746e6a1045" + +SRC_URI = " \ + git://github.com/wjwwood/${BPN}.git;protocol=https;branch=main \ + file://Findcatkin.cmake \ +" +SRCREV = "10ac4e1c25c2cda1dc0a32a8e12b87fd89f3bb4f" +SRC_URI[sha256sum] = "c8cd235dda2ef7d977ba06dfcb35c35e42f45cfd9149ba3ad257756123d8ff96" + +S = "${WORKDIR}/git" + +inherit cmake + +# Work-around for https://github.com/wjwwood/serial/issues/135 +EXTRA_OECMAKE = " \ + -DCMAKE_MODULE_PATH=${WORKDIR} \ + -DCATKIN_PACKAGE_LIB_DESTINATION=${libdir} \ + -DCATKIN_PACKAGE_BIN_DESTINATION=${bindir} \ + -DCATKIN_GLOBAL_INCLUDE_DESTINATION=${includedir} \ + -DCATKIN_ENABLE_TESTING=OFF \ +" + +# Do not depend on the main package since it will be empty +RDEPENDS:${PN}-dev = "" + diff --git a/meta-oe/recipes-support/sg3-utils/sg3-utils/0001-sg_dd.c-Use-off_t-instead-of-uint.patch b/meta-oe/recipes-support/sg3-utils/sg3-utils/0001-sg_dd.c-Use-off_t-instead-of-uint.patch new file mode 100644 index 0000000000..317876f197 --- /dev/null +++ b/meta-oe/recipes-support/sg3-utils/sg3-utils/0001-sg_dd.c-Use-off_t-instead-of-uint.patch @@ -0,0 +1,36 @@ +From 9a8ede03ef61cdf527ce3a80771150a7452e4603 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 11 Mar 2023 22:56:17 -0800 +Subject: [PATCH] sg_dd.c: Use off_t instead of uint + +uint is not available on every platform e.g. linux/musl systems. Use +uint32_t instead to represent 'off' variable, Fixes + +sg_dd.c:2402:17: error: use of undeclared identifier 'uint'; did you mean 'int'? + uint off; + ^~~~ + int +1 error generated. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/sg_dd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/sg_dd.c b/src/sg_dd.c +index 9d05c93..35e2423 100644 +--- a/src/sg_dd.c ++++ b/src/sg_dd.c +@@ -2399,7 +2399,7 @@ main(int argc, char * argv[]) + res = blocks * blk_sz; + if (iflag.zero && iflag.ff && (blk_sz >= 4)) { + uint32_t pos = (uint32_t)skip; +- uint off; ++ uint32_t off; + + for (k = 0, off = 0; k < blocks; ++k, off += blk_sz, ++pos) { + for (j = 0; j < (blk_sz - 3); j += 4) +-- +2.39.2 + diff --git a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.45.bb b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.47.bb index ac12f9561d..1aa65e6cc4 100644 --- a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.45.bb +++ b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.47.bb @@ -6,16 +6,15 @@ HOMEPAGE = "http://sg.danny.cz/sg/sg3_utils.html" SECTION = "console/admin" LICENSE = "GPL-2.0-or-later & BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=f90da7fc52172599dbf082d7620f18ca" +LIC_FILES_CHKSUM = "file://COPYING;md5=f685699d3ac82f108aa880043fa3feb7" SRC_URI = "http://sg.danny.cz/sg/p/sg3_utils-${PV}.tgz \ -" + file://0001-sg_dd.c-Use-off_t-instead-of-uint.patch" MIRRORS += "http://sg.danny.cz/sg/p https://fossies.org/linux/misc" UPSTREAM_CHECK_REGEX = "sg3_utils-(?P<pver>\d+(\.\d+)+)\.tgz" -SRC_URI[md5sum] = "2e71d7cd925dcc48acb24afaaaac7990" -SRC_URI[sha256sum] = "0b87c971af52af7cebebcce343eac6bd3d73febb3c72af9ce41a4552f1605a61" +SRC_URI[sha256sum] = "8673c7faca849b6b34764332d2aa91f72db05bff7382bb836d0688795199c3e1" inherit autotools-brokensep diff --git a/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-build-with-clang.patch b/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-build-with-clang.patch index 7b627c16dd..583fe33ece 100644 --- a/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-build-with-clang.patch +++ b/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-build-with-clang.patch @@ -8,6 +8,8 @@ whereas it does support format attribute, we hard code it Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/shar-opts.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-building-with-GCC-10.patch b/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-building-with-GCC-10.patch index 9e2ebe7564..0d9978a214 100644 --- a/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-building-with-GCC-10.patch +++ b/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-building-with-GCC-10.patch @@ -21,6 +21,8 @@ declarations. Signed-off-by: Petr PÃsaÅ™ <address@hidden> Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/shar-opts.h | 2 +- src/shar-std.def | 2 +- src/unshar-opts.h | 2 +- diff --git a/meta-oe/recipes-support/sharutils/sharutils/0002-Do-not-include-lib-md5.c-into-src-shar.c.patch b/meta-oe/recipes-support/sharutils/sharutils/0002-Do-not-include-lib-md5.c-into-src-shar.c.patch index d4a8d6fbae..5932ddf1c0 100644 --- a/meta-oe/recipes-support/sharutils/sharutils/0002-Do-not-include-lib-md5.c-into-src-shar.c.patch +++ b/meta-oe/recipes-support/sharutils/sharutils/0002-Do-not-include-lib-md5.c-into-src-shar.c.patch @@ -20,6 +20,8 @@ shar.o:shar.c:(.text+0x28): first defined here Signed-off-by: Petr PÃsaÅ™ <address@hidden> Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/shar.c | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-oe/recipes-support/sharutils/sharutils/CVE-2018-1000097.patch b/meta-oe/recipes-support/sharutils/sharutils/CVE-2018-1000097.patch index 99dc4e3046..47eb9cfd64 100644 --- a/meta-oe/recipes-support/sharutils/sharutils/CVE-2018-1000097.patch +++ b/meta-oe/recipes-support/sharutils/sharutils/CVE-2018-1000097.patch @@ -36,7 +36,7 @@ This was reported in <http://lists.gnu.org/archive/html/bug-gnu-utils/2018-02/msg00004.html>. CVE: CVE-2018-1000097 -Upstream-Status: no upstream [http://lists.gnu.org/archive/html/bug-gnu-utils/2018-02/msg00004.html] +Upstream-Status: Inappropriate [no upstream] Signed-off-by: Petr Písař <ppisar@redhat.com> Signed-off-by: Sinan Kaya <okaya@kernel.org> --- diff --git a/meta-oe/recipes-support/span-lite/span-lite_0.10.3.bb b/meta-oe/recipes-support/span-lite/span-lite_0.10.3.bb index 0d9a8c93d2..15380f5d7f 100644 --- a/meta-oe/recipes-support/span-lite/span-lite_0.10.3.bb +++ b/meta-oe/recipes-support/span-lite/span-lite_0.10.3.bb @@ -9,4 +9,3 @@ SRCREV = "cbb9c3c5162a0d7018c7b3e053153a04d4fbbbb9" S = "${WORKDIR}/git" inherit cmake -inherit ptest diff --git a/meta-oe/recipes-support/spdlog/spdlog/0001-Do-not-use-LFS64-functions-on-linux-musl.patch b/meta-oe/recipes-support/spdlog/spdlog/0001-Do-not-use-LFS64-functions-on-linux-musl.patch deleted file mode 100644 index b997389aa2..0000000000 --- a/meta-oe/recipes-support/spdlog/spdlog/0001-Do-not-use-LFS64-functions-on-linux-musl.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ce7a593e74c8e0c2ece15c73e7614d4f13a19a53 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 30 Dec 2022 13:04:08 -0800 -Subject: [PATCH] Do not use LFS64 functions on linux/musl - -On musl, off_t is 64bit always ( even on 32bit platforms ), therefore using -LFS64 funcitons is not needed on such platforms. Moreover, musl has stopped -providing aliases for these functions [1] which means it wont compile on -newer musl systems. Therefore only use it on 32bit glibc/linux platforms -and exclude musl like cygwin or OSX - -[1] https://git.musl-libc.org/cgit/musl/commit/?id=246f1c811448f37a44b41cd8df8d0ef9736d95f4 - -Upstream-Status: Submitted [https://github.com/gabime/spdlog/pull/2589] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - include/spdlog/details/os.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- a/include/spdlog/details/os-inl.h -+++ b/include/spdlog/details/os-inl.h -@@ -237,7 +237,7 @@ SPDLOG_INLINE size_t filesize(FILE *f) - int fd = ::fileno(f); - # endif - // 64 bits(but not in osx or cygwin, where fstat64 is deprecated) --# if (defined(__linux__) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64)) -+# if ((defined(__linux__) && defined(__GLIBC__)) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64)) - struct stat64 st; - if (::fstat64(fd, &st) == 0) - { diff --git a/meta-oe/recipes-support/spdlog/spdlog_1.11.0.bb b/meta-oe/recipes-support/spdlog/spdlog_1.12.0.bb index ec985fb039..c7d8ff8f3d 100644 --- a/meta-oe/recipes-support/spdlog/spdlog_1.11.0.bb +++ b/meta-oe/recipes-support/spdlog/spdlog_1.12.0.bb @@ -3,10 +3,8 @@ HOMEPAGE = "https://github.com/gabime/spdlog/wiki" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -SRCREV = "ad0e89cbfb4d0c1ce4d097e134eb7be67baebb36" -SRC_URI = "git://github.com/gabime/spdlog.git;protocol=https;branch=v1.x \ - file://0001-Do-not-use-LFS64-functions-on-linux-musl.patch \ - " +SRCREV = "7e635fca68d014934b4af8a1cf874f63989352b7" +SRC_URI = "git://github.com/gabime/spdlog.git;protocol=https;branch=v1.x" DEPENDS += "fmt" diff --git a/meta-oe/recipes-support/srecord/files/0001-Disable-doxygen.patch b/meta-oe/recipes-support/srecord/files/0001-Disable-doxygen.patch new file mode 100644 index 0000000000..0ed9e87771 --- /dev/null +++ b/meta-oe/recipes-support/srecord/files/0001-Disable-doxygen.patch @@ -0,0 +1,85 @@ +From d75193671c235e4b3bd02417b40516f3bfeb55b6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 30 Apr 2023 14:09:21 -0700 +Subject: [PATCH] Disable doxygen + +doxygen (dot) detect does not work in cross environment here with cmake + +Upstream-Status: Inappropriate [Cross-compile specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + etc/configure.cmake | 2 +- + srecord/CMakeLists.txt | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +--- a/etc/configure.cmake ++++ b/etc/configure.cmake +@@ -103,32 +103,3 @@ option(_TANDEM_SOURCE ON) + # Enable general extensions on Solaris. + option(__EXTENSIONS__ ON) + +-# Doxygen configuration +-find_package(Doxygen REQUIRED doxygen dot) +- +-set(DOXYGEN_DOT_GRAPH_MAX_NODES 150) +-set(DOXYGEN_ALPHABETICAL_INDEX NO) +-set(DOXYGEN_BUILTIN_STL_SUPPORT YES) +-set(DOXYGEN_CASE_SENSE_NAMES NO) +-set(DOXYGEN_CLASS_DIAGRAMS YES) +-set(DOXYGEN_DISTRIBUTE_GROUP_DOC YES) +-set(DOXYGEN_EXCLUDE bin) +-set(DOXYGEN_EXTRACT_ALL YES) +-set(DOXYGEN_EXTRACT_LOCAL_CLASSES NO) +-set(DOXYGEN_FILE_PATTERNS *.h) +-set(DOXYGEN_GENERATE_TREEVIEW YES) +-set(DOXYGEN_HIDE_FRIEND_COMPOUNDS YES) +-set(DOXYGEN_HIDE_IN_BODY_DOCS YES) +-set(DOXYGEN_HIDE_UNDOC_CLASSES YES) +-set(DOXYGEN_HIDE_UNDOC_MEMBERS YES) +-set(DOXYGEN_JAVADOC_AUTOBRIEF YES) +-set(DOXYGEN_QT_AUTOBRIEF YES) +-set(DOXYGEN_QUIET YES) +-set(DOXYGEN_RECURSIVE YES) +-set(DOXYGEN_REFERENCED_BY_RELATION YES) +-set(DOXYGEN_REFERENCES_RELATION YES) +-set(DOXYGEN_SORT_BY_SCOPE_NAME YES) +-set(DOXYGEN_SORT_MEMBER_DOCS NO) +-set(DOXYGEN_SOURCE_BROWSER YES) +-set(DOXYGEN_STRIP_CODE_COMMENTS NO) +-set(DOXYGEN_GENERATE_HTML YES) +--- a/srecord/CMakeLists.txt ++++ b/srecord/CMakeLists.txt +@@ -34,9 +34,9 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE + FILES_MATCHING PATTERN "*.h") + + # Install the Doxygen output for the website +-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html +- DESTINATION ${CMAKE_INSTALL_DOCDIR}/htdocs/srecord +- COMPONENT website) ++#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html ++# DESTINATION ${CMAKE_INSTALL_DOCDIR}/htdocs/srecord ++# COMPONENT website) + + # Generate config.h to suit local environment + configure_file(config.h.in config.h @ONLY) +@@ -44,6 +44,6 @@ configure_file(patchlevel.h.in patchleve + include_directories(${CMAKE_CURRENT_BINARY_DIR}) + + # Generate doxygen content +-doxygen_add_docs(doxygen +- ${LIB_SRECORD_HDR} +- ALL) ++#doxygen_add_docs(doxygen ++# ${LIB_SRECORD_HDR} ++# ALL) +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -55,7 +55,7 @@ enable_testing() + add_subdirectory(test) + + # Documentation & Man Pages +-add_subdirectory(doc) ++# add_subdirectory(doc) + + # Package SRecord + include(CPack) diff --git a/meta-oe/recipes-support/srecord/files/0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch b/meta-oe/recipes-support/srecord/files/0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch new file mode 100644 index 0000000000..524dc74611 --- /dev/null +++ b/meta-oe/recipes-support/srecord/files/0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch @@ -0,0 +1,45 @@ +From 756169511ed13e4c7adc06c7c108d365ac66b9f8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 30 Apr 2023 22:58:47 -0700 +Subject: [PATCH] cmake: Do not try to compute library dependencies during + install + +Since we are cross-building the dependencies are not in final install +location but in a staging area in recipe specific sysroot and it wont be +able to resolve the libraries all the time + +Fixes +| CMake Error at srec_cat/cmake_install.cmake:66 (file): +| file Could not resolve runtime dependencies: +| +| libc++.so.1 +| libc.so +| Call Stack (most recent call first): +| cmake_install.cmake:52 (include) + +Upstream-Status: Inappropriate [OE-specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + etc/packaging.cmake | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/etc/packaging.cmake b/etc/packaging.cmake +index ee2a32c..9804fd8 100644 +--- a/etc/packaging.cmake ++++ b/etc/packaging.cmake +@@ -45,12 +45,6 @@ FUNCTION(INSTALL_SRECORD_EXECUTABLE_TARGET target) + + install(IMPORTED_RUNTIME_ARTIFACTS ${target} + RUNTIME_DEPENDENCY_SET ${PROJECT_NAME}_dlls COMPONENT ${target}) +- install(RUNTIME_DEPENDENCY_SET ${PROJECT_NAME}_dlls +- PRE_EXCLUDE_REGEXES "api-ms-" "ext-ms-" +- POST_EXCLUDE_REGEXES ".*system32/.*\\.dll" +- DIRECTORIES ${DLL_SEARCH_DIRS} +- COMPONENT ${target} +- ) + ENDFUNCTION() + + # Packaging +-- +2.40.1 + diff --git a/meta-oe/recipes-support/srecord/files/0001-configure-Fix-AC_CHECK_LIB-test-for-gpg-error.patch b/meta-oe/recipes-support/srecord/files/0001-configure-Fix-AC_CHECK_LIB-test-for-gpg-error.patch deleted file mode 100644 index 9a411f05d4..0000000000 --- a/meta-oe/recipes-support/srecord/files/0001-configure-Fix-AC_CHECK_LIB-test-for-gpg-error.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f9e50aba10f9d2c58e5d88f51810ca7143f4372b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 1 Sep 2022 13:20:01 -0700 -Subject: [PATCH] configure: Fix AC_CHECK_LIB test for gpg-error - -Use check function which is found in libgpg-error - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - etc/configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/etc/configure.ac b/etc/configure.ac -index d4ae290..ea0936d 100644 ---- a/etc/configure.ac -+++ b/etc/configure.ac -@@ -30,7 +30,7 @@ AC_CHECK_PROGS(SOELIM, gsoelim soelim roffpp) - AC_CHECK_FUNCS(snprintf vsnprintf) - - dnl! This is needed for MingGW build, but not for Unix or Linux, etc. --AC_CHECK_LIB(gpg-error, main) -+AC_CHECK_LIB(gpg-error, gpg_strerror_r) - - dnl! @synopsis AC_ADD_CFLAGS - dnl! --- -2.37.3 - diff --git a/meta-oe/recipes-support/srecord/files/add-option-to-remove-docs.patch b/meta-oe/recipes-support/srecord/files/add-option-to-remove-docs.patch deleted file mode 100644 index 9b2bd99795..0000000000 --- a/meta-oe/recipes-support/srecord/files/add-option-to-remove-docs.patch +++ /dev/null @@ -1,57 +0,0 @@ -Add option to build this utility without a documentation. - -For full documentation building are necessary utilities like -groff and ps2pdf. Full documentation can takes a lot of space. -So it can be disabled by overloading makefile variable WITHOUT_DOC. - -Upstream-Status: Inappropriate [Other] -Workaround specific to our build system. - -Signed-off-by: Andrej Valek <andrej.valek@siemens.com> - -diff --git a/Makefile.in b/Makefile.in -index 9bdd8f1..a2b5494 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -141,6 +141,14 @@ GROFF = @GROFF@ - # - SOELIM = @SOELIM@ - -+# Option to build this utility without building and installing the documentation. -+WITHOUT_DOC ?= 0 -+ifeq ($(WITHOUT_DOC),0) -+ BUILD_DOC = all-doc -+ INST_DOC = install-doc -+ CLR_DOC = clean-doc -+endif -+ - # --------------------------------------------------------- - # You should not need to change anything below this line. - -@@ -4090,7 +4098,7 @@ bin/test_url_decode: $(test_url_decode_obj) .bin srecord/libsrecord.la - $(LIBTOOL) --mode=link --tag=CXX $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ \ - $(test_url_decode_obj) srecord/libsrecord.la $(LDFLAGS) $(LIBS) - --all: all-bin all-doc -+all: all-bin $(BUILD_DOC) - - all-bin: bin/srec_cat bin/srec_cmp bin/srec_info bin/test_arglex_ambiguous \ - bin/test_crc16 bin/test_fletcher16 bin/test_gecos \ -@@ -4156,7 +4164,7 @@ test_files = t0001a t0002a t0003a t0004a t0005a t0006a t0007a t0008a t0009a \ - sure: $(test_files) - @echo Passed All Tests - --clean: clean-bin clean-doc clean-misc clean-obj -+clean: clean-bin $(CLR_DOC) clean-misc clean-obj - - clean-bin: - rm -f bin/srec_cat bin/srec_cmp bin/srec_info bin/test_arglex_ambiguous -@@ -4443,7 +4451,7 @@ distclean-directories: - rm -rf test/fletcher16/.libs test/gecos/.libs test/hyphen/.libs - rm -rf test/url_decode/.libs - --install: install-bin install-doc install-include install-libdir install-man -+install: install-bin $(INST_DOC) install-include install-libdir install-man - - install-bin: $(bindir)/srec_cat $(bindir)/srec_cmp $(bindir)/srec_info - diff --git a/meta-oe/recipes-support/srecord/files/libtool.patch b/meta-oe/recipes-support/srecord/files/libtool.patch deleted file mode 100644 index 95063cea59..0000000000 --- a/meta-oe/recipes-support/srecord/files/libtool.patch +++ /dev/null @@ -1,67 +0,0 @@ -Instead of just looking for a libtool binary, actually configure libtool. - -As the build doesn't use automake we need to manually set top_builddir in the Makefile. - -Upstream-Status: Inactive-Upstream [2014] -Signed-off-by: Ross Burton <ross.burton@arm.com> - -diff --git a/Makefile.in b/Makefile.in -index a2b5494..aa0b8ca 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -36,6 +36,7 @@ - # - srcdir = @srcdir@ - VPATH = @srcdir@ -+top_builddir = @srcdir@ - - # - # the name of the install program to use -diff --git a/etc/configure.ac b/etc/configure.ac -index e444543..b137443 100644 ---- a/etc/configure.ac -+++ b/etc/configure.ac -@@ -161,42 +161,7 @@ AS_IF([test "x$with_gcrypt" != xno], AC_GCRYPT_SETUP()) - dnl! - dnl! Now look for libtool. - dnl! --AC_CHECK_PROGS(LIBTOOL, libtool) --if test -z "$LIBTOOL" --then -- AC_MSG_RESULT([ -- You must have GNU Libtool installed to build srecord. -- Homepage: http://www.gnu.org/software/libtool/]) -- OK=no -- if apt-get --version > /dev/null 2> /dev/null; then -- AC_MSG_RESULT([ -- The following command may be used to install it: -- sudo apt-get install libtool -- ]) -- OK=yes -- fi -- if yum --version > /dev/null 2> /dev/null; then -- AC_MSG_RESULT([ -- The following command may be used to install it: -- sudo yum install libtool -- ]) -- OK=yes -- fi -- if pkg_info -a > /dev/null 2> /dev/null; then -- AC_MSG_RESULT([ -- The following command may be used to install it: -- sudo pkg_add -r libtool -- ]) -- OK=yes -- fi -- if test "$OK" != "yes"; then -- AC_MSG_RESULT([ -- If you are using a package based install, you will need the -- libtool package. -- ]) -- fi -- exit 1 --fi -+LT_INIT - - dnl - dnl If the soelim program exists, and understands the -I option, diff --git a/meta-oe/recipes-support/srecord/srecord_1.64.bb b/meta-oe/recipes-support/srecord/srecord_1.64.bb deleted file mode 100644 index 0629c0f648..0000000000 --- a/meta-oe/recipes-support/srecord/srecord_1.64.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "A collection of powerful tools for manipulating EPROM load files." -SECTION = "devel" -LICENSE = "GPL-3.0-or-later & LGPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8dfcbf2f0a144b97f0931b6394debea7" - -SRC_URI = " \ - http://srecord.sourceforge.net/srecord-${PV}.tar.gz \ - file://add-option-to-remove-docs.patch \ - file://libtool.patch \ - file://0001-configure-Fix-AC_CHECK_LIB-test-for-gpg-error.patch \ -" - -SRC_URI[md5sum] = "4de4a7497472d7972645c2af91313769" -SRC_URI[sha256sum] = "49a4418733c508c03ad79a29e95acec9a2fbc4c7306131d2a8f5ef32012e67e2" - -UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/srecord/files/releases" - -DEPENDS = "boost groff-native" - -inherit autotools-brokensep - -do_configure:prepend() { - # To autoreconf we need the script in ${S}, we can't tell autotools to use - # etc/ because then it can't find the Makefile.in - ln -sf ${S}/etc/configure.ac ${S} -} - -PACKAGECONFIG ??= "gcrypt" -PACKAGECONFIG[gcrypt] = "--with-gcrypt,--without-gcrypt,libgcrypt" - -# Set variable WITHOUT_DOC=0 to enable documentation generation -EXTRA_OEMAKE = "WITHOUT_DOC=1" - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/srecord/srecord_1.65.0.bb b/meta-oe/recipes-support/srecord/srecord_1.65.0.bb new file mode 100644 index 0000000000..06ce48e65c --- /dev/null +++ b/meta-oe/recipes-support/srecord/srecord_1.65.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "A collection of powerful tools for manipulating EPROM load files." +SECTION = "devel" +LICENSE = "GPL-3.0-or-later & LGPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = " \ + https://sourceforge.net/projects/${BPN}/files/srecord/${@oe.utils.trim_version('${PV}', 2)}/${BP}-Source.tar.gz \ + file://0001-Disable-doxygen.patch \ + file://0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch" +SRC_URI[sha256sum] = "81c3d07cf15ce50441f43a82cefd0ac32767c535b5291bcc41bd2311d1337644" +S = "${WORKDIR}/${BP}-Source" + +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/srecord/files/releases" + +DEPENDS = "boost libgcrypt" + +inherit cmake + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0001-Don-t-use-__GNUC_PREREQ.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0001-Don-t-use-__GNUC_PREREQ.patch index d9190e5bdf..5842ff1f36 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0001-Don-t-use-__GNUC_PREREQ.patch +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0001-Don-t-use-__GNUC_PREREQ.patch @@ -10,6 +10,8 @@ availability first Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + lib/efi/efi.h | 4 ++-- lib/engine/pragma.h | 4 ++-- lib/log/log.h | 4 ++-- diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0001-Include-libgen.h.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0001-Include-libgen.h.patch index fd44571b69..b522146602 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0001-Include-libgen.h.patch +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0001-Include-libgen.h.patch @@ -9,6 +9,8 @@ would be upstreams choice to make Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + tools/ssieventmonitor.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0001-log-Avoid-shadowing-functions-from-std-lib.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0001-log-Avoid-shadowing-functions-from-std-lib.patch index 8fdbf3e60e..c01c7e5ccd 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0001-log-Avoid-shadowing-functions-from-std-lib.patch +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0001-log-Avoid-shadowing-functions-from-std-lib.patch @@ -5,6 +5,8 @@ Subject: [PATCH 1/4] log: Avoid shadowing functions from std lib Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + lib/log/log.c | 2 +- lib/log/log.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0002-Use-stangard-int-types.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0002-Use-stangard-int-types.patch index acc718d23d..390faeb77b 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0002-Use-stangard-int-types.patch +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0002-Use-stangard-int-types.patch @@ -10,6 +10,8 @@ error: unknown type name '__uint8_t' Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + lib/engine/end_device.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0002-boost-Backport-clang-support.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0002-boost-Backport-clang-support.patch index 2eeab54e53..aabbc04e57 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0002-boost-Backport-clang-support.patch +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0002-boost-Backport-clang-support.patch @@ -7,6 +7,8 @@ backport headers from boost 1.59 Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + lib/boost/config/compiler/clang.hpp | 272 +++++++++ lib/boost/config/stdlib/libcpp.hpp | 80 +++ lib/boost/cstdint.hpp | 542 ++++++++++++++++++ diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0003-engine-Define-discover-const-String-path-in-base-cla.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0003-engine-Define-discover-const-String-path-in-base-cla.patch index 261358459e..e5e257b49a 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0003-engine-Define-discover-const-String-path-in-base-cla.patch +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0003-engine-Define-discover-const-String-path-in-base-cla.patch @@ -11,6 +11,8 @@ Remove ununsed orom_vmd Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + lib/engine/storage_object.h | 3 +++ lib/engine/vmd_raid_info.h | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0003-replace-canonicalize_file_name-with-realpath.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0003-replace-canonicalize_file_name-with-realpath.patch index 848d38b223..d70be51ee6 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0003-replace-canonicalize_file_name-with-realpath.patch +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0003-replace-canonicalize_file_name-with-realpath.patch @@ -11,6 +11,8 @@ error: use of undeclared identifier 'canonicalize_file_name' Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + lib/engine/filesystem.cpp | 2 +- tools/ssieventmonitor.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0004-Do-not-override-flags-coming-from-build-environment.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0004-Do-not-override-flags-coming-from-build-environment.patch index ca2ffc56b1..56e3c658a4 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0004-Do-not-override-flags-coming-from-build-environment.patch +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0004-Do-not-override-flags-coming-from-build-environment.patch @@ -8,6 +8,8 @@ without this change, the build would fail Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0004-include-limits.h.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0004-include-limits.h.patch index d63eb50619..005a35e5a4 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0004-include-limits.h.patch +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0004-include-limits.h.patch @@ -8,6 +8,8 @@ error: use of undeclared identifier 'PATH_MAX' Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + tools/ssieventmonitor.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0005-enable-out-of-source-tree-builds.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0005-enable-out-of-source-tree-builds.patch index c516f65252..6dd7fc735e 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0005-enable-out-of-source-tree-builds.patch +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0005-enable-out-of-source-tree-builds.patch @@ -5,6 +5,8 @@ Subject: [PATCH] enable out of source tree builds Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + lib/efi/Makefile.am | 2 +- lib/engine/Makefile.am | 2 +- lib/orom/Makefile.am | 2 +- diff --git a/meta-oe/recipes-support/switchtec-user/switchtec-user/0001-cli-Fix-format-security-warning.patch b/meta-oe/recipes-support/switchtec-user/switchtec-user/0001-cli-Fix-format-security-warning.patch new file mode 100644 index 0000000000..ff2743eb68 --- /dev/null +++ b/meta-oe/recipes-support/switchtec-user/switchtec-user/0001-cli-Fix-format-security-warning.patch @@ -0,0 +1,27 @@ +From 2d61587f85d1bf57287d12b470afb94c0bf9249d Mon Sep 17 00:00:00 2001 +From: Davide Cavalca <dcavalca@fedoraproject.org> +Date: Mon, 27 Jun 2022 16:54:35 -0700 +Subject: [PATCH] cli: Fix format security warning + +Upstream-Status: Submitted [https://github.com/Microsemi/switchtec-user/pull/316] + +--- + cli/graph.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cli/graph.c b/cli/graph.c +index 5748914..95609de 100644 +--- a/cli/graph.c ++++ b/cli/graph.c +@@ -134,7 +134,7 @@ static void draw_status(WINDOW *win, int x_off, int x_cnt, const char *status) + mvwprintw(win, 0, 0, " "); + for (i = 0; i < x_cnt * 2 + x_off; i++) + mvwaddch(win, 1, i, ' '); +- mvwprintw(win, 1, x_off, status); ++ mvwprintw(win, 1, x_off, "%s", status); + wrefresh(win); + } + +-- +2.39.2 + diff --git a/meta-oe/recipes-support/switchtec-user/switchtec-user_4.1.bb b/meta-oe/recipes-support/switchtec-user/switchtec-user_4.1.bb new file mode 100644 index 0000000000..443e5bc493 --- /dev/null +++ b/meta-oe/recipes-support/switchtec-user/switchtec-user_4.1.bb @@ -0,0 +1,24 @@ +SUMMARY = "Easy to use CLI and C library for communicating with Microsemi's Switchtec management interface" +HOMEPAGE = "https://github.com/Microsemi/switchtec-user" +SECTION = "console/utils" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3d6b07c89629cff2990d2e8e1f4c2382" + +DEPENDS = "ncurses openssl" + +SRCREV = "762ba441d2c02685f98e5f56e984db033bab279a" +SRC_URI = " \ + git://github.com/Microsemi/switchtec-user.git;protocol=https;branch=master \ + file://0001-cli-Fix-format-security-warning.patch \ +" +SRC_URI[sha256sum] = "f98c1fe23e1d7a11fb23e8bcf9b563929fc805ea669191a7fd525ad16519f655" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep pkgconfig + +EXTRA_OEMAKE = "DESTDIR='${D}' PREFIX='${prefix}' LDCONFIG='true' LIBDIR='${D}${libdir}'" + +do_install () { + oe_runmake install +} diff --git a/meta-oe/recipes-support/syslog-ng/files/0001-Fix-buildpaths-warning.patch b/meta-oe/recipes-support/syslog-ng/files/0001-Fix-buildpaths-warning.patch new file mode 100644 index 0000000000..c7bb4a64d9 --- /dev/null +++ b/meta-oe/recipes-support/syslog-ng/files/0001-Fix-buildpaths-warning.patch @@ -0,0 +1,55 @@ +From d85a7a3ae2bb9f5267b2af43784633ae8f011f21 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Mon, 13 Mar 2023 09:50:15 +0800 +Subject: [PATCH] Fix buildpaths warning + +Fix buildpath warning: +WARNING: syslog-ng-4.0.1-r0 do_package_qa: QA Issue: File /usr/include/syslog-ng/syslog-ng-config-64.h in package syslog-ng-dev contains reference to TMPDIR [buildpaths] +WARNING: syslog-ng-4.0.1-r0 do_package_qa: QA Issue: File /usr/bin/syslog-ng-update-virtualenv in package syslog-ng contains reference to TMPDIR +File /usr/bin/pdbtool in package syslog-ng contains reference to TMPDIR [buildpaths] +WARNING: syslog-ng-4.0.1-r0 do_package_qa: QA Issue: File /usr/lib/syslog-ng/libdbparser.so in package syslog-ng-libs contains reference to TMPDIR [buildpaths] + +* SYSLOG_NG_PATH_TOPSRC_DIR is /yocto/build/tmp/work/core2-64-poky-linux/syslog-ng/4.0.1-r0, + which is used to get xsd dir in build SYSLOG_NG_PATH_TOPSRC_DIR/doc/xsd, + which is not suitable for target, set it to "/source" for fixing this buildpath warning + +* SYSTEM_PYTHON is /yocto/build/tmp/hosttools/python3, set to python3 + for target. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + configure.ac | 2 +- + scripts/syslog-ng-update-virtualenv.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 79a1502..1ad6508 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1930,7 +1930,7 @@ AC_DEFINE_UNQUOTED(PYTHON_SYSCONF_MODULE_DIR, "$python_sysconf_moduledir", [Pyth + AC_DEFINE_UNQUOTED(PATH_LOGGENPLUGINDIR, "$loggenplugindir", [loggenplugin installation directory]) + AC_DEFINE_UNQUOTED(MODULE_PATH, "$module_path", [module search path]) + AC_DEFINE_UNQUOTED(JAVA_MODULE_PATH, "$java_module_path", [java module search path]) +-AC_DEFINE_UNQUOTED(PATH_TOPSRC_DIR, "$abs_topsrcdir", [self-defined top_srcdir path]) ++AC_DEFINE_UNQUOTED(PATH_TOPSRC_DIR, "/source", [self-defined top_srcdir path]) + AC_DEFINE_UNQUOTED(PACKAGE_NAME, "$PACKAGE_NAME", [package name]) + + +diff --git a/scripts/syslog-ng-update-virtualenv.in b/scripts/syslog-ng-update-virtualenv.in +index ed85baf..b1a9e34 100755 +--- a/scripts/syslog-ng-update-virtualenv.in ++++ b/scripts/syslog-ng-update-virtualenv.in +@@ -62,7 +62,7 @@ done + set -e + + REQUIREMENTS_FILE=${python_moduledir}/requirements.txt +-SYSTEM_PYTHON=@PYTHON@ ++SYSTEM_PYTHON=python3 + VENV_PYTHON=${python_venvdir}/bin/python + + if [ "$display_prompt" -ne 0 ]; then +-- +2.25.1 + diff --git a/meta-oe/recipes-support/syslog-ng/files/0001-plugin.c-workaround-powerpc64le-segfaults-error.patch b/meta-oe/recipes-support/syslog-ng/files/0001-plugin.c-workaround-powerpc64le-segfaults-error.patch new file mode 100644 index 0000000000..343e6fdade --- /dev/null +++ b/meta-oe/recipes-support/syslog-ng/files/0001-plugin.c-workaround-powerpc64le-segfaults-error.patch @@ -0,0 +1,46 @@ +From 616446afab61ab98b28c81605e2efd4a689f37d1 Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Fri, 20 Jan 2023 14:59:14 +0800 +Subject: [PATCH] plugin.c: workaround powerpc64le segfaults error + +syslog-ng segfaults on powerpc64le, workaround this error. +See https://github.com/syslog-ng/syslog-ng/issues/4285 and +https://sourceware.org/bugzilla/show_bug.cgi?id=30062 for more details. +This patch should be dropped once the above issues are fixed. + +Upstream-Status: Inappropriate [OE Specific] + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + lib/plugin.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/lib/plugin.c b/lib/plugin.c +index fbbfb92..3a03617 100644 +--- a/lib/plugin.c ++++ b/lib/plugin.c +@@ -528,10 +528,7 @@ plugin_discover_candidate_modules(PluginContext *context) + } + } + g_free(module_name); +- if (mod) +- g_module_close(mod); +- else +- mod = NULL; ++ mod = NULL; + } + } + g_dir_close(dir); +@@ -663,8 +660,7 @@ plugin_list_modules(FILE *out, gboolean verbose) + first = FALSE; + } + g_free(module_name); +- if (mod) +- g_module_close(mod); ++ mod = NULL; + } + } + g_dir_close(dir); +-- +2.17.1 + diff --git a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch index 7334800304..c80e91244f 100644 --- a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch +++ b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch @@ -1,7 +1,7 @@ Subject: [PATCH] syslog-ng.service: the syslog-ng service can not start successfully,so modify it. -Upstream-Status: pending +Upstream-Status: Pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> Updated-by: Andrej Valek <andrej.valek@siemens.com> diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng_3.38.1.bb b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.0.1.bb index 76945095ac..650c7bd5f3 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng_3.38.1.bb +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.0.1.bb @@ -22,9 +22,11 @@ SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.ta file://volatiles.03_syslog-ng \ file://syslog-ng-tmp.conf \ file://syslog-ng.service-the-syslog-ng-service.patch \ + file://0001-Fix-buildpaths-warning.patch \ " +SRC_URI:append:powerpc64le = " file://0001-plugin.c-workaround-powerpc64le-segfaults-error.patch" -SRC_URI[sha256sum] = "5491f686d0b829b69b2e0fc0d66a62f51991aafaee005475bfa38fab399441f7" +SRC_URI[sha256sum] = "c16eafe447191c079f471846182876b7919d3d789af8c1f9fe55ab14521ceb2c" UPSTREAM_CHECK_URI = "https://github.com/balabit/syslog-ng/releases" @@ -83,6 +85,10 @@ do_install:append() { # Remove /var/run as it is created on startup rm -rf ${D}${localstatedir}/run + # it causes install conflict when multilib enabled + # since python support is disabled, not deliver it + rm -f ${D}${bindir}/syslog-ng-update-virtualenv + # support for systemd if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -m 644 ${WORKDIR}/syslog-ng.conf.systemd ${D}${sysconfdir}/${BPN}/${BPN}.conf diff --git a/meta-oe/recipes-support/tbb/tbb_2021.8.0.bb b/meta-oe/recipes-support/tbb/tbb_2021.9.0.bb index 5606d38dae..028291c965 100644 --- a/meta-oe/recipes-support/tbb/tbb_2021.8.0.bb +++ b/meta-oe/recipes-support/tbb/tbb_2021.9.0.bb @@ -12,7 +12,7 @@ DEPENDS:append:libc-musl = " libucontext" PE = "1" BRANCH = "onetbb_2021" -SRCREV = "c9497714821c3d443ee44c732609eb6850195ffb" +SRCREV = "a00cc3b8b5fb4d8115e9de56bf713157073ed68c" SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH} \ file://0001-CMakeLists.txt-exclude-riscv64-riscv32.patch \ " diff --git a/meta-oe/recipes-support/thin-provisioning-tools/files/0001-do-not-strip-pdata_tools-at-do_install.patch b/meta-oe/recipes-support/thin-provisioning-tools/files/0001-do-not-strip-pdata_tools-at-do_install.patch deleted file mode 100644 index 547949dd60..0000000000 --- a/meta-oe/recipes-support/thin-provisioning-tools/files/0001-do-not-strip-pdata_tools-at-do_install.patch +++ /dev/null @@ -1,33 +0,0 @@ -From de869ad2cb19d81257a159770ebe27593a71593c Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Tue, 31 Jul 2018 11:29:51 +0800 -Subject: [PATCH] do not strip pdata_tools at do_install - -It caused QA Issue: --------------- -|ERROR: QA Issue: File '/usr/sbin/pdata_tools' from thin-provisioning-tools -was already stripped, this will prevent future debugging! [already-stripped] --------------- - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - Makefile.in | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 02b75dd..df590b4 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -267,7 +267,6 @@ MANPAGES:=$(patsubst %,man8/%.8,$(TOOLS)) - install: bin/pdata_tools $(MANPAGES) - $(INSTALL_DIR) $(BINDIR) - $(INSTALL_PROGRAM) bin/pdata_tools $(BINDIR) -- $(STRIP) $(BINDIR)/pdata_tools - ln -s -f pdata_tools $(BINDIR)/cache_check - ln -s -f pdata_tools $(BINDIR)/cache_dump - ln -s -f pdata_tools $(BINDIR)/cache_metadata_size --- -2.7.4 - diff --git a/meta-oe/recipes-support/thin-provisioning-tools/files/use-sh-on-path.patch b/meta-oe/recipes-support/thin-provisioning-tools/files/use-sh-on-path.patch deleted file mode 100644 index de934c19a8..0000000000 --- a/meta-oe/recipes-support/thin-provisioning-tools/files/use-sh-on-path.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 38397b42e2c3450c2aee20e6fb92f362db4e35ef Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Tue, 2 Jul 2019 13:20:39 +0800 -Subject: [PATCH] thin-provisioning-tools: use sh on path when invoking txt2man - -txt2man contains a test which might try to use ksh to run the script, so we -avoid running /bin/sh. - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: joe.slater <joe.slater@windriver.com> - -Rebase to 0.8.5 -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 7c867b2..5303994 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -223,7 +223,7 @@ endif - %.8: %.txt bin/txt2man - @echo " [txt2man] $<" - @mkdir -p $(dir $@) -- $(V) bin/txt2man -p -t $(basename $(notdir $<)) $< > $@ -+ $(V) sh bin/txt2man -p -t $(basename $(notdir $<)) $< > $@ - - #---------------------------------------------------------------- - --- -2.7.4 - diff --git a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc new file mode 100644 index 0000000000..f7992b9411 --- /dev/null +++ b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc @@ -0,0 +1,306 @@ +# Autogenerated with 'bitbake -c update_crates thin-provisioning-tools' + +# from Cargo.lock +SRC_URI += " \ + crate://crates.io/adler/1.0.2 \ + crate://crates.io/aho-corasick/1.0.1 \ + crate://crates.io/anyhow/1.0.70 \ + crate://crates.io/atty/0.2.14 \ + crate://crates.io/autocfg/1.1.0 \ + crate://crates.io/base64/0.20.0 \ + crate://crates.io/bitflags/1.3.2 \ + crate://crates.io/bytemuck/1.13.1 \ + crate://crates.io/byteorder/1.4.3 \ + crate://crates.io/cassowary/0.3.0 \ + crate://crates.io/cc/1.0.79 \ + crate://crates.io/cfg-if/1.0.0 \ + crate://crates.io/clap/3.2.23 \ + crate://crates.io/clap_lex/0.2.4 \ + crate://crates.io/console/0.15.5 \ + crate://crates.io/crc32fast/1.3.2 \ + crate://crates.io/data-encoding/2.3.3 \ + crate://crates.io/difflib/0.4.0 \ + crate://crates.io/downcast/0.11.0 \ + crate://crates.io/duct/0.13.6 \ + crate://crates.io/either/1.8.1 \ + crate://crates.io/encode_unicode/0.3.6 \ + crate://crates.io/env_logger/0.7.1 \ + crate://crates.io/errno/0.3.1 \ + crate://crates.io/errno-dragonfly/0.1.2 \ + crate://crates.io/exitcode/1.1.2 \ + crate://crates.io/fastrand/1.9.0 \ + crate://crates.io/fixedbitset/0.4.2 \ + crate://crates.io/flate2/1.0.25 \ + crate://crates.io/float-cmp/0.9.0 \ + crate://crates.io/fragile/2.0.0 \ + crate://crates.io/futures/0.3.28 \ + crate://crates.io/futures-channel/0.3.28 \ + crate://crates.io/futures-core/0.3.28 \ + crate://crates.io/futures-executor/0.3.28 \ + crate://crates.io/futures-io/0.3.28 \ + crate://crates.io/futures-macro/0.3.28 \ + crate://crates.io/futures-sink/0.3.28 \ + crate://crates.io/futures-task/0.3.28 \ + crate://crates.io/futures-util/0.3.28 \ + crate://crates.io/getrandom/0.1.16 \ + crate://crates.io/getrandom/0.2.9 \ + crate://crates.io/hashbrown/0.12.3 \ + crate://crates.io/hermit-abi/0.1.19 \ + crate://crates.io/hermit-abi/0.2.6 \ + crate://crates.io/hermit-abi/0.3.1 \ + crate://crates.io/indexmap/1.9.3 \ + crate://crates.io/indicatif/0.17.3 \ + crate://crates.io/instant/0.1.12 \ + crate://crates.io/io-lifetimes/1.0.10 \ + crate://crates.io/iovec/0.1.4 \ + crate://crates.io/itertools/0.10.5 \ + crate://crates.io/jobserver/0.1.26 \ + crate://crates.io/json/0.12.4 \ + crate://crates.io/lazy_static/1.4.0 \ + crate://crates.io/libc/0.2.142 \ + crate://crates.io/linux-raw-sys/0.3.4 \ + crate://crates.io/log/0.4.17 \ + crate://crates.io/memchr/2.5.0 \ + crate://crates.io/minimal-lexical/0.2.1 \ + crate://crates.io/miniz_oxide/0.6.2 \ + crate://crates.io/mockall/0.11.4 \ + crate://crates.io/mockall_derive/0.11.4 \ + crate://crates.io/nom/7.1.3 \ + crate://crates.io/normalize-line-endings/0.3.0 \ + crate://crates.io/num-derive/0.3.3 \ + crate://crates.io/num-traits/0.2.15 \ + crate://crates.io/num_cpus/1.15.0 \ + crate://crates.io/number_prefix/0.4.0 \ + crate://crates.io/numtoa/0.1.0 \ + crate://crates.io/once_cell/1.17.1 \ + crate://crates.io/os_pipe/1.1.4 \ + crate://crates.io/os_str_bytes/6.5.0 \ + crate://crates.io/pin-project-lite/0.2.9 \ + crate://crates.io/pin-utils/0.1.0 \ + crate://crates.io/pkg-config/0.3.26 \ + crate://crates.io/portable-atomic/0.3.19 \ + crate://crates.io/ppv-lite86/0.2.17 \ + crate://crates.io/predicates/2.1.5 \ + crate://crates.io/predicates-core/1.0.6 \ + crate://crates.io/predicates-tree/1.0.9 \ + crate://crates.io/proc-macro2/1.0.56 \ + crate://crates.io/quick-xml/0.23.1 \ + crate://crates.io/quickcheck/0.9.2 \ + crate://crates.io/quickcheck_macros/0.9.1 \ + crate://crates.io/quote/1.0.26 \ + crate://crates.io/rand/0.7.3 \ + crate://crates.io/rand/0.8.5 \ + crate://crates.io/rand_chacha/0.2.2 \ + crate://crates.io/rand_chacha/0.3.1 \ + crate://crates.io/rand_core/0.5.1 \ + crate://crates.io/rand_core/0.6.4 \ + crate://crates.io/rand_hc/0.2.0 \ + crate://crates.io/rangemap/1.3.0 \ + crate://crates.io/redox_syscall/0.2.16 \ + crate://crates.io/redox_syscall/0.3.5 \ + crate://crates.io/redox_termios/0.1.2 \ + crate://crates.io/regex/1.8.1 \ + crate://crates.io/regex-syntax/0.7.1 \ + crate://crates.io/retain_mut/0.1.7 \ + crate://crates.io/roaring/0.10.1 \ + crate://crates.io/rustc_version/0.4.0 \ + crate://crates.io/rustix/0.37.14 \ + crate://crates.io/safemem/0.3.3 \ + crate://crates.io/semver/1.0.17 \ + crate://crates.io/shared_child/1.0.0 \ + crate://crates.io/slab/0.4.8 \ + crate://crates.io/strsim/0.10.0 \ + crate://crates.io/syn/1.0.109 \ + crate://crates.io/syn/2.0.15 \ + crate://crates.io/tempfile/3.5.0 \ + crate://crates.io/termcolor/1.2.0 \ + crate://crates.io/termion/1.5.6 \ + crate://crates.io/termtree/0.4.1 \ + crate://crates.io/textwrap/0.16.0 \ + crate://crates.io/thiserror/1.0.40 \ + crate://crates.io/thiserror-impl/1.0.40 \ + crate://crates.io/threadpool/1.8.1 \ + crate://crates.io/tui/0.16.0 \ + crate://crates.io/unicode-ident/1.0.8 \ + crate://crates.io/unicode-segmentation/1.10.1 \ + crate://crates.io/unicode-width/0.1.10 \ + crate://crates.io/wasi/0.9.0+wasi-snapshot-preview1 \ + 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-util/0.1.5 \ + crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ + crate://crates.io/windows-sys/0.42.0 \ + crate://crates.io/windows-sys/0.45.0 \ + crate://crates.io/windows-sys/0.48.0 \ + crate://crates.io/windows-targets/0.42.2 \ + crate://crates.io/windows-targets/0.48.0 \ + crate://crates.io/windows_aarch64_gnullvm/0.42.2 \ + crate://crates.io/windows_aarch64_gnullvm/0.48.0 \ + crate://crates.io/windows_aarch64_msvc/0.42.2 \ + crate://crates.io/windows_aarch64_msvc/0.48.0 \ + crate://crates.io/windows_i686_gnu/0.42.2 \ + crate://crates.io/windows_i686_gnu/0.48.0 \ + crate://crates.io/windows_i686_msvc/0.42.2 \ + crate://crates.io/windows_i686_msvc/0.48.0 \ + crate://crates.io/windows_x86_64_gnu/0.42.2 \ + crate://crates.io/windows_x86_64_gnu/0.48.0 \ + crate://crates.io/windows_x86_64_gnullvm/0.42.2 \ + crate://crates.io/windows_x86_64_gnullvm/0.48.0 \ + crate://crates.io/windows_x86_64_msvc/0.42.2 \ + crate://crates.io/windows_x86_64_msvc/0.48.0 \ + crate://crates.io/zstd/0.11.2+zstd.1.5.2 \ + crate://crates.io/zstd-safe/5.0.2+zstd.1.5.2 \ + crate://crates.io/zstd-sys/2.0.8+zstd.1.5.5 \ +" + +SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +SRC_URI[aho-corasick-1.0.1.sha256sum] = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +SRC_URI[anyhow-1.0.70.sha256sum] = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +SRC_URI[atty-0.2.14.sha256sum] = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +SRC_URI[base64-0.20.0.sha256sum] = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" +SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +SRC_URI[bytemuck-1.13.1.sha256sum] = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +SRC_URI[byteorder-1.4.3.sha256sum] = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +SRC_URI[cassowary-0.3.0.sha256sum] = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" +SRC_URI[cc-1.0.79.sha256sum] = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +SRC_URI[clap-3.2.23.sha256sum] = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +SRC_URI[clap_lex-0.2.4.sha256sum] = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +SRC_URI[console-0.15.5.sha256sum] = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" +SRC_URI[crc32fast-1.3.2.sha256sum] = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +SRC_URI[data-encoding-2.3.3.sha256sum] = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" +SRC_URI[difflib-0.4.0.sha256sum] = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" +SRC_URI[downcast-0.11.0.sha256sum] = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" +SRC_URI[duct-0.13.6.sha256sum] = "37ae3fc31835f74c2a7ceda3aeede378b0ae2e74c8f1c36559fcc9ae2a4e7d3e" +SRC_URI[either-1.8.1.sha256sum] = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +SRC_URI[encode_unicode-0.3.6.sha256sum] = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +SRC_URI[env_logger-0.7.1.sha256sum] = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +SRC_URI[errno-0.3.1.sha256sum] = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +SRC_URI[errno-dragonfly-0.1.2.sha256sum] = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +SRC_URI[exitcode-1.1.2.sha256sum] = "de853764b47027c2e862a995c34978ffa63c1501f2e15f987ba11bd4f9bba193" +SRC_URI[fastrand-1.9.0.sha256sum] = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +SRC_URI[fixedbitset-0.4.2.sha256sum] = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" +SRC_URI[flate2-1.0.25.sha256sum] = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +SRC_URI[float-cmp-0.9.0.sha256sum] = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +SRC_URI[fragile-2.0.0.sha256sum] = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" +SRC_URI[futures-0.3.28.sha256sum] = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +SRC_URI[futures-channel-0.3.28.sha256sum] = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +SRC_URI[futures-core-0.3.28.sha256sum] = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +SRC_URI[futures-executor-0.3.28.sha256sum] = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +SRC_URI[futures-io-0.3.28.sha256sum] = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +SRC_URI[futures-macro-0.3.28.sha256sum] = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +SRC_URI[futures-sink-0.3.28.sha256sum] = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +SRC_URI[futures-task-0.3.28.sha256sum] = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +SRC_URI[futures-util-0.3.28.sha256sum] = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +SRC_URI[getrandom-0.1.16.sha256sum] = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +SRC_URI[getrandom-0.2.9.sha256sum] = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +SRC_URI[hashbrown-0.12.3.sha256sum] = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +SRC_URI[hermit-abi-0.1.19.sha256sum] = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +SRC_URI[hermit-abi-0.2.6.sha256sum] = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +SRC_URI[hermit-abi-0.3.1.sha256sum] = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +SRC_URI[indexmap-1.9.3.sha256sum] = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +SRC_URI[indicatif-0.17.3.sha256sum] = "cef509aa9bc73864d6756f0d34d35504af3cf0844373afe9b8669a5b8005a729" +SRC_URI[instant-0.1.12.sha256sum] = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +SRC_URI[io-lifetimes-1.0.10.sha256sum] = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +SRC_URI[iovec-0.1.4.sha256sum] = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +SRC_URI[itertools-0.10.5.sha256sum] = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +SRC_URI[jobserver-0.1.26.sha256sum] = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +SRC_URI[json-0.12.4.sha256sum] = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd" +SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +SRC_URI[libc-0.2.142.sha256sum] = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" +SRC_URI[linux-raw-sys-0.3.4.sha256sum] = "36eb31c1778188ae1e64398743890d0877fef36d11521ac60406b42016e8c2cf" +SRC_URI[log-0.4.17.sha256sum] = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +SRC_URI[memchr-2.5.0.sha256sum] = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" +SRC_URI[miniz_oxide-0.6.2.sha256sum] = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +SRC_URI[mockall-0.11.4.sha256sum] = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96" +SRC_URI[mockall_derive-0.11.4.sha256sum] = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb" +SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +SRC_URI[normalize-line-endings-0.3.0.sha256sum] = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" +SRC_URI[num-derive-0.3.3.sha256sum] = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +SRC_URI[num-traits-0.2.15.sha256sum] = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +SRC_URI[num_cpus-1.15.0.sha256sum] = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +SRC_URI[number_prefix-0.4.0.sha256sum] = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" +SRC_URI[numtoa-0.1.0.sha256sum] = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" +SRC_URI[once_cell-1.17.1.sha256sum] = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +SRC_URI[os_pipe-1.1.4.sha256sum] = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" +SRC_URI[os_str_bytes-6.5.0.sha256sum] = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" +SRC_URI[pin-project-lite-0.2.9.sha256sum] = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +SRC_URI[pin-utils-0.1.0.sha256sum] = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +SRC_URI[pkg-config-0.3.26.sha256sum] = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +SRC_URI[portable-atomic-0.3.19.sha256sum] = "26f6a7b87c2e435a3241addceeeff740ff8b7e76b74c13bf9acb17fa454ea00b" +SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +SRC_URI[predicates-2.1.5.sha256sum] = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" +SRC_URI[predicates-core-1.0.6.sha256sum] = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" +SRC_URI[predicates-tree-1.0.9.sha256sum] = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" +SRC_URI[proc-macro2-1.0.56.sha256sum] = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +SRC_URI[quick-xml-0.23.1.sha256sum] = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea" +SRC_URI[quickcheck-0.9.2.sha256sum] = "a44883e74aa97ad63db83c4bf8ca490f02b2fc02f92575e720c8551e843c945f" +SRC_URI[quickcheck_macros-0.9.1.sha256sum] = "608c156fd8e97febc07dc9c2e2c80bf74cfc6ef26893eae3daf8bc2bc94a4b7f" +SRC_URI[quote-1.0.26.sha256sum] = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +SRC_URI[rand-0.7.3.sha256sum] = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +SRC_URI[rand_chacha-0.2.2.sha256sum] = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +SRC_URI[rand_core-0.5.1.sha256sum] = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +SRC_URI[rand_core-0.6.4.sha256sum] = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +SRC_URI[rand_hc-0.2.0.sha256sum] = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +SRC_URI[rangemap-1.3.0.sha256sum] = "8b9283c6b06096b47afc7109834fdedab891175bb5241ee5d4f7d2546549f263" +SRC_URI[redox_syscall-0.2.16.sha256sum] = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +SRC_URI[redox_syscall-0.3.5.sha256sum] = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +SRC_URI[redox_termios-0.1.2.sha256sum] = "8440d8acb4fd3d277125b4bd01a6f38aee8d814b3b5fc09b3f2b825d37d3fe8f" +SRC_URI[regex-1.8.1.sha256sum] = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" +SRC_URI[regex-syntax-0.7.1.sha256sum] = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" +SRC_URI[retain_mut-0.1.7.sha256sum] = "8c31b5c4033f8fdde8700e4657be2c497e7288f01515be52168c631e2e4d4086" +SRC_URI[roaring-0.10.1.sha256sum] = "ef0fb5e826a8bde011ecae6a8539dd333884335c57ff0f003fbe27c25bbe8f71" +SRC_URI[rustc_version-0.4.0.sha256sum] = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +SRC_URI[rustix-0.37.14.sha256sum] = "d9b864d3c18a5785a05953adeed93e2dca37ed30f18e69bba9f30079d51f363f" +SRC_URI[safemem-0.3.3.sha256sum] = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" +SRC_URI[semver-1.0.17.sha256sum] = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +SRC_URI[shared_child-1.0.0.sha256sum] = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" +SRC_URI[slab-0.4.8.sha256sum] = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +SRC_URI[strsim-0.10.0.sha256sum] = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +SRC_URI[syn-2.0.15.sha256sum] = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +SRC_URI[tempfile-3.5.0.sha256sum] = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +SRC_URI[termcolor-1.2.0.sha256sum] = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +SRC_URI[termion-1.5.6.sha256sum] = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e" +SRC_URI[termtree-0.4.1.sha256sum] = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" +SRC_URI[textwrap-0.16.0.sha256sum] = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +SRC_URI[thiserror-1.0.40.sha256sum] = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +SRC_URI[thiserror-impl-1.0.40.sha256sum] = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +SRC_URI[threadpool-1.8.1.sha256sum] = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +SRC_URI[tui-0.16.0.sha256sum] = "39c8ce4e27049eed97cfa363a5048b09d995e209994634a0efc26a14ab6c0c23" +SRC_URI[unicode-ident-1.0.8.sha256sum] = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +SRC_URI[unicode-segmentation-1.10.1.sha256sum] = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +SRC_URI[unicode-width-0.1.10.sha256sum] = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +SRC_URI[wasi-0.9.0+wasi-snapshot-preview1.sha256sum] = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +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-util-0.1.5.sha256sum] = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +SRC_URI[windows-sys-0.42.0.sha256sum] = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +SRC_URI[windows-sys-0.45.0.sha256sum] = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +SRC_URI[windows-sys-0.48.0.sha256sum] = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +SRC_URI[windows-targets-0.42.2.sha256sum] = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +SRC_URI[windows-targets-0.48.0.sha256sum] = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +SRC_URI[windows_aarch64_gnullvm-0.42.2.sha256sum] = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +SRC_URI[windows_aarch64_gnullvm-0.48.0.sha256sum] = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +SRC_URI[windows_aarch64_msvc-0.42.2.sha256sum] = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +SRC_URI[windows_aarch64_msvc-0.48.0.sha256sum] = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +SRC_URI[windows_i686_gnu-0.42.2.sha256sum] = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +SRC_URI[windows_i686_gnu-0.48.0.sha256sum] = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +SRC_URI[windows_i686_msvc-0.42.2.sha256sum] = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +SRC_URI[windows_i686_msvc-0.48.0.sha256sum] = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +SRC_URI[windows_x86_64_gnu-0.42.2.sha256sum] = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +SRC_URI[windows_x86_64_gnu-0.48.0.sha256sum] = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +SRC_URI[windows_x86_64_gnullvm-0.42.2.sha256sum] = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +SRC_URI[windows_x86_64_gnullvm-0.48.0.sha256sum] = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +SRC_URI[windows_x86_64_msvc-0.42.2.sha256sum] = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +SRC_URI[windows_x86_64_msvc-0.48.0.sha256sum] = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +SRC_URI[zstd-0.11.2+zstd.1.5.2.sha256sum] = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +SRC_URI[zstd-safe-5.0.2+zstd.1.5.2.sha256sum] = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +SRC_URI[zstd-sys-2.0.8+zstd.1.5.5.sha256sum] = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" diff --git a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-git-crates.inc b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-git-crates.inc new file mode 100644 index 0000000000..46e826cabc --- /dev/null +++ b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-git-crates.inc @@ -0,0 +1,10 @@ +SRC_URI += "\ + git://github.com/zowens/crc32c;protocol=https;nobranch=1;name=crc32c;destsuffix=crc32c;type=git-dependency \ + git://github.com/jthornber/rio;protocol=https;nobranch=1;name=rio;destsuffix=rio;type=git-dependency \ +" + +SRCREV_FORMAT .= "_crc32c" +SRCREV_crc32c = "3779fe88fea034922f808586b2564fbcab31efdc" + +SRCREV_FORMAT .= "_rio" +SRCREV_rio = "2979a720f671e836302c01546f9cc9f7988610c8" diff --git a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools/0001-Replace-LFS-functions.patch b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools/0001-Replace-LFS-functions.patch new file mode 100644 index 0000000000..a9f1c8601d --- /dev/null +++ b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools/0001-Replace-LFS-functions.patch @@ -0,0 +1,91 @@ +From 289105253fbf342fd22cbcde2ccc1127f732ab09 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 7 Jul 2023 14:21:17 -0700 +Subject: [PATCH] Replace LFS functions + +The original functions are able to consume 64bit off_t now a days +therefore *64 equivalents can be replaced, as a side it fixes build with +musl. + +Upstream-Status: Submitted [https://github.com/jthornber/thin-provisioning-tools/pull/267] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/file_utils.rs | 10 +++++----- + src/io_engine/base.rs | 4 ++-- + src/thin/trim.rs | 2 +- + 3 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/file_utils.rs b/src/file_utils.rs +index 0ca3c0f..d2b3ee9 100644 +--- a/src/file_utils.rs ++++ b/src/file_utils.rs +@@ -11,18 +11,18 @@ fn test_bit(mode: u32, flag: u32) -> bool { + (mode & libc::S_IFMT) == flag + } + +-fn is_file_or_blk_(info: &libc::stat64) -> bool { ++fn is_file_or_blk_(info: &libc::stat) -> bool { + test_bit(info.st_mode, libc::S_IFBLK) || test_bit(info.st_mode, libc::S_IFREG) + } + + // wrapper of libc::stat64 +-fn libc_stat64(path: &Path) -> io::Result<libc::stat64> { ++fn libc_stat64(path: &Path) -> io::Result<libc::stat> { + let c_path = std::ffi::CString::new(path.as_os_str().as_bytes()) + .map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e.to_string()))?; + + unsafe { +- let mut st: libc::stat64 = std::mem::zeroed(); +- let r = libc::stat64(c_path.as_ptr(), &mut st); ++ let mut st: libc::stat = std::mem::zeroed(); ++ let r = libc::stat(c_path.as_ptr(), &mut st); + if r == 0 { + Ok(st) + } else { +@@ -56,7 +56,7 @@ fn get_device_size<P: AsRef<Path>>(path: P) -> io::Result<u64> { + let fd = file.as_raw_fd(); + let mut cap = 0u64; + unsafe { +- if libc::ioctl(fd, BLKGETSIZE64 as libc::c_ulong, &mut cap) == 0 { ++ if libc::ioctl(fd, BLKGETSIZE64 as libc::c_int, &mut cap) == 0 { + Ok(cap) + } else { + Err(io::Error::last_os_error()) +diff --git a/src/io_engine/base.rs b/src/io_engine/base.rs +index 725ebf7..db6209f 100644 +--- a/src/io_engine/base.rs ++++ b/src/io_engine/base.rs +@@ -115,7 +115,7 @@ pub trait VectoredIo { + + fn read_vectored_at(file: &File, bufs: &mut [libc::iovec], pos: u64) -> io::Result<usize> { + let ptr = bufs.as_ptr(); +- let ret = match unsafe { libc::preadv64(file.as_raw_fd(), ptr, bufs.len() as i32, pos as i64) } ++ let ret = match unsafe { libc::preadv(file.as_raw_fd(), ptr, bufs.len() as i32, pos as i64) } + { + -1 => return Err(io::Error::last_os_error()), + n => n, +@@ -125,7 +125,7 @@ fn read_vectored_at(file: &File, bufs: &mut [libc::iovec], pos: u64) -> io::Resu + + fn write_vectored_at(file: &File, bufs: &[libc::iovec], pos: u64) -> io::Result<usize> { + let ptr = bufs.as_ptr(); +- let ret = match unsafe { libc::pwritev64(file.as_raw_fd(), ptr, bufs.len() as i32, pos as i64) } ++ let ret = match unsafe { libc::pwritev(file.as_raw_fd(), ptr, bufs.len() as i32, pos as i64) } + { + -1 => return Err(io::Error::last_os_error()), + n => n, +diff --git a/src/thin/trim.rs b/src/thin/trim.rs +index 3d938ca..91a53dd 100644 +--- a/src/thin/trim.rs ++++ b/src/thin/trim.rs +@@ -135,7 +135,7 @@ impl<'a> Iterator for RangeIterator<'a> { + const BLKDISCARD: u32 = 0x1277; + fn ioctl_blkdiscard(fd: i32, range: &[u64; 2]) -> std::io::Result<()> { + unsafe { +- if libc::ioctl(fd, BLKDISCARD as libc::c_ulong, range) == 0 { ++ if libc::ioctl(fd, BLKDISCARD as libc::c_int, range) == 0 { + Ok(()) + } else { + Err(std::io::Error::last_os_error()) +-- +2.41.0 + diff --git a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.9.0.bb b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.9.0.bb deleted file mode 100644 index 25d72006fd..0000000000 --- a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.9.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Tools of dm-thin device-mapper" -DESCRIPTION = "A suite of tools for manipulating the metadata of the dm-thin device-mapper target." -HOMEPAGE = "https://github.com/jthornber/thin-provisioning-tools" -LICENSE = "GPL-3.0-only" -SECTION = "devel" - -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -S = "${WORKDIR}/git" - -SRC_URI = "git://github.com/jthornber/thin-provisioning-tools;branch=main;protocol=https \ - file://0001-do-not-strip-pdata_tools-at-do_install.patch \ - file://use-sh-on-path.patch \ -" - -SRCREV = "d6d93c3157631b242a13a81d30f75453e576c55a" - -UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" - -DEPENDS += "expat libaio boost" - -inherit autotools-brokensep diff --git a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.4.bb b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.4.bb new file mode 100644 index 0000000000..e79f62ff6e --- /dev/null +++ b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.4.bb @@ -0,0 +1,47 @@ +SUMMARY = "Tools of dm-thin device-mapper" +DESCRIPTION = "A suite of tools for manipulating the metadata of the dm-thin device-mapper target." +HOMEPAGE = "https://github.com/jthornber/thin-provisioning-tools" +LICENSE = "GPL-3.0-only" +SECTION = "devel" + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +S = "${WORKDIR}/git" + +SRC_URI = " \ + git://github.com/jthornber/thin-provisioning-tools;branch=main;protocol=https \ + " +SRC_URI:append:libc-musl = " file://0001-Replace-LFS-functions.patch" + +SRCREV = "3baa3fa3a3e4f714e6170a4152b186f0fa1d76e1" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" + +inherit cargo cargo-update-recipe-crates + +require ${BPN}-crates.inc +require ${BPN}-git-crates.inc + +do_install:append() { + for tool in cache_check \ + cache_dump \ + cache_metadata_size \ + cache_repair \ + cache_restore \ + cache_writeback \ + thin_check \ + thin_delta \ + thin_dump \ + thin_ls \ + thin_repair \ + thin_restore \ + thin_rmap \ + thin_metadata_size \ + thin_metadata_pack \ + thin_metadata_unpack \ + thin_trim \ + era_check \ + era_dump \ + era_invalidate \ + era_restore; do + ln -sf pdata_tools ${D}${bindir}/$tool + done +} diff --git a/meta-oe/recipes-support/tio/tio_2.5.bb b/meta-oe/recipes-support/tio/tio_2.6.bb index 1f69e1a9e0..1a83a2e420 100644 --- a/meta-oe/recipes-support/tio/tio_2.5.bb +++ b/meta-oe/recipes-support/tio/tio_2.6.bb @@ -7,7 +7,7 @@ LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=0e1a95b7892d3015ecd6d0016f601f2c" SRC_URI = "git://github.com/tio/tio;protocol=https;nobranch=1" -SRCREV = "a2bbab068428275febeea13906654b9e58400c95" +SRCREV = "88ef473362c5a1ff0dcd389fd5b1d4d6bf202472" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/tree/tree_2.1.0.bb b/meta-oe/recipes-support/tree/tree_2.1.1.bb index c867a3a7d8..0b61149609 100644 --- a/meta-oe/recipes-support/tree/tree_2.1.0.bb +++ b/meta-oe/recipes-support/tree/tree_2.1.1.bb @@ -5,7 +5,7 @@ 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] = "0160c535bff2b0dc6a830b9944e981e3427380f63e748da96ced7071faebabf6" +SRC_URI[sha256sum] = "d3c3d55f403af7c76556546325aa1eca90b918cbaaf6d3ab60a49d8367ab90d5" # tree's default CFLAGS for Linux CFLAGS += "-Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" diff --git a/meta-oe/recipes-support/uchardet/uchardet_0.0.7.bb b/meta-oe/recipes-support/uchardet/uchardet_0.0.8.bb index 9087c8b298..3e164cc26f 100644 --- a/meta-oe/recipes-support/uchardet/uchardet_0.0.7.bb +++ b/meta-oe/recipes-support/uchardet/uchardet_0.0.8.bb @@ -4,6 +4,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6ecda54f6f525388d71d6b3cd92f7474" inherit cmake -SRC_URI = "https://www.freedesktop.org/software/uchardet/releases/uchardet-0.0.7.tar.xz" -SRC_URI[md5sum] = "623406dac5c5ad89e40eedd7f279efae" -SRC_URI[sha256sum] = "3fc79408ae1d84b406922fa9319ce005631c95ca0f34b205fad867e8b30e45b1" +SRC_URI = "https://www.freedesktop.org/software/uchardet/releases/uchardet-0.0.8.tar.xz" +SRC_URI[sha256sum] = "e97a60cfc00a1c147a674b097bb1422abd9fa78a2d9ce3f3fdcc2e78a34ac5f0" diff --git a/meta-oe/recipes-support/udisks/udisks2_2.9.4.bb b/meta-oe/recipes-support/udisks/udisks2_2.9.4.bb index 3de5557238..2030063712 100644 --- a/meta-oe/recipes-support/udisks/udisks2_2.9.4.bb +++ b/meta-oe/recipes-support/udisks/udisks2_2.9.4.bb @@ -35,6 +35,12 @@ do_configure:prepend() { touch ${S}/build-aux/config.rpath } +PACKAGECONFIG ?= "" + +PACKAGECONFIG[lvm2] = "--enable-lvm2,--disable-lvm2,lvm2" +PACKAGECONFIG[btrfs] = "--enable-btrfs,--disable-btrfs,,btrfs-tools" +PACKAGECONFIG[lsm] = "--enable-lsm,--disable-lsm,libstoragemgmt" + FILES:${PN} += " \ ${datadir}/dbus-1/ \ ${datadir}/polkit-1 \ diff --git a/meta-oe/recipes-support/uim/uim/uim-module-manager.patch b/meta-oe/recipes-support/uim/uim/uim-module-manager.patch index 0fafc8533e..0e2fb687b6 100644 --- a/meta-oe/recipes-support/uim/uim/uim-module-manager.patch +++ b/meta-oe/recipes-support/uim/uim/uim-module-manager.patch @@ -3,6 +3,8 @@ From: Bian Naimeng <biannm@cn.fujitsu.com> Date: Fri, 26 Jun 2015 12:57:48 +0900 --- +Upstream-Status: Pending + scm/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb b/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb index f0f3a66e07..7970cd953f 100644 --- a/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb +++ b/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb @@ -1,14 +1,14 @@ SUMMARY = "Unicode Character Database" HOMEPAGE = "https://unicode.org/ucd/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${WORKDIR}/license.html;beginline=43;endline=83;md5=cf6c4777b109bcee78b6083a21be6192" +LIC_FILES_CHKSUM = "file://${WORKDIR}/license.txt;md5=4b11b5cbb0a24df9f4e7db63db98f22f" SRC_URI = " \ https://www.unicode.org/Public/zipped/${PV}/UCD.zip;name=ucd;subdir=ucd;downloadfilename=unicode-ucd-${PV}.zip \ - https://www.unicode.org/license.html;name=license \ + https://www.unicode.org/license.txt;name=ucd-license \ " SRC_URI[ucd.sha256sum] = "033a5276b5d7af8844589f8e3482f3977a8385e71d107d375055465178c23600" -SRC_URI[license.sha256sum] = "e415e1f2188ef2b1a5f7e6ee8c60cefe8a49dacd8b96c9025cad5013985129e4" +SRC_URI[ucd-license.sha256sum] = "f7830d126f59d83842565d3dddedc79db4ca978ed52aee0ebcc040ea76a85519" inherit allarch diff --git a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.11.bb b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.11.bb index c7d23d1202..3a9e390a2b 100644 --- a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.11.bb +++ b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.11.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7b37bf80a3df5a65b355433ae36d206" DEPENDS = "libtool readline" -SRC_URI = "http://ftp.unixodbc.org/unixODBC-${PV}.tar.gz \ +SRC_URI = "https://www.unixodbc.org/unixODBC-${PV}.tar.gz \ file://do-not-use-libltdl-source-directory.patch \ " SRC_URI[sha256sum] = "d9e55c8e7118347e3c66c87338856dad1516b490fb7c756c1562a2c267c73b5c" UPSTREAM_CHECK_REGEX = "unixODBC-(?P<pver>\d+(\.\d+)+)\.tar" -inherit autotools-brokensep +inherit autotools-brokensep multilib_header S = "${WORKDIR}/unixODBC-${PV}" @@ -26,3 +26,7 @@ do_configure:prepend() { rm -rf m4/* rm -fr libltdl } + +do_install:append() { + oe_multilib_header unixodbc.h unixODBC/config.h unixODBC/unixodbc_conf.h +} diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.0.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.1.bb index 1474ca615e..cd3840feab 100644 --- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.0.bb +++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.1.bb @@ -5,8 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=091556bd6d0154cd4c2d17a1bfc7380a" DEPENDS = "libusb1" SRC_URI = "http://www.draisberghof.de/usb_modeswitch/${BP}.tar.bz2" -SRC_URI[md5sum] = "be73dcc84025794081a1d4d4e5a75e4c" -SRC_URI[sha256sum] = "c215236e6bada6e659fc195a31d611ea298a4bdb4d57a0d68c553b56585f8ba3" +SRC_URI[sha256sum] = "5195d9e136e52f658f19e9f93e4f982b1b67bffac197d0a455cd8c2cd245fa34" inherit pkgconfig systemd @@ -14,7 +13,12 @@ SYSTEMD_SERVICE:${PN} = "usb_modeswitch@.service" EXTRA_OEMAKE = "TCL=${bindir}/tclsh" -FILES:${PN} = "${bindir} ${sysconfdir} ${nonarch_base_libdir}/udev/usb_modeswitch ${sbindir} ${localstatedir}/lib/usb_modeswitch" +FILES:${PN} = " \ + ${bindir} \ + ${sysconfdir} \ + ${nonarch_base_libdir}/udev/usb_modeswitch \ + ${sbindir} ${localstatedir}/lib/usb_modeswitch \ +" RDEPENDS:${PN} = "tcl" RRECOMMENDS:${PN} = "usb-modeswitch-data" diff --git a/meta-oe/recipes-support/utouch/utouch-frame/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch b/meta-oe/recipes-support/utouch/utouch-frame/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch index f3c8eeb418..f0860fcd90 100644 --- a/meta-oe/recipes-support/utouch/utouch-frame/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch +++ b/meta-oe/recipes-support/utouch/utouch-frame/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch @@ -9,6 +9,8 @@ error: field has incomplete Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + tools/utouch-frame-test-mtdev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.4.bb b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.10.bb index 91f5ae0e0f..f193636524 100644 --- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.4.bb +++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.10.bb @@ -15,7 +15,7 @@ SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 file://Makefile.utils \ " -SRC_URI[sha256sum] = "58951f7d1bcda836c5e50ca0a6b13f0e61a07a904f476526a831df3d9bfe5b17" +SRC_URI[sha256sum] = "0b1e6d8b7f87d017c7fae37f80586acff04f799ffc1d51e995954d6415dee371" S ?= "${WORKDIR}/vbox_module" S:task-patch = "${WORKDIR}/${VBOX_NAME}" diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch new file mode 100644 index 0000000000..8ae39f14e1 --- /dev/null +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch @@ -0,0 +1,29 @@ +From 10cfdcc905915d8814c609008a069102f2bc7e39 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Tue, 27 Oct 2015 16:02:19 +0200 +Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained + from pkg-config with PKG_CONFIG_SYSROOT_DIR + +See discussion at https://bugs.webkit.org/show_bug.cgi?id=232933 for +reasons why this is not approproiate for upstream submission. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + Source/cmake/FindGI.cmake | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/Source/cmake/FindGI.cmake b/Source/cmake/FindGI.cmake +index af039cbb..b3e810cd 100644 +--- a/Source/cmake/FindGI.cmake ++++ b/Source/cmake/FindGI.cmake +@@ -72,6 +72,9 @@ if (PKG_CONFIG_FOUND) + endif () + endif () + ++set(_GI_SCANNER_EXE "$ENV{PKG_CONFIG_SYSROOT_DIR}${_GI_SCANNER_EXE}") ++set(_GI_COMPILER_EXE "$ENV{PKG_CONFIG_SYSROOT_DIR}${_GI_COMPILER_EXE}") ++ + find_program(GI_SCANNER_EXE NAMES ${_GI_SCANNER_EXE} g-ir-scanner) + find_program(GI_COMPILER_EXE NAMES ${_GI_COMPILER_EXE} g-ir-compiler) + diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-Source-JavaScriptCore-CMakeLists.txt-ensure-reproduc.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-Source-JavaScriptCore-CMakeLists.txt-ensure-reproduc.patch new file mode 100644 index 0000000000..bbe265059d --- /dev/null +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-Source-JavaScriptCore-CMakeLists.txt-ensure-reproduc.patch @@ -0,0 +1,28 @@ +From cd65e3d9256a4f6eb7906a9f10678c29a4ffef2f Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Mon, 26 Jun 2023 14:30:02 +0200 +Subject: [PATCH] Source/JavaScriptCore/CMakeLists.txt: ensure reproducibility + of __TIMESTAMP__ + +__TIMESTAMP__ refers to mtime of the file that contains it, which is unstable +and breaks binary reproducibility when the file is generated at build time. To ensure +this does not happen, mtime should be set from the original file. + +Upstream-Status: Submitted [https://github.com/WebKit/WebKit/pull/15293] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + Source/JavaScriptCore/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt +index 43dc22ff..c2e3b1cd 100644 +--- a/Source/JavaScriptCore/CMakeLists.txt ++++ b/Source/JavaScriptCore/CMakeLists.txt +@@ -159,6 +159,7 @@ add_custom_command( + OUTPUT ${JavaScriptCore_DERIVED_SOURCES_DIR}/JSCBytecodeCacheVersion.cpp + MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/runtime/JSCBytecodeCacheVersion.cpp.in + COMMAND ${PERL_EXECUTABLE} -pe s/CACHED_TYPES_CKSUM/__TIMESTAMP__/ ${JAVASCRIPTCORE_DIR}/runtime/JSCBytecodeCacheVersion.cpp.in > ${JavaScriptCore_DERIVED_SOURCES_DIR}/JSCBytecodeCacheVersion.cpp ++ COMMAND touch -r ${JAVASCRIPTCORE_DIR}/runtime/JSCBytecodeCacheVersion.cpp.in ${JavaScriptCore_DERIVED_SOURCES_DIR}/JSCBytecodeCacheVersion.cpp + VERBATIM + ) + diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/0d3344e17d258106617b0e6d783d073b188a2548.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0d3344e17d258106617b0e6d783d073b188a2548.patch new file mode 100644 index 0000000000..34e0ff9af3 --- /dev/null +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0d3344e17d258106617b0e6d783d073b188a2548.patch @@ -0,0 +1,310 @@ +From 647c93de99a0f71f478d76a4cc7714eba7ba1447 Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro <aperez@igalia.com> +Date: Thu, 2 Jun 2022 11:19:06 +0300 +Subject: [PATCH] FELightningNEON.cpp fails to build, NEON fast path seems + unused https://bugs.webkit.org/show_bug.cgi?id=241182 + +Reviewed by NOBODY (OOPS!). + +Move the NEON fast path for the SVG lighting filter effects into +FELightingSoftwareApplier, and arrange to actually use them by +forwarding calls to applyPlatformGeneric() into applyPlatformNeon(). + +Some changes were needed to adapt platformApplyNeon() to the current +state of filters after r286140. This was not detected because the code +bitrotted due to it being guarded with CPU(ARM_TRADITIONAL), which does +not get used much these days: CPU(ARM_THUMB2) is more common. It should +be possible to use the NEON fast paths also in Thumb mode, but that is +left for a follow-up fix. + +* Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp: +(WebCore::FELightingSoftwareApplier::platformApplyNeonWorker): +(WebCore::FELightingSoftwareApplier::getPowerCoefficients): +(WebCore::FELighting::platformApplyNeonWorker): Deleted. +(WebCore::FELighting::getPowerCoefficients): Deleted. +* Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h: +(WebCore::FELightingSoftwareApplier::applyPlatformNeon): +(WebCore::FELighting::platformApplyNeon): Deleted. +* Source/WebCore/platform/graphics/filters/DistantLightSource.h: +* Source/WebCore/platform/graphics/filters/FELighting.h: +* Source/WebCore/platform/graphics/filters/PointLightSource.h: +* Source/WebCore/platform/graphics/filters/SpotLightSource.h: +* Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h: + +Upstream-Status: Submitted [https://github.com/WebKit/WebKit/pull/1233] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + .../cpu/arm/filters/FELightingNEON.cpp | 4 +- + .../graphics/cpu/arm/filters/FELightingNEON.h | 52 +++++++++---------- + .../graphics/filters/DistantLightSource.h | 4 ++ + .../platform/graphics/filters/FELighting.h | 7 --- + .../graphics/filters/PointLightSource.h | 4 ++ + .../graphics/filters/SpotLightSource.h | 4 ++ + .../software/FELightingSoftwareApplier.h | 16 ++++++ + 7 files changed, 56 insertions(+), 35 deletions(-) + +diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp +index f6ff8c20..42a97ffc 100644 +--- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp ++++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp +@@ -49,7 +49,7 @@ short* feLightingConstantsForNeon() + return s_FELightingConstantsForNeon; + } + +-void FELighting::platformApplyNeonWorker(FELightingPaintingDataForNeon* parameters) ++void FELightingSoftwareApplier::platformApplyNeonWorker(FELightingPaintingDataForNeon* parameters) + { + neonDrawLighting(parameters); + } +@@ -464,7 +464,7 @@ TOSTRING(neonDrawLighting) ":" NL + "b .lightStrengthCalculated" NL + ); // NOLINT + +-int FELighting::getPowerCoefficients(float exponent) ++int FELightingSoftwareApplier::getPowerCoefficients(float exponent) + { + // Calling a powf function from the assembly code would require to save + // and reload a lot of NEON registers. Since the base is in range [0..1] +diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h +index b17c603d..e4629cda 100644 +--- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h ++++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h +@@ -24,14 +24,15 @@ + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +-#ifndef FELightingNEON_h +-#define FELightingNEON_h ++#pragma once + + #if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) + +-#include "FELighting.h" ++#include "FELightingSoftwareApplier.h" ++#include "ImageBuffer.h" + #include "PointLightSource.h" + #include "SpotLightSource.h" ++#include <wtf/ObjectIdentifier.h> + #include <wtf/ParallelJobs.h> + + namespace WebCore { +@@ -93,14 +94,14 @@ extern "C" { + void neonDrawLighting(FELightingPaintingDataForNeon*); + } + +-inline void FELighting::platformApplyNeon(const LightingData& data, const LightSource::PaintingData& paintingData) ++inline void FELightingSoftwareApplier::applyPlatformNeon(const FELightingSoftwareApplier::LightingData& data, const LightSource::PaintingData& paintingData) + { +- alignas(16) FELightingFloatArgumentsForNeon floatArguments; +- FELightingPaintingDataForNeon neonData = { ++ WebCore::FELightingFloatArgumentsForNeon alignas(16) floatArguments; ++ WebCore::FELightingPaintingDataForNeon neonData = { + data.pixels->data(), + 1, +- data.widthDecreasedByOne - 1, +- data.heightDecreasedByOne - 1, ++ data.width - 2, ++ data.height - 2, + 0, + 0, + 0, +@@ -111,23 +112,23 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS + // Set light source arguments. + floatArguments.constOne = 1; + +- auto color = m_lightingColor.toColorTypeLossy<SRGBA<uint8_t>>().resolved(); ++ auto color = data.lightingColor.toColorTypeLossy<SRGBA<uint8_t>>().resolved(); + + floatArguments.colorRed = color.red; + floatArguments.colorGreen = color.green; + floatArguments.colorBlue = color.blue; + floatArguments.padding4 = 0; + +- if (m_lightSource->type() == LS_POINT) { ++ if (data.lightSource->type() == LS_POINT) { + neonData.flags |= FLAG_POINT_LIGHT; +- PointLightSource& pointLightSource = static_cast<PointLightSource&>(m_lightSource.get()); ++ const auto& pointLightSource = *static_cast<const PointLightSource*>(data.lightSource); + floatArguments.lightX = pointLightSource.position().x(); + floatArguments.lightY = pointLightSource.position().y(); + floatArguments.lightZ = pointLightSource.position().z(); + floatArguments.padding2 = 0; +- } else if (m_lightSource->type() == LS_SPOT) { ++ } else if (data.lightSource->type() == LS_SPOT) { + neonData.flags |= FLAG_SPOT_LIGHT; +- SpotLightSource& spotLightSource = static_cast<SpotLightSource&>(m_lightSource.get()); ++ const auto& spotLightSource = *static_cast<const SpotLightSource*>(data.lightSource); + floatArguments.lightX = spotLightSource.position().x(); + floatArguments.lightY = spotLightSource.position().y(); + floatArguments.lightZ = spotLightSource.position().z(); +@@ -145,7 +146,7 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS + if (spotLightSource.specularExponent() == 1) + neonData.flags |= FLAG_CONE_EXPONENT_IS_1; + } else { +- ASSERT(m_lightSource->type() == LS_DISTANT); ++ ASSERT(data.lightSource->type() == LS_DISTANT); + floatArguments.lightX = paintingData.initialLightingData.lightVector.x(); + floatArguments.lightY = paintingData.initialLightingData.lightVector.y(); + floatArguments.lightZ = paintingData.initialLightingData.lightVector.z(); +@@ -155,38 +156,39 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS + // Set lighting arguments. + floatArguments.surfaceScale = data.surfaceScale; + floatArguments.minusSurfaceScaleDividedByFour = -data.surfaceScale / 4; +- if (m_lightingType == FELighting::DiffuseLighting) +- floatArguments.diffuseConstant = m_diffuseConstant; ++ if (data.filterType == FilterEffect::Type::FEDiffuseLighting) ++ floatArguments.diffuseConstant = data.diffuseConstant; + else { + neonData.flags |= FLAG_SPECULAR_LIGHT; +- floatArguments.diffuseConstant = m_specularConstant; +- neonData.specularExponent = getPowerCoefficients(m_specularExponent); +- if (m_specularExponent == 1) ++ floatArguments.diffuseConstant = data.specularConstant; ++ neonData.specularExponent = getPowerCoefficients(data.specularExponent); ++ if (data.specularExponent == 1) + neonData.flags |= FLAG_SPECULAR_EXPONENT_IS_1; + } + if (floatArguments.diffuseConstant == 1) + neonData.flags |= FLAG_DIFFUSE_CONST_IS_1; + +- int optimalThreadNumber = ((data.widthDecreasedByOne - 1) * (data.heightDecreasedByOne - 1)) / s_minimalRectDimension; ++ static constexpr int minimalRectDimension = 100 * 100; // Empirical data limit for parallel jobs ++ int optimalThreadNumber = ((data.width - 2) * (data.height - 2)) / minimalRectDimension; + if (optimalThreadNumber > 1) { + // Initialize parallel jobs +- ParallelJobs<FELightingPaintingDataForNeon> parallelJobs(&WebCore::FELighting::platformApplyNeonWorker, optimalThreadNumber); ++ ParallelJobs<FELightingPaintingDataForNeon> parallelJobs(&FELightingSoftwareApplier::platformApplyNeonWorker, optimalThreadNumber); + + // Fill the parameter array + int job = parallelJobs.numberOfJobs(); + if (job > 1) { + int yStart = 1; +- int yStep = (data.heightDecreasedByOne - 1) / job; ++ int yStep = (data.height - 2) / job; + for (--job; job >= 0; --job) { + FELightingPaintingDataForNeon& params = parallelJobs.parameter(job); + params = neonData; + params.yStart = yStart; +- params.pixels += (yStart - 1) * (data.widthDecreasedByOne + 1) * 4; ++ params.pixels += (yStart - 1) * data.width * 4; + if (job > 0) { + params.absoluteHeight = yStep; + yStart += yStep; + } else +- params.absoluteHeight = data.heightDecreasedByOne - yStart; ++ params.absoluteHeight = (data.height - 1) - yStart; + } + parallelJobs.execute(); + return; +@@ -199,5 +201,3 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS + } // namespace WebCore + + #endif // CPU(ARM_NEON) && COMPILER(GCC_COMPATIBLE) +- +-#endif // FELightingNEON_h +diff --git a/Source/WebCore/platform/graphics/filters/DistantLightSource.h b/Source/WebCore/platform/graphics/filters/DistantLightSource.h +index 70c6512f..b032c82e 100644 +--- a/Source/WebCore/platform/graphics/filters/DistantLightSource.h ++++ b/Source/WebCore/platform/graphics/filters/DistantLightSource.h +@@ -26,6 +26,10 @@ + #include <wtf/ArgumentCoder.h> + #include <wtf/Ref.h> + ++namespace WTF { ++class TextStream; ++} // namespace WTF ++ + namespace WebCore { + + class DistantLightSource : public LightSource { +diff --git a/Source/WebCore/platform/graphics/filters/FELighting.h b/Source/WebCore/platform/graphics/filters/FELighting.h +index 53beb596..e78a9354 100644 +--- a/Source/WebCore/platform/graphics/filters/FELighting.h ++++ b/Source/WebCore/platform/graphics/filters/FELighting.h +@@ -35,8 +35,6 @@ + + namespace WebCore { + +-struct FELightingPaintingDataForNeon; +- + class FELighting : public FilterEffect { + public: + const Color& lightingColor() const { return m_lightingColor; } +@@ -64,11 +62,6 @@ protected: + + std::unique_ptr<FilterEffectApplier> createSoftwareApplier() const override; + +-#if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) +- static int getPowerCoefficients(float exponent); +- inline void platformApplyNeon(const LightingData&, const LightSource::PaintingData&); +-#endif +- + Color m_lightingColor; + float m_surfaceScale; + float m_diffuseConstant; +diff --git a/Source/WebCore/platform/graphics/filters/PointLightSource.h b/Source/WebCore/platform/graphics/filters/PointLightSource.h +index 3a5723f0..675d63f5 100644 +--- a/Source/WebCore/platform/graphics/filters/PointLightSource.h ++++ b/Source/WebCore/platform/graphics/filters/PointLightSource.h +@@ -26,6 +26,10 @@ + #include "LightSource.h" + #include <wtf/Ref.h> + ++namespace WTF { ++class TextStream; ++} // namespace WTF ++ + namespace WebCore { + + class PointLightSource : public LightSource { +diff --git a/Source/WebCore/platform/graphics/filters/SpotLightSource.h b/Source/WebCore/platform/graphics/filters/SpotLightSource.h +index 684626f7..dea58389 100644 +--- a/Source/WebCore/platform/graphics/filters/SpotLightSource.h ++++ b/Source/WebCore/platform/graphics/filters/SpotLightSource.h +@@ -26,6 +26,10 @@ + #include "LightSource.h" + #include <wtf/Ref.h> + ++namespace WTF { ++class TextStream; ++} // namespace WTF ++ + namespace WebCore { + + class SpotLightSource : public LightSource { +diff --git a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h +index c974d921..e2896660 100644 +--- a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h ++++ b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h +@@ -36,6 +36,7 @@ + namespace WebCore { + + class FELighting; ++struct FELightingPaintingDataForNeon; + + class FELightingSoftwareApplier final : public FilterEffectConcreteApplier<FELighting> { + WTF_MAKE_FAST_ALLOCATED; +@@ -132,8 +133,23 @@ private: + + static void applyPlatformGenericPaint(const LightingData&, const LightSource::PaintingData&, int startY, int endY); + static void applyPlatformGenericWorker(ApplyParameters*); ++ ++#if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) ++ static int getPowerCoefficients(float exponent); ++ static void platformApplyNeonWorker(FELightingPaintingDataForNeon*); ++ inline static void applyPlatformNeon(const LightingData&, const LightSource::PaintingData&); ++ ++ inline static void applyPlatformGeneric(const LightingData& data, const LightSource::PaintingData& paintingData) ++ { ++ applyPlatformNeon(data, paintingData); ++ } ++#else + static void applyPlatformGeneric(const LightingData&, const LightSource::PaintingData&); ++#endif ++ + static void applyPlatform(const LightingData&); + }; + + } // namespace WebCore ++ ++#include "FELightingNEON.h" diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/4977290ab4ab35258a6da9b13795c9b0f7894bf4.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/4977290ab4ab35258a6da9b13795c9b0f7894bf4.patch new file mode 100644 index 0000000000..79da855ff4 --- /dev/null +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/4977290ab4ab35258a6da9b13795c9b0f7894bf4.patch @@ -0,0 +1,41 @@ +From 4977290ab4ab35258a6da9b13795c9b0f7894bf4 Mon Sep 17 00:00:00 2001 +From: Diego Pino Garcia <dpino@igalia.com> +Date: Mon, 22 May 2023 19:58:50 -0700 +Subject: [PATCH] [GLIB] Fix build error after 264196@main + https://bugs.webkit.org/show_bug.cgi?id=256917 + +Reviewed by Michael Catanzaro. + +Variable BWRAP_EXECUTABLE is only defined when BUBBLEWRAP_SANDBOX is +enabled. + +* Source/WTF/wtf/glib/Sandbox.cpp: +(WTF::isInsideUnsupportedContainer): + +Canonical link: https://commits.webkit.org/264395@main +Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/4977290ab4ab35258a6da9b13795c9b0f7894bf4] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + Source/WTF/wtf/glib/Sandbox.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Source/WTF/wtf/glib/Sandbox.cpp b/Source/WTF/wtf/glib/Sandbox.cpp +index 7d84e830ab33e..9b07bb8cb5a9b 100644 +--- a/Source/WTF/wtf/glib/Sandbox.cpp ++++ b/Source/WTF/wtf/glib/Sandbox.cpp +@@ -36,6 +36,7 @@ bool isInsideFlatpak() + return returnValue; + } + ++#if ENABLE(BUBBLEWRAP_SANDBOX) + bool isInsideUnsupportedContainer() + { + static bool inContainer = g_file_test("/run/.containerenv", G_FILE_TEST_EXISTS); +@@ -64,6 +65,7 @@ bool isInsideUnsupportedContainer() + + return inContainer && !supportedContainer; + } ++#endif + + bool isInsideSnap() + { diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/check-GST_GL_HAVE_PLATFORM_GLX.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/check-GST_GL_HAVE_PLATFORM_GLX.patch new file mode 100644 index 0000000000..ae99810ced --- /dev/null +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/check-GST_GL_HAVE_PLATFORM_GLX.patch @@ -0,0 +1,33 @@ +Add additional check on GST_GL_HAVE_PLATFORM_GLX before using gst_gl_display_x11_new_with_display + +This ensures that there is a compile time check for glx support in gstreamer as +runtime check is not enough because gst_gl_display_x11_new_with_display() API comes from +gst/gl/x11/gstgldisplay_x11.h which is only included when GST_GL_HAVE_PLATFORM_GLX is defined +therefore make this check consistent to fix build with some platforms which use pvr gl drivers +where this problem appear at compile time. + + +/mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/webkitgtk/2.40.2-r0/webkitgtk-2.40.2/Source/WebCore/platform/graphics/gstreamer/PlatformDisplayGStreamer.cpp:68:31: error: use of undeclared identifier 'gst_gl_display_x11_new_with_display'; did you mean 'gst_gl_display_egl_new_with_egl_display'? + 68 | return GST_GL_DISPLAY(gst_gl_display_x11_new_with_display(downcast<PlatformDisplayX11>(sharedDisplay).native())); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + | gst_gl_display_egl_new_with_egl_display + +This issue is 2.40 specific since GLX support is removed [1] from trunk upstream, therefore +this patch wont be needed when upgrading to 2.42+ + +[1] https://github.com/WebKit/WebKit/commit/320560f9e53ddcd53954059bd005e0c75eb91abf + +Upstream-Status: Inappropriate [GLX support is gone in 2.41+] +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/Source/WebCore/platform/graphics/gstreamer/PlatformDisplayGStreamer.cpp 2023-02-20 01:22:18.917743700 -0800 ++++ b/Source/WebCore/platform/graphics/gstreamer/PlatformDisplayGStreamer.cpp 2023-07-08 08:45:09.739177065 -0700 +@@ -63,7 +63,7 @@ + if (glPlatform == GST_GL_PLATFORM_EGL) + return GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(sharedDisplay.eglDisplay())); + #endif +-#if USE(GLX) ++#if USE(GLX) && GST_GL_HAVE_PLATFORM_GLX + if (is<PlatformDisplayX11>(sharedDisplay) && glPlatform == GST_GL_PLATFORM_GLX) + return GST_GL_DISPLAY(gst_gl_display_x11_new_with_display(downcast<PlatformDisplayX11>(sharedDisplay).native())); + #endif diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/reproducibility.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/reproducibility.patch new file mode 100644 index 0000000000..e866a1a193 --- /dev/null +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/reproducibility.patch @@ -0,0 +1,22 @@ +Injection a year based on the current date isn't reproducible. Hack this +to a specific year for now for reproducibilty and to avoid autobuilder failures. + +The correct fix would be to use SOURCE_DATE_EPOCH from the environment and +then this could be submitted upstream, sadly my ruby isn't up to that. + +Upstream-Status: Pending [could be reworked] +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> + +Index: webkitgtk-2.34.2/Source/JavaScriptCore/generator/GeneratedFile.rb +=================================================================== +--- webkitgtk-2.34.2.orig/Source/JavaScriptCore/generator/GeneratedFile.rb ++++ webkitgtk-2.34.2/Source/JavaScriptCore/generator/GeneratedFile.rb +@@ -25,7 +25,7 @@ require 'date' + require 'digest' + + $LICENSE = <<-EOF +-Copyright (C) #{Date.today.year} Apple Inc. All rights reserved. ++Copyright (C) 2021 Apple Inc. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.40.2.bb b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.40.2.bb new file mode 100644 index 0000000000..9bd0c4e198 --- /dev/null +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.40.2.bb @@ -0,0 +1,169 @@ +SUMMARY = "WebKit web rendering engine for the GTK+ platform" +HOMEPAGE = "https://www.webkitgtk.org/" +BUGTRACKER = "https://bugs.webkit.org/" + +LICENSE = "BSD-2-Clause & LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d84286dda758da57bd691 \ + file://Source/WebCore/LICENSE-APPLE;md5=4646f90082c40bcf298c285f8bab0b12 \ + file://Source/WebCore/LICENSE-LGPL-2;md5=36357ffde2b64ae177b2494445b79d21 \ + file://Source/WebCore/LICENSE-LGPL-2.1;md5=a778a33ef338abbaf8b8a7c36b6eec80 \ + " + +SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \ + file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ + file://reproducibility.patch \ + file://0d3344e17d258106617b0e6d783d073b188a2548.patch \ + file://4977290ab4ab35258a6da9b13795c9b0f7894bf4.patch \ + file://0001-Source-JavaScriptCore-CMakeLists.txt-ensure-reproduc.patch \ + file://check-GST_GL_HAVE_PLATFORM_GLX.patch \ + " +SRC_URI[sha256sum] = "96898870d994da406ee7a632816dcde9a3bb395ee5f344fcb3f3b8cc8a77e000" + +inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen + +S = "${WORKDIR}/webkitgtk-${PV}" + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}" + +CVE_PRODUCT = "webkitgtk webkitgtk\+" + +DEPENDS += " \ + ruby-native \ + gperf-native \ + unifdef-native \ + cairo \ + harfbuzz \ + jpeg \ + atk \ + libwebp \ + gtk+3 \ + libxslt \ + libtasn1 \ + libnotify \ + gstreamer1.0 \ + gstreamer1.0-plugins-base \ + glib-2.0-native \ + gettext-native \ + " + +PACKAGECONFIG_SOUP ?= "soup3" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl-or-es', '', d)} \ + enchant \ + libsecret \ + ${PACKAGECONFIG_SOUP} \ + " + +PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" +PACKAGECONFIG[angle] = "-DUSE_ANGLE_WEBGL=ON,-DUSE_ANGLE_WEBGL=OFF" +PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11 libxcomposite libxdamage libxrender libxt" +PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" +PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" +PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" +PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/egl" +PACKAGECONFIG[opengl] = "-DENABLE_GRAPHICS_CONTEXT_GL=ON,-DENABLE_GRAPHICS_CONTEXT_GL=OFF,virtual/egl" +PACKAGECONFIG[opengl-or-es] = "-DUSE_OPENGL_OR_ES=ON,-DUSE_OPENGL_OR_ES=OFF" +PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret" +PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" +PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2" +PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg" +PACKAGECONFIG[systemd] = "-DUSE_SYSTEMD=ON,-DUSE_SYSTEMD=off,systemd" +PACKAGECONFIG[reduce-size] = "-DCMAKE_BUILD_TYPE=MinSizeRel,-DCMAKE_BUILD_TYPE=Release,," +PACKAGECONFIG[lcms] = "-DUSE_LCMS=ON,-DUSE_LCMS=OFF,lcms" +PACKAGECONFIG[soup2] = "-DUSE_SOUP2=ON,-DUSE_SOUP2=OFF,libsoup-2.4,,,soup3" +PACKAGECONFIG[soup3] = ",,libsoup,,,soup2" +PACKAGECONFIG[journald] = "-DENABLE_JOURNALD_LOG=ON,-DENABLE_JOURNALD_LOG=OFF,systemd" +PACKAGECONFIG[avif] = "-DUSE_AVIF_LOG=ON,-DUSE_AVIF=OFF,libavif" +PACKAGECONFIG[media-recorder] = "-DENABLE_MEDIA_RECORDER=ON,-DENABLE_MEDIA_RECORDER=OFF,gstreamer1.0-plugins-bad" +PACKAGECONFIG[gamepad] = "-DENABLE_GAMEPAD=ON,-DENABLE_GAMEPAD=OFF,libmanette" +PACKAGECONFIG[webrtc] = "-DENABLE_WEB_RTC=ON,-DENABLE_WEB_RTC=OFF" +PACKAGECONFIG[bubblewrap] = "-DENABLE_BUBBLEWRAP_SANDBOX=ON -DBWRAP_EXECUTABLE=${bindir}/bwrap -DDBUS_PROXY_EXECUTABLE=${bindir}/xdg-dbus-proxy,-DENABLE_BUBBLEWRAP_SANDBOX=OFF,,bubblewrap xdg-dbus-proxy" + +EXTRA_OECMAKE = " \ + -DPORT=GTK \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ + ${@bb.utils.contains('GIDOCGEN_ENABLED', 'True', '-DENABLE_DOCUMENTATION=ON', '-DENABLE_DOCUMENTATION=OFF', d)} \ + -DENABLE_MINIBROWSER=ON \ + " + +# Javascript JIT is not supported on ARC +EXTRA_OECMAKE:append:arc = " -DENABLE_JIT=OFF " +# By default 25-bit "medium" calls are used on ARC +# which is not enough for binaries larger than 32 MiB +CFLAGS:append:arc = " -mlong-calls" +CXXFLAGS:append:arc = " -mlong-calls" + +# Needed for non-mesa graphics stacks when x11 is disabled +CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_NO_X11=1', d)}" + +# Javascript JIT is not supported on powerpc +EXTRA_OECMAKE:append:powerpc = " -DENABLE_JIT=OFF " +EXTRA_OECMAKE:append:powerpc64 = " -DENABLE_JIT=OFF " + +# ARM JIT code does not build on ARMv4/5/6 anymore +EXTRA_OECMAKE:append:armv5 = " -DENABLE_JIT=OFF " +EXTRA_OECMAKE:append:armv6 = " -DENABLE_JIT=OFF " +EXTRA_OECMAKE:append:armv4 = " -DENABLE_JIT=OFF " + +EXTRA_OECMAKE:append:mipsarch = " -DUSE_LD_GOLD=OFF " +EXTRA_OECMAKE:append:powerpc = " -DUSE_LD_GOLD=OFF " + +# JIT and gold linker does not work on RISCV +EXTRA_OECMAKE:append:riscv32 = " -DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF" +EXTRA_OECMAKE:append:riscv64 = " -DUSE_LD_GOLD=OFF" + +# JIT not supported on MIPS either +EXTRA_OECMAKE:append:mipsarch = " -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON " + +# JIT not supported on X32 +# An attempt was made to upstream JIT support for x32 in +# https://bugs.webkit.org/show_bug.cgi?id=100450, but this was closed as +# unresolved due to limited X32 adoption. +EXTRA_OECMAKE:append:x86-x32 = " -DENABLE_JIT=OFF " + +SECURITY_CFLAGS:remove:aarch64 = "-fpie" +SECURITY_CFLAGS:append:aarch64 = " -fPIE" + +FILES:${PN} += "${libdir}/webkit2gtk-4.*/injected-bundle/libwebkit2gtkinjectedbundle.so" + +RRECOMMENDS:${PN} += "ca-certificates shared-mime-info" + +# http://errors.yoctoproject.org/Errors/Details/20370/ +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" +ARM_INSTRUCTION_SET:armv6 = "arm" + +# https://bugzilla.yoctoproject.org/show_bug.cgi?id=9474 +# https://bugs.webkit.org/show_bug.cgi?id=159880 +# JSC JIT can build on ARMv7 with -marm, but doesn't work on runtime. +# Upstream only tests regularly the JSC JIT on ARMv7 with Thumb2 (-mthumb). +ARM_INSTRUCTION_SET:armv7a = "thumb" +ARM_INSTRUCTION_SET:armv7r = "thumb" +ARM_INSTRUCTION_SET:armv7ve = "thumb" + +# ANGLE requires SSE support as of webkit 2.40.x on 32 bit x86 +COMPATIBLE_HOST:x86 = "${@bb.utils.contains_any('TUNE_FEATURES', 'core2 corei7', '.*', 'null', d)}" + +# introspection inside qemu-arm hangs forever on musl/arm builds +# therefore disable GI_DATA +GI_DATA_ENABLED:libc-musl:armv7a = "False" +GI_DATA_ENABLED:libc-musl:armv7ve = "False" + +do_install:append() { + mv ${D}${bindir}/WebKitWebDriver ${D}${bindir}/WebKitWebDriver3 +} + +PACKAGE_PREPROCESS_FUNCS += "src_package_preprocess" +src_package_preprocess () { + # Trim build paths from comments in generated sources to ensure reproducibility + sed -i -e "s,${WORKDIR},,g" \ + ${B}/JavaScriptCore/DerivedSources/*.h \ + ${B}/JavaScriptCore/DerivedSources/yarr/*.h \ + ${B}/JavaScriptCore/PrivateHeaders/JavaScriptCore/*.h \ + ${B}/WebCore/DerivedSources/*.cpp \ + ${B}/WebKitGTK/DerivedSources/webkit/*.cpp +} + diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/1024.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/1024.patch index 7506d8bb26..12613f8b19 100644 --- a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/1024.patch +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/1024.patch @@ -6,6 +6,8 @@ Subject: [PATCH] SCons 4.2.0 no longer has env_cpp11.has_key() Check env_cpp11 This fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1003022 --- +Upstream-Status: Pending + examples/broadcast_server/SConscript | 2 +- examples/debug_client/SConscript | 2 +- examples/debug_server/SConscript | 2 +- diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/855.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/855.patch index 3245d941b0..68cb645b40 100644 --- a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/855.patch +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/855.patch @@ -5,6 +5,8 @@ Subject: [PATCH] Fix cmake find boost with version >= 1.71 For some reasons "system;thread;random;unit_test_framework" was seen as a single module, because of the quotes. --- +Upstream-Status: Pending + CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/857.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/857.patch index f221cd6999..401a614dc1 100644 --- a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/857.patch +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/857.patch @@ -8,6 +8,8 @@ Subject: [PATCH] Update SConstruct with new Python3 syntax: - new raise This should fix FTBFS against new scons 3.1.2 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=947584 --- +Upstream-Status: Pending + SConstruct | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.4.bb b/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.4.bb new file mode 100644 index 0000000000..35dee632a2 --- /dev/null +++ b/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.4.bb @@ -0,0 +1,19 @@ +SUMMARY = "xdg-dbus-proxy is a filtering proxy for D-Bus connections" +HOMEPAGE = "https://github.com/flatpak/xdg-dbus-proxy" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = " \ + glib-2.0 \ + libxslt-native \ + docbook-xsl-stylesheets-native \ +" + +inherit meson pkgconfig + +SRC_URI = "git://github.com/flatpak/xdg-dbus-proxy.git;protocol=https;branch=main" + +S = "${WORKDIR}/git" +SRCREV = "6bfe8c32ab23f8c1d80af7a70b3d318a79a17652" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal/0001-xdg-desktop-portal-pc-in-add-pc_sysrootdir-dir.patch b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal/0001-xdg-desktop-portal-pc-in-add-pc_sysrootdir-dir.patch index 4b80c6e9f8..1997d0ffe7 100644 --- a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal/0001-xdg-desktop-portal-pc-in-add-pc_sysrootdir-dir.patch +++ b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal/0001-xdg-desktop-portal-pc-in-add-pc_sysrootdir-dir.patch @@ -4,6 +4,8 @@ Date: Mon, 12 Dec 2022 18:40:31 +0100 Subject: [PATCH] xdg-desktop-portal.pc.in: add pc_sysrootdir dir --- +Upstream-Status: Pending + xdg-desktop-portal.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.16.0.bb b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.16.0.bb index 84e04e9f2e..0b3a93ab32 100644 --- a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.16.0.bb +++ b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.16.0.bb @@ -13,20 +13,17 @@ DEPENDS = " \ pipewire \ dbus-native \ fuse3 \ - bubblewrap-native \ xmlto-native \ flatpak \ python3-dbus-native \ " PORTAL_BACKENDS ?= " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'xdg-desktop-portal-wlr', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'gtk', 'xdg-desktop-portal-gnome', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'gtk+3', 'xdg-desktop-portal-gnome', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'gtk4', 'xdg-desktop-portal-gnome', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'gtk+3', 'xdg-desktop-portal-gtk', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'gtk4', 'xdg-desktop-portal-gtk', '', d)} \ " -RDEPENDS:${PN} = "bubblewrap ${PORTAL_BACKENDS}" +RDEPENDS:${PN} = "bubblewrap rtkit ${PORTAL_BACKENDS}" inherit meson pkgconfig python3native features_check @@ -39,3 +36,12 @@ S = "${WORKDIR}/git" SRCREV = "88af6c8ca4106fcf70925355350a669848e9fd5a" FILES:${PN} += "${libdir}/systemd ${datadir}/dbus-1" + +EXTRA_OEMESON += "--cross-file=${WORKDIR}/meson-${PN}.cross" + +do_write_config:append() { + cat >${WORKDIR}/meson-${PN}.cross <<EOF +[binaries] +bwrap = '${bindir}/bwrap' +EOF +} diff --git a/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch b/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch index e55f4f3b13..7e13110a3b 100644 --- a/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch +++ b/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + configure.ac: don't use xml-config if --with-libxml-prefix is specified to configure Same behavior for xslt-config. diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch index 5e7fca02a5..05803266cb 100644 --- a/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch +++ b/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch @@ -6,6 +6,8 @@ Subject: [PATCH] Added req_distinguished_name in /etc/xrdp/openssl.conf, Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> --- +Upstream-Status: Pending + keygen/openssl.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch index 82b2790856..e8b4ffa6bf 100644 --- a/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch +++ b/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch @@ -5,6 +5,8 @@ Fix the compile error: Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + xrdp/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/yaml-cpp/yaml-cpp/0001-Fix-CMake-export-files-1077.patch b/meta-oe/recipes-support/yaml-cpp/yaml-cpp/0001-Fix-CMake-export-files-1077.patch new file mode 100644 index 0000000000..b6c4a3b883 --- /dev/null +++ b/meta-oe/recipes-support/yaml-cpp/yaml-cpp/0001-Fix-CMake-export-files-1077.patch @@ -0,0 +1,117 @@ +From 3d436f6cfc2dfe52fc1533c01f57c25ae7ffac9c Mon Sep 17 00:00:00 2001 +From: Felix Schwitzer <flx107809@gmail.com> +Date: Fri, 1 Apr 2022 05:26:47 +0200 +Subject: [PATCH] Fix CMake export files (#1077) + +After configuring the file `yaml-cpp-config.cmake.in`, the result ends up with +empty variables. (see also the discussion in #774). + +Rework this file and the call to `configure_package_config_file` according the +cmake documentation +(https://cmake.org/cmake/help/v3.22/module/CMakePackageConfigHelpers.html?highlight=configure_package_config#command:configure_package_config_file) +to overcome this issue and allow a simple `find_package` after install. + +As there was some discussion about the place where to install the +`yaml-cpp-config.cmake` file, e.g. #1055, factor out the install location into +an extra variable to make it easier changing this location in the future. + +Also untabify CMakeLists.txt in some places to align with the other code parts in this file. + +Upstream-Status: Accepted [https://github.com/jbeder/yaml-cpp/pull/1077] + +Signed-off-by: Jasper Orschulko <jasper@fancydomain.eu> +--- + CMakeLists.txt | 29 ++++++++++++++++++----------- + yaml-cpp-config.cmake.in | 10 ++++++---- + 2 files changed, 24 insertions(+), 15 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b230b9e..983d1a4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -127,10 +127,16 @@ set_target_properties(yaml-cpp PROPERTIES + PROJECT_LABEL "yaml-cpp ${yaml-cpp-label-postfix}" + DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}") + ++# FIXME(felix2012): A more common place for the cmake export would be ++# `CMAKE_INSTALL_LIBDIR`, as e.g. done in ubuntu or in this project for GTest ++set(CONFIG_EXPORT_DIR "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") ++set(EXPORT_TARGETS yaml-cpp) + configure_package_config_file( + "${PROJECT_SOURCE_DIR}/yaml-cpp-config.cmake.in" + "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" +- INSTALL_DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") ++ INSTALL_DESTINATION "${CONFIG_EXPORT_DIR}" ++ PATH_VARS CMAKE_INSTALL_INCLUDEDIR CONFIG_EXPORT_DIR) ++unset(EXPORT_TARGETS) + + write_basic_package_version_file( + "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" +@@ -139,30 +145,31 @@ write_basic_package_version_file( + configure_file(yaml-cpp.pc.in yaml-cpp.pc @ONLY) + + if (YAML_CPP_INSTALL) +- install(TARGETS yaml-cpp ++ install(TARGETS yaml-cpp + EXPORT yaml-cpp-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +- install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ ++ install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} +- FILES_MATCHING PATTERN "*.h") ++ FILES_MATCHING PATTERN "*.h") + install(EXPORT yaml-cpp-targets +- DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") +- install(FILES +- "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" +- "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" +- DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") ++ DESTINATION "${CONFIG_EXPORT_DIR}") ++ install(FILES ++ "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" ++ "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" ++ DESTINATION "${CONFIG_EXPORT_DIR}") + install(FILES "${PROJECT_BINARY_DIR}/yaml-cpp.pc" + DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig) + endif() ++unset(CONFIG_EXPORT_DIR) + + if(YAML_CPP_BUILD_TESTS) +- add_subdirectory(test) ++ add_subdirectory(test) + endif() + + if(YAML_CPP_BUILD_TOOLS) +- add_subdirectory(util) ++ add_subdirectory(util) + endif() + + if (YAML_CPP_CLANG_FORMAT_EXE) +diff --git a/yaml-cpp-config.cmake.in b/yaml-cpp-config.cmake.in +index 7b41e3f..a7ace3d 100644 +--- a/yaml-cpp-config.cmake.in ++++ b/yaml-cpp-config.cmake.in +@@ -3,12 +3,14 @@ + # YAML_CPP_INCLUDE_DIR - include directory + # YAML_CPP_LIBRARIES - libraries to link against + +-# Compute paths +-get_filename_component(YAML_CPP_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +-set(YAML_CPP_INCLUDE_DIR "@CONFIG_INCLUDE_DIRS@") ++@PACKAGE_INIT@ ++ ++set_and_check(YAML_CPP_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") + + # Our library dependencies (contains definitions for IMPORTED targets) +-include("${YAML_CPP_CMAKE_DIR}/yaml-cpp-targets.cmake") ++include(@PACKAGE_CONFIG_EXPORT_DIR@/yaml-cpp-targets.cmake) + + # These are IMPORTED targets created by yaml-cpp-targets.cmake + set(YAML_CPP_LIBRARIES "@EXPORT_TARGETS@") ++ ++check_required_components(@EXPORT_TARGETS@) +-- +2.39.2 + diff --git a/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.7.0.bb b/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.7.0.bb index d3984abe8b..e04d4705a4 100644 --- a/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.7.0.bb +++ b/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.7.0.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=6a8aaf0595c2efc1a9c2e0913e9c1a2c" # yaml-cpp releases are stored as archive files in github. # download the exact revision of release SRC_URI = "git://github.com/jbeder/yaml-cpp.git;branch=master;protocol=https" +SRC_URI += "file://0001-Fix-CMake-export-files-1077.patch" SRCREV = "0579ae3d976091d7d664aa9d2527e0d0cff25763" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/zbar/zbar/0001-qt-Create-subdir-in-Makefile.patch b/meta-oe/recipes-support/zbar/zbar/0001-qt-Create-subdir-in-Makefile.patch index d7ca152074..3d8c07f02b 100644 --- a/meta-oe/recipes-support/zbar/zbar/0001-qt-Create-subdir-in-Makefile.patch +++ b/meta-oe/recipes-support/zbar/zbar/0001-qt-Create-subdir-in-Makefile.patch @@ -17,6 +17,8 @@ make: *** [Makefile:2459: qt/moc_QZBar.cpp] Error 1 Signed-off-by: Daniel Gomez <dagmcr@gmail.com> --- +Upstream-Status: Pending + qt/Makefile.am.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-support/zbar/zbar/0002-zbarcam-Create-subdir-in-Makefile.patch b/meta-oe/recipes-support/zbar/zbar/0002-zbarcam-Create-subdir-in-Makefile.patch index a1c27b8b43..9030ed88f2 100644 --- a/meta-oe/recipes-support/zbar/zbar/0002-zbarcam-Create-subdir-in-Makefile.patch +++ b/meta-oe/recipes-support/zbar/zbar/0002-zbarcam-Create-subdir-in-Makefile.patch @@ -20,6 +20,8 @@ make: *** [Makefile:2438: zbarcam/moc_zbarcam_qt.h] Error 1 Signed-off-by: Daniel Gomez <dagmcr@gmail.com> --- +Upstream-Status: Pending + zbarcam/Makefile.am.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-support/zchunk/zchunk_1.2.0.bb b/meta-oe/recipes-support/zchunk/zchunk_1.3.1.bb index 0baea5032a..9bf3809244 100644 --- a/meta-oe/recipes-support/zchunk/zchunk_1.2.0.bb +++ b/meta-oe/recipes-support/zchunk/zchunk_1.3.1.bb @@ -6,17 +6,19 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=daf6e68539f564601a5a5869c31e5242" SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https;branch=main" -SRCREV = "dd6a30a1e4e8b738b0cafc682f3c00e7706134e5" +SRCREV = "b462b1587f7d3aa782689430e83e96c737748f33" S = "${WORKDIR}/git" -DEPENDS = "\ - curl \ - zstd \ - " - +DEPENDS = "zstd" DEPENDS:append:libc-musl = " argp-standalone" -LDFLAGS:append:libc-musl = " -largp" -inherit meson pkgconfig +inherit meson pkgconfig lib_package + +PACKAGECONFIG ??= "openssl zckdl" + +# zckdl gets packaged into zchunk-bin +PACKAGECONFIG[zckdl] = "-Dwith-curl=enabled,-Dwith-curl=disabled,curl" +# Use OpenSSL primitives for SHA +PACKAGECONFIG[openssl] = "-Dwith-openssl=enabled,-Dwith-openssl=disabled,openssl" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-test/bats/bats_1.8.2.bb b/meta-oe/recipes-test/bats/bats_1.10.0.bb index 74e683e589..0fb624e0da 100644 --- a/meta-oe/recipes-test/bats/bats_1.8.2.bb +++ b/meta-oe/recipes-test/bats/bats_1.10.0.bb @@ -10,15 +10,17 @@ SRC_URI = "\ git://github.com/bats-core/bats-core.git;branch=master;protocol=https \ " -# v1.7.0 -SRCREV = "e8c840b58f0833e23461c682655fe540aa923f85" +# v1.10.0 +SRCREV = "f7defb94362f2053a3e73d13086a167448ea9133" S = "${WORKDIR}/git" +# Numerous scripts assume ${baselib} == lib, which is not true. +# do_configure:prepend() { - sed -i 's:\$BATS_ROOT/lib:\$BATS_ROOT/${baselib}:g' ${S}/libexec/bats-core/bats - sed -i 's:\$BATS_ROOT/lib:\$BATS_ROOT/${baselib}:g' ${S}/libexec/bats-core/bats-exec-file - sed -i 's:\$BATS_ROOT/lib:\$BATS_ROOT/${baselib}:g' ${S}/libexec/bats-core/bats-exec-test + for f in ${S}/libexec/bats-core/* ${S}/lib/bats-core/* ; do + sed -i 's:\$BATS_ROOT/lib/:\$BATS_ROOT/${baselib}/:g' $f + done } do_install() { diff --git a/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb b/meta-oe/recipes-test/cmocka/cmocka_1.1.7.bb index 554d582a57..44077a0d35 100644 --- a/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb +++ b/meta-oe/recipes-test/cmocka/cmocka_1.1.7.bb @@ -6,9 +6,10 @@ HOMEPAGE = "https://cmocka.org/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRCREV = "a4fc3dd7705c277e3a57432895e9852ea105dac9" +SRCREV = "a01cc69ee9536f90e57c61a198f2d1944d3d4313" PV .= "+git${SRCPV}" -SRC_URI = "git://git.cryptomilk.org/projects/cmocka.git;protocol=https;branch=master \ +SRC_URI = "git://git.cryptomilk.org/projects/cmocka.git;protocol=https;branch=stable-1.1 \ + file://0001-include-Check-for-previous-declaration-of-uintptr_t.patch \ file://run-ptest \ " diff --git a/meta-oe/recipes-test/cmocka/files/0001-include-Check-for-previous-declaration-of-uintptr_t.patch b/meta-oe/recipes-test/cmocka/files/0001-include-Check-for-previous-declaration-of-uintptr_t.patch new file mode 100644 index 0000000000..65d30ea993 --- /dev/null +++ b/meta-oe/recipes-test/cmocka/files/0001-include-Check-for-previous-declaration-of-uintptr_t.patch @@ -0,0 +1,43 @@ +From a54e035f802e79e3292d8ad39a14bd7c060eb7b1 Mon Sep 17 00:00:00 2001 +From: Breno Leitao <breno.leitao@gmail.com> +Date: Tue, 21 Mar 2023 21:58:28 -0700 +Subject: [PATCH] include: Check for previous declaration of uintptr_t + +Adding a extra check before declaring uintptr_t. Currently musl uses +macro __DEFINED_uintptr_t once it defines uintptr_t type. Checking +this macro before defining it, and, defining it when uintptr_t is +defined. + +Taken from Alpine + +Upstream-Status: Pending +Signed-off-by: Breno Leitao <breno.leitao@gmail.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + include/cmocka.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/include/cmocka.h b/include/cmocka.h +index a21d965..f540793 100644 +--- a/include/cmocka.h ++++ b/include/cmocka.h +@@ -121,7 +121,7 @@ typedef uintmax_t LargestIntegralType; + ((LargestIntegralType)(value)) + + /* Smallest integral type capable of holding a pointer. */ +-#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) && !defined(HAVE_UINTPTR_T) ++#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) && !defined(HAVE_UINTPTR_T) && !defined(__DEFINED_uintptr_t) + # if defined(_WIN32) + /* WIN32 is an ILP32 platform */ + typedef unsigned int uintptr_t; +@@ -147,6 +147,7 @@ typedef uintmax_t LargestIntegralType; + + # define _UINTPTR_T + # define _UINTPTR_T_DEFINED ++# define __DEFINED_uintptr_t + #endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */ + + /* Perform an unsigned cast to uintptr_t. */ +-- +2.40.0 + diff --git a/meta-oe/recipes-test/cukinia/cukinia_0.6.0.bb b/meta-oe/recipes-test/cukinia/cukinia_0.6.2.bb index 229aee6d7e..470d26ef69 100644 --- a/meta-oe/recipes-test/cukinia/cukinia_0.6.0.bb +++ b/meta-oe/recipes-test/cukinia/cukinia_0.6.2.bb @@ -1,6 +1,6 @@ -SUMMARY = "Linux firmware validation framework" +SUMMARY = "Linux firmware validation framework" DESCRIPTION = "Cukinia is designed to help Linux-based embedded firmware \ -developers run simple system-level validation tests on their firmware." +developers run simple system-level validation tests on their firmware." HOMEPAGE = "https://github.com/savoirfairelinux/cukinia" LICENSE = "GPL-3.0-only & Apache-2.0" @@ -9,10 +9,14 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ SRC_URI = "git://github.com/savoirfairelinux/cukinia.git;protocol=https;branch=master" -SRCREV = "3fd9db9838ef3de20965aa5f7657c363b679a995" +SRCREV = "a290f2dbb813ce12ba407962655a5d8b57322221" S = "${WORKDIR}/git" +inherit allarch + +RRECOMMENDS:${PN} = "libgpiod-tools" + do_install () { install -d ${D}${sbindir} install -m 0755 ${S}/cukinia ${D}${sbindir} diff --git a/meta-oe/recipes-test/fwts/fwts/0001-Add-correct-printf-qualifier-for-off_t.patch b/meta-oe/recipes-test/fwts/fwts/0001-Add-correct-printf-qualifier-for-off_t.patch index 0d73d73109..41eaa239d1 100644 --- a/meta-oe/recipes-test/fwts/fwts/0001-Add-correct-printf-qualifier-for-off_t.patch +++ b/meta-oe/recipes-test/fwts/fwts/0001-Add-correct-printf-qualifier-for-off_t.patch @@ -5,6 +5,8 @@ Subject: [PATCH 1/6] Add correct printf qualifier for off_t Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/bios/ebda_region/ebda_region.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-oe/recipes-test/fwts/fwts/0001-Makefile.am-Add-missing-link-with-zlib.patch b/meta-oe/recipes-test/fwts/fwts/0001-Makefile.am-Add-missing-link-with-zlib.patch new file mode 100644 index 0000000000..358f7c424d --- /dev/null +++ b/meta-oe/recipes-test/fwts/fwts/0001-Makefile.am-Add-missing-link-with-zlib.patch @@ -0,0 +1,43 @@ +From dd97e711b13af6f770db27abec316d5c9271c777 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 12 Jun 2023 10:25:55 -0700 +Subject: [PATCH] Makefile.am: Add missing link with zlib + +It uses functions e.g. gzopen/gzclone/gzgets which are provided by zlib +therefore add it to linker flags. + +Fixes +| aarch64-yoe-linux-ld.lld: error: undefined reference due to --no-allow-shlib-undefined: gzgets +| >>> referenced by ../src/lib/src/.libs/libfwts.so +| +| aarch64-yoe-linux-ld.lld: error: undefined reference due to --no-allow-shlib-undefined: gzopen +| >>> referenced by ../src/lib/src/.libs/libfwts.so +| +| aarch64-yoe-linux-ld.lld: error: undefined reference due to --no-allow-shlib-undefined: gzclose +| >>> referenced by ../src/lib/src/.libs/libfwts.so +| clang-16: error: linker command failed with exit code 1 (use -v to see invocation) +| make[3]: *** [Makefile:2301: fwts] Error 1 + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/lib/src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am +index 76c48d4..45eea88 100644 +--- a/src/lib/src/Makefile.am ++++ b/src/lib/src/Makefile.am +@@ -30,7 +30,7 @@ pkglib_LTLIBRARIES = libfwts.la + libfwts_la_LDFLAGS = -version-info 1:0:0 + + libfwts_la_LIBADD = \ +- -lm -lpthread -lbsd \ ++ -lm -lpthread -lbsd -lz \ + @GIO_LIBS@ \ + @GLIB_LIBS@ + +-- +2.41.0 + diff --git a/meta-oe/recipes-test/fwts/fwts/0006-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch b/meta-oe/recipes-test/fwts/fwts/0006-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch index b5c265ec2b..b723b87c7a 100644 --- a/meta-oe/recipes-test/fwts/fwts/0006-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch +++ b/meta-oe/recipes-test/fwts/fwts/0006-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch @@ -9,6 +9,8 @@ will yield the original pointer value Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/lib/src/fwts_acpi_tables.c | 4 ++-- src/lib/src/fwts_mmap.c | 2 +- src/lib/src/fwts_smbios.c | 2 +- diff --git a/meta-oe/recipes-test/fwts/fwts_22.11.00.bb b/meta-oe/recipes-test/fwts/fwts_22.11.00.bb index f1028074d7..2448082620 100644 --- a/meta-oe/recipes-test/fwts/fwts_22.11.00.bb +++ b/meta-oe/recipes-test/fwts/fwts_22.11.00.bb @@ -12,6 +12,7 @@ SRC_URI = "http://fwts.ubuntu.com/release/fwts-V${PV}.tar.gz;subdir=${BP} \ file://0005-Undefine-PAGE_SIZE.patch \ file://0006-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch \ file://0001-libfwtsiasl-Disable-parallel-builds-of-lex-bison-fil.patch \ + file://0001-Makefile.am-Add-missing-link-with-zlib.patch \ " SRC_URI[sha256sum] = "4af4e1e0f1ae9313297af722d744ba47a81c81bc5bdeab3f4f40837a39e4b808" diff --git a/meta-oe/recipes-test/googletest/googletest_git.bb b/meta-oe/recipes-test/googletest/googletest_1.13.0.bb index edca0bc462..2327f85d46 100644 --- a/meta-oe/recipes-test/googletest/googletest_git.bb +++ b/meta-oe/recipes-test/googletest/googletest_1.13.0.bb @@ -4,13 +4,11 @@ SECTION = "libs" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=cbbd27594afd089daa160d3a16dd515a" -PV = "1.12.1" - PROVIDES += "gmock gtest" S = "${WORKDIR}/git" -SRCREV = "58d77fa8070e8cec2dc1ed015d66b454c8d78850" -SRC_URI = "git://github.com/google/googletest.git;branch=v1.12.x;protocol=https" +SRCREV = "b796f7d44681514f58a683a3a71ff17c94edb0c1" +SRC_URI = "git://github.com/google/googletest.git;branch=main;protocol=https" inherit cmake diff --git a/meta-oe/recipes-test/linux-serial-test/linux-serial-test_git.bb b/meta-oe/recipes-test/linux-serial-test/linux-serial-test_git.bb new file mode 100644 index 0000000000..7abdcb2523 --- /dev/null +++ b/meta-oe/recipes-test/linux-serial-test/linux-serial-test_git.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Linux Serial Test Application" +HOMEPAGE = "https://github.com/cbrake/linux-serial-test" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSES/MIT;md5=544799d0b492f119fa04641d1b8868ed" + +SRC_URI = "git://github.com/cbrake/linux-serial-test.git;protocol=https;branch=master" + +PV = "0+git${SRCPV}" +SRCREV = "2ee61484167eab846f7b7c565284d7c350d738d3" + +S = "${WORKDIR}/git" + +inherit cmake diff --git a/meta-oe/recipes-test/syzkaller/syzkaller/0001-executor-Include-missing-linux-falloc.h.patch b/meta-oe/recipes-test/syzkaller/syzkaller/0001-executor-Include-missing-linux-falloc.h.patch new file mode 100644 index 0000000000..23bfb9a5e2 --- /dev/null +++ b/meta-oe/recipes-test/syzkaller/syzkaller/0001-executor-Include-missing-linux-falloc.h.patch @@ -0,0 +1,37 @@ +From 9db789b4498d4130450e988757914c03e42b40f5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 19 Jun 2023 18:33:36 -0700 +Subject: [PATCH] executor: Include missing linux/falloc.h + +Its needed for FALLOC_FL_ZERO_RANGE which needs this header, it works +with glibc because fcntl.h includes this header indirectly, however the +failure comes to fore with musl C library where this header is not +included indirectly by other system headers, therefore include it as +required. + +Fixes +In file included from executor/common.h:505: +executor/common_linux.h:5604:16: error: use of undeclared identifier 'FALLOC_FL_ZERO_RANGE' + fallocate(fd, FALLOC_FL_ZERO_RANGE, 0, SWAP_FILE_SIZE); + ^ +Upstream-Status: Submitted [https://github.com/google/syzkaller/pull/3974] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + executor/common_linux.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/executor/common_linux.h b/executor/common_linux.h +index d5152e058..9ae3fb159 100644 +--- a/executor/common_linux.h ++++ b/executor/common_linux.h +@@ -5585,6 +5585,7 @@ static long syz_pkey_set(volatile long pkey, volatile long val) + #include <sys/stat.h> + #include <sys/swap.h> + #include <sys/types.h> ++#include <linux/falloc.h> + + #define SWAP_FILE "./swap-file" + #define SWAP_FILE_SIZE (128 * 1000 * 1000) // 128 MB. +-- +2.41.0 + diff --git a/meta-oe/recipes-test/syzkaller/syzkaller/0001-sys-targets-targets.go-allow-users-to-override-hardc.patch b/meta-oe/recipes-test/syzkaller/syzkaller/0001-sys-targets-targets.go-allow-users-to-override-hardc.patch index d647b8d4a0..61f4351651 100644 --- a/meta-oe/recipes-test/syzkaller/syzkaller/0001-sys-targets-targets.go-allow-users-to-override-hardc.patch +++ b/meta-oe/recipes-test/syzkaller/syzkaller/0001-sys-targets-targets.go-allow-users-to-override-hardc.patch @@ -18,11 +18,9 @@ Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> sys/targets/targets.go | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) -diff --git a/sys/targets/targets.go b/sys/targets/targets.go -index f3be708f3..19a8bb681 100644 --- a/sys/targets/targets.go +++ b/sys/targets/targets.go -@@ -258,7 +258,6 @@ var List = map[string]map[string]*Target{ +@@ -262,7 +262,6 @@ var List = map[string]map[string]*Target PtrSize: 4, PageSize: 4 << 10, LittleEndian: true, @@ -30,7 +28,7 @@ index f3be708f3..19a8bb681 100644 Triple: "arm-linux-gnueabi", KernelArch: "arm", KernelHeaderArch: "arm", -@@ -670,12 +669,16 @@ func initTarget(target *Target, OS, arch string) { +@@ -700,12 +699,16 @@ func initTarget(target *Target, OS, arch for i := range target.CFlags { target.replaceSourceDir(&target.CFlags[i], sourceDir) } @@ -53,15 +51,12 @@ index f3be708f3..19a8bb681 100644 } if target.CCompiler == "" { target.setCompiler(useClang) -@@ -803,7 +806,7 @@ func (target *Target) lazyInit() { +@@ -839,7 +842,7 @@ func (target *Target) lazyInit() { // On CI we want to fail loudly if cross-compilation breaks. // Also fail if SOURCEDIR_GOOS is set b/c in that case user probably assumes it will work. - if (target.OS != runtime.GOOS || !runningOnCI) && os.Getenv("SOURCEDIR_"+strings.ToUpper(target.OS)) == "" { + if (target.OS != runtime.GOOS || !runningOnCI) && getSourceDir(target) == "" { - if _, err := exec.LookPath(target.CCompiler); err != nil { + if _, err := exec.LookPath(strings.Fields(target.CCompiler)[0]); err != nil { target.BrokenCompiler = fmt.Sprintf("%v is missing (%v)", target.CCompiler, err) return } --- -2.25.1 - diff --git a/meta-oe/recipes-test/syzkaller/syzkaller_git.bb b/meta-oe/recipes-test/syzkaller/syzkaller_git.bb index f7c751f806..2adc06a2bc 100644 --- a/meta-oe/recipes-test/syzkaller/syzkaller_git.bb +++ b/meta-oe/recipes-test/syzkaller/syzkaller_git.bb @@ -8,8 +8,9 @@ GO_IMPORT = "github.com/google/syzkaller" SRC_URI = "git://${GO_IMPORT};protocol=https;destsuffix=${BPN}-${PV}/src/${GO_IMPORT};branch=master \ file://0001-sys-targets-targets.go-allow-users-to-override-hardc.patch;patchdir=src/${GO_IMPORT} \ + file://0001-executor-Include-missing-linux-falloc.h.patch;patchdir=src/${GO_IMPORT} \ " -SRCREV = "67cb024cd1a3c95e311263a5c95e957f9abfd8ca" +SRCREV = "6d01f20890edf11b99bb54573025b11c1acd2d52" COMPATIBLE_HOST = "(x86_64|i.86|arm|aarch64).*-linux" @@ -23,7 +24,7 @@ export TARGETOS = '${GOOS}' export TARGETARCH = '${GOARCH}' export TARGETVMARCH = '${GOARCH}' -CGO_ENABLED = "0" +CGO_ENABLED = "1" DEPENDS:class-native += "qemu-system-native" diff --git a/meta-oe/recipes-test/testfloat/files/0001-Makefile-for-cross-compile-SoftFloat.patch b/meta-oe/recipes-test/testfloat/files/0001-Makefile-for-cross-compile-SoftFloat.patch index 9f41bf2da0..908a352d0b 100644 --- a/meta-oe/recipes-test/testfloat/files/0001-Makefile-for-cross-compile-SoftFloat.patch +++ b/meta-oe/recipes-test/testfloat/files/0001-Makefile-for-cross-compile-SoftFloat.patch @@ -9,6 +9,8 @@ from Fabio Berton <fabio.berton@ossystems.com.br>. Signed-off-by: Zong Li <zongbox@gmail.com> --- +Upstream-Status: Pending + SoftFloat-3e/build/Linux-Cross-Compile/Makefile | 325 ++++++++++++++++++++++ SoftFloat-3e/build/Linux-Cross-Compile/platform.h | 52 ++++ 2 files changed, 377 insertions(+) diff --git a/meta-oe/recipes-test/testfloat/files/0002-Makefile-for-cross-compile-TestFloat.patch b/meta-oe/recipes-test/testfloat/files/0002-Makefile-for-cross-compile-TestFloat.patch index b7d861f8fc..c99ba71b37 100644 --- a/meta-oe/recipes-test/testfloat/files/0002-Makefile-for-cross-compile-TestFloat.patch +++ b/meta-oe/recipes-test/testfloat/files/0002-Makefile-for-cross-compile-TestFloat.patch @@ -9,6 +9,8 @@ from Fabio Berton <fabio.berton@ossystems.com.br>. Signed-off-by: Zong Li <zongbox@gmail.com> --- +Upstream-Status: Pending + TestFloat-3e/build/Linux-Cross-Compile/Makefile | 353 ++++++++++++++++++++++ TestFloat-3e/build/Linux-Cross-Compile/platform.h | 48 +++ 2 files changed, 401 insertions(+) diff --git a/meta-perl/README b/meta-perl/README.md index 13014b0ff3..13014b0ff3 100644 --- a/meta-perl/README +++ b/meta-perl/README.md diff --git a/meta-perl/conf/include/ptest-packagelists-meta-perl.inc b/meta-perl/conf/include/ptest-packagelists-meta-perl.inc new file mode 100644 index 0000000000..1a8c759b18 --- /dev/null +++ b/meta-perl/conf/include/ptest-packagelists-meta-perl.inc @@ -0,0 +1,50 @@ +# +# Lists of the ptest in meta-perl, sorted into two sets by the time they take +# Please keep these sorted in alphabetical order +# +# A first pass at getting all meta-perl recipes which inherit ptest +# meta_perl_ptest_recipes=$(bitbake-layers show-recipes --recipes-only --layer meta-perl --inherits ptest --bare | tr '\n' ' ' | pcregrep -o1 '^NOTE:.+===(.+)$') +# +# ptests which take less than ~30s each +PTESTS_FAST_META_PERL = "\ + libcapture-tiny-perl \ + libcgi-perl \ + libcrypt-openssl-random-perl \ + libextutils-config-perl \ + libhtml-tagset-perl \ + libmozilla-ca-perl \ + libstrictures-perl \ + libterm-readkey-perl \ + libtest-nowarnings-perl \ +" + +PTESTS_SLOW_META_PERL = "\ + libio-socket-ssl-perl \ +" + +PTESTS_PROBLEMS_META_PERL ="\ + libauthen-sasl-perl \ + libconfig-autoconf-perl \ + libcrypt-openssl-guess-perl \ + libcrypt-openssl-rsa-perl \ + libdata-hexdump-perl \ + libdbd-sqlite-perl \ + libdigest-hmac-perl \ + libdigest-sha1-perl \ + libnet-dns-perl \ + libnet-dns-sec-perl \ + libnet-ldap-perl \ + libencode-perl \ + libextutils-installpaths-perl \ + libfile-slurper-perl \ + libhtml-parser-perl \ + libmime-types-perl \ + libnet-ssleay-perl \ + libsub-uplevel-perl \ + libtest-deep-perl \ + libtest-harness-perl \ + libtest-warn-perl \ + libunicode-linebreak-perl \ + libunix-statgrab \ + libxml-libxml-perl \ +" diff --git a/meta-perl/recipes-perl/images/meta-perl-base.bb b/meta-perl/recipes-core/images/meta-perl-base.bb index ec671020d8..2af10b218c 100644 --- a/meta-perl/recipes-perl/images/meta-perl-base.bb +++ b/meta-perl/recipes-core/images/meta-perl-base.bb @@ -1,4 +1,4 @@ -SUMMARY = "meta-per build test image" +SUMMARY = "meta-perl build test image" IMAGE_INSTALL = "packagegroup-core-boot" diff --git a/meta-perl/recipes-perl/images/meta-perl-image.bb b/meta-perl/recipes-core/images/meta-perl-image.bb index b8d3a76e6a..b8d3a76e6a 100644 --- a/meta-perl/recipes-perl/images/meta-perl-image.bb +++ b/meta-perl/recipes-core/images/meta-perl-image.bb diff --git a/meta-perl/recipes-core/images/meta-perl-ptest-all-image.bb b/meta-perl/recipes-core/images/meta-perl-ptest-all-image.bb new file mode 100644 index 0000000000..236043c22a --- /dev/null +++ b/meta-perl/recipes-core/images/meta-perl-ptest-all-image.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Recipe to trigger execution of all meta-perl ptest images." +HOMEPAGE = "https://www.openembedded.org/" + +LICENSE = "MIT" + +inherit features_check nopackages +REQUIRED_DISTRO_FEATURES = "ptest" + +require conf/include/ptest-packagelists-meta-perl.inc + +# Include the full set of ptests +PTESTS_META_PERL = "${PTESTS_FAST_META_PERL} ${PTESTS_SLOW_META_PERL}" + +do_testimage[noexec] = "1" +do_testimage[depends] = "${@' '.join(['meta-perl-ptest-image-'+x+':do_testimage' for x in d.getVar('PTESTS_META_PERL').split()])}" + +do_build[depends] = "${@' '.join(['meta-perl-ptest-image-'+x+':do_build' for x in d.getVar('PTESTS_META_PERL').split()])}" + +# normally image.bbclass would do this +EXCLUDE_FROM_WORLD = "1" + +python () { + if bb.utils.contains('IMAGE_CLASSES', 'testimage', True, False, d): + bb.build.addtask("do_testimage", "", "", d) +} diff --git a/meta-perl/recipes-core/images/meta-perl-ptest-fast-image.bb b/meta-perl/recipes-core/images/meta-perl-ptest-fast-image.bb new file mode 100644 index 0000000000..5d8afa08e7 --- /dev/null +++ b/meta-perl/recipes-core/images/meta-perl-ptest-fast-image.bb @@ -0,0 +1,6 @@ +require meta-perl-ptest-all-image.bb + +DESCRIPTION = "Recipe to trigger execution of all fast meta-perl ptest images." + +PTESTS_META_PERL = "${PTESTS_FAST_META_PERL}" + diff --git a/meta-perl/recipes-core/images/meta-perl-ptest-image.bb b/meta-perl/recipes-core/images/meta-perl-ptest-image.bb new file mode 100644 index 0000000000..7cca6402b2 --- /dev/null +++ b/meta-perl/recipes-core/images/meta-perl-ptest-image.bb @@ -0,0 +1,41 @@ +inherit features_check +REQUIRED_DISTRO_FEATURES += "ptest" + +require meta-perl-base.bb + +SUMMARY = "meta-perl build ptest image" + +require conf/include/ptest-packagelists-meta-perl.inc + +DESCRIPTION += "Also including the ${MCNAME} ptest package." +HOMEPAGE = "https://www.openembedded.org/" + +PTESTS_META_PERL = "${PTESTS_SLOW_META_PERL} ${PTESTS_FAST_META_PERL}" + +IMAGE_INSTALL:append = " ${MCNAME}-ptest openssh" + +BBCLASSEXTEND = "${@' '.join(['mcextend:'+x for x in d.getVar('PTESTS_META_PERL').split()])}" + +# The image can be sufficiently large (~1.8GB) that we need to be careful that it fits in a live +# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the +# box) and explicitly add up to 1500MB. +IMAGE_OVERHEAD_FACTOR = "1.0" +IMAGE_ROOTFS_EXTRA_SPACE = "324288" +# If a particular ptest needs more space, it can be customized: +#IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend-<pn> = "1024288" + +# ptests need more memory than standard to avoid the OOM killer +QB_MEM = "-m 1024" +# If a particular ptest needs more memory, it can be customized: +#QB_MEM:virtclass-mcextend-<pn> = "-m 4096" + +TEST_SUITES = "ping ssh parselogs ptest" + +# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places +PTEST_EXPECT_FAILURE = "1" + +python () { + if not d.getVar("MCNAME"): + raise bb.parse.SkipRecipe("No class extension set") +} + diff --git a/meta-perl/recipes-perl/packagegroups/packagegroup-meta-perl.bb b/meta-perl/recipes-core/packagegroups/packagegroup-meta-perl.bb index 187424b449..187424b449 100644 --- a/meta-perl/recipes-perl/packagegroups/packagegroup-meta-perl.bb +++ b/meta-perl/recipes-core/packagegroups/packagegroup-meta-perl.bb diff --git a/meta-perl/recipes-extended/logcheck/logcheck_1.4.0.bb b/meta-perl/recipes-extended/logcheck/logcheck_1.4.2.bb index 7436b9c7eb..1ad32b2dbb 100644 --- a/meta-perl/recipes-extended/logcheck/logcheck_1.4.0.bb +++ b/meta-perl/recipes-extended/logcheck/logcheck_1.4.2.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c93c0550bd3173f4504b2cbd8991e50b" SRC_URI = "${DEBIAN_MIRROR}/main/l/${BPN}/${BPN}_${PV}.tar.xz \ file://99_logcheck \ " -SRC_URI[sha256sum] = "dfd95c980727108cc9b8921736af9388dea0f6157688c03e8e39de378107b3dc" +SRC_URI[sha256sum] = "0c651deb31dc201f1584ecea292b259932bae6e3e8cef846db3109e89a7f217e" inherit useradd diff --git a/meta-perl/recipes-perl/images/meta-perl-ptest-image.bb b/meta-perl/recipes-perl/images/meta-perl-ptest-image.bb deleted file mode 100644 index a9b4cc3c7d..0000000000 --- a/meta-perl/recipes-perl/images/meta-perl-ptest-image.bb +++ /dev/null @@ -1,9 +0,0 @@ -require meta-perl-base.bb - -SUMMARY = "meta-perl build ptest image" - -inherit features_check - -REQUIRED_DISTRO_FEATURES += "ptest" - -IMAGE_INSTALL += "packagegroup-meta-perl-ptest" diff --git a/meta-perl/recipes-perl/libcgi/libcgi-perl_4.55.bb b/meta-perl/recipes-perl/libcgi/libcgi-perl_4.57.bb index 2278d14f6c..dea5f7a453 100644 --- a/meta-perl/recipes-perl/libcgi/libcgi-perl_4.55.bb +++ b/meta-perl/recipes-perl/libcgi/libcgi-perl_4.57.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] = "67895e94b13fdf46a3893c9a17c2d0d4c3d4cd2550e1f41e26696c10cb8c64b2" +SRC_URI[sha256sum] = "4e6ca634fe0d5621bb55b0fce5c1d08e6f643c65eecdfffbb4b344fd51b963ac" S = "${WORKDIR}/CGI-${PV}" diff --git a/meta-perl/recipes-perl/libclass/libclass-method-modifiers-perl_2.13.bb b/meta-perl/recipes-perl/libclass/libclass-method-modifiers-perl_2.15.bb index 4cd6343878..f6ed718239 100644 --- a/meta-perl/recipes-perl/libclass/libclass-method-modifiers-perl_2.13.bb +++ b/meta-perl/recipes-perl/libclass/libclass-method-modifiers-perl_2.15.bb @@ -7,11 +7,10 @@ SECTION = "libs" HOMEPAGE = "https://github.com/moose/Class-Method-Modifiers/" LICENSE = "Artistic-1.0 | GPL-1.0-or-later" -LIC_FILES_CHKSUM = "file://LICENSE;md5=16fd0ec7b73c0e158426f753943f1058" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d49d07ae038f38923335ac8cc301e1ba" SRC_URI = "${CPAN_MIRROR}/authors/id/E/ET/ETHER/Class-Method-Modifiers-${PV}.tar.gz" -SRC_URI[md5sum] = "b1398e3682aa2e075b913b9f9000b596" -SRC_URI[sha256sum] = "ab5807f71018a842de6b7a4826d6c1f24b8d5b09fcce5005a3309cf6ea40fd63" +SRC_URI[sha256sum] = "65cd85bfe475d066e9186f7a8cc636070985b30b0ebb1cde8681cf062c2e15fc" S = "${WORKDIR}/Class-Method-Modifiers-${PV}" diff --git a/meta-perl/recipes-perl/libcompress/libcompress-raw-bzip2-perl_2.201.bb b/meta-perl/recipes-perl/libcompress/libcompress-raw-bzip2-perl_2.204.bb index e7cc6a1699..1dc077d67e 100644 --- a/meta-perl/recipes-perl/libcompress/libcompress-raw-bzip2-perl_2.201.bb +++ b/meta-perl/recipes-perl/libcompress/libcompress-raw-bzip2-perl_2.204.bb @@ -5,11 +5,11 @@ HOMEPAGE = "https://metacpan.org/release/Compress-Raw-Bzip2" SECTION = "libs" LICENSE = "Artistic-1.0 | GPL-1.0-or-later" -LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=3cca53585f3090f28fa8401bf1db9179" +LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=85ab0f65a47c4c0f72dd6d033ff74ece" SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-${PV}.tar.gz" -SRC_URI[sha256sum] = "6204b270806d924e124e406faf6bbc715f7bb461dfdbea722042325633be300a" +SRC_URI[sha256sum] = "ee7b490e67e7e2a7a0e8c1e1aa29a9610066149f46b836921149ad1813f70c69" DEPENDS += "bzip2" diff --git a/meta-perl/recipes-perl/libcompress/libcompress-raw-lzma-perl_2.201.bb b/meta-perl/recipes-perl/libcompress/libcompress-raw-lzma-perl_2.204.bb index a9a5570d39..c4b6a4bb79 100644 --- a/meta-perl/recipes-perl/libcompress/libcompress-raw-lzma-perl_2.201.bb +++ b/meta-perl/recipes-perl/libcompress/libcompress-raw-lzma-perl_2.204.bb @@ -5,11 +5,11 @@ HOMEPAGE = "https://metacpan.org/release/Compress-Raw-Lzma" SECTION = "libs" LICENSE = "Artistic-1.0 | GPL-1.0-or-later" -LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=8f4f1603d6e92a381ce2f595ab3cafd5" +LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=b95311d4a7dbf3d0d3663edc094aced6" SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/Compress-Raw-Lzma-${PV}.tar.gz" -SRC_URI[sha256sum] = "ccefd0c0379fae599e2f24570d51cdd8135c161519f7931f0b6cfcf0366094f1" +SRC_URI[sha256sum] = "b226d0648da3e7309387cd8d9cf629353593fd08bac29533f2559659ef7aac1a" DEPENDS += "xz" diff --git a/meta-perl/recipes-perl/libcompress/libcompress-raw-zlib-perl_2.202.bb b/meta-perl/recipes-perl/libcompress/libcompress-raw-zlib-perl_2.202.bb deleted file mode 100644 index 5459572e2b..0000000000 --- a/meta-perl/recipes-perl/libcompress/libcompress-raw-zlib-perl_2.202.bb +++ /dev/null @@ -1,47 +0,0 @@ -# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'. -# The following is the difference between the old and the new license text. -# Please update the LICENSE value if needed, and summarize the changes in -# the commit message via 'License-Update:' tag. -# (example: 'License-Update: copyright years updated.') -# -# The changes: -# -# --- README -# +++ README -# @@ -1,4 +1,4 @@ -# - Copyright (c) 2005-2020 Paul Marquess. All rights reserved. -# + Copyright (c) 2005-2022 Paul Marquess. All rights reserved. -# This program is free software; you can redistribute it -# and/or modify it under the same terms as Perl itself. -# -# -# - -SUMMARY = "Perl interface to the zlib compression library." -DESCRIPTION = "The Compress::Raw::Zlib module provides a Perl interface \ -to the zlib compression library (see 'AUTHOR' for details about where to \ -get zlib)." -HOMEPAGE = "https://metacpan.org/release/Compress-Raw-Zlib" -SECTION = "libs" -LICENSE = "Artistic-1.0 | GPL-1.0-or-later" - -LIC_FILES_CHKSUM = "file://README;beginline=8;endline=17;md5=9bd174bdd6fbb141c1b679e2466e0b39" - -SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/Compress-Raw-Zlib-${PV}.tar.gz" - -SRC_URI[sha256sum] = "96e20946eb457a32d2d7a0050b922e37b5ada41246bcdc824196d3f7c4da91b7" - -DEPENDS += "zlib" - -S = "${WORKDIR}/Compress-Raw-Zlib-${PV}" - -inherit cpan - -export BUILD_ZLIB="0" - -do_compile() { - export LIBC="$(find ${STAGING_DIR_TARGET}/${base_libdir}/ -name 'libc-*.so')" - cpan_do_compile -} - -BBCLASSEXTEND = "native" diff --git a/meta-perl/recipes-perl/libcompress/libcompress-raw-zlib-perl_2.204.bb b/meta-perl/recipes-perl/libcompress/libcompress-raw-zlib-perl_2.204.bb new file mode 100644 index 0000000000..e0aa2e9c25 --- /dev/null +++ b/meta-perl/recipes-perl/libcompress/libcompress-raw-zlib-perl_2.204.bb @@ -0,0 +1,28 @@ +SUMMARY = "Perl interface to the zlib compression library." +DESCRIPTION = "The Compress::Raw::Zlib module provides a Perl interface \ +to the zlib compression library (see 'AUTHOR' for details about where to \ +get zlib)." +HOMEPAGE = "https://metacpan.org/release/Compress-Raw-Zlib" +SECTION = "libs" +LICENSE = "Artistic-1.0 | GPL-1.0-or-later" + +LIC_FILES_CHKSUM = "file://README;beginline=8;endline=17;md5=45bba5fa4937353fd4f505fa2108a6bf" + +SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/Compress-Raw-Zlib-${PV}.tar.gz" + +SRC_URI[sha256sum] = "f161f4297efadbed79c8b096a75951784fc5ccd3170bd32866a19e5c6876d13f" + +DEPENDS += "zlib" + +S = "${WORKDIR}/Compress-Raw-Zlib-${PV}" + +inherit cpan + +export BUILD_ZLIB="0" + +do_compile() { + export LIBC="$(find ${STAGING_DIR_TARGET}/${base_libdir}/ -name 'libc-*.so')" + cpan_do_compile +} + +BBCLASSEXTEND = "native" diff --git a/meta-perl/recipes-perl/libconfig-tiny/libconfig-tiny-perl_2.28.bb b/meta-perl/recipes-perl/libconfig-tiny/libconfig-tiny-perl_2.29.bb index ff28c7663e..92d9bac0e4 100644 --- a/meta-perl/recipes-perl/libconfig-tiny/libconfig-tiny-perl_2.28.bb +++ b/meta-perl/recipes-perl/libconfig-tiny/libconfig-tiny-perl_2.29.bb @@ -15,6 +15,6 @@ S = "${WORKDIR}/Config-Tiny-${PV}" SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RS/RSAVAGE/Config-Tiny-${PV}.tgz" -SRC_URI[sha256sum] = "12df843a0d29d48f61bcc14c4f18f0858fd27a8dd829a00319529d654fe01500" +SRC_URI[sha256sum] = "3de79b0ea03a8d6a93e9d9128fe845fb556222b14699a4f6f0d5ca057ae3333b" inherit cpan diff --git a/meta-perl/recipes-perl/libencode/libencode-perl_3.19.bb b/meta-perl/recipes-perl/libencode/libencode-perl_3.19.bb index 352517ca67..79934e2229 100644 --- a/meta-perl/recipes-perl/libencode/libencode-perl_3.19.bb +++ b/meta-perl/recipes-perl/libencode/libencode-perl_3.19.bb @@ -21,8 +21,8 @@ UPSTREAM_CHECK_REGEX = "Encode\-(?P<pver>(\d+\.\d+))(?!_\d+).tar" S = "${WORKDIR}/Encode-${PV}" +#EXTRA_CPANFLAGS:append = "PERL=../recipe-sysroot-native/usr/bin/perl-native/perl" inherit cpan ptest-perl - do_install:prepend() { # Requires "-T" (taint) option on command line rm -rf ${B}/t/taint.t @@ -32,6 +32,10 @@ do_install:prepend() { rm -rf ${B}/t/use-Encode-Alias.t } +do_install:append() { + sed -i -e "s|${STAGING_BINDIR_NATIVE}/perl-native||g" ${S}/*/*.exh ${S}/*.exh +} + do_install_ptest() { mkdir ${D}${PTEST_PATH}/bin cp -r ${B}/bin/piconv ${D}${PTEST_PATH}/bin diff --git a/meta-perl/recipes-perl/libio/libio-compress-lzma-perl_2.201.bb b/meta-perl/recipes-perl/libio/libio-compress-lzma-perl_2.204.bb index 327cc7a969..13c17b9bba 100644 --- a/meta-perl/recipes-perl/libio/libio-compress-lzma-perl_2.201.bb +++ b/meta-perl/recipes-perl/libio/libio-compress-lzma-perl_2.204.bb @@ -5,11 +5,11 @@ HOMEPAGE = "https://metacpan.org/release/IO-Compress-Lzma" SECTION = "libs" LICENSE = "Artistic-1.0 | GPL-1.0-or-later" -LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=8f4f1603d6e92a381ce2f595ab3cafd5" +LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=b95311d4a7dbf3d0d3663edc094aced6" SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/IO-Compress-Lzma-${PV}.tar.gz" -SRC_URI[sha256sum] = "e0714dd35624654ba3d8e245ac980bcd07d995989d7acc90a46146f62c4ec761" +SRC_URI[sha256sum] = "1e7a4c4f4e665434df59246b19d168b08af2f1aeebaa08937bd69ad3e5e319c8" S = "${WORKDIR}/IO-Compress-Lzma-${PV}" diff --git a/meta-perl/recipes-perl/libio/libio-compress-perl_2.201.bb b/meta-perl/recipes-perl/libio/libio-compress-perl_2.204.bb index fb4efee42d..8d4aec709e 100644 --- a/meta-perl/recipes-perl/libio/libio-compress-perl_2.201.bb +++ b/meta-perl/recipes-perl/libio/libio-compress-perl_2.204.bb @@ -14,11 +14,11 @@ HOMEPAGE = "https://metacpan.org/release/IO-Compress" SECTION = "libs" LICENSE = "Artistic-1.0 | GPL-1.0-or-later" -LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=00f9580b6984ffc2d5f1dc4cc7c3dfcc" +LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=8e78b88f9c8ac08ae03e8ea81195ca45" SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/IO-Compress-${PV}.tar.gz" -SRC_URI[sha256sum] = "f6c55c4e39cfaa3219965dd3b36c9de1edee9a82a10a9cadeb3b74a9ceeeaaad" +SRC_URI[sha256sum] = "617784cb8543778681341b18fc67b74735e8b494f32f00814dd22f68ac6af018" S = "${WORKDIR}/IO-Compress-${PV}" diff --git a/meta-perl/recipes-perl/libmodule/libmodule-build-tiny-perl_0.039.bb b/meta-perl/recipes-perl/libmodule/libmodule-build-tiny-perl_0.045.bb index ff3f4d6944..17ee50d7c8 100644 --- a/meta-perl/recipes-perl/libmodule/libmodule-build-tiny-perl_0.039.bb +++ b/meta-perl/recipes-perl/libmodule/libmodule-build-tiny-perl_0.045.bb @@ -10,13 +10,12 @@ SECTION = "libs" HOMEPAGE = "http://search.cpan.org/~leont/Module-Build-Tiny/" LICENSE = "Artistic-1.0 | GPL-1.0-or-later" -LIC_FILES_CHKSUM = "file://LICENSE;md5=57b8100f0b648cd37fbc3725fe3c111a" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6374136f6774db2f51cc116f5efbf705" DEPENDS = "libextutils-config-perl-native libextutils-helpers-perl-native libextutils-installpaths-perl-native" SRC_URI = "${CPAN_MIRROR}/authors/id/L/LE/LEONT/Module-Build-Tiny-${PV}.tar.gz" -SRC_URI[md5sum] = "2332c90c17454107fea3f2614e11a3a9" -SRC_URI[sha256sum] = "7d580ff6ace0cbe555bf36b86dc8ea232581530cbeaaea09bccb57b55797f11c" +SRC_URI[sha256sum] = "d20692eee246d0b329b7f7659f36286b14ae0696fe91078a64b7078f8876d300" S = "${WORKDIR}/Module-Build-Tiny-${PV}" diff --git a/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.36.bb b/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.39.bb index 2c9b47a4c5..7e57be35cc 100644 --- a/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.36.bb +++ b/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.39.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] = "143ba0e530f8b727be61ec052974cbf52df5b0afc0582d75b04809e0b2a95ebe" +SRC_URI[sha256sum] = "e99cdedf9f0d60dca16f613e488c5b7f123c2fb24b3346d580cfe7da40851ac6" UPSTREAM_CHECK_REGEX = "Net\-DNS\-(?P<pver>(\d+\.\d+))(?!_\d+).tar" diff --git a/meta-perl/recipes-perl/libnet/libnet-ssleay-perl/no-exec-on-configure.patch b/meta-perl/recipes-perl/libnet/libnet-ssleay-perl/no-exec-on-configure.patch index 6efa7d8f95..9620df5ece 100644 --- a/meta-perl/recipes-perl/libnet/libnet-ssleay-perl/no-exec-on-configure.patch +++ b/meta-perl/recipes-perl/libnet/libnet-ssleay-perl/no-exec-on-configure.patch @@ -1,3 +1,7 @@ +Avoid running target binaries during in cross build + +Upstream-Status: Inappropriate [Cross-compile specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> --- a/inc/Module/Install/PRIVATE/Net/SSLeay.pm 2018-08-27 14:56:24.788544991 +0200 +++ b/inc/Module/Install/PRIVATE/Net/SSLeay.pm 2018-08-27 15:00:12.847266331 +0200 @@ -24,20 +24,7 @@ diff --git a/meta-perl/recipes-perl/libtest/libtest-deep-perl_1.130.bb b/meta-perl/recipes-perl/libtest/libtest-deep-perl_1.204.bb index 6252bc3351..d7f6166b4b 100644 --- a/meta-perl/recipes-perl/libtest/libtest-deep-perl_1.130.bb +++ b/meta-perl/recipes-perl/libtest/libtest-deep-perl_1.204.bb @@ -23,11 +23,10 @@ SECTION = "libs" HOMEPAGE = "http://github.com/rjbs/Test-Deep/" LICENSE = "Artistic-1.0 | GPL-1.0-or-later" -LIC_FILES_CHKSUM = "file://lib/Test/Deep.pm;beginline=1817;endline=1826;md5=a897a42bafc3422cab17c2eb94f87a7c" +LIC_FILES_CHKSUM = "file://lib/Test/Deep.pm;beginline=1817;endline=1826;md5=d3ed382cc19bae8ead6076df35a43cbf" SRC_URI = "${CPAN_MIRROR}/authors/id/R/RJ/RJBS/Test-Deep-${PV}.tar.gz" -SRC_URI[md5sum] = "d466e471108f7f7a5df3802cb13761ac" -SRC_URI[sha256sum] = "4064f494f5f62587d0ae501ca439105821ee5846c687dc6503233f55300a7c56" +SRC_URI[sha256sum] = "b6591f6ccdd853c7efc9ff3c5756370403211cffe46047f082b1cd1611a84e5f" UPSTREAM_CHECK_REGEX = "Test\-Deep\-(?P<pver>(\d+\.\d+))(?!_\d+).tar" diff --git a/meta-python/README b/meta-python/README.md index 36c193957c..36c193957c 100644 --- a/meta-python/README +++ b/meta-python/README.md diff --git a/meta-python/classes/python_mesonpy.bbclass b/meta-python/classes/python_mesonpy.bbclass new file mode 100644 index 0000000000..131fa74bed --- /dev/null +++ b/meta-python/classes/python_mesonpy.bbclass @@ -0,0 +1,52 @@ +# +# Copyright OpenEmbedded Contributors +# +# SPDX-License-Identifier: MIT +# + +inherit meson setuptools3-base python3targetconfig python_pep517 + +# meson_do_qa_configure does the wrong thing here because +# mesonpy runs "meson setup ..." in do_compile context. +# Make it a dummy function. +meson_do_qa_configure () { + : +} + +# This prevents the meson error: +# ERROR: Got argument buildtype as both -Dbuildtype and --buildtype. Pick one. +MESONOPTS:remove = "--buildtype ${MESON_BUILDTYPE}" + +CONFIGURE_FILES = "pyproject.toml" + +DEPENDS += "python3-wheel-native python3-meson-python-native" + +def mesonpy_get_args(d): + vars = ['MESONOPTS', 'MESON_CROSS_FILE', 'EXTRA_OEMESON'] + varlist = [] + for var in vars: + value = d.getVar(var) + vallist = value.split() + for elem in vallist: + varlist.append("-Csetup-args=" + elem) + return ' '.join(varlist) + +PEP517_BUILD_OPTS = "-Cbuilddir='${B}' ${@mesonpy_get_args(d)}" + +# Python pyx -> c -> so build leaves absolute build paths in the code +INSANE_SKIP:${PN} += "buildpaths" +INSANE_SKIP:${PN}-src += "buildpaths" + +python_mesonpy_do_configure () { + python_pep517_do_configure +} + +python_mesonpy_do_compile () { + python_pep517_do_compile +} + +python_mesonpy_do_install () { + python_pep517_do_install +} + +EXPORT_FUNCTIONS do_configure do_compile do_install diff --git a/meta-python/conf/include/ptest-packagelists-meta-python.inc b/meta-python/conf/include/ptest-packagelists-meta-python.inc new file mode 100644 index 0000000000..c4a752ae61 --- /dev/null +++ b/meta-python/conf/include/ptest-packagelists-meta-python.inc @@ -0,0 +1,86 @@ +# +# Lists of the ptest in meta-python, sorted into two sets by the time they take +# Please keep these sorted in alphabetical order +# +# A first pass at getting all meta-python recipes which inherit ptest +# meta_python_ptest_recipes=$(bitbake-layers show-recipes --recipes-only --layer meta-python --inherits ptest --bare | tr '\n' ' ' | pcregrep -o1 '^NOTE:.+===(.+)$') +# +# ptests which take less than ~30s each +PTESTS_FAST_META_PYTHON = "\ + python3-ansicolors \ + python3-asgiref \ + python3-aspectlib \ + python3-blinker \ + python3-cachetools \ + python3-cbor2 \ + python3-click \ + python3-dominate \ + python3-execnet \ + python3-geojson \ + python3-html2text \ + python3-inflection \ + python3-intervals \ + python3-ipy \ + python3-iso3166 \ + python3-parse-type \ + python3-platformdirs \ + python3-polyline \ + python3-precise-runner \ + python3-prettytable \ + python3-pylint \ + python3-ptyprocess \ + python3-pyasn1-modules \ + python3-pyroute2 \ + python3-pyserial \ + python3-pytoml \ + python3-requests-file \ + python3-requests-toolbelt \ + python3-semver \ + python3-serpent \ + python3-simpleeval \ + python3-smpplib \ + python3-soupsieve \ + python3-sqlparse \ + python3-tomlkit \ + python3-u-msgpack-python \ + python3-unidiff \ + python3-uritemplate \ + python3-xmltodict \ + python3-xxhash \ +" + +PTESTS_SLOW_META_PYTHON = "\ + python3-lz4 \ +" + +PTESTS_PROBLEMS_META_PYTHON ="\ + python3-appdirs \ + python3-betamax \ + python3-dnspython \ + python3-fastjsonschema \ + python3-gpiod \ + python3-gunicorn \ + python3-inotify \ + python3-jdcal \ + python3-jsmin \ + python3-license-expression \ + python3-msgpack \ + python3-multidict \ + python3-ordered-set \ + python3-parse \ + python3-pillow \ + python3-pint \ + python3-py-cpuinfo \ + python3-pytest-lazy-fixture \ + python3-pytest-mock \ + python3-pyzmq \ + python3-scrypt \ + python3-service-identity \ + python3-trustme \ + python3-typeguard \ + python3-whoosh \ + python3-ujson \ + python3-xlrd \ + python3-yappi \ + python3-yarl \ +" diff --git a/meta-python/recipes-connectivity/python-gsocketpool/python3-gsocketpool_0.1.6.bb b/meta-python/recipes-connectivity/python-gsocketpool/python3-gsocketpool_0.1.6.bb index a5581c252b..60ac18155f 100644 --- a/meta-python/recipes-connectivity/python-gsocketpool/python3-gsocketpool_0.1.6.bb +++ b/meta-python/recipes-connectivity/python-gsocketpool/python3-gsocketpool_0.1.6.bb @@ -3,8 +3,11 @@ DESCRIPTION = "creates a pool of connections that can be used with gevent" HOMEPAGE = "https://github.com/studio-ousia/gsocketpool" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=4ba825394aec026b5f94edca44426859" -DEPENDS += "${PYTHON_PN}-gevent" -RDEPENDS:${PN} += "${PYTHON_PN}-gevent" + +RDEPENDS:${PN} += " \ + python3-gevent \ + python3-logging \ +" SRC_URI[md5sum] = "49f5f292ef1b60944ae92ca426a5e550" SRC_URI[sha256sum] = "f2e2749aceadce6b27ca52e2b0a64af99797746a8681e1a2963f72007c14cb14" diff --git a/meta-python/recipes-connectivity/python-hpack/python3-hpack_4.0.0.bb b/meta-python/recipes-connectivity/python-hpack/python3-hpack_4.0.0.bb index afba98e4b3..0297cb8c27 100644 --- a/meta-python/recipes-connectivity/python-hpack/python3-hpack_4.0.0.bb +++ b/meta-python/recipes-connectivity/python-hpack/python3-hpack_4.0.0.bb @@ -8,3 +8,5 @@ SRC_URI[md5sum] = "27e01514ef06dc9fa0798d3dcb7de47c" SRC_URI[sha256sum] = "fc41de0c63e687ebffde81187a948221294896f6bdc0ae2312708df339430095" inherit pypi setuptools3 + +RDEPENDS:${PN} += "python3-logging" diff --git a/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.16.0.bb b/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.16.0.bb index 6eb896d1d2..9bb3053885 100644 --- a/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.16.0.bb +++ b/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.16.0.bb @@ -10,10 +10,11 @@ inherit pypi setuptools3 PYPI_SRC_URI:append = ";downloadfilename=${BP}.${PYPI_PACKAGE_EXT}" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-stringold \ - ${PYTHON_PN}-threading \ + python3-logging \ + python3-scons \ + python3-six \ + python3-stringold \ + python3-threading \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-connectivity/python-txws/python3-txws_0.9.1.bb b/meta-python/recipes-connectivity/python-txws/python3-txws_0.9.1.bb index c075e42700..ef6375546e 100644 --- a/meta-python/recipes-connectivity/python-txws/python3-txws_0.9.1.bb +++ b/meta-python/recipes-connectivity/python-txws/python3-txws_0.9.1.bb @@ -6,6 +6,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=76699830db7fa9e897f6a1ad05f98ec8" DEPENDS = "python3-twisted python3-six python3-vcversioner python3-six-native python3-vcversioner-native" +RDEPENDS:${PN} += " \ + python3-six \ + python3-twisted \ +" + SRC_URI = "git://github.com/MostAwesomeDude/txWS.git;branch=master;protocol=https" SRCREV= "88cf6d9b9b685ffa1720644bd53c742afb10a414" diff --git a/meta-python/recipes-connectivity/telepathy/telepathy-python3-0.15.19/remove_duplicate_install.patch b/meta-python/recipes-connectivity/telepathy/telepathy-python3-0.15.19/remove_duplicate_install.patch index df95a4c138..04d2da8ef2 100644 --- a/meta-python/recipes-connectivity/telepathy/telepathy-python3-0.15.19/remove_duplicate_install.patch +++ b/meta-python/recipes-connectivity/telepathy/telepathy-python3-0.15.19/remove_duplicate_install.patch @@ -2,14 +2,14 @@ commit f6c67662145de889055a86a6b3b12c70a45fc8d5 Author: Dongxiao Xu <dongxiao.xu@intel.com> Date: Wed Sep 7 16:02:20 2011 +0800 - Avoid duplicated installation of errors.py +Avoid duplicated installation of errors.py - newer version of autotools don't seem to like listing files to install - twice. Remove one errors.py from the installation list. +newer version of autotools don't seem to like listing files to install +twice. Remove one errors.py from the installation list. - Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> +Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> - Upstream-Status: Inappropirate [upstream inactive] +Upstream-Status: Inappropriate [upstream inactive] diff --git a/src/Makefile.am b/src/Makefile.am index 5c27dfe..7536e43 100644 diff --git a/meta-python/recipes-connectivity/telepathy/telepathy-python3-0.15.19/telepathy-python_fix_for_automake_1.12.patch b/meta-python/recipes-connectivity/telepathy/telepathy-python3-0.15.19/telepathy-python_fix_for_automake_1.12.patch index f613fdce4d..0498f3ddd0 100644 --- a/meta-python/recipes-connectivity/telepathy/telepathy-python3-0.15.19/telepathy-python_fix_for_automake_1.12.patch +++ b/meta-python/recipes-connectivity/telepathy/telepathy-python3-0.15.19/telepathy-python_fix_for_automake_1.12.patch @@ -9,7 +9,7 @@ of warning-errors. | make[1]: Leaving directory `/srv/home/nitin/builds2/build0/tmp/work/i586-poky-linux/telepathy-python-0.15.19-r4/telepathy-python-0.15.19/src' | make: *** [all-recursive] Error 1 -Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> +Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 2012/07/10 Index: telepathy-python-0.15.19/src/Makefile.am =================================================================== diff --git a/meta-python/recipes-core/images/meta-python-ptest-all-image.bb b/meta-python/recipes-core/images/meta-python-ptest-all-image.bb new file mode 100644 index 0000000000..fd4dc42487 --- /dev/null +++ b/meta-python/recipes-core/images/meta-python-ptest-all-image.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Recipe to trigger execution of all meta-python ptest images." +HOMEPAGE = "https://www.openembedded.org/" + +LICENSE = "MIT" + +inherit features_check nopackages +REQUIRED_DISTRO_FEATURES = "ptest" + +require conf/include/ptest-packagelists-meta-python.inc + +# Include the full set of ptests +PTESTS_META_PYTHON = "${PTESTS_FAST_META_PYTHON} ${PTESTS_SLOW_META_PYTHON}" + +do_testimage[noexec] = "1" +do_testimage[depends] = "${@' '.join(['meta-python-ptest-image-'+x+':do_testimage' for x in d.getVar('PTESTS_META_PYTHON').split()])}" + +do_build[depends] = "${@' '.join(['meta-python-ptest-image-'+x+':do_build' for x in d.getVar('PTESTS_META_PYTHON').split()])}" + +# normally image.bbclass would do this +EXCLUDE_FROM_WORLD = "1" + +python () { + if bb.utils.contains('IMAGE_CLASSES', 'testimage', True, False, d): + bb.build.addtask("do_testimage", "", "", d) +} diff --git a/meta-python/recipes-core/images/meta-python-ptest-fast-image.bb b/meta-python/recipes-core/images/meta-python-ptest-fast-image.bb new file mode 100644 index 0000000000..4f93a15959 --- /dev/null +++ b/meta-python/recipes-core/images/meta-python-ptest-fast-image.bb @@ -0,0 +1,6 @@ +require meta-python-ptest-all-image.bb + +DESCRIPTION = "Recipe to trigger execution of all fast meta-python ptest images." + +PTESTS_META_PYTHON = "${PTESTS_FAST_META_PYTHON}" + diff --git a/meta-python/recipes-core/images/meta-python-ptest-image.bb b/meta-python/recipes-core/images/meta-python-ptest-image.bb index d497016d41..a649cbb94c 100644 --- a/meta-python/recipes-core/images/meta-python-ptest-image.bb +++ b/meta-python/recipes-core/images/meta-python-ptest-image.bb @@ -1,5 +1,41 @@ +inherit features_check +REQUIRED_DISTRO_FEATURES = "ptest" + +require conf/include/ptest-packagelists-meta-python.inc + require meta-python-image-base.bb SUMMARY = "meta-python ptest test image" -IMAGE_INSTALL += "packagegroup-meta-python3-ptest" +DESCRIPTION += "Also including the ${MCNAME} ptest package." +HOMEPAGE = "https://www.openembedded.org/" + +PTESTS_META_PYTHON = "${PTESTS_SLOW_META_PYTHON} ${PTESTS_FAST_META_PYTHON}" + +IMAGE_INSTALL:append = " ${MCNAME}-ptest openssh" + +BBCLASSEXTEND = "${@' '.join(['mcextend:'+x for x in d.getVar('PTESTS_META_PYTHON').split()])}" + +# The image can be sufficiently large (~1.8GB) that we need to be careful that it fits in a live +# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the +# box) and explicitly add up to 1500MB. +IMAGE_OVERHEAD_FACTOR = "1.0" +IMAGE_ROOTFS_EXTRA_SPACE = "324288" +# If a particular ptest needs more space, it can be customized: +#IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend-<pn> = "1024288" + +# ptests need more memory than standard to avoid the OOM killer +QB_MEM = "-m 1024" +# If a particular ptest needs more memory, it can be customized: +#QB_MEM:virtclass-mcextend-<pn> = "-m 4096" + +TEST_SUITES = "ping ssh parselogs ptest" + +# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places +PTEST_EXPECT_FAILURE = "1" + +python () { + if not d.getVar("MCNAME"): + raise bb.parse.SkipRecipe("No class extension set") +} + diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb index 2275ccd6c5..9500f80e03 100644 --- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb @@ -137,7 +137,6 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-flask-nav \ python3-flask-pymongo \ python3-flask-restful \ - python3-flask-script \ python3-flask-sijax \ python3-flask-socketio \ python3-flask-sqlalchemy \ @@ -157,6 +156,7 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-gmqtt \ python3-gnupg \ python3-google-api-python-client \ + python3-gpiod \ python3-gpsd-py3 \ python3-graphviz \ python3-greenlet \ @@ -313,8 +313,6 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-pycodestyle \ python3-pyconnman \ python3-pycurl \ - python3-pydbus \ - python3-pydbus-manager \ python3-pydicti \ python3-pyephem \ python3-pyexpect \ @@ -393,6 +391,7 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-send2trash \ python3-sentry-sdk \ python3-serpent \ + python3-service-identity \ python3-setuptools-declarative-requirements \ python3-setuptools-scm-git-archive \ python3-sh \ @@ -430,6 +429,7 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-trafaret-config \ python3-traitlets \ python3-transitions \ + python3-trustme \ python3-twine \ python3-twisted \ python3-twitter \ @@ -446,6 +446,7 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-unidiff \ python3-uritemplate \ python3-vcversioner \ + python3-versioneer \ python3-versiontools \ python3-visitor \ python3-waitress \ diff --git a/meta-python/recipes-devtools/gyp/gyp/0001-Fix-for-Python-3.10-compatibility.patch b/meta-python/recipes-devtools/gyp/gyp/0001-Fix-for-Python-3.10-compatibility.patch index 1848654404..d1ac2c6b42 100644 --- a/meta-python/recipes-devtools/gyp/gyp/0001-Fix-for-Python-3.10-compatibility.patch +++ b/meta-python/recipes-devtools/gyp/gyp/0001-Fix-for-Python-3.10-compatibility.patch @@ -7,6 +7,8 @@ The collections.abc module replaces collections for Python 3.10 Signed-off-by: Kurt Kiefer <kurt.kiefer@arthrex.com> --- +Upstream-Status: Pending + pylib/gyp/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-python/recipes-devtools/python/pamela_1.0.0.bb b/meta-python/recipes-devtools/python/pamela_1.0.0.bb deleted file mode 100644 index 369ed78ca7..0000000000 --- a/meta-python/recipes-devtools/python/pamela_1.0.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Pamela: yet another Python wrapper for PAM" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=3f9b78307cdde4e6a4976bfd82a0e7f3" - -SRC_URI[md5sum] = "5fc14f5275383ed8bdd509007af0323d" -SRC_URI[sha256sum] = "65c9389bef7d1bb0b168813b6be21964df32016923aac7515bdf05366acbab6c" - -PYPI_PACKAGE = "pamela" - -inherit pypi setuptools3 - -RDEPENDS:${PN} = "libpam" - -inherit features_check -REQUIRED_DISTRO_FEATURES = "pam" diff --git a/meta-python/recipes-devtools/python/pamela_1.1.0.bb b/meta-python/recipes-devtools/python/pamela_1.1.0.bb new file mode 100644 index 0000000000..3573de551d --- /dev/null +++ b/meta-python/recipes-devtools/python/pamela_1.1.0.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Pamela: yet another Python wrapper for PAM" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=6b706db92112b8384848de3e5c6adaa3" + +SRC_URI[sha256sum] = "d4b139fe600e192e176a2a368059207a6bffa0e7879879b13f4fcba0163481be" + +PYPI_PACKAGE = "pamela" + +inherit pypi setuptools3 + +RDEPENDS:${PN} = "libpam" + +inherit features_check +REQUIRED_DISTRO_FEATURES = "pam" diff --git a/meta-python/recipes-devtools/python/python-daemon/0001-Workaround-for-issue-2-1.patch b/meta-python/recipes-devtools/python/python-daemon/0001-Workaround-for-issue-2-1.patch deleted file mode 100644 index dbb8407186..0000000000 --- a/meta-python/recipes-devtools/python/python-daemon/0001-Workaround-for-issue-2-1.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0981eee9f0198c2045dc0eaa78a005d06fc7bfe4 Mon Sep 17 00:00:00 2001 -From: Carlos Eduardo Moreira dos Santos <cems@cemshost.com.br> -Date: Tue, 28 Mar 2017 18:23:44 -0300 -Subject: [PATCH] Workaround for issue 2 [1] - -[1] https://pagure.io/python-daemon/issue/2 ---- - version.py | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/version.py b/version.py -index d58422a377ee..293e2d64c2b7 100644 ---- a/version.py -+++ b/version.py -@@ -648,9 +648,10 @@ class ChangelogAwareDistribution(distutils.dist.Distribution, object): - - @lru_cache(maxsize=128) - def get_version_info(self): -- changelog_path = get_changelog_path(self) -- version_info = generate_version_info_from_changelog(changelog_path) -- return version_info -+ return { -+ 'version': '2.1.2', -+ 'maintainer': 'Ben Finney' -+ } - - def get_version(self): - version_info = self.get_version_info() --- -2.7.4 - diff --git a/meta-python/recipes-devtools/python/python-flask-script.inc b/meta-python/recipes-devtools/python/python-flask-script.inc deleted file mode 100644 index 3a7adb32ca..0000000000 --- a/meta-python/recipes-devtools/python/python-flask-script.inc +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Scripting support for flask" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e686048adb69341fc8a08caeda528b41" - -SRC_URI[md5sum] = "3fbd91fe13cebedfb2431331f6eabb68" -SRC_URI[sha256sum] = "6425963d91054cfcc185807141c7314a9c5ad46325911bd24dcb489bd0161c65" - -PYPI_PACKAGE = "Flask-Script" - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-flask \ - " diff --git a/meta-python/recipes-devtools/python/python-flask-sijax.inc b/meta-python/recipes-devtools/python/python-flask-sijax.inc index 4264f8f6d5..239c843fce 100644 --- a/meta-python/recipes-devtools/python/python-flask-sijax.inc +++ b/meta-python/recipes-devtools/python/python-flask-sijax.inc @@ -5,4 +5,8 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=266adc7b911b7c84b837bf77196e1ba6" PYPI_PACKAGE = "Flask-Sijax" -RDEPENDS:${PN} = "${PYTHON_PN}-sijax"
\ No newline at end of file +RDEPENDS:${PN} += " \ + python3-flask \ + python3-sijax \ + python3-werkzeug \ +" diff --git a/meta-python/recipes-devtools/python/python-flask-xstatic/remove-pip-requires.patch b/meta-python/recipes-devtools/python/python-flask-xstatic/remove-pip-requires.patch index a2d620ad06..ba06d670e3 100644 --- a/meta-python/recipes-devtools/python/python-flask-xstatic/remove-pip-requires.patch +++ b/meta-python/recipes-devtools/python/python-flask-xstatic/remove-pip-requires.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- Flask-XStatic-0.0.1/setup.py.orig 2015-01-30 08:01:56.000000000 -0800 +++ Flask-XStatic-0.0.1/setup.py 2017-04-17 21:40:32.570181626 -0700 @@ -1,4 +1,3 @@ diff --git a/meta-python/recipes-devtools/python/python-idna-ssl.inc b/meta-python/recipes-devtools/python/python-idna-ssl.inc index e74bbd7c65..356a3873ee 100644 --- a/meta-python/recipes-devtools/python/python-idna-ssl.inc +++ b/meta-python/recipes-devtools/python/python-idna-ssl.inc @@ -8,3 +8,8 @@ SRC_URI[sha256sum] = "a933e3bb13da54383f9e8f35dc4f9cb9eb9b3b78c6b36f311254d6d0d9 PYPI_PACKAGE = "idna-ssl" inherit pypi + +RDEPENDS:${PN} += " \ + python3-idna \ + python3-io \ +" diff --git a/meta-python/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch b/meta-python/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch deleted file mode 100644 index 2575306bec..0000000000 --- a/meta-python/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 07d4f095a9e22ae676a8d68073101131e65012dc Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Tue, 15 Nov 2011 13:16:54 +0100 -Subject: [PATCH] python imaging setup.py: force paths for zlib, freetype and jpeg and don't add host paths - -Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> - -Upstream-Status: Inappropriate [embedded specific] ---- - setup.py | 14 +++----------- - 1 files changed, 3 insertions(+), 11 deletions(-) - -diff --git a/setup.py b/setup.py -index 5d4d53a..b1a22ec 100644 ---- a/setup.py -+++ b/setup.py -@@ -34,10 +34,10 @@ def libinclude(root): - # TIFF_ROOT = libinclude("/opt/tiff") - - TCL_ROOT = None --JPEG_ROOT = None --ZLIB_ROOT = None -+JPEG_ROOT = os.environ['STAGING_LIBDIR'] -+ZLIB_ROOT = os.environ['STAGING_LIBDIR'] - TIFF_ROOT = None --FREETYPE_ROOT = None -+FREETYPE_ROOT = os.environ['STAGING_LIBDIR'], os.environ['STAGING_INCDIR'] - LCMS_ROOT = None - - # FIXME: add mechanism to explicitly *disable* the use of a library -@@ -147,7 +147,6 @@ class pil_build_ext(build_ext): - add_directory(library_dirs, "/opt/local/lib") - add_directory(include_dirs, "/opt/local/include") - -- add_directory(library_dirs, "/usr/local/lib") - # FIXME: check /opt/stuff directories here? - - prefix = sysconfig.get_config_var("prefix") -@@ -207,13 +206,6 @@ class pil_build_ext(build_ext): - if os.path.isfile(os.path.join(tcl_dir, "tk.h")): - add_directory(include_dirs, tcl_dir) - -- # standard locations -- add_directory(library_dirs, "/usr/local/lib") -- add_directory(include_dirs, "/usr/local/include") -- -- add_directory(library_dirs, "/usr/lib") -- add_directory(include_dirs, "/usr/include") -- - # - # insert new dirs *before* default libs, to avoid conflicts - # between Python PYD stub libs and real libraries --- -1.7.2.5 - diff --git a/meta-python/recipes-devtools/python/python-imaging/allow.to.disable.some.features.patch b/meta-python/recipes-devtools/python/python-imaging/allow.to.disable.some.features.patch deleted file mode 100644 index 4960ed4661..0000000000 --- a/meta-python/recipes-devtools/python/python-imaging/allow.to.disable.some.features.patch +++ /dev/null @@ -1,65 +0,0 @@ -At least lcms wasn't deterministicly detected from sysroot. - -This will allow to export LCMS_ENABLED=False when lcms isn't in PACKAGECONFIG. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> - -diff -uNr Imaging-1.1.7.orig/setup.py Imaging-1.1.7/setup.py ---- Imaging-1.1.7.orig/setup.py 2013-07-22 10:17:02.081457075 +0200 -+++ Imaging-1.1.7/setup.py 2013-07-22 13:10:09.029707492 +0200 -@@ -39,6 +39,12 @@ - TIFF_ROOT = None - FREETYPE_ROOT = os.environ['STAGING_LIBDIR'], os.environ['STAGING_INCDIR'] - LCMS_ROOT = None -+TCL_ENABLED = os.getenv('TCL_ENABLED', "True") -+JPEG_ENABLED = os.getenv('JPEG_ENABLED', "True") -+ZLIB_ENABLED = os.getenv('ZLIB_ENABLED', "True") -+TIFF_ENABLED = os.getenv('TIFF_ENABLED', "True") -+FREETYPE_ENABLED = os.getenv('FREETYPE_ENABLED', "True") -+LCMS_ENABLED = os.getenv('LCMS_ENABLED', "True") - - # FIXME: add mechanism to explicitly *disable* the use of a library - -@@ -220,22 +226,22 @@ - zlib = jpeg = tiff = freetype = tcl = tk = lcms = None - feature = feature() - -- if find_include_file(self, "zlib.h"): -+ if ZLIB_ENABLED == 'True' and find_include_file(self, "zlib.h"): - if find_library_file(self, "z"): - feature.zlib = "z" - elif sys.platform == "win32" and find_library_file(self, "zlib"): - feature.zlib = "zlib" # alternative name - -- if find_include_file(self, "jpeglib.h"): -+ if JPEG_ENABLED == 'True' and find_include_file(self, "jpeglib.h"): - if find_library_file(self, "jpeg"): - feature.jpeg = "jpeg" - elif sys.platform == "win32" and find_library_file(self, "libjpeg"): - feature.jpeg = "libjpeg" # alternative name - -- if find_library_file(self, "tiff"): -+ if TIFF_ENABLED == 'True' and find_library_file(self, "tiff"): - feature.tiff = "tiff" - -- if find_library_file(self, "freetype"): -+ if FREETYPE_ENABLED == 'True' and find_library_file(self, "freetype"): - # look for freetype2 include files - freetype_version = 0 - for dir in self.compiler.include_dirs: -@@ -256,11 +262,11 @@ - if dir: - add_directory(self.compiler.include_dirs, dir, 0) - -- if find_include_file(self, "lcms.h"): -+ if LCMS_ENABLED == 'True' and find_include_file(self, "lcms.h"): - if find_library_file(self, "lcms"): - feature.lcms = "lcms" - -- if _tkinter and find_include_file(self, "tk.h"): -+ if TCL_ENABLED == 'True' and _tkinter and find_include_file(self, "tk.h"): - # the library names may vary somewhat (e.g. tcl84 or tcl8.4) - version = TCL_VERSION[0] + TCL_VERSION[2] - if find_library_file(self, "tcl" + version): diff --git a/meta-python/recipes-devtools/python/python-imaging/fix-freetype-includes.patch b/meta-python/recipes-devtools/python/python-imaging/fix-freetype-includes.patch deleted file mode 100644 index 9ecc63a0d6..0000000000 --- a/meta-python/recipes-devtools/python/python-imaging/fix-freetype-includes.patch +++ /dev/null @@ -1,30 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From c6040f618d8f2706a7b46d1cdf37d1a587f9701f Mon Sep 17 00:00:00 2001 -From: Andrew Stromnov <stromnov@gmail.com> -Date: Thu, 28 Nov 2013 16:58:43 +0400 -Subject: [PATCH] fix compiling with FreeType 2.5.1 - ---- - _imagingft.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/_imagingft.c b/_imagingft.c -index 47d50bd..f19555b 100644 ---- a/_imagingft.c -+++ b/_imagingft.c -@@ -59,7 +59,11 @@ struct { - const char* message; - } ft_errors[] = - -+#if defined(USE_FREETYPE_2_1) -+#include FT_ERRORS_H -+#else - #include <freetype/fterrors.h> -+#endif - - /* -------------------------------------------------------------------- */ - /* font objects */ --- -1.8.5.1 diff --git a/meta-python/recipes-devtools/python/python-imaging/python-imaging-CVE-2016-2533.patch b/meta-python/recipes-devtools/python/python-imaging/python-imaging-CVE-2016-2533.patch deleted file mode 100644 index b01136f9ac..0000000000 --- a/meta-python/recipes-devtools/python/python-imaging/python-imaging-CVE-2016-2533.patch +++ /dev/null @@ -1,38 +0,0 @@ -python-imaging: CVE-2016-2533 - -the patch comes from: -https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-2533 -https://github.com/python-pillow/Pillow/commit/ae453aa18b66af54e7ff716f4ccb33adca60afd4#diff-8ff6909c159597e22288ad818938fd6b - -PCD decoder overruns the shuffle buffer, Fixes #568 - -Signed-off-by: Li Wang <li.wang@windriver.com> ---- - libImaging/PcdDecode.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libImaging/PcdDecode.c b/libImaging/PcdDecode.c -index b6898e3..c02d005 100644 ---- a/libImaging/PcdDecode.c -+++ b/libImaging/PcdDecode.c -@@ -47,7 +47,7 @@ ImagingPcdDecode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes) - out[0] = ptr[x]; - out[1] = ptr[(x+4*state->xsize)/2]; - out[2] = ptr[(x+5*state->xsize)/2]; -- out += 4; -+ out += 3; - } - - state->shuffle((UINT8*) im->image[state->y], -@@ -62,7 +62,7 @@ ImagingPcdDecode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes) - out[0] = ptr[x+state->xsize]; - out[1] = ptr[(x+4*state->xsize)/2]; - out[2] = ptr[(x+5*state->xsize)/2]; -- out += 4; -+ out += 3; - } - - state->shuffle((UINT8*) im->image[state->y], --- -1.7.9.5 - diff --git a/meta-python/recipes-devtools/python/python-imaging/remove-host-libdir.patch b/meta-python/recipes-devtools/python/python-imaging/remove-host-libdir.patch deleted file mode 100644 index 028a51ad59..0000000000 --- a/meta-python/recipes-devtools/python/python-imaging/remove-host-libdir.patch +++ /dev/null @@ -1,25 +0,0 @@ -Avoid getting host sysroot paths in the library paths to fix issue like: - -| /home/andrei/work/yocto/build-rpi-master/tmp/sysroots/x86_64-linux/usr/lib/libz.so: file not recognized: File format not recognized - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> - - -Index: Imaging-1.1.7/setup.py -=================================================================== ---- Imaging-1.1.7.orig/setup.py -+++ Imaging-1.1.7/setup.py -@@ -155,11 +155,6 @@ class pil_build_ext(build_ext): - - # FIXME: check /opt/stuff directories here? - -- prefix = sysconfig.get_config_var("prefix") -- if prefix: -- add_directory(library_dirs, os.path.join(prefix, "lib")) -- add_directory(include_dirs, os.path.join(prefix, "include")) -- - # - # locate tkinter libraries - diff --git a/meta-python/recipes-devtools/python/python-mccabe/0001-python-mccabe-remove-unnecessary-setup_requires-pyte.patch b/meta-python/recipes-devtools/python/python-mccabe/0001-python-mccabe-remove-unnecessary-setup_requires-pyte.patch deleted file mode 100644 index 941bed3d73..0000000000 --- a/meta-python/recipes-devtools/python/python-mccabe/0001-python-mccabe-remove-unnecessary-setup_requires-pyte.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3484bdfa7adbaebcf8bb8e7d4820f64b12717932 Mon Sep 17 00:00:00 2001 -From: Mingli Yu <mingli.yu@windriver.com> -Date: Fri, 29 Jul 2016 15:37:18 +0800 -Subject: [PATCH] python-mccabe: remove unnecessary setup_requires - pytest-runner - -* Remove setup_requires pytest-runner as the - setup_requires pytest-runner actually is not - used for pytest which only in do_compile phase - via setup.py build - -Upstream-Status: Pending - -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - setup.py | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/setup.py b/setup.py -index e59903d..bf2aaba 100644 ---- a/setup.py -+++ b/setup.py -@@ -33,7 +33,6 @@ setup( - license='Expat license', - py_modules=['mccabe'], - zip_safe=False, -- setup_requires=['pytest-runner'], - tests_require=['pytest'], - entry_points={ - 'flake8.extension': [ --- -2.8.1 - diff --git a/meta-python/recipes-devtools/python/python-numeric/0001-it-tries-to-define-this-function-differently-than-it.patch b/meta-python/recipes-devtools/python/python-numeric/0001-it-tries-to-define-this-function-differently-than-it.patch deleted file mode 100644 index 81ed744cbd..0000000000 --- a/meta-python/recipes-devtools/python/python-numeric/0001-it-tries-to-define-this-function-differently-than-it.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 322e781c67d7a78fc2cfc3d377f50b825fc64abb Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 2 Jun 2017 20:21:01 -0700 -Subject: [PATCH] it tries to define this function differently than it is - defined in sys/time.h. - -Use the definition from system - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - Packages/RNG/Src/ranf.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/Packages/RNG/Src/ranf.c b/Packages/RNG/Src/ranf.c -index 5ca7dc5..e669fa8 100644 ---- a/Packages/RNG/Src/ranf.c -+++ b/Packages/RNG/Src/ranf.c -@@ -149,9 +149,6 @@ void Mixranf(int *s,u32 s48[2]) - #else - struct timeval tv; - struct timezone tz; --#if !defined(__sgi) -- int gettimeofday(struct timeval *, struct timezone *); --#endif - - (void)gettimeofday(&tv,&tz); - s48[0] = (u32)tv.tv_sec; --- -2.13.0 - diff --git a/meta-python/recipes-devtools/python/python-pygpgme/0001-reflect-2.1-reporting-for-key-imports.patch b/meta-python/recipes-devtools/python/python-pygpgme/0001-reflect-2.1-reporting-for-key-imports.patch deleted file mode 100644 index 1f31cb805e..0000000000 --- a/meta-python/recipes-devtools/python/python-pygpgme/0001-reflect-2.1-reporting-for-key-imports.patch +++ /dev/null @@ -1,90 +0,0 @@ -From ed44474c11f577c1644910964a917a4cf701bb0f Mon Sep 17 00:00:00 2001 -From: Daniel Kahn Gillmor <dkg@fifthhorseman.net> -Date: Tue, 26 Jan 2016 14:24:26 -0500 -Subject: [PATCH] reflect 2.1 reporting for key imports - -GnuPG 2.1 changes how it reports key imports. These changes should -make the pygpgme test suite compatible with GnuPG 2.1. - -See also: -https://lists.gnupg.org/pipermail/gnupg-devel/2016-January/030718.html - -Upstream-Status: Backport - -Signed-off-by: Catalin Enache <catalin.enache@windriver.com> - ---- - tests/test_import.py | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - -diff --git a/tests/test_import.py b/tests/test_import.py -index 10eb816..597eb47 100644 ---- a/tests/test_import.py -+++ b/tests/test_import.py -@@ -55,7 +55,7 @@ class ImportTestCase(GpgHomeTestCase): - ctx = gpgme.Context() - with self.keyfile('key1.sec') as fp: - result = ctx.import_(fp) -- self.assertEqual(result.considered, 1) -+ self.assertEqual(result.considered, 3) - self.assertEqual(result.no_user_id, 0) - self.assertEqual(result.imported, 1) - self.assertEqual(result.imported_rsa, 0) -@@ -64,18 +64,18 @@ class ImportTestCase(GpgHomeTestCase): - self.assertEqual(result.new_sub_keys, 0) - self.assertEqual(result.new_signatures, 0) - self.assertEqual(result.new_revocations, 0) -- self.assertEqual(result.secret_read, 1) -- self.assertEqual(result.secret_imported, 1) -+ self.assertEqual(result.secret_read, 3) -+ self.assertEqual(result.secret_imported, 2) - self.assertEqual(result.secret_unchanged, 0) - self.assertEqual(result.skipped_new_keys, 0) - self.assertEqual(result.not_imported, 0) - self.assertEqual(len(result.imports), 2) - self.assertEqual(result.imports[0], - ('E79A842DA34A1CA383F64A1546BB55F0885C65A4', -- None, gpgme.IMPORT_NEW | gpgme.IMPORT_SECRET)) -+ None, gpgme.IMPORT_NEW)) - self.assertEqual(result.imports[1], - ('E79A842DA34A1CA383F64A1546BB55F0885C65A4', -- None, gpgme.IMPORT_NEW)) -+ None, gpgme.IMPORT_NEW | gpgme.IMPORT_SECRET)) - # can we get the public key? - key = ctx.get_key('E79A842DA34A1CA383F64A1546BB55F0885C65A4') - # can we get the secret key? -@@ -102,17 +102,17 @@ class ImportTestCase(GpgHomeTestCase): - fp = BytesIO(b'\n'.join(keys)) - ctx = gpgme.Context() - result = ctx.import_(fp) -- self.assertEqual(result.considered, 3) -+ self.assertEqual(result.considered, 5) - self.assertEqual(result.no_user_id, 0) - self.assertEqual(result.imported, 2) -- self.assertEqual(result.imported_rsa, 1) -+ self.assertEqual(result.imported_rsa, 0) - self.assertEqual(result.unchanged, 0) - self.assertEqual(result.new_user_ids, 0) - self.assertEqual(result.new_sub_keys, 0) - self.assertEqual(result.new_signatures, 1) - self.assertEqual(result.new_revocations, 0) -- self.assertEqual(result.secret_read, 1) -- self.assertEqual(result.secret_imported, 1) -+ self.assertEqual(result.secret_read, 3) -+ self.assertEqual(result.secret_imported, 2) - self.assertEqual(result.secret_unchanged, 0) - self.assertEqual(result.skipped_new_keys, 0) - self.assertEqual(result.not_imported, 0) -@@ -122,10 +122,10 @@ class ImportTestCase(GpgHomeTestCase): - None, gpgme.IMPORT_NEW)) - self.assertEqual(result.imports[1], - ('E79A842DA34A1CA383F64A1546BB55F0885C65A4', -- None, gpgme.IMPORT_NEW | gpgme.IMPORT_SECRET)) -+ None, gpgme.IMPORT_SIG)) - self.assertEqual(result.imports[2], - ('E79A842DA34A1CA383F64A1546BB55F0885C65A4', -- None, gpgme.IMPORT_SIG)) -+ None, gpgme.IMPORT_NEW | gpgme.IMPORT_SECRET)) - self.assertEqual(result.imports[3], - ('93C2240D6B8AA10AB28F701D2CF46B7FC97E6B0F', - None, gpgme.IMPORT_NEW)) diff --git a/meta-python/recipes-devtools/python/python-pygpgme/0002-passphrase_cb-is-deprecated.patch b/meta-python/recipes-devtools/python/python-pygpgme/0002-passphrase_cb-is-deprecated.patch deleted file mode 100644 index c18cf3feba..0000000000 --- a/meta-python/recipes-devtools/python/python-pygpgme/0002-passphrase_cb-is-deprecated.patch +++ /dev/null @@ -1,52 +0,0 @@ -From ba0dc8273e4f83bcd2d43baa5910aae34b93048c Mon Sep 17 00:00:00 2001 -From: Daniel Kahn Gillmor <dkg@fifthhorseman.net> -Date: Mon, 1 Feb 2016 19:25:12 -0500 -Subject: [PATCH] passphrase_cb is deprecated - -https://bugs.gnupg.org/gnupg/issue767 indicates that -gpgme_set_passphrase_cb is a deprecated corner of the API and that -developers using gpgme should really rely on the gpg-agent to handle -this stuff. This should actually simplify things for most -installations -- just strip out all passphrase handling from your -application entirely, relying on gpg to figure out how to find the -agent, and relying on the agent figuring out how to prompt the user -(if necessary). - -However, if a developer really wants to use the passphrase callback -approach, they'll have to use loopback pinentry. This sets up the -test suite to be able to make those tests. - -Upstream-Status: Backport - -Signed-off-by: Catalin Enache <catalin.enache@windriver.com> - ---- - tests/util.py | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/tests/util.py b/tests/util.py -index cd803c2..86892ca 100644 ---- a/tests/util.py -+++ b/tests/util.py -@@ -28,7 +28,9 @@ keydir = os.path.join(os.path.dirname(__file__), 'keys') - - class GpgHomeTestCase(unittest.TestCase): - -- gpg_conf_contents = '' -+ gpg_conf_contents = 'pinentry-mode loopback' -+ gpg_agent_conf_contents = 'allow-loopback-pinentry' -+ - import_keys = [] - - def keyfile(self, key): -@@ -41,6 +43,10 @@ class GpgHomeTestCase(unittest.TestCase): - fp.write(self.gpg_conf_contents.encode('UTF-8')) - fp.close() - -+ fp = open(os.path.join(self._gpghome, 'gpg-agent.conf'), 'wb') -+ fp.write(self.gpg_agent_conf_contents.encode('UTF-8')) -+ fp.close() -+ - # import requested keys into the keyring - ctx = gpgme.Context() - for key in self.import_keys: diff --git a/meta-python/recipes-devtools/python/python-pygpgme/0003-handle-generic-error-when-no-passphrase-callback-pre.patch b/meta-python/recipes-devtools/python/python-pygpgme/0003-handle-generic-error-when-no-passphrase-callback-pre.patch deleted file mode 100644 index 6acb68bfe7..0000000000 --- a/meta-python/recipes-devtools/python/python-pygpgme/0003-handle-generic-error-when-no-passphrase-callback-pre.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 579b5930e15de8855bf63b3c20b6c3aaf894c3eb Mon Sep 17 00:00:00 2001 -From: Daniel Kahn Gillmor <dkg@fifthhorseman.net> -Date: Mon, 1 Feb 2016 19:27:59 -0500 -Subject: [PATCH] handle generic error when no passphrase callback present - -apparently gpg 2.1 returns ERR_GENERAL right now if the pinentry was -in loopback mode and no passphrase callback was supplied. Earlier -versions supplied ERR_BAD_PASSPHRASE. - -Upstream-Status: Backport - -Signed-off-by: Catalin Enache <catalin.enache@windriver.com> - ---- - tests/test_passphrase.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/test_passphrase.py b/tests/test_passphrase.py -index 0a235e9..35b3c59 100644 ---- a/tests/test_passphrase.py -+++ b/tests/test_passphrase.py -@@ -41,7 +41,7 @@ class PassphraseTestCase(GpgHomeTestCase): - new_sigs = ctx.sign(plaintext, signature, gpgme.SIG_MODE_CLEAR) - except gpgme.GpgmeError as exc: - self.assertEqual(exc.args[0], gpgme.ERR_SOURCE_GPGME) -- self.assertEqual(exc.args[1], gpgme.ERR_BAD_PASSPHRASE) -+ self.assertEqual(exc.args[1], gpgme.ERR_GENERAL) - else: - self.fail('gpgme.GpgmeError not raised') - diff --git a/meta-python/recipes-devtools/python/python-pygpgme/run-ptest b/meta-python/recipes-devtools/python/python-pygpgme/run-ptest deleted file mode 100644 index ce2abb66a5..0000000000 --- a/meta-python/recipes-devtools/python/python-pygpgme/run-ptest +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -GPG_AGENT_INFO= python test_all.py -v 2>&1 | sed -e '/\.\.\. ok/ s/^/PASS: /g' -e '/\.\.\. [ERROR|FAIL]/ s/^/FAIL: /g' -e '/\.\.\. skipped/ s/^/SKIP: /g' -e 's/ \.\.\. ok//g' -e 's/ \.\.\. ERROR//g' -e 's/ \.\.\. FAIL//g' -e 's/ \.\.\. skipped//g' diff --git a/meta-python/recipes-devtools/python/python-pyrex/pyrex-fix-optimized-mode.patch b/meta-python/recipes-devtools/python/python-pyrex/pyrex-fix-optimized-mode.patch deleted file mode 100644 index c58c3280e2..0000000000 --- a/meta-python/recipes-devtools/python/python-pyrex/pyrex-fix-optimized-mode.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Pending - -Index: Pyrex-0.9.8.4/Pyrex/Distutils/extension.py -=================================================================== ---- Pyrex-0.9.8.4.orig/Pyrex/Distutils/extension.py -+++ Pyrex-0.9.8.4/Pyrex/Distutils/extension.py -@@ -15,7 +15,7 @@ except ImportError: - warnings = None - - class Extension(_Extension.Extension): -- _Extension.Extension.__doc__ + \ -+ _Extension.Extension.__doc__ or "" + \ - """pyrex_include_dirs : [string] - list of directories to search for Pyrex header files (.pxd) (in - Unix form for portability) diff --git a/meta-python/recipes-devtools/python/python-systemd/0002-setup.py-switch-from-distutils-to-setuptools.patch b/meta-python/recipes-devtools/python/python-systemd/0002-setup.py-switch-from-distutils-to-setuptools.patch deleted file mode 100644 index b3180f29f2..0000000000 --- a/meta-python/recipes-devtools/python/python-systemd/0002-setup.py-switch-from-distutils-to-setuptools.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a681a79472df85cdc8c052bc61fb8b9e7b9a6495 Mon Sep 17 00:00:00 2001 -From: Tim Orling <tim.orling@konsulko.com> -Date: Sun, 27 Feb 2022 11:50:36 -0800 -Subject: [PATCH] setup.py: switch from distutils to setuptools - -In Python 3.10, distutils is deprecated and slated for removal in Python -3.12. It also prevents 'setup.py bdist_wheel' from building a wheel. - -Upstream-Status: Submitted -[https://github.com/systemd/python-systemd/pull/103] - -Signed-off-by: Tim Orling <tim.orling@konsulko.com> ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 099819b..fe9c03a 100644 ---- a/setup.py -+++ b/setup.py -@@ -1,5 +1,5 @@ - import sys, os --from distutils.core import setup, Extension -+from setuptools import setup, Extension - from subprocess import Popen, PIPE, check_output - - def call(*cmd): --- -2.30.2 - diff --git a/meta-python/recipes-devtools/python/python-systemd/endian.patch b/meta-python/recipes-devtools/python/python-systemd/endian.patch deleted file mode 100644 index e09aea7336..0000000000 --- a/meta-python/recipes-devtools/python/python-systemd/endian.patch +++ /dev/null @@ -1,14 +0,0 @@ -Include endian.h for missing definitions of htobe16 - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- a/systemd/util.c -+++ b/systemd/util.c -@@ -28,6 +28,7 @@ - #include <stdbool.h> - #include <assert.h> - #include <errno.h> -+#include <endian.h> - #include <fcntl.h> - #include <unistd.h> - #include <net/if.h> diff --git a/meta-python/recipes-devtools/python/python3-aenum_3.1.11.bb b/meta-python/recipes-devtools/python/python3-aenum_3.1.15.bb index b2fba6f010..f9fdb6aeb6 100644 --- a/meta-python/recipes-devtools/python/python3-aenum_3.1.11.bb +++ b/meta-python/recipes-devtools/python/python3-aenum_3.1.15.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://pypi.org/project/aenum/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://aenum/LICENSE;md5=c6a85477543f8b8591b9c1f82abebbe9" -SRC_URI[sha256sum] = "aed2c273547ae72a0d5ee869719c02a643da16bf507c80958faadc7e038e3f73" +SRC_URI[sha256sum] = "8cbd76cd18c4f870ff39b24284d3ea028fbe8731a58df3aa581e434c575b9559" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-aiofiles_22.1.0.bb b/meta-python/recipes-devtools/python/python3-aiofiles_23.1.0.bb index 40ac76efd5..c06f09fb6a 100644 --- a/meta-python/recipes-devtools/python/python3-aiofiles_22.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-aiofiles_23.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] = "9107f1ca0b2a5553987a94a3c9959fe5b491fdf731389aa5b7b1bd0733e32de6" +SRC_URI[sha256sum] = "edd247df9a19e0db16534d4baaf536d6609a43e1de5401d7a4c1c148753a1635" PYPI_PACKAGE = "aiofiles" diff --git a/meta-python/recipes-devtools/python/python3-aiohttp-jinja2_1.5.bb b/meta-python/recipes-devtools/python/python3-aiohttp-jinja2_1.5.1.bb index c86ec092a6..68cbb265f4 100644 --- a/meta-python/recipes-devtools/python/python3-aiohttp-jinja2_1.5.bb +++ b/meta-python/recipes-devtools/python/python3-aiohttp-jinja2_1.5.1.bb @@ -3,7 +3,7 @@ SUMMARY = "jinja2 template renderer for aiohttp.web (http server for asyncio)" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=29dca541e03964615590ca7b50392d97" -SRC_URI[sha256sum] = "7c3ba5eac060b691f4e50534af2d79fca2a75712ebd2b25e6fcb1295859f910b" +SRC_URI[sha256sum] = "8d149b2a57d91f794b33a394ea5bc66b567f38c74a5a6a9477afc2450f105c01" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-aiohttp_3.8.3.bb b/meta-python/recipes-devtools/python/python3-aiohttp_3.8.4.bb index b233b3ac9a..926801dc74 100644 --- a/meta-python/recipes-devtools/python/python3-aiohttp_3.8.3.bb +++ b/meta-python/recipes-devtools/python/python3-aiohttp_3.8.4.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] = "3828fb41b7203176b82fe5d699e0d845435f2374750a44b480ea6b930f6be269" +SRC_URI[sha256sum] = "bf2e1a9162c1e441bf805a1fd166e249d574ca04e03b34f97e2928769e91ab5c" PYPI_PACKAGE = "aiohttp" inherit python_setuptools_build_meta pypi diff --git a/meta-python/recipes-devtools/python/python3-aiohue_4.6.1.bb b/meta-python/recipes-devtools/python/python3-aiohue_4.6.2.bb index 7e915fd3d2..b9256ca204 100644 --- a/meta-python/recipes-devtools/python/python3-aiohue_4.6.1.bb +++ b/meta-python/recipes-devtools/python/python3-aiohue_4.6.2.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=dab31a1d28183826937f4b152143a33f" -SRC_URI[sha256sum] = "afe44307ff2453e20323009cb315de3896d551afd0635b57381a278bb2119d48" +SRC_URI[sha256sum] = "069af6bb0a7d34d566538af57cc10fb691ee04f844204e4f67d95a57f0b91a46" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-aioredis_2.0.1.bb b/meta-python/recipes-devtools/python/python3-aioredis_2.0.1.bb new file mode 100644 index 0000000000..d8a8f2d033 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-aioredis_2.0.1.bb @@ -0,0 +1,16 @@ +SUMMARY = "The library is intended to provide simple and clear interface to Redis based on asyncio." +HOMEPAGE = "https://github.com/aio-libs/aioredis-py" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=bf9085f32a671dfa86ee69fe0fff7b95" + +SRC_URI[sha256sum] = "eaa51aaf993f2d71f54b70527c440437ba65340588afeb786cd87c55c89cd98e" + +PYPI_PACKAGE = "aioredis" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + python3-core (>=3.6) \ + python3-async-timeout \ + python3-typing-extensions \ +" diff --git a/meta-python/recipes-devtools/python/python3-aioserial_1.3.1.bb b/meta-python/recipes-devtools/python/python3-aioserial_1.3.1.bb index 7ef47a2f83..8279f27044 100755 --- a/meta-python/recipes-devtools/python/python3-aioserial_1.3.1.bb +++ b/meta-python/recipes-devtools/python/python3-aioserial_1.3.1.bb @@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "702bf03b0eb84b8ef2d8dac5cb925e1e685dce98f77b125569bc6fd2b3 inherit pypi setuptools3 -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-pyserial \ +RDEPENDS:${PN} += " \ + python3-asyncio \ + python3-pyserial \ " diff --git a/meta-python/recipes-devtools/python/python3-alembic_1.9.2.bb b/meta-python/recipes-devtools/python/python3-alembic_1.11.1.bb index 0d83f86c41..feb2c419bc 100644 --- a/meta-python/recipes-devtools/python/python3-alembic_1.9.2.bb +++ b/meta-python/recipes-devtools/python/python3-alembic_1.11.1.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e3023b042cb6002cb398344b51c67093" inherit pypi setuptools3 -SRC_URI[sha256sum] = "6880dec4f28dd7bd999d2ed13fbe7c9d4337700a44d11a524c0ce0c59aaf0dbd" +SRC_URI[sha256sum] = "6a810a6b012c88b33458fceb869aef09ac75d6ace5291915ba7fae44de372c01" PYPI_PACKAGE = "alembic" diff --git a/meta-python/recipes-devtools/python/python3-antlr4-runtime_4.11.1.bb b/meta-python/recipes-devtools/python/python3-antlr4-runtime_4.13.0.bb index 535dc022da..870152c74f 100644 --- a/meta-python/recipes-devtools/python/python3-antlr4-runtime_4.11.1.bb +++ b/meta-python/recipes-devtools/python/python3-antlr4-runtime_4.13.0.bb @@ -1,8 +1,8 @@ SUMMARY = "ANTLR runtime for Python" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=9a0a1d20e667cf7ab7c59357cf8b4812" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=b38bac4871765ce562806c44d2f18cf1" -SRC_URI[sha256sum] = "a53de701312f9bdacc5258a6872cd6c62b90d3a90ae25e494026f76267333b60" +SRC_URI[sha256sum] = "0d5454928ae40c8a6b653caa35046cd8492c8743b5fbc22ff4009099d074c7ae" PYPI_PACKAGE = "antlr4-python3-runtime" diff --git a/meta-python/recipes-devtools/python/python3-anyjson/0001-setup.py-Do-not-use-2to3.patch b/meta-python/recipes-devtools/python/python3-anyjson/0001-setup.py-Do-not-use-2to3.patch deleted file mode 100644 index 2b9e6e52e8..0000000000 --- a/meta-python/recipes-devtools/python/python3-anyjson/0001-setup.py-Do-not-use-2to3.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 4fb61d7c621599b0db9c2c45f4243f07936c5953 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 13 Oct 2021 08:20:00 -0700 -Subject: [PATCH] setup.py: Do not use 2to3 - -This helps compiling with setuptools 0.58+ -and it seems to compile fine with python3 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - setup.py | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/setup.py b/setup.py -index 9fe4902..f2098e1 100644 ---- a/setup.py -+++ b/setup.py -@@ -2,8 +2,6 @@ import os - import sys - - extra = {} --if sys.version_info >= (3, 0): -- extra.update(use_2to3=True) - - try: - from setuptools import setup, find_packages --- -2.33.0 - diff --git a/meta-python/recipes-devtools/python/python3-appdirs_1.4.4.bb b/meta-python/recipes-devtools/python/python3-appdirs_1.4.4.bb index 977999bfe5..95d1ac05ac 100644 --- a/meta-python/recipes-devtools/python/python3-appdirs_1.4.4.bb +++ b/meta-python/recipes-devtools/python/python3-appdirs_1.4.4.bb @@ -19,3 +19,5 @@ do_install_ptest() { install -d ${D}${PTEST_PATH}/test cp -rf ${S}/test/* ${D}${PTEST_PATH}/test/ } + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-argcomplete_2.0.0.bb b/meta-python/recipes-devtools/python/python3-argcomplete_3.1.1.bb index 4eab34f488..504e7e2ebd 100644 --- a/meta-python/recipes-devtools/python/python3-argcomplete_2.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-argcomplete_3.1.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/kislyuk/argcomplete" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=2ee41112a44fe7014dce33e26468ba93" -SRC_URI[sha256sum] = "6372ad78c89d662035101418ae253668445b391755cfe94ea52f1b9d22425b20" +SRC_URI[sha256sum] = "6c4c563f14f01440aaffa3eae13441c5db2357b5eec639abe7c0b15334627dff" PYPI_PACKAGE = "argcomplete" diff --git a/meta-python/recipes-devtools/python/python3-argh_0.26.2.bb b/meta-python/recipes-devtools/python/python3-argh_0.26.2.bb deleted file mode 100644 index c02e31a9a1..0000000000 --- a/meta-python/recipes-devtools/python/python3-argh_0.26.2.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Pattern matching and various utilities for file systems paths." - -LICENSE = "LGPL-2.0-only" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=cede70b648dcc81baf5b431d38905bad" - -SRC_URI[sha256sum] = "e9535b8c84dc9571a48999094fda7f33e63c3f1b74f3e5f3ac0105a58405bb65" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-logging \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-argh_0.28.1.bb b/meta-python/recipes-devtools/python/python3-argh_0.28.1.bb new file mode 100644 index 0000000000..2b1cb3ed81 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-argh_0.28.1.bb @@ -0,0 +1,26 @@ +SUMMARY = "An unobtrusive argparse wrapper with natural syntax" +DESCRIPTION = "Building a command-line interface? Found yourself uttering \ +'argh!' while struggling with the API of argparse? Don't like the complexity \ +but need the power? \ +\ +Everything should be made as simple as possible, but no simpler. \ +\ +—Albert Einstein (probably) \ +\ +Argh is a smart wrapper for argparse. Argparse is a very powerful \ +tool; Argh just makes it easy to use." + +LICENSE = "LGPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=3000208d539ec061b899bce1d9ce9404 \ + file://README.rst;beginline=261;endline=275;md5=a8bf3475df7e0d575a53d04c83d5e090" + +SRC_URI[sha256sum] = "b2093086f0e809a3ecc24b64a2145309ee8f56d034936cd59e57c558a357329d" + +inherit pypi python_flit_core + +RDEPENDS:${PN} += " \ + python3-argcomplete \ + python3-logging \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-arpeggio_2.0.0.bb b/meta-python/recipes-devtools/python/python3-arpeggio_2.0.2.bb index 96d6de6a69..1a48a88c29 100644 --- a/meta-python/recipes-devtools/python/python3-arpeggio_2.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-arpeggio_2.0.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://pypi.org/project/Arpeggio/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=33b8d1ba459a2fa4d801acfd1d1b7ceb" -SRC_URI[sha256sum] = "d6b03839019bb8a68785f9292ee6a36b1954eb84b925b84a6b8a5e1e26d3ed3d" +SRC_URI[sha256sum] = "c790b2b06e226d2dd468e4fbfb5b7f506cec66416031fde1441cf1de2a0ba700" PYPI_PACKAGE = "Arpeggio" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-asgiref_3.6.0.bb b/meta-python/recipes-devtools/python/python3-asgiref_3.7.2.bb index ac3353ce02..c9081c8cbb 100644 --- a/meta-python/recipes-devtools/python/python3-asgiref_3.6.0.bb +++ b/meta-python/recipes-devtools/python/python3-asgiref_3.7.2.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f09eb47206614a4954c51db8a94840fa" SRC_URI += "file://run-ptest \ " -SRC_URI[sha256sum] = "9567dfe7bd8d3c8c892227827c41cce860b368104c3431da67a0c5a65a949506" +SRC_URI[sha256sum] = "9e0ce3aa93a819ba5b45120216b23878cf6e8525eb3848653452b4192b92afed" export BUILD_SYS export HOST_SYS diff --git a/meta-python/recipes-devtools/python/python3-aspectlib/0001-Remove-tornado-6-test-constraint.-Ref-15.patch b/meta-python/recipes-devtools/python/python3-aspectlib/0001-Remove-tornado-6-test-constraint.-Ref-15.patch deleted file mode 100644 index 174f088e9e..0000000000 --- a/meta-python/recipes-devtools/python/python3-aspectlib/0001-Remove-tornado-6-test-constraint.-Ref-15.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d3ae6ac951cc5bbce29b9c987741e0a557c9b777 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ionel=20Cristian=20M=C4=83rie=C8=99?= <contact@ionelmc.ro> -Date: Sun, 2 May 2021 09:50:43 +0300 -Subject: [PATCH] Remove tornado<6 test constraint. Ref #15. - -Upstream-Status: Backport [https://github.com/ionelmc/python-aspectlib/commit/7dccb198dfb426f529b81a28a755f3c02f8b50cb] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - tests/test_integrations_py3.py | 5 ++++- - tox.ini | 3 ++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/tests/test_integrations_py3.py b/tests/test_integrations_py3.py -index e025eac..596589d 100644 ---- a/tests/test_integrations_py3.py -+++ b/tests/test_integrations_py3.py -@@ -36,7 +36,10 @@ def test_decorate_tornado_coroutine(): - @gen.coroutine - @debug.log(print_to=buf, module=False, stacktrace=2, result_repr=repr) - def coro(): -- yield gen.Task(loop.add_timeout, timedelta(microseconds=10)) -+ if hasattr(gen, 'Task'): -+ yield gen.Task(loop.add_timeout, timedelta(microseconds=10)) -+ else: -+ yield gen.sleep(0.01) - return "result" - - loop = ioloop.IOLoop.current() -diff --git a/tox.ini b/tox.ini -index 8c607de..08c31b3 100644 ---- a/tox.ini -+++ b/tox.ini -@@ -55,7 +55,8 @@ deps = - pytest-clarity - pytest-cov - pytest-travis-fold -- tornado<6.0 -+ six -+ tornado - commands = - {posargs:pytest --cov --cov-report=term-missing -vv --ignore=src} - --- -2.32.0 - diff --git a/meta-python/recipes-devtools/python/python3-aspectlib/run-ptest b/meta-python/recipes-devtools/python/python3-aspectlib/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-python/recipes-devtools/python/python3-aspectlib/run-ptest +++ b/meta-python/recipes-devtools/python/python3-aspectlib/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-python/recipes-devtools/python/python3-aspectlib_1.5.2.bb b/meta-python/recipes-devtools/python/python3-aspectlib_2.0.0.bb index 71f3d3594e..1341513289 100644 --- a/meta-python/recipes-devtools/python/python3-aspectlib_1.5.2.bb +++ b/meta-python/recipes-devtools/python/python3-aspectlib_2.0.0.bb @@ -6,14 +6,13 @@ DESCRIPTION = " It is useful when changing behavior in existing code is desired. It includes tools for debugging and testing: simple mock/record and a complete capture/replay framework." HOMEPAGE = "https://github.com/ionelmc/python-aspectlib" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d58b3f20fd10347a9458b8a03793b62e" +LIC_FILES_CHKSUM = "file://LICENSE;md5=80721ace117fd1f814049ecb81c6be76" -SRC_URI[sha256sum] = "d275ec82c4c2712e564bb760e4accff8f061f648e38774feabeb8b241cf3a4aa" +SRC_URI[sha256sum] = "a4b461b9da0b531aebcb93efcde3de808a72c60226dd8d902c467d13faf7ce92" inherit ptest pypi setuptools3 SRC_URI += "file://run-ptest \ - file://0001-Remove-tornado-6-test-constraint.-Ref-15.patch \ " do_install_ptest() { @@ -22,10 +21,15 @@ do_install_ptest() { } RDEPENDS:${PN}-ptest += "\ - python3-tornado \ python3-process-tests \ + python3-pytest \ + python3-tornado \ + python3-unittest-automake-output \ " -RDEPENDS:${PN} += "python3-core python3-fields" +RDEPENDS:${PN} += " \ + python3-fields \ + python3-logging \ +" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-astroid/0001-pyproject.toml-Replace-with.patch b/meta-python/recipes-devtools/python/python3-astroid/0001-pyproject.toml-Replace-with.patch deleted file mode 100644 index 3e1a17be92..0000000000 --- a/meta-python/recipes-devtools/python/python3-astroid/0001-pyproject.toml-Replace-with.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 517f361ba4a6ae430acfe3b83986d32b4f811b58 Mon Sep 17 00:00:00 2001 -From: Leon Anavi <leon.anavi@konsulko.com> -Date: Wed, 11 Jan 2023 13:56:24 +0200 -Subject: [PATCH] pyproject.toml: Replace ~= with >= - -Replace ~= with >= to avoid errors if the version is not exactly -the same. - -Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> ---- - pyproject.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pyproject.toml b/pyproject.toml -index 537bca9a..a01e0d45 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -1,5 +1,5 @@ - [build-system] --requires = ["setuptools~=62.6", "wheel~=0.37.1"] -+requires = ["setuptools>=62.6", "wheel>=0.37.1"] - build-backend = "setuptools.build_meta" - - [project] --- -2.30.2 - diff --git a/meta-python/recipes-devtools/python/python3-astroid_2.13.2.bb b/meta-python/recipes-devtools/python/python3-astroid_2.15.6.bb index fa22080d36..7325eb13f3 100644 --- a/meta-python/recipes-devtools/python/python3-astroid_2.13.2.bb +++ b/meta-python/recipes-devtools/python/python3-astroid_2.15.6.bb @@ -4,11 +4,7 @@ SECTION = "devel/python" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=a70cf540abf41acb644ac3b621b2fad1" -SRC_URI[sha256sum] = "3bc7834720e1a24ca797fd785d77efb14f7a28ee8e635ef040b6e2d80ccb3303" - -SRC_URI += " \ - file://0001-pyproject.toml-Replace-with.patch \ -" +SRC_URI[sha256sum] = "903f024859b7c7687d7a7f3a3f73b17301f8e42dfd9cc9df9d4418172d3e2dbd" inherit pypi python_setuptools_build_meta diff --git a/meta-python/recipes-devtools/python/python3-asyncinotify_3.0.1.bb b/meta-python/recipes-devtools/python/python3-asyncinotify_4.0.2.bb index 2f4adcea7a..08dc77bd17 100644 --- a/meta-python/recipes-devtools/python/python3-asyncinotify_3.0.1.bb +++ b/meta-python/recipes-devtools/python/python3-asyncinotify_4.0.2.bb @@ -3,9 +3,9 @@ HOMEPAGE = "https://gitlab.com/Taywee/asyncinotify" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=6ec941a1cd6616454970d03cb9c9e8f8" -SRC_URI[sha256sum] = "da812bf2be6a76aac6670b766eec4564d9484da6595d3ce1f9bba8ba78c30445" +SRC_URI[sha256sum] = "bcac19425b1b418bbbc4d31193ea3c39e24343cd7ddff2074ae7b599f1a04829" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta RDEPENDS:${PN} += " \ python3-asyncio \ diff --git a/meta-python/recipes-devtools/python/python3-asyncio-glib_0.1.bb b/meta-python/recipes-devtools/python/python3-asyncio-glib_0.1.bb index 2314f72845..02ace02a3d 100644 --- a/meta-python/recipes-devtools/python/python3-asyncio-glib_0.1.bb +++ b/meta-python/recipes-devtools/python/python3-asyncio-glib_0.1.bb @@ -3,7 +3,9 @@ AUTHOR = "James Henstridge" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c" -inherit setuptools3 pypi +inherit setuptools3 pypi features_check + +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" SRC_URI[md5sum] = "60153055e76ceaacdfbaeafb03d61dd9" SRC_URI[sha256sum] = "fe3ceb2ba5f541330c07ca1bd7ae792468d625bad1acf5354a3a7a0b9fd87521" diff --git a/meta-python/recipes-devtools/python/python3-asyncio-throttle_1.0.2.bb b/meta-python/recipes-devtools/python/python3-asyncio-throttle_1.0.2.bb index 1f907511a6..040e70940b 100644 --- a/meta-python/recipes-devtools/python/python3-asyncio-throttle_1.0.2.bb +++ b/meta-python/recipes-devtools/python/python3-asyncio-throttle_1.0.2.bb @@ -7,3 +7,5 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c7906e56b70808e1ade6ca05e0bb48d5" SRC_URI[sha256sum] = "2675282e99d9129ecc446f917e174bc205c65e36c602aa18603b4948567fcbd4" inherit pypi setuptools3 + +RDEPENDS:${PN} += "python3-asyncio" diff --git a/meta-python/recipes-devtools/python/python3-autobahn_23.1.1.bb b/meta-python/recipes-devtools/python/python3-autobahn_23.6.2.bb index b67e900685..54c8f23fc3 100644 --- a/meta-python/recipes-devtools/python/python3-autobahn_23.1.1.bb +++ b/meta-python/recipes-devtools/python/python3-autobahn_23.6.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://crossbar.io/autobahn" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3e2c2c2cc2915edc5321b0e6b1d3f5f8" -SRC_URI[sha256sum] = "a88882ab4700ee9eee46c69c38e2b625f6fda48ab1ce61cf7b58b23cf2fadcb8" +SRC_URI[sha256sum] = "ec9421c52a2103364d1ef0468036e6019ee84f71721e86b36fe19ad6966c1181" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-awesomeversion_22.9.0.bb b/meta-python/recipes-devtools/python/python3-awesomeversion_23.5.0.bb index 20ed1890db..bcd959cb27 100644 --- a/meta-python/recipes-devtools/python/python3-awesomeversion_22.9.0.bb +++ b/meta-python/recipes-devtools/python/python3-awesomeversion_23.5.0.bb @@ -4,8 +4,8 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENCE.md;md5=92622b5a8e216099be741d78328bae5d" -SRC_URI[sha256sum] = "2f4190d333e81e10b2a4e156150ddb3596f5f11da67e9d51ba39057aa7a17f7e" +SRC_URI[sha256sum] = "a505558316010d2d10d487226f79c1157204af00fa462fdcf948e347011dd491" RDEPENDS:${PN} += "python3-profile python3-logging" -inherit pypi setuptools3 +inherit pypi python_poetry_core diff --git a/meta-python/recipes-devtools/python/python3-bandit_1.7.4.bb b/meta-python/recipes-devtools/python/python3-bandit_1.7.5.bb index cfdbde9689..bccdf284e5 100644 --- a/meta-python/recipes-devtools/python/python3-bandit_1.7.4.bb +++ b/meta-python/recipes-devtools/python/python3-bandit_1.7.5.bb @@ -2,12 +2,20 @@ SUMMARY = "Security oriented static analyser for python code." LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" -SRC_URI[sha256sum] = "2d63a8c573417bae338962d4b9b06fbc6080f74ecd955a092849e1e65c717bd2" +SRC_URI[sha256sum] = "bdfc739baa03b880c2d15d0431b31c658ffc348e907fe197e54e0389dd59e11e" DEPENDS = "python3-pbr-native python3-git python3-pbr python3-pyyaml python3-six python3-stevedore" inherit setuptools3 pypi -RDEPENDS:${PN} += "python3-modules python3-git python3-pbr python3-pyyaml python3-six python3-stevedore" +RDEPENDS:${PN} += "\ + python3-git \ + python3-modules \ + python3-pbr \ + python3-pyyaml \ + python3-rich \ + python3-six \ + python3-stevedore \ + " BBCLASSEXTEND = "native" diff --git a/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.11.1.bb b/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.12.2.bb index 3037ea83c0..7eb2d7c345 100644 --- a/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.11.1.bb +++ b/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.12.2.bb @@ -1,11 +1,11 @@ SUMMARY = "Screen-scraping library" HOMEPAGE = " https://www.crummy.com/software/BeautifulSoup/bs4" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=15a76c7c51ecfc5c094d04f3ccd41a09" +LIC_FILES_CHKSUM = "file://LICENSE;md5=96e0034f7c9443910c486773aa1ed9ac" -SRC_URI[sha256sum] = "ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693" +SRC_URI[sha256sum] = "492bbc69dca35d12daac71c4db1bfff0c876c00ef4a2ffacce226d4638eb72da" -inherit pypi setuptools3 +inherit pypi python_hatchling RDEPENDS:${PN} = "\ ${PYTHON_PN}-html5lib \ diff --git a/meta-python/recipes-devtools/python/python3-betamax/0001-Drop-ptests-fixtures-and-recorde_modes.patch b/meta-python/recipes-devtools/python/python3-betamax/0001-Drop-ptests-fixtures-and-recorde_modes.patch new file mode 100644 index 0000000000..7adcb68324 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-betamax/0001-Drop-ptests-fixtures-and-recorde_modes.patch @@ -0,0 +1,333 @@ +From 0e0b63ae80df5d7849b2e1c5ab9a668e8378b5e8 Mon Sep 17 00:00:00 2001 +From: Zhixiong Chi <zhixiong.chi@windriver.com> +Date: Tue, 28 Mar 2023 06:05:45 +0000 +Subject: [PATCH] Drop ptests fixtures and recorde_modes + +The usage of fixture in test_fixtures has been deprecated. +See https://docs.pytest.org/en/stable/explanation/fixtures.html and +https://docs.pytest.org/en/stable/deprecations.html#calling-fixtures-directly +for more information about fixtures. +Meanwhile the test_record_modes relies on httpbin.org which has been sold and +re-sold several times, and it adds X-Amzn-Trace-Id header that can possibly +diff for each request. +It leads to ptest failure, so drop it now until we find the solution. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> +--- + tests/integration/test_fixtures.py | 60 ----------- + tests/integration/test_record_modes.py | 132 ------------------------- + tests/unit/test_fixtures.py | 94 ------------------ + 3 files changed, 286 deletions(-) + delete mode 100644 tests/integration/test_fixtures.py + delete mode 100644 tests/integration/test_record_modes.py + delete mode 100644 tests/unit/test_fixtures.py + +diff --git a/tests/integration/test_fixtures.py b/tests/integration/test_fixtures.py +deleted file mode 100644 +index fc3d1e7..0000000 +--- a/tests/integration/test_fixtures.py ++++ /dev/null +@@ -1,60 +0,0 @@ +-import os.path +- +-import pytest +- +- +-@pytest.mark.usefixtures('betamax_session') +-class TestPyTestFixtures: +- @pytest.fixture(autouse=True) +- def setup(self, request): +- """After test hook to assert everything.""" +- def finalizer(): +- test_dir = os.path.abspath('.') +- cassette_name = ('tests.integration.test_fixtures.' # Module name +- 'TestPyTestFixtures.' # Class name +- 'test_pytest_fixture' # Test function name +- '.json') +- file_name = os.path.join(test_dir, 'tests', 'cassettes', +- cassette_name) +- assert os.path.exists(file_name) is True +- +- request.addfinalizer(finalizer) +- +- def test_pytest_fixture(self, betamax_session): +- """Exercise the fixture itself.""" +- resp = betamax_session.get('https://httpbin.org/get') +- assert resp.ok +- +- +-@pytest.mark.usefixtures('betamax_parametrized_session') +-class TestPyTestParametrizedFixtures: +- @pytest.fixture(autouse=True) +- def setup(self, request): +- """After test hook to assert everything.""" +- def finalizer(): +- test_dir = os.path.abspath('.') +- cassette_name = ('tests.integration.test_fixtures.' # Module name +- 'TestPyTestParametrizedFixtures.' # Class name +- 'test_pytest_fixture' # Test function name +- '[https---httpbin.org-get]' # Parameter +- '.json') +- file_name = os.path.join(test_dir, 'tests', 'cassettes', +- cassette_name) +- assert os.path.exists(file_name) is True +- +- request.addfinalizer(finalizer) +- +- @pytest.mark.parametrize('url', ('https://httpbin.org/get',)) +- def test_pytest_fixture(self, betamax_parametrized_session, url): +- """Exercise the fixture itself.""" +- resp = betamax_parametrized_session.get(url) +- assert resp.ok +- +- +-@pytest.mark.parametrize('problematic_arg', [r'aaa\bbb', 'ccc:ddd', 'eee*fff']) +-def test_pytest_parametrize_with_filesystem_problematic_chars( +- betamax_parametrized_session, problematic_arg): +- """ +- Exercice parametrized args containing characters which might cause +- problems when getting translated into file names. """ +- assert True +diff --git a/tests/integration/test_record_modes.py b/tests/integration/test_record_modes.py +deleted file mode 100644 +index 58c8846..0000000 +--- a/tests/integration/test_record_modes.py ++++ /dev/null +@@ -1,132 +0,0 @@ +-from betamax import Betamax, BetamaxError +- +-from tests.integration.helper import IntegrationHelper +- +- +-class TestRecordOnce(IntegrationHelper): +- def test_records_new_interaction(self): +- s = self.session +- with Betamax(s).use_cassette('test_record_once') as betamax: +- self.cassette_path = betamax.current_cassette.cassette_path +- assert betamax.current_cassette.is_empty() is True +- r = s.get('http://httpbin.org/get') +- assert r.status_code == 200 +- assert betamax.current_cassette.is_empty() is True +- assert betamax.current_cassette.interactions != [] +- +- def test_replays_response_from_cassette(self): +- s = self.session +- with Betamax(s).use_cassette('test_replays_response') as betamax: +- self.cassette_path = betamax.current_cassette.cassette_path +- assert betamax.current_cassette.is_empty() is True +- r0 = s.get('http://httpbin.org/get') +- assert r0.status_code == 200 +- assert betamax.current_cassette.interactions != [] +- assert len(betamax.current_cassette.interactions) == 1 +- r1 = s.get('http://httpbin.org/get') +- assert len(betamax.current_cassette.interactions) == 2 +- assert r1.status_code == 200 +- r0_headers = r0.headers.copy() +- r0_headers.pop('Date') +- r0_headers.pop('Age', None) +- r0_headers.pop('X-Processed-Time', None) +- r1_headers = r1.headers.copy() +- r1_headers.pop('Date') +- r1_headers.pop('Age', None) +- r1_headers.pop('X-Processed-Time', None) +- # NOTE(sigmavirus24): This fails if the second request is +- # technically a second later. Ignoring the Date headers allows +- # this test to succeed. +- # NOTE(hroncok): httpbin.org added X-Processed-Time header that +- # can possibly differ (and often does) +- assert r0_headers == r1_headers +- assert r0.content == r1.content +- +- +-class TestRecordNone(IntegrationHelper): +- def test_raises_exception_when_no_interactions_present(self): +- s = self.session +- with Betamax(s) as betamax: +- betamax.use_cassette('test', record='none') +- self.cassette_created = False +- assert betamax.current_cassette is not None +- self.assertRaises(BetamaxError, s.get, 'http://httpbin.org/get') +- +- def test_record_none_does_not_create_cassettes(self): +- s = self.session +- with Betamax(s) as betamax: +- self.assertRaises(ValueError, betamax.use_cassette, +- 'test_record_none', record='none') +- self.cassette_created = False +- +- +-class TestRecordNewEpisodes(IntegrationHelper): +- def setUp(self): +- super(TestRecordNewEpisodes, self).setUp() +- with Betamax(self.session).use_cassette('test_record_new'): +- self.session.get('http://httpbin.org/get') +- self.session.get('http://httpbin.org/redirect/2') +- +- def test_records_new_events_with_existing_cassette(self): +- s = self.session +- opts = {'record': 'new_episodes'} +- with Betamax(s).use_cassette('test_record_new', **opts) as betamax: +- cassette = betamax.current_cassette +- self.cassette_path = cassette.cassette_path +- assert cassette.interactions != [] +- assert len(cassette.interactions) == 4 +- assert cassette.is_empty() is False +- s.get('https://httpbin.org/get') +- assert len(cassette.interactions) == 5 +- +- with Betamax(s).use_cassette('test_record_new') as betamax: +- cassette = betamax.current_cassette +- assert len(cassette.interactions) == 5 +- r = s.get('https://httpbin.org/get') +- assert r.status_code == 200 +- +- +-class TestRecordNewEpisodesCreatesCassettes(IntegrationHelper): +- def test_creates_new_cassettes(self): +- recorder = Betamax(self.session) +- opts = {'record': 'new_episodes'} +- cassette_name = 'test_record_new_makes_new_cassettes' +- with recorder.use_cassette(cassette_name, **opts) as betamax: +- self.cassette_path = betamax.current_cassette.cassette_path +- self.session.get('https://httpbin.org/get') +- +- +-class TestRecordAll(IntegrationHelper): +- def setUp(self): +- super(TestRecordAll, self).setUp() +- with Betamax(self.session).use_cassette('test_record_all'): +- self.session.get('http://httpbin.org/get') +- self.session.get('http://httpbin.org/redirect/2') +- self.session.get('http://httpbin.org/get') +- +- def test_records_new_interactions(self): +- s = self.session +- opts = {'record': 'all'} +- with Betamax(s).use_cassette('test_record_all', **opts) as betamax: +- cassette = betamax.current_cassette +- self.cassette_path = cassette.cassette_path +- assert cassette.interactions != [] +- assert len(cassette.interactions) == 5 +- assert cassette.is_empty() is False +- s.post('http://httpbin.org/post', data={'foo': 'bar'}) +- assert len(cassette.interactions) == 6 +- +- with Betamax(s).use_cassette('test_record_all') as betamax: +- assert len(betamax.current_cassette.interactions) == 6 +- +- def test_replaces_old_interactions(self): +- s = self.session +- opts = {'record': 'all'} +- with Betamax(s).use_cassette('test_record_all', **opts) as betamax: +- cassette = betamax.current_cassette +- self.cassette_path = cassette.cassette_path +- assert cassette.interactions != [] +- assert len(cassette.interactions) == 5 +- assert cassette.is_empty() is False +- s.get('http://httpbin.org/get') +- assert len(cassette.interactions) == 5 +diff --git a/tests/unit/test_fixtures.py b/tests/unit/test_fixtures.py +deleted file mode 100644 +index 387d9ce..0000000 +--- a/tests/unit/test_fixtures.py ++++ /dev/null +@@ -1,94 +0,0 @@ +-try: +- import unittest.mock as mock +-except ImportError: +- import mock +- +-import pytest +-import unittest +- +-import requests +- +-import betamax +-from betamax.fixtures import pytest as pytest_fixture +-from betamax.fixtures import unittest as unittest_fixture +- +- +-class TestPyTestFixture(unittest.TestCase): +- def setUp(self): +- self.mocked_betamax = mock.MagicMock() +- self.patched_betamax = mock.patch.object( +- betamax.recorder, 'Betamax', return_value=self.mocked_betamax) +- self.patched_betamax.start() +- +- def tearDown(self): +- self.patched_betamax.stop() +- +- def test_adds_stop_as_a_finalizer(self): +- # Mock a pytest request object +- request = mock.MagicMock() +- request.cls = request.module = None +- request.function.__name__ = 'test' +- +- pytest_fixture.betamax_recorder(request) +- assert request.addfinalizer.called is True +- request.addfinalizer.assert_called_once_with(self.mocked_betamax.stop) +- +- def test_auto_starts_the_recorder(self): +- # Mock a pytest request object +- request = mock.MagicMock() +- request.cls = request.module = None +- request.function.__name__ = 'test' +- +- pytest_fixture.betamax_recorder(request) +- self.mocked_betamax.start.assert_called_once_with() +- +- +-class FakeBetamaxTestCase(unittest_fixture.BetamaxTestCase): +- def test_fake(self): +- pass +- +- +-class TestUnittestFixture(unittest.TestCase): +- def setUp(self): +- self.mocked_betamax = mock.MagicMock() +- self.patched_betamax = mock.patch.object( +- betamax.recorder, 'Betamax', return_value=self.mocked_betamax) +- self.betamax = self.patched_betamax.start() +- self.fixture = FakeBetamaxTestCase(methodName='test_fake') +- +- def tearDown(self): +- self.patched_betamax.stop() +- +- def test_setUp(self): +- self.fixture.setUp() +- +- self.mocked_betamax.use_cassette.assert_called_once_with( +- 'FakeBetamaxTestCase.test_fake' +- ) +- self.mocked_betamax.start.assert_called_once_with() +- +- def test_setUp_rejects_arbitrary_session_classes(self): +- self.fixture.SESSION_CLASS = object +- +- with pytest.raises(AssertionError): +- self.fixture.setUp() +- +- def test_setUp_accepts_session_subclasses(self): +- class TestSession(requests.Session): +- pass +- +- self.fixture.SESSION_CLASS = TestSession +- +- self.fixture.setUp() +- +- assert self.betamax.called is True +- call_kwargs = self.betamax.call_args[-1] +- assert isinstance(call_kwargs['session'], TestSession) +- +- def test_tearDown_calls_stop(self): +- recorder = mock.Mock() +- self.fixture.recorder = recorder +- +- self.fixture.tearDown() +- +- recorder.stop.assert_called_once_with() +-- +2.35.5 + diff --git a/meta-python/recipes-devtools/python/python3-betamax_0.8.1.bb b/meta-python/recipes-devtools/python/python3-betamax_0.8.1.bb index 2caeb5afa2..feb9ab3e27 100644 --- a/meta-python/recipes-devtools/python/python3-betamax_0.8.1.bb +++ b/meta-python/recipes-devtools/python/python3-betamax_0.8.1.bb @@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=61c15f0c146c5fb1a8ce8ba2f310d73c" SRC_URI += " \ file://run-ptest \ + file://0001-Drop-ptests-fixtures-and-recorde_modes.patch \ " SRC_URI[md5sum] = "b8182d43a200fc126a3bf7555626f964" @@ -12,9 +13,13 @@ SRC_URI[sha256sum] = "5bf004ceffccae881213fb722f34517166b84a34919b92ffc14d1dbd05 inherit pypi setuptools3 ptest +RDEPENDS:${PN} += " \ + python3-requests \ + python3-unittest \ +" + RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-requests \ " do_install_ptest() { diff --git a/meta-python/recipes-devtools/python/python3-binwalk_2.3.3.bb b/meta-python/recipes-devtools/python/python3-binwalk_2.3.4.bb index 362efa2751..0b7d97fccb 100644 --- a/meta-python/recipes-devtools/python/python3-binwalk_2.3.3.bb +++ b/meta-python/recipes-devtools/python/python3-binwalk_2.3.4.bb @@ -8,10 +8,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=65bbee055d3ea3bfc475f07aecf4de64" SRC_URI = "git://github.com/ReFirmLabs/binwalk;protocol=https;branch=master" -SRCREV = "fa0c0bd59b8588814756942fe4cb5452e76c1dcd" +SRCREV = "cddfede795971045d99422bd7a9676c8803ec5ee" S = "${WORKDIR}/git" inherit setuptools3 -RDEPENDS:${PN} += "python3-core" +RDEPENDS:${PN} += " \ + python3-compression \ + python3-logging \ + python3-netserver \ + python3-setuptools \ + python3-stringold \ +" diff --git a/meta-python/recipes-devtools/python/python3-bitarray_2.6.2.bb b/meta-python/recipes-devtools/python/python3-bitarray_2.7.6.bb index 1b225c3fae..b27480057a 100644 --- a/meta-python/recipes-devtools/python/python3-bitarray_2.6.2.bb +++ b/meta-python/recipes-devtools/python/python3-bitarray_2.7.6.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/ilanschnell/bitarray" LICENSE = "PSF-2.0" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=2ad702cdcd49e8d2ac01d7e7d0810d2d" -SRC_URI[sha256sum] = "90bac83ba6c37ab5048b43e07eba7d0de12f301ad6641633656fa269618a7301" +SRC_URI[sha256sum] = "3807f9323c308bc3f9b58cbe5d04dc28f34ac32d852999334da96b42f64b5356" inherit setuptools3 pypi diff --git a/meta-python/recipes-devtools/python/python3-bitstring_3.1.9.bb b/meta-python/recipes-devtools/python/python3-bitstring_4.0.2.bb index 94dbae2afc..a4d59913f8 100644 --- a/meta-python/recipes-devtools/python/python3-bitstring_3.1.9.bb +++ b/meta-python/recipes-devtools/python/python3-bitstring_4.0.2.bb @@ -2,18 +2,19 @@ SUMMARY = "Simple construction, analysis and modification of binary data." HOMEPAGE = "https://github.com/scott-griffiths/bitstring" AUTHOR = "Scott Griffiths <dr.scottgriffiths@gmail.com>" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f7f2fd3f1cd52b5ccd39d76fb3568d3f" +LIC_FILES_CHKSUM = "file://LICENSE;md5=661f450e2c0aef39b4b15597333444a7" -SRC_URI[sha256sum] = "a5848a3f63111785224dca8bb4c0a75b62ecdef56a042c8d6be74b16f7e860e7" +SRC_URI[sha256sum] = "a391db8828ac4485dd5ce72c80b27ebac3e7b989631359959e310cd9729723b2" PYPI_PACKAGE = "bitstring" -inherit pypi setuptools3 +inherit pypi python_poetry_core RDEPENDS:${PN} = "\ ${PYTHON_PN}-core \ - ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-io \ ${PYTHON_PN}-mmap \ + ${PYTHON_PN}-numbers \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-bitstruct_8.15.1.bb b/meta-python/recipes-devtools/python/python3-bitstruct_8.17.0.bb index fe3aeb7b58..d1d30cdb3c 100644 --- a/meta-python/recipes-devtools/python/python3-bitstruct_8.15.1.bb +++ b/meta-python/recipes-devtools/python/python3-bitstruct_8.17.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/eerimoq/bitstruct" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" -SRC_URI[sha256sum] = "6fa6adbfb8f3b8cb68c21b13aa65d23eb2c3ac32419ab926f3fd1fff717a9125" +SRC_URI[sha256sum] = "eb94b40e4218a23aa8f90406b836a9e6ed83e48b8d112ce3f96408463bd1b874" PYPI_PACKAGE = "bitstruct" diff --git a/meta-python/recipes-devtools/python/python3-bleak/0001-fix-poetry-version-compatibility.patch b/meta-python/recipes-devtools/python/python3-bleak/0001-fix-poetry-version-compatibility.patch new file mode 100644 index 0000000000..051ebbe674 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-bleak/0001-fix-poetry-version-compatibility.patch @@ -0,0 +1,23 @@ +Upstream-Status: Pending + +--- a/pyproject.toml 2023-04-19 19:04:47.159474100 -0300 ++++ b/pyproject.toml 2023-05-04 08:08:12.289941765 -0300 +@@ -31,15 +31,15 @@ + bleak-winrt = { version = "^1.2.0", markers = "platform_system=='Windows'" } + dbus-fast = { version = "^1.83.0", markers = "platform_system == 'Linux'" } + +-[tool.poetry.group.docs.dependencies] ++#[tool.poetry.group.docs.dependencies] + Sphinx = { version = "^5.1.1", python = ">=3.8" } + sphinx-rtd-theme = "^1.0.0" + +-[tool.poetry.group.lint.dependencies] ++#[tool.poetry.group.lint.dependencies] + black = "^22.1.0" + flake8 = { version = "^5.0.0", python = ">=3.8" } + +-[tool.poetry.group.test.dependencies] ++#[tool.poetry.group.test.dependencies] + asynctest = { version = "^0.13.0", python = "<3.8" } + pytest = "^7.0.0" + pytest-asyncio = "^0.19.0" diff --git a/meta-python/recipes-devtools/python/python3-bleak_0.20.2.bb b/meta-python/recipes-devtools/python/python3-bleak_0.20.2.bb new file mode 100644 index 0000000000..9b81efe400 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-bleak_0.20.2.bb @@ -0,0 +1,20 @@ +SUMMARY = "Bleak is a GATT client software, capable of connecting to BLE devices acting as GATT servers." +HOMEPAGE = "https://github.com/hbldh/bleak" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=bcbc2069a86cba1b5e47253679f66ed7" + +SRC_URI:append = " \ + file://0001-fix-poetry-version-compatibility.patch \ +" + +SRC_URI[sha256sum] = "6c92a47abe34e6dea8ffc5cea9457cbff6e1be966854839dbc25cddb36b79ee4" + +PYPI_PACKAGE = "bleak" + +inherit pypi python_poetry_core + +RDEPENDS:${PN} += " \ + python3-core (>=3.7) \ + python3-async-timeout \ + python3-dbus-fast \ +" diff --git a/meta-python/recipes-devtools/python/python3-blinker_1.5.bb b/meta-python/recipes-devtools/python/python3-blinker_1.6.2.bb index dae1e39437..b0728e66cd 100644 --- a/meta-python/recipes-devtools/python/python3-blinker_1.5.bb +++ b/meta-python/recipes-devtools/python/python3-blinker_1.6.2.bb @@ -2,12 +2,16 @@ DESCRIPTION = "Fast, simple object-to-object and broadcast signaling." LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=42cd19c88fc13d1307a4efd64ee90e4e" -SRC_URI[sha256sum] = "923e5e2f69c155f2cc42dafbbd70e16e3fde24d2d4aa2ab72fbe386238892462" +SRC_URI[sha256sum] = "4afd3de66ef3a9f8067559fb7a1cbe555c17dcbe15971b05d1b625c3e7abe213" -inherit pypi setuptools3 ptest +inherit pypi python_setuptools_build_meta ptest SRC_URI += "file://run-ptest" +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-asyncio \ +" + RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ " diff --git a/meta-python/recipes-devtools/python/python3-cachecontrol_0.12.12.bb b/meta-python/recipes-devtools/python/python3-cachecontrol_0.13.0.bb index 8f7185b8f5..e4e3c49988 100644 --- a/meta-python/recipes-devtools/python/python3-cachecontrol_0.12.12.bb +++ b/meta-python/recipes-devtools/python/python3-cachecontrol_0.13.0.bb @@ -1,13 +1,13 @@ SUMMARY = "httplib2 caching for requests" HOMEPAGE = "https://pypi.org/project/CacheControl/" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=12;endline=12;md5=942a721dac34d073453642ffe5fcf546" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=12;endline=12;md5=e2fd6ddcf506e08972d5ba4b93c0022e" # On PyPi, this is "CacheControl", rather than "cachecontrol", so we need to # override PYPI_PACKAGE so fetch succeeds. PYPI_PACKAGE = "CacheControl" -SRC_URI[sha256sum] = "9c2e5208ea76ebd9921176569743ddf6d7f3bb4188dbf61806f0f8fc48ecad38" +SRC_URI[sha256sum] = "fd3fd2cb0ca66b9a6c1d56cc9709e7e49c63dbd19b1b1bcbd8d3f94cedfe8ce5" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-cachetools_5.3.0.bb b/meta-python/recipes-devtools/python/python3-cachetools_5.3.1.bb index 21bb518719..739e5a8264 100644 --- a/meta-python/recipes-devtools/python/python3-cachetools_5.3.0.bb +++ b/meta-python/recipes-devtools/python/python3-cachetools_5.3.1.bb @@ -27,6 +27,6 @@ do_install_ptest() { cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ } -SRC_URI[sha256sum] = "13dfddc7b8df938c21a940dfa6557ce6e94a2f1cdfa58eb90c805721d58f2c14" +SRC_URI[sha256sum] = "dce83f2d9b4e1f732a8cd44af8e8fab2dbe46201467fc98b3ef8f269092bf62b" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-can_4.1.0.bb b/meta-python/recipes-devtools/python/python3-can_4.1.0.bb deleted file mode 100644 index 3d90c7f369..0000000000 --- a/meta-python/recipes-devtools/python/python3-can_4.1.0.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Controller Area Network (CAN) interface module for Python" -SECTION = "devel/python" -LICENSE = "LGPL-3.0-only" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e6a600fd5e1d9cbde2d983680233ad02" - -SRC_URI[sha256sum] = "3f2b6b0dc5f459591d171ee0c0136dce79acedc2740ce695024aa3444e911bb9" - -PYPI_PACKAGE="python-can" - -inherit pypi setuptools3 - -RDEPENDS:${PN}:class-target += "\ - ${PYTHON_PN}-aenum \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-codecs \ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-fcntl \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-misc \ - ${PYTHON_PN}-netserver \ - ${PYTHON_PN}-sqlite3 \ - ${PYTHON_PN}-wrapt \ - ${PYTHON_PN}-pkg-resources \ - ${PYTHON_PN}-typing-extensions \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-can_4.2.2.bb b/meta-python/recipes-devtools/python/python3-can_4.2.2.bb new file mode 100644 index 0000000000..7ecbf12073 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-can_4.2.2.bb @@ -0,0 +1,29 @@ +SUMMARY = "Controller Area Network (CAN) interface module for Python" +SECTION = "devel/python" +LICENSE = "LGPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e6a600fd5e1d9cbde2d983680233ad02" + +SRC_URI[sha256sum] = "6ad50f4613289f3c4d276b6d2ac8901d776dcb929994cce93f55a69e858c595f" + +PYPI_PACKAGE="python-can" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + python3-aenum \ + python3-asyncio \ + python3-codecs \ + python3-compression \ + python3-ctypes \ + python3-fcntl \ + python3-json \ + python3-logging \ + python3-misc \ + python3-netserver \ + python3-pkg-resources \ + python3-sqlite3 \ + python3-typing-extensions \ + python3-wrapt \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-cantools_38.0.1.bb b/meta-python/recipes-devtools/python/python3-cantools_38.0.2.bb index c116063510..0035735830 100644 --- a/meta-python/recipes-devtools/python/python3-cantools_38.0.1.bb +++ b/meta-python/recipes-devtools/python/python3-cantools_38.0.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/eerimoq/cantools" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" -SRC_URI[sha256sum] = "be391520a43c8041ba99839a00a0a61b7afa929387def6c6348a9626b99f24d7" +SRC_URI[sha256sum] = "93bfe6f4bd652f369763ea9162b027a62f424a8400f2423d41137918ce68c68e" PYPI_PACKAGE = "cantools" diff --git a/meta-python/recipes-devtools/python/python3-cassandra-driver_3.25.0.bb b/meta-python/recipes-devtools/python/python3-cassandra-driver_3.28.0.bb index cf27f7f476..468aa247e8 100644 --- a/meta-python/recipes-devtools/python/python3-cassandra-driver_3.25.0.bb +++ b/meta-python/recipes-devtools/python/python3-cassandra-driver_3.28.0.bb @@ -8,7 +8,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" SRCNAME = "cassandra-driver" -SRC_URI[sha256sum] = "8ad7d7c090eb1cac6110b3bfc1fd2d334ac62f415aac09350ebb8d241b7aa7ee" +SRC_URI[sha256sum] = "64ff130d19f994b80997c14343a8306be52a0e7ab92520a534eed944c88d70df" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-charset-normalizer_3.0.1.bb b/meta-python/recipes-devtools/python/python3-charset-normalizer_3.2.0.bb index 0a48ae97d4..0c2810c62a 100644 --- a/meta-python/recipes-devtools/python/python3-charset-normalizer_3.0.1.bb +++ b/meta-python/recipes-devtools/python/python3-charset-normalizer_3.2.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/ousret/charset_normalizer" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=0974a390827087287db39928f7c524b5" -SRC_URI[sha256sum] = "ebea339af930f8ca5d7a699b921106c6e29c617fe9606fa7baa043c1cdae326f" +SRC_URI[sha256sum] = "3bb3d25a8e6c0aedd251753a79ae98a093c7e7b471faa3aa9a93a81431987ace" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-classes_0.4.1.bb b/meta-python/recipes-devtools/python/python3-classes_0.4.1.bb new file mode 100644 index 0000000000..d9240e1383 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-classes_0.4.1.bb @@ -0,0 +1,10 @@ +SUMMARY = "Smart, pythonic, ad-hoc, typed polymorphism for Python." + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=155fbcc756c8ae5265d252d23e20908f" + +SRC_URI[sha256sum] = "4de4fdd6c5c38607bbd8ad76703d7cc4dbe007cfa78e8ef1f62fc6ac55303e23" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += "python3-typing-extensions" diff --git a/meta-python/recipes-devtools/python/python3-click-repl_0.2.0.bb b/meta-python/recipes-devtools/python/python3-click-repl_0.2.0.bb deleted file mode 100644 index cf5ba988b4..0000000000 --- a/meta-python/recipes-devtools/python/python3-click-repl_0.2.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "REPL plugin for Click" -HOMEPAGE = "https://github.com/untitaker/click-repl" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fee2943fdd4d8afbac9ccc1c8ac137d5" - -SRC_URI[sha256sum] = "cd12f68d745bf6151210790540b4cb064c7b13e571bc64b6957d98d120dacfd8" - -inherit pypi setuptools3 - -RDEPENDS:${PN} = "${PYTHON_PN}-click" diff --git a/meta-python/recipes-devtools/python/python3-click-repl_0.3.0.bb b/meta-python/recipes-devtools/python/python3-click-repl_0.3.0.bb new file mode 100644 index 0000000000..33e42cb3b8 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-click-repl_0.3.0.bb @@ -0,0 +1,10 @@ +SUMMARY = "REPL plugin for Click" +HOMEPAGE = "https://github.com/untitaker/click-repl" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=580facc4832cac548fad94845542da44" + +SRC_URI[sha256sum] = "17849c23dba3d667247dc4defe1757fff98694e90fe37474f3feebb69ced26a9" + +inherit pypi setuptools3 + +RDEPENDS:${PN} = "${PYTHON_PN}-click ${PYTHON_PN}-prompt-toolkit" diff --git a/meta-python/recipes-devtools/python/python3-click-spinner_0.1.10.bb b/meta-python/recipes-devtools/python/python3-click-spinner_0.1.10.bb index 418f8a32a7..bd1136fd77 100644 --- a/meta-python/recipes-devtools/python/python3-click-spinner_0.1.10.bb +++ b/meta-python/recipes-devtools/python/python3-click-spinner_0.1.10.bb @@ -7,3 +7,5 @@ SRC_URI[md5sum] = "ab68ed404401421819c81cc6c0677a87" SRC_URI[sha256sum] = "87eacf9d7298973a25d7615ef57d4782aebf913a532bba4b28a37e366e975daf" inherit pypi setuptools3 + +RDEPENDS:${PN} += "python3-json" diff --git a/meta-python/recipes-devtools/python/python3-click_8.1.3.bb b/meta-python/recipes-devtools/python/python3-click_8.1.5.bb index 006742f153..d7d50118e2 100644 --- a/meta-python/recipes-devtools/python/python3-click_8.1.3.bb +++ b/meta-python/recipes-devtools/python/python3-click_8.1.5.bb @@ -8,13 +8,11 @@ HOMEPAGE = "http://click.pocoo.org/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=1fa98232fd645608937a0fdc82e999b8" -SRC_URI[sha256sum] = "7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e" +SRC_URI[sha256sum] = "4be4b1af8d665c6d942909916d31a213a106800c47d0eeba73d34da3cbc11367" inherit pypi setuptools3 ptest -SRC_URI += " \ - file://run-ptest \ -" +SRC_URI += "file://run-ptest" RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ diff --git a/meta-python/recipes-devtools/python/python3-cmake/CMakeLists.txt b/meta-python/recipes-devtools/python/python3-cmake/CMakeLists.txt new file mode 100644 index 0000000000..8ba81970ff --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-cmake/CMakeLists.txt @@ -0,0 +1,11 @@ +cmake_minimum_required(VERSION 3.6) + +# +# For more details, see docs/building.rst +# + +project(CMakePythonDistributions NONE) + +install(CODE " + message(STATUS \"Install CMake project\") +") diff --git a/meta-python/recipes-devtools/python/python3-cmake/run-cmake-from-path.patch b/meta-python/recipes-devtools/python/python3-cmake/run-cmake-from-path.patch new file mode 100644 index 0000000000..d4d2903d5e --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-cmake/run-cmake-from-path.patch @@ -0,0 +1,13 @@ +Upstream-Status: Pending + +--- cmake-3.25.2/src/cmake/__init__.py.old 2023-03-10 09:40:43.582315753 +0100 ++++ cmake-3.25.2/src/cmake/__init__.py 2023-03-10 09:41:38.030874047 +0100 +@@ -36,7 +36,7 @@ + + + def _program(name, args): +- return subprocess.call([os.path.join(CMAKE_BIN_DIR, name)] + args, close_fds=False) ++ return subprocess.call([name] + args, close_fds=False) + + + def cmake(): diff --git a/meta-python/recipes-devtools/python/python3-cmake_3.26.4.bb b/meta-python/recipes-devtools/python/python3-cmake_3.26.4.bb new file mode 100644 index 0000000000..c66c777574 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-cmake_3.26.4.bb @@ -0,0 +1,37 @@ +SUMMARY = "CMake is an open-source, cross-platform family of tools designed to build, test and package software" +LICENSE = "BSD-3-Clause & Apache-2.0" +LIC_FILES_CHKSUM = " \ + file://LICENSE_BSD_3;md5=9134cb61aebbdd79dd826ccb9ae6afcd \ + file://LICENSE_Apache_20;md5=19cbd64715b51267a47bf3750cc6a8a5 \ +" + +DEPENDS = "ninja-native cmake-native python3-scikit-build-native" + +PYPI_PACKAGE = "cmake" +PYPI_ARCHIVE_NAME_PREFIX = "pypi-" + +inherit pypi python_setuptools_build_meta +SRC_URI[sha256sum] = "d45b30b9ce7280829888c78650177ab525df2b6785e1a5b3d82b4c147d828c0e" + +SRC_URI += " \ + file://CMakeLists.txt \ + file://run-cmake-from-path.patch \ +" + +addtask do_patchbuild after do_patch before do_configure + +do_patchbuild () { + rm -f ${S}/CMakeLists.txt + cp ${WORKDIR}/CMakeLists.txt ${S}/ +} + +do_install:append () { + rm -rf ${D}${bindir} +} + +RDEPENDS:${PN} = " \ + cmake \ + python3-scikit-build \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-cmd2_2.4.2.bb b/meta-python/recipes-devtools/python/python3-cmd2_2.4.3.bb index d2434b626f..29d790b94f 100644 --- a/meta-python/recipes-devtools/python/python3-cmd2_2.4.2.bb +++ b/meta-python/recipes-devtools/python/python3-cmd2_2.4.3.bb @@ -1,11 +1,11 @@ SUMMARY = "Extra features for standard library's cmd module" HOMEPAGE = "https://github.com/python-cmd2/cmd2" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=209e288518b0668115f58c3929af9ff1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fad7740aa21780c8b9a214f5b320b4ad" DEPENDS += "${PYTHON_PN}-setuptools-scm-native" -SRC_URI[sha256sum] = "073e555c05853b0f6965f3d03329babdf9e38a5f2cea028e61a64cd7eeb74ad5" +SRC_URI[sha256sum] = "71873c11f72bd19e2b1db578214716f0d4f7c8fa250093c601265a9a717dee52" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-colorlog_6.7.0.bb b/meta-python/recipes-devtools/python/python3-colorlog_6.7.0.bb index 84b67e784a..69f4be17c4 100644 --- a/meta-python/recipes-devtools/python/python3-colorlog_6.7.0.bb +++ b/meta-python/recipes-devtools/python/python3-colorlog_6.7.0.bb @@ -8,3 +8,5 @@ inherit pypi setuptools3 PYPI_PACKAGE = "colorlog" SRC_URI[sha256sum] = "bd94bd21c1e13fac7bd3153f4bc3a7dc0eb0974b8bc2fdf1a989e474f6e582e5" + +RDEPENDS:${PN} += "python3-logging" diff --git a/meta-python/recipes-devtools/python/python3-colorzero_2.0.bb b/meta-python/recipes-devtools/python/python3-colorzero_2.0.bb index 1a331d13fd..fc1615e670 100644 --- a/meta-python/recipes-devtools/python/python3-colorzero_2.0.bb +++ b/meta-python/recipes-devtools/python/python3-colorzero_2.0.bb @@ -7,7 +7,10 @@ HOMEPAGE = " https://github.com/waveform80/colorzero " LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ae6c62710c0646f3c60d1ad812ea9bf9" -RDEPENDS:${PN} = "python3-image" +RDEPENDS:${PN} += " \ + python3-image \ + python3-numbers \ +" SRC_URI[sha256sum] = "e7d5a5c26cd0dc37b164ebefc609f388de24f8593b659191e12d85f8f9d5eb58" diff --git a/meta-python/recipes-devtools/python/python3-configargparse_1.5.3.bb b/meta-python/recipes-devtools/python/python3-configargparse_1.5.5.bb index 7d21375548..7d3a5fba5f 100644 --- a/meta-python/recipes-devtools/python/python3-configargparse_1.5.3.bb +++ b/meta-python/recipes-devtools/python/python3-configargparse_1.5.5.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/bw2/ConfigArgParse" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=da746463714cc35999ed9a42339f2943" -SRC_URI[sha256sum] = "1b0b3cbf664ab59dada57123c81eff3d9737e0d11d8cf79e3d6eb10823f1739f" +SRC_URI[sha256sum] = "363d80a6d35614bd446e2f2b1b216f3b33741d03ac6d0a92803306f40e555b58" PYPI_PACKAGE = "ConfigArgParse" diff --git a/meta-python/recipes-devtools/python/python3-configobj_5.0.8.bb b/meta-python/recipes-devtools/python/python3-configobj_5.0.8.bb index b8b5e6f897..8dc706fdfd 100644 --- a/meta-python/recipes-devtools/python/python3-configobj_5.0.8.bb +++ b/meta-python/recipes-devtools/python/python3-configobj_5.0.8.bb @@ -8,6 +8,7 @@ SRC_URI[sha256sum] = "6f704434a07dc4f4dc7c9a745172c1cad449feb548febd9f7fe362629c inherit pypi setuptools3 -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-six \ +RDEPENDS:${PN} += " \ + python3-pprint \ + python3-six \ " diff --git a/meta-python/recipes-devtools/python/python3-configshell-fb_1.1.29.bb b/meta-python/recipes-devtools/python/python3-configshell-fb_1.1.29.bb index 2bb196c209..7a7ecd753f 100644 --- a/meta-python/recipes-devtools/python/python3-configshell-fb_1.1.29.bb +++ b/meta-python/recipes-devtools/python/python3-configshell-fb_1.1.29.bb @@ -14,4 +14,9 @@ S = "${WORKDIR}/git" inherit setuptools3 PIP_INSTALL_PACKAGE = "configshell_fb" -RDEPENDS:${PN} += "python3-modules python3-fcntl python3-six" +RDEPENDS:${PN} += " \ + python3-fcntl \ + python3-modules \ + python3-pyparsing \ + python3-six \ +" diff --git a/meta-python/recipes-devtools/python/python3-covdefaults/run-ptest b/meta-python/recipes-devtools/python/python3-covdefaults/run-ptest new file mode 100644 index 0000000000..3385d68939 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-covdefaults/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-python/recipes-devtools/python/python3-covdefaults_2.3.0.bb b/meta-python/recipes-devtools/python/python3-covdefaults_2.3.0.bb new file mode 100644 index 0000000000..b7709aa1ca --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-covdefaults_2.3.0.bb @@ -0,0 +1,31 @@ +SUMMARY = "A coverage plugin to provide sensible default settings" +HOMEPAGE = "https://github.com/asottile/covdefaults" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a3da826da635201a80d2fb40f3034929" + +# Use GitHub SRC_URI, as pypi package does not include tests +SRC_URI += " \ + git://github.com/asottile/covdefaults.git;branch=main;protocol=https \ + file://run-ptest \ +" + +SRCREV = "007f5aff5d1c817883385a5f61f742dd11776dc6" + +S = "${WORKDIR}/git" + +inherit setuptools3 ptest + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-coverage \ +" + +RDEPENDS:${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH} + cp -rf ${S}/tests ${D}${PTEST_PATH} +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-coverage_7.0.5.bb b/meta-python/recipes-devtools/python/python3-coverage_7.0.5.bb deleted file mode 100644 index 98f0f191c6..0000000000 --- a/meta-python/recipes-devtools/python/python3-coverage_7.0.5.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Code coverage measurement for Python" -HOMEPAGE = "https://coverage.readthedocs.io" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ee41112a44fe7014dce33e26468ba93" - -SRC_URI[sha256sum] = "051afcbd6d2ac39298d62d340f94dbb6a1f31de06dfaf6fcef7b759dd3860c45" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-sqlite3 \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-xml \ - ${PYTHON_PN}-crypt \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-toml \ - ${PYTHON_PN}-multiprocessing \ -" diff --git a/meta-python/recipes-devtools/python/python3-coverage_7.2.7.bb b/meta-python/recipes-devtools/python/python3-coverage_7.2.7.bb new file mode 100644 index 0000000000..a69c05d25b --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-coverage_7.2.7.bb @@ -0,0 +1,20 @@ +SUMMARY = "Code coverage measurement for Python" +HOMEPAGE = "https://coverage.readthedocs.io" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ee41112a44fe7014dce33e26468ba93" + +SRC_URI[sha256sum] = "924d94291ca674905fe9481f12294eb11f2d3d3fd1adb20314ba89e94f44ed59" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + python3-crypt \ + python3-io \ + python3-json \ + python3-multiprocessing \ + python3-pprint \ + python3-shell \ + python3-sqlite3 \ + python3-tomllib \ + python3-xml \ +" diff --git a/meta-python/recipes-devtools/python/python3-crc32c_2.3.bb b/meta-python/recipes-devtools/python/python3-crc32c_2.3.bb index 2032568950..da756ea074 100644 --- a/meta-python/recipes-devtools/python/python3-crc32c_2.3.bb +++ b/meta-python/recipes-devtools/python/python3-crc32c_2.3.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE;md5=4fbd65380cdd255951079008b364516c \ file://LICENSE.google-crc32c;md5=e9ed01b5e5ac9eae23fc2bb33701220c \ file://LICENSE.slice-by-8;md5=6b3bc7709d6b2db6646ec2467310ff6b \ - file://crc32c_adler.c;startline=9;endline=24;md5=c60e6e55d0e5d95effa6fad27db0711a \ + file://crc32c_adler.c;beginline=9;endline=24;md5=9c8bd2afd2d340fd37c038759cd4eff8 \ " SRC_URI[sha256sum] = "17ce6c596ad0d53df52dcd72defb66984aeabd98fbefea7ba848a6b6bdece36a" diff --git a/meta-python/recipes-devtools/python/python3-croniter_1.3.8.bb b/meta-python/recipes-devtools/python/python3-croniter_1.4.1.bb index 691c25017b..e9f84eb9e5 100644 --- a/meta-python/recipes-devtools/python/python3-croniter_1.3.8.bb +++ b/meta-python/recipes-devtools/python/python3-croniter_1.4.1.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b8ee59850b882cbf623188489ea748e2" PYPI_PACKAGE = "croniter" -SRC_URI[sha256sum] = "32a5ec04e97ec0837bcdf013767abd2e71cceeefd3c2e14c804098ce51ad6cd9" +SRC_URI[sha256sum] = "1a6df60eacec3b7a0aa52a8f2ef251ae3dd2a7c7c8b9874e73e791636d55a361" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-custom-inherit_2.3.1.bb b/meta-python/recipes-devtools/python/python3-custom-inherit_2.3.1.bb index c0e10448ea..8ff3b9e3d1 100644 --- a/meta-python/recipes-devtools/python/python3-custom-inherit_2.3.1.bb +++ b/meta-python/recipes-devtools/python/python3-custom-inherit_2.3.1.bb @@ -8,3 +8,8 @@ PYPI_PACKAGE = "custom_inherit" SRC_URI[sha256sum] = "a0d104847b4cc1ae24e00061fc2e11da8766b019bf4c8c753822347366c8c49f" inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + python3-json \ + python3-stringold \ +" diff --git a/meta-python/recipes-devtools/python/python3-daemon_3.0.1.bb b/meta-python/recipes-devtools/python/python3-daemon_3.0.1.bb new file mode 100644 index 0000000000..79507bdce2 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-daemon_3.0.1.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Library to implement a well-behaved Unix daemon process" +HOMEPAGE = "https://pagure.io/python-daemon/" +SECTION = "devel/python" + +DEPENDS += "${PYTHON_PN}-docutils-native" +RDEPENDS:${PN} = "${PYTHON_PN}-docutils \ + ${PYTHON_PN}-lockfile (>= 0.10) \ + ${PYTHON_PN}-resource \ +" + +LICENSE = "Apache-2.0 & GPL-3.0-only" +LIC_FILES_CHKSUM = "file://README;md5=a3a94c615dc969a70525f1eebbacf235" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "6c57452372f7eaff40934a1c03ad1826bf5e793558e87fef49131e6464b4dae5" + +PYPI_PACKAGE = "python-daemon" diff --git a/meta-python/recipes-devtools/python/python3-dateparser_1.1.6.bb b/meta-python/recipes-devtools/python/python3-dateparser_1.1.8.bb index 80869d0163..8b890fb227 100644 --- a/meta-python/recipes-devtools/python/python3-dateparser_1.1.6.bb +++ b/meta-python/recipes-devtools/python/python3-dateparser_1.1.8.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/scrapinghub/dateparser" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=3d3ed25571191e7aa3f55d0a6efe0051" -SRC_URI[sha256sum] = "e703db1815270c020552f4b3e3a981937b48b2cbcfcef5347071b74788dd9214" +SRC_URI[sha256sum] = "86b8b7517efcc558f085a142cdb7620f0921543fcabdb538c8a4c4001d8178e3" PYPI_PACKAGE = "dateparser" @@ -12,9 +12,12 @@ inherit pypi setuptools3 CLEANBROKEN = "1" RDEPENDS:${PN} += " \ - ${PYTHON_PN}-dateutil \ - ${PYTHON_PN}-tzlocal \ - ${PYTHON_PN}-ruamel-yaml \ + python3-dateutil \ + python3-logging \ + python3-pytz \ + python3-regex \ + python3-ruamel-yaml \ + python3-tzlocal \ " -# Ommitted ${PYTHON_PN}-convertdate, ${PYTHON_PN}-jdatetime ${PYTHON_PN}-umalqurra +# Ommitted python3-convertdate, python3-jdatetime python3-umalqurra diff --git a/meta-python/recipes-devtools/python/python3-dbus-fast_1.85.0.bb b/meta-python/recipes-devtools/python/python3-dbus-fast_1.85.0.bb new file mode 100644 index 0000000000..6e1b599351 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-dbus-fast_1.85.0.bb @@ -0,0 +1,15 @@ +SUMMARY = "A faster version of dbus-next originally from the great DBus next library." +HOMEPAGE = "https://github.com/bluetooth-devices/dbus-fast" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=729e372b5ea0168438e4fd4a00a04947" + +SRC_URI[sha256sum] = "af346e87e34fa52c7ae82d117303cbfe089cd5391b5a1cc0e51f67066ef426f5" + +PYPI_PACKAGE = "dbus_fast" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + python3-core (>=3.7) \ + python3-async-timeout \ +" diff --git a/meta-python/recipes-devtools/python/python3-dbus-next_0.2.3.bb b/meta-python/recipes-devtools/python/python3-dbus-next_0.2.3.bb index 3ee11b9d55..9f6aa7ed7f 100644 --- a/meta-python/recipes-devtools/python/python3-dbus-next_0.2.3.bb +++ b/meta-python/recipes-devtools/python/python3-dbus-next_0.2.3.bb @@ -10,3 +10,8 @@ PYPI_PACKAGE = "dbus_next" inherit pypi setuptools3 BBCLASSEXTEND = "native nativesdk" + +RDEPENDS:${PN} += " \ + python3-asyncio \ + python3-xml \ +" diff --git a/meta-python/recipes-devtools/python/python3-decouple_3.7.bb b/meta-python/recipes-devtools/python/python3-decouple_3.8.bb index 5238431bcb..20d614a423 100644 --- a/meta-python/recipes-devtools/python/python3-decouple_3.7.bb +++ b/meta-python/recipes-devtools/python/python3-decouple_3.8.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=a46375b26bb7d7603565d829a2a51782" -SRC_URI[sha256sum] = "e88a8d6bdf3b07d471a854099e455e20a6fa7a4d6ecf8631b250e3db654336e6" +SRC_URI[sha256sum] = "ba6e2657d4f376ecc46f77a3a615e058d93ba5e465c01bbe57289bfb7cce680f" PYPI_PACKAGE = "python-decouple" diff --git a/meta-python/recipes-devtools/python/python3-defusedxml_0.7.1.bb b/meta-python/recipes-devtools/python/python3-defusedxml_0.7.1.bb index 3396c7262d..8ec6680d8f 100644 --- a/meta-python/recipes-devtools/python/python3-defusedxml_0.7.1.bb +++ b/meta-python/recipes-devtools/python/python3-defusedxml_0.7.1.bb @@ -10,3 +10,5 @@ SRC_URI[sha256sum] = "1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51 inherit pypi setuptools3 BBCLASSEXTEND = "native" + +RDEPENDS:${PN} += "python3-xml" diff --git a/meta-python/recipes-devtools/python/python3-deprecated_1.2.13.bb b/meta-python/recipes-devtools/python/python3-deprecated_1.2.14.bb index 6ea47f4292..4b5c78fb03 100644 --- a/meta-python/recipes-devtools/python/python3-deprecated_1.2.13.bb +++ b/meta-python/recipes-devtools/python/python3-deprecated_1.2.14.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=44288e26f4896bdab14072d4fa35ff01" PYPI_PACKAGE = "Deprecated" -SRC_URI[sha256sum] = "43ac5335da90c31c24ba028af536a91d41d53f9e6901ddb021bcc572ce44e38d" +SRC_URI[sha256sum] = "e5323eb936458dccc2582dc6f9c322c852a775a27065ff2b0c4970b9d53d01b3" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-diskcache_5.4.0.bb b/meta-python/recipes-devtools/python/python3-diskcache_5.6.1.bb index 84d42e5722..447bfc440b 100644 --- a/meta-python/recipes-devtools/python/python3-diskcache_5.4.0.bb +++ b/meta-python/recipes-devtools/python/python3-diskcache_5.6.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.grantjenks.com/docs/diskcache/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=c60ef82f0f40155453f6d5f2c94b6e8e" -SRC_URI[sha256sum] = "8879eb8c9b4a2509a5e633d2008634fb2b0b35c2b36192d89655dbde02419644" +SRC_URI[sha256sum] = "e4c978532feff5814c4cc00fe1e11e40501985946643d73220d41ee7737c72c3" PYPI_PACKAGE = "diskcache" diff --git a/meta-python/recipes-devtools/python/python3-distlib_0.3.6.bb b/meta-python/recipes-devtools/python/python3-distlib_0.3.6.bb new file mode 100644 index 0000000000..ffffece56a --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-distlib_0.3.6.bb @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: MIT +# Copyright (C) 2023 iris-GmbH infrared & intelligent sensors + +SUMMARY = "A library which implements low-level functions that relate to packaging and distribution of Python software." +HOMEPAGE = "https://github.com/pypa/distlib" +LICENSE = "PSF-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f6a11430d5cd6e2cd3832ee94f22ddfc" + +SRC_URI[sha256sum] = "14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46" + +BBCLASSEXTEND = "native nativesdk" +inherit pypi python_setuptools_build_meta diff --git a/meta-python/recipes-devtools/python/python3-django_4.1.3.bb b/meta-python/recipes-devtools/python/python3-django_4.2.3.bb index 6d800982af..4e3192744e 100644 --- a/meta-python/recipes-devtools/python/python3-django_4.1.3.bb +++ b/meta-python/recipes-devtools/python/python3-django_4.2.3.bb @@ -1,7 +1,7 @@ require python-django.inc inherit setuptools3 -SRC_URI[sha256sum] = "678bbfc8604eb246ed54e2063f0765f13b321a50526bdc8cb1f943eda7fa31f1" +SRC_URI[sha256sum] = "45a747e1c5b3d6df1b141b1481e193b033fd1fdbda3ff52677dc81afdaacbaed" RDEPENDS:${PN} += "\ ${PYTHON_PN}-sqlparse \ diff --git a/meta-python/recipes-devtools/python/python3-dnspython_2.3.0.bb b/meta-python/recipes-devtools/python/python3-dnspython_2.4.0.bb index 3d1dc8d3ad..bce6ccfafb 100644 --- a/meta-python/recipes-devtools/python/python3-dnspython_2.3.0.bb +++ b/meta-python/recipes-devtools/python/python3-dnspython_2.4.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.dnspython.org/" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=5af50906b5929837f667dfe31052bd34" -SRC_URI[sha256sum] = "224e32b03eb46be70e12ef6d64e0be123a64e621ab4c0822ff6d450d52a540b9" +SRC_URI[sha256sum] = "758e691dbb454d5ccf4e1b154a19e52847f79e21a42fef17b969144af29a4e6c" inherit pypi python_poetry_core ptest diff --git a/meta-python/recipes-devtools/python/python3-dominate_2.7.0.bb b/meta-python/recipes-devtools/python/python3-dominate_2.8.0.bb index bee89ed754..73701ec72e 100644 --- a/meta-python/recipes-devtools/python/python3-dominate_2.7.0.bb +++ b/meta-python/recipes-devtools/python/python3-dominate_2.8.0.bb @@ -2,7 +2,7 @@ SUMMARY = "Dominate is a Python library for creating and manipulating HTML docum LICENSE = "LGPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b52f2d57d10c4f7ee67a7eb9615d5d24" -SRC_URI[sha256sum] = "520101360892ebf9d0553f67d37e359ff92403d8a1e33814030503088a05da49" +SRC_URI[sha256sum] = "4c90c3befaf88e612b71f4b39af7bcbef8977acfa855cec957225a8fbf504007" inherit pypi setuptools3 ptest diff --git a/meta-python/recipes-devtools/python/python3-ecdsa_0.18.0.bb b/meta-python/recipes-devtools/python/python3-ecdsa_0.18.0.bb index 6a399a96fe..d1022891b9 100644 --- a/meta-python/recipes-devtools/python/python3-ecdsa_0.18.0.bb +++ b/meta-python/recipes-devtools/python/python3-ecdsa_0.18.0.bb @@ -13,3 +13,7 @@ inherit pypi setuptools3 python3native RDEPENDS:${PN} += "python3-six python3-gmpy2 python3-pbr" BBCLASSEXTEND = "native nativesdk" + +do_install:append() { + rm ${D}${PYTHON_SITEPACKAGES_DIR}/ecdsa/test_*.py +} diff --git a/meta-python/recipes-devtools/python/python3-editor_1.0.4.bb b/meta-python/recipes-devtools/python/python3-editor_1.0.4.bb index dffc36169e..335461c435 100644 --- a/meta-python/recipes-devtools/python/python3-editor_1.0.4.bb +++ b/meta-python/recipes-devtools/python/python3-editor_1.0.4.bb @@ -10,3 +10,8 @@ PYPI_PACKAGE = "python-editor" inherit pypi setuptools3 BBCLASSEXTEND = "native nativesdk" + +RDEPENDS:${PN} += " \ + python3-io \ + python3-setuptools \ +" diff --git a/meta-python/recipes-devtools/python/python3-elementpath_3.0.2.bb b/meta-python/recipes-devtools/python/python3-elementpath_4.1.4.bb index 661259f467..60c54f0193 100644 --- a/meta-python/recipes-devtools/python/python3-elementpath_3.0.2.bb +++ b/meta-python/recipes-devtools/python/python3-elementpath_4.1.4.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/sissaschool/elementpath" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5dbb7fb7d72da3921202dd7b995d3ecf" -SRC_URI[sha256sum] = "cca18742dc0f354f79874c41a906e6ce4cc15230b7858d22a861e1ec5946940f" +SRC_URI[sha256sum] = "f991c42ff66fa06e219141ccf65890261e6635b448e7d4c2d8b62dc5bf1de9e8" PYPI_PACKAGE = "elementpath" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-engineio_4.3.4.bb b/meta-python/recipes-devtools/python/python3-engineio_4.5.1.bb index d89a54dc3d..d97248891c 100644 --- a/meta-python/recipes-devtools/python/python3-engineio_4.3.4.bb +++ b/meta-python/recipes-devtools/python/python3-engineio_4.5.1.bb @@ -17,4 +17,4 @@ RDEPENDS:${PN} += " \ python3-asyncio \ " -SRC_URI[sha256sum] = "d8d8b072799c36cadcdcc2b40d2a560ce09797ab3d2d596b2ad519a5e4df19ae" +SRC_URI[sha256sum] = "b167a1b208fcdce5dbe96a61a6ca22391cfa6715d796c22de93e3adf9c07ae0c" diff --git a/meta-python/recipes-devtools/python/python3-et-xmlfile_1.1.0.bb b/meta-python/recipes-devtools/python/python3-et-xmlfile_1.1.0.bb index 7c66342ec4..50ae7fa5e4 100644 --- a/meta-python/recipes-devtools/python/python3-et-xmlfile_1.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-et-xmlfile_1.1.0.bb @@ -10,7 +10,13 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148 SRC_URI[sha256sum] = "8eb9e2bc2f8c97e37a2dc85a09ecdcdec9d8a396530a6d5a33b30b9a92da0c5c" -RDEPENDS:${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-io ${PYTHON_PN}-pprint ${PYTHON_PN}-shell" +RDEPENDS:${PN} += " \ + python3-compression \ + python3-io \ + python3-pprint \ + python3-shell \ + python3-xml \ +" inherit setuptools3 pypi diff --git a/meta-python/recipes-devtools/python/python3-eth-account_0.8.0.bb b/meta-python/recipes-devtools/python/python3-eth-account_0.9.0.bb index bb82168b3b..e33b7679c9 100644 --- a/meta-python/recipes-devtools/python/python3-eth-account_0.8.0.bb +++ b/meta-python/recipes-devtools/python/python3-eth-account_0.9.0.bb @@ -2,9 +2,9 @@ SUMMARY = "Assign Ethereum transactions and messages with local private keys." HOMEPAGE = "https://github.com/ethereum/eth-account" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=287820ad3553117aa2f92bf84c219324" +LIC_FILES_CHKSUM = "file://LICENSE;md5=16ffc86adf4293d4cfb204e77d62cfe6" -SRC_URI[sha256sum] = "ccb2d90a16c81c8ea4ca4dc76a70b50f1d63cea6aff3c5a5eddedf9e45143eca" +SRC_URI[sha256sum] = "5f66ecb7bc52569924dfaf4a9add501b1c2a4901eec74e3c0598cd26d0971777" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-eth-hash_0.5.1.bb b/meta-python/recipes-devtools/python/python3-eth-hash_0.5.2.bb index 10d6695dec..683d84761c 100644 --- a/meta-python/recipes-devtools/python/python3-eth-hash_0.5.1.bb +++ b/meta-python/recipes-devtools/python/python3-eth-hash_0.5.2.bb @@ -2,9 +2,9 @@ SUMMARY = "The Ethereum hashing function, keccak256, sometimes (erroneously) cal HOMEPAGE = "https://github.com/ethereum/eth-hash" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=287820ad3553117aa2f92bf84c219324" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3d7bdfe69b1ffbde073ca6e96f5c53f7" -SRC_URI[sha256sum] = "9805075f653e114a31a99678e93b257fb4082337696f4eff7b4371fe65158409" +SRC_URI[sha256sum] = "1b5f10eca7765cc385e1430eefc5ced6e2e463bb18d1365510e2e539c1a6fe4e" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-eth-keyfile/0001-setup-don-t-use-setuptools-markdown.patch b/meta-python/recipes-devtools/python/python3-eth-keyfile/0001-setup-don-t-use-setuptools-markdown.patch deleted file mode 100644 index 7b81203807..0000000000 --- a/meta-python/recipes-devtools/python/python3-eth-keyfile/0001-setup-don-t-use-setuptools-markdown.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4348c72877e049804c7cdb7eec7a6bcd7ac2ea1d Mon Sep 17 00:00:00 2001 -From: Bartosz Golaszewski <brgl@bgdev.pl> -Date: Wed, 11 May 2022 13:21:30 +0200 -Subject: [PATCH] setup: don't use setuptools-markdown - -This project is deprecated and irrelevant for the functionality of -eth-keyfile. We don't support it in meta-python so just drop it from -the dependencies. - -Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl> ---- - setup.py | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/setup.py b/setup.py -index cbb7f4c..7702aa4 100644 ---- a/setup.py -+++ b/setup.py -@@ -51,14 +51,12 @@ setup( - "A library for handling the encrypted keyfiles used to store ethereum " - "private keys." - ), -- long_description_markdown_filename='README.md', - author='Piper Merriam', - author_email='pipermerriam@gmail.com', - url='https://github.com/ethereum/eth-keyfile', - include_package_data=True, - install_requires=install_requires, - extras_require=deps, -- setup_requires=['setuptools-markdown'], - py_modules=['eth_keyfile'], - license="MIT", - zip_safe=False, --- -2.34.1 - diff --git a/meta-python/recipes-devtools/python/python3-eth-keyfile_0.6.0.bb b/meta-python/recipes-devtools/python/python3-eth-keyfile_0.6.1.bb index 9477632e2f..55ab1a78da 100644 --- a/meta-python/recipes-devtools/python/python3-eth-keyfile_0.6.0.bb +++ b/meta-python/recipes-devtools/python/python3-eth-keyfile_0.6.1.bb @@ -4,8 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=2beaef1b1764f4d6b46084c885b4bcad" -SRC_URI[sha256sum] = "d30597cdecb8ccd3b56bb275cd86fcdc7a279f86eafa92ddc49f66512f0bff67" -SRC_URI += "file://0001-setup-don-t-use-setuptools-markdown.patch" +SRC_URI[sha256sum] = "471be6e5386fce7b22556b3d4bde5558dbce46d2674f00848027cb0a20abdc8c" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-eth-typing_3.2.0.bb b/meta-python/recipes-devtools/python/python3-eth-typing_3.4.0.bb index b810341d2b..a1594fbf54 100644 --- a/meta-python/recipes-devtools/python/python3-eth-typing_3.2.0.bb +++ b/meta-python/recipes-devtools/python/python3-eth-typing_3.4.0.bb @@ -2,8 +2,8 @@ SUMMARY = "Common type annotations for ethereum python packages." HOMEPAGE = "https://github.com/ethereum/eth-typing" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=bf9691ead96f1163622689e47ce3f366" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3d7bdfe69b1ffbde073ca6e96f5c53f7" -SRC_URI[sha256sum] = "177e2070da9bf557fe0fd46ee467a7be2d0b6476aa4dc18680603e7da1fc5690" +SRC_URI[sha256sum] = "7f49610469811ee97ac43eaf6baa294778ce74042d41e61ecf22e5ebe385590f" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-eth-utils/0001-setup-don-t-use-setuptools-markdown.patch b/meta-python/recipes-devtools/python/python3-eth-utils/0001-setup-don-t-use-setuptools-markdown.patch index 3c3c5270a3..6584e60e1d 100644 --- a/meta-python/recipes-devtools/python/python3-eth-utils/0001-setup-don-t-use-setuptools-markdown.patch +++ b/meta-python/recipes-devtools/python/python3-eth-utils/0001-setup-don-t-use-setuptools-markdown.patch @@ -9,6 +9,8 @@ the dependencies. Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl> --- +Upstream-Status: Pending + setup.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-python/recipes-devtools/python/python3-eth-utils_2.1.0.bb b/meta-python/recipes-devtools/python/python3-eth-utils_2.2.0.bb index da45cc7c98..ce2dcb0d4c 100644 --- a/meta-python/recipes-devtools/python/python3-eth-utils_2.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-eth-utils_2.2.0.bb @@ -2,9 +2,9 @@ SUMMARY = "Common utility functions for codebases which interact with ethereum." HOMEPAGE = "https://github.com/ethereum/eth-utils" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=287820ad3553117aa2f92bf84c219324" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6749008d847c14b9718949c2e24d5c0a" -SRC_URI[sha256sum] = "fcb4c3c1b32947ba92970963f9aaf40da73b04ea1034964ff8c0e70595127138" +SRC_URI[sha256sum] = "7f1a9e10400ee332432a778c321f446abaedb8f538df550e7c9964f446f7e265" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-evdev_1.6.0.bb b/meta-python/recipes-devtools/python/python3-evdev_1.6.1.bb index 659a86dae3..c091040c5d 100644 --- a/meta-python/recipes-devtools/python/python3-evdev_1.6.0.bb +++ b/meta-python/recipes-devtools/python/python3-evdev_1.6.1.bb @@ -1,9 +1,9 @@ SUMMARY = "Python evdev lib" HOMEPAGE = "https://github.com/gvalkov/python-evdev" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=18debddbb3f52c661a129724a883a8e2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0ff275b442f45fc06287544cf713016f" -SRC_URI[sha256sum] = "ecfa01b5c84f7e8c6ced3367ac95288f43cd84efbfd7dd7d0cdbfc0d18c87a6a" +SRC_URI[sha256sum] = "299db8628cc73b237fc1cc57d3c2948faa0756e2a58b6194b5bf81dc2081f1e3" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-execnet_1.9.0.bb b/meta-python/recipes-devtools/python/python3-execnet_2.0.2.bb index ea17e84143..a934d1c461 100644 --- a/meta-python/recipes-devtools/python/python3-execnet_1.9.0.bb +++ b/meta-python/recipes-devtools/python/python3-execnet_2.0.2.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=772fcdaca14b378878d05c7d857e6c3e" DEPENDS += "\ python3-pip-native \ - python3-setuptools-scm-native \ + python3-hatch-vcs-native \ " SRC_URI += "file://run-ptest \ " -SRC_URI[sha256sum] = "8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5" +SRC_URI[sha256sum] = "cc59bc4423742fd71ad227122eb0dd44db51efb3dc4095b45ac9a08c770096af" -inherit ptest pypi setuptools3 +inherit ptest pypi python_hatchling do_install_ptest() { install -d ${D}${PTEST_PATH}/tests diff --git a/meta-python/recipes-devtools/python/python3-executing_1.2.0.bb b/meta-python/recipes-devtools/python/python3-executing_1.2.0.bb new file mode 100644 index 0000000000..89f935c672 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-executing_1.2.0.bb @@ -0,0 +1,9 @@ +SUMMARY = "Get the currently executing AST node of a frame, and other information" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a3d6c15f7859ae235a78f2758e5a48cf" + +DEPENDS = "python3-setuptools-scm-native" + +inherit pypi python_setuptools_build_meta + +SRC_URI[sha256sum] = "19da64c18d2d851112f09c287f8d3dbbdf725ab0e569077efb6cdcbd3497c107" diff --git a/meta-python/recipes-devtools/python/python3-fastjsonschema_2.16.2.bb b/meta-python/recipes-devtools/python/python3-fastjsonschema_2.18.0.bb index a1d3392e19..e0be7b6160 100644 --- a/meta-python/recipes-devtools/python/python3-fastjsonschema_2.16.2.bb +++ b/meta-python/recipes-devtools/python/python3-fastjsonschema_2.18.0.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/seznam/python-fastjsonschema" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=18950e8362b69c0c617b42b8bd8e7532" -SRCREV = "1aad747bab39d4b1201ab99917463f4079955ecd" +SRCREV = "756540088687cda351390f687b92e602feaa7dc6" PYPI_SRC_URI = "git://github.com/horejsek/python-fastjsonschema;protocol=https;branch=master" SRC_URI += "file://run-ptest" diff --git a/meta-python/recipes-devtools/python/python3-fastnumbers_3.2.1.bb b/meta-python/recipes-devtools/python/python3-fastnumbers_3.2.1.bb deleted file mode 100644 index 0db33052ff..0000000000 --- a/meta-python/recipes-devtools/python/python3-fastnumbers_3.2.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "Super-fast and clean conversions to numbers." -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6a96e5ad780a0eea866ecccec4463517" - -PYPI_PACKAGE = "fastnumbers" - -SRC_URI[sha256sum] = "44f92b42e7e9f2ed77ba5cb7d664f05c17e43d4586718ed6cd3b3fffa0e67f33" - -inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-fastnumbers_5.0.1.bb b/meta-python/recipes-devtools/python/python3-fastnumbers_5.0.1.bb new file mode 100644 index 0000000000..7494c45f06 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-fastnumbers_5.0.1.bb @@ -0,0 +1,10 @@ +SUMMARY = "Super-fast and clean conversions to numbers." +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=58db8ac9e152dd9b700f4d39ff40a31a" + +PYPI_PACKAGE = "fastnumbers" + +SRC_URI[sha256sum] = "9e4fd92cdf263a8e0865af19c40ae9df45a9bc0eb5e22fefea871140e7e0262f" + +inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-filelock_3.12.0.bb b/meta-python/recipes-devtools/python/python3-filelock_3.12.0.bb new file mode 100644 index 0000000000..8deca31b5b --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-filelock_3.12.0.bb @@ -0,0 +1,19 @@ +# SPDX-License-Identifier: MIT +# Copyright (C) 2023 iris-GmbH infrared & intelligent sensors + +SUMMARY = "A single module, which implements a platform independent file lock in Python, which provides a simple way of inter-process communication" +HOMEPAGE = "https://py-filelock.readthedocs.io/" +LICENSE = "Unlicense" +LIC_FILES_CHKSUM = "file://LICENSE;md5=911690f51af322440237a253d695d19f" + +SRC_URI[sha256sum] = "fc03ae43288c013d2ea83c8597001b1129db351aad9c57fe2409327916b8e718" + +UPSTREAM_CHECK_URI = "https://pypi.org/project/lockfile/" +UPSTREAM_CHECK_REGEX = "/lockfile/(?P<pver>(\d+[\.\-_]*)+)" + +BBCLASSEXTEND = "native nativesdk" +inherit pypi python_hatchling + +DEPENDS += "\ + ${PYTHON_PN}-hatch-vcs-native \ +" diff --git a/meta-python/recipes-devtools/python/python3-flask-mail_0.9.1.bb b/meta-python/recipes-devtools/python/python3-flask-mail_0.9.1.bb index e568f7fac2..1aca3a1619 100644 --- a/meta-python/recipes-devtools/python/python3-flask-mail_0.9.1.bb +++ b/meta-python/recipes-devtools/python/python3-flask-mail_0.9.1.bb @@ -11,4 +11,7 @@ PYPI_PACKAGE = "Flask-Mail" inherit pypi setuptools3 -RDEPENDS:${PN} = "${PYTHON_PN}-flask" +RDEPENDS:${PN} = " \ + python3-blinker \ + python3-flask \ +" diff --git a/meta-python/recipes-devtools/python/python3-flask-migrate_4.0.1.bb b/meta-python/recipes-devtools/python/python3-flask-migrate_4.0.4.bb index 7d3ac9e32c..d9df2a4270 100644 --- a/meta-python/recipes-devtools/python/python3-flask-migrate_4.0.1.bb +++ b/meta-python/recipes-devtools/python/python3-flask-migrate_4.0.4.bb @@ -2,7 +2,7 @@ DESCRIPTION = "SQLAlchemy database migrations for Flask applications using Alemb LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b69377f79f3f48c661701236d5a6a85" -SRC_URI[sha256sum] = "f62b51f9cd2c4f444deac111726a2335d0b846dcf51909a97e261d2098b816f7" +SRC_URI[sha256sum] = "73293d40b10ac17736e715b377e7b7bde474cb8105165d77474df4c3619b10b3" PYPI_PACKAGE = "Flask-Migrate" diff --git a/meta-python/recipes-devtools/python/python3-flask-restful_0.3.9.bb b/meta-python/recipes-devtools/python/python3-flask-restful_0.3.10.bb index 294e3b0928..7d5f1ea41d 100644 --- a/meta-python/recipes-devtools/python/python3-flask-restful_0.3.9.bb +++ b/meta-python/recipes-devtools/python/python3-flask-restful_0.3.10.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/flask-restful/flask-restful" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=685bb55ed99a366bb431995f5eef2783" -SRC_URI[sha256sum] = "ccec650b835d48192138c85329ae03735e6ced58e9b2d9c2146d6c84c06fa53e" +SRC_URI[sha256sum] = "fe4af2ef0027df8f9b4f797aba20c5566801b6ade995ac63b588abf1a59cec37" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-flask-script_2.0.6.bb b/meta-python/recipes-devtools/python/python3-flask-script_2.0.6.bb deleted file mode 100644 index 9f885191be..0000000000 --- a/meta-python/recipes-devtools/python/python3-flask-script_2.0.6.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools3 -require python-flask-script.inc diff --git a/meta-python/recipes-devtools/python/python3-flask-socketio_5.3.2.bb b/meta-python/recipes-devtools/python/python3-flask-socketio_5.3.4.bb index b7ba80991a..4dae0d14ba 100644 --- a/meta-python/recipes-devtools/python/python3-flask-socketio_5.3.2.bb +++ b/meta-python/recipes-devtools/python/python3-flask-socketio_5.3.4.bb @@ -9,7 +9,7 @@ inherit pypi python_setuptools_build_meta PYPI_PACKAGE = "Flask-SocketIO" -SRC_URI[sha256sum] = "11d1d78b8805cda351b27828a110b88c74a573be62b07f7f5a519fb67fae0a58" +SRC_URI[sha256sum] = "1cbd379c9bf68ac37bcc4750d01708922fa6365d13a5447d3f8893792879410c" RDEPENDS:${PN} += "\ ${PYTHON_PN}-flask \ diff --git a/meta-python/recipes-devtools/python/python3-flask-user_0.6.19.bb b/meta-python/recipes-devtools/python/python3-flask-user_0.6.19.bb index fbacf2e996..ac449361a4 100644 --- a/meta-python/recipes-devtools/python/python3-flask-user_0.6.19.bb +++ b/meta-python/recipes-devtools/python/python3-flask-user_0.6.19.bb @@ -13,7 +13,12 @@ PYPI_PACKAGE = "Flask-User" inherit pypi setuptools3 -RDEPENDS:${PN} = "${PYTHON_PN}-flask \ - ${PYTHON_PN}-flask-login \ - ${PYTHON_PN}-flask-mail \ - ${PYTHON_PN}-babel" +RDEPENDS:${PN} = " \ + python3-babel \ + python3-blinker \ + python3-flask \ + python3-flask-login \ + python3-flask-mail \ + python3-flask-wtf \ + python3-passlib \ +" diff --git a/meta-python/recipes-devtools/python/python3-flask-wtf_1.1.0.bb b/meta-python/recipes-devtools/python/python3-flask-wtf_1.1.1.bb index 92d78674e9..ec47fcac2c 100644 --- a/meta-python/recipes-devtools/python/python3-flask-wtf_1.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-flask-wtf_1.1.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Simple integration of Flask and WTForms." LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=d98d089889e14b227732d45dac3aacc4" -SRC_URI[sha256sum] = "10fd267a41b6dee4f433ec8d6507d4cce4f1d71700280cf654a7cdbae6408d47" +SRC_URI[sha256sum] = "41c4244e9ae626d63bed42ae4785b90667b885b1535d5a4095e1f63060d12aa9" PYPI_PACKAGE = "Flask-WTF" diff --git a/meta-python/recipes-devtools/python/python3-flask_2.2.2.bb b/meta-python/recipes-devtools/python/python3-flask_2.3.2.bb index cceab72ede..c4c1ff7dec 100644 --- a/meta-python/recipes-devtools/python/python3-flask_2.2.2.bb +++ b/meta-python/recipes-devtools/python/python3-flask_2.3.2.bb @@ -6,18 +6,19 @@ HOMEPAGE = "https://github.com/mitsuhiko/flask/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75" -SRC_URI[sha256sum] = "642c450d19c4ad482f96729bd2a8f6d32554aa1e231f4f6b4e7e5264b16cca2b" +SRC_URI[sha256sum] = "8c2f9abd47a9e8df7f0c3f091ce9497d011dc3b31effcf4c85a6e2b50f4114ef" PYPI_PACKAGE = "Flask" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta CLEANBROKEN = "1" RDEPENDS:${PN} = " \ - ${PYTHON_PN}-werkzeug \ - ${PYTHON_PN}-jinja2 \ - ${PYTHON_PN}-itsdangerous \ + ${PYTHON_PN}-blinker \ ${PYTHON_PN}-click \ + ${PYTHON_PN}-itsdangerous \ + ${PYTHON_PN}-jinja2 \ ${PYTHON_PN}-profile \ + ${PYTHON_PN}-werkzeug \ " diff --git a/meta-python/recipes-devtools/python/python3-frozenlist_1.3.3.bb b/meta-python/recipes-devtools/python/python3-frozenlist_1.4.0.bb index 0cd23ab7a8..340b0e3845 100644 --- a/meta-python/recipes-devtools/python/python3-frozenlist_1.3.3.bb +++ b/meta-python/recipes-devtools/python/python3-frozenlist_1.4.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/aio-libs/frozenlist" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=cf056e8e7a0a5477451af18b7b5aa98c" -SRC_URI[sha256sum] = "58bcc55721e8a90b88332d6cd441261ebb22342e238296bb330968952fbb3a6a" +SRC_URI[sha256sum] = "09163bdf0b2907454042edb19f887c6d33806adc71fbd54afc14908bfdc22251" inherit pypi python_setuptools_build_meta diff --git a/meta-python/recipes-devtools/python/python3-gast_0.5.3.bb b/meta-python/recipes-devtools/python/python3-gast_0.5.4.bb index 7fd49456d2..9c750ea3b0 100644 --- a/meta-python/recipes-devtools/python/python3-gast_0.5.3.bb +++ b/meta-python/recipes-devtools/python/python3-gast_0.5.4.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=a3ad9b6802e713fc5e307e1230f1ea90" -SRC_URI[sha256sum] = "cfbea25820e653af9c7d1807f659ce0a0a9c64f2439421a7bba4f0983f532dea" +SRC_URI[sha256sum] = "9c270fe5f4b130969b54174de7db4e764b09b4f7f67ccfc32480e29f78348d97" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-gcovr_5.2.bb b/meta-python/recipes-devtools/python/python3-gcovr_6.0.bb index 03231f926a..21c36687e2 100644 --- a/meta-python/recipes-devtools/python/python3-gcovr_5.2.bb +++ b/meta-python/recipes-devtools/python/python3-gcovr_6.0.bb @@ -2,16 +2,16 @@ DESCRIPTION = "generate GCC code coverage reports" HOMEPAGE = "https://gcovr.com" SECTION = "devel/python" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e59af597b3484fa3b52c0fbfd5d17611" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=6542fc4ce5904ffb741ef56f8fe33452" SRC_URI = "git://github.com/gcovr/gcovr.git;branch=master;protocol=https" -SRCREV = "1040a85ecfb3ef0d01635df9d50a3cae5059d566" +SRCREV = "1221ef62ff0de15bbeaf79e68e08a65d62c73ff4" S = "${WORKDIR}/git" inherit setuptools3 PIP_INSTALL_PACKAGE = "gcovr" -RDEPENDS:${PN} += "${PYTHON_PN}-jinja2 ${PYTHON_PN}-lxml ${PYTHON_PN}-setuptools ${PYTHON_PN}-pygments" +RDEPENDS:${PN} += "${PYTHON_PN}-jinja2 ${PYTHON_PN}-lxml ${PYTHON_PN}-setuptools ${PYTHON_PN}-pygments ${PYTHON_PN}-multiprocessing" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-geojson_2.5.0.bb b/meta-python/recipes-devtools/python/python3-geojson_3.0.1.bb index 40cf8bda76..671fe4f23a 100644 --- a/meta-python/recipes-devtools/python/python3-geojson_2.5.0.bb +++ b/meta-python/recipes-devtools/python/python3-geojson_3.0.1.bb @@ -1,10 +1,9 @@ SUMMARY = "Python bindings and utilities for GeoJSON" HOMEPAGE = "https://pypi.org/project/geojson/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=f48972abe5cddee79e301574742ed745" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=f77f2ed49768c8d4c79ba874c0f94d8a" -SRC_URI[md5sum] = "14753ed28678828b1de73f68b04e2324" -SRC_URI[sha256sum] = "6e4bb7ace4226a45d9c8c8b1348b3fc43540658359f93c3f7e03efa9f15f658a" +SRC_URI[sha256sum] = "ff3d75acab60b1e66504a11f7ea12c104bad32ff3c410a807788663b966dee4a" inherit pypi setuptools3 ptest diff --git a/meta-python/recipes-devtools/python/python3-gevent_22.10.2.bb b/meta-python/recipes-devtools/python/python3-gevent_23.7.0.bb index b9bf9130db..a82abcc096 100644 --- a/meta-python/recipes-devtools/python/python3-gevent_22.10.2.bb +++ b/meta-python/recipes-devtools/python/python3-gevent_23.7.0.bb @@ -13,7 +13,7 @@ RDEPENDS:${PN} = "${PYTHON_PN}-greenlet \ SRC_URI += "file://0001-_setuputils.py-Do-not-add-sys_inc_dir.patch" -SRC_URI[sha256sum] = "1ca01da176ee37b3527a2702f7d40dbc9ffb8cfc7be5a03bfa4f9eec45e55c46" +SRC_URI[sha256sum] = "d0d3630674c1b344b256a298ab1ff43220f840b12af768131b5d74e485924237" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-gmqtt_0.6.11.bb b/meta-python/recipes-devtools/python/python3-gmqtt_0.6.12.bb index 0e6670b906..c06e94e7a3 100644 --- a/meta-python/recipes-devtools/python/python3-gmqtt_0.6.11.bb +++ b/meta-python/recipes-devtools/python/python3-gmqtt_0.6.12.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/wialon/gmqtt" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=903f1792621a3b35ee546da75d139177" -SRC_URI[sha256sum] = "0be6d57841538abc3ae0a41131c6d53314e0705b74876a6f94bc903df1209fb6" +SRC_URI[sha256sum] = "7df03792343089ae62dc7cd6f8be356861c4fc68768cefa22f3d8de5e7e5be48" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-google-api-core_2.11.0.bb b/meta-python/recipes-devtools/python/python3-google-api-core_2.11.1.bb index 439358d05f..8ac34e6398 100644 --- a/meta-python/recipes-devtools/python/python3-google-api-core_2.11.0.bb +++ b/meta-python/recipes-devtools/python/python3-google-api-core_2.11.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" inherit pypi setuptools3 -SRC_URI[sha256sum] = "4b9bb5d5a380a0befa0573b302651b8a9a89262c1730e37bf423cec511804c22" +SRC_URI[sha256sum] = "25d29e05a0058ed5f19c61c0a78b1b53adea4d9364b464d014fbda941f6d1c9a" RDEPENDS:${PN} += "\ ${PYTHON_PN}-asyncio \ diff --git a/meta-python/recipes-devtools/python/python3-google-api-python-client_2.72.0.bb b/meta-python/recipes-devtools/python/python3-google-api-python-client_2.93.0.bb index d0e94d8fbb..14a3b4fbed 100644 --- a/meta-python/recipes-devtools/python/python3-google-api-python-client_2.72.0.bb +++ b/meta-python/recipes-devtools/python/python3-google-api-python-client_2.93.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] = "0ddf4a44256d4516635578b93a9ac0dfba7d8bd357cd896e68ef9c549a840b2f" +SRC_URI[sha256sum] = "62ee28e96031a10a1c341f226a75ac6a4f16bdb1d888dc8222b2cdca133d0031" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-google-auth_2.16.0.bb b/meta-python/recipes-devtools/python/python3-google-auth_2.22.0.bb index 07dc8d045d..ff3f422f33 100644 --- a/meta-python/recipes-devtools/python/python3-google-auth_2.16.0.bb +++ b/meta-python/recipes-devtools/python/python3-google-auth_2.22.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" inherit pypi setuptools3 -SRC_URI[sha256sum] = "ed7057a101af1146f0554a769930ac9de506aeca4fd5af6543ebe791851a9fbd" +SRC_URI[sha256sum] = "164cba9af4e6e4e40c3a4f90a1a6c12ee56f14c0b4868d1ca91b32826ab334ce" RDEPENDS:${PN} += "\ ${PYTHON_PN}-asyncio \ diff --git a/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.58.0.bb b/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.59.1.bb index 27c3b9b227..802a434993 100644 --- a/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.58.0.bb +++ b/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.59.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7ca inherit pypi setuptools3 -SRC_URI[sha256sum] = "c727251ec025947d545184ba17e3578840fc3a24a0516a020479edab660457df" +SRC_URI[sha256sum] = "b35d530fe825fb4227857bc47ad84c33c809ac96f312e13182bdeaa2abe1178a" RDEPENDS:${PN} += "\ ${PYTHON_PN}-grpcio \ diff --git a/meta-python/recipes-devtools/python/python3-gpiod/run-ptest b/meta-python/recipes-devtools/python/python3-gpiod/run-ptest new file mode 100644 index 0000000000..bf1244b07c --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-gpiod/run-ptest @@ -0,0 +1,15 @@ +#!/bin/sh + +cd $(dirname "$(readlink -f "$0")") + +# python3-gpiod uses gpio-sim - a configfs-based testing module. We need to +# make sure configfs is mounted before running any tests. +modprobe configfs +mountpoint /sys/kernel/config > /dev/null || mount -t configfs configfs /sys/kernel/config + +python3 -m gpiod-test -v > ./python3-gpiod.out 2>&1 +if [ $? -ne 0 ]; then + echo "FAIL: python3-gpiod" +else + echo "PASS: python3-gpiod" +fi diff --git a/meta-python/recipes-devtools/python/python3-gpiod_2.0.1.bb b/meta-python/recipes-devtools/python/python3-gpiod_2.0.1.bb new file mode 100644 index 0000000000..f833e69032 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-gpiod_2.0.1.bb @@ -0,0 +1,38 @@ +SUMMARY = "Python bindings for libgpiod." +AUTHOR = "Bartosz Golaszewski <brgl@bgdev.pl>" + +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & CC-BY-SA-4.0" +# The actual license files live in the upstream libgpiod from which the pypi +# package is spun out. +LIC_FILES_CHKSUM = "file://setup.py;beginline=57;endline=57;md5=120334ed83ec0cb248605e775bd13b87" + +SRC_URI += "file://run-ptest" + +SRC_URI[sha256sum] = "d5c0f9502e97e7359b9dd601e29f15d668983ce50f5c13323f3302845f790fa6" + +inherit setuptools3 ptest pypi + +PYPI_PACKAGE = "libgpiod" + +DEPENDS += "libgpiod" +RDEPENDS:${PN} += " \ + libgpiod (>= 2.0) \ + python3-datetime \ + python3-profile \ +" +RDEPENDS:${PN}-ptest += " \ + libgpiod-ptest \ + python3-setuptools \ +" + +export GPIOD_WITH_TESTS = "${@bb.utils.contains("PTEST_ENABLED", "1", "1", "0", d)}" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/gpiod-test/gpiosim + install -d ${D}${PTEST_PATH}/gpiod-test/procname + install -m 0644 ${S}/tests/*.py ${D}${PTEST_PATH}/gpiod-test/ + install -m 0644 ${B}/build/lib*/tests/gpiosim/_ext* ${D}${PTEST_PATH}/gpiod-test/gpiosim + install -m 0644 ${S}/tests/gpiosim/*.py ${D}${PTEST_PATH}/gpiod-test/gpiosim + install -m 0644 ${B}/build/lib*/tests/procname/_ext* ${D}${PTEST_PATH}/gpiod-test/procname + install -m 0644 ${S}/tests/procname/*.py ${D}${PTEST_PATH}/gpiod-test/procname +} diff --git a/meta-python/recipes-devtools/python/python3-greenlet/0001-cleanup-Drop-using-register-storage-class-keyword-ev.patch b/meta-python/recipes-devtools/python/python3-greenlet/0001-cleanup-Drop-using-register-storage-class-keyword-ev.patch new file mode 100644 index 0000000000..2a6ddd4726 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-greenlet/0001-cleanup-Drop-using-register-storage-class-keyword-ev.patch @@ -0,0 +1,247 @@ +From 74d8c5ecdc677a7a412c7f782fe8488a5d987333 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 5 Feb 2023 19:05:45 -0800 +Subject: [PATCH] cleanup: Drop using 'register' storage class keyword everywhere + +This has been dropped in c++17 and newer + +Upstream-Status: Submitted [https://github.com/python-greenlet/greenlet/pull/347] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/greenlet/platform/switch_alpha_unix.h | 4 ++-- + src/greenlet/platform/switch_arm32_gcc.h | 2 +- + src/greenlet/platform/switch_arm32_ios.h | 2 +- + src/greenlet/platform/switch_csky_gcc.h | 2 +- + src/greenlet/platform/switch_mips_unix.h | 4 ++-- + src/greenlet/platform/switch_ppc64_aix.h | 4 ++-- + src/greenlet/platform/switch_ppc64_linux.h | 4 ++-- + src/greenlet/platform/switch_ppc_aix.h | 4 ++-- + src/greenlet/platform/switch_ppc_linux.h | 4 ++-- + src/greenlet/platform/switch_ppc_macosx.h | 4 ++-- + src/greenlet/platform/switch_ppc_unix.h | 4 ++-- + src/greenlet/platform/switch_s390_unix.h | 4 ++-- + src/greenlet/platform/switch_sparc_sun_gcc.h | 4 ++-- + src/greenlet/platform/switch_x32_unix.h | 4 ++-- + src/greenlet/platform/switch_x86_unix.h | 2 +- + 15 files changed, 26 insertions(+), 26 deletions(-) + +diff --git a/src/greenlet/platform/switch_alpha_unix.h b/src/greenlet/platform/switch_alpha_unix.h +index 216619f..7e07abf 100644 +--- a/src/greenlet/platform/switch_alpha_unix.h ++++ b/src/greenlet/platform/switch_alpha_unix.h +@@ -9,8 +9,8 @@ + static int + slp_switch(void) + { +- register int ret; +- register long *stackref, stsizediff; ++ int ret; ++ long *stackref, stsizediff; + __asm__ volatile ("" : : : REGS_TO_SAVE); + __asm__ volatile ("mov $30, %0" : "=r" (stackref) : ); + { +diff --git a/src/greenlet/platform/switch_arm32_gcc.h b/src/greenlet/platform/switch_arm32_gcc.h +index 035d6b9..655003a 100644 +--- a/src/greenlet/platform/switch_arm32_gcc.h ++++ b/src/greenlet/platform/switch_arm32_gcc.h +@@ -56,7 +56,7 @@ __attribute__((optimize("no-omit-frame-pointer"))) + slp_switch(void) + { + void *fp; +- register int *stackref, stsizediff; ++ int *stackref, stsizediff; + int result; + __asm__ volatile ("" : : : REGS_TO_SAVE); + __asm__ volatile ("mov r0," REG_FP "\n\tstr r0,%0" : "=m" (fp) : : "r0"); +diff --git a/src/greenlet/platform/switch_arm32_ios.h b/src/greenlet/platform/switch_arm32_ios.h +index e993707..9e640e1 100644 +--- a/src/greenlet/platform/switch_arm32_ios.h ++++ b/src/greenlet/platform/switch_arm32_ios.h +@@ -38,7 +38,7 @@ __attribute__((optimize("no-omit-frame-pointer"))) + slp_switch(void) + { + void *fp; +- register int *stackref, stsizediff, result; ++ int *stackref, stsizediff, result; + __asm__ volatile ("" : : : REGS_TO_SAVE); + __asm__ volatile ("str " REG_FP ",%0" : "=m" (fp)); + __asm__ ("mov %0," REG_SP : "=r" (stackref)); +diff --git a/src/greenlet/platform/switch_csky_gcc.h b/src/greenlet/platform/switch_csky_gcc.h +index 7486b94..ac469d3 100644 +--- a/src/greenlet/platform/switch_csky_gcc.h ++++ b/src/greenlet/platform/switch_csky_gcc.h +@@ -23,7 +23,7 @@ __attribute__((optimize("no-omit-frame-pointer"))) + #endif + slp_switch(void) + { +- register int *stackref, stsizediff; ++ int *stackref, stsizediff; + int result; + + __asm__ volatile ("" : : : REGS_TO_SAVE); +diff --git a/src/greenlet/platform/switch_mips_unix.h b/src/greenlet/platform/switch_mips_unix.h +index 1916b26..b9003e9 100644 +--- a/src/greenlet/platform/switch_mips_unix.h ++++ b/src/greenlet/platform/switch_mips_unix.h +@@ -19,8 +19,8 @@ + static int + slp_switch(void) + { +- register int err; +- register int *stackref, stsizediff; ++ int err; ++ int *stackref, stsizediff; + #ifdef __mips64 + uint64_t gpsave; + #endif +diff --git a/src/greenlet/platform/switch_ppc64_aix.h b/src/greenlet/platform/switch_ppc64_aix.h +index e07b8de..e7e0b87 100644 +--- a/src/greenlet/platform/switch_ppc64_aix.h ++++ b/src/greenlet/platform/switch_ppc64_aix.h +@@ -74,8 +74,8 @@ + static int + slp_switch(void) + { +- register int err; +- register long *stackref, stsizediff; ++ int err; ++ long *stackref, stsizediff; + void * toc; + void * r30; + __asm__ volatile ("" : : : REGS_TO_SAVE); +diff --git a/src/greenlet/platform/switch_ppc64_linux.h b/src/greenlet/platform/switch_ppc64_linux.h +index 88e6847..3c324d0 100644 +--- a/src/greenlet/platform/switch_ppc64_linux.h ++++ b/src/greenlet/platform/switch_ppc64_linux.h +@@ -76,8 +76,8 @@ + static int + slp_switch(void) + { +- register int err; +- register long *stackref, stsizediff; ++ int err; ++ long *stackref, stsizediff; + void * toc; + void * r30; + __asm__ volatile ("" : : : REGS_TO_SAVE); +diff --git a/src/greenlet/platform/switch_ppc_aix.h b/src/greenlet/platform/switch_ppc_aix.h +index c7d476f..6d93c13 100644 +--- a/src/greenlet/platform/switch_ppc_aix.h ++++ b/src/greenlet/platform/switch_ppc_aix.h +@@ -53,8 +53,8 @@ + static int + slp_switch(void) + { +- register int err; +- register int *stackref, stsizediff; ++ int err; ++ int *stackref, stsizediff; + __asm__ volatile ("" : : : REGS_TO_SAVE); + __asm__ ("mr %0, 1" : "=r" (stackref) : ); + { +diff --git a/src/greenlet/platform/switch_ppc_linux.h b/src/greenlet/platform/switch_ppc_linux.h +index 0a71255..e83ad70 100644 +--- a/src/greenlet/platform/switch_ppc_linux.h ++++ b/src/greenlet/platform/switch_ppc_linux.h +@@ -49,8 +49,8 @@ + static int + slp_switch(void) + { +- register int err; +- register int *stackref, stsizediff; ++ int err; ++ int *stackref, stsizediff; + __asm__ volatile ("" : : : REGS_TO_SAVE); + __asm__ ("mr %0, 1" : "=r" (stackref) : ); + { +diff --git a/src/greenlet/platform/switch_ppc_macosx.h b/src/greenlet/platform/switch_ppc_macosx.h +index 56e573f..d6e5a03 100644 +--- a/src/greenlet/platform/switch_ppc_macosx.h ++++ b/src/greenlet/platform/switch_ppc_macosx.h +@@ -46,8 +46,8 @@ + static int + slp_switch(void) + { +- register int err; +- register int *stackref, stsizediff; ++ int err; ++ int *stackref, stsizediff; + __asm__ volatile ("" : : : REGS_TO_SAVE); + __asm__ ("; asm block 2\n\tmr %0, r1" : "=g" (stackref) : ); + { +diff --git a/src/greenlet/platform/switch_ppc_unix.h b/src/greenlet/platform/switch_ppc_unix.h +index 2b3d307..ca590a5 100644 +--- a/src/greenlet/platform/switch_ppc_unix.h ++++ b/src/greenlet/platform/switch_ppc_unix.h +@@ -47,8 +47,8 @@ + static int + slp_switch(void) + { +- register int err; +- register int *stackref, stsizediff; ++ int err; ++ int *stackref, stsizediff; + __asm__ volatile ("" : : : REGS_TO_SAVE); + __asm__ ("mr %0, 1" : "=g" (stackref) : ); + { +diff --git a/src/greenlet/platform/switch_s390_unix.h b/src/greenlet/platform/switch_s390_unix.h +index 6641854..9199367 100644 +--- a/src/greenlet/platform/switch_s390_unix.h ++++ b/src/greenlet/platform/switch_s390_unix.h +@@ -36,8 +36,8 @@ + static int + slp_switch(void) + { +- register int ret; +- register long *stackref, stsizediff; ++ int ret; ++ long *stackref, stsizediff; + __asm__ volatile ("" : : : REGS_TO_SAVE); + #ifdef __s390x__ + __asm__ volatile ("lgr %0, 15" : "=r" (stackref) : ); +diff --git a/src/greenlet/platform/switch_sparc_sun_gcc.h b/src/greenlet/platform/switch_sparc_sun_gcc.h +index 652b57f..96990c3 100644 +--- a/src/greenlet/platform/switch_sparc_sun_gcc.h ++++ b/src/greenlet/platform/switch_sparc_sun_gcc.h +@@ -51,8 +51,8 @@ + static int + slp_switch(void) + { +- register int err; +- register int *stackref, stsizediff; ++ int err; ++ int *stackref, stsizediff; + + /* Put current stack pointer into stackref. + * Register spilling is done in save/restore. +diff --git a/src/greenlet/platform/switch_x32_unix.h b/src/greenlet/platform/switch_x32_unix.h +index cb14ec1..893369c 100644 +--- a/src/greenlet/platform/switch_x32_unix.h ++++ b/src/greenlet/platform/switch_x32_unix.h +@@ -22,8 +22,8 @@ slp_switch(void) + void* ebx; + unsigned int csr; + unsigned short cw; +- register int err; +- register int *stackref, stsizediff; ++ int err; ++ int *stackref, stsizediff; + __asm__ volatile ("" : : : REGS_TO_SAVE); + __asm__ volatile ("fstcw %0" : "=m" (cw)); + __asm__ volatile ("stmxcsr %0" : "=m" (csr)); +diff --git a/src/greenlet/platform/switch_x86_unix.h b/src/greenlet/platform/switch_x86_unix.h +index 3a95186..493fa6b 100644 +--- a/src/greenlet/platform/switch_x86_unix.h ++++ b/src/greenlet/platform/switch_x86_unix.h +@@ -51,7 +51,7 @@ slp_switch(void) + #endif + void *ebp, *ebx; + unsigned short cw; +- register int *stackref, stsizediff; ++ int *stackref, stsizediff; + __asm__ volatile ("" : : : "esi", "edi"); + __asm__ volatile ("fstcw %0" : "=m" (cw)); + __asm__ volatile ("movl %%ebp, %0" : "=m" (ebp)); +-- +2.39.1 + diff --git a/meta-python/recipes-devtools/python/python3-greenlet/0001-greenlet-Drop-using-register-storage-class-keyword.patch b/meta-python/recipes-devtools/python/python3-greenlet/0001-greenlet-Drop-using-register-storage-class-keyword.patch deleted file mode 100644 index 5abe59279f..0000000000 --- a/meta-python/recipes-devtools/python/python3-greenlet/0001-greenlet-Drop-using-register-storage-class-keyword.patch +++ /dev/null @@ -1,31 +0,0 @@ -From aa505359a3bb5a954fe3c7fbd853c75802bf3533 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 16 Jan 2023 21:37:26 -0800 -Subject: [PATCH] greenlet: Drop using 'register' storage class keyword - -This has been dropped in c++17 and newer - -Upstream-Status: Submitted [https://github.com/python-greenlet/greenlet/pull/336] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/greenlet/platform/switch_riscv_unix.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/greenlet/platform/switch_riscv_unix.h b/src/greenlet/platform/switch_riscv_unix.h -index 5b5ea98..24df9db 100644 ---- a/src/greenlet/platform/switch_riscv_unix.h -+++ b/src/greenlet/platform/switch_riscv_unix.h -@@ -11,8 +11,8 @@ - static int - slp_switch(void) - { -- register int ret; -- register long *stackref, stsizediff; -+ int ret; -+ long *stackref, stsizediff; - __asm__ volatile ("" : : : REGS_TO_SAVE); - __asm__ volatile ("mv %0, sp" : "=r" (stackref) : ); - { --- -2.39.0 - diff --git a/meta-python/recipes-devtools/python/python3-greenlet_2.0.1.bb b/meta-python/recipes-devtools/python/python3-greenlet_2.0.2.bb index 4a50a24184..a2e036a891 100644 --- a/meta-python/recipes-devtools/python/python3-greenlet_2.0.1.bb +++ b/meta-python/recipes-devtools/python/python3-greenlet_2.0.2.bb @@ -4,8 +4,7 @@ LICENSE = "MIT & PSF-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e95668d68e4329085c7ab3535e6a7aee \ file://LICENSE.PSF;md5=c106931d9429eda0492617f037b8f69a" -SRC_URI += "file://0001-greenlet-Drop-using-register-storage-class-keyword.patch" - -SRC_URI[sha256sum] = "42e602564460da0e8ee67cb6d7236363ee5e131aa15943b6670e44e5c2ed0f67" +SRC_URI += "file://0001-cleanup-Drop-using-register-storage-class-keyword-ev.patch" +SRC_URI[sha256sum] = "e7c8dc13af7db097bed64a051d2dd49e9f0af495c26995c00a9ee842690d34c0" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-greenstalk_2.0.0.bb b/meta-python/recipes-devtools/python/python3-greenstalk_2.0.2.bb index 841b84ddf6..33eb62d5d9 100644 --- a/meta-python/recipes-devtools/python/python3-greenstalk_2.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-greenstalk_2.0.2.bb @@ -3,9 +3,8 @@ HOMEPAGE = "https://github.com/mayhewj/greenstalk" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=8f98432ba1fce3933c556430fd47298f" -SRC_URI[sha256sum] = "0020970abdb6f400586938573cbbec80410e83805d61e46cf76ea3ed71129257" +SRC_URI[sha256sum] = "3ebde5fc9ecf986f96f6779fd6d15a53f33d432c52a2e28012e100a99ee154a4" RDEPENDS:${PN} += "python3-io python3-core" -inherit pypi -inherit setuptools3 +inherit pypi python_setuptools_build_meta diff --git a/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-direct_mmap-Use-off_t-on-linux.patch b/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-direct_mmap-Use-off_t-on-linux.patch new file mode 100644 index 0000000000..9b3e5d4a5f --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-direct_mmap-Use-off_t-on-linux.patch @@ -0,0 +1,37 @@ +From 45fdade6c0415ec5af3f9312e6311a4ccc682a7b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 28 Dec 2022 18:24:21 -0800 +Subject: [PATCH] direct_mmap: Use off_t on linux + +off64_t is not provided without defining _LARGEFILE64_SOURCE on musl +this define is not defined automatically like glibc where it gets +defined when _GNU_SOURCE is defined. Using off_t makes it portable +across musl/glibc and for using 64bit off_t on glibc 32bit systems +-D_FILE_OFFSET_BITS=64 can be defined during build via CXXFLAGS + +Upstream-Status: Submitted [https://github.com/abseil/abseil-cpp/pull/1349] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + absl/base/internal/direct_mmap.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/third_party/abseil-cpp/absl/base/internal/direct_mmap.h ++++ b/third_party/abseil-cpp/absl/base/internal/direct_mmap.h +@@ -72,7 +72,7 @@ namespace base_internal { + // Platform specific logic extracted from + // https://chromium.googlesource.com/linux-syscall-support/+/master/linux_syscall_support.h + inline void* DirectMmap(void* start, size_t length, int prot, int flags, int fd, +- off64_t offset) noexcept { ++ off_t offset) noexcept { + #if defined(__i386__) || defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) || \ + defined(__m68k__) || defined(__sh__) || \ + (defined(__hppa__) && !defined(__LP64__)) || \ +@@ -102,7 +102,7 @@ inline void* DirectMmap(void* start, siz + #else + return reinterpret_cast<void*>( + syscall(SYS_mmap2, start, length, prot, flags, fd, +- static_cast<off_t>(offset / pagesize))); ++ offset / pagesize)); + #endif + #elif defined(__s390x__) + // On s390x, mmap() arguments are passed in memory. diff --git a/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-protobuf-Disable-musttail-attribute-on-mips.patch b/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-protobuf-Disable-musttail-attribute-on-mips.patch index 8b13d7ae21..8c70b2b6a6 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-protobuf-Disable-musttail-attribute-on-mips.patch +++ b/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-protobuf-Disable-musttail-attribute-on-mips.patch @@ -14,11 +14,11 @@ Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- a/third_party/protobuf/src/google/protobuf/port_def.inc +++ b/third_party/protobuf/src/google/protobuf/port_def.inc -@@ -255,6 +255,7 @@ +@@ -338,6 +338,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125 #error PROTOBUF_TAILCALL was previously defined #endif - #if __has_cpp_attribute(clang::musttail) && !defined(__arm__) && \ + #if __has_cpp_attribute(clang::musttail) && !defined(__arm__) && \ + !defined(__mips__) && \ - !defined(_ARCH_PPC) && !defined(__wasm__) && \ - !(defined(_MSC_VER) && defined(_M_IX86)) && \ + !defined(_ARCH_PPC) && !defined(__wasm__) && \ + !(defined(_MSC_VER) && defined(_M_IX86)) && !defined(__i386__) && \ !(defined(__NDK_MAJOR__) && __NDK_MAJOR <= 24) diff --git a/meta-python/recipes-devtools/python/python3-grpcio-tools_1.51.1.bb b/meta-python/recipes-devtools/python/python3-grpcio-tools_1.56.0.bb index c1dbde1c9a..8fbe1fa91f 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio-tools_1.51.1.bb +++ b/meta-python/recipes-devtools/python/python3-grpcio-tools_1.56.0.bb @@ -11,8 +11,9 @@ DEPENDS += "${PYTHON_PN}-grpcio" SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch \ file://0001-protobuf-Disable-musttail-attribute-on-mips.patch \ + file://0001-direct_mmap-Use-off_t-on-linux.patch \ " -SRC_URI[sha256sum] = "8e62d23d3fed9d4f81738f98dd193dbd2e21aed4a8f0dd715e75b5439e649727" +SRC_URI[sha256sum] = "39f5877cea514b3da9f2683dfb3ffb45ef47b05f4ff39c287d7d61c5057f48b8" RDEPENDS:${PN} = "${PYTHON_PN}-grpcio" diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-Include-missing-cstdint-header.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-Include-missing-cstdint-header.patch new file mode 100644 index 0000000000..f970cf3c3c --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-grpcio/0001-Include-missing-cstdint-header.patch @@ -0,0 +1,32 @@ +From 752e30eebe5b91c323bafcbea8d450dd5683701a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 30 Jan 2023 10:31:10 -0800 +Subject: [PATCH] Include missing <cstdint> header + +gcc 13 moved some includes around and as a result <cstdint> is +no longer transitively included [1]. Explicitly include it for +int32_t. + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Upstream-Status: Submitted [https://code-review.googlesource.com/c/re2/+/60970] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + third_party/re2/util/pcre.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/third_party/re2/util/pcre.h b/third_party/re2/util/pcre.h +index 896b0bd..271a005 100644 +--- a/third_party/re2/util/pcre.h ++++ b/third_party/re2/util/pcre.h +@@ -163,6 +163,7 @@ + + #include "util/util.h" + #include "re2/stringpiece.h" ++#include <cstdint> + + #ifdef USEPCRE + #include <pcre.h> +-- +2.39.1 + diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-direct_mmap-Use-off_t-on-linux.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-direct_mmap-Use-off_t-on-linux.patch new file mode 100644 index 0000000000..49df528d7e --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-grpcio/0001-direct_mmap-Use-off_t-on-linux.patch @@ -0,0 +1,42 @@ +From 45fdade6c0415ec5af3f9312e6311a4ccc682a7b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 28 Dec 2022 18:24:21 -0800 +Subject: [PATCH] direct_mmap: Use off_t on linux + +off64_t is not provided without defining _LARGEFILE64_SOURCE on musl +this define is not defined automatically like glibc where it gets +defined when _GNU_SOURCE is defined. Using off_t makes it portable +across musl/glibc and for using 64bit off_t on glibc 32bit systems +-D_FILE_OFFSET_BITS=64 can be defined during build via CXXFLAGS + +Upstream-Status: Submitted [https://github.com/abseil/abseil-cpp/pull/1349] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + absl/base/internal/direct_mmap.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/absl/base/internal/direct_mmap.h b/absl/base/internal/direct_mmap.h +index 815b8d23..fdf88f0b 100644 +--- a/absl/base/internal/direct_mmap.h ++++ b/absl/base/internal/direct_mmap.h +@@ -72,7 +72,7 @@ namespace base_internal { + // Platform specific logic extracted from + // https://chromium.googlesource.com/linux-syscall-support/+/master/linux_syscall_support.h + inline void* DirectMmap(void* start, size_t length, int prot, int flags, int fd, +- off64_t offset) noexcept { ++ off_t offset) noexcept { + #if defined(__i386__) || defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) || \ + defined(__m68k__) || defined(__sh__) || \ + (defined(__hppa__) && !defined(__LP64__)) || \ +@@ -102,7 +102,7 @@ inline void* DirectMmap(void* start, size_t length, int prot, int flags, int fd, + #else + return reinterpret_cast<void*>( + syscall(SYS_mmap2, start, length, prot, flags, fd, +- static_cast<off_t>(offset / pagesize))); ++ offset / pagesize)); + #endif + #elif defined(__s390x__) + // On s390x, mmap() arguments are passed in memory. +-- +2.39.0 + diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch index 1f465dbb6e..13911ddcf3 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch +++ b/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch @@ -29,11 +29,9 @@ Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> src/python/grpcio/commands.py | 5 ++++- 2 files changed, 11 insertions(+), 5 deletions(-) -diff --git a/setup.py b/setup.py -index 3a50c97..bb2386d 100644 --- a/setup.py +++ b/setup.py -@@ -205,8 +205,11 @@ def check_linker_need_libatomic(): +@@ -206,8 +206,11 @@ def check_linker_need_libatomic(): """Test if linker on system needs libatomic.""" code_test = (b'#include <atomic>\n' + b'int main() { return std::atomic<int64_t>{}; }') @@ -47,7 +45,7 @@ index 3a50c97..bb2386d 100644 stdin=PIPE, stdout=PIPE, stderr=PIPE) -@@ -215,8 +218,8 @@ def check_linker_need_libatomic(): +@@ -216,8 +219,8 @@ def check_linker_need_libatomic(): return False # Double-check to see if -latomic actually can solve the problem. # https://github.com/grpc/grpc/issues/22491 @@ -58,15 +56,14 @@ index 3a50c97..bb2386d 100644 stdin=PIPE, stdout=PIPE, stderr=PIPE) -diff --git a/src/python/grpcio/commands.py b/src/python/grpcio/commands.py -index d93b6c7..a8c4a51 100644 --- a/src/python/grpcio/commands.py +++ b/src/python/grpcio/commands.py -@@ -228,7 +228,10 @@ class BuildExt(build_ext.build_ext): +@@ -228,8 +228,10 @@ class BuildExt(build_ext.build_ext): """ try: # TODO(lidiz) Remove the generated a.out for success tests. -- cc_test = subprocess.Popen(['cc', '-x', 'c', '-std=c++14', '-'], +- cc = os.environ.get('CC', 'cc') +- cc_test = subprocess.Popen([cc, '-x', 'c', '-std=c++14', '-'], + cc_test, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc' + if not cc_args: + cc_args = "-g" @@ -74,6 +71,3 @@ index d93b6c7..a8c4a51 100644 stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) --- -2.25.1 - diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch new file mode 100644 index 0000000000..918c6c8601 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-grpcio/0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch @@ -0,0 +1,27 @@ +From 4432b9a296c9c287dfe281b4d464dfd03e4eb721 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 12 Feb 2023 21:25:04 -0800 +Subject: [PATCH] zlib: Include unistd.h for open/close C APIs + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + third_party/zlib/gzguts.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/third_party/zlib/gzguts.h b/third_party/zlib/gzguts.h +index 57faf37..3c700c2 100644 +--- a/third_party/zlib/gzguts.h ++++ b/third_party/zlib/gzguts.h +@@ -19,6 +19,7 @@ + #endif + + #include <stdio.h> ++#include <unistd.h> + #include "zlib.h" + #ifdef STDC + # include <string.h> +-- +2.39.1 + diff --git a/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch b/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch index c5fdcd63d2..4100cf63f7 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch +++ b/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch @@ -10,14 +10,14 @@ Sourced from void linux Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Xu Huan <xuhuan.fnst@fujitsu.com> --- +Upstream-Status: Pending + absl/base/internal/unscaledcycleclock.cc | 4 ++-- absl/base/internal/unscaledcycleclock.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 b1c396c..d62bfd6 100644 --- a/absl/base/internal/unscaledcycleclock.cc +++ b/absl/base/internal/unscaledcycleclock.cc @@ -20,7 +20,7 @@ @@ -38,22 +38,6 @@ index b1c396c..d62bfd6 100644 int64_t UnscaledCycleClock::Now() { #ifdef __GLIBC__ -diff --git a/absl/base/internal/unscaledcycleclock.h b/absl/base/internal/unscaledcycleclock.h -index 2cbeae3..683a5ef 100644 ---- a/absl/base/internal/unscaledcycleclock.h -+++ b/absl/base/internal/unscaledcycleclock.h -@@ -46,7 +46,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(__GLIBC__)) || \ -+ defined(__riscv) || \ - 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 5bdd341..a784e0d 100644 --- a/absl/debugging/internal/examine_stack.cc +++ b/absl/debugging/internal/examine_stack.cc @@ -33,6 +33,10 @@ @@ -67,7 +51,7 @@ index 5bdd341..a784e0d 100644 #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) { +@@ -174,8 +178,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]); @@ -79,8 +63,6 @@ index 5bdd341..a784e0d 100644 #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 3929b1b..23d5e50 100644 --- a/absl/debugging/internal/stacktrace_config.h +++ b/absl/debugging/internal/stacktrace_config.h @@ -60,7 +60,7 @@ @@ -92,6 +74,15 @@ index 3929b1b..23d5e50 100644 #define ABSL_STACKTRACE_INL_HEADER \ "absl/debugging/internal/stacktrace_powerpc-inl.inc" #elif defined(__aarch64__) --- -2.25.1 - +--- 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(__GLIBC__)) || \ ++ defined(__riscv) || \ + defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC)) + #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 + #else diff --git a/meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch b/meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch deleted file mode 100644 index d12e35a993..0000000000 --- a/meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch +++ /dev/null @@ -1,50 +0,0 @@ -From f71b32eb8a5c173fc5733847437b9485d75bb2e5 Mon Sep 17 00:00:00 2001 -From: Leon Anavi <leon.anavi@konsulko.com> -Date: Fri, 9 Apr 2021 14:06:36 +0300 -Subject: [PATCH] setup.py: Fix determining target platform - -Do not poke at the build machine to determine target platform or architecture -pass it from environment instead for cross compiling to work - -Upstream-Status: Inappropriate [OE-Specific] -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> ---- - setup.py | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/setup.py b/setup.py -index c93d419f32..71a944a9d0 100644 ---- a/setup.py -+++ b/setup.py -@@ -116,6 +116,9 @@ def _env_bool_value(env_name, default): - BUILD_WITH_BORING_SSL_ASM = _env_bool_value('GRPC_BUILD_WITH_BORING_SSL_ASM', - 'True') - -+BORING_SSL_PLATFORM = os.environ.get('GRPC_BORING_SSL_PLATFORM', -+ 'True') -+ - # Export this environment variable to override the platform variant that will - # be chosen for boringssl assembly optimizations. This option is useful when - # crosscompiling and the host platform as obtained by distutils.utils.get_platform() -@@ -336,13 +339,13 @@ if BUILD_WITH_BORING_SSL_ASM and not BUILD_WITH_SYSTEM_OPENSSL: - LINUX_X86_64 = 'linux-x86_64' - LINUX_ARM = 'linux-arm' - LINUX_AARCH64 = 'linux-aarch64' -- if LINUX_X86_64 == boringssl_asm_platform: -+ if LINUX_X86_64 == BORING_SSL_PLATFORM: - asm_key = 'crypto_linux_x86_64' -- elif LINUX_ARM == boringssl_asm_platform: -+ elif LINUX_ARM == BORING_SSL_PLATFORM: - asm_key = 'crypto_linux_arm' -- elif LINUX_AARCH64 == boringssl_asm_platform: -+ elif LINUX_AARCH64 == BORING_SSL_PLATFORM: - asm_key = 'crypto_linux_aarch64' -- elif "mac" in boringssl_asm_platform and "x86_64" in boringssl_asm_platform: -+ elif "mac" in boringssl_asm_platform and "x86_64" in BORING_SSL_PLATFORM: - asm_key = 'crypto_mac_x86_64' - else: - print("ASM Builds for BoringSSL currently not supported on:", --- -2.17.1 - diff --git a/meta-python/recipes-devtools/python/python3-grpcio/mips_bigendian.patch b/meta-python/recipes-devtools/python/python3-grpcio/mips_bigendian.patch index 775afa415c..088ce33fc5 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio/mips_bigendian.patch +++ b/meta-python/recipes-devtools/python/python3-grpcio/mips_bigendian.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/third_party/boringssl-with-bazel/src/include/openssl/base.h +++ b/third_party/boringssl-with-bazel/src/include/openssl/base.h @@ -102,10 +102,10 @@ extern "C" { diff --git a/meta-python/recipes-devtools/python/python3-grpcio/ppc-boringssl-support.patch b/meta-python/recipes-devtools/python/python3-grpcio/ppc-boringssl-support.patch index 5c9be443d8..5dacc689fc 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio/ppc-boringssl-support.patch +++ b/meta-python/recipes-devtools/python/python3-grpcio/ppc-boringssl-support.patch @@ -5,10 +5,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> --- a/third_party/boringssl-with-bazel/src/include/openssl/base.h +++ b/third_party/boringssl-with-bazel/src/include/openssl/base.h -@@ -99,6 +99,9 @@ extern "C" { - #elif (defined(__PPC64__) || defined(__powerpc64__)) && defined(_LITTLE_ENDIAN) - #define OPENSSL_64_BIT - #define OPENSSL_PPC64LE +@@ -96,6 +96,9 @@ extern "C" { + #elif defined(__ARMEL__) || defined(_M_ARM) + #define OPENSSL_32_BIT + #define OPENSSL_ARM +#elif (defined(__PPC__) || defined(__powerpc__)) +#define OPENSSL_32_BIT +#define OPENSSL_PPC diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.51.1.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.56.0.bb index b0971db1cc..fc871adec4 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio_1.51.1.bb +++ b/meta-python/recipes-devtools/python/python3-grpcio_1.56.0.bb @@ -8,11 +8,13 @@ DEPENDS += "${PYTHON_PN}-protobuf" SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch" SRC_URI:append:class-target = " file://ppc-boringssl-support.patch \ - file://boring_ssl.patch \ file://mips_bigendian.patch \ + file://0001-Include-missing-cstdint-header.patch \ file://abseil-ppc-fixes.patch;patchdir=third_party/abseil-cpp \ + file://0001-direct_mmap-Use-off_t-on-linux.patch;patchdir=third_party/abseil-cpp \ + file://0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch \ " -SRC_URI[sha256sum] = "e6dfc2b6567b1c261739b43d9c59d201c1b89e017afd9e684d85aa7a186c9f7a" +SRC_URI[sha256sum] = "4c08ee21b3d10315b8dc26f6c13917b20ed574cdbed2d2d80c53d5508fdcc0f2" RDEPENDS:${PN} = "${PYTHON_PN}-protobuf \ ${PYTHON_PN}-setuptools \ @@ -28,11 +30,14 @@ export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY = "1" BORING_SSL_PLATFORM:arm = "linux-arm" BORING_SSL_PLATFORM:x86-64 = "linux-x86_64" +BORING_SSL_PLATFORM:aarch64 = "linux-aarch64" BORING_SSL_PLATFORM ?= "unsupported" export GRPC_BORING_SSL_PLATFORM = "${BORING_SSL_PLATFORM}" +export GRPC_BUILD_OVERRIDE_BORING_SSL_ASM_PLATFORM = "${BORING_SSL_PLATFORM}" -BORING_SSL:x86-64 = "1" BORING_SSL:arm = "1" +BORING_SSL:x86-64 = "1" +BORING_SSL:aarch64 = "1" BORING_SSL ?= "0" export GRPC_BUILD_WITH_BORING_SSL_ASM = "${BORING_SSL}" diff --git a/meta-python/recipes-devtools/python/python3-h11_0.14.0.bb b/meta-python/recipes-devtools/python/python3-h11_0.14.0.bb index 7bda0eae18..2bddefa3f0 100644 --- a/meta-python/recipes-devtools/python/python3-h11_0.14.0.bb +++ b/meta-python/recipes-devtools/python/python3-h11_0.14.0.bb @@ -6,3 +6,5 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f5501d19c3116f4aaeef89369f458693" inherit pypi setuptools3 SRC_URI[sha256sum] = "8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d" + +RDEPENDS:${PN} += "python3-profile" diff --git a/meta-python/recipes-devtools/python/python3-h5py/0001-fix-wrong-file-driver-version.patch b/meta-python/recipes-devtools/python/python3-h5py/0001-fix-wrong-file-driver-version.patch deleted file mode 100644 index 2692acde75..0000000000 --- a/meta-python/recipes-devtools/python/python3-h5py/0001-fix-wrong-file-driver-version.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 5b0b1d0b941ba338d449f9261bdf4cb2b679d048 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Tue, 20 Sep 2022 02:53:11 -0700 -Subject: [PATCH] fix wrong file driver version - -Due to commit [1] applied in hdf5 (1.13.2), import hdf5 failed - -|>>> import h5py -|Traceback (most recent call last): -| File "<stdin>", line 1, in <module> -| File "/usr/lib/python3.10/site-packages/h5py/__init__.py", line 56, in <module> -| from . import h5a, h5d, h5ds, h5f, h5fd, h5g, h5r, h5s, h5t, h5p, h5z, h5pl -| File "h5py/h5fd.pyx", line 220, in init h5py.h5fd -|RuntimeError: Wrong file driver version # (wrong file driver version #) - -Initial driver version to fix the error - -[1] https://github.com/HDFGroup/hdf5/commit/42b767fc67ad1e13735e3cee2077f2e108f9463e - -Upstream-Status: Submitted [https://github.com/h5py/h5py/pull/2153] -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - h5py/api_types_hdf5.pxd | 1 + - h5py/h5fd.pyx | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/h5py/api_types_hdf5.pxd b/h5py/api_types_hdf5.pxd -index 6977f1a7..312fdaa0 100644 ---- a/h5py/api_types_hdf5.pxd -+++ b/h5py/api_types_hdf5.pxd -@@ -237,6 +237,7 @@ cdef extern from "hdf5.h": - - # Class information for each file driver - ctypedef struct H5FD_class_t: -+ unsigned version; - const char *name - haddr_t maxaddr - H5F_close_degree_t fc_degree -diff --git a/h5py/h5fd.pyx b/h5py/h5fd.pyx -index 04aff077..d41953d0 100644 ---- a/h5py/h5fd.pyx -+++ b/h5py/h5fd.pyx -@@ -191,6 +191,7 @@ cdef herr_t H5FD_fileobj_flush(H5FD_fileobj_t *f, hid_t dxpl, hbool_t closing) e - cdef H5FD_class_t info - memset(&info, 0, sizeof(info)) - -+info.version = 0x01 - info.name = 'fileobj' - info.maxaddr = libc.stdint.SIZE_MAX - 1 - info.fc_degree = H5F_CLOSE_WEAK --- -2.37.1 - diff --git a/meta-python/recipes-devtools/python/python3-h5py/0001-setup.py-Fix-numpy-version.patch b/meta-python/recipes-devtools/python/python3-h5py/0001-setup.py-Fix-numpy-version.patch deleted file mode 100644 index 9b79cc5395..0000000000 --- a/meta-python/recipes-devtools/python/python3-h5py/0001-setup.py-Fix-numpy-version.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b1d4d171fd13624f3d8bb917f716b62494066501 Mon Sep 17 00:00:00 2001 -From: Leon Anavi <leon.anavi@konsulko.com> -Date: Mon, 22 Feb 2021 18:42:43 +0200 -Subject: [PATCH] setup.py: Fix numpy version - -Fix numpy version to ensure bitbake will find the pip package. - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> - ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 4b2890c..42ba21b 100755 ---- a/setup.py -+++ b/setup.py -@@ -49,7 +49,7 @@ SETUP_REQUIRES = [ - "Cython >=0.29.14; python_version=='3.8'", - "Cython >=0.29.15; python_version>='3.9'", - ] + [ -- f"numpy =={np_min}; python_version{py_condition}" -+ f"numpy >={np_min}; python_version{py_condition}" - for np_min, py_condition in NUMPY_MIN_VERSIONS - ] - diff --git a/meta-python/recipes-devtools/python/python3-h5py_3.7.0.bb b/meta-python/recipes-devtools/python/python3-h5py_3.9.0.bb index ce4f05dbed..834bb031ca 100644 --- a/meta-python/recipes-devtools/python/python3-h5py_3.7.0.bb +++ b/meta-python/recipes-devtools/python/python3-h5py_3.9.0.bb @@ -4,12 +4,9 @@ SECTION = "devel/python" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=113251d71fb0384712c719b567261c5c" -SRC_URI[sha256sum] = "3fcf37884383c5da64846ab510190720027dca0768def34dd8dcb659dbe5cbf3" +SRC_URI[sha256sum] = "e604db6521c1e367c6bd7fad239c847f53cc46646f2d2651372d05ae5e95f817" -SRC_URI:append = " \ - file://0001-setup_build.py-avoid-absolute-path.patch \ - file://0001-fix-wrong-file-driver-version.patch \ - " +SRC_URI += "file://0001-setup_build.py-avoid-absolute-path.patch" inherit pkgconfig pypi setuptools3 @@ -24,9 +21,19 @@ DEPENDS = "python3-pkgconfig-native \ hdf5 \ " +PACKAGESPLITFUNCS =+ "fix_cythonized_sources" + +fix_cythonized_sources() { + for f in `grep -l -r -e '\/* Generated by Cython.*/$' ${PKGD}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}`; do + if [ -e $f ]; then + sed -i -e 's#${RECIPE_SYSROOT_NATIVE}##g' $f + fi + done +} + RDEPENDS:${PN} = "python3-numpy \ python3-six \ python3-json \ " -export HDF5_VERSION="1.13.2" +export HDF5_VERSION="1.14.0" diff --git a/meta-python/recipes-devtools/python/python3-haversine_2.7.0.bb b/meta-python/recipes-devtools/python/python3-haversine_2.8.0.bb index bfe36b0b80..0c7b414d98 100644 --- a/meta-python/recipes-devtools/python/python3-haversine_2.7.0.bb +++ b/meta-python/recipes-devtools/python/python3-haversine_2.8.0.bb @@ -2,7 +2,7 @@ SUMMARY = "Calculate the distance between 2 points on Earth" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -SRC_URI[sha256sum] = "9dd62c95bff9c43eb898604625e80db68b8b9e91a5111338f55ebcf470dd5a3d" +SRC_URI[sha256sum] = "cca39afd2ae5f1e6ed9231b332395bb8afb2e0a64edf70c238c176492e60c150" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-hexbytes_0.3.0.bb b/meta-python/recipes-devtools/python/python3-hexbytes_0.3.1.bb index 8402ddecd9..19b5813ad3 100644 --- a/meta-python/recipes-devtools/python/python3-hexbytes_0.3.0.bb +++ b/meta-python/recipes-devtools/python/python3-hexbytes_0.3.1.bb @@ -4,6 +4,6 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=287820ad3553117aa2f92bf84c219324" -SRC_URI[sha256sum] = "afeebfb800f5f15a3ca5bab52e49eabcb4b6dac06ec8ff01a94fdb890c6c0712" +SRC_URI[sha256sum] = "a3fe35c6831ee8fafd048c4c086b986075fc14fd46258fa24ecb8d65745f9a9d" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-html2text_2020.1.16.bb b/meta-python/recipes-devtools/python/python3-html2text_2020.1.16.bb index 64873d2464..5b6d040368 100644 --- a/meta-python/recipes-devtools/python/python3-html2text_2020.1.16.bb +++ b/meta-python/recipes-devtools/python/python3-html2text_2020.1.16.bb @@ -17,6 +17,8 @@ RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ " +RDEPENDS:${PN} += "python3-cgitb" + do_install_ptest() { install -d ${D}${PTEST_PATH}/test cp -rf ${S}/test/* ${D}${PTEST_PATH}/test/ diff --git a/meta-python/recipes-devtools/python/python3-httplib2_0.21.0.bb b/meta-python/recipes-devtools/python/python3-httplib2_0.22.0.bb index 3e285d9ae7..9614de920e 100644 --- a/meta-python/recipes-devtools/python/python3-httplib2_0.21.0.bb +++ b/meta-python/recipes-devtools/python/python3-httplib2_0.22.0.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=56e5e931172b6164b62dc7c4aba6c8cf" -SRC_URI[sha256sum] = "fc144f091c7286b82bec71bdbd9b27323ba709cc612568d3000893bfd9cb4b34" +SRC_URI[sha256sum] = "d7a10bc5ef5ab08322488bde8c726eeee5c8618723fdb399597ec58f3d82df81" inherit pypi python_setuptools_build_meta diff --git a/meta-python/recipes-devtools/python/python3-huey_2.4.4.bb b/meta-python/recipes-devtools/python/python3-huey_2.4.5.bb index 2f433814ee..dbddd6cb80 100644 --- a/meta-python/recipes-devtools/python/python3-huey_2.4.4.bb +++ b/meta-python/recipes-devtools/python/python3-huey_2.4.5.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5cac039fcc82f01141cc170b48f315d4" PYPI_PACKAGE = "huey" -SRC_URI[sha256sum] = "6a27a7862a7a982c0508ad4e548d95765e3b0d97093a51106f07540837a09c86" +SRC_URI[sha256sum] = "760cf150deff1fa34b852da37701a5a750d1148f03ea07aa2b3764dc6060b4c3" RDEPENDS:${PN} += " \ python3-datetime \ diff --git a/meta-python/recipes-devtools/python/python3-humanize_4.4.0.bb b/meta-python/recipes-devtools/python/python3-humanize_4.7.0.bb index 7bb03b75f2..81654af875 100644 --- a/meta-python/recipes-devtools/python/python3-humanize_4.4.0.bb +++ b/meta-python/recipes-devtools/python/python3-humanize_4.7.0.bb @@ -5,12 +5,13 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENCE;md5=4ecc42519e84f6f3e23529464df7bd1d" -SRC_URI[sha256sum] = "efb2584565cc86b7ea87a977a15066de34cdedaf341b11c851cfcfd2b964779c" +SRC_URI[sha256sum] = "7ca0e43e870981fa684acb5b062deb307218193bca1a01f2b2676479df849b3a" -inherit pypi python_setuptools_build_meta +inherit pypi python_hatchling DEPENDS += "\ ${PYTHON_PN}-setuptools-scm-native \ + ${PYTHON_PN}-hatch-vcs-native \ " RDEPENDS:${PN} += "\ diff --git a/meta-python/recipes-devtools/python/python3-icu/0001-Fix-host-contamination-of-include-files.patch b/meta-python/recipes-devtools/python/python3-icu/0001-Fix-host-contamination-of-include-files.patch index 36485d56ce..7bb5ee58cc 100644 --- a/meta-python/recipes-devtools/python/python3-icu/0001-Fix-host-contamination-of-include-files.patch +++ b/meta-python/recipes-devtools/python/python3-icu/0001-Fix-host-contamination-of-include-files.patch @@ -10,25 +10,25 @@ Also, don't use icu-config Upstream-Status: Inappropriate [OE specific] Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> - +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.py b/setup.py -index d308b80..56e9c74 100644 +index 176c9ab..0a10268 100644 --- a/setup.py +++ b/setup.py -@@ -81,7 +81,7 @@ Building PyICU %s for ICU %s (max ICU major version supported: %s) +@@ -68,7 +68,7 @@ elif platform.startswith('freebsd'): CONFIGURE_WITH_ICU_CONFIG = { - 'darwin': True, + 'darwin': False, - 'linux': True, + 'linux': False, 'freebsd': False, # not tested 'win32': False, # no icu-config 'sunos5': False, # not tested -@@ -273,7 +273,6 @@ setup(name="PyICU", +@@ -277,7 +277,6 @@ setup(name="PyICU", ext_modules=[Extension('icu._icu_', [filename for filename in sorted(os.listdir(os.curdir)) if filename.endswith('.cpp')], @@ -36,3 +36,6 @@ index d308b80..56e9c74 100644 extra_compile_args=_cflags, extra_link_args=_lflags, libraries=_libraries)], +-- +2.34.1 + diff --git a/meta-python/recipes-devtools/python/python3-icu_2.8.1.bb b/meta-python/recipes-devtools/python/python3-icu_2.11.bb index 027ef129ee..c66455c7e8 100644 --- a/meta-python/recipes-devtools/python/python3-icu_2.8.1.bb +++ b/meta-python/recipes-devtools/python/python3-icu_2.11.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0724597863f1581ab01429e0423e779f" DEPENDS += "icu" PYPI_PACKAGE = "PyICU" -SRC_URI[sha256sum] = "f0b9549a87f87ba7c413f13679d137271e0b37f1f39b0109ace38257d4d148d6" +SRC_URI[sha256sum] = "3ab531264cfe9132b3d2ac5d708da9a4649d25f6e6813730ac88cf040a08a844" SRC_URI += "file://0001-Fix-host-contamination-of-include-files.patch" diff --git a/meta-python/recipes-devtools/python/python3-imageio_2.25.0.bb b/meta-python/recipes-devtools/python/python3-imageio_2.31.1.bb index 4edd166fde..904ddde70c 100644 --- a/meta-python/recipes-devtools/python/python3-imageio_2.25.0.bb +++ b/meta-python/recipes-devtools/python/python3-imageio_2.31.1.bb @@ -5,7 +5,7 @@ SECTION = "devel/python" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=24cb9a367a9e641b459a01c4d15256ba" -SRC_URI[sha256sum] = "b80796a1f8c38c697a940a2ad7397ee28900d5c4e51061b9a67d16aca867f33e" +SRC_URI[sha256sum] = "f8436a02af02fd63f272dab50f7d623547a38f0e04a4a73e2b02ae1b8b180f27" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-imgtool_1.9.0.bb b/meta-python/recipes-devtools/python/python3-imgtool_1.10.0.bb index 1e5efbe187..5282bccd01 100644 --- a/meta-python/recipes-devtools/python/python3-imgtool_1.9.0.bb +++ b/meta-python/recipes-devtools/python/python3-imgtool_1.10.0.bb @@ -3,7 +3,7 @@ SUMMARY = "MCUboot's image signing and key management tool" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://imgtool/main.py;beginline=3;endline=18;md5=9965f09ae52c04886a1f04e13ccdce57" -SRC_URI[sha256sum] = "7fa7f6bd6bf069b5ffa07ea47478e16b6206bd2fc5b7607def999de0e9134a43" +SRC_URI[sha256sum] = "03b34e75934ac3d96e7c42b6bcaf11ceaf4f453f7c6f26c17d726bd183104b40" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-iperf_0.1.11.bb b/meta-python/recipes-devtools/python/python3-iperf_0.1.11.bb index 36d6463051..9a8e6f7daf 100644 --- a/meta-python/recipes-devtools/python/python3-iperf_0.1.11.bb +++ b/meta-python/recipes-devtools/python/python3-iperf_0.1.11.bb @@ -9,3 +9,9 @@ PYPI_PACKAGE = "iperf3" SRC_URI[sha256sum] = "d50eebbf2dcf445a173f98a82f9c433e0302d3dfb7987e1f21b86b35ef63ce26" inherit setuptools3 pypi + +RDEPENDS:${PN} += " \ + python3-ctypes \ + python3-json \ + python3-threading \ +" diff --git a/meta-python/recipes-devtools/python/python3-ipython_8.8.0.bb b/meta-python/recipes-devtools/python/python3-ipython_8.14.0.bb index 5b3d85db04..83af99a4aa 100644 --- a/meta-python/recipes-devtools/python/python3-ipython_8.8.0.bb +++ b/meta-python/recipes-devtools/python/python3-ipython_8.14.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING.rst;md5=59b20262b8663cdd094005bddf47af5f" PYPI_PACKAGE = "ipython" -SRC_URI[sha256sum] = "f3bf2c08505ad2c3f4ed5c46ae0331a8547d36bf4b21a451e8ae80c0791db95b" +SRC_URI[sha256sum] = "1d197b907b6ba441b692c48cf2a3a2de280dc0ac91a3405b39349a50272ca0a1" RDEPENDS:${PN} = "\ ${PYTHON_PN}-setuptools \ @@ -23,6 +23,7 @@ RDEPENDS:${PN} = "\ ${PYTHON_PN}-unixadmin \ ${PYTHON_PN}-misc \ ${PYTHON_PN}-sqlite3 \ + ${PYTHON_PN}-stack-data \ " inherit setuptools3 pypi diff --git a/meta-python/recipes-devtools/python/python3-isodate_0.6.1.bb b/meta-python/recipes-devtools/python/python3-isodate_0.6.1.bb index 2a5dcfca3c..c65083b777 100644 --- a/meta-python/recipes-devtools/python/python3-isodate_0.6.1.bb +++ b/meta-python/recipes-devtools/python/python3-isodate_0.6.1.bb @@ -7,7 +7,8 @@ SRC_URI[sha256sum] = "48c5881de7e8b0a0d648cb024c8062dc84e7b840ed81e864c7614fd3c1 inherit pypi setuptools3 RDEPENDS:${PN} += " \ - ${PYTHON_PN}-six \ + python3-numbers \ + python3-six \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-isort_5.11.4.bb b/meta-python/recipes-devtools/python/python3-isort_5.12.0.bb index 3ece22c382..d111393eaf 100644 --- a/meta-python/recipes-devtools/python/python3-isort_5.11.4.bb +++ b/meta-python/recipes-devtools/python/python3-isort_5.12.0.bb @@ -4,17 +4,19 @@ LICENSE = "MIT" SECTION = "devel/python" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=8227180126797a0148f94f483f3e1489" -SRC_URI[sha256sum] = "6db30c5ded9815d813932c04c2f85a360bcdd35fed496f4d8f35495ef0a261b6" +SRC_URI[sha256sum] = "8bef7dde241278824a6d83f44a544709b065191b95b6e50894bdc722fcba0504" inherit pypi python_poetry_core -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-profile \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-difflib \ +RDEPENDS:${PN} += " \ + python3-compression \ + python3-datetime \ + python3-difflib \ + python3-email \ + python3-numbers \ + python3-pprint \ + python3-profile \ + python3-shell \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.3.bb b/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.3.bb index eb93e71733..5555a12563 100644 --- a/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.3.bb +++ b/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.3.bb @@ -12,3 +12,8 @@ SRC_URI[sha256sum] = "38f74db3a57e9998a9774e3614afb95cb396f139f29b3fdb130c5af554 inherit pypi setuptools3 BBCLASSEXTEND = "native nativesdk" + +RDEPENDS:${PN} += " \ + python3-compression \ + python3-logging \ +" diff --git a/meta-python/recipes-devtools/python/python3-jdatetime_4.1.0.bb b/meta-python/recipes-devtools/python/python3-jdatetime_4.1.1.bb index c96e5c39ed..1b65f3bc9e 100644 --- a/meta-python/recipes-devtools/python/python3-jdatetime_4.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-jdatetime_4.1.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/slashmili/python-jalali" LICENSE = "Python-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=c80be45b33471b4a23cf53d06a8172be" -SRC_URI[sha256sum] = "4a67a82ee57e35b5f6f9f7fbe6a0eda63f56ce1dd8af409b4c2a26a3340457db" +SRC_URI[sha256sum] = "1dd0ee210160c7bd30002803c443e6260ac602ea65b065652a1d567d3bfdca7a" PYPI_PACKAGE = "jdatetime" diff --git a/meta-python/recipes-devtools/python/python3-joblib_1.2.0.bb b/meta-python/recipes-devtools/python/python3-joblib_1.3.1.bb index ec02265d1e..9186cbb19f 100644 --- a/meta-python/recipes-devtools/python/python3-joblib_1.2.0.bb +++ b/meta-python/recipes-devtools/python/python3-joblib_1.3.1.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2e481820abf0a70a18011a30153df066" inherit setuptools3 pypi -SRC_URI[sha256sum] = "e1cee4a79e4af22881164f218d4311f60074197fb707e082e803b61f6d137018" +SRC_URI[sha256sum] = "1f937906df65329ba98013dc9692fe22a4c5e4a648112de500508b18a21b41e3" RDEPENDS:${PN} += " \ python3-asyncio \ diff --git a/meta-python/recipes-devtools/python/python3-jsonpatch_1.32.bb b/meta-python/recipes-devtools/python/python3-jsonpatch_1.33.bb index 2a653cce88..3d6deb2a61 100644 --- a/meta-python/recipes-devtools/python/python3-jsonpatch_1.32.bb +++ b/meta-python/recipes-devtools/python/python3-jsonpatch_1.33.bb @@ -1,11 +1,11 @@ SUMMARY = "Appling JSON patches in Python 2.6+ and 3.x" HOMEPAGE = "https://github.com/stefankoegl/python-json-patch" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=32b15c843b7a329130f4e266a281ebb3" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4f81c84f9a053e31fe9402a2a4e78864" inherit pypi setuptools3 -SRC_URI[sha256sum] = "b6ddfe6c3db30d81a96aaeceb6baf916094ffa23d7dd5fa2c13e13f8b6e600c2" +SRC_URI[sha256sum] = "9fcd4009c41e6d12348b4a0ff2563ba56a2923a7dfee731d004e212e1ee5030c" RDEPENDS:${PN} += " \ ${PYTHON_PN}-json \ diff --git a/meta-python/recipes-devtools/python/python3-jsonpath-rw_1.4.0.bb b/meta-python/recipes-devtools/python/python3-jsonpath-rw_1.4.0.bb index b1af0f0336..4cc39a286a 100644 --- a/meta-python/recipes-devtools/python/python3-jsonpath-rw_1.4.0.bb +++ b/meta-python/recipes-devtools/python/python3-jsonpath-rw_1.4.0.bb @@ -8,4 +8,9 @@ SRC_URI[sha256sum] = "05c471281c45ae113f6103d1268ec7a4831a2e96aa80de45edc89b11fa inherit pypi setuptools3 -RDEPENDS:${PN} += " python3-decorator" +RDEPENDS:${PN} += " \ + python3-decorator \ + python3-logging \ + python3-ply \ + python3-six \ +" diff --git a/meta-python/recipes-devtools/python/python3-jsonrpcclient_4.0.2.bb b/meta-python/recipes-devtools/python/python3-jsonrpcclient_4.0.2.bb index 26ee3786b4..08ee15a920 100644 --- a/meta-python/recipes-devtools/python/python3-jsonrpcclient_4.0.2.bb +++ b/meta-python/recipes-devtools/python/python3-jsonrpcclient_4.0.2.bb @@ -8,7 +8,9 @@ SRC_URI[sha256sum] = "c0d475494b3e1b591ecdee7883739accaf5695edb673f16b7383b8c6bb inherit pypi setuptools3 RDEPENDS:${PN} += "\ - python3-core \ + python3-json \ + python3-math \ + python3-netclient \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-jstyleson_0.0.2.bb b/meta-python/recipes-devtools/python/python3-jstyleson_0.0.2.bb index e70ce33efc..237713bf12 100644 --- a/meta-python/recipes-devtools/python/python3-jstyleson_0.0.2.bb +++ b/meta-python/recipes-devtools/python/python3-jstyleson_0.0.2.bb @@ -13,3 +13,5 @@ inherit pypi setuptools3 SRC_URI[sha256sum] = "680003f3b15a2959e4e6a351f3b858e3c07dd3e073a0d54954e34d8ea5e1308e" BBCLASSEXTEND = "native nativesdk" + +RDEPENDS:${PN} += "python3-json" diff --git a/meta-python/recipes-devtools/python/python3-kconfiglib_14.1.0.bb b/meta-python/recipes-devtools/python/python3-kconfiglib_14.1.0.bb index ec09cfc58e..b9c1c4e384 100644 --- a/meta-python/recipes-devtools/python/python3-kconfiglib_14.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-kconfiglib_14.1.0.bb @@ -8,3 +8,9 @@ SRC_URI[sha256sum] = "bed2cc2216f538eca4255a83a4588d8823563cdd50114f86cf1a2674e6 inherit pypi setuptools3 BBCLASSEXTEND = "native nativesdk" + +RDEPENDS:${PN} += " \ + python3-curses \ + python3-shell \ + python3-tkinter \ +" diff --git a/meta-python/recipes-devtools/python/python3-kivy/0001-add-support-for-glesv2.patch b/meta-python/recipes-devtools/python/python3-kivy/0001-add-support-for-glesv2.patch index bb236b4195..0abc6c5c7e 100644 --- a/meta-python/recipes-devtools/python/python3-kivy/0001-add-support-for-glesv2.patch +++ b/meta-python/recipes-devtools/python/python3-kivy/0001-add-support-for-glesv2.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/setup.py +++ b/setup.py @@ -695,7 +695,18 @@ def determine_gl_flags(): diff --git a/meta-python/recipes-devtools/python/python3-kivy_2.1.0..bb b/meta-python/recipes-devtools/python/python3-kivy_2.1.0..bb index 684bca03e1..ca1fc5f96d 100644 --- a/meta-python/recipes-devtools/python/python3-kivy_2.1.0..bb +++ b/meta-python/recipes-devtools/python/python3-kivy_2.1.0..bb @@ -43,7 +43,7 @@ export KIVY_GRAPHICS KIVY_CROSS_SYSROOT="${RECIPE_SYSROOT}" export KIVY_CROSS_SYSROOT -REQUIRED_DISTRO_FEATURES += "x11 opengl" +REQUIRED_DISTRO_FEATURES += "x11 opengl gobject-introspection-data" DEPENDS += " \ gstreamer1.0 \ diff --git a/meta-python/recipes-devtools/python/python3-langtable_0.0.61.bb b/meta-python/recipes-devtools/python/python3-langtable_0.0.62.bb index 6e924ac42e..df6d14ece5 100644 --- a/meta-python/recipes-devtools/python/python3-langtable_0.0.61.bb +++ b/meta-python/recipes-devtools/python/python3-langtable_0.0.62.bb @@ -6,7 +6,7 @@ SECTION = "devel/python" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI[sha256sum] = "2c09f561463f18b038373b1fa8a4f68143dd3bfb59fdc8edbbba00548fc70db4" +SRC_URI[sha256sum] = "df8d5daedaa5c0d4e72dace925733376ba705d9330f63934f122eacf4746f360" inherit pypi setuptools3 python3native diff --git a/meta-python/recipes-devtools/python/python3-lazy_1.5.bb b/meta-python/recipes-devtools/python/python3-lazy_1.5.bb new file mode 100644 index 0000000000..cdff28c295 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-lazy_1.5.bb @@ -0,0 +1,8 @@ +SUMMARY = "Lazy attributes are computed attributes that are evaluated only once, the first time they are used." + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=84689cccb68e3c397d0856e8ad5a73b2" + +SRC_URI[sha256sum] = "cb3d8612aa895a48afe8f08860573ba8ef5ee4fdbe1b3cd606c5f50a16152186" + +inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-libevdev_0.11.bb b/meta-python/recipes-devtools/python/python3-libevdev_0.11.bb new file mode 100644 index 0000000000..27e336710c --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-libevdev_0.11.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "python-libevdev is a Python wrapper around the libevdev C library." +HOMEPAGE = "https://gitlab.freedesktop.org/libevdev/python-libevdev" +SECTION = "devel/python" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +SRC_URI[md5sum] = "34b48098c1fba26de79a0d67a17a588a" +SRC_URI[sha256sum] = "e9ca006a4df2488a60bd9a740011ee948d81904be2364f017e560169508f560f" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "libevdev" + +RDEPENDS:${PN} += " \ + libevdev \ + python3-ctypes \ +" diff --git a/meta-python/recipes-devtools/python/python3-license-expression_30.0.0.bb b/meta-python/recipes-devtools/python/python3-license-expression_30.1.1.bb index eeb91723e3..31fb88d6e5 100644 --- a/meta-python/recipes-devtools/python/python3-license-expression_30.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-license-expression_30.1.1.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/nexB/license-expression" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://apache-2.0.LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI[sha256sum] = "ad638292aa8493f84354909b517922cb823582c2ce2c4d880e42544a86bea8dd" +SRC_URI[sha256sum] = "42375df653ad85e6f5b4b0385138b2dbea1f5d66360783d8625c3e4f97f11f0c" inherit pypi ptest python_setuptools_build_meta diff --git a/meta-python/recipes-devtools/python/python3-linux-procfs_0.7.1.bb b/meta-python/recipes-devtools/python/python3-linux-procfs_0.7.1.bb index 9395a792fc..d51eecf978 100644 --- a/meta-python/recipes-devtools/python/python3-linux-procfs_0.7.1.bb +++ b/meta-python/recipes-devtools/python/python3-linux-procfs_0.7.1.bb @@ -10,3 +10,5 @@ SRCREV = "7f43598387e44e2da93ead2e075b7232429e4cc4" S = "${WORKDIR}/git" inherit setuptools3 + +RDEPENDS:${PN} += "python3-six" diff --git a/meta-python/recipes-devtools/python/python3-lockfile_0.12.2.bb b/meta-python/recipes-devtools/python/python3-lockfile_0.12.2.bb index b9dc4722af..af738e08ec 100644 --- a/meta-python/recipes-devtools/python/python3-lockfile_0.12.2.bb +++ b/meta-python/recipes-devtools/python/python3-lockfile_0.12.2.bb @@ -12,6 +12,9 @@ SRC_URI[sha256sum] = "6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361 inherit pypi setuptools3 DEPENDS += "python3-distutils-extra-native python3-pbr-native" -RDEPENDS:${PN} += "python3-sqlite3" +RDEPENDS:${PN} += " \ + python3-io \ + python3-sqlite3 \ +" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-lorem/run-ptest b/meta-python/recipes-devtools/python/python3-lorem/run-ptest new file mode 100644 index 0000000000..8d2017d39c --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-lorem/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest --automake diff --git a/meta-python/recipes-devtools/python/python3-lorem_0.1.1.bb b/meta-python/recipes-devtools/python/python3-lorem_0.1.1.bb index 9ce7a6293c..a855c39141 100644 --- a/meta-python/recipes-devtools/python/python3-lorem_0.1.1.bb +++ b/meta-python/recipes-devtools/python/python3-lorem_0.1.1.bb @@ -5,12 +5,25 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5301c01b2bcdeedba23645f94db2f179" SRC_URI[md5sum] = "e3f0064a94c13e19780eb724affdb426" SRC_URI[sha256sum] = "785f4109a241fc2891e59705e85d065f6e6d3ed6ad91750a8cb54d4f3e59d934" +SRC_URI += "\ + file://run-ptest \ +" + PYPI_PACKAGE = "lorem" -inherit pypi setuptools3 +inherit pypi setuptools3 ptest CLEANBROKEN = "1" RDEPENDS:${PN} += " \ python3 \ " +RDEPENDS:${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-unittest-automake-output \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} diff --git a/meta-python/recipes-devtools/python/python3-lru-dict_1.1.8.bb b/meta-python/recipes-devtools/python/python3-lru-dict_1.2.0.bb index b870bc0889..7a3a172746 100644 --- a/meta-python/recipes-devtools/python/python3-lru-dict_1.1.8.bb +++ b/meta-python/recipes-devtools/python/python3-lru-dict_1.2.0.bb @@ -4,6 +4,8 @@ SECTION = "devel/python" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=9d10a486ee04034fdef5162fd791f153" -SRC_URI[sha256sum] = "878bc8ef4073e5cfb953dfc1cf4585db41e8b814c0106abde34d00ee0d0b3115" +SRC_URI[sha256sum] = "13c56782f19d68ddf4d8db0170041192859616514c706b126d0df2ec72a11bd7" inherit pypi setuptools3 + +SRC_URI += "${PYPI_SRC_URI}" diff --git a/meta-python/recipes-devtools/python/python3-luma-oled_3.9.0.bb b/meta-python/recipes-devtools/python/python3-luma-oled_3.12.0.bb index 4d34fbb01f..87f7ad6635 100644 --- a/meta-python/recipes-devtools/python/python3-luma-oled_3.9.0.bb +++ b/meta-python/recipes-devtools/python/python3-luma-oled_3.12.0.bb @@ -4,11 +4,11 @@ A small library to drive an OLED device with either SSD1306 , SSD1309, SSD1322, SSD1325, SSD1327, SSD1331, SSD1351 or SH1106 chipset" HOMEPAGE = "https://github.com/rm-hull/luma.oled" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=20adf60219f02398b350b8bfbdad7a58" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=5ec447eb69733e20a55838de7e8cb991" inherit pypi setuptools3 -SRC_URI[sha256sum] = "e51c2ce5b88d591f9c64ab49d6bd5abd26759b87180706d615fec796569b6f6b" +SRC_URI[sha256sum] = "af97d79fa3481d2c48b7bccfb6de349219f6d814fdc9a3dd075c7b2c71206450" CLEANBROKEN = "1" diff --git a/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch b/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch index 85423a3fec..0baadfcaa5 100644 --- a/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch +++ b/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch @@ -5,7 +5,7 @@ Subject: [PATCH] setup.py: link in sysroot, not in host directories Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> -Upstream-Status: Unknown +Upstream-Status: Pending [Unknown] --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-python/recipes-devtools/python/python3-m2crypto/CVE-2020-25657.patch b/meta-python/recipes-devtools/python/python3-m2crypto/CVE-2020-25657.patch deleted file mode 100644 index 38ecd7a276..0000000000 --- a/meta-python/recipes-devtools/python/python3-m2crypto/CVE-2020-25657.patch +++ /dev/null @@ -1,176 +0,0 @@ -Backport patch to fix CVE-2020-25657. - -Upstream-Status: Backport [https://gitlab.com/m2crypto/m2crypto/-/commit/84c53958] - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - -From 84c53958def0f510e92119fca14d74f94215827a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@cepl.eu> -Date: Tue, 28 Jun 2022 21:17:01 +0200 -Subject: [PATCH] Mitigate the Bleichenbacher timing attacks in the RSA - decryption API (CVE-2020-25657) - -Fixes #282 ---- - src/SWIG/_m2crypto_wrap.c | 20 ++++++++++++-------- - src/SWIG/_rsa.i | 20 ++++++++++++-------- - tests/test_rsa.py | 15 +++++++-------- - 3 files changed, 31 insertions(+), 24 deletions(-) - -diff --git a/src/SWIG/_m2crypto_wrap.c b/src/SWIG/_m2crypto_wrap.c -index aba9eb6d..a9f30da9 100644 ---- a/src/SWIG/_m2crypto_wrap.c -+++ b/src/SWIG/_m2crypto_wrap.c -@@ -7040,9 +7040,10 @@ PyObject *rsa_private_encrypt(RSA *rsa, PyObject *from, int padding) { - tlen = RSA_private_encrypt(flen, (unsigned char *)fbuf, - (unsigned char *)tbuf, rsa, padding); - if (tlen == -1) { -- m2_PyErr_Msg(_rsa_err); -+ ERR_clear_error(); -+ PyErr_Clear(); - PyMem_Free(tbuf); -- return NULL; -+ Py_RETURN_NONE; - } - - ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); -@@ -7070,9 +7071,10 @@ PyObject *rsa_public_decrypt(RSA *rsa, PyObject *from, int padding) { - tlen = RSA_public_decrypt(flen, (unsigned char *)fbuf, - (unsigned char *)tbuf, rsa, padding); - if (tlen == -1) { -- m2_PyErr_Msg(_rsa_err); -+ ERR_clear_error(); -+ PyErr_Clear(); - PyMem_Free(tbuf); -- return NULL; -+ Py_RETURN_NONE; - } - - ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); -@@ -7097,9 +7099,10 @@ PyObject *rsa_public_encrypt(RSA *rsa, PyObject *from, int padding) { - tlen = RSA_public_encrypt(flen, (unsigned char *)fbuf, - (unsigned char *)tbuf, rsa, padding); - if (tlen == -1) { -- m2_PyErr_Msg(_rsa_err); -+ ERR_clear_error(); -+ PyErr_Clear(); - PyMem_Free(tbuf); -- return NULL; -+ Py_RETURN_NONE; - } - - ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); -@@ -7124,9 +7127,10 @@ PyObject *rsa_private_decrypt(RSA *rsa, PyObject *from, int padding) { - tlen = RSA_private_decrypt(flen, (unsigned char *)fbuf, - (unsigned char *)tbuf, rsa, padding); - if (tlen == -1) { -- m2_PyErr_Msg(_rsa_err); -+ ERR_clear_error(); -+ PyErr_Clear(); - PyMem_Free(tbuf); -- return NULL; -+ Py_RETURN_NONE; - } - ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); - -diff --git a/src/SWIG/_rsa.i b/src/SWIG/_rsa.i -index bc714e01..1377b8be 100644 ---- a/src/SWIG/_rsa.i -+++ b/src/SWIG/_rsa.i -@@ -239,9 +239,10 @@ PyObject *rsa_private_encrypt(RSA *rsa, PyObject *from, int padding) { - tlen = RSA_private_encrypt(flen, (unsigned char *)fbuf, - (unsigned char *)tbuf, rsa, padding); - if (tlen == -1) { -- m2_PyErr_Msg(_rsa_err); -+ ERR_clear_error(); -+ PyErr_Clear(); - PyMem_Free(tbuf); -- return NULL; -+ Py_RETURN_NONE; - } - - ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); -@@ -269,9 +270,10 @@ PyObject *rsa_public_decrypt(RSA *rsa, PyObject *from, int padding) { - tlen = RSA_public_decrypt(flen, (unsigned char *)fbuf, - (unsigned char *)tbuf, rsa, padding); - if (tlen == -1) { -- m2_PyErr_Msg(_rsa_err); -+ ERR_clear_error(); -+ PyErr_Clear(); - PyMem_Free(tbuf); -- return NULL; -+ Py_RETURN_NONE; - } - - ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); -@@ -296,9 +298,10 @@ PyObject *rsa_public_encrypt(RSA *rsa, PyObject *from, int padding) { - tlen = RSA_public_encrypt(flen, (unsigned char *)fbuf, - (unsigned char *)tbuf, rsa, padding); - if (tlen == -1) { -- m2_PyErr_Msg(_rsa_err); -+ ERR_clear_error(); -+ PyErr_Clear(); - PyMem_Free(tbuf); -- return NULL; -+ Py_RETURN_NONE; - } - - ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); -@@ -323,9 +326,10 @@ PyObject *rsa_private_decrypt(RSA *rsa, PyObject *from, int padding) { - tlen = RSA_private_decrypt(flen, (unsigned char *)fbuf, - (unsigned char *)tbuf, rsa, padding); - if (tlen == -1) { -- m2_PyErr_Msg(_rsa_err); -+ ERR_clear_error(); -+ PyErr_Clear(); - PyMem_Free(tbuf); -- return NULL; -+ Py_RETURN_NONE; - } - ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); - -diff --git a/tests/test_rsa.py b/tests/test_rsa.py -index 7bb3af75..5e75d681 100644 ---- a/tests/test_rsa.py -+++ b/tests/test_rsa.py -@@ -109,8 +109,9 @@ class RSATestCase(unittest.TestCase): - # The other paddings. - for padding in self.s_padding_nok: - p = getattr(RSA, padding) -- with self.assertRaises(RSA.RSAError): -- priv.private_encrypt(self.data, p) -+ # Exception disabled as a part of mitigation against CVE-2020-25657 -+ # with self.assertRaises(RSA.RSAError): -+ priv.private_encrypt(self.data, p) - # Type-check the data to be encrypted. - with self.assertRaises(TypeError): - priv.private_encrypt(self.gen_callback, RSA.pkcs1_padding) -@@ -127,10 +128,12 @@ class RSATestCase(unittest.TestCase): - self.assertEqual(ptxt, self.data) - - # no_padding -- with six.assertRaisesRegex(self, RSA.RSAError, 'data too small'): -- priv.public_encrypt(self.data, RSA.no_padding) -+ # Exception disabled as a part of mitigation against CVE-2020-25657 -+ # with six.assertRaisesRegex(self, RSA.RSAError, 'data too small'): -+ priv.public_encrypt(self.data, RSA.no_padding) - - # Type-check the data to be encrypted. -+ # Exception disabled as a part of mitigation against CVE-2020-25657 - with self.assertRaises(TypeError): - priv.public_encrypt(self.gen_callback, RSA.pkcs1_padding) - -@@ -146,10 +149,6 @@ class RSATestCase(unittest.TestCase): - b'\000\000\000\003\001\000\001') # aka 65537 aka 0xf4 - with self.assertRaises(RSA.RSAError): - setattr(rsa, 'e', '\000\000\000\003\001\000\001') -- with self.assertRaises(RSA.RSAError): -- rsa.private_encrypt(1) -- with self.assertRaises(RSA.RSAError): -- rsa.private_decrypt(1) - assert rsa.check_key() - - def test_loadpub_bad(self): --- -GitLab - diff --git a/meta-python/recipes-devtools/python/python3-m2crypto_0.38.0.bb b/meta-python/recipes-devtools/python/python3-m2crypto_0.39.0.bb index 40e3bfb316..3a4a700bf7 100644 --- a/meta-python/recipes-devtools/python/python3-m2crypto_0.38.0.bb +++ b/meta-python/recipes-devtools/python/python3-m2crypto_0.39.0.bb @@ -10,9 +10,8 @@ SRC_URI += "file://0001-setup.py-link-in-sysroot-not-in-host-directories.patch \ file://cross-compile-platform.patch \ file://avoid-host-contamination.patch \ file://0001-setup.py-address-openssl-3.x-build-issue.patch \ - file://CVE-2020-25657.patch \ " -SRC_URI[sha256sum] = "99f2260a30901c949a8dc6d5f82cd5312ffb8abc92e76633baf231bbbcb2decb" +SRC_URI[sha256sum] = "24c0f471358b8b19ad4c8aa9da12e868030b65c1fdb3279d006df60c9501338a" PYPI_PACKAGE = "M2Crypto" inherit pypi siteinfo setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-matplotlib/0001-removed-RandomNumberGenerator-class-included-random-.patch b/meta-python/recipes-devtools/python/python3-matplotlib/0001-removed-RandomNumberGenerator-class-included-random-.patch deleted file mode 100644 index 1f9b8cdeaf..0000000000 --- a/meta-python/recipes-devtools/python/python3-matplotlib/0001-removed-RandomNumberGenerator-class-included-random-.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 3eb9987b02cc10b93e09219ddc86aa6be5f10177 Mon Sep 17 00:00:00 2001 -From: tybeller <ty.c.beller@gmail.com> -Date: Fri, 30 Sep 2022 16:13:41 -0400 -Subject: [PATCH] removed RandomNumberGenerator class, included <random>, - replaced random_shuffle with shuffle and used mersenne twister engine to - generate uniform random bit generator for the shuffle. - -Upstream-Status: Backport [https://github.com/matplotlib/matplotlib/commit/601d92a8850] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/tri/_tri.cpp | 20 ++++---------------- - 1 file changed, 4 insertions(+), 16 deletions(-) - -diff --git a/src/tri/_tri.cpp b/src/tri/_tri.cpp -index b7a87783de..6e639eea44 100644 ---- a/src/tri/_tri.cpp -+++ b/src/tri/_tri.cpp -@@ -12,6 +12,7 @@ - - #include <algorithm> - #include <set> -+#include <random> - - - TriEdge::TriEdge() -@@ -1465,8 +1466,8 @@ TrapezoidMapTriFinder::initialize() - _tree->assert_valid(false); - - // Randomly shuffle all edges other than first 2. -- RandomNumberGenerator rng(1234); -- std::random_shuffle(_edges.begin()+2, _edges.end(), rng); -+ std::mt19937 rng(1234); -+ std::shuffle(_edges.begin()+2, _edges.end(), rng); - - // Add edges, one at a time, to tree. - size_t nedges = _edges.size(); -@@ -2055,17 +2056,4 @@ TrapezoidMapTriFinder::Trapezoid::set_upper_right(Trapezoid* upper_right_) - upper_right = upper_right_; - if (upper_right != 0) - upper_right->upper_left = this; --} -- -- -- --RandomNumberGenerator::RandomNumberGenerator(unsigned long seed) -- : _m(21870), _a(1291), _c(4621), _seed(seed % _m) --{} -- --unsigned long --RandomNumberGenerator::operator()(unsigned long max_value) --{ -- _seed = (_seed*_a + _c) % _m; -- return (_seed*max_value) / _m; --} -+} -\ No newline at end of file --- -2.39.0 - diff --git a/meta-python/recipes-devtools/python/python3-matplotlib/matplotlib-disable-download.patch b/meta-python/recipes-devtools/python/python3-matplotlib/matplotlib-disable-download.patch index 899cac624a..aea8f62ea7 100644 --- a/meta-python/recipes-devtools/python/python3-matplotlib/matplotlib-disable-download.patch +++ b/meta-python/recipes-devtools/python/python3-matplotlib/matplotlib-disable-download.patch @@ -4,19 +4,17 @@ Upstream-Status: Inappropriate [disable feature] Signed-off-by: Mark Hatle <mark.hatle@xilinx.com> +Update patch to fit on 3.7.2. + +Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> + +diff --git a/setup.py b/setup.py +index 0bea13fa6f..f39d8fc871 100644 --- a/setup.py +++ b/setup.py -@@ -303,7 +303,6 @@ setup( # Finally, pass this all along t - setup_requires=[ - "certifi>=2020.06.20", - "numpy>=1.19", -- "setuptools_scm>=7", - ], - install_requires=[ - "contourpy>=1.0.1", -@@ -315,13 +314,7 @@ setup( # Finally, pass this all along t +@@ -327,13 +327,7 @@ setup( # Finally, pass this all along to setuptools to do the heavy lifting. "pillow>=6.2.0", - "pyparsing>=2.2.1", + "pyparsing>=2.3.1,<3.1", "python-dateutil>=2.7", - ] + ( - # Installing from a git checkout that is not producing a wheel. @@ -26,12 +24,14 @@ Signed-off-by: Mark Hatle <mark.hatle@xilinx.com> - ) else [] - ), + ], - use_scm_version={ - "version_scheme": "release-branch-semver", - "local_scheme": "node-and-date", + extras_require={ + ':python_version<"3.10"': [ + "importlib-resources>=3.2.0", +diff --git a/setupext.py b/setupext.py +index a898d642d6..474172ff8f 100644 --- a/setupext.py +++ b/setupext.py -@@ -65,40 +65,7 @@ def get_from_cache_or_download(url, sha) +@@ -66,40 +66,7 @@ def get_from_cache_or_download(url, sha): BytesIO The file loaded into memory. """ diff --git a/meta-python/recipes-devtools/python/python3-matplotlib_3.6.3.bb b/meta-python/recipes-devtools/python/python3-matplotlib_3.7.2.bb index fa0a78d6a9..72c369100a 100644 --- a/meta-python/recipes-devtools/python/python3-matplotlib_3.6.3.bb +++ b/meta-python/recipes-devtools/python/python3-matplotlib_3.7.2.bb @@ -7,7 +7,7 @@ HOMEPAGE = "https://github.com/matplotlib/matplotlib" SECTION = "devel/python" LICENSE = "PSF-2.0" LIC_FILES_CHKSUM = "\ - file://setup.py;beginline=283;endline=283;md5=20e7ab4d2b2b1395a0e4ab800181eb96 \ + file://setup.py;beginline=293;endline=293;md5=20e7ab4d2b2b1395a0e4ab800181eb96 \ file://LICENSE/LICENSE;md5=afec61498aa5f0c45936687da9a53d74 \ " @@ -20,15 +20,16 @@ DEPENDS = "\ python3-pytz-native \ python3-certifi-native \ python3-setuptools-scm-native \ + python3-pybind11-native \ " -SRC_URI[sha256sum] = "1f4d69707b1677560cd952544ee4962f68ff07952fb9069ff8c12b56353cb8c9" +SRC_URI[sha256sum] = "a8cdb91dddb04436bd2f098b8fdf4b81352e68cf4d2c6756fcc414791076569b" inherit pypi setuptools3 pkgconfig # Stop the component from attempting to download when it detects a missing # dependency SRC_URI += "file://matplotlib-disable-download.patch \ - file://0001-removed-RandomNumberGenerator-class-included-random-.patch" +" # This python module requires a full copy of freetype-2.6.1 SRC_URI += "https://downloads.sourceforge.net/project/freetype/freetype2/2.6.1/freetype-2.6.1.tar.gz;name=freetype;subdir=matplotlib-${PV}/build" diff --git a/meta-python/recipes-devtools/python/python3-meld3_2.0.1.bb b/meta-python/recipes-devtools/python/python3-meld3_2.0.1.bb index 1223ae9532..1be3fa5ada 100644 --- a/meta-python/recipes-devtools/python/python3-meld3_2.0.1.bb +++ b/meta-python/recipes-devtools/python/python3-meld3_2.0.1.bb @@ -12,3 +12,9 @@ SRC_URI[md5sum] = "1add16caefc9e6b82ef4f40532cb4918" SRC_URI[sha256sum] = "3ea266994f1aa83507679a67b493b852c232a7905e29440a6b868558cad5e775" inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + python3-cgitb \ + python3-smtpd \ + python3-xml \ +" diff --git a/meta-python/recipes-devtools/python/python3-meson-python_0.13.1.bb b/meta-python/recipes-devtools/python/python3-meson-python_0.13.1.bb new file mode 100644 index 0000000000..6b9ff24f2a --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-meson-python_0.13.1.bb @@ -0,0 +1,23 @@ +SUMMARY = "Meson Python build backend (PEP 517)" +HOMEPAGE = "https://github.com/mesonbuild/meson-python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d580b27e67cc0892a5b005b0be114b60" + +DEPENDS = " \ + meson-native ninja-native patchelf-native \ + python3-pyproject-metadata-native \ +" + +PYPI_PACKAGE = "meson_python" + +inherit pypi python_mesonpy +SRC_URI[sha256sum] = "63b3170001425c42fa4cfedadb9051cbd28925ff8eed7c40d36ba0099e3c7618" + +DEPENDS:remove:class-native = "python3-meson-python-native" + +RDEPENDS:${PN} = " \ + meson ninja patchelf \ + python3-pyproject-metadata \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-mock_5.0.1.bb b/meta-python/recipes-devtools/python/python3-mock_5.0.1.bb deleted file mode 100644 index b916a7b4e7..0000000000 --- a/meta-python/recipes-devtools/python/python3-mock_5.0.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "A Python Mocking and Patching Library for Testing" -HOMEPAGE = "https://pypi.python.org/pypi/mock" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=de9dfbf780446b18aab11f00baaf5b7e" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += "${PYTHON_PN}-prettytable \ - ${PYTHON_PN}-cmd2 \ - ${PYTHON_PN}-pyparsing \ - ${PYTHON_PN}-mccabe \ - ${PYTHON_PN}-pep8 \ - ${PYTHON_PN}-pyflakes" - -SRC_URI[sha256sum] = "e3ea505c03babf7977fd21674a69ad328053d414f05e6433c30d8fa14a534a6b" diff --git a/meta-python/recipes-devtools/python/python3-mock_5.1.0.bb b/meta-python/recipes-devtools/python/python3-mock_5.1.0.bb new file mode 100644 index 0000000000..d9ecb9d4c8 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-mock_5.1.0.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "A Python Mocking and Patching Library for Testing" +HOMEPAGE = "https://pypi.python.org/pypi/mock" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=de9dfbf780446b18aab11f00baaf5b7e" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + python3-cmd2 \ + python3-mccabe \ + python3-pep8 \ + python3-prettytable \ + python3-pyflakes \ + python3-pyparsing \ + python3-unittest \ +" + +SRC_URI[sha256sum] = "5e96aad5ccda4718e0a229ed94b2024df75cc2d55575ba5762d31f5767b8767d" diff --git a/meta-python/recipes-devtools/python/python3-mpmath_1.2.1.bb b/meta-python/recipes-devtools/python/python3-mpmath_1.3.0.bb index 3337df4903..01dd8bfb44 100644 --- a/meta-python/recipes-devtools/python/python3-mpmath_1.2.1.bb +++ b/meta-python/recipes-devtools/python/python3-mpmath_1.3.0.bb @@ -4,13 +4,16 @@ SUMMARY = "Python library for arbitrary-precision floating-point arithmetic" HOMEPAGE = "https://pypi.org/project/mpmath/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=71970bd3749eebe1bfef9f1efff5b37a" +LIC_FILES_CHKSUM = "file://LICENSE;md5=bde3c575382996b75d85702949512751" -SRC_URI[sha256sum] = "79ffb45cf9f4b101a807595bcb3e72e0396202e0b1d25d689134b48c4216a81a" +SRC_URI[sha256sum] = "7a28eb2a9774d00c7bc92411c19a89209d5da7c4c9a9e227be8330a23a25b91f" inherit pypi setuptools3 DEPENDS += "${PYTHON_PN}-setuptools-scm-native" -RDEPENDS:${PN} += "python3-image" +RDEPENDS:${PN} += " \ + python3-image \ + python3-math \ +" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-msgpack_1.0.4.bb b/meta-python/recipes-devtools/python/python3-msgpack_1.0.5.bb index a796d7cb57..3965dad8e5 100644 --- a/meta-python/recipes-devtools/python/python3-msgpack_1.0.4.bb +++ b/meta-python/recipes-devtools/python/python3-msgpack_1.0.5.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=cd9523181d9d4fbf7ffca52eaa2a5751" PYPI_PACKAGE = "msgpack" inherit pypi setuptools3 ptest -SRC_URI[sha256sum] = "f5d869c18f030202eb412f08b28d2afeea553d6613aee89e200d7aca7ef01f5f" +SRC_URI[sha256sum] = "c075544284eadc5cddc70f4757331d99dcbc16b2bbd4849d15f8aae4cf36d31c" RDEPENDS:${PN}:class-target += "\ ${PYTHON_PN}-io \ diff --git a/meta-python/recipes-devtools/python/python3-msm_0.8.8.bb b/meta-python/recipes-devtools/python/python3-msm_0.8.8.bb index 848b25dae8..966ff86dee 100644 --- a/meta-python/recipes-devtools/python/python3-msm_0.8.8.bb +++ b/meta-python/recipes-devtools/python/python3-msm_0.8.8.bb @@ -8,10 +8,18 @@ SRC_URI[sha256sum] = "a502aee54917cd394217b31c977a1ba3d9541a0120e0a045c49fd77b32 inherit pypi setuptools3 -RDEPENDS:${PN} += "\ - python3-pako \ - python3-monotonic \ +RDEPENDS:${PN} += " \ python3-appdirs \ + python3-git \ + python3-fasteners \ + python3-io \ + python3-json \ + python3-lazy \ + python3-monotonic \ + python3-multiprocessing \ + python3-pako \ + python3-pyyaml \ + python3-requests \ " do_install:append() { diff --git a/meta-python/recipes-devtools/python/python3-natsort_8.2.0.bb b/meta-python/recipes-devtools/python/python3-natsort_8.4.0.bb index bc142195ed..206e322fbd 100644 --- a/meta-python/recipes-devtools/python/python3-natsort_8.2.0.bb +++ b/meta-python/recipes-devtools/python/python3-natsort_8.4.0.bb @@ -1,10 +1,10 @@ SUMMARY = "Simple yet flexible natural sorting in Python." SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=58db8ac9e152dd9b700f4d39ff40a31a" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d32431d1b650010945da4e078011c8fa" PYPI_PACKAGE = "natsort" -SRC_URI[sha256sum] = "57f85b72c688b09e053cdac302dd5b5b53df5f73ae20b4874fcbffd8bf783d11" +SRC_URI[sha256sum] = "45312c4a0e5507593da193dedd04abb1469253b601ecaf63445ad80f0a1ea581" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-netaddr_0.8.0.bb b/meta-python/recipes-devtools/python/python3-netaddr_0.8.0.bb index ad03eec851..5ba006691a 100644 --- a/meta-python/recipes-devtools/python/python3-netaddr_0.8.0.bb +++ b/meta-python/recipes-devtools/python/python3-netaddr_0.8.0.bb @@ -8,6 +8,7 @@ SRC_URI[sha256sum] = "d6cc57c7a07b1d9d2e917aa8b36ae8ce61c35ba3fcd1b83ca31c5a0ee2 inherit pypi setuptools3 RDEPENDS:${PN} += " \ - ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-xml \ + python3-io \ + python3-pprint \ + python3-xml \ " diff --git a/meta-python/recipes-devtools/python/python3-networkx_3.0.bb b/meta-python/recipes-devtools/python/python3-networkx_3.1.bb index c83771b1e6..7158f7b057 100644 --- a/meta-python/recipes-devtools/python/python3-networkx_3.0.bb +++ b/meta-python/recipes-devtools/python/python3-networkx_3.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://networkx.github.io/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4266362445d56549f7b8973d02e5f22a" -SRC_URI[sha256sum] = "9a9992345353618ae98339c2b63d8201c381c2944f38a2ab49cb45a4c667e412" +SRC_URI[sha256sum] = "de346335408f84de0eada6ff9fafafff9bcda11f0a0dfaa931133debb146ab61" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-ninja-syntax_1.7.2.bb b/meta-python/recipes-devtools/python/python3-ninja-syntax_1.7.2.bb new file mode 100644 index 0000000000..9a6326f37d --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-ninja-syntax_1.7.2.bb @@ -0,0 +1,10 @@ +SUMMARY = "Python module for generating .ninja files." + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://setup.py;beginline=38;endline=38;md5=f5441d6119564d4094cf77bee7cf7b0a" + +SRC_URI[sha256sum] = "342dc97b9e88a6495bae22953ee6063f91d2f03db6f727b62ba5c3092a18ef1f" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "ninja_syntax" diff --git a/meta-python/recipes-devtools/python/python3-ninja/CMakeLists.txt b/meta-python/recipes-devtools/python/python3-ninja/CMakeLists.txt new file mode 100644 index 0000000000..04fa451e72 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-ninja/CMakeLists.txt @@ -0,0 +1,9 @@ +cmake_minimum_required(VERSION 3.15) + +project(NinjaPythonDistributions) + +set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_MODULE_PATH}) + +install(CODE " + message(STATUS \"Install ninja project\") +") diff --git a/meta-python/recipes-devtools/python/python3-ninja/no-scikit-build.patch b/meta-python/recipes-devtools/python/python3-ninja/no-scikit-build.patch new file mode 100644 index 0000000000..276fb50172 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-ninja/no-scikit-build.patch @@ -0,0 +1,31 @@ +We don't need to build ninja so there's no need to use scikit-build, +as we just need the python module with it's one ninja() function. + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton <ross.burton@arm.com> + +diff --git a/pyproject.toml b/pyproject.toml +index b895c20..577b642 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,7 +1,6 @@ + [build-system] + requires = [ + "setuptools>=42", +- "scikit-build>=0.12", + ] + build-backend = "setuptools.build_meta" + +diff --git a/setup.py b/setup.py +index dbe1fbc..3259754 100755 +--- a/setup.py ++++ b/setup.py +@@ -5,7 +5,7 @@ import os + import sys + from distutils.text_file import TextFile + +-from skbuild import setup ++from setuptools import setup + + # Add current folder to path + # This is required to import versioneer in an isolated pip build diff --git a/meta-python/recipes-devtools/python/python3-ninja/run-ninja-from-path.patch b/meta-python/recipes-devtools/python/python3-ninja/run-ninja-from-path.patch new file mode 100644 index 0000000000..0068efcc3a --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-ninja/run-ninja-from-path.patch @@ -0,0 +1,44 @@ +There's no need to hunt around source or install trees when we're just running ninja +from PATH. + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton <ross.burton@arm.com> + +diff --git a/src/ninja/__init__.py b/src/ninja/__init__.py +index f83767e..31bb926 100644 +--- a/src/ninja/__init__.py ++++ b/src/ninja/__init__.py +@@ -19,32 +19,9 @@ except ImportError: + os.path.dirname(__file__), '../../Ninja-src/misc'))) + from ninja_syntax import Writer, escape, expand # noqa: F401 + +-DATA = os.path.join(os.path.dirname(__file__), 'data') +- +-# Support running tests from the source tree +-if not os.path.exists(DATA): +- from skbuild.constants import CMAKE_INSTALL_DIR as SKBUILD_CMAKE_INSTALL_DIR +- from skbuild.constants import set_skbuild_plat_name +- +- if platform.system().lower() == "darwin": +- # Since building the project specifying --plat-name or CMAKE_OSX_* variables +- # leads to different SKBUILD_DIR, the code below attempt to guess the most +- # likely plat-name. +- _skbuild_dirs = os.listdir(os.path.join(os.path.dirname(__file__), '..', '..', '_skbuild')) +- if _skbuild_dirs: +- _likely_plat_name = '-'.join(_skbuild_dirs[0].split('-')[:3]) +- set_skbuild_plat_name(_likely_plat_name) +- +- _data = os.path.abspath(os.path.join( +- os.path.dirname(__file__), '..', '..', SKBUILD_CMAKE_INSTALL_DIR(), 'src/ninja/data')) +- if os.path.exists(_data): +- DATA = _data +- +-BIN_DIR = os.path.join(DATA, 'bin') +- + + def _program(name, args): +- return subprocess.call([os.path.join(BIN_DIR, name)] + args, close_fds=False) ++ return subprocess.call([name] + args, close_fds=False) + + + def ninja(): diff --git a/meta-python/recipes-devtools/python/python3-ninja_1.11.1.bb b/meta-python/recipes-devtools/python/python3-ninja_1.11.1.bb new file mode 100644 index 0000000000..3b9077f326 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-ninja_1.11.1.bb @@ -0,0 +1,25 @@ +SUMMARY = "Ninja is a small build system with a focus on speed" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE_Apache_20;md5=19cbd64715b51267a47bf3750cc6a8a5" + +PYPI_PACKAGE = "ninja" +PYPI_ARCHIVE_NAME_PREFIX = "pypi-" + +inherit pypi python_setuptools_build_meta +SRC_URI[sha256sum] = "c833a47d39b2d1eee3f9ca886fa1581efd5be6068b82734ac229961ee8748f90" + +SRC_URI += "file://no-scikit-build.patch \ + file://run-ninja-from-path.patch" + +do_install:append () { + rm -rf ${D}${bindir} +} + +RDEPENDS:${PN} = " \ + ninja \ + python3-io \ + python3-json \ + python3-ninja-syntax \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-nocasedict_1.1.0.bb b/meta-python/recipes-devtools/python/python3-nocasedict_2.0.1.bb index 319598e3b2..6185b7b1e9 100644 --- a/meta-python/recipes-devtools/python/python3-nocasedict_1.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-nocasedict_2.0.1.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] = "ac551de692be6aea5b43ac3f2c33780df940013ac6dd0718fb552c8b560ba661" +SRC_URI[sha256sum] = "960cb699f1209da80ac39e3ab50aa7342fe8ca9f70606c23447a510550435e50" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-nocaselist_1.1.0.bb b/meta-python/recipes-devtools/python/python3-nocaselist_2.0.0.bb index 4b93ca98fa..29a3c86067 100644 --- a/meta-python/recipes-devtools/python/python3-nocaselist_1.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-nocaselist_2.0.0.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] = "a99384abc700c409e9def7143763e18dfad332fdff7e30fae1f6d1a30b372772" +SRC_URI[sha256sum] = "456aa000c6777c5d21b029c52e532f94328d4fb4f15ad2a4dd3dd62db30b3892" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-obd_0.7.1.bb b/meta-python/recipes-devtools/python/python3-obd_0.7.2.bb index 0cb1b85e5a..d78642a9bd 100644 --- a/meta-python/recipes-devtools/python/python3-obd_0.7.1.bb +++ b/meta-python/recipes-devtools/python/python3-obd_0.7.2.bb @@ -1,9 +1,8 @@ DESCRIPTION = "A python module for handling realtime sensor data from OBD-II vehicle ports"HOMEPAGE = "https://github.com/brendan-w/python-OBD" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://README.md;md5=58ba896fa086c96ad23317cebfeab277" +LIC_FILES_CHKSUM = "file://README.md;md5=176d0f9ad45c10895296260d426fa862" -SRC_URI[md5sum] = "305efcb6c650db7b9583532355ebeb7c" -SRC_URI[sha256sum] = "8b81ea5896157b6e861af12e173c10b001cb6cca6ebb04db2c01d326812ad77b" +SRC_URI[sha256sum] = "20d38c9ded3daad1e8affab3ff367a70788d4f29ac77ab7aacddc6a6d2a43d61" inherit setuptools3 pypi diff --git a/meta-python/recipes-devtools/python/python3-openpyxl_3.0.10.bb b/meta-python/recipes-devtools/python/python3-openpyxl_3.1.2.bb index 447c86ddb7..a889210616 100644 --- a/meta-python/recipes-devtools/python/python3-openpyxl_3.0.10.bb +++ b/meta-python/recipes-devtools/python/python3-openpyxl_3.1.2.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148 inherit pypi setuptools3 -SRC_URI[sha256sum] = "e47805627aebcf860edb4edf7987b1309c1b3632f3750538ed962bbcc3bd7449" +SRC_URI[sha256sum] = "a6f5977418eff3b2d5500d54d9db50c8277a368436f4e4f8ddb1be3422870184" RDEPENDS:${PN} += "\ ${PYTHON_PN}-compression \ diff --git a/meta-python/recipes-devtools/python/python3-oslash_0.6.3.bb b/meta-python/recipes-devtools/python/python3-oslash_0.6.3.bb index d9d977b705..b926484db0 100644 --- a/meta-python/recipes-devtools/python/python3-oslash_0.6.3.bb +++ b/meta-python/recipes-devtools/python/python3-oslash_0.6.3.bb @@ -14,8 +14,9 @@ PYPI_PACKAGE = "OSlash" inherit pypi setuptools3 -RDEPENDS:${PN} += "\ - python3-core \ +RDEPENDS:${PN} += " \ + python3-json \ + python3-typing-extensions \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-padaos_0.1.10.bb b/meta-python/recipes-devtools/python/python3-padaos_0.1.10.bb index f506a78636..3af9349d44 100644 --- a/meta-python/recipes-devtools/python/python3-padaos_0.1.10.bb +++ b/meta-python/recipes-devtools/python/python3-padaos_0.1.10.bb @@ -7,3 +7,5 @@ SRC_URI[md5sum] = "dbf852015ef87a6694549779fb475b52" SRC_URI[sha256sum] = "2ac05fcbc826873c574568aa5ce09945d6ea987bee10399e766eb8f7c6356d72" inherit pypi setuptools3 + +RDEPENDS:${PN} += "python3-logging" diff --git a/meta-python/recipes-devtools/python/python3-padatious_0.4.8.bb b/meta-python/recipes-devtools/python/python3-padatious_0.4.8.bb index 404a0170dc..fef6376ef7 100644 --- a/meta-python/recipes-devtools/python/python3-padatious_0.4.8.bb +++ b/meta-python/recipes-devtools/python/python3-padatious_0.4.8.bb @@ -7,3 +7,11 @@ SRC_URI[md5sum] = "7dd2f1830737dc142aa199f77dacf32e" SRC_URI[sha256sum] = "e471f251b94e8cadf6e4214f0f3b7b36678848aaa8c51cd5638ab23ecb716f75" inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + python3-fann2 \ + python3-json \ + python3-multiprocessing \ + python3-padaos \ + python3-xxhash \ +" diff --git a/meta-python/recipes-devtools/python/python3-pako_0.3.1.bb b/meta-python/recipes-devtools/python/python3-pako_0.3.1.bb index 34cd096c9d..046e6571ea 100644 --- a/meta-python/recipes-devtools/python/python3-pako_0.3.1.bb +++ b/meta-python/recipes-devtools/python/python3-pako_0.3.1.bb @@ -11,3 +11,10 @@ do_install:append() { rm -rf ${D}${prefix}/pako/LICENSE rm -rf ${D}${prefix}/pako } + +RDEPENDS:${PN} += " \ + python3-appdirs \ + python3-io \ + python3-json \ + python3-logging \ +" diff --git a/meta-python/recipes-devtools/python/python3-pandas_1.5.2.bb b/meta-python/recipes-devtools/python/python3-pandas_2.0.3.bb index 15709b6047..87a173c8a2 100644 --- a/meta-python/recipes-devtools/python/python3-pandas_1.5.2.bb +++ b/meta-python/recipes-devtools/python/python3-pandas_2.0.3.bb @@ -4,16 +4,28 @@ high-performance, easy-to-use data structures and data analysis tools for \ the Python programming language." HOMEPAGE = "http://pandas.pydata.org/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c1cc9ab35a8b2aabf933cd6d245b5db3" +LIC_FILES_CHKSUM = "file://LICENSE;md5=cb819092901ddb13a7d0a4f5e05f098a" -SRC_URI[sha256sum] = "220b98d15cee0b2cd839a6358bd1f273d0356bf964c1a1aeb32d47db0215488b" +SRC_URI[sha256sum] = "c02f372a88e0d17f36d3093a644c73cfc1788e876a7c4bcb4020a77512e2043c" inherit pypi setuptools3 DEPENDS += " \ - ${PYTHON_PN}-numpy-native ${PYTHON_PN}-cython-native \ + ${PYTHON_PN}-cython-native \ + ${PYTHON_PN}-numpy-native \ + ${PYTHON_PN}-versioneer-native \ " +PACKAGESPLITFUNCS =+ "fix_cythonized_sources" + +fix_cythonized_sources() { + for f in `grep -l -r -e '\/* Generated by Cython.*/$' ${PKGD}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}`; do + if [ -e $f ]; then + sed -i -e 's#${RECIPE_SYSROOT_NATIVE}##g' $f + fi + done +} + CFLAGS:append:toolchain-clang = " -Wno-error=deprecated-declarations" RDEPENDS:${PN} += " \ diff --git a/meta-python/recipes-devtools/python/python3-paramiko_2.12.0.bb b/meta-python/recipes-devtools/python/python3-paramiko_3.2.0.bb index 6295c66a27..5420a9edc8 100644 --- a/meta-python/recipes-devtools/python/python3-paramiko_2.12.0.bb +++ b/meta-python/recipes-devtools/python/python3-paramiko_3.2.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] = "376885c05c5d6aa6e1f4608aac2a6b5b0548b1add40274477324605903d9cd49" +SRC_URI[sha256sum] = "93cdce625a8a1dc12204439d45033f3261bdb2c201648cfcdc06f9fd0f94ec29" PYPI_PACKAGE = "paramiko" @@ -11,9 +11,10 @@ inherit pypi setuptools3 CLEANBROKEN = "1" -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-bcrypt \ - ${PYTHON_PN}-cryptography \ - ${PYTHON_PN}-pynacl \ - ${PYTHON_PN}-unixadmin \ +RDEPENDS:${PN} += " \ + python3-bcrypt \ + python3-cryptography \ + python3-logging \ + python3-pynacl \ + python3-unixadmin \ " diff --git a/meta-python/recipes-devtools/python/python3-parse_1.19.0.bb b/meta-python/recipes-devtools/python/python3-parse_1.19.0.bb deleted file mode 100644 index 2bf55cbaff..0000000000 --- a/meta-python/recipes-devtools/python/python3-parse_1.19.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Parse strings using a specification based on the Python format() syntax" -HOMEPAGE = "https://github.com/r1chardj0n3s/parse" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8ab458ad281b60e6f1b39b3feafbfc05" - -SRC_URI[sha256sum] = "9ff82852bcb65d139813e2a5197627a94966245c897796760a3a2a8eb66f020b" - -inherit pypi setuptools3 ptest - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-logging \ - " - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - cp -f ${S}/test_parse.py ${D}${PTEST_PATH}/ -} diff --git a/meta-python/recipes-devtools/python/python3-parse_1.19.1.bb b/meta-python/recipes-devtools/python/python3-parse_1.19.1.bb new file mode 100644 index 0000000000..9dc7f79318 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-parse_1.19.1.bb @@ -0,0 +1,31 @@ +SUMMARY = "Parse strings using a specification based on the Python format() syntax" +HOMEPAGE = "https://github.com/r1chardj0n3s/parse" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8ab458ad281b60e6f1b39b3feafbfc05" + +SRC_URI[sha256sum] = "cc3a47236ff05da377617ddefa867b7ba983819c664e1afe46249e5b469be464" + +SRC_URI += " \ + git://github.com/r1chardj0n3s/parse.git;branch=master;protocol=https \ + file://run-ptest \ +" + +SRCREV ?= "72776522285d516032faa0f80c4ee6a8964075e8" + +S = "${WORKDIR}/git" + +inherit python_setuptools_build_meta ptest + +RDEPENDS:${PN} += "\ + python3-datetime \ + python3-logging \ + python3-numbers \ +" + +RDEPENDS:${PN}-ptest += " \ + python3-pytest \ +" + +do_install_ptest() { + cp -f ${S}/test_parse.py ${D}${PTEST_PATH}/ +} diff --git a/meta-python/recipes-devtools/python/python3-path/run-ptest b/meta-python/recipes-devtools/python/python3-path/run-ptest new file mode 100644 index 0000000000..8d2017d39c --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-path/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest --automake diff --git a/meta-python/recipes-devtools/python/python3-path_16.6.0.bb b/meta-python/recipes-devtools/python/python3-path_16.6.0.bb deleted file mode 100644 index 41fe374619..0000000000 --- a/meta-python/recipes-devtools/python/python3-path_16.6.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "A module wrapper for os.path" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7a7126e068206290f3fe9f8d6c713ea6" - -SRC_URI[sha256sum] = "bea3816e1d54f4e33aac78d2031a0b0ed2f95e69db85b45d51f17df97071da69" - -inherit pypi python_setuptools_build_meta - -DEPENDS += "python3-setuptools-scm-native" - -BBCLASSEXTEND = "nativesdk native" diff --git a/meta-python/recipes-devtools/python/python3-path_16.7.1.bb b/meta-python/recipes-devtools/python/python3-path_16.7.1.bb new file mode 100644 index 0000000000..d9576ed0b8 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-path_16.7.1.bb @@ -0,0 +1,34 @@ +SUMMARY = "A module wrapper for os.path" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=141643e11c48898150daa83802dbc65f" + +SRC_URI[sha256sum] = "2b477f5887033f3cbea1cfd8553ee6a6a498eb2540a19f4aa082822aadcea30a" + +SRC_URI += "\ + file://run-ptest \ +" + +inherit pypi python_setuptools_build_meta ptest + +DEPENDS += "python3-setuptools-scm-native" + +RDEPENDS:${PN} += " \ + python3-appdirs \ + python3-crypt \ + python3-io \ + python3-numbers \ + python3-shell \ +" +RDEPENDS:${PN}-ptest += " \ + python3-pytest \ + python3-unittest-automake-output \ +" + +BBCLASSEXTEND = "nativesdk native" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/test + cp -rf ${S}/test_* ${D}${PTEST_PATH}/test/ + install -d ${D}${PTEST_PATH}/path + cp -rf ${S}/path/* ${D}${PTEST_PATH}/path/ +} diff --git a/meta-python/recipes-devtools/python/python3-pefile_2023.2.7.bb b/meta-python/recipes-devtools/python/python3-pefile_2023.2.7.bb new file mode 100644 index 0000000000..f3e0711087 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pefile_2023.2.7.bb @@ -0,0 +1,19 @@ +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" + +inherit setuptools3 pypi ptest +SRC_URI[sha256sum] = "82e6114004b3d6911c77c3953e3838654b04511b8b66e8583db70c65998017dc" + +PIP_INSTALL_PACKAGE = "pefile" +PIP_INSTALL_DIST_PATH = "${S}/dist" + +BBCLASSEXTEND = "native nativesdk" + +RDEPENDS:${PN} += " \ + python3-mmap \ + python3-netclient \ + python3-stringold \ +" diff --git a/meta-python/recipes-devtools/python/python3-periphery_2.3.0.bb b/meta-python/recipes-devtools/python/python3-periphery_2.4.1.bb index 4d81b8d244..e284ccc33a 100644 --- a/meta-python/recipes-devtools/python/python3-periphery_2.3.0.bb +++ b/meta-python/recipes-devtools/python/python3-periphery_2.4.1.bb @@ -2,9 +2,9 @@ DESCRIPTION = "A pure Python 2/3 library for peripheral I/O (GPIO, LED, PWM, SPI HOMEPAGE = "http://pythonhosted.org/python-periphery/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fed1784a083509430580a913df680706" +LIC_FILES_CHKSUM = "file://LICENSE;md5=30fe6f023a80fb33989fb3b9d773fea0" -SRC_URI[sha256sum] = "8a8ec019d9b330a6a6f69a7de61d14b4c98b102d76359047c5ce0263e12246a6" +SRC_URI[sha256sum] = "61d461d736982a6f766e878720ab10a68151e2e8c1086600d9389ac47e40e88a" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-petact_0.1.2.bb b/meta-python/recipes-devtools/python/python3-petact_0.1.2.bb index 58cd05e222..b7fa69ffa8 100644 --- a/meta-python/recipes-devtools/python/python3-petact_0.1.2.bb +++ b/meta-python/recipes-devtools/python/python3-petact_0.1.2.bb @@ -7,3 +7,9 @@ SRC_URI[md5sum] = "47e9a6abc91b4022953e4007ddae9e68" SRC_URI[sha256sum] = "5dcb0d44f86a601e41a2def9770993cd0ea45c76d37eb3f35e3dd61aa50350e6" inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + python3-compression \ + python3-crypt \ + python3-io \ +" diff --git a/meta-python/recipes-devtools/python/python3-pickleshare_0.7.5.bb b/meta-python/recipes-devtools/python/python3-pickleshare_0.7.5.bb index 9d67e4f338..8260913087 100644 --- a/meta-python/recipes-devtools/python/python3-pickleshare_0.7.5.bb +++ b/meta-python/recipes-devtools/python/python3-pickleshare_0.7.5.bb @@ -10,3 +10,5 @@ SRC_URI[md5sum] = "44ab782615894a812ab96669a122a634" SRC_URI[sha256sum] = "87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca" inherit setuptools3 pypi + +RDEPENDS:${PN} += "python3-pickle" diff --git a/meta-python/recipes-devtools/python/python3-pika_1.3.1.bb b/meta-python/recipes-devtools/python/python3-pika_1.3.2.bb index 075f3bb577..d5100dd78e 100644 --- a/meta-python/recipes-devtools/python/python3-pika_1.3.1.bb +++ b/meta-python/recipes-devtools/python/python3-pika_1.3.2.bb @@ -8,7 +8,7 @@ HOMEPAGE = "https://pika.readthedocs.io" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=678ec81495ba50edf81e84e4f1aa69f3" -SRC_URI[sha256sum] = "beb19ff6dd1547f99a29acc2c6987ebb2ba7c44bf44a3f8e305877c5ef7d2fdc" +SRC_URI[sha256sum] = "b2a327ddddf8570b4965b3576ac77091b850262d34ce8c1d8cb4e4146aa4145f" inherit pypi python_setuptools_build_meta diff --git a/meta-python/recipes-devtools/python/python3-pillow/run-ptest b/meta-python/recipes-devtools/python/python3-pillow/run-ptest new file mode 100644 index 0000000000..3385d68939 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pillow/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-python/recipes-devtools/python/python3-pillow_9.4.0.bb b/meta-python/recipes-devtools/python/python3-pillow_10.0.0.bb index 403a987d1e..8683ef2287 100644 --- a/meta-python/recipes-devtools/python/python3-pillow_9.4.0.bb +++ b/meta-python/recipes-devtools/python/python3-pillow_10.0.0.bb @@ -3,15 +3,16 @@ Clark and Contributors. PIL is the Python Imaging Library by Fredrik Lundh and \ Contributors." HOMEPAGE = "https://pillow.readthedocs.io" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=bc416d18f294943285560364be7cbec1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b22dc6b663b9175820e5e03337c7596b" SRC_URI = "git://github.com/python-pillow/Pillow.git;branch=main;protocol=https \ file://0001-support-cross-compiling.patch \ file://0001-explicitly-set-compile-options.patch \ + file://run-ptest \ " SRCREV ?= "82541b6dec8452cb612067fcebba1c5a1a2bfdc8" -inherit setuptools3 +inherit setuptools3 ptest PIP_INSTALL_PACKAGE = "Pillow" PIP_INSTALL_DIST_PATH = "${S}/dist" @@ -29,6 +30,23 @@ RDEPENDS:${PN} += " \ ${PYTHON_PN}-misc \ ${PYTHON_PN}-logging \ ${PYTHON_PN}-numbers \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcb', '', d)} \ +" + +RDEPENDS:${PN}-ptest += " \ + bash \ + ghostscript \ + jpeg-tools \ + libwebp \ + ${PYTHON_PN}-core \ + ${PYTHON_PN}-distutils \ + ${PYTHON_PN}-image \ + ${PYTHON_PN}-mmap \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-pytest-timeout \ + ${PYTHON_PN}-resource \ + ${PYTHON_PN}-unixadmin\ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'tk', '', d)} \ " CVE_PRODUCT = "pillow" @@ -37,6 +55,11 @@ S = "${WORKDIR}/git" RPROVIDES:${PN} += "python3-imaging" +do_install_ptest() { + install -d ${D}${PTEST_PATH}/Tests + cp -rf ${S}/Tests ${D}${PTEST_PATH}/ +} + BBCLASSEXTEND = "native" -SRCREV = "a5bbab1c1e63b439de191ef2040173713b26d2da" +SRCREV = "6e28ed1f36d0eb74053af54e1eddc9c29db698cd" diff --git a/meta-python/recipes-devtools/python/python3-pint_0.20.1.bb b/meta-python/recipes-devtools/python/python3-pint_0.22.bb index 625f50f847..0eed33f799 100644 --- a/meta-python/recipes-devtools/python/python3-pint_0.20.1.bb +++ b/meta-python/recipes-devtools/python/python3-pint_0.22.bb @@ -10,7 +10,7 @@ PYPI_PACKAGE := "Pint" inherit pypi ptest python_setuptools_build_meta -SRC_URI[sha256sum] = "387cf04078dc7dfe4a708033baad54ab61d82ab06c4ee3d4922b1e45d5626067" +SRC_URI[sha256sum] = "2d139f6abbcf3016cad7d3cec05707fe908ac4f99cf59aedfd6ee667b7a64433" DEPENDS += "python3-setuptools-scm-native" diff --git a/meta-python/recipes-devtools/python/python3-anyjson/run-ptest b/meta-python/recipes-devtools/python/python3-platformdirs/run-ptest index b63c4de0d9..b63c4de0d9 100644 --- a/meta-python/recipes-devtools/python/python3-anyjson/run-ptest +++ b/meta-python/recipes-devtools/python/python3-platformdirs/run-ptest diff --git a/meta-python/recipes-devtools/python/python3-platformdirs_3.9.1.bb b/meta-python/recipes-devtools/python/python3-platformdirs_3.9.1.bb new file mode 100644 index 0000000000..c52d9d2169 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-platformdirs_3.9.1.bb @@ -0,0 +1,31 @@ +SUMMARY = "A small Python module for determining appropriate platform-specific dirs" +HOMEPAGE = "https://github.com/platformdirs/platformdirs" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ea4f5a41454746a9ed111e3d8723d17a" + +SRC_URI += " \ + file://run-ptest \ +" + +SRC_URI[sha256sum] = "1b42b450ad933e981d56e59f1b97495428c9bd60698baab9f3eb3d00d5822421" + +inherit pypi python_hatchling ptest + +DEPENDS += " \ + ${PYTHON_PN}-hatch-vcs-native \ +" + +RDEPENDS:${PN}-ptest += " \ + ${PYTHON_PN}-appdirs \ + ${PYTHON_PN}-covdefaults \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-pytest-mock \ + ${PYTHON_PN}-pytest-cov \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH} + cp -rf ${S}/tests ${D}${PTEST_PATH}/ +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-portion_2.3.0.bb b/meta-python/recipes-devtools/python/python3-portion_2.4.0.bb index 1638d64c32..942f1204c0 100644 --- a/meta-python/recipes-devtools/python/python3-portion_2.3.0.bb +++ b/meta-python/recipes-devtools/python/python3-portion_2.4.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=05f1e16a8e59ce3e9a979e881816c2ab" inherit pypi setuptools3 -SRC_URI[sha256sum] = "0e9d42838099263201b25517e4c1bd57042b5fe44432d6df38cef72d84d1eb1f" +SRC_URI[sha256sum] = "deb16389e844dbf9aeb654261fce5febd720e4786c6690efbb9dc11608226840" RDEPENDS:${PN} = "\ ${PYTHON_PN}-sortedcontainers \ diff --git a/meta-python/recipes-devtools/python/python3-process-tests_2.1.2.bb b/meta-python/recipes-devtools/python/python3-process-tests_2.1.2.bb index 24ab0399f9..eb01504f61 100644 --- a/meta-python/recipes-devtools/python/python3-process-tests_2.1.2.bb +++ b/meta-python/recipes-devtools/python/python3-process-tests_2.1.2.bb @@ -13,3 +13,9 @@ inherit pypi setuptools3 RDEPENDS:${PN} += "python3-core" BBCLASSEXTEND = "native nativesdk" + +RDEPENDS:${PN} += " \ + python3-io \ + python3-logging \ + python3-unittest \ +" diff --git a/meta-python/recipes-devtools/python/python3-protobuf_4.21.12.bb b/meta-python/recipes-devtools/python/python3-protobuf_4.23.4.bb index 5e2fe151e9..8474a43d69 100644 --- a/meta-python/recipes-devtools/python/python3-protobuf_4.21.12.bb +++ b/meta-python/recipes-devtools/python/python3-protobuf_4.23.4.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=53dbfa56f61b90215a inherit pypi setuptools3 -SRC_URI[sha256sum] = "7cd532c4566d0e6feafecc1059d04c7915aec8e182d1cf7adee8b24ef1e2e6ab" +SRC_URI[sha256sum] = "ccd9430c0719dce806b93f89c91de7977304729e55377f872a92465d548329a9" # http://errors.yoctoproject.org/Errors/Details/184715/ # Can't find required file: ../src/google/protobuf/descriptor.proto diff --git a/meta-python/recipes-devtools/python/python3-pulsectl_22.3.2.bb b/meta-python/recipes-devtools/python/python3-pulsectl_23.5.2.bb index c13c677899..4da72904f1 100644 --- a/meta-python/recipes-devtools/python/python3-pulsectl_22.3.2.bb +++ b/meta-python/recipes-devtools/python/python3-pulsectl_23.5.2.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] = "cc174e1ceebd4e6222c5b78f4f415f12e80753c9ab75ab354159b4cb5950b084" +SRC_URI[sha256sum] = "e911d398eaf0539cf3c63b4217357b51a3d1b7e4a50607d1591cf2b49f5d2c6a" RDEPENDS:${PN} += " \ libpulse \ diff --git a/meta-python/recipes-devtools/python/python3-pure-eval_0.2.2.bb b/meta-python/recipes-devtools/python/python3-pure-eval_0.2.2.bb new file mode 100644 index 0000000000..66e4673a70 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pure-eval_0.2.2.bb @@ -0,0 +1,16 @@ +SUMMARY = "Safely evaluate AST nodes without side effects" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a3d6c15f7859ae235a78f2758e5a48cf" + +DEPENDS = "python3-setuptools-scm-native" + +PYPI_PACKAGE = "pure_eval" + +inherit pypi python_setuptools_build_meta + +SRC_URI[sha256sum] = "2b45320af6dfaa1750f543d714b6d1c520a1688dec6fd24d339063ce0aaa9ac3" + +RDEPENDS:${PN} += " \ + python3-datetime \ + python3-numbers \ +" diff --git a/meta-python/recipes-devtools/python/python3-pyalsaaudio_0.9.2.bb b/meta-python/recipes-devtools/python/python3-pyalsaaudio_0.10.0.bb index e7e706c6cf..8b22faad3a 100644 --- a/meta-python/recipes-devtools/python/python3-pyalsaaudio_0.9.2.bb +++ b/meta-python/recipes-devtools/python/python3-pyalsaaudio_0.10.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1a3b161aa0fcec32a0c8907a2219ad9d" inherit pypi setuptools3 -SRC_URI[sha256sum] = "e74a66d6c7a6bcceb990df66d3ebc0fe382fc9d765f35f050f9d98c695304b36" +SRC_URI[sha256sum] = "e21175500a2bd310ae3867e7991639defc1e2a5c92cf1b9f7083296b346738ab" DEPENDS += "alsa-lib" diff --git a/meta-python/recipes-devtools/python/python3-pyatspi_2.46.0.bb b/meta-python/recipes-devtools/python/python3-pyatspi_2.46.0.bb index 4595eafc6d..cd0e12ec8e 100644 --- a/meta-python/recipes-devtools/python/python3-pyatspi_2.46.0.bb +++ b/meta-python/recipes-devtools/python/python3-pyatspi_2.46.0.bb @@ -15,7 +15,10 @@ S = "${WORKDIR}/git" # Same restriction as gtk+ inherit features_check setuptools3 ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" inherit pkgconfig autotools python3native FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}/pyatspi/*" + +RDEPENDS:${PN} += "python3-pygobject" diff --git a/meta-python/recipes-devtools/python/python3-pyaudio/0001-Remove-absolute-paths-into-build-machine-system-dirs.patch b/meta-python/recipes-devtools/python/python3-pyaudio/0001-Remove-absolute-paths-into-build-machine-system-dirs.patch new file mode 100644 index 0000000000..a71902a362 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pyaudio/0001-Remove-absolute-paths-into-build-machine-system-dirs.patch @@ -0,0 +1,28 @@ +From d94518b558c1812aecb87d8ef19d75c2df1b98a5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 26 Jul 2023 19:54:19 -0700 +Subject: [PATCH] Remove absolute paths into build machine system dirs + +This ensures that it does not add /usr/include and /usr/local/include/ +into cflags + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + setup.py | 2 -- + 1 file changed, 2 deletions(-) + +--- a/setup.py ++++ b/setup.py +@@ -111,11 +111,6 @@ def setup_extension(): + # the standard portaudio cmake settings. For details, see: + # https://devblogs.microsoft.com/cppblog/vcpkg-updates-static-linking-is-now-available/ + extra_compile_args += ["/MT"] +- else: +- # GNU/Linux and other posix-like OSes will dynamically link to +- # portaudio, installed by the package manager. +- include_dirs += ['/usr/local/include', '/usr/include'] +- external_libraries_path += ['/usr/local/lib', '/usr/lib'] + + return Extension( + 'pyaudio._portaudio', diff --git a/meta-python/recipes-devtools/python/python3-pyaudio_0.2.11.bb b/meta-python/recipes-devtools/python/python3-pyaudio_0.2.11.bb deleted file mode 100644 index 802ca35100..0000000000 --- a/meta-python/recipes-devtools/python/python3-pyaudio_0.2.11.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "PyAudio provides Python bindings for PortAudio, the cross-platform audio I/O library" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://README;md5=288793c2b9b05bd67abbd2a8f5d144f7" - -PYPI_PACKAGE = "PyAudio" - -SRC_URI[md5sum] = "7e4c88139284033f67b4336c74eda3b8" -SRC_URI[sha256sum] = "93bfde30e0b64e63a46f2fd77e85c41fd51182a4a3413d9edfaf9ffaa26efb74" - -inherit pypi setuptools3 - -DEPENDS += "portaudio-v19" - -RDEPENDS:${PN} += "portaudio-v19" diff --git a/meta-python/recipes-devtools/python/python3-pyaudio_0.2.13.bb b/meta-python/recipes-devtools/python/python3-pyaudio_0.2.13.bb new file mode 100644 index 0000000000..1f0b5cf6e8 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pyaudio_0.2.13.bb @@ -0,0 +1,17 @@ +SUMMARY = "PyAudio provides Python bindings for PortAudio, the cross-platform audio I/O library" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7c3152b432b96d6dc4a1cb35397da9ec" + +PYPI_PACKAGE = "PyAudio" + +SRC_URI[md5sum] = "41199ffd2abbdaf1ce6b88cf8af48cc5" +SRC_URI[sha256sum] = "26bccc81e4243d1c0ff5487e6b481de6329fcd65c79365c267cef38f363a2b56" + +inherit pypi setuptools3 + +SRC_URI += "file://0001-Remove-absolute-paths-into-build-machine-system-dirs.patch" + +DEPENDS += "portaudio-v19" + +RDEPENDS:${PN} += "portaudio-v19" diff --git a/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch b/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch deleted file mode 100644 index 699eb61550..0000000000 --- a/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch +++ /dev/null @@ -1,48 +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> ---- - tools/pybind11NewTools.cmake | 5 ----- - tools/pybind11Tools.cmake | 4 ---- - 2 files changed, 9 deletions(-) - -diff --git a/tools/pybind11NewTools.cmake b/tools/pybind11NewTools.cmake -index 18da8be1..82ebf5e7 100644 ---- a/tools/pybind11NewTools.cmake -+++ b/tools/pybind11NewTools.cmake -@@ -246,11 +246,6 @@ function(pybind11_add_module target_name) - endif() - endif() - -- if(NOT MSVC AND NOT ${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 32313539..a7d81012 100644 ---- a/tools/pybind11Tools.cmake -+++ b/tools/pybind11Tools.cmake -@@ -201,10 +201,6 @@ function(pybind11_add_module target_name) - endif() - endif() - -- if(NOT MSVC AND NOT ${CMAKE_BUILD_TYPE} MATCHES Debug|RelWithDebInfo) -- pybind11_strip(${target_name}) -- endif() -- - if(MSVC) - target_link_libraries(${target_name} PRIVATE pybind11::windows_extras) - endif() --- -2.17.1 - diff --git a/meta-python/recipes-devtools/python/python3-pybind11_2.10.3.bb b/meta-python/recipes-devtools/python/python3-pybind11_2.11.1.bb index bb604982d0..d51dd905a5 100644 --- a/meta-python/recipes-devtools/python/python3-pybind11_2.10.3.bb +++ b/meta-python/recipes-devtools/python/python3-pybind11_2.11.1.bb @@ -7,7 +7,7 @@ DEPENDS = "boost" SRC_URI = "git://github.com/pybind/pybind11.git;branch=stable;protocol=https" -SRCREV = "0bd8896a4010f2d91b2340570c24fa08606ec406" +SRCREV = "8a099e44b3d5f85b20f05828d919d2332a8de841" S = "${WORKDIR}/git" diff --git a/meta-python/recipes-devtools/python/python3-pychromecast_13.0.4.bb b/meta-python/recipes-devtools/python/python3-pychromecast_13.0.7.bb index 49680c343d..c27d490f4c 100644 --- a/meta-python/recipes-devtools/python/python3-pychromecast_13.0.4.bb +++ b/meta-python/recipes-devtools/python/python3-pychromecast_13.0.7.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/balloob/pychromecast" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b1dbd4e85f47b389bdadee9c694669f5" -SRC_URI[sha256sum] = "792fba3f31e4968a5e99c19c771774083a2aa7e897ebf6f5e218e308e33a461f" +SRC_URI[sha256sum] = "0de98e9e5be43269dd41efb16126ab0d5ba941ca4acae024329712851c0c0324" PYPI_PACKAGE = "PyChromecast" diff --git a/meta-python/recipes-devtools/python/python3-pydantic_1.10.4.bb b/meta-python/recipes-devtools/python/python3-pydantic_1.10.4.bb deleted file mode 100644 index c17f3024cd..0000000000 --- a/meta-python/recipes-devtools/python/python3-pydantic_1.10.4.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Data validation and settings management using Python type hinting" -HOMEPAGE = "https://github.com/samuelcolvin/pydantic" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2c02ea30650b91528657db64baea1757" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "b9a3859f24eb4e097502a3be1fb4b2abb79b6103dd9e2e0edb70613a4459a648" - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-typing-extensions \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-image \ - ${PYTHON_PN}-logging \ -" diff --git a/meta-python/recipes-devtools/python/python3-pydantic_1.10.7.bb b/meta-python/recipes-devtools/python/python3-pydantic_1.10.7.bb new file mode 100644 index 0000000000..9d59cf8598 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pydantic_1.10.7.bb @@ -0,0 +1,21 @@ +SUMMARY = "Data validation and settings management using Python type hinting" +HOMEPAGE = "https://github.com/samuelcolvin/pydantic" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2c02ea30650b91528657db64baea1757" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "cfc83c0678b6ba51b0532bea66860617c4cd4251ecf76e9846fa5a9f3454e97e" + +RDEPENDS:${PN} += "\ + python3-core \ + python3-datetime \ + python3-image \ + python3-io \ + python3-json \ + python3-logging \ + python3-netclient \ + python3-numbers \ + python3-profile \ + python3-typing-extensions \ +" diff --git a/meta-python/recipes-devtools/python/python3-pydbus-manager_git.bb b/meta-python/recipes-devtools/python/python3-pydbus-manager_git.bb deleted file mode 100644 index 796f7219ac..0000000000 --- a/meta-python/recipes-devtools/python/python3-pydbus-manager_git.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "DBus.ObjectManager implementation for pydbus" -AUTHOR = "Sébastien Corne" - -LICENSE = "WTFPL" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0fd5bb1dae91ba145745db55870be6a7" - -inherit setuptools3 - -SRC_URI = "git://github.com/seebz/pydbus-manager.git;branch=master;protocol=https" -SRCREV = "6b576b969cbda50521dca62a7df929167207f9fc" -PV = "git${SRCPV}" - -S = "${WORKDIR}/git" - -RDEPENDS:${PN} += "python3-pydbus" diff --git a/meta-python/recipes-devtools/python/python3-pydbus/0001-Support-asynchronous-calls-58.patch b/meta-python/recipes-devtools/python/python3-pydbus/0001-Support-asynchronous-calls-58.patch deleted file mode 100644 index c5cb9a8780..0000000000 --- a/meta-python/recipes-devtools/python/python3-pydbus/0001-Support-asynchronous-calls-58.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 39a7d79ee6c548902fbac8b95c934af7e4c69260 Mon Sep 17 00:00:00 2001 -From: Vendula Poncova <vponcova@redhat.com> -Date: Thu, 2 Aug 2018 15:30:45 +0800 -Subject: [PATCH 1/2] Support asynchronous calls (#58) - -Added support for asynchronous calls of methods. A method is called -synchronously unless its callback parameter is specified. A callback -is a function f(*args, returned=None, error=None), where args is -callback_args specified in the method call, returned is a return -value of the method and error is an exception raised by the method. - -Example of an asynchronous call: - -def func(x, y, returned=None, error=None): - pass - -proxy.Method(a, b, callback=func, callback_args=(x, y)) - -Upstream-Status: Cherry-pick [https://src.fedoraproject.org/cgit/rpms/python-pydbus.git/] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - pydbus/proxy_method.py | 44 ++++++++++++++++++++++++++++++++++++++------ - 1 file changed, 38 insertions(+), 6 deletions(-) - -diff --git a/pydbus/proxy_method.py b/pydbus/proxy_method.py -index 8798edd..4ea4304 100644 ---- a/pydbus/proxy_method.py -+++ b/pydbus/proxy_method.py -@@ -65,15 +65,34 @@ class ProxyMethod(object): - - # Python 2 sux - for kwarg in kwargs: -- if kwarg not in ("timeout",): -+ if kwarg not in ("timeout", "callback", "callback_args"): - raise TypeError(self.__qualname__ + " got an unexpected keyword argument '{}'".format(kwarg)) - timeout = kwargs.get("timeout", None) -+ callback = kwargs.get("callback", None) -+ callback_args = kwargs.get("callback_args", tuple()) -+ -+ call_args = ( -+ instance._bus_name, -+ instance._path, -+ self._iface_name, -+ self.__name__, -+ GLib.Variant(self._sinargs, args), -+ GLib.VariantType.new(self._soutargs), -+ 0, -+ timeout_to_glib(timeout), -+ None -+ ) -+ -+ if callback: -+ call_args += (self._finish_async_call, (callback, callback_args)) -+ instance._bus.con.call(*call_args) -+ return None -+ else: -+ ret = instance._bus.con.call_sync(*call_args) -+ return self._unpack_return(ret) - -- ret = instance._bus.con.call_sync( -- instance._bus_name, instance._path, -- self._iface_name, self.__name__, GLib.Variant(self._sinargs, args), GLib.VariantType.new(self._soutargs), -- 0, timeout_to_glib(timeout), None).unpack() -- -+ def _unpack_return(self, values): -+ ret = values.unpack() - if len(self._outargs) == 0: - return None - elif len(self._outargs) == 1: -@@ -81,6 +100,19 @@ class ProxyMethod(object): - else: - return ret - -+ def _finish_async_call(self, source, result, user_data): -+ error = None -+ return_args = None -+ -+ try: -+ ret = source.call_finish(result) -+ return_args = self._unpack_return(ret) -+ except Exception as err: -+ error = err -+ -+ callback, callback_args = user_data -+ callback(*callback_args, returned=return_args, error=error) -+ - def __get__(self, instance, owner): - if instance is None: - return self --- -2.7.4 - diff --git a/meta-python/recipes-devtools/python/python3-pydbus/0002-Support-transformation-between-D-Bus-errors-and-exce.patch b/meta-python/recipes-devtools/python/python3-pydbus/0002-Support-transformation-between-D-Bus-errors-and-exce.patch deleted file mode 100644 index f5c0390c54..0000000000 --- a/meta-python/recipes-devtools/python/python3-pydbus/0002-Support-transformation-between-D-Bus-errors-and-exce.patch +++ /dev/null @@ -1,203 +0,0 @@ -From 69968dec867053e38de0b91d76ac41d5a5735e36 Mon Sep 17 00:00:00 2001 -From: Vendula Poncova <vponcova@redhat.com> -Date: Thu, 2 Aug 2018 15:31:56 +0800 -Subject: [PATCH 2/2] Support transformation between D-Bus errors and - exceptions. - -Exceptions can be registered with decorators, raised in a remote -method and recreated after return from the remote call. - -Upstream-Status: Cherry-pick [https://src.fedoraproject.org/cgit/rpms/python-pydbus.git/] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - pydbus/error.py | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++ - pydbus/proxy_method.py | 18 ++++++++-- - pydbus/registration.py | 16 ++++++--- - 3 files changed, 123 insertions(+), 8 deletions(-) - create mode 100644 pydbus/error.py - -diff --git a/pydbus/error.py b/pydbus/error.py -new file mode 100644 -index 0000000..aaa3510 ---- /dev/null -+++ b/pydbus/error.py -@@ -0,0 +1,97 @@ -+from gi.repository import GLib, Gio -+ -+ -+def register_error(name, domain, code): -+ """Register and map decorated exception class to a DBus error.""" -+ def decorated(cls): -+ error_registration.register_error(cls, name, domain, code) -+ return cls -+ -+ return decorated -+ -+ -+def map_error(error_name): -+ """Map decorated exception class to a DBus error.""" -+ def decorated(cls): -+ error_registration.map_error(cls, error_name) -+ return cls -+ -+ return decorated -+ -+ -+def map_by_default(cls): -+ """Map decorated exception class to all unknown DBus errors.""" -+ error_registration.map_by_default(cls) -+ return cls -+ -+ -+class ErrorRegistration(object): -+ """Class for mapping exceptions to DBus errors.""" -+ -+ _default = None -+ _map = dict() -+ _reversed_map = dict() -+ -+ def map_by_default(self, exception_cls): -+ """Set the exception class as a default.""" -+ self._default = exception_cls -+ -+ def map_error(self, exception_cls, name): -+ """Map the exception class to a DBus name.""" -+ self._map[name] = exception_cls -+ self._reversed_map[exception_cls] = name -+ -+ def register_error(self, exception_cls, name, domain, code): -+ """Map and register the exception class to a DBus name.""" -+ self.map_error(exception_cls, name) -+ return Gio.DBusError.register_error(domain, code, name) -+ -+ def is_registered_exception(self, obj): -+ """Is the exception registered?""" -+ return obj.__class__ in self._reversed_map -+ -+ def get_dbus_name(self, obj): -+ """Get the DBus name of the exception.""" -+ return self._reversed_map.get(obj.__class__) -+ -+ def get_exception_class(self, name): -+ """Get the exception class mapped to the DBus name.""" -+ return self._map.get(name, self._default) -+ -+ def transform_message(self, name, message): -+ """Transform the message of the exception.""" -+ prefix = "{}:{}: ".format("GDBus.Error", name) -+ -+ if message.startswith(prefix): -+ return message[len(prefix):] -+ -+ return message -+ -+ def transform_exception(self, e): -+ """Transform the remote error to the exception.""" -+ if not isinstance(e, GLib.Error): -+ return e -+ -+ if not Gio.DBusError.is_remote_error(e): -+ return e -+ -+ # Get DBus name of the error. -+ name = Gio.DBusError.get_remote_error(e) -+ # Get the exception class. -+ exception_cls = self.get_exception_class(name) -+ -+ # Return the original exception. -+ if not exception_cls: -+ return e -+ -+ # Return new exception. -+ message = self.transform_message(name, e.message) -+ exception = exception_cls(message) -+ exception.dbus_name = name -+ exception.dbus_domain = e.domain -+ exception.dbus_code = e.code -+ return exception -+ -+ -+# Default error registration. -+error_registration = ErrorRegistration() -diff --git a/pydbus/proxy_method.py b/pydbus/proxy_method.py -index 4ea4304..e9496f5 100644 ---- a/pydbus/proxy_method.py -+++ b/pydbus/proxy_method.py -@@ -2,6 +2,7 @@ from gi.repository import GLib - from .generic import bound_method - from .identifier import filter_identifier - from .timeout import timeout_to_glib -+from .error import error_registration - - try: - from inspect import Signature, Parameter -@@ -87,9 +88,20 @@ class ProxyMethod(object): - call_args += (self._finish_async_call, (callback, callback_args)) - instance._bus.con.call(*call_args) - return None -+ - else: -- ret = instance._bus.con.call_sync(*call_args) -- return self._unpack_return(ret) -+ result = None -+ error = None -+ -+ try: -+ result = instance._bus.con.call_sync(*call_args) -+ except Exception as e: -+ error = error_registration.transform_exception(e) -+ -+ if error: -+ raise error -+ -+ return self._unpack_return(result) - - def _unpack_return(self, values): - ret = values.unpack() -@@ -108,7 +120,7 @@ class ProxyMethod(object): - ret = source.call_finish(result) - return_args = self._unpack_return(ret) - except Exception as err: -- error = err -+ error = error_registration.transform_exception(err) - - callback, callback_args = user_data - callback(*callback_args, returned=return_args, error=error) -diff --git a/pydbus/registration.py b/pydbus/registration.py -index f531539..1d2cbcb 100644 ---- a/pydbus/registration.py -+++ b/pydbus/registration.py -@@ -5,6 +5,7 @@ from . import generic - from .exitable import ExitableWithAliases - from functools import partial - from .method_call_context import MethodCallContext -+from .error import error_registration - import logging - - try: -@@ -91,11 +92,16 @@ class ObjectWrapper(ExitableWithAliases("unwrap")): - logger = logging.getLogger(__name__) - logger.exception("Exception while handling %s.%s()", interface_name, method_name) - -- #TODO Think of a better way to translate Python exception types to DBus error types. -- e_type = type(e).__name__ -- if not "." in e_type: -- e_type = "unknown." + e_type -- invocation.return_dbus_error(e_type, str(e)) -+ if error_registration.is_registered_exception(e): -+ name = error_registration.get_dbus_name(e) -+ invocation.return_dbus_error(name, str(e)) -+ else: -+ logger.info("name is not registered") -+ e_type = type(e).__name__ -+ if not "." in e_type: -+ e_type = "unknown." + e_type -+ -+ invocation.return_dbus_error(e_type, str(e)) - - def Get(self, interface_name, property_name): - type = self.readable_properties[interface_name + "." + property_name] --- -2.7.4 - diff --git a/meta-python/recipes-devtools/python/python3-pydbus_0.6.0.bb b/meta-python/recipes-devtools/python/python3-pydbus_0.6.0.bb deleted file mode 100644 index a1b9fffea6..0000000000 --- a/meta-python/recipes-devtools/python/python3-pydbus_0.6.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Pythonic DBus library" -HOMEPAGE = "https://pypi.python.org/pypi/pydbus/" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a916467b91076e631dd8edb7424769c7" - -SRC_URI += "file://0001-Support-asynchronous-calls-58.patch \ - file://0002-Support-transformation-between-D-Bus-errors-and-exce.patch \ -" - -SRC_URI[md5sum] = "c6abd44862322679bd4e907bebc3e0d0" -SRC_URI[sha256sum] = "4207162eff54223822c185da06c1ba8a34137a9602f3da5a528eedf3f78d0f2c" - -inherit pypi setuptools3 - -S = "${WORKDIR}/pydbus-${PV}" - -RDEPENDS:${PN} = "${PYTHON_PN}-pygobject \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-logging" diff --git a/meta-python/recipes-devtools/python/python3-pydicti_1.2.0.bb b/meta-python/recipes-devtools/python/python3-pydicti_1.2.1.bb index 18d3a0aa63..2363c29059 100644 --- a/meta-python/recipes-devtools/python/python3-pydicti_1.2.0.bb +++ b/meta-python/recipes-devtools/python/python3-pydicti_1.2.1.bb @@ -3,6 +3,6 @@ HOMEPAGE = "https://github.com/coldfix/pydicti" LICENSE = "WTFPL" LIC_FILES_CHKSUM = "file://COPYING;md5=389a9e29629d1f05e115f8f05c283df5" -SRC_URI[sha256sum] = "32d59407b3229b22702910bd10f53d46c330481b5aea7cce076630d661be9d1e" +SRC_URI[sha256sum] = "63e0756ff27a335e92916ff40be589a21a58894b3a93099edf0f3cbf695690dc" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-pyexpect_1.0.21.bb b/meta-python/recipes-devtools/python/python3-pyexpect_1.0.22.bb index 1b80770d73..1cbd2384a3 100644 --- a/meta-python/recipes-devtools/python/python3-pyexpect_1.0.21.bb +++ b/meta-python/recipes-devtools/python/python3-pyexpect_1.0.22.bb @@ -7,5 +7,6 @@ LIC_FILES_CHKSUM = "file://README.md;md5=a6aa1e7097aca5955f9a2e1c8b0ce158" inherit pypi setuptools3 -SRC_URI[md5sum] = "c661939158d6a1acbcc2191bedc47751" -SRC_URI[sha256sum] = "96e900d6af928a94c2a75b4935ddda44872c218121d0467c549ae19e7608a9a2" +SRC_URI[sha256sum] = "659351e7ee8923b42de8a774fabfc806acf07377d7fd19f2ea4412ef8f619c6a" + +RDEPENDS:${PN} += "python3-numbers" diff --git a/meta-python/recipes-devtools/python/python3-pyiface_git.bb b/meta-python/recipes-devtools/python/python3-pyiface_git.bb index 5e0d2de916..29a0bc86c5 100644 --- a/meta-python/recipes-devtools/python/python3-pyiface_git.bb +++ b/meta-python/recipes-devtools/python/python3-pyiface_git.bb @@ -7,6 +7,12 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4fe869ee987a340198fb0d54c55c47f1" DEPENDS += "python3-setuptools-scm-native" +RDEPENDS:${PN} += " \ + python3-ctypes \ + python3-fcntl \ + python3-io \ +" + inherit setuptools3 SRC_URI = "git://github.com/bat-serjo/PyIface.git;protocol=https;branch=master" diff --git a/meta-python/recipes-devtools/python/python3-pyjks_20.0.0.bb b/meta-python/recipes-devtools/python/python3-pyjks_20.0.0.bb index 87e212d9dc..c0cca98ff6 100644 --- a/meta-python/recipes-devtools/python/python3-pyjks_20.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-pyjks_20.0.0.bb @@ -11,12 +11,12 @@ SRC_URI[sha256sum] = "0378cec15fb11b2ed27ba54dad9fd987d48e6f62f49fcff138f5f7a8b3 inherit pypi setuptools3 -RDEPENDS:${PN} = "\ - ${PYTHON_PN}-javaobj-py3 \ - ${PYTHON_PN}-pyasn1 \ - ${PYTHON_PN}-pyasn1-modules \ - ${PYTHON_PN}-pycryptodome \ - ${PYTHON_PN}-twofish\ +RDEPENDS:${PN} = " \ + python3-javaobj-py3 \ + python3-pyasn1 \ + python3-pyasn1-modules \ + python3-pycryptodomex \ + python3-twofish \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-pyjwt_2.6.0.bb b/meta-python/recipes-devtools/python/python3-pyjwt_2.7.0.bb index d6ca242c58..3aa9b479a5 100644 --- a/meta-python/recipes-devtools/python/python3-pyjwt_2.6.0.bb +++ b/meta-python/recipes-devtools/python/python3-pyjwt_2.7.0.bb @@ -5,11 +5,14 @@ HOMEPAGE = "http://github.com/jpadilla/pyjwt" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=e4b56d2c9973d8cf54655555be06e551" -SRC_URI[sha256sum] = "69285c7e31fc44f68a1feb309e948e0df53259d579295e6cfe2b1792329f05fd" +SRC_URI[sha256sum] = "bd6ca4a3c4285c1a2d4349e5a035fdf8fb94e04ccd0fcbe6ba289dae9cc3e074" PYPI_PACKAGE = "PyJWT" inherit pypi setuptools3 -RDEPENDS:${PN} = "${PYTHON_PN}-cryptography" +RDEPENDS:${PN} = " \ + python3-json \ + python3-cryptography \ +" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-pykwalify_1.8.0.bb b/meta-python/recipes-devtools/python/python3-pykwalify_1.8.0.bb index 6d93f384e0..d94051df89 100644 --- a/meta-python/recipes-devtools/python/python3-pykwalify_1.8.0.bb +++ b/meta-python/recipes-devtools/python/python3-pykwalify_1.8.0.bb @@ -11,9 +11,10 @@ PYPI_PACKAGE = "pykwalify" inherit setuptools3 pypi RDEPENDS:${PN} = "\ - ${PYTHON_PN}-docopt \ - ${PYTHON_PN}-dateutil \ - ${PYTHON_PN}-ruamel-yaml \ + python3-dateutil \ + python3-docopt \ + python3-logging \ + python3-ruamel-yaml \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-pylint/0001-pylint-remove-plugin-pickle-test.patch b/meta-python/recipes-devtools/python/python3-pylint/0001-pylint-remove-plugin-pickle-test.patch new file mode 100644 index 0000000000..a7637a5ca6 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pylint/0001-pylint-remove-plugin-pickle-test.patch @@ -0,0 +1,53 @@ +From 341e19dd69d847f84859e85cabff5846e7da24c4 Mon Sep 17 00:00:00 2001 +From: Trevor Gamblin <tgamblin@baylibre.com> +Date: Mon, 15 May 2023 09:26:04 -0400 +Subject: [PATCH] pylint: remove plugin pickle test + +Upstream-Status: Inappropriate (oe-specific) + +Upstream uses an assertion in the removed test to state that the test +needs changing if the plugin loading succeeds. The same failure wasn't +seen when running the tests on the host with pytest, so disable it by +removing the test from the suite. + +Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> +--- + tests/test_check_parallel.py | 22 ---------------------- + 1 file changed, 22 deletions(-) + +diff --git a/tests/test_check_parallel.py b/tests/test_check_parallel.py +index d56502eaf..34fec140f 100644 +--- a/tests/test_check_parallel.py ++++ b/tests/test_check_parallel.py +@@ -257,28 +257,6 @@ class TestCheckParallelFramework: + assert stats.statement == 18 + assert stats.warning == 0 + +- def test_linter_with_unpickleable_plugins_is_pickleable(self) -> None: +- """The linter needs to be pickle-able in order to be passed between workers""" +- linter = PyLinter(reporter=Reporter()) +- # We load an extension that we know is not pickle-safe +- linter.load_plugin_modules(["pylint.extensions.overlapping_exceptions"]) +- try: +- dill.dumps(linter) +- raise AssertionError( +- "Plugins loaded were pickle-safe! This test needs altering" +- ) +- except (KeyError, TypeError, PickleError, NotImplementedError): +- pass +- +- # And expect this call to make it pickle-able +- linter.load_plugin_configuration() +- try: +- dill.dumps(linter) +- except KeyError as exc: +- raise AssertionError( +- "Cannot pickle linter when using non-pickleable plugin" +- ) from exc +- + def test_worker_check_sequential_checker(self) -> None: + """Same as test_worker_check_single_file_no_checkers with SequentialTestChecker.""" + linter = PyLinter(reporter=Reporter()) +-- +2.40.1 + diff --git a/meta-python/recipes-devtools/python/python3-pylint/0001-pyproject.toml-Remove-hard-coded-dependencies.patch b/meta-python/recipes-devtools/python/python3-pylint/0001-pyproject.toml-Remove-hard-coded-dependencies.patch new file mode 100644 index 0000000000..7950e72077 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pylint/0001-pyproject.toml-Remove-hard-coded-dependencies.patch @@ -0,0 +1,26 @@ +From c5c415a240189ac6730ba95de0bb5883dfb53609 Mon Sep 17 00:00:00 2001 +From: Trevor Gamblin <tgamblin@baylibre.com> +Date: Mon, 1 May 2023 11:32:24 -0400 +Subject: [PATCH] pyproject.toml: Remove hard-coded dependencies + +Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> +--- +Upstream-Status: Pending + + pyproject.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyproject.toml b/pyproject.toml +index bd542646b..2c0ed9485 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,5 +1,5 @@ + [build-system] +-requires = ["setuptools~=62.6", "wheel~=0.37.1"] ++requires = ["setuptools", "wheel"] + build-backend = "setuptools.build_meta" + + [project] +-- +2.40.0 + diff --git a/meta-python/recipes-devtools/python/python3-pylint/run-ptest b/meta-python/recipes-devtools/python/python3-pylint/run-ptest new file mode 100644 index 0000000000..7a5ceedf95 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pylint/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest --benchmark-disable -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-python/recipes-devtools/python/python3-pylint_2.14.5.bb b/meta-python/recipes-devtools/python/python3-pylint_2.14.5.bb deleted file mode 100644 index 738b9250c0..0000000000 --- a/meta-python/recipes-devtools/python/python3-pylint_2.14.5.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY="Pylint is a Python source code analyzer" -HOMEPAGE= "http://www.pylint.org/" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c107cf754550e65755c42985a5d4e9c9" - -SRC_URI[sha256sum] = "487ce2192eee48211269a0e976421f334cf94de1806ca9d0a99449adcdf0285e" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += "${PYTHON_PN}-astroid \ - ${PYTHON_PN}-isort \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-pkgutil \ - ${PYTHON_PN}-difflib \ - ${PYTHON_PN}-netserver \ - " diff --git a/meta-python/recipes-devtools/python/python3-pylint_2.17.4.bb b/meta-python/recipes-devtools/python/python3-pylint_2.17.4.bb new file mode 100644 index 0000000000..96fce2e048 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pylint_2.17.4.bb @@ -0,0 +1,51 @@ +SUMMARY="Pylint is a Python source code analyzer" +HOMEPAGE= "http://www.pylint.org/" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c107cf754550e65755c42985a5d4e9c9" + +SRC_URI += " \ + git://github.com/pylint-dev/pylint;branch=main;protocol=https \ + file://run-ptest \ + file://0001-pyproject.toml-Remove-hard-coded-dependencies.patch \ + file://0001-pylint-remove-plugin-pickle-test.patch \ + " +SRCREV ?= "fc34a4b6abe56f3ac07ca15d846b1c1955545f85" + +inherit python_setuptools_build_meta ptest + +RDEPENDS:${PN} += "${PYTHON_PN}-astroid \ + ${PYTHON_PN}-dill \ + ${PYTHON_PN}-isort \ + ${PYTHON_PN}-mccabe \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-platformdirs \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-pkgutil \ + ${PYTHON_PN}-difflib \ + ${PYTHON_PN}-netserver \ + ${PYTHON_PN}-tomlkit \ + " + +RDEPENDS:${PN}-ptest += " \ + ${PYTHON_PN}-core \ + ${PYTHON_PN}-git \ + ${PYTHON_PN}-py \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-pytest-benchmark \ + ${PYTHON_PN}-pytest-runner \ + ${PYTHON_PN}-pytest-timeout \ + ${PYTHON_PN}-pytest-xdist \ + ${PYTHON_PN}-requests \ + ${PYTHON_PN}-statistics \ + ${PYTHON_PN}-tomllib \ + ${PYTHON_PN}-typing-extensions \ + " + +S = "${WORKDIR}/git" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ + sed -i 's#/usr/bin/python$#/usr/bin/python3#g' ${D}${PTEST_PATH}/tests/data/ascript +} diff --git a/meta-python/recipes-devtools/python/python3-pylyrics_1.1.0.bb b/meta-python/recipes-devtools/python/python3-pylyrics_1.1.0.bb index 207751c451..1ac95e8be3 100644 --- a/meta-python/recipes-devtools/python/python3-pylyrics_1.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-pylyrics_1.1.0.bb @@ -9,4 +9,10 @@ SRC_URI[sha256sum] = "c5f36e8ef0ed3b487a9242ce34c19f9684e418a5bbffd5d367dc1d1604 PYPI_PACKAGE = "PyLyrics" PYPI_PACKAGE_EXT = "zip" -inherit pypi setuptools3
\ No newline at end of file +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + python3-beautifulsoup4 \ + python3-classes \ + python3-requests \ +" diff --git a/meta-python/recipes-devtools/python/python3-pymisp_2.4.167.bb b/meta-python/recipes-devtools/python/python3-pymisp_2.4.173.bb index b4680e35d3..10cc52a7e9 100644 --- a/meta-python/recipes-devtools/python/python3-pymisp_2.4.167.bb +++ b/meta-python/recipes-devtools/python/python3-pymisp_2.4.173.bb @@ -4,7 +4,7 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=a3639cf5780f71b125d3e9d1dc127c20" SRC_URI = "git://github.com/MISP/PyMISP.git;protocol=https;branch=main" -SRCREV = "29dc2d6d1aa7919f50db256525bf66aa52b585ec" +SRCREV = "ccae32ae716c143bea09954e860238e193bc78c6" S = "${WORKDIR}/git" inherit python_poetry_core diff --git a/meta-python/recipes-devtools/python/python3-pymodbus_3.1.0.bb b/meta-python/recipes-devtools/python/python3-pymodbus_3.3.2.bb index b58c62218a..2b7dfd7741 100644 --- a/meta-python/recipes-devtools/python/python3-pymodbus_3.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-pymodbus_3.3.2.bb @@ -1,10 +1,10 @@ SUMMARY = "A fully featured modbus protocol stack in python" HOMEPAGE = "https://github.com/riptideio/pymodbus/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2c2223d66c7e674b40527b5a4c35bd76" +LIC_FILES_CHKSUM = "file://LICENSE;md5=430604f78bee72425da231d42eac9cee" DEPENDS += "python3-six-native" -SRC_URI[sha256sum] = "eeba02c86b13b1f885c0acc50adf4611df24ab85066ff54daa37c2d883c32525" +SRC_URI[sha256sum] = "33f427f39189567600ea1f8f6ebd7e5f26caf50ef330798792679fcae80ef339" S = "${WORKDIR}/pymodbus-${PV}" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-pymongo_4.3.3.bb b/meta-python/recipes-devtools/python/python3-pymongo_4.4.1.bb index c1bc39a451..b89706a566 100644 --- a/meta-python/recipes-devtools/python/python3-pymongo_4.3.3.bb +++ b/meta-python/recipes-devtools/python/python3-pymongo_4.4.1.bb @@ -8,7 +8,7 @@ HOMEPAGE = "http://github.com/mongodb/mongo-python-driver" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI[sha256sum] = "34e95ffb0a68bffbc3b437f2d1f25fc916fef3df5cdeed0992da5f42fae9b807" +SRC_URI[sha256sum] = "a4df87dbbd03ac6372d24f2a8054b4dc33de497d5227b50ec649f436ad574284" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-pynetlinux/0002-Fixed-relative-imports.patch b/meta-python/recipes-devtools/python/python3-pynetlinux/0002-Fixed-relative-imports.patch new file mode 100644 index 0000000000..9b5d9d6364 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pynetlinux/0002-Fixed-relative-imports.patch @@ -0,0 +1,60 @@ +From afb778669efbc658a29e6bdb1c4834fee42931aa Mon Sep 17 00:00:00 2001 +From: Robert Grant <rgrant@mdi.us.com> +Date: Wed, 10 Sep 2014 14:56:33 -0400 +Subject: [PATCH] Fixed relative imports + +Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> + +--- +Upstream-Status: Accepted + + pynetlinux/__init__.py | 8 ++++---- + pynetlinux/brctl.py | 2 +- + pynetlinux/tap.py | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/pynetlinux/__init__.py b/pynetlinux/__init__.py +index dbbf392..b6e1b8e 100644 +--- a/pynetlinux/__init__.py ++++ b/pynetlinux/__init__.py +@@ -2,7 +2,7 @@ + # import pylinux + # does a reasonable thing. + +-import brctl +-import ifconfig +-import tap +-import route ++from . import brctl ++from . import ifconfig ++from . import tap ++from . import route +diff --git a/pynetlinux/brctl.py b/pynetlinux/brctl.py +index f54d176..a8b926e 100644 +--- a/pynetlinux/brctl.py ++++ b/pynetlinux/brctl.py +@@ -3,7 +3,7 @@ import fcntl + import os + import struct + +-import ifconfig ++from . import ifconfig + + SYSFS_NET_PATH = "/sys/class/net" + +diff --git a/pynetlinux/tap.py b/pynetlinux/tap.py +index 0a0d59c..3f8ad3a 100644 +--- a/pynetlinux/tap.py ++++ b/pynetlinux/tap.py +@@ -2,7 +2,7 @@ import fcntl + import os + import struct + +-import ifconfig ++from . import ifconfig + + # From linux/if_tun.h + +-- +2.39.2 + diff --git a/meta-python/recipes-devtools/python/python3-pynetlinux_1.1.bb b/meta-python/recipes-devtools/python/python3-pynetlinux_1.1.bb index a5ac74fd68..b1abac17aa 100644 --- a/meta-python/recipes-devtools/python/python3-pynetlinux_1.1.bb +++ b/meta-python/recipes-devtools/python/python3-pynetlinux_1.1.bb @@ -7,6 +7,15 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=74e1861736ee959824fe7542323c12e9" SRC_URI[sha256sum] = "4ad08298c9f5ba15a11cddc639ba8778cabdfc402b51066d9e0a325e5a5b391c" -SRC_URI += "file://0001-setup.py-switch-to-setuptools.patch" +SRC_URI += " \ + file://0001-setup.py-switch-to-setuptools.patch \ + file://0002-Fixed-relative-imports.patch \ +" inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + python3-ctypes \ + python3-fcntl \ + python3-io \ +" diff --git a/meta-python/recipes-devtools/python/python3-pyperf_2.5.0.bb b/meta-python/recipes-devtools/python/python3-pyperf_2.6.1.bb index d5eaa4f607..c63e75cf2e 100644 --- a/meta-python/recipes-devtools/python/python3-pyperf_2.5.0.bb +++ b/meta-python/recipes-devtools/python/python3-pyperf_2.6.1.bb @@ -13,11 +13,11 @@ Features: \ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=78bc2e6e87c8c61272937b879e6dc2f8" -SRC_URI[sha256sum] = "9fd9be5b57224e68b5a5b88f7126f15b6c8667573f62a0a39faf14d6fdd13909" +SRC_URI[sha256sum] = "171aea69b8efde61210e512166d8764e7765a9c7678b768052174b01f349f247" DEPENDS += "${PYTHON_PN}-six-native" PYPI_PACKAGE = "pyperf" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta RDEPENDS:${PN} += "${PYTHON_PN}-misc ${PYTHON_PN}-statistics" diff --git a/meta-python/recipes-devtools/python/python3-pypng_0.20220715.0.bb b/meta-python/recipes-devtools/python/python3-pypng_0.20220715.0.bb new file mode 100644 index 0000000000..9e30f67dc6 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pypng_0.20220715.0.bb @@ -0,0 +1,8 @@ +SUMMARY = "PNG module for Python." +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENCE;md5=5b60f319c8cf51f825b4f40aadee3243" + +SRC_URI[sha256sum] = "739c433ba96f078315de54c0db975aee537cbc3e1d0ae4ed9aab0ca1e427e2c1" + +inherit pypi python_setuptools_build_meta diff --git a/meta-python/recipes-devtools/python/python3-pyproj_3.4.1.bb b/meta-python/recipes-devtools/python/python3-pyproj_3.6.0.bb index 49e5555fdf..d8708f5e72 100644 --- a/meta-python/recipes-devtools/python/python3-pyproj_3.4.1.bb +++ b/meta-python/recipes-devtools/python/python3-pyproj_3.6.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Python interface to PROJ (cartographic projections and coordinate transformations library)" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=dc4bb2668871655e24030dfe8d2a7ce7" +LIC_FILES_CHKSUM = "file://LICENSE;md5=873757af01d2d221eedb422c4c1dd163" DEPENDS = "python3-cython proj" DEPENDS:append:class-target = " python3-cython-native proj-native" @@ -8,9 +8,15 @@ PYPI_PACKAGE = "pyproj" inherit pypi setuptools3 -SRC_URI[sha256sum] = "261eb29b1d55b1eb7f336127344d9b31284d950a9446d1e0d1c2411f7dd8e3ac" +SRC_URI[sha256sum] = "a5b111865b3f0f8b77b3983f2fbe4dd6248fc09d3730295949977c8dcd988062" -RDEPENDS:${PN} = "${PYTHON_PN}-certifi proj" +RDEPENDS:${PN} = " \ + python3-certifi \ + python3-compression \ + python3-json \ + python3-logging \ + python3-profile \ +" export PROJ_INCDIR = "${STAGING_INCDIR}" export PROJ_LIBDIR = "${STAGING_LIBDIR}" diff --git a/meta-python/recipes-devtools/python/python3-pyproject-api_1.5.1.bb b/meta-python/recipes-devtools/python/python3-pyproject-api_1.5.1.bb new file mode 100644 index 0000000000..1b458fa2df --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pyproject-api_1.5.1.bb @@ -0,0 +1,23 @@ +# SPDX-License-Identifier: MIT +# Copyright (C) 2023 iris-GmbH infrared & intelligent sensors + +SUMMARY = "pyproject-api aims to abstract away interaction with pyproject.toml style projects in a flexible way." +HOMEPAGE = "https://pyproject-api.readthedocs.io" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=11610a9d8fd95649cf8159be12b98cb7" + +SRC_URI[sha256sum] = "435f46547a9ff22cf4208ee274fca3e2869aeb062a4834adfc99a4dd64af3cf9" + +PYPI_PACKAGE = "pyproject_api" + +BBCLASSEXTEND = "native nativesdk" +inherit pypi python_hatchling + +DEPENDS += "\ + ${PYTHON_PN}-hatch-vcs-native \ +" + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-packaging \ + ${PYTHON_PN}-tomli \ +" diff --git a/meta-python/recipes-devtools/python/python3-pyproject-metadata_0.7.1.bb b/meta-python/recipes-devtools/python/python3-pyproject-metadata_0.7.1.bb new file mode 100644 index 0000000000..9887af78d0 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pyproject-metadata_0.7.1.bb @@ -0,0 +1,16 @@ +SUMMARY = "PEP 621 metadata parsing" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=310439af287b0fb4780b2ad6907c256c" + +PYPI_PACKAGE = "pyproject-metadata" + +inherit pypi python_setuptools_build_meta +SRC_URI[sha256sum] = "0a94f18b108b9b21f3a26a3d541f056c34edcb17dc872a144a15618fed7aef67" + +BBCLASSEXTEND = "native nativesdk" + +RDEPENDS:${PN} += " \ + python3-logging \ + python3-packaging \ + python3-profile \ +" diff --git a/meta-python/recipes-devtools/python/python3-pyrad_2.4.bb b/meta-python/recipes-devtools/python/python3-pyrad_2.4.bb index bce1e2fd14..801233a026 100644 --- a/meta-python/recipes-devtools/python/python3-pyrad_2.4.bb +++ b/meta-python/recipes-devtools/python/python3-pyrad_2.4.bb @@ -9,3 +9,11 @@ SRC_URI[sha256sum] = "057de4b7e89d8da57ba782c1bde45c63ebee720ae2c0b0a69beaff15c4 SRC_URI += "file://use-poetry-core.patch" inherit pypi python_poetry_core + +RDEPENDS:${PN} += " \ + python3-crypt \ + python3-io \ + python3-logging \ + python3-netaddr \ + python3-six \ +" diff --git a/meta-python/recipes-devtools/python/python3-pyroute2_0.5.19.bb b/meta-python/recipes-devtools/python/python3-pyroute2_0.5.19.bb deleted file mode 100644 index fa5b3a522a..0000000000 --- a/meta-python/recipes-devtools/python/python3-pyroute2_0.5.19.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "A pure Python netlink and Linux network configuration library" -LICENSE = "GPL-2.0-only & Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.GPL.v2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://LICENSE.Apache.v2;md5=34281e312165f843a2b7d1f114fe65ce" - -SRC_URI[sha256sum] = "45460d12ed2a5caf272a357a3360b36d1e346f17afe1425b66fc21d70f462b29" - -inherit setuptools3 pypi ptest - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-distutils \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-multiprocessing \ - ${PYTHON_PN}-pickle \ - ${PYTHON_PN}-pkgutil \ - ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-unixadmin \ -" - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-fcntl \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} diff --git a/meta-python/recipes-devtools/python/python3-pyroute2_0.7.9.bb b/meta-python/recipes-devtools/python/python3-pyroute2_0.7.9.bb new file mode 100644 index 0000000000..263acd06c7 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pyroute2_0.7.9.bb @@ -0,0 +1,38 @@ +SUMMARY = "A pure Python netlink and Linux network configuration library" +LICENSE = "GPL-2.0-or-later | Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dccbff78d7d79ae7e53953d43445c6e6 \ + file://LICENSE.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LICENSE.Apache-2.0;md5=34281e312165f843a2b7d1f114fe65ce" + +SRC_URI[sha256sum] = "b69d82f140b0774317d7ba40f6c5fa1d755098ba3f3eb619982d16e750dc631a" + +inherit setuptools3 pypi ptest + +RDEPENDS:${PN} += " \ + python3-ctypes \ + python3-distutils \ + python3-io \ + python3-json \ + python3-fcntl \ + python3-logging \ + python3-multiprocessing \ + python3-pickle \ + python3-pkgutil \ + python3-pprint \ + python3-shell \ + python3-unixadmin \ +" + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS:${PN}-ptest += " \ + python3-pytest \ + python3-fcntl \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} diff --git a/meta-python/recipes-devtools/python/python3-pyruvate-crates.inc b/meta-python/recipes-devtools/python/python3-pyruvate-crates.inc new file mode 100644 index 0000000000..b8a74e617f --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pyruvate-crates.inc @@ -0,0 +1,216 @@ +# Autogenerated with 'bitbake -c update_crates python3-pyruvate' + +# from Cargo.lock +SRC_URI += " \ + crate://crates.io/aho-corasick/0.7.20 \ + crate://crates.io/autocfg/1.1.0 \ + crate://crates.io/bitflags/1.3.2 \ + crate://crates.io/block-buffer/0.10.3 \ + crate://crates.io/cc/1.0.78 \ + crate://crates.io/cfg-if/1.0.0 \ + crate://crates.io/cpufeatures/0.2.5 \ + crate://crates.io/cpython/0.7.1 \ + crate://crates.io/crossbeam/0.8.2 \ + crate://crates.io/crossbeam-channel/0.5.6 \ + crate://crates.io/crossbeam-deque/0.8.2 \ + crate://crates.io/crossbeam-epoch/0.9.13 \ + crate://crates.io/crossbeam-queue/0.3.8 \ + crate://crates.io/crossbeam-utils/0.8.14 \ + crate://crates.io/crypto-common/0.1.6 \ + crate://crates.io/digest/0.10.6 \ + crate://crates.io/encoding/0.2.33 \ + crate://crates.io/encoding-index-japanese/1.20141219.5 \ + crate://crates.io/encoding-index-korean/1.20141219.5 \ + crate://crates.io/encoding-index-simpchinese/1.20141219.5 \ + crate://crates.io/encoding-index-singlebyte/1.20141219.5 \ + crate://crates.io/encoding-index-tradchinese/1.20141219.5 \ + crate://crates.io/encoding_index_tests/0.1.4 \ + crate://crates.io/env_logger/0.10.0 \ + crate://crates.io/errno/0.2.8 \ + crate://crates.io/errno-dragonfly/0.1.2 \ + crate://crates.io/fastrand/1.8.0 \ + crate://crates.io/generic-array/0.14.6 \ + crate://crates.io/getrandom/0.2.8 \ + crate://crates.io/hermit-abi/0.1.19 \ + crate://crates.io/hermit-abi/0.2.6 \ + crate://crates.io/hmac/0.12.1 \ + crate://crates.io/httparse/1.8.0 \ + crate://crates.io/humantime/2.1.0 \ + crate://crates.io/instant/0.1.12 \ + crate://crates.io/io-lifetimes/1.0.3 \ + crate://crates.io/is-terminal/0.4.1 \ + crate://crates.io/itoa/1.0.5 \ + crate://crates.io/libc/0.2.138 \ + crate://crates.io/libsystemd/0.5.0 \ + crate://crates.io/linux-raw-sys/0.1.4 \ + crate://crates.io/log/0.4.17 \ + crate://crates.io/memchr/2.5.0 \ + crate://crates.io/memoffset/0.6.5 \ + crate://crates.io/memoffset/0.7.1 \ + crate://crates.io/minimal-lexical/0.2.1 \ + crate://crates.io/mio/0.8.5 \ + crate://crates.io/nix/0.23.2 \ + crate://crates.io/nix/0.26.1 \ + crate://crates.io/nom/7.1.1 \ + crate://crates.io/num-traits/0.2.15 \ + crate://crates.io/num_cpus/1.14.0 \ + crate://crates.io/num_threads/0.1.6 \ + crate://crates.io/once_cell/1.16.0 \ + crate://crates.io/paste/1.0.11 \ + crate://crates.io/pin-utils/0.1.0 \ + crate://crates.io/ppv-lite86/0.2.17 \ + crate://crates.io/proc-macro2/1.0.49 \ + crate://crates.io/python3-sys/0.7.1 \ + crate://crates.io/quote/1.0.23 \ + 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/redox_syscall/0.2.16 \ + crate://crates.io/regex/1.7.0 \ + crate://crates.io/regex-syntax/0.6.28 \ + crate://crates.io/remove_dir_all/0.5.3 \ + crate://crates.io/rustix/0.36.5 \ + crate://crates.io/scopeguard/1.1.0 \ + crate://crates.io/serde/1.0.151 \ + crate://crates.io/serde_derive/1.0.151 \ + crate://crates.io/sha2/0.10.6 \ + crate://crates.io/signal-hook/0.3.14 \ + crate://crates.io/signal-hook-registry/1.4.0 \ + crate://crates.io/simplelog/0.12.0 \ + crate://crates.io/spmc/0.3.0 \ + crate://crates.io/static_assertions/1.1.0 \ + crate://crates.io/subtle/2.4.1 \ + crate://crates.io/syn/1.0.107 \ + crate://crates.io/tempfile/3.3.0 \ + crate://crates.io/termcolor/1.1.3 \ + crate://crates.io/thiserror/1.0.38 \ + crate://crates.io/thiserror-impl/1.0.38 \ + crate://crates.io/threadpool/1.8.1 \ + crate://crates.io/time/0.3.17 \ + crate://crates.io/time-core/0.1.0 \ + crate://crates.io/time-macros/0.2.6 \ + crate://crates.io/typenum/1.16.0 \ + crate://crates.io/unicode-ident/1.0.6 \ + crate://crates.io/urlencoding/2.1.2 \ + crate://crates.io/uuid/0.8.2 \ + crate://crates.io/version_check/0.9.4 \ + 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-util/0.1.5 \ + crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ + crate://crates.io/windows-sys/0.42.0 \ + crate://crates.io/windows_aarch64_gnullvm/0.42.0 \ + crate://crates.io/windows_aarch64_msvc/0.42.0 \ + crate://crates.io/windows_i686_gnu/0.42.0 \ + crate://crates.io/windows_i686_msvc/0.42.0 \ + crate://crates.io/windows_x86_64_gnu/0.42.0 \ + crate://crates.io/windows_x86_64_gnullvm/0.42.0 \ + crate://crates.io/windows_x86_64_msvc/0.42.0 \ +" + +SRC_URI[aho-corasick-0.7.20.sha256sum] = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +SRC_URI[block-buffer-0.10.3.sha256sum] = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +SRC_URI[cc-1.0.78.sha256sum] = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" +SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +SRC_URI[cpufeatures-0.2.5.sha256sum] = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +SRC_URI[cpython-0.7.1.sha256sum] = "3052106c29da7390237bc2310c1928335733b286287754ea85e6093d2495280e" +SRC_URI[crossbeam-0.8.2.sha256sum] = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" +SRC_URI[crossbeam-channel-0.5.6.sha256sum] = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +SRC_URI[crossbeam-deque-0.8.2.sha256sum] = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +SRC_URI[crossbeam-epoch-0.9.13.sha256sum] = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" +SRC_URI[crossbeam-queue-0.3.8.sha256sum] = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +SRC_URI[crossbeam-utils-0.8.14.sha256sum] = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +SRC_URI[crypto-common-0.1.6.sha256sum] = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +SRC_URI[digest-0.10.6.sha256sum] = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +SRC_URI[encoding-0.2.33.sha256sum] = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" +SRC_URI[encoding-index-japanese-1.20141219.5.sha256sum] = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" +SRC_URI[encoding-index-korean-1.20141219.5.sha256sum] = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" +SRC_URI[encoding-index-simpchinese-1.20141219.5.sha256sum] = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" +SRC_URI[encoding-index-singlebyte-1.20141219.5.sha256sum] = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" +SRC_URI[encoding-index-tradchinese-1.20141219.5.sha256sum] = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" +SRC_URI[encoding_index_tests-0.1.4.sha256sum] = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" +SRC_URI[env_logger-0.10.0.sha256sum] = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +SRC_URI[errno-0.2.8.sha256sum] = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +SRC_URI[errno-dragonfly-0.1.2.sha256sum] = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +SRC_URI[fastrand-1.8.0.sha256sum] = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +SRC_URI[generic-array-0.14.6.sha256sum] = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +SRC_URI[getrandom-0.2.8.sha256sum] = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +SRC_URI[hermit-abi-0.1.19.sha256sum] = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +SRC_URI[hermit-abi-0.2.6.sha256sum] = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +SRC_URI[hmac-0.12.1.sha256sum] = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +SRC_URI[httparse-1.8.0.sha256sum] = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +SRC_URI[humantime-2.1.0.sha256sum] = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +SRC_URI[instant-0.1.12.sha256sum] = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +SRC_URI[io-lifetimes-1.0.3.sha256sum] = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" +SRC_URI[is-terminal-0.4.1.sha256sum] = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330" +SRC_URI[itoa-1.0.5.sha256sum] = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" +SRC_URI[libc-0.2.138.sha256sum] = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" +SRC_URI[libsystemd-0.5.0.sha256sum] = "8144587c71c16756b1055d3dcb0c75cb605a10ecd6523cc33702d5f90902bf6d" +SRC_URI[linux-raw-sys-0.1.4.sha256sum] = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +SRC_URI[log-0.4.17.sha256sum] = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +SRC_URI[memchr-2.5.0.sha256sum] = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +SRC_URI[memoffset-0.6.5.sha256sum] = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +SRC_URI[memoffset-0.7.1.sha256sum] = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" +SRC_URI[mio-0.8.5.sha256sum] = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +SRC_URI[nix-0.23.2.sha256sum] = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" +SRC_URI[nix-0.26.1.sha256sum] = "46a58d1d356c6597d08cde02c2f09d785b09e28711837b1ed667dc652c08a694" +SRC_URI[nom-7.1.1.sha256sum] = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +SRC_URI[num-traits-0.2.15.sha256sum] = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +SRC_URI[num_cpus-1.14.0.sha256sum] = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +SRC_URI[num_threads-0.1.6.sha256sum] = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +SRC_URI[once_cell-1.16.0.sha256sum] = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +SRC_URI[paste-1.0.11.sha256sum] = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" +SRC_URI[pin-utils-0.1.0.sha256sum] = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +SRC_URI[proc-macro2-1.0.49.sha256sum] = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" +SRC_URI[python3-sys-0.7.1.sha256sum] = "49f8b50d72fb3015735aa403eebf19bbd72c093bfeeae24ee798be5f2f1aab52" +SRC_URI[quote-1.0.23.sha256sum] = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +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[redox_syscall-0.2.16.sha256sum] = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +SRC_URI[regex-1.7.0.sha256sum] = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +SRC_URI[regex-syntax-0.6.28.sha256sum] = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +SRC_URI[remove_dir_all-0.5.3.sha256sum] = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +SRC_URI[rustix-0.36.5.sha256sum] = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588" +SRC_URI[scopeguard-1.1.0.sha256sum] = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +SRC_URI[serde-1.0.151.sha256sum] = "97fed41fc1a24994d044e6db6935e69511a1153b52c15eb42493b26fa87feba0" +SRC_URI[serde_derive-1.0.151.sha256sum] = "255abe9a125a985c05190d687b320c12f9b1f0b99445e608c21ba0782c719ad8" +SRC_URI[sha2-0.10.6.sha256sum] = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +SRC_URI[signal-hook-0.3.14.sha256sum] = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" +SRC_URI[signal-hook-registry-1.4.0.sha256sum] = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +SRC_URI[simplelog-0.12.0.sha256sum] = "48dfff04aade74dd495b007c831cd6f4e0cee19c344dd9dc0884c0289b70a786" +SRC_URI[spmc-0.3.0.sha256sum] = "02a8428da277a8e3a15271d79943e80ccc2ef254e78813a166a08d65e4c3ece5" +SRC_URI[static_assertions-1.1.0.sha256sum] = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +SRC_URI[subtle-2.4.1.sha256sum] = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +SRC_URI[syn-1.0.107.sha256sum] = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +SRC_URI[tempfile-3.3.0.sha256sum] = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +SRC_URI[termcolor-1.1.3.sha256sum] = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +SRC_URI[thiserror-1.0.38.sha256sum] = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +SRC_URI[thiserror-impl-1.0.38.sha256sum] = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +SRC_URI[threadpool-1.8.1.sha256sum] = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +SRC_URI[time-0.3.17.sha256sum] = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +SRC_URI[time-core-0.1.0.sha256sum] = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +SRC_URI[time-macros-0.2.6.sha256sum] = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +SRC_URI[typenum-1.16.0.sha256sum] = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +SRC_URI[unicode-ident-1.0.6.sha256sum] = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +SRC_URI[urlencoding-2.1.2.sha256sum] = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" +SRC_URI[uuid-0.8.2.sha256sum] = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" +SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +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-util-0.1.5.sha256sum] = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +SRC_URI[windows-sys-0.42.0.sha256sum] = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +SRC_URI[windows_aarch64_gnullvm-0.42.0.sha256sum] = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +SRC_URI[windows_aarch64_msvc-0.42.0.sha256sum] = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +SRC_URI[windows_i686_gnu-0.42.0.sha256sum] = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +SRC_URI[windows_i686_msvc-0.42.0.sha256sum] = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +SRC_URI[windows_x86_64_gnu-0.42.0.sha256sum] = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +SRC_URI[windows_x86_64_gnullvm-0.42.0.sha256sum] = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +SRC_URI[windows_x86_64_msvc-0.42.0.sha256sum] = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" diff --git a/meta-python/recipes-devtools/python/python3-pyruvate/0001-check-for-mips-targets-for-stat.st_dev-definitions.patch b/meta-python/recipes-devtools/python/python3-pyruvate/0001-check-for-mips-targets-for-stat.st_dev-definitions.patch index f41e6cf116..3f8256b027 100644 --- a/meta-python/recipes-devtools/python/python3-pyruvate/0001-check-for-mips-targets-for-stat.st_dev-definitions.patch +++ b/meta-python/recipes-devtools/python/python3-pyruvate/0001-check-for-mips-targets-for-stat.st_dev-definitions.patch @@ -19,7 +19,9 @@ currently the build fails on mips archirecture with type mismatches 296 | device: stat.st_dev, | ^^^^^^^^^^^ expected `u64`, found `u32` -Upstream-Status: Submitted [https://github.com/lucab/libsystemd-rs/pull/103] +Drop this patch when libsystemd-rs crate bumps to 0.6.0+ + +Upstream-Status: Backport [https://github.com/lucab/libsystemd-rs/pull/104] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- src/logging.rs | 3 +++ diff --git a/meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-Define-O_LARGEFILE-for-riscv32.patch b/meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-Define-O_LARGEFILE-for-riscv32.patch new file mode 100644 index 0000000000..621249c483 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-Define-O_LARGEFILE-for-riscv32.patch @@ -0,0 +1,21 @@ +From fdf98602ad20d06ebf65574541caac68ca421ac4 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 8 Apr 2023 09:19:53 -0700 +Subject: [PATCH] musl: Define O_LARGEFILE for riscv32 + +Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/3191] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/unix/linux_like/linux/musl/b32/riscv32/mod.rs | 1 + + 1 file changed, 1 insertion(+) + +--- a/src/unix/linux_like/linux/musl/b32/riscv32/mod.rs ++++ b/src/unix/linux_like/linux/musl/b32/riscv32/mod.rs +@@ -370,6 +370,7 @@ pub const __SIZEOF_PTHREAD_CONDATTR_T: u + pub const __SIZEOF_PTHREAD_MUTEXATTR_T: usize = 4; + pub const O_DIRECT: ::c_int = 16384; + pub const O_DIRECTORY: ::c_int = 65536; ++pub const O_LARGEFILE: ::c_int = 0o0100000; + pub const O_NOFOLLOW: ::c_int = 131072; + pub const MAP_HUGETLB: ::c_int = 262144; + pub const MAP_LOCKED: ::c_int = 8192; diff --git a/meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-Define-SOCK_NONBLOCK-with-O_NONBLOCK.patch b/meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-Define-SOCK_NONBLOCK-with-O_NONBLOCK.patch new file mode 100644 index 0000000000..e19b50d30d --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-Define-SOCK_NONBLOCK-with-O_NONBLOCK.patch @@ -0,0 +1,99 @@ +From f2b06fa4ea6ec9a33f8b269f0a1730a26276c5b0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 8 Apr 2023 08:25:46 -0700 +Subject: [PATCH] musl: Define SOCK_NONBLOCK with O_NONBLOCK + +Much like glibc, these defines are same on musl [1] [2] +therefore consolidate the definition in one place +for SOCK_NONBLOCK + +[1] https://github.com/search?q=repo%3Abminor%2Fmusl++%22%23define+SOCK_NONBLOCK%22&type=code +[2] https://github.com/search?q=repo%3Abminor%2Fmusl++%22%23define+O_NONBLOCK%22&type=code + +Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/3191] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/unix/linux_like/linux/musl/b32/arm/mod.rs | 2 -- + src/unix/linux_like/linux/musl/b32/hexagon.rs | 1 - + src/unix/linux_like/linux/musl/b32/mips/mod.rs | 2 -- + src/unix/linux_like/linux/musl/b32/powerpc.rs | 2 -- + src/unix/linux_like/linux/musl/b32/x86/mod.rs | 2 -- + src/unix/linux_like/linux/musl/b64/mod.rs | 2 -- + src/unix/linux_like/linux/musl/mod.rs | 1 + + 7 files changed, 1 insertion(+), 11 deletions(-) + +--- a/src/unix/linux_like/linux/musl/b32/arm/mod.rs ++++ b/src/unix/linux_like/linux/musl/b32/arm/mod.rs +@@ -311,8 +311,6 @@ pub const O_SYNC: ::c_int = 1052672; + pub const O_RSYNC: ::c_int = 1052672; + pub const O_DSYNC: ::c_int = 4096; + +-pub const SOCK_NONBLOCK: ::c_int = 2048; +- + pub const MAP_ANON: ::c_int = 0x0020; + pub const MAP_GROWSDOWN: ::c_int = 0x0100; + pub const MAP_DENYWRITE: ::c_int = 0x0800; +--- a/src/unix/linux_like/linux/musl/b32/hexagon.rs ++++ b/src/unix/linux_like/linux/musl/b32/hexagon.rs +@@ -295,7 +295,6 @@ pub const SIG_SETMASK: ::c_int = 2; // F + pub const SIG_BLOCK: ::c_int = 0x000000; + pub const SIG_UNBLOCK: ::c_int = 0x01; + pub const SOCK_DGRAM: ::c_int = 2; +-pub const SOCK_NONBLOCK: ::c_int = 2048; + pub const SOCK_SEQPACKET: ::c_int = 5; + pub const SOCK_STREAM: ::c_int = 1; + pub const SOL_CAIF: ::c_int = 278; +--- a/src/unix/linux_like/linux/musl/b32/mips/mod.rs ++++ b/src/unix/linux_like/linux/musl/b32/mips/mod.rs +@@ -250,8 +250,6 @@ pub const O_SYNC: ::c_int = 0o40020; + pub const O_RSYNC: ::c_int = 0o40020; + pub const O_DSYNC: ::c_int = 0o020; + +-pub const SOCK_NONBLOCK: ::c_int = 0o200; +- + pub const MAP_ANON: ::c_int = 0x800; + pub const MAP_GROWSDOWN: ::c_int = 0x1000; + pub const MAP_DENYWRITE: ::c_int = 0x2000; +--- a/src/unix/linux_like/linux/musl/b32/powerpc.rs ++++ b/src/unix/linux_like/linux/musl/b32/powerpc.rs +@@ -243,8 +243,6 @@ pub const O_SYNC: ::c_int = 1052672; + pub const O_RSYNC: ::c_int = 1052672; + pub const O_DSYNC: ::c_int = 4096; + +-pub const SOCK_NONBLOCK: ::c_int = 2048; +- + pub const MAP_ANON: ::c_int = 0x0020; + pub const MAP_GROWSDOWN: ::c_int = 0x0100; + pub const MAP_DENYWRITE: ::c_int = 0x0800; +--- a/src/unix/linux_like/linux/musl/b32/x86/mod.rs ++++ b/src/unix/linux_like/linux/musl/b32/x86/mod.rs +@@ -300,8 +300,6 @@ pub const O_SYNC: ::c_int = 1052672; + pub const O_RSYNC: ::c_int = 1052672; + pub const O_DSYNC: ::c_int = 4096; + +-pub const SOCK_NONBLOCK: ::c_int = 2048; +- + pub const MAP_ANON: ::c_int = 0x0020; + pub const MAP_GROWSDOWN: ::c_int = 0x0100; + pub const MAP_DENYWRITE: ::c_int = 0x0800; +--- a/src/unix/linux_like/linux/musl/b64/mod.rs ++++ b/src/unix/linux_like/linux/musl/b64/mod.rs +@@ -133,8 +133,6 @@ s! { + pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 56; + pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 40; + +-pub const SOCK_NONBLOCK: ::c_int = 2048; +- + pub const SOCK_SEQPACKET: ::c_int = 5; + + extern "C" { +--- a/src/unix/linux_like/linux/musl/mod.rs ++++ b/src/unix/linux_like/linux/musl/mod.rs +@@ -527,6 +527,7 @@ pub const POSIX_MADV_DONTNEED: ::c_int = + pub const MAP_ANONYMOUS: ::c_int = MAP_ANON; + + pub const SOCK_DCCP: ::c_int = 6; ++pub const SOCK_NONBLOCK: ::c_int = O_NONBLOCK; + pub const SOCK_PACKET: ::c_int = 10; + + pub const SOMAXCONN: ::c_int = 128; diff --git a/meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch b/meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch new file mode 100644 index 0000000000..2da3a43154 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch @@ -0,0 +1,92 @@ +From e00da82cd46221bfb650895c9cea65082da66b4e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 8 Apr 2023 09:25:31 -0700 +Subject: [PATCH] musl: Define SOCK_SEQPACKET in common place + +This define is not architecture specific in musl [1] + +[1] https://git.musl-libc.org/cgit/musl/tree/include/sys/socket.h#n90 + +Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/3191] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/unix/linux_like/linux/musl/b32/arm/mod.rs | 1 - + src/unix/linux_like/linux/musl/b32/hexagon.rs | 1 - + src/unix/linux_like/linux/musl/b32/mips/mod.rs | 1 - + src/unix/linux_like/linux/musl/b32/powerpc.rs | 1 - + src/unix/linux_like/linux/musl/b32/x86/mod.rs | 1 - + src/unix/linux_like/linux/musl/b64/mod.rs | 2 -- + src/unix/linux_like/linux/musl/mod.rs | 1 + + 7 files changed, 1 insertion(+), 7 deletions(-) + +--- a/src/unix/linux_like/linux/musl/b32/arm/mod.rs ++++ b/src/unix/linux_like/linux/musl/b32/arm/mod.rs +@@ -324,7 +324,6 @@ pub const MAP_SYNC: ::c_int = 0x080000; + + pub const SOCK_STREAM: ::c_int = 1; + pub const SOCK_DGRAM: ::c_int = 2; +-pub const SOCK_SEQPACKET: ::c_int = 5; + + pub const EDEADLK: ::c_int = 35; + pub const ENAMETOOLONG: ::c_int = 36; +--- a/src/unix/linux_like/linux/musl/b32/hexagon.rs ++++ b/src/unix/linux_like/linux/musl/b32/hexagon.rs +@@ -292,7 +292,6 @@ pub const SIG_SETMASK: ::c_int = 2; // F + pub const SIG_BLOCK: ::c_int = 0x000000; + pub const SIG_UNBLOCK: ::c_int = 0x01; + pub const SOCK_DGRAM: ::c_int = 2; +-pub const SOCK_SEQPACKET: ::c_int = 5; + pub const SOCK_STREAM: ::c_int = 1; + pub const SOL_CAIF: ::c_int = 278; + pub const SOL_IUCV: ::c_int = 277; +--- a/src/unix/linux_like/linux/musl/b32/mips/mod.rs ++++ b/src/unix/linux_like/linux/musl/b32/mips/mod.rs +@@ -348,7 +348,6 @@ pub const ERFKILL: ::c_int = 167; + + pub const SOCK_STREAM: ::c_int = 2; + pub const SOCK_DGRAM: ::c_int = 1; +-pub const SOCK_SEQPACKET: ::c_int = 5; + + pub const SA_ONSTACK: ::c_int = 0x08000000; + pub const SA_SIGINFO: ::c_int = 8; +--- a/src/unix/linux_like/linux/musl/b32/powerpc.rs ++++ b/src/unix/linux_like/linux/musl/b32/powerpc.rs +@@ -255,7 +255,6 @@ pub const MAP_STACK: ::c_int = 0x020000; + + pub const SOCK_STREAM: ::c_int = 1; + pub const SOCK_DGRAM: ::c_int = 2; +-pub const SOCK_SEQPACKET: ::c_int = 5; + + pub const EDEADLK: ::c_int = 35; + pub const ENAMETOOLONG: ::c_int = 36; +--- a/src/unix/linux_like/linux/musl/b32/x86/mod.rs ++++ b/src/unix/linux_like/linux/musl/b32/x86/mod.rs +@@ -313,7 +313,6 @@ pub const MAP_SYNC: ::c_int = 0x080000; + + pub const SOCK_STREAM: ::c_int = 1; + pub const SOCK_DGRAM: ::c_int = 2; +-pub const SOCK_SEQPACKET: ::c_int = 5; + + pub const EDEADLK: ::c_int = 35; + pub const ENAMETOOLONG: ::c_int = 36; +--- a/src/unix/linux_like/linux/musl/b64/mod.rs ++++ b/src/unix/linux_like/linux/musl/b64/mod.rs +@@ -133,8 +133,6 @@ s! { + pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 56; + pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 40; + +-pub const SOCK_SEQPACKET: ::c_int = 5; +- + extern "C" { + pub fn getrandom(buf: *mut ::c_void, buflen: ::size_t, flags: ::c_uint) -> ::ssize_t; + } +--- a/src/unix/linux_like/linux/musl/mod.rs ++++ b/src/unix/linux_like/linux/musl/mod.rs +@@ -530,6 +530,7 @@ pub const POSIX_MADV_DONTNEED: ::c_int = + + pub const MAP_ANONYMOUS: ::c_int = MAP_ANON; + ++pub const SOCK_SEQPACKET: ::c_int = 5; + pub const SOCK_DCCP: ::c_int = 6; + pub const SOCK_NONBLOCK: ::c_int = O_NONBLOCK; + pub const SOCK_PACKET: ::c_int = 10; diff --git a/meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-Move-F_OFD_GETLK-F_OFD_SETLK-and-F_OFD_SETLKW-t.patch b/meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-Move-F_OFD_GETLK-F_OFD_SETLK-and-F_OFD_SETLKW-t.patch new file mode 100644 index 0000000000..9c93434e03 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-Move-F_OFD_GETLK-F_OFD_SETLK-and-F_OFD_SETLKW-t.patch @@ -0,0 +1,140 @@ +From e4f6d7b6d57e83633814c54d93dff292ed0e4609 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 8 Apr 2023 09:01:54 -0700 +Subject: [PATCH] musl: Move F_OFD_GETLK, F_OFD_SETLK and F_OFD_SETLKW to + common location + +These defines are not architecture specific in musl [1] therefore move them +to be common + +[1] https://git.musl-libc.org/cgit/musl/tree/include/fcntl.h#n48 + +Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/3191] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/unix/linux_like/linux/musl/b32/arm/mod.rs | 3 --- + src/unix/linux_like/linux/musl/b32/hexagon.rs | 3 --- + src/unix/linux_like/linux/musl/b32/mips/mod.rs | 3 --- + src/unix/linux_like/linux/musl/b32/powerpc.rs | 3 --- + src/unix/linux_like/linux/musl/b32/x86/mod.rs | 3 --- + src/unix/linux_like/linux/musl/b64/aarch64/mod.rs | 3 --- + src/unix/linux_like/linux/musl/b64/mips64.rs | 3 --- + src/unix/linux_like/linux/musl/mod.rs | 4 ++++ + 8 files changed, 4 insertions(+), 21 deletions(-) + +diff --git a/src/unix/linux_like/linux/musl/b32/arm/mod.rs b/src/unix/linux_like/linux/musl/b32/arm/mod.rs +index c47fa2c4c..3c8978e4f 100644 +--- a/src/unix/linux_like/linux/musl/b32/arm/mod.rs ++++ b/src/unix/linux_like/linux/musl/b32/arm/mod.rs +@@ -451,9 +451,6 @@ pub const F_GETOWN: ::c_int = 9; + pub const F_SETLK: ::c_int = 13; + pub const F_SETLKW: ::c_int = 14; + pub const F_SETOWN: ::c_int = 8; +-pub const F_OFD_GETLK: ::c_int = 36; +-pub const F_OFD_SETLK: ::c_int = 37; +-pub const F_OFD_SETLKW: ::c_int = 38; + + pub const VEOF: usize = 4; + pub const VEOL: usize = 11; +diff --git a/src/unix/linux_like/linux/musl/b32/hexagon.rs b/src/unix/linux_like/linux/musl/b32/hexagon.rs +index f83d208d5..720c603da 100644 +--- a/src/unix/linux_like/linux/musl/b32/hexagon.rs ++++ b/src/unix/linux_like/linux/musl/b32/hexagon.rs +@@ -225,9 +225,6 @@ pub const F_GETOWN_EX: ::c_int = 16; + pub const F_GETSIG: ::c_int = 11; + pub const F_LINUX_SPECIFIC_BASE: ::c_int = 1024; + pub const FLUSHO: ::c_int = 4096; +-pub const F_OFD_GETLK: ::c_int = 36; +-pub const F_OFD_SETLK: ::c_int = 37; +-pub const F_OFD_SETLKW: ::c_int = 38; + pub const F_OWNER_PGRP: ::c_int = 2; + pub const F_OWNER_PID: ::c_int = 1; + pub const F_OWNER_TID: ::c_int = 0; +diff --git a/src/unix/linux_like/linux/musl/b32/mips/mod.rs b/src/unix/linux_like/linux/musl/b32/mips/mod.rs +index d09b8278e..69e20ce32 100644 +--- a/src/unix/linux_like/linux/musl/b32/mips/mod.rs ++++ b/src/unix/linux_like/linux/musl/b32/mips/mod.rs +@@ -388,9 +388,6 @@ pub const F_GETOWN: ::c_int = 23; + pub const F_SETLK: ::c_int = 34; + pub const F_SETLKW: ::c_int = 35; + pub const F_SETOWN: ::c_int = 24; +-pub const F_OFD_GETLK: ::c_int = 36; +-pub const F_OFD_SETLK: ::c_int = 37; +-pub const F_OFD_SETLKW: ::c_int = 38; + + pub const VEOF: usize = 16; + pub const VEOL: usize = 17; +diff --git a/src/unix/linux_like/linux/musl/b32/powerpc.rs b/src/unix/linux_like/linux/musl/b32/powerpc.rs +index 3b998329b..63bc9163d 100644 +--- a/src/unix/linux_like/linux/musl/b32/powerpc.rs ++++ b/src/unix/linux_like/linux/musl/b32/powerpc.rs +@@ -384,9 +384,6 @@ pub const F_GETOWN: ::c_int = 9; + pub const F_SETLK: ::c_int = 13; + pub const F_SETLKW: ::c_int = 14; + pub const F_SETOWN: ::c_int = 8; +-pub const F_OFD_GETLK: ::c_int = 36; +-pub const F_OFD_SETLK: ::c_int = 37; +-pub const F_OFD_SETLKW: ::c_int = 38; + + pub const VEOF: usize = 4; + pub const VEOL: usize = 6; +diff --git a/src/unix/linux_like/linux/musl/b32/x86/mod.rs b/src/unix/linux_like/linux/musl/b32/x86/mod.rs +index c319b91b6..52ecf3c7e 100644 +--- a/src/unix/linux_like/linux/musl/b32/x86/mod.rs ++++ b/src/unix/linux_like/linux/musl/b32/x86/mod.rs +@@ -441,9 +441,6 @@ pub const F_GETOWN: ::c_int = 9; + pub const F_SETLK: ::c_int = 13; + pub const F_SETLKW: ::c_int = 14; + pub const F_SETOWN: ::c_int = 8; +-pub const F_OFD_GETLK: ::c_int = 36; +-pub const F_OFD_SETLK: ::c_int = 37; +-pub const F_OFD_SETLKW: ::c_int = 38; + + pub const VEOF: usize = 4; + pub const VEOL: usize = 11; +diff --git a/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs b/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs +index 14b4bc6d6..522493ff3 100644 +--- a/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs ++++ b/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs +@@ -250,9 +250,6 @@ pub const F_GETOWN: ::c_int = 9; + pub const F_SETLK: ::c_int = 6; + pub const F_SETLKW: ::c_int = 7; + pub const F_SETOWN: ::c_int = 8; +-pub const F_OFD_GETLK: ::c_int = 36; +-pub const F_OFD_SETLK: ::c_int = 37; +-pub const F_OFD_SETLKW: ::c_int = 38; + + pub const VEOF: usize = 4; + +diff --git a/src/unix/linux_like/linux/musl/b64/mips64.rs b/src/unix/linux_like/linux/musl/b64/mips64.rs +index 22ac91690..c7f041260 100644 +--- a/src/unix/linux_like/linux/musl/b64/mips64.rs ++++ b/src/unix/linux_like/linux/musl/b64/mips64.rs +@@ -612,9 +612,6 @@ pub const F_GETOWN: ::c_int = 23; + pub const F_SETOWN: ::c_int = 24; + pub const F_SETLK: ::c_int = 6; + pub const F_SETLKW: ::c_int = 7; +-pub const F_OFD_GETLK: ::c_int = 36; +-pub const F_OFD_SETLK: ::c_int = 37; +-pub const F_OFD_SETLKW: ::c_int = 38; + + pub const MCL_CURRENT: ::c_int = 0x0001; + pub const MCL_FUTURE: ::c_int = 0x0002; +diff --git a/src/unix/linux_like/linux/musl/mod.rs b/src/unix/linux_like/linux/musl/mod.rs +index 37a8ca2af..9a4fa7ca7 100644 +--- a/src/unix/linux_like/linux/musl/mod.rs ++++ b/src/unix/linux_like/linux/musl/mod.rs +@@ -506,6 +506,10 @@ pub const ECOMM: ::c_int = 70; + pub const EPROTO: ::c_int = 71; + pub const EDOTDOT: ::c_int = 73; + ++pub const F_OFD_GETLK: ::c_int = 36; ++pub const F_OFD_SETLK: ::c_int = 37; ++pub const F_OFD_SETLKW: ::c_int = 38; ++ + pub const F_RDLCK: ::c_int = 0; + pub const F_WRLCK: ::c_int = 1; + pub const F_UNLCK: ::c_int = 2; +-- +2.40.0 + diff --git a/meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-riscv32-Define-F_SETLK-F_SETLKW-and-fix-F_GETLK.patch b/meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-riscv32-Define-F_SETLK-F_SETLKW-and-fix-F_GETLK.patch new file mode 100644 index 0000000000..47969542c8 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-riscv32-Define-F_SETLK-F_SETLKW-and-fix-F_GETLK.patch @@ -0,0 +1,35 @@ +From b87552c504b53a5e5df2438adfe24e35b0168aba Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 8 Apr 2023 08:51:02 -0700 +Subject: [PATCH] musl/riscv32: Define F_SETLK, F_SETLKW and fix F_GETLK + +F_SETLK and F_SETLKW were not defined therefore define them +and F_GETLK value was not matching the musl port hence fixed + +Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/3191] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/unix/linux_like/linux/musl/b32/riscv32/mod.rs | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/unix/linux_like/linux/musl/b32/riscv32/mod.rs b/src/unix/linux_like/linux/musl/b32/riscv32/mod.rs +index 9ce6a9fd3..e56ff4853 100644 +--- a/src/unix/linux_like/linux/musl/b32/riscv32/mod.rs ++++ b/src/unix/linux_like/linux/musl/b32/riscv32/mod.rs +@@ -339,9 +339,11 @@ pub const POLLWRBAND: ::c_short = 512; + pub const O_ASYNC: ::c_int = 8192; + pub const O_NDELAY: ::c_int = 2048; + pub const EFD_NONBLOCK: ::c_int = 2048; +-pub const F_GETLK: ::c_int = 5; +-pub const F_GETOWN: ::c_int = 9; + pub const F_SETOWN: ::c_int = 8; ++pub const F_GETOWN: ::c_int = 9; ++pub const F_GETLK: ::c_int = 12; ++pub const F_SETLK: ::c_int = 13; ++pub const F_SETLKW: ::c_int = 14; + pub const SFD_NONBLOCK: ::c_int = 2048; + pub const TCSANOW: ::c_int = 0; + pub const TCSADRAIN: ::c_int = 1; +-- +2.40.0 + diff --git a/meta-python/recipes-devtools/python/python3-pyruvate_1.1.2.bb b/meta-python/recipes-devtools/python/python3-pyruvate_1.1.2.bb deleted file mode 100644 index 1f1c186d31..0000000000 --- a/meta-python/recipes-devtools/python/python3-pyruvate_1.1.2.bb +++ /dev/null @@ -1,133 +0,0 @@ -SUMMARY = "WSGI server implemented in Rust." -DESCRIPTION = "Pyruvate is a reasonably fast, multithreaded, non-blocking \ -WSGI server implemented in Rust." -HOMEPAGE = "https://gitlab.com/tschorr/pyruvate" -BUGTRACKER = "https://gitlab.com/tschorr/pyruvate/-/issues" - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://LICENSE;md5=051b48e640a6e2d795eac75542d9417c \ - file://LICENSE.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRC_URI[sha256sum] = "10befedd97e73fc18b902d02aa3b24e8978aa162242c1b664849c886c0675899" - -S = "${WORKDIR}/pyruvate-${PV}" - -inherit pypi python_setuptools3_rust - -PIP_INSTALL_DIST_PATH = "${S}/dist" - -# crossbeam-* -> std::sync::atomic AtomicI64, AtomicU64 -# not supported on mips/powerpc with 32-bit pointers -# https://doc.rust-lang.org/std/sync/atomic/#portability -RUSTFLAGS:append:mips = " --cfg crossbeam_no_atomic_64" -RUSTFLAGS:append:mipsel = " --cfg crossbeam_no_atomic_64" -RUSTFLAGS:append:powerpc = " --cfg crossbeam_no_atomic_64" -RUSTFLAGS:append:riscv32 = " --cfg crossbeam_no_atomic_64" - -SRC_URI += " \ - crate://crates.io/aho-corasick/0.7.18 \ - crate://crates.io/atty/0.2.14 \ - crate://crates.io/autocfg/1.0.1 \ - crate://crates.io/bitflags/1.3.2 \ - crate://crates.io/block-buffer/0.9.0 \ - crate://crates.io/cc/1.0.72 \ - crate://crates.io/cfg-if/1.0.0 \ - crate://crates.io/chrono/0.4.19 \ - crate://crates.io/cpufeatures/0.2.1 \ - crate://crates.io/cpython/0.7.0 \ - crate://crates.io/crossbeam-channel/0.5.2 \ - crate://crates.io/crossbeam-deque/0.8.1 \ - crate://crates.io/crossbeam-epoch/0.9.6 \ - crate://crates.io/crossbeam-queue/0.3.3 \ - crate://crates.io/crossbeam-utils/0.8.6 \ - crate://crates.io/crossbeam/0.8.1 \ - crate://crates.io/crypto-mac/0.11.1 \ - crate://crates.io/ctrlc/3.2.1 \ - crate://crates.io/digest/0.9.0 \ - crate://crates.io/encoding-index-japanese/1.20141219.5 \ - crate://crates.io/encoding-index-korean/1.20141219.5 \ - crate://crates.io/encoding-index-simpchinese/1.20141219.5 \ - crate://crates.io/encoding-index-singlebyte/1.20141219.5 \ - crate://crates.io/encoding-index-tradchinese/1.20141219.5 \ - crate://crates.io/encoding/0.2.33 \ - crate://crates.io/encoding_index_tests/0.1.4 \ - crate://crates.io/env_logger/0.9.0 \ - crate://crates.io/errno-dragonfly/0.1.2 \ - crate://crates.io/errno/0.2.8 \ - crate://crates.io/fastrand/1.6.0 \ - crate://crates.io/generic-array/0.14.5 \ - crate://crates.io/getrandom/0.2.3 \ - crate://crates.io/hermit-abi/0.1.19 \ - crate://crates.io/hmac/0.11.0 \ - crate://crates.io/httparse/1.5.1 \ - crate://crates.io/humantime/2.1.0 \ - crate://crates.io/instant/0.1.12 \ - crate://crates.io/lazy_static/1.4.0 \ - crate://crates.io/libc/0.2.120 \ - crate://crates.io/libsystemd/0.4.1 \ - crate://crates.io/log/0.4.14 \ - crate://crates.io/memchr/2.4.1 \ - crate://crates.io/memoffset/0.6.5 \ - crate://crates.io/mio/0.8.0 \ - crate://crates.io/miow/0.3.7 \ - crate://crates.io/nix/0.23.1 \ - crate://crates.io/ntapi/0.3.6 \ - crate://crates.io/num-integer/0.1.44 \ - crate://crates.io/num-traits/0.2.14 \ - crate://crates.io/num_cpus/1.13.1 \ - crate://crates.io/once_cell/1.9.0 \ - crate://crates.io/opaque-debug/0.3.0 \ - crate://crates.io/paste/1.0.6 \ - crate://crates.io/ppv-lite86/0.2.16 \ - crate://crates.io/proc-macro2/1.0.36 \ - crate://crates.io/python3-sys/0.7.0 \ - crate://crates.io/quote/1.0.14 \ - crate://crates.io/rand/0.8.4 \ - crate://crates.io/rand_chacha/0.3.1 \ - crate://crates.io/rand_core/0.6.3 \ - crate://crates.io/rand_hc/0.3.1 \ - crate://crates.io/redox_syscall/0.2.10 \ - crate://crates.io/regex-syntax/0.6.25 \ - crate://crates.io/regex/1.5.4 \ - crate://crates.io/remove_dir_all/0.5.3 \ - crate://crates.io/scopeguard/1.1.0 \ - crate://crates.io/serde/1.0.133 \ - crate://crates.io/serde_derive/1.0.133 \ - crate://crates.io/sha2/0.9.9 \ - crate://crates.io/simplelog/0.11.1 \ - crate://crates.io/spmc/0.3.0 \ - crate://crates.io/subtle/2.4.1 \ - crate://crates.io/syn/1.0.85 \ - crate://crates.io/tempfile/3.3.0 \ - crate://crates.io/termcolor/1.1.2 \ - crate://crates.io/thiserror-impl/1.0.30 \ - crate://crates.io/thiserror/1.0.30 \ - crate://crates.io/threadpool/1.8.1 \ - crate://crates.io/time/0.1.44 \ - crate://crates.io/typenum/1.15.0 \ - crate://crates.io/unicode-xid/0.2.2 \ - crate://crates.io/urlencoding/2.1.0 \ - crate://crates.io/uuid/0.8.2 \ - crate://crates.io/version_check/0.9.4 \ - crate://crates.io/wasi/0.10.0+wasi-snapshot-preview1 \ - 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/winapi/0.3.9 \ -" -SRC_URI += "\ - file://0001-linux.rs-Define-consts-for-rv32-architecture.patch;patchdir=../cargo_home/bitbake/nix-0.23.1/ \ - " -SRC_URI:append:mips = " file://0001-check-for-mips-targets-for-stat.st_dev-definitions.patch;patchdir=../cargo_home/bitbake/libsystemd-0.4.1/" - -# The following configs & dependencies are from setuptools extras_require. -# These dependencies are optional, hence can be controlled via PACKAGECONFIG. -# The upstream names may not correspond exactly to bitbake package names. -# -# Uncomment this line to enable all the optional features. -#PACKAGECONFIG ?= "test" -PACKAGECONFIG[test] = ",,,python3-pytest python3-requests" - -# WARNING: the following rdepends are determined through basic analysis of the -# python sources, and might not be 100% accurate. -RDEPENDS:${PN} += "python3-core" diff --git a/meta-python/recipes-devtools/python/python3-pyruvate_1.2.1.bb b/meta-python/recipes-devtools/python/python3-pyruvate_1.2.1.bb new file mode 100644 index 0000000000..7a96635144 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pyruvate_1.2.1.bb @@ -0,0 +1,49 @@ +SUMMARY = "WSGI server implemented in Rust." +DESCRIPTION = "Pyruvate is a reasonably fast, multithreaded, non-blocking \ +WSGI server implemented in Rust." +HOMEPAGE = "https://gitlab.com/tschorr/pyruvate" +BUGTRACKER = "https://gitlab.com/tschorr/pyruvate/-/issues" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI += "\ + git://gitlab.com/tschorr/pyruvate.git;protocol=https;branch=main \ + file://0001-linux.rs-Define-consts-for-rv32-architecture.patch;patchdir=../cargo_home/bitbake/nix-0.23.2/ \ + file://0001-musl-Define-SOCK_NONBLOCK-with-O_NONBLOCK.patch;patchdir=../cargo_home/bitbake/libc-0.2.138/ \ + file://0001-musl-riscv32-Define-F_SETLK-F_SETLKW-and-fix-F_GETLK.patch;patchdir=../cargo_home/bitbake/libc-0.2.138/ \ + file://0001-musl-Move-F_OFD_GETLK-F_OFD_SETLK-and-F_OFD_SETLKW-t.patch;patchdir=../cargo_home/bitbake/libc-0.2.138/ \ + file://0001-musl-Define-O_LARGEFILE-for-riscv32.patch;patchdir=../cargo_home/bitbake/libc-0.2.138/ \ + file://0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch;patchdir=../cargo_home/bitbake/libc-0.2.138/ \ +" +SRCREV = "57db64c9f65ced05c71b8d786c1cedfaa2991597" + +SRC_URI:append:mips = " file://0001-check-for-mips-targets-for-stat.st_dev-definitions.patch;patchdir=../cargo_home/bitbake/libsystemd-0.5.0/" + +S = "${WORKDIR}/git" + +inherit python_setuptools3_rust cargo-update-recipe-crates + +PIP_INSTALL_DIST_PATH = "${S}/dist" + +# crossbeam-* -> std::sync::atomic AtomicI64, AtomicU64 +# not supported on mips/powerpc with 32-bit pointers +# https://doc.rust-lang.org/std/sync/atomic/#portability +RUSTFLAGS:append:mips = " --cfg crossbeam_no_atomic_64" +RUSTFLAGS:append:mipsel = " --cfg crossbeam_no_atomic_64" +RUSTFLAGS:append:powerpc = " --cfg crossbeam_no_atomic_64" +RUSTFLAGS:append:riscv32 = " --cfg crossbeam_no_atomic_64" + +require ${BPN}-crates.inc + +# The following configs & dependencies are from setuptools extras_require. +# These dependencies are optional, hence can be controlled via PACKAGECONFIG. +# The upstream names may not correspond exactly to bitbake package names. +# +# Uncomment this line to enable all the optional features. +#PACKAGECONFIG ?= "test" +PACKAGECONFIG[test] = ",,,python3-pytest python3-requests" + +# WARNING: the following rdepends are determined through basic analysis of the +# python sources, and might not be 100% accurate. +RDEPENDS:${PN} += "python3-core" diff --git a/meta-python/recipes-devtools/python/python3-pyscaffold_4.3.1.bb b/meta-python/recipes-devtools/python/python3-pyscaffold_4.5.bb index a19e38770a..dda81e2256 100644 --- a/meta-python/recipes-devtools/python/python3-pyscaffold_4.3.1.bb +++ b/meta-python/recipes-devtools/python/python3-pyscaffold_4.5.bb @@ -9,7 +9,7 @@ LICENSE = "0BSD & MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=14a49c74a1d91829908ac756c07e6b91" DEPENDS += "python3-setuptools-scm-native" -SRC_URI[sha256sum] = "50cb1f910163204caec30c7c6bbe70f1a81c377538b8c8340d23abe31f5ca5b4" +SRC_URI[sha256sum] = "d849f9a2e15bdcf165e19f96835f0b17e1a2d59d4c561c445b827a081de6d262" inherit pypi python_setuptools_build_meta PYPI_PACKAGE = "PyScaffold" diff --git a/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.16.0.bb b/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.16.0.bb deleted file mode 100644 index 1dfeab6332..0000000000 --- a/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.16.0.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "pytest-asyncio is an Apache2 licensed library, written in Python, for testing asyncio code with pytest" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" - -SRC_URI[sha256sum] = "7496c5977ce88c34379df64a66459fe395cd05543f0a2f837016e7144391fcfb" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-pytest \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.21.1.bb b/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.21.1.bb new file mode 100644 index 0000000000..c96c0e0801 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.21.1.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "pytest-asyncio is an Apache2 licensed library, written in Python, for testing asyncio code with pytest" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=136e4f49dbf29942c572a3a8f6e88a77" + +SRC_URI[sha256sum] = "40a7eae6dded22c7b604986855ea48400ab15b069ae38116e8c01238e9eeb64d" + +inherit pypi python_setuptools_build_meta + +DEPENDS += "python3-setuptools-scm-native" + +RDEPENDS:${PN} += " \ + python3-pytest \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-pytest-cov_4.1.0.bb b/meta-python/recipes-devtools/python/python3-pytest-cov_4.1.0.bb new file mode 100644 index 0000000000..1ff3e75cbe --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pytest-cov_4.1.0.bb @@ -0,0 +1,14 @@ +SUMMARY = "Pytest plugin for measuring coverage." +HOMEPAGE = "https://github.com/pytest-dev/pytest-cov" +LICENSE = "MIT" +LIC_FILES_CHKSUM = " \ + file://LICENSE;md5=cbc4e25353c748c817db2daffe605e43 \ +" + +SRC_URI[sha256sum] = "3904b13dfbfec47f003b8e77fd5b589cd11904a21ddf1ab38a64f204d6a10ef6" + +inherit pypi setuptools3 + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-pytest-forked_1.4.0.bb b/meta-python/recipes-devtools/python/python3-pytest-forked_1.6.0.bb index 2e6a32a248..f573bf0523 100644 --- a/meta-python/recipes-devtools/python/python3-pytest-forked_1.4.0.bb +++ b/meta-python/recipes-devtools/python/python3-pytest-forked_1.6.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/pytest-dev/pytest-forked" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=772fcdaca14b378878d05c7d857e6c3e" -SRC_URI[sha256sum] = "8b67587c8f98cbbadfdd804539ed5455b6ed03802203485dd2f53c1422d7440e" +SRC_URI[sha256sum] = "4dafd46a9a600f65d822b8f605133ecf5b3e1941ebb3588e943b4e3eb71a5a3f" inherit pypi python_setuptools_build_meta diff --git a/meta-python/recipes-devtools/python/python3-pytest-mock/run-ptest b/meta-python/recipes-devtools/python/python3-pytest-mock/run-ptest new file mode 100644 index 0000000000..b63c4de0d9 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pytest-mock/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-python/recipes-devtools/python/python3-pytest-mock_3.11.1.bb b/meta-python/recipes-devtools/python/python3-pytest-mock_3.11.1.bb new file mode 100644 index 0000000000..69d74567c3 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pytest-mock_3.11.1.bb @@ -0,0 +1,32 @@ +SUMMARY = "Thin-wrapper around the mock package for easier use with pytest" +HOMEPAGE = "https://github.com/pytest-dev/pytest-mock/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = " \ + file://LICENSE;md5=b2ddb1e69238461b7e4ef2a84d874109 \ +" + +SRC_URI = " \ + git://github.com/pytest-dev/pytest-mock;branch=main;protocol=https \ + file://run-ptest \ +" + +SRCREV ?= "d3e73f2e93f7b93eba0a36e17e43bafd969da4fe" + +SRC_URI[sha256sum] = "fbbdb085ef7c252a326fd8cdcac0aa3b1333d8811f131bdcc701002e1be7ed4f" + +inherit setuptools3 ptest + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +RDEPENDS:${PN} += " \ + python3-asyncio \ + python3-pytest \ + python3-unittest \ +" + +S = "${WORKDIR}/git" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests ${D}${PTEST_PATH}/ +} diff --git a/meta-python/recipes-devtools/python/python3-pytest-xdist_3.1.0.bb b/meta-python/recipes-devtools/python/python3-pytest-xdist_3.3.1.bb index 1651ec34ba..6001977a48 100644 --- a/meta-python/recipes-devtools/python/python3-pytest-xdist_3.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-pytest-xdist_3.3.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/pytest-dev/pytest-xdist" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=772fcdaca14b378878d05c7d857e6c3e" -SRC_URI[sha256sum] = "40fdb8f3544921c5dfcd486ac080ce22870e71d82ced6d2e78fa97c2addd480c" +SRC_URI[sha256sum] = "d5ee0520eb1b7bcca50a60a518ab7a7707992812c578198f8b44fdfac78e8c93" inherit pypi python_setuptools_build_meta diff --git a/meta-python/recipes-devtools/python/python3-python-vlc_3.0.18121.bb b/meta-python/recipes-devtools/python/python3-python-vlc_3.0.18122.bb index 518dbb2050..e67e792f7e 100644 --- a/meta-python/recipes-devtools/python/python3-python-vlc_3.0.18121.bb +++ b/meta-python/recipes-devtools/python/python3-python-vlc_3.0.18122.bb @@ -3,6 +3,11 @@ HOMEPAGE = "wiki.videolan.org/PythonBinding" LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI[sha256sum] = "24550314a3e6ed55fd347b009491c98b865f9dfa05a92e889d7b0a2210e7485b" +SRC_URI[sha256sum] = "1039bde287853b4b7b61ba22d83761832434f78506da762dfb060291bf32897d" inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + python3-ctypes \ + python3-logging \ +" diff --git a/meta-python/recipes-devtools/python/python3-pyudev_0.24.0.bb b/meta-python/recipes-devtools/python/python3-pyudev_0.24.1.bb index 84154641ff..98817f9312 100644 --- a/meta-python/recipes-devtools/python/python3-pyudev_0.24.0.bb +++ b/meta-python/recipes-devtools/python/python3-pyudev_0.24.1.bb @@ -3,7 +3,7 @@ SUMMARY = "A libudev binding" LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" -SRC_URI[sha256sum] = "b2a3afe1c99ea751f8296652557eac559874da2a1b1ec0625178706ec5a345f3" +SRC_URI[sha256sum] = "75e54d37218f5ac45b0da1f0fd9cc5e526a3cac3ef1cfad410cf7ab338b01471" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-pyusb_1.2.1.bb b/meta-python/recipes-devtools/python/python3-pyusb_1.2.1.bb index 286e9672b1..abe3529119 100644 --- a/meta-python/recipes-devtools/python/python3-pyusb_1.2.1.bb +++ b/meta-python/recipes-devtools/python/python3-pyusb_1.2.1.bb @@ -13,6 +13,6 @@ SRC_URI[sha256sum] = "a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d inherit pypi setuptools3 -RDEPENDS:${PN} += "libusb1" +RDEPENDS:${PN} += "python3-ctypes" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-pyzstd_0.15.9.bb b/meta-python/recipes-devtools/python/python3-pyzstd_0.15.9.bb new file mode 100644 index 0000000000..81bffac3ab --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pyzstd_0.15.9.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Pyzstd module provides classes and functions for compressing and \ +decompressing data, using Facebook’s Zstandard (or zstd as short name) algorithm." +HOMEPAGE = "https://github.com/animalize/pyzstd" +SECTION = "devel/python" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8458383225d7107f3383ee5c521628d2" + +PYPI_PACKAGE = "pyzstd" + +SRC_URI[sha256sum] = "cbfdde6c5768ffa5d2f14127bbc1d7c3c2d03c0ceaeb0736946197e06275ccc7" + +inherit pypi setuptools3 + +# clang-16 with -flto segfaults on arm, therefore ignore flto for now +do_configure:append:arm:toolchain-clang() { + sed -i -e "s|'-flto'|''|" ${S}/setup.py +} diff --git a/meta-python/recipes-devtools/python/python3-qrcode_7.3.1.bb b/meta-python/recipes-devtools/python/python3-qrcode_7.4.2.bb index f6de60e1a9..204f4eceec 100644 --- a/meta-python/recipes-devtools/python/python3-qrcode_7.3.1.bb +++ b/meta-python/recipes-devtools/python/python3-qrcode_7.4.2.bb @@ -4,8 +4,13 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=4b802d2a65df4626623c79757f486af9" PYPI_PACKAGE = "qrcode" -SRC_URI[sha256sum] = "375a6ff240ca9bd41adc070428b5dfc1dcfbb0f2507f1ac848f6cded38956578" +SRC_URI[sha256sum] = "9dd969454827e127dbd93696b20747239e6d540e082937c90f14ac95b30f5845" inherit pypi setuptools3 -RDEPENDS:${PN} = "python3-six python3-pillow" +RDEPENDS:${PN} = " \ + python3-six \ + python3-pillow \ + python3-pypng \ + python3-typing-extensions \ +" diff --git a/meta-python/recipes-devtools/python/python3-rapidjson_1.9.bb b/meta-python/recipes-devtools/python/python3-rapidjson_1.10.bb index 8b50aabb75..7dac464bea 100644 --- a/meta-python/recipes-devtools/python/python3-rapidjson_1.9.bb +++ b/meta-python/recipes-devtools/python/python3-rapidjson_1.10.bb @@ -5,7 +5,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=4daf3929156304df67003c33274a98bd" SRC_URI = "git://github.com/python-rapidjson/python-rapidjson.git;protocol=https;branch=master" -SRCREV = "8f4ab8e197ca30c03726b675ae7cce6ac9d6622e" +SRCREV = "e9e209553a65db3568471f32392f54549c8a9816" S = "${WORKDIR}/git" diff --git a/meta-python/recipes-devtools/python/python3-raven_6.10.0.bb b/meta-python/recipes-devtools/python/python3-raven_6.10.0.bb index b0d19c31ad..79a38983de 100644 --- a/meta-python/recipes-devtools/python/python3-raven_6.10.0.bb +++ b/meta-python/recipes-devtools/python/python3-raven_6.10.0.bb @@ -11,3 +11,8 @@ SRC_URI[sha256sum] = "3fa6de6efa2493a7c827472e984ce9b020797d0da16f1db67197bcc23c PYPI_PACKAGE = "raven" inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + python3-json \ + python3-logging \ +" diff --git a/meta-python/recipes-devtools/python/python3-rdflib_6.2.0.bb b/meta-python/recipes-devtools/python/python3-rdflib_6.3.2.bb index 282d407090..1b4bb5a40e 100644 --- a/meta-python/recipes-devtools/python/python3-rdflib_6.2.0.bb +++ b/meta-python/recipes-devtools/python/python3-rdflib_6.3.2.bb @@ -1,10 +1,10 @@ SUMMARY = "RDFLib is a pure Python package for working with RDF" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=bcae79bd3c84b857f42a98a7ccf6ad47" +LIC_FILES_CHKSUM = "file://LICENSE;md5=37d489c0cefe52a17e1d5007e196464a" -SRC_URI[sha256sum] = "62dc3c86d1712db0f55785baf8047f63731fa59b2682be03219cb89262065942" +SRC_URI[sha256sum] = "72af591ff704f4caacea7ecc0c5a9056b8553e0489dd4f35a9bc52dbd41522e0" -inherit pypi setuptools3 +inherit pypi python_poetry_core RDEPENDS:${PN} += " \ ${PYTHON_PN}-isodate \ diff --git a/meta-python/recipes-devtools/python/python3-redis_4.4.2.bb b/meta-python/recipes-devtools/python/python3-redis_4.6.0.bb index 37c64b11ff..47eb7c2096 100644 --- a/meta-python/recipes-devtools/python/python3-redis_4.4.2.bb +++ b/meta-python/recipes-devtools/python/python3-redis_4.6.0.bb @@ -4,13 +4,15 @@ HOMEPAGE = "http://github.com/andymccurdy/redis-py" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=1db1f331d351900707368237cc4880cf" -SRC_URI[sha256sum] = "a010f6cb7378065040a02839c3f75c7e0fb37a87116fb4a95be82a95552776c7" +SRC_URI[sha256sum] = "585dc516b9eb042a619ef0a39c3d7d55fe81bdb4df09a52c9cdde0d07bf1aa7d" inherit pypi setuptools3 -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-cryptography \ - ${PYTHON_PN}-packaging \ - ${PYTHON_PN}-asyncio \ +RDEPENDS:${PN} += " \ + python3-asyncio \ + python3-compression \ + python3-cryptography \ + python3-datetime \ + python3-json \ + python3-packaging \ " diff --git a/meta-python/recipes-devtools/python/python3-regex_2022.10.31.bb b/meta-python/recipes-devtools/python/python3-regex_2023.6.3.bb index 19fc153d54..f653f32fe2 100644 --- a/meta-python/recipes-devtools/python/python3-regex_2022.10.31.bb +++ b/meta-python/recipes-devtools/python/python3-regex_2023.6.3.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7b5751ddd6b643203c31ff873051d069" inherit pypi setuptools3 -SRC_URI[sha256sum] = "a3a98921da9a1bf8457aeee6a551948a83601689e5ecdd736894ea9bbec77e83" +SRC_URI[sha256sum] = "72d1a25bf36d2050ceb35b517afe13864865268dfb45910e2e17a84be6cbfeb0" RDEPENDS:${PN} += " \ python3-stringold \ diff --git a/meta-python/recipes-devtools/python/python3-requests-futures_1.0.0.bb b/meta-python/recipes-devtools/python/python3-requests-futures_1.0.1.bb index 4b57e13a9a..28f034f7e3 100644 --- a/meta-python/recipes-devtools/python/python3-requests-futures_1.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-requests-futures_1.0.1.bb @@ -3,8 +3,7 @@ HOMEPAGE = "https://github.com/ross/requests-futures" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e1e50798d0afe0e1f87594c6619a2fa5" -SRC_URI[md5sum] = "601b5e90413bb00e06148752d31f0cc7" -SRC_URI[sha256sum] = "35547502bf1958044716a03a2f47092a89efe8f9789ab0c4c528d9c9c30bc148" +SRC_URI[sha256sum] = "f55a4ef80070e2858e7d1e73123d2bfaeaf25b93fd34384d8ddf148e2b676373" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-requests-toolbelt/090856f4159c40a2927fb88546419f2e1697ad5f.patch b/meta-python/recipes-devtools/python/python3-requests-toolbelt/090856f4159c40a2927fb88546419f2e1697ad5f.patch new file mode 100644 index 0000000000..948dd2ad55 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-requests-toolbelt/090856f4159c40a2927fb88546419f2e1697ad5f.patch @@ -0,0 +1,1492 @@ +From 090856f4159c40a2927fb88546419f2e1697ad5f Mon Sep 17 00:00:00 2001 +From: Quentin Pradet <quentin.pradet@gmail.com> +Date: Fri, 28 Apr 2023 22:03:46 +0400 +Subject: [PATCH] Indent cassettes files to help track changes in git + +Upstream-Status: Submitted [https://github.com/requests/toolbelt/pull/356] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tests/cassettes/file_for_download.json | 56 ++++- + tests/cassettes/http2bin_cookies.json | 133 +++++++++- + tests/cassettes/http2bin_fingerprint.json | 65 ++++- + tests/cassettes/httpbin_guess_auth_basic.json | 115 ++++++++- + .../cassettes/httpbin_guess_auth_digest.json | 124 +++++++++- + tests/cassettes/httpbin_guess_auth_none.json | 59 ++++- + tests/cassettes/klevas_vu_lt_ssl3.json | 36 ++- + .../redirect_request_for_dump_all.json | 233 +++++++++++++++++- + tests/cassettes/simple_get_request.json | 65 ++++- + tests/cassettes/stream_response_to_file.json | 181 +++++++++++++- + ...sponse_without_content_length_to_file.json | 175 ++++++++++++- + tests/cassettes/test_x509_adapter_der.json | 69 +++++- + tests/cassettes/test_x509_adapter_pem.json | 69 +++++- + 13 files changed, 1367 insertions(+), 13 deletions(-) + +diff --git a/tests/cassettes/file_for_download.json b/tests/cassettes/file_for_download.json +index 9e4bb8f..d171443 100644 +--- a/tests/cassettes/file_for_download.json ++++ b/tests/cassettes/file_for_download.json +@@ -1 +1,55 @@ +-{"http_interactions": [{"request": {"uri": "https://stxnext.com/static/img/logo.830ebe551641.svg", "body": {"encoding": "utf-8", "string": ""}, "method": "GET", "headers": {"User-Agent": ["python-requests/2.2.1 CPython/3.5.2 Darwin/17.3.0"], "Accept-Encoding": ["gzip, deflate, compress"], "Accept": ["*/*"]}}, "recorded_at": "2018-01-04T23:00:12", "response": {"url": "https://stxnext.com/static/img/logo.830ebe551641.svg", "status": {"message": "OK", "code": 200}, "body": {"encoding": null, "string": "<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" viewBox=\"-16169 -10492.84 144.98 39.947\"><defs><style>.a{fill:url(#a);}</style><linearGradient id=\"a\" x2=\"1\" y2=\"1\" gradientUnits=\"objectBoundingBox\"><stop offset=\"0\" stop-color=\"#15c9c2\"/><stop offset=\"1\" stop-color=\"#39769b\"/></linearGradient></defs><path class=\"a\" d=\"M88.841,54.948V48.514a3.665,3.665,0,0,1,1.541-.336,2.169,2.169,0,0,1,2.266,2.435A2.182,2.182,0,0,1,90.435,53.1a2.9,2.9,0,0,1-.85-.125v1.974Zm.744-6.019v3.46a2.558,2.558,0,0,0,.8.125c1,0,1.523-.807,1.523-1.9s-.525-1.84-1.506-1.84h-.041A1.986,1.986,0,0,0,89.585,48.929ZM62.838,54.948l.717-1.9-1.788-4.769h.805l1.187,3.472a5.008,5.008,0,0,1,.167.682h.019a5.01,5.01,0,0,1,.167-.682l1.177-3.472h.815l-2.5,6.672Zm-5.749,0V48.514a3.669,3.669,0,0,1,1.541-.336A2.169,2.169,0,0,1,60.9,50.613,2.185,2.185,0,0,1,58.683,53.1a2.9,2.9,0,0,1-.85-.125v1.974Zm.74-6.019v3.46a2.558,2.558,0,0,0,.8.125c1,0,1.523-.807,1.523-1.9s-.529-1.84-1.513-1.84H58.6A1.986,1.986,0,0,0,57.829,48.929Zm79.213,4.213a2.19,2.19,0,0,1-2.282-2.487c0-1.462.788-2.478,2.08-2.478a1.825,1.825,0,0,1,1.9,2.044c0,.1,0,.205-.008.318l-3.257.469a1.5,1.5,0,0,0,1.6,1.532,2.886,2.886,0,0,0,1.3-.292l.23.557a3.431,3.431,0,0,1-1.484.336ZM135.432,50.5l2.6-.366c-.011-.944-.488-1.386-1.2-1.386C135.989,48.744,135.45,49.416,135.432,50.5ZM130.4,52.8l.265-.567a2.665,2.665,0,0,0,1.143.3c.611,0,1.018-.3,1.018-.77,0-.5-.407-.7-.965-.9-.673-.248-1.336-.549-1.336-1.408,0-.744.575-1.279,1.585-1.279a2.6,2.6,0,0,1,1.327.336l-.257.523a2.054,2.054,0,0,0-1-.283c-.576,0-.9.309-.9.707,0,.5.388.682.913.875.708.265,1.4.549,1.4,1.434.006.823-.649,1.372-1.772,1.372A3.261,3.261,0,0,1,130.4,52.8Zm-3.008.34c-1.187,0-1.841-.523-1.841-1.672V48.276h.744v3.2c0,.707.366,1.043,1.1,1.043a2.914,2.914,0,0,0,1.008-.158V48.276h.73V52.8a4.263,4.263,0,0,1-1.664.34Zm-7.256-2.487c0-1.417.708-2.478,2.028-2.478s2.026,1.061,2.026,2.478-.709,2.487-2.026,2.487S120.14,52.071,120.14,50.655Zm.735-.007c0,1.1.424,1.884,1.292,1.884s1.291-.788,1.291-1.884-.425-1.866-1.291-1.866v0C121.3,48.779,120.875,49.549,120.875,50.648Zm-12.187,2.494a2.19,2.19,0,0,1-2.282-2.487c0-1.462.788-2.478,2.08-2.478a1.825,1.825,0,0,1,1.9,2.044c0,.1,0,.205-.009.318l-3.256.469a1.494,1.494,0,0,0,1.6,1.532,2.886,2.886,0,0,0,1.3-.292l.23.557a3.431,3.431,0,0,1-1.484.336ZM107.079,50.5l2.6-.366c-.01-.944-.488-1.386-1.2-1.386C107.636,48.744,107.1,49.416,107.079,50.5Zm-13.249.159c0-1.417.708-2.478,2.028-2.478s2.026,1.061,2.026,2.478-.707,2.487-2.026,2.487S93.83,52.071,93.83,50.655Zm.735-.007c0,1.1.424,1.884,1.292,1.884s1.291-.788,1.291-1.884-.424-1.866-1.291-1.866v0C94.989,48.779,94.565,49.549,94.565,50.648Zm-18.973.007c0-1.417.708-2.478,2.028-2.478s2.032,1.061,2.032,2.478-.715,2.487-2.032,2.487S75.592,52.071,75.592,50.655Zm.735-.007c0,1.1.424,1.884,1.292,1.884s1.292-.788,1.292-1.884-.426-1.866-1.292-1.866v0C76.752,48.779,76.328,49.549,76.328,50.648ZM68.85,53.1a1.149,1.149,0,0,1-1.257-1.292V48.833H66.9v-.557h.688V47.123l.716-.239v1.389h1.027v.557H68.306v2.939a.634.634,0,0,0,.716.673,1.006,1.006,0,0,0,.309-.044v.619a1.308,1.308,0,0,1-.453.081Zm15.078-.053V49.823c0-.638-.39-1.044-1.158-1.044a2.968,2.968,0,0,0-1.018.169v4.1h-.745V48.513a4.5,4.5,0,0,1,1.753-.336c1.257,0,1.9.584,1.9,1.585v3.289Zm34.114-3.212c0-.7-.461-1.037-1.187-1.037a2.036,2.036,0,0,0-.989.265v3.983h-.744V46.1h.744v2.376A2.616,2.616,0,0,1,117,48.191c1.1,0,1.778.557,1.778,1.585v3.265l-.734,0Zm-6.285,3.212V48.513a4.493,4.493,0,0,1,1.743-.336,3.273,3.273,0,0,1,.47.034l-.143.621a2.031,2.031,0,0,0-.424-.034,2.461,2.461,0,0,0-.9.15v4.1Zm-8.485,0-.974-3.327a5.884,5.884,0,0,1-.14-.654h-.019s-.062.354-.15.654l-.974,3.327h-.753l-1.45-4.769h.744l.93,3.371a7.42,7.42,0,0,1,.15.732h.019s.07-.407.158-.732l.974-3.371h.709l.966,3.371c.088.318.167.732.167.732h.019a6.418,6.418,0,0,1,.143-.732l.947-3.371h.731l-1.442,4.769ZM73.5,49.833c0-.7-.461-1.037-1.187-1.037a2.044,2.044,0,0,0-.991.265v3.983h-.744V46.1h.744v2.376a2.612,2.612,0,0,1,1.133-.283c1.1,0,1.778.557,1.778,1.585v3.265l-.734,0Zm-27.141-6,8.837-14.534L46.91,15.475h7.926l7.925,13.819L54.32,43.828Zm-15.478,0V21.688H23.911V15.474H44.819v6.213H37.846V43.828ZM0,40.086l4.455-4.463c1.473,1.473,4.064,1.99,6.331,1.99,2.741,0,4.062-.913,4.062-2.548a2.4,2.4,0,0,0-.548-1.671,3.133,3.133,0,0,0-1.872-.757L9,32.158A9.631,9.631,0,0,1,3.31,29.651a7.847,7.847,0,0,1-1.953-5.7C1.358,18.778,5.26,15,11.712,15c4.06,0,7.127.956,9.558,3.385l-4.387,4.385C15.092,20.98,12.742,21.1,11.506,21.1c-2.429,0-3.424,1.394-3.424,2.63a1.868,1.868,0,0,0,.557,1.315,3.179,3.179,0,0,0,1.952.836l3.426.48a9.569,9.569,0,0,1,5.576,2.348c1.513,1.473,2.111,3.584,2.111,6.213,0,5.761-4.982,8.907-10.95,8.907C6.412,43.828,2.866,43.031,0,40.086Zm111.6,3.73,6.958-11.665-6.518-11.076h2.81l5.048,8.975,5.046-8.975h2.812L121.2,32.15l7.027,11.658-2.812.006L119.9,34.265l-5.558,9.55Zm24.376,0V23.245h-6.579V21.074h15.588v2.171H138.4V43.814ZM95.878,21.074H109.99v2.173h-11.7v8.018h9.966v2.165H98.3v8.21H110v2.173l-14.123,0ZM90.192,43.814,78.12,25.571V43.808H75.692V21.074h2.3L90.069,39.247V21.074H92.5V43.814ZM63.528,43.8l-2.683-5.029,3.7-6.344,6.611,11.379Zm-2.7-24.291,2.094-4.046h7.919L64.668,26.125Z\" transform=\"translate(-16169 -10507.84)\"/></svg>"}, "headers": {"date": ["Thu, 04 Jan 2018 23:00:15 GMT"], "strict-transport-security": ["max-age=0; includeSubdomains; preload"], "last-modified": ["Wed, 22 Nov 2017 09:22:00 GMT"], "content-type": ["image/svg+xml"], "content-length": ["5177"]}}}], "recorded_with": "betamax/0.8.0"} +\ No newline at end of file ++{ ++ "http_interactions": [ ++ { ++ "recorded_at": "2018-01-04T23:00:12", ++ "request": { ++ "body": { ++ "encoding": "utf-8", ++ "string": "" ++ }, ++ "headers": { ++ "Accept": [ ++ "*/*" ++ ], ++ "Accept-Encoding": [ ++ "gzip, deflate, compress" ++ ], ++ "User-Agent": [ ++ "python-requests/2.2.1 CPython/3.5.2 Darwin/17.3.0" ++ ] ++ }, ++ "method": "GET", ++ "uri": "https://stxnext.com/static/img/logo.830ebe551641.svg" ++ }, ++ "response": { ++ "body": { ++ "encoding": null, ++ "string": "<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" viewBox=\"-16169 -10492.84 144.98 39.947\"><defs><style>.a{fill:url(#a);}</style><linearGradient id=\"a\" x2=\"1\" y2=\"1\" gradientUnits=\"objectBoundingBox\"><stop offset=\"0\" stop-color=\"#15c9c2\"/><stop offset=\"1\" stop-color=\"#39769b\"/></linearGradient></defs><path class=\"a\" d=\"M88.841,54.948V48.514a3.665,3.665,0,0,1,1.541-.336,2.169,2.169,0,0,1,2.266,2.435A2.182,2.182,0,0,1,90.435,53.1a2.9,2.9,0,0,1-.85-.125v1.974Zm.744-6.019v3.46a2.558,2.558,0,0,0,.8.125c1,0,1.523-.807,1.523-1.9s-.525-1.84-1.506-1.84h-.041A1.986,1.986,0,0,0,89.585,48.929ZM62.838,54.948l.717-1.9-1.788-4.769h.805l1.187,3.472a5.008,5.008,0,0,1,.167.682h.019a5.01,5.01,0,0,1,.167-.682l1.177-3.472h.815l-2.5,6.672Zm-5.749,0V48.514a3.669,3.669,0,0,1,1.541-.336A2.169,2.169,0,0,1,60.9,50.613,2.185,2.185,0,0,1,58.683,53.1a2.9,2.9,0,0,1-.85-.125v1.974Zm.74-6.019v3.46a2.558,2.558,0,0,0,.8.125c1,0,1.523-.807,1.523-1.9s-.529-1.84-1.513-1.84H58.6A1.986,1.986,0,0,0,57.829,48.929Zm79.213,4.213a2.19,2.19,0,0,1-2.282-2.487c0-1.462.788-2.478,2.08-2.478a1.825,1.825,0,0,1,1.9,2.044c0,.1,0,.205-.008.318l-3.257.469a1.5,1.5,0,0,0,1.6,1.532,2.886,2.886,0,0,0,1.3-.292l.23.557a3.431,3.431,0,0,1-1.484.336ZM135.432,50.5l2.6-.366c-.011-.944-.488-1.386-1.2-1.386C135.989,48.744,135.45,49.416,135.432,50.5ZM130.4,52.8l.265-.567a2.665,2.665,0,0,0,1.143.3c.611,0,1.018-.3,1.018-.77,0-.5-.407-.7-.965-.9-.673-.248-1.336-.549-1.336-1.408,0-.744.575-1.279,1.585-1.279a2.6,2.6,0,0,1,1.327.336l-.257.523a2.054,2.054,0,0,0-1-.283c-.576,0-.9.309-.9.707,0,.5.388.682.913.875.708.265,1.4.549,1.4,1.434.006.823-.649,1.372-1.772,1.372A3.261,3.261,0,0,1,130.4,52.8Zm-3.008.34c-1.187,0-1.841-.523-1.841-1.672V48.276h.744v3.2c0,.707.366,1.043,1.1,1.043a2.914,2.914,0,0,0,1.008-.158V48.276h.73V52.8a4.263,4.263,0,0,1-1.664.34Zm-7.256-2.487c0-1.417.708-2.478,2.028-2.478s2.026,1.061,2.026,2.478-.709,2.487-2.026,2.487S120.14,52.071,120.14,50.655Zm.735-.007c0,1.1.424,1.884,1.292,1.884s1.291-.788,1.291-1.884-.425-1.866-1.291-1.866v0C121.3,48.779,120.875,49.549,120.875,50.648Zm-12.187,2.494a2.19,2.19,0,0,1-2.282-2.487c0-1.462.788-2.478,2.08-2.478a1.825,1.825,0,0,1,1.9,2.044c0,.1,0,.205-.009.318l-3.256.469a1.494,1.494,0,0,0,1.6,1.532,2.886,2.886,0,0,0,1.3-.292l.23.557a3.431,3.431,0,0,1-1.484.336ZM107.079,50.5l2.6-.366c-.01-.944-.488-1.386-1.2-1.386C107.636,48.744,107.1,49.416,107.079,50.5Zm-13.249.159c0-1.417.708-2.478,2.028-2.478s2.026,1.061,2.026,2.478-.707,2.487-2.026,2.487S93.83,52.071,93.83,50.655Zm.735-.007c0,1.1.424,1.884,1.292,1.884s1.291-.788,1.291-1.884-.424-1.866-1.291-1.866v0C94.989,48.779,94.565,49.549,94.565,50.648Zm-18.973.007c0-1.417.708-2.478,2.028-2.478s2.032,1.061,2.032,2.478-.715,2.487-2.032,2.487S75.592,52.071,75.592,50.655Zm.735-.007c0,1.1.424,1.884,1.292,1.884s1.292-.788,1.292-1.884-.426-1.866-1.292-1.866v0C76.752,48.779,76.328,49.549,76.328,50.648ZM68.85,53.1a1.149,1.149,0,0,1-1.257-1.292V48.833H66.9v-.557h.688V47.123l.716-.239v1.389h1.027v.557H68.306v2.939a.634.634,0,0,0,.716.673,1.006,1.006,0,0,0,.309-.044v.619a1.308,1.308,0,0,1-.453.081Zm15.078-.053V49.823c0-.638-.39-1.044-1.158-1.044a2.968,2.968,0,0,0-1.018.169v4.1h-.745V48.513a4.5,4.5,0,0,1,1.753-.336c1.257,0,1.9.584,1.9,1.585v3.289Zm34.114-3.212c0-.7-.461-1.037-1.187-1.037a2.036,2.036,0,0,0-.989.265v3.983h-.744V46.1h.744v2.376A2.616,2.616,0,0,1,117,48.191c1.1,0,1.778.557,1.778,1.585v3.265l-.734,0Zm-6.285,3.212V48.513a4.493,4.493,0,0,1,1.743-.336,3.273,3.273,0,0,1,.47.034l-.143.621a2.031,2.031,0,0,0-.424-.034,2.461,2.461,0,0,0-.9.15v4.1Zm-8.485,0-.974-3.327a5.884,5.884,0,0,1-.14-.654h-.019s-.062.354-.15.654l-.974,3.327h-.753l-1.45-4.769h.744l.93,3.371a7.42,7.42,0,0,1,.15.732h.019s.07-.407.158-.732l.974-3.371h.709l.966,3.371c.088.318.167.732.167.732h.019a6.418,6.418,0,0,1,.143-.732l.947-3.371h.731l-1.442,4.769ZM73.5,49.833c0-.7-.461-1.037-1.187-1.037a2.044,2.044,0,0,0-.991.265v3.983h-.744V46.1h.744v2.376a2.612,2.612,0,0,1,1.133-.283c1.1,0,1.778.557,1.778,1.585v3.265l-.734,0Zm-27.141-6,8.837-14.534L46.91,15.475h7.926l7.925,13.819L54.32,43.828Zm-15.478,0V21.688H23.911V15.474H44.819v6.213H37.846V43.828ZM0,40.086l4.455-4.463c1.473,1.473,4.064,1.99,6.331,1.99,2.741,0,4.062-.913,4.062-2.548a2.4,2.4,0,0,0-.548-1.671,3.133,3.133,0,0,0-1.872-.757L9,32.158A9.631,9.631,0,0,1,3.31,29.651a7.847,7.847,0,0,1-1.953-5.7C1.358,18.778,5.26,15,11.712,15c4.06,0,7.127.956,9.558,3.385l-4.387,4.385C15.092,20.98,12.742,21.1,11.506,21.1c-2.429,0-3.424,1.394-3.424,2.63a1.868,1.868,0,0,0,.557,1.315,3.179,3.179,0,0,0,1.952.836l3.426.48a9.569,9.569,0,0,1,5.576,2.348c1.513,1.473,2.111,3.584,2.111,6.213,0,5.761-4.982,8.907-10.95,8.907C6.412,43.828,2.866,43.031,0,40.086Zm111.6,3.73,6.958-11.665-6.518-11.076h2.81l5.048,8.975,5.046-8.975h2.812L121.2,32.15l7.027,11.658-2.812.006L119.9,34.265l-5.558,9.55Zm24.376,0V23.245h-6.579V21.074h15.588v2.171H138.4V43.814ZM95.878,21.074H109.99v2.173h-11.7v8.018h9.966v2.165H98.3v8.21H110v2.173l-14.123,0ZM90.192,43.814,78.12,25.571V43.808H75.692V21.074h2.3L90.069,39.247V21.074H92.5V43.814ZM63.528,43.8l-2.683-5.029,3.7-6.344,6.611,11.379Zm-2.7-24.291,2.094-4.046h7.919L64.668,26.125Z\" transform=\"translate(-16169 -10507.84)\"/></svg>" ++ }, ++ "headers": { ++ "content-length": [ ++ "5177" ++ ], ++ "content-type": [ ++ "image/svg+xml" ++ ], ++ "date": [ ++ "Thu, 04 Jan 2018 23:00:15 GMT" ++ ], ++ "last-modified": [ ++ "Wed, 22 Nov 2017 09:22:00 GMT" ++ ], ++ "strict-transport-security": [ ++ "max-age=0; includeSubdomains; preload" ++ ] ++ }, ++ "status": { ++ "code": 200, ++ "message": "OK" ++ }, ++ "url": "https://stxnext.com/static/img/logo.830ebe551641.svg" ++ } ++ } ++ ], ++ "recorded_with": "betamax/0.8.0" ++} +\ No newline at end of file +diff --git a/tests/cassettes/http2bin_cookies.json b/tests/cassettes/http2bin_cookies.json +index a8368ed..3d907da 100644 +--- a/tests/cassettes/http2bin_cookies.json ++++ b/tests/cassettes/http2bin_cookies.json +@@ -1 +1,132 @@ +-{"recorded_with": "betamax/0.5.1", "http_interactions": [{"response": {"status": {"code": 302, "message": "FOUND"}, "body": {"string": "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">\n<title>Redirecting...</title>\n<h1>Redirecting...</h1>\n<p>You should be redirected automatically to target URL: <a href=\"/cookies\">/cookies</a>. If not click the link.", "encoding": "utf-8"}, "url": "https://httpbin.org/cookies/set?cookie0=value0", "headers": {"Location": ["/cookies"], "Content-Length": ["223"], "Date": ["Fri, 13 Nov 2015 00:23:20 GMT"], "Access-Control-Allow-Credentials": ["true"], "Access-Control-Allow-Origin": ["*"], "Connection": ["keep-alive"], "Server": ["nginx"], "Set-Cookie": ["cookie0=value0; Path=/"], "Content-Type": ["text/html; charset=utf-8"]}}, "recorded_at": "2015-11-13T00:23:19", "request": {"uri": "https://httpbin.org/cookies/set?cookie0=value0", "method": "GET", "body": {"string": "", "encoding": "utf-8"}, "headers": {"Connection": ["keep-alive"], "User-Agent": ["python-requests/2.8.1"], "Accept-Encoding": ["gzip, deflate"], "Accept": ["*/*"]}}}, {"response": {"status": {"code": 200, "message": "OK"}, "body": {"string": "{\n \"cookies\": {\n \"cookie0\": \"value0\"\n }\n}\n", "encoding": null}, "url": "https://httpbin.org/cookies", "headers": {"Access-Control-Allow-Credentials": ["true"], "Content-Length": ["47"], "Date": ["Fri, 13 Nov 2015 00:23:20 GMT"], "Content-Type": ["application/json"], "Connection": ["keep-alive"], "Server": ["nginx"], "Access-Control-Allow-Origin": ["*"]}}, "recorded_at": "2015-11-13T00:23:19", "request": {"uri": "https://httpbin.org/cookies", "method": "GET", "body": {"string": "", "encoding": "utf-8"}, "headers": {"Connection": ["keep-alive"], "User-Agent": ["python-requests/2.8.1"], "Accept-Encoding": ["gzip, deflate"], "Accept": ["*/*"], "Cookie": ["cookie0=value0"]}}}]} +\ No newline at end of file ++{ ++ "http_interactions": [ ++ { ++ "recorded_at": "2015-11-13T00:23:19", ++ "request": { ++ "body": { ++ "encoding": "utf-8", ++ "string": "" ++ }, ++ "headers": { ++ "Accept": [ ++ "*/*" ++ ], ++ "Accept-Encoding": [ ++ "gzip, deflate" ++ ], ++ "Connection": [ ++ "keep-alive" ++ ], ++ "User-Agent": [ ++ "python-requests/2.8.1" ++ ] ++ }, ++ "method": "GET", ++ "uri": "https://httpbin.org/cookies/set?cookie0=value0" ++ }, ++ "response": { ++ "body": { ++ "encoding": "utf-8", ++ "string": "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">\n<title>Redirecting...</title>\n<h1>Redirecting...</h1>\n<p>You should be redirected automatically to target URL: <a href=\"/cookies\">/cookies</a>. If not click the link." ++ }, ++ "headers": { ++ "Access-Control-Allow-Credentials": [ ++ "true" ++ ], ++ "Access-Control-Allow-Origin": [ ++ "*" ++ ], ++ "Connection": [ ++ "keep-alive" ++ ], ++ "Content-Length": [ ++ "223" ++ ], ++ "Content-Type": [ ++ "text/html; charset=utf-8" ++ ], ++ "Date": [ ++ "Fri, 13 Nov 2015 00:23:20 GMT" ++ ], ++ "Location": [ ++ "/cookies" ++ ], ++ "Server": [ ++ "nginx" ++ ], ++ "Set-Cookie": [ ++ "cookie0=value0; Path=/" ++ ] ++ }, ++ "status": { ++ "code": 302, ++ "message": "FOUND" ++ }, ++ "url": "https://httpbin.org/cookies/set?cookie0=value0" ++ } ++ }, ++ { ++ "recorded_at": "2015-11-13T00:23:19", ++ "request": { ++ "body": { ++ "encoding": "utf-8", ++ "string": "" ++ }, ++ "headers": { ++ "Accept": [ ++ "*/*" ++ ], ++ "Accept-Encoding": [ ++ "gzip, deflate" ++ ], ++ "Connection": [ ++ "keep-alive" ++ ], ++ "Cookie": [ ++ "cookie0=value0" ++ ], ++ "User-Agent": [ ++ "python-requests/2.8.1" ++ ] ++ }, ++ "method": "GET", ++ "uri": "https://httpbin.org/cookies" ++ }, ++ "response": { ++ "body": { ++ "encoding": null, ++ "string": "{\n \"cookies\": {\n \"cookie0\": \"value0\"\n }\n}\n" ++ }, ++ "headers": { ++ "Access-Control-Allow-Credentials": [ ++ "true" ++ ], ++ "Access-Control-Allow-Origin": [ ++ "*" ++ ], ++ "Connection": [ ++ "keep-alive" ++ ], ++ "Content-Length": [ ++ "47" ++ ], ++ "Content-Type": [ ++ "application/json" ++ ], ++ "Date": [ ++ "Fri, 13 Nov 2015 00:23:20 GMT" ++ ], ++ "Server": [ ++ "nginx" ++ ] ++ }, ++ "status": { ++ "code": 200, ++ "message": "OK" ++ }, ++ "url": "https://httpbin.org/cookies" ++ } ++ } ++ ], ++ "recorded_with": "betamax/0.5.1" ++} +\ No newline at end of file +diff --git a/tests/cassettes/http2bin_fingerprint.json b/tests/cassettes/http2bin_fingerprint.json +index fd2fd35..75eb143 100644 +--- a/tests/cassettes/http2bin_fingerprint.json ++++ b/tests/cassettes/http2bin_fingerprint.json +@@ -1 +1,64 @@ +-{"recorded_with": "betamax/0.4.1", "http_interactions": [{"response": {"status": {"message": "OK", "code": 200}, "body": {"string": "{\n \"args\": {}, \n \"headers\": {\n \"Accept\": \"*/*\", \n \"Accept-Encoding\": \"gzip, deflate\", \n \"Connection\": \"keep-alive\", \n \"Host\": \"http2bin.org\", \n \"User-Agent\": \"python-requests/2.5.3 CPython/2.7.9 Darwin/14.1.0\"\n }, \n \"origin\": \"77.99.146.203\", \n \"url\": \"https://http2bin.org/get\"\n}\n", "encoding": null}, "headers": {"access-control-allow-origin": ["*"], "date": ["Tue, 03 Mar 2015 21:29:55 GMT"], "server": ["h2o/1.0.2-alpha1"], "content-length": ["301"], "access-control-allow-credentials": ["true"], "connection": ["keep-alive"], "content-type": ["application/json"]}, "url": "https://http2bin.org/get"}, "recorded_at": "2015-03-03T21:29:55", "request": {"method": "GET", "uri": "https://http2bin.org/get", "body": {"string": "", "encoding": "utf-8"}, "headers": {"Accept": ["*/*"], "Accept-Encoding": ["gzip, deflate"], "Connection": ["keep-alive"], "User-Agent": ["python-requests/2.5.3 CPython/2.7.9 Darwin/14.1.0"]}}}]} +\ No newline at end of file ++{ ++ "http_interactions": [ ++ { ++ "recorded_at": "2015-03-03T21:29:55", ++ "request": { ++ "body": { ++ "encoding": "utf-8", ++ "string": "" ++ }, ++ "headers": { ++ "Accept": [ ++ "*/*" ++ ], ++ "Accept-Encoding": [ ++ "gzip, deflate" ++ ], ++ "Connection": [ ++ "keep-alive" ++ ], ++ "User-Agent": [ ++ "python-requests/2.5.3 CPython/2.7.9 Darwin/14.1.0" ++ ] ++ }, ++ "method": "GET", ++ "uri": "https://http2bin.org/get" ++ }, ++ "response": { ++ "body": { ++ "encoding": null, ++ "string": "{\n \"args\": {}, \n \"headers\": {\n \"Accept\": \"*/*\", \n \"Accept-Encoding\": \"gzip, deflate\", \n \"Connection\": \"keep-alive\", \n \"Host\": \"http2bin.org\", \n \"User-Agent\": \"python-requests/2.5.3 CPython/2.7.9 Darwin/14.1.0\"\n }, \n \"origin\": \"77.99.146.203\", \n \"url\": \"https://http2bin.org/get\"\n}\n" ++ }, ++ "headers": { ++ "access-control-allow-credentials": [ ++ "true" ++ ], ++ "access-control-allow-origin": [ ++ "*" ++ ], ++ "connection": [ ++ "keep-alive" ++ ], ++ "content-length": [ ++ "301" ++ ], ++ "content-type": [ ++ "application/json" ++ ], ++ "date": [ ++ "Tue, 03 Mar 2015 21:29:55 GMT" ++ ], ++ "server": [ ++ "h2o/1.0.2-alpha1" ++ ] ++ }, ++ "status": { ++ "code": 200, ++ "message": "OK" ++ }, ++ "url": "https://http2bin.org/get" ++ } ++ } ++ ], ++ "recorded_with": "betamax/0.4.1" ++} +\ No newline at end of file +diff --git a/tests/cassettes/httpbin_guess_auth_basic.json b/tests/cassettes/httpbin_guess_auth_basic.json +index db72722..2daca54 100644 +--- a/tests/cassettes/httpbin_guess_auth_basic.json ++++ b/tests/cassettes/httpbin_guess_auth_basic.json +@@ -1 +1,114 @@ +-{"http_interactions": [{"request": {"body": {"string": "", "encoding": "utf-8"}, "headers": {"Accept-Encoding": ["gzip, deflate, compress"], "Accept": ["*/*"], "User-Agent": ["python-requests/2.2.1 CPython/2.7.6 Linux/3.14.1-1-ARCH"]}, "method": "GET", "uri": "http://httpbin.org/basic-auth/user/passwd"}, "response": {"body": {"string": "", "encoding": null}, "headers": {"content-length": ["0"], "server": ["gunicorn/0.17.4"], "connection": ["keep-alive"], "date": ["Sat, 03 May 2014 17:23:06 GMT"], "access-control-allow-origin": ["*"], "www-authenticate": ["Basic realm=\"Fake Realm\""]}, "status": {"message": "UNAUTHORIZED", "code": 401}, "url": "http://httpbin.org/basic-auth/user/passwd"}, "recorded_at": "2014-05-03T17:23:06"}, {"request": {"body": {"string": "", "encoding": "utf-8"}, "headers": {"Accept": ["*/*"], "Accept-Encoding": ["gzip, deflate, compress"], "Authorization": ["Basic dXNlcjpwYXNzd2Q="], "User-Agent": ["python-requests/2.2.1 CPython/2.7.6 Linux/3.14.1-1-ARCH"]}, "method": "GET", "uri": "http://httpbin.org/basic-auth/user/passwd"}, "response": {"body": {"string": "{\n \"user\": \"user\",\n \"authenticated\": true\n}", "encoding": null}, "headers": {"content-length": ["45"], "server": ["gunicorn/0.17.4"], "connection": ["keep-alive"], "date": ["Sat, 03 May 2014 17:23:06 GMT"], "access-control-allow-origin": ["*"], "content-type": ["application/json"]}, "status": {"message": "OK", "code": 200}, "url": "http://httpbin.org/basic-auth/user/passwd"}, "recorded_at": "2014-05-03T17:23:06"}], "recorded_with": "betamax/{version}"} +\ No newline at end of file ++{ ++ "http_interactions": [ ++ { ++ "recorded_at": "2014-05-03T17:23:06", ++ "request": { ++ "body": { ++ "encoding": "utf-8", ++ "string": "" ++ }, ++ "headers": { ++ "Accept": [ ++ "*/*" ++ ], ++ "Accept-Encoding": [ ++ "gzip, deflate, compress" ++ ], ++ "User-Agent": [ ++ "python-requests/2.2.1 CPython/2.7.6 Linux/3.14.1-1-ARCH" ++ ] ++ }, ++ "method": "GET", ++ "uri": "http://httpbin.org/basic-auth/user/passwd" ++ }, ++ "response": { ++ "body": { ++ "encoding": null, ++ "string": "" ++ }, ++ "headers": { ++ "access-control-allow-origin": [ ++ "*" ++ ], ++ "connection": [ ++ "keep-alive" ++ ], ++ "content-length": [ ++ "0" ++ ], ++ "date": [ ++ "Sat, 03 May 2014 17:23:06 GMT" ++ ], ++ "server": [ ++ "gunicorn/0.17.4" ++ ], ++ "www-authenticate": [ ++ "Basic realm=\"Fake Realm\"" ++ ] ++ }, ++ "status": { ++ "code": 401, ++ "message": "UNAUTHORIZED" ++ }, ++ "url": "http://httpbin.org/basic-auth/user/passwd" ++ } ++ }, ++ { ++ "recorded_at": "2014-05-03T17:23:06", ++ "request": { ++ "body": { ++ "encoding": "utf-8", ++ "string": "" ++ }, ++ "headers": { ++ "Accept": [ ++ "*/*" ++ ], ++ "Accept-Encoding": [ ++ "gzip, deflate, compress" ++ ], ++ "Authorization": [ ++ "Basic dXNlcjpwYXNzd2Q=" ++ ], ++ "User-Agent": [ ++ "python-requests/2.2.1 CPython/2.7.6 Linux/3.14.1-1-ARCH" ++ ] ++ }, ++ "method": "GET", ++ "uri": "http://httpbin.org/basic-auth/user/passwd" ++ }, ++ "response": { ++ "body": { ++ "encoding": null, ++ "string": "{\n \"user\": \"user\",\n \"authenticated\": true\n}" ++ }, ++ "headers": { ++ "access-control-allow-origin": [ ++ "*" ++ ], ++ "connection": [ ++ "keep-alive" ++ ], ++ "content-length": [ ++ "45" ++ ], ++ "content-type": [ ++ "application/json" ++ ], ++ "date": [ ++ "Sat, 03 May 2014 17:23:06 GMT" ++ ], ++ "server": [ ++ "gunicorn/0.17.4" ++ ] ++ }, ++ "status": { ++ "code": 200, ++ "message": "OK" ++ }, ++ "url": "http://httpbin.org/basic-auth/user/passwd" ++ } ++ } ++ ], ++ "recorded_with": "betamax/{version}" ++} +\ No newline at end of file +diff --git a/tests/cassettes/httpbin_guess_auth_digest.json b/tests/cassettes/httpbin_guess_auth_digest.json +index 94cf3a3..3b46fac 100644 +--- a/tests/cassettes/httpbin_guess_auth_digest.json ++++ b/tests/cassettes/httpbin_guess_auth_digest.json +@@ -1 +1,123 @@ +-{"http_interactions": [{"request": {"body": {"string": "", "encoding": "utf-8"}, "headers": {"Accept-Encoding": ["gzip, deflate, compress"], "Accept": ["*/*"], "User-Agent": ["python-requests/2.2.1 CPython/2.7.6 Linux/3.14.1-1-ARCH"]}, "method": "GET", "uri": "http://httpbin.org/digest-auth/auth/user/passwd"}, "response": {"body": {"string": "", "encoding": "utf-8"}, "headers": {"content-length": ["0"], "set-cookie": ["fake=fake_value"], "server": ["gunicorn/0.17.4"], "connection": ["keep-alive"], "date": ["Sat, 03 May 2014 17:23:07 GMT"], "access-control-allow-origin": ["*"], "content-type": ["text/html; charset=utf-8"], "www-authenticate": ["Digest qop=auth, nonce=\"713b4eb6d0ad0ac25d75b50c4d044d5e\", realm=\"me@kennethreitz.com\", opaque=\"d0033bc1960ca78a2fc4497c1e8a8cbd\""]}, "status": {"message": "UNAUTHORIZED", "code": 401}, "url": "http://httpbin.org/digest-auth/auth/user/passwd"}, "recorded_at": "2014-05-03T17:23:07"}, {"request": {"body": {"string": "", "encoding": "utf-8"}, "headers": {"Accept": ["*/*"], "Cookie": ["fake=fake_value"], "Accept-Encoding": ["gzip, deflate, compress"], "Authorization": ["Digest username=\"user\", realm=\"me@kennethreitz.com\", nonce=\"713b4eb6d0ad0ac25d75b50c4d044d5e\", uri=\"/digest-auth/auth/user/passwd\", response=\"30276b25ef0031e65e3bccc719031388\", opaque=\"d0033bc1960ca78a2fc4497c1e8a8cbd\", qop=\"auth\", nc=00000001, cnonce=\"e94e00be64d66bcb\""], "User-Agent": ["python-requests/2.2.1 CPython/2.7.6 Linux/3.14.1-1-ARCH"]}, "method": "GET", "uri": "http://httpbin.org/digest-auth/auth/user/passwd"}, "response": {"body": {"string": "{\n \"user\": \"user\",\n \"authenticated\": true\n}", "encoding": null}, "headers": {"content-length": ["45"], "server": ["gunicorn/0.17.4"], "connection": ["keep-alive"], "date": ["Sat, 03 May 2014 17:23:07 GMT"], "access-control-allow-origin": ["*"], "content-type": ["application/json"]}, "status": {"message": "OK", "code": 200}, "url": "http://httpbin.org/digest-auth/auth/user/passwd"}, "recorded_at": "2014-05-03T17:23:07"}], "recorded_with": "betamax/{version}"} +\ No newline at end of file ++{ ++ "http_interactions": [ ++ { ++ "recorded_at": "2014-05-03T17:23:07", ++ "request": { ++ "body": { ++ "encoding": "utf-8", ++ "string": "" ++ }, ++ "headers": { ++ "Accept": [ ++ "*/*" ++ ], ++ "Accept-Encoding": [ ++ "gzip, deflate, compress" ++ ], ++ "User-Agent": [ ++ "python-requests/2.2.1 CPython/2.7.6 Linux/3.14.1-1-ARCH" ++ ] ++ }, ++ "method": "GET", ++ "uri": "http://httpbin.org/digest-auth/auth/user/passwd" ++ }, ++ "response": { ++ "body": { ++ "encoding": "utf-8", ++ "string": "" ++ }, ++ "headers": { ++ "access-control-allow-origin": [ ++ "*" ++ ], ++ "connection": [ ++ "keep-alive" ++ ], ++ "content-length": [ ++ "0" ++ ], ++ "content-type": [ ++ "text/html; charset=utf-8" ++ ], ++ "date": [ ++ "Sat, 03 May 2014 17:23:07 GMT" ++ ], ++ "server": [ ++ "gunicorn/0.17.4" ++ ], ++ "set-cookie": [ ++ "fake=fake_value" ++ ], ++ "www-authenticate": [ ++ "Digest qop=auth, nonce=\"713b4eb6d0ad0ac25d75b50c4d044d5e\", realm=\"me@kennethreitz.com\", opaque=\"d0033bc1960ca78a2fc4497c1e8a8cbd\"" ++ ] ++ }, ++ "status": { ++ "code": 401, ++ "message": "UNAUTHORIZED" ++ }, ++ "url": "http://httpbin.org/digest-auth/auth/user/passwd" ++ } ++ }, ++ { ++ "recorded_at": "2014-05-03T17:23:07", ++ "request": { ++ "body": { ++ "encoding": "utf-8", ++ "string": "" ++ }, ++ "headers": { ++ "Accept": [ ++ "*/*" ++ ], ++ "Accept-Encoding": [ ++ "gzip, deflate, compress" ++ ], ++ "Authorization": [ ++ "Digest username=\"user\", realm=\"me@kennethreitz.com\", nonce=\"713b4eb6d0ad0ac25d75b50c4d044d5e\", uri=\"/digest-auth/auth/user/passwd\", response=\"30276b25ef0031e65e3bccc719031388\", opaque=\"d0033bc1960ca78a2fc4497c1e8a8cbd\", qop=\"auth\", nc=00000001, cnonce=\"e94e00be64d66bcb\"" ++ ], ++ "Cookie": [ ++ "fake=fake_value" ++ ], ++ "User-Agent": [ ++ "python-requests/2.2.1 CPython/2.7.6 Linux/3.14.1-1-ARCH" ++ ] ++ }, ++ "method": "GET", ++ "uri": "http://httpbin.org/digest-auth/auth/user/passwd" ++ }, ++ "response": { ++ "body": { ++ "encoding": null, ++ "string": "{\n \"user\": \"user\",\n \"authenticated\": true\n}" ++ }, ++ "headers": { ++ "access-control-allow-origin": [ ++ "*" ++ ], ++ "connection": [ ++ "keep-alive" ++ ], ++ "content-length": [ ++ "45" ++ ], ++ "content-type": [ ++ "application/json" ++ ], ++ "date": [ ++ "Sat, 03 May 2014 17:23:07 GMT" ++ ], ++ "server": [ ++ "gunicorn/0.17.4" ++ ] ++ }, ++ "status": { ++ "code": 200, ++ "message": "OK" ++ }, ++ "url": "http://httpbin.org/digest-auth/auth/user/passwd" ++ } ++ } ++ ], ++ "recorded_with": "betamax/{version}" ++} +\ No newline at end of file +diff --git a/tests/cassettes/httpbin_guess_auth_none.json b/tests/cassettes/httpbin_guess_auth_none.json +index 2ebbb0f..4ddfbc5 100644 +--- a/tests/cassettes/httpbin_guess_auth_none.json ++++ b/tests/cassettes/httpbin_guess_auth_none.json +@@ -1 +1,58 @@ +-{"http_interactions": [{"request": {"body": {"string": "", "encoding": "utf-8"}, "headers": {"Accept-Encoding": ["gzip, deflate, compress"], "Accept": ["*/*"], "User-Agent": ["python-requests/2.2.1 CPython/2.7.6 Linux/3.14.1-1-ARCH"]}, "method": "GET", "uri": "http://httpbin.org/get?a=1"}, "response": {"body": {"string": "{\n \"args\": {\n \"a\": \"1\"\n },\n \"url\": \"http://httpbin.org/get?a=1\",\n \"headers\": {\n \"Connection\": \"close\",\n \"Host\": \"httpbin.org\",\n \"Accept-Encoding\": \"gzip, deflate, compress\",\n \"X-Request-Id\": \"f9f71f12-5705-4a0f-85d4-3d63f9140b1f\",\n \"User-Agent\": \"python-requests/2.2.1 CPython/2.7.6 Linux/3.14.1-1-ARCH\",\n \"Accept\": \"*/*\"\n },\n \"origin\": \"62.47.252.115\"\n}", "encoding": null}, "headers": {"content-length": ["381"], "server": ["gunicorn/0.17.4"], "connection": ["keep-alive"], "date": ["Sat, 03 May 2014 17:23:07 GMT"], "access-control-allow-origin": ["*"], "content-type": ["application/json"]}, "status": {"message": "OK", "code": 200}, "url": "http://httpbin.org/get?a=1"}, "recorded_at": "2014-05-03T17:23:07"}], "recorded_with": "betamax/{version}"} +\ No newline at end of file ++{ ++ "http_interactions": [ ++ { ++ "recorded_at": "2014-05-03T17:23:07", ++ "request": { ++ "body": { ++ "encoding": "utf-8", ++ "string": "" ++ }, ++ "headers": { ++ "Accept": [ ++ "*/*" ++ ], ++ "Accept-Encoding": [ ++ "gzip, deflate, compress" ++ ], ++ "User-Agent": [ ++ "python-requests/2.2.1 CPython/2.7.6 Linux/3.14.1-1-ARCH" ++ ] ++ }, ++ "method": "GET", ++ "uri": "http://httpbin.org/get?a=1" ++ }, ++ "response": { ++ "body": { ++ "encoding": null, ++ "string": "{\n \"args\": {\n \"a\": \"1\"\n },\n \"url\": \"http://httpbin.org/get?a=1\",\n \"headers\": {\n \"Connection\": \"close\",\n \"Host\": \"httpbin.org\",\n \"Accept-Encoding\": \"gzip, deflate, compress\",\n \"X-Request-Id\": \"f9f71f12-5705-4a0f-85d4-3d63f9140b1f\",\n \"User-Agent\": \"python-requests/2.2.1 CPython/2.7.6 Linux/3.14.1-1-ARCH\",\n \"Accept\": \"*/*\"\n },\n \"origin\": \"62.47.252.115\"\n}" ++ }, ++ "headers": { ++ "access-control-allow-origin": [ ++ "*" ++ ], ++ "connection": [ ++ "keep-alive" ++ ], ++ "content-length": [ ++ "381" ++ ], ++ "content-type": [ ++ "application/json" ++ ], ++ "date": [ ++ "Sat, 03 May 2014 17:23:07 GMT" ++ ], ++ "server": [ ++ "gunicorn/0.17.4" ++ ] ++ }, ++ "status": { ++ "code": 200, ++ "message": "OK" ++ }, ++ "url": "http://httpbin.org/get?a=1" ++ } ++ } ++ ], ++ "recorded_with": "betamax/{version}" ++} +\ No newline at end of file +diff --git a/tests/cassettes/klevas_vu_lt_ssl3.json b/tests/cassettes/klevas_vu_lt_ssl3.json +index 3c667ba..1608e48 100644 +--- a/tests/cassettes/klevas_vu_lt_ssl3.json ++++ b/tests/cassettes/klevas_vu_lt_ssl3.json +@@ -1 +1,35 @@ +-{"http_interactions": [{"request": {"body": "", "headers": {"Accept-Encoding": "gzip, deflate, compress", "Accept": "*/*", "User-Agent": "python-requests/2.1.0 CPython/2.7.3 Linux/3.2.29"}, "method": "GET", "uri": "https://klevas.vu.lt/"}, "response": {"body": {"string": "<html>\n<title>\nKlevas\n</title>\n<head>\n<script language=\"javascript\" type=\"text/javascript\">\n <!--\n window.location=\"https://klevas.vu.lt/pls/klevas/logon\";\n // -->\n </script>\n</head>\n</html>\n\n", "encoding": "ISO-8859-1"}, "headers": {"content-length": "204", "accept-ranges": "bytes", "server": "Oracle-Application-Server-10g/10.1.3.1.0 Oracle-HTTP-Server", "last-modified": "Wed, 13 Apr 2011 05:00:23 GMT", "etag": "\"7f9b-cc-4da52de7\"", "date": "Sun, 05 Jan 2014 01:35:40 GMT", "content-type": "text/html"}, "url": "https://klevas.vu.lt/", "status_code": 200}, "recorded_at": "2014-01-05T01:34:40"}], "recorded_with": "betamax"} +\ No newline at end of file ++{ ++ "http_interactions": [ ++ { ++ "recorded_at": "2014-01-05T01:34:40", ++ "request": { ++ "body": "", ++ "headers": { ++ "Accept": "*/*", ++ "Accept-Encoding": "gzip, deflate, compress", ++ "User-Agent": "python-requests/2.1.0 CPython/2.7.3 Linux/3.2.29" ++ }, ++ "method": "GET", ++ "uri": "https://klevas.vu.lt/" ++ }, ++ "response": { ++ "body": { ++ "encoding": "ISO-8859-1", ++ "string": "<html>\n<title>\nKlevas\n</title>\n<head>\n<script language=\"javascript\" type=\"text/javascript\">\n <!--\n window.location=\"https://klevas.vu.lt/pls/klevas/logon\";\n // -->\n </script>\n</head>\n</html>\n\n" ++ }, ++ "headers": { ++ "accept-ranges": "bytes", ++ "content-length": "204", ++ "content-type": "text/html", ++ "date": "Sun, 05 Jan 2014 01:35:40 GMT", ++ "etag": "\"7f9b-cc-4da52de7\"", ++ "last-modified": "Wed, 13 Apr 2011 05:00:23 GMT", ++ "server": "Oracle-Application-Server-10g/10.1.3.1.0 Oracle-HTTP-Server" ++ }, ++ "status_code": 200, ++ "url": "https://klevas.vu.lt/" ++ } ++ } ++ ], ++ "recorded_with": "betamax" ++} +\ No newline at end of file +diff --git a/tests/cassettes/redirect_request_for_dump_all.json b/tests/cassettes/redirect_request_for_dump_all.json +index 38b037d..f713ff3 100644 +--- a/tests/cassettes/redirect_request_for_dump_all.json ++++ b/tests/cassettes/redirect_request_for_dump_all.json +@@ -1 +1,232 @@ +-{"recorded_with": "betamax/0.5.1", "http_interactions": [{"recorded_at": "2015-11-14T22:53:20", "request": {"uri": "https://httpbin.org/redirect/5", "method": "GET", "body": {"string": "", "encoding": "utf-8"}, "headers": {"Connection": "keep-alive", "Accept": "*/*", "User-Agent": "python-requests/2.8.1", "Accept-Encoding": "gzip, deflate"}}, "response": {"url": "https://httpbin.org/redirect/5", "status": {"code": 302, "message": "FOUND"}, "body": {"string": "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">\n<title>Redirecting...</title>\n<h1>Redirecting...</h1>\n<p>You should be redirected automatically to target URL: <a href=\"/relative-redirect/4\">/relative-redirect/4</a>. If not click the link.", "encoding": "utf-8"}, "headers": {"Location": "/relative-redirect/4", "Access-Control-Allow-Credentials": "true", "Server": "nginx", "Date": "Sat, 14 Nov 2015 22:53:18 GMT", "Content-Length": "247", "Connection": "keep-alive", "Access-Control-Allow-Origin": "*", "Content-Type": "text/html; charset=utf-8"}}}, {"recorded_at": "2015-11-14T22:53:20", "request": {"uri": "https://httpbin.org/relative-redirect/4", "method": "GET", "body": {"string": "", "encoding": "utf-8"}, "headers": {"Connection": "keep-alive", "Accept": "*/*", "User-Agent": "python-requests/2.8.1", "Accept-Encoding": "gzip, deflate"}}, "response": {"url": "https://httpbin.org/relative-redirect/4", "status": {"code": 302, "message": "FOUND"}, "body": {"string": "", "encoding": "utf-8"}, "headers": {"Location": "/relative-redirect/3", "Access-Control-Allow-Credentials": "true", "Server": "nginx", "Date": "Sat, 14 Nov 2015 22:53:18 GMT", "Content-Length": "0", "Connection": "keep-alive", "Access-Control-Allow-Origin": "*", "Content-Type": "text/html; charset=utf-8"}}}, {"recorded_at": "2015-11-14T22:53:20", "request": {"uri": "https://httpbin.org/relative-redirect/3", "method": "GET", "body": {"string": "", "encoding": "utf-8"}, "headers": {"Connection": "keep-alive", "Accept": "*/*", "User-Agent": "python-requests/2.8.1", "Accept-Encoding": "gzip, deflate"}}, "response": {"url": "https://httpbin.org/relative-redirect/3", "status": {"code": 302, "message": "FOUND"}, "body": {"string": "", "encoding": "utf-8"}, "headers": {"Location": "/relative-redirect/2", "Access-Control-Allow-Credentials": "true", "Server": "nginx", "Date": "Sat, 14 Nov 2015 22:53:18 GMT", "Content-Length": "0", "Connection": "keep-alive", "Access-Control-Allow-Origin": "*", "Content-Type": "text/html; charset=utf-8"}}}, {"recorded_at": "2015-11-14T22:53:20", "request": {"uri": "https://httpbin.org/relative-redirect/2", "method": "GET", "body": {"string": "", "encoding": "utf-8"}, "headers": {"Connection": "keep-alive", "Accept": "*/*", "User-Agent": "python-requests/2.8.1", "Accept-Encoding": "gzip, deflate"}}, "response": {"url": "https://httpbin.org/relative-redirect/2", "status": {"code": 302, "message": "FOUND"}, "body": {"string": "", "encoding": "utf-8"}, "headers": {"Location": "/relative-redirect/1", "Access-Control-Allow-Credentials": "true", "Server": "nginx", "Date": "Sat, 14 Nov 2015 22:53:18 GMT", "Content-Length": "0", "Connection": "keep-alive", "Access-Control-Allow-Origin": "*", "Content-Type": "text/html; charset=utf-8"}}}, {"recorded_at": "2015-11-14T22:53:20", "request": {"uri": "https://httpbin.org/relative-redirect/1", "method": "GET", "body": {"string": "", "encoding": "utf-8"}, "headers": {"Connection": "keep-alive", "Accept": "*/*", "User-Agent": "python-requests/2.8.1", "Accept-Encoding": "gzip, deflate"}}, "response": {"url": "https://httpbin.org/relative-redirect/1", "status": {"code": 302, "message": "FOUND"}, "body": {"string": "", "encoding": "utf-8"}, "headers": {"Location": "/get", "Access-Control-Allow-Credentials": "true", "Server": "nginx", "Date": "Sat, 14 Nov 2015 22:53:18 GMT", "Content-Length": "0", "Connection": "keep-alive", "Access-Control-Allow-Origin": "*", "Content-Type": "text/html; charset=utf-8"}}}, {"recorded_at": "2015-11-14T22:53:20", "request": {"uri": "https://httpbin.org/get", "method": "GET", "body": {"string": "", "encoding": "utf-8"}, "headers": {"Connection": "keep-alive", "Accept": "*/*", "User-Agent": "python-requests/2.8.1", "Accept-Encoding": "gzip, deflate"}}, "response": {"url": "https://httpbin.org/get", "status": {"code": 200, "message": "OK"}, "body": {"string": "{\n \"args\": {}, \n \"headers\": {\n \"Accept\": \"*/*\", \n \"Accept-Encoding\": \"gzip, deflate\", \n \"Host\": \"httpbin.org\", \n \"User-Agent\": \"python-requests/2.8.1\"\n }, \n \"origin\": \"<IPADDR>\", \n \"url\": \"https://httpbin.org/get\"\n}\n", "encoding": null}, "headers": {"Access-Control-Allow-Credentials": "true", "Server": "nginx", "Date": "Sat, 14 Nov 2015 22:53:18 GMT", "Content-Length": "239", "Connection": "keep-alive", "Access-Control-Allow-Origin": "*", "Content-Type": "application/json"}}}]} +\ No newline at end of file ++{ ++ "http_interactions": [ ++ { ++ "recorded_at": "2015-11-14T22:53:20", ++ "request": { ++ "body": { ++ "encoding": "utf-8", ++ "string": "" ++ }, ++ "headers": { ++ "Accept": "*/*", ++ "Accept-Encoding": "gzip, deflate", ++ "Connection": "keep-alive", ++ "User-Agent": "python-requests/2.8.1" ++ }, ++ "method": "GET", ++ "uri": "https://httpbin.org/redirect/5" ++ }, ++ "response": { ++ "body": { ++ "encoding": "utf-8", ++ "string": "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">\n<title>Redirecting...</title>\n<h1>Redirecting...</h1>\n<p>You should be redirected automatically to target URL: <a href=\"/relative-redirect/4\">/relative-redirect/4</a>. If not click the link." ++ }, ++ "headers": { ++ "Access-Control-Allow-Credentials": "true", ++ "Access-Control-Allow-Origin": "*", ++ "Connection": "keep-alive", ++ "Content-Length": "247", ++ "Content-Type": "text/html; charset=utf-8", ++ "Date": "Sat, 14 Nov 2015 22:53:18 GMT", ++ "Location": "/relative-redirect/4", ++ "Server": "nginx" ++ }, ++ "status": { ++ "code": 302, ++ "message": "FOUND" ++ }, ++ "url": "https://httpbin.org/redirect/5" ++ } ++ }, ++ { ++ "recorded_at": "2015-11-14T22:53:20", ++ "request": { ++ "body": { ++ "encoding": "utf-8", ++ "string": "" ++ }, ++ "headers": { ++ "Accept": "*/*", ++ "Accept-Encoding": "gzip, deflate", ++ "Connection": "keep-alive", ++ "User-Agent": "python-requests/2.8.1" ++ }, ++ "method": "GET", ++ "uri": "https://httpbin.org/relative-redirect/4" ++ }, ++ "response": { ++ "body": { ++ "encoding": "utf-8", ++ "string": "" ++ }, ++ "headers": { ++ "Access-Control-Allow-Credentials": "true", ++ "Access-Control-Allow-Origin": "*", ++ "Connection": "keep-alive", ++ "Content-Length": "0", ++ "Content-Type": "text/html; charset=utf-8", ++ "Date": "Sat, 14 Nov 2015 22:53:18 GMT", ++ "Location": "/relative-redirect/3", ++ "Server": "nginx" ++ }, ++ "status": { ++ "code": 302, ++ "message": "FOUND" ++ }, ++ "url": "https://httpbin.org/relative-redirect/4" ++ } ++ }, ++ { ++ "recorded_at": "2015-11-14T22:53:20", ++ "request": { ++ "body": { ++ "encoding": "utf-8", ++ "string": "" ++ }, ++ "headers": { ++ "Accept": "*/*", ++ "Accept-Encoding": "gzip, deflate", ++ "Connection": "keep-alive", ++ "User-Agent": "python-requests/2.8.1" ++ }, ++ "method": "GET", ++ "uri": "https://httpbin.org/relative-redirect/3" ++ }, ++ "response": { ++ "body": { ++ "encoding": "utf-8", ++ "string": "" ++ }, ++ "headers": { ++ "Access-Control-Allow-Credentials": "true", ++ "Access-Control-Allow-Origin": "*", ++ "Connection": "keep-alive", ++ "Content-Length": "0", ++ "Content-Type": "text/html; charset=utf-8", ++ "Date": "Sat, 14 Nov 2015 22:53:18 GMT", ++ "Location": "/relative-redirect/2", ++ "Server": "nginx" ++ }, ++ "status": { ++ "code": 302, ++ "message": "FOUND" ++ }, ++ "url": "https://httpbin.org/relative-redirect/3" ++ } ++ }, ++ { ++ "recorded_at": "2015-11-14T22:53:20", ++ "request": { ++ "body": { ++ "encoding": "utf-8", ++ "string": "" ++ }, ++ "headers": { ++ "Accept": "*/*", ++ "Accept-Encoding": "gzip, deflate", ++ "Connection": "keep-alive", ++ "User-Agent": "python-requests/2.8.1" ++ }, ++ "method": "GET", ++ "uri": "https://httpbin.org/relative-redirect/2" ++ }, ++ "response": { ++ "body": { ++ "encoding": "utf-8", ++ "string": "" ++ }, ++ "headers": { ++ "Access-Control-Allow-Credentials": "true", ++ "Access-Control-Allow-Origin": "*", ++ "Connection": "keep-alive", ++ "Content-Length": "0", ++ "Content-Type": "text/html; charset=utf-8", ++ "Date": "Sat, 14 Nov 2015 22:53:18 GMT", ++ "Location": "/relative-redirect/1", ++ "Server": "nginx" ++ }, ++ "status": { ++ "code": 302, ++ "message": "FOUND" ++ }, ++ "url": "https://httpbin.org/relative-redirect/2" ++ } ++ }, ++ { ++ "recorded_at": "2015-11-14T22:53:20", ++ "request": { ++ "body": { ++ "encoding": "utf-8", ++ "string": "" ++ }, ++ "headers": { ++ "Accept": "*/*", ++ "Accept-Encoding": "gzip, deflate", ++ "Connection": "keep-alive", ++ "User-Agent": "python-requests/2.8.1" ++ }, ++ "method": "GET", ++ "uri": "https://httpbin.org/relative-redirect/1" ++ }, ++ "response": { ++ "body": { ++ "encoding": "utf-8", ++ "string": "" ++ }, ++ "headers": { ++ "Access-Control-Allow-Credentials": "true", ++ "Access-Control-Allow-Origin": "*", ++ "Connection": "keep-alive", ++ "Content-Length": "0", ++ "Content-Type": "text/html; charset=utf-8", ++ "Date": "Sat, 14 Nov 2015 22:53:18 GMT", ++ "Location": "/get", ++ "Server": "nginx" ++ }, ++ "status": { ++ "code": 302, ++ "message": "FOUND" ++ }, ++ "url": "https://httpbin.org/relative-redirect/1" ++ } ++ }, ++ { ++ "recorded_at": "2015-11-14T22:53:20", ++ "request": { ++ "body": { ++ "encoding": "utf-8", ++ "string": "" ++ }, ++ "headers": { ++ "Accept": "*/*", ++ "Accept-Encoding": "gzip, deflate", ++ "Connection": "keep-alive", ++ "User-Agent": "python-requests/2.8.1" ++ }, ++ "method": "GET", ++ "uri": "https://httpbin.org/get" ++ }, ++ "response": { ++ "body": { ++ "encoding": null, ++ "string": "{\n \"args\": {}, \n \"headers\": {\n \"Accept\": \"*/*\", \n \"Accept-Encoding\": \"gzip, deflate\", \n \"Host\": \"httpbin.org\", \n \"User-Agent\": \"python-requests/2.8.1\"\n }, \n \"origin\": \"<IPADDR>\", \n \"url\": \"https://httpbin.org/get\"\n}\n" ++ }, ++ "headers": { ++ "Access-Control-Allow-Credentials": "true", ++ "Access-Control-Allow-Origin": "*", ++ "Connection": "keep-alive", ++ "Content-Length": "239", ++ "Content-Type": "application/json", ++ "Date": "Sat, 14 Nov 2015 22:53:18 GMT", ++ "Server": "nginx" ++ }, ++ "status": { ++ "code": 200, ++ "message": "OK" ++ }, ++ "url": "https://httpbin.org/get" ++ } ++ } ++ ], ++ "recorded_with": "betamax/0.5.1" ++} +\ No newline at end of file +diff --git a/tests/cassettes/simple_get_request.json b/tests/cassettes/simple_get_request.json +index a61fb5f..68378cd 100644 +--- a/tests/cassettes/simple_get_request.json ++++ b/tests/cassettes/simple_get_request.json +@@ -1 +1,64 @@ +-{"recorded_with": "betamax/0.5.1", "http_interactions": [{"request": {"body": {"encoding": "utf-8", "string": ""}, "uri": "https://httpbin.org/get", "headers": {"Connection": ["keep-alive"], "User-Agent": ["python-requests/2.8.1"], "Accept": ["*/*"], "Accept-Encoding": ["gzip, deflate"]}, "method": "GET"}, "recorded_at": "2015-11-14T22:33:32", "response": {"status": {"code": 200, "message": "OK"}, "url": "https://httpbin.org/get", "body": {"encoding": null, "string": "{\n \"args\": {}, \n \"headers\": {\n \"Accept\": \"*/*\", \n \"Accept-Encoding\": \"gzip, deflate\", \n \"Host\": \"httpbin.org\", \n \"User-Agent\": \"python-requests/2.8.1\"\n }, \n \"origin\": \"<IPADDR>\", \n \"url\": \"https://httpbin.org/get\"\n}\n"}, "headers": {"Content-Type": ["application/json"], "Date": ["Sat, 14 Nov 2015 22:33:30 GMT"], "Connection": ["keep-alive"], "Server": ["nginx"], "Access-Control-Allow-Credentials": ["true"], "Content-Length": ["239"], "Access-Control-Allow-Origin": ["*"]}}}]} ++{ ++ "http_interactions": [ ++ { ++ "recorded_at": "2015-11-14T22:33:32", ++ "request": { ++ "body": { ++ "encoding": "utf-8", ++ "string": "" ++ }, ++ "headers": { ++ "Accept": [ ++ "*/*" ++ ], ++ "Accept-Encoding": [ ++ "gzip, deflate" ++ ], ++ "Connection": [ ++ "keep-alive" ++ ], ++ "User-Agent": [ ++ "python-requests/2.8.1" ++ ] ++ }, ++ "method": "GET", ++ "uri": "https://httpbin.org/get" ++ }, ++ "response": { ++ "body": { ++ "encoding": null, ++ "string": "{\n \"args\": {}, \n \"headers\": {\n \"Accept\": \"*/*\", \n \"Accept-Encoding\": \"gzip, deflate\", \n \"Host\": \"httpbin.org\", \n \"User-Agent\": \"python-requests/2.8.1\"\n }, \n \"origin\": \"<IPADDR>\", \n \"url\": \"https://httpbin.org/get\"\n}\n" ++ }, ++ "headers": { ++ "Access-Control-Allow-Credentials": [ ++ "true" ++ ], ++ "Access-Control-Allow-Origin": [ ++ "*" ++ ], ++ "Connection": [ ++ "keep-alive" ++ ], ++ "Content-Length": [ ++ "239" ++ ], ++ "Content-Type": [ ++ "application/json" ++ ], ++ "Date": [ ++ "Sat, 14 Nov 2015 22:33:30 GMT" ++ ], ++ "Server": [ ++ "nginx" ++ ] ++ }, ++ "status": { ++ "code": 200, ++ "message": "OK" ++ }, ++ "url": "https://httpbin.org/get" ++ } ++ } ++ ], ++ "recorded_with": "betamax/0.5.1" ++} +\ No newline at end of file +diff --git a/tests/cassettes/stream_response_to_file.json b/tests/cassettes/stream_response_to_file.json +index 9807e41..ff407da 100644 +--- a/tests/cassettes/stream_response_to_file.json ++++ b/tests/cassettes/stream_response_to_file.json +@@ -1 +1,180 @@ +-{"recorded_with": "betamax/0.4.1", "http_interactions": [{"request": {"uri": "https://api.github.com/repos/sigmavirus24/github3.py/releases/assets/37944", "method": "GET", "headers": {"Accept": ["application/octet-stream"], "Accept-Encoding": ["gzip, deflate"], "Connection": ["keep-alive"], "User-Agent": ["python-requests/2.5.3 CPython/2.7.9 Darwin/14.1.0"]}, "body": {"base64_string": "", "encoding": "utf-8"}}, "response": {"status": {"code": 302, "message": "Found"}, "url": "https://api.github.com/repos/sigmavirus24/github3.py/releases/assets/37944", "headers": {"access-control-allow-credentials": ["true"], "x-xss-protection": ["1; mode=block"], "vary": ["Accept-Encoding"], "location": ["https://s3.amazonaws.com/github-cloud/releases/3710711/365425c2-4e46-11e3-86fb-bb0d50a886e7.whl?response-content-disposition=attachment%3B%20filename%3Dgithub3.py-0.7.1-py2.py3-none-any.whl&response-content-type=application/octet-stream&AWSAccessKeyId=AKIAISTNZFOVBIJMK3TQ&Expires=1426166613&Signature=78anFgNgXLm3TIbo%2FbTEEk7m%2F34%3D"], "x-content-type-options": ["nosniff"], "content-security-policy": ["default-src 'none'"], "x-ratelimit-limit": ["60"], "content-length": ["0"], "status": ["302 Found"], "x-frame-options": ["deny"], "x-served-by": ["8dd185e423974a7e13abbbe6e060031e"], "server": ["GitHub.com"], "access-control-allow-origin": ["*"], "strict-transport-security": ["max-age=31536000; includeSubdomains; preload"], "x-github-request-id": ["48A0C951:54E7:48B5311:55019319"], "date": ["Thu, 12 Mar 2015 13:22:33 GMT"], "access-control-expose-headers": ["ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval"], "x-ratelimit-remaining": ["58"], "content-type": ["text/html;charset=utf-8"], "x-ratelimit-reset": ["1426170017"]}, "body": {"base64_string": "", "encoding": "utf-8"}}, "recorded_at": "2015-03-12T13:22:33"}, {"request": {"uri": "https://s3.amazonaws.com/github-cloud/releases/3710711/365425c2-4e46-11e3-86fb-bb0d50a886e7.whl?response-content-disposition=attachment%3B%20filename%3Dgithub3.py-0.7.1-py2.py3-none-any.whl&response-content-type=application/octet-stream&AWSAccessKeyId=AKIAISTNZFOVBIJMK3TQ&Expires=1426166613&Signature=78anFgNgXLm3TIbo%2FbTEEk7m%2F34%3D", "method": "GET", "headers": {"Accept": ["application/octet-stream"], "Accept-Encoding": ["gzip, deflate"], "Connection": ["keep-alive"], "User-Agent": ["python-requests/2.5.3 CPython/2.7.9 Darwin/14.1.0"]}, "body": {"base64_string": "", "encoding": "utf-8"}}, "response": {"status": {"code": 200, "message": "OK"}, "url": "https://s3.amazonaws.com/github-cloud/releases/3710711/365425c2-4e46-11e3-86fb-bb0d50a886e7.whl?response-content-disposition=attachment%3B%20filename%3Dgithub3.py-0.7.1-py2.py3-none-any.whl&response-content-type=application/octet-stream&AWSAccessKeyId=AKIAISTNZFOVBIJMK3TQ&Expires=1426166613&Signature=78anFgNgXLm3TIbo%2FbTEEk7m%2F34%3D", "headers": {"accept-ranges": ["bytes"], "content-disposition": ["attachment; filename=github3.py-0.7.1-py2.py3-none-any.whl"], "x-amz-id-2": ["9+TuHhbd7y2BUJaEV+mFpaDgjl1g9uSAPiZxwc6b2cYydhlhZSyKSuB7PQyiPBPD"], "content-length": ["117140"], "x-amz-meta-surrogate-key": ["repository-3710711 user-240830"], "x-amz-request-id": ["4B4BFE6BF5135B8D"], "last-modified": ["Fri, 15 Nov 2013 22:35:23 GMT"], "x-amz-meta-surrogate-control": ["max-age=31557600"], "etag": ["\"6550854f02f7bf10b944070b84f38313\""], "date": ["Thu, 12 Mar 2015 13:22:35 GMT"], "cache-control": ["max-age=31557600"], "content-type": ["application/octet-stream"], "server": ["AmazonS3"]}, "body": {"base64_string": "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", "encoding": null}}, "recorded_at": "2015-03-12T13:22:34"}]} +\ No newline at end of file ++{ ++ "http_interactions": [ ++ { ++ "recorded_at": "2015-03-12T13:22:33", ++ "request": { ++ "body": { ++ "base64_string": "", ++ "encoding": "utf-8" ++ }, ++ "headers": { ++ "Accept": [ ++ "application/octet-stream" ++ ], ++ "Accept-Encoding": [ ++ "gzip, deflate" ++ ], ++ "Connection": [ ++ "keep-alive" ++ ], ++ "User-Agent": [ ++ "python-requests/2.5.3 CPython/2.7.9 Darwin/14.1.0" ++ ] ++ }, ++ "method": "GET", ++ "uri": "https://api.github.com/repos/sigmavirus24/github3.py/releases/assets/37944" ++ }, ++ "response": { ++ "body": { ++ "base64_string": "", ++ "encoding": "utf-8" ++ }, ++ "headers": { ++ "access-control-allow-credentials": [ ++ "true" ++ ], ++ "access-control-allow-origin": [ ++ "*" ++ ], ++ "access-control-expose-headers": [ ++ "ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval" ++ ], ++ "content-length": [ ++ "0" ++ ], ++ "content-security-policy": [ ++ "default-src 'none'" ++ ], ++ "content-type": [ ++ "text/html;charset=utf-8" ++ ], ++ "date": [ ++ "Thu, 12 Mar 2015 13:22:33 GMT" ++ ], ++ "location": [ ++ "https://s3.amazonaws.com/github-cloud/releases/3710711/365425c2-4e46-11e3-86fb-bb0d50a886e7.whl?response-content-disposition=attachment%3B%20filename%3Dgithub3.py-0.7.1-py2.py3-none-any.whl&response-content-type=application/octet-stream&AWSAccessKeyId=AKIAISTNZFOVBIJMK3TQ&Expires=1426166613&Signature=78anFgNgXLm3TIbo%2FbTEEk7m%2F34%3D" ++ ], ++ "server": [ ++ "GitHub.com" ++ ], ++ "status": [ ++ "302 Found" ++ ], ++ "strict-transport-security": [ ++ "max-age=31536000; includeSubdomains; preload" ++ ], ++ "vary": [ ++ "Accept-Encoding" ++ ], ++ "x-content-type-options": [ ++ "nosniff" ++ ], ++ "x-frame-options": [ ++ "deny" ++ ], ++ "x-github-request-id": [ ++ "48A0C951:54E7:48B5311:55019319" ++ ], ++ "x-ratelimit-limit": [ ++ "60" ++ ], ++ "x-ratelimit-remaining": [ ++ "58" ++ ], ++ "x-ratelimit-reset": [ ++ "1426170017" ++ ], ++ "x-served-by": [ ++ "8dd185e423974a7e13abbbe6e060031e" ++ ], ++ "x-xss-protection": [ ++ "1; mode=block" ++ ] ++ }, ++ "status": { ++ "code": 302, ++ "message": "Found" ++ }, ++ "url": "https://api.github.com/repos/sigmavirus24/github3.py/releases/assets/37944" ++ } ++ }, ++ { ++ "recorded_at": "2015-03-12T13:22:34", ++ "request": { ++ "body": { ++ "base64_string": "", ++ "encoding": "utf-8" ++ }, ++ "headers": { ++ "Accept": [ ++ "application/octet-stream" ++ ], ++ "Accept-Encoding": [ ++ "gzip, deflate" ++ ], ++ "Connection": [ ++ "keep-alive" ++ ], ++ "User-Agent": [ ++ "python-requests/2.5.3 CPython/2.7.9 Darwin/14.1.0" ++ ] ++ }, ++ "method": "GET", ++ "uri": "https://s3.amazonaws.com/github-cloud/releases/3710711/365425c2-4e46-11e3-86fb-bb0d50a886e7.whl?response-content-disposition=attachment%3B%20filename%3Dgithub3.py-0.7.1-py2.py3-none-any.whl&response-content-type=application/octet-stream&AWSAccessKeyId=AKIAISTNZFOVBIJMK3TQ&Expires=1426166613&Signature=78anFgNgXLm3TIbo%2FbTEEk7m%2F34%3D" ++ }, ++ "response": { ++ "body": { ++ "base64_string": "UEsDBBQAAAAIADSXPkONiblWuBEAAIKCAAAUAAAAdGVzdHMvdGVzdF9naXRodWIucHntHf1v27j19/wVQu8H2Zkr22kPK4JLcbdDbyu23R1yLXBYEBiyRctqZEkTpaRpkP99fCQlkRQlUbLsbtgZyIct8n2/x0fykQ72SZxmFn7EZ8EW/jj3KMVBHK2CaBtb31mTVzNrMb08s8grYI3zKMgyhLMLy8XlmzMUYqRtdsbf+0G2y9evzrZpvLf28eauaJi42WY3s/5JPmIPoRd28iwIcdFm8hcXox/Jz8wKY9ebnp2dbUIXY+sDafvXIPtbvi6bcGo9tKWQCCdBNsEo3PIH8PKtq4Igh3e3t3Fszyx77ab2tGxIcCCCP0VJOvGnDoo8/ED6Tewb0vz2LWnZBjOL71B0RSEbgHxaXH5+fms72zjdu9kk8MjjKUdQcrOJowx9zlZ7N3J9lKqMASSViikoyt9VjSi1O2e1Qp+DbLUidIPwJ1OpASczwEGEMzfaoIlPtCSDFrmv4Dms62rjhiHyJioHbp7t4jT44mbEzlT64a2TIpzEEUYTW2oryJA281E2sXdZluDL+dxNAocR52zi/VzqiOfLhdqZ0XjtBhjhiczVuzSN0xnH4UiQZtZyUdMkp/nfOeHOYUwTsVk/ucQlzmSsYewHkSBol8heh2eiQSNowq0UAd2w84PYWeEUfG3FYIAsGvWBeuliZl0slgKmTZwgTLi5sem/S3Al+t+FfasIoeIVTX6OI+LT7DeDoVAfxaohNciNUJgTHgFvQrh9iFPPrsMcLst2ZX9Ic1XXRSMiQUT8lXlYb3PQieiq4EoJDTsEmu7hXlSLiz5ulSRhsOFOtXXv0Crw5jTK4bkthQ/6st3NBmG8oi1UDySRbEv4fZK6Ed2l7h7bl9aTvQkDFJH47ZF3jP3iI4w2Kcr4x88zGQIIgDwiAZ3RBxZB/+W9plX75zOten1HJ0rANa0c28BKOTBQf8lLM1k9SGmVa5e/E2xuhlZ+gGvDomIe0KRwdGmYK0gTINkewps0SHhwsLdBiHCdKXE4qRwPIGASfXHW399UvgKM865QRtvUONO6ZFBjlyEQvZJaRo1TIBOeDBsumvCWQY7kDzRf0cj4MMw0haBJmROvP6FNpgyPHDcOsjh9tGlyAe/l9AI+IaiyPI1W926YIyE5or2d6xLGpBY4IMebMA6nxUAsZyfG4vkQZCES07S6IQaVIVIg2HkPfw43xTv02GGIpIXeDI3TkwqVbI3fiNK6q0kLSGtszvm9O8yOtO6kp8T+2d2DP9p/J/Jo1dVdpSvQNHZIj8MVBcbSoSluT3LSo+MwrXFIodvXgs+0MJjOGv3kAD49FCITg2QmcbF43RUWm4MEzxbKWAEmToME+UeOEeSDphBR6nbCQgEFoo8E8mgpMEpS6FIaHWglIzcBqph6b31s4zCMH4x1ITVI8ub8DOQ2Z8CDyJ/jwN+790Ga44vXTemX7bmZW6RSQ6MQQwkpv4yxI92VpMxl0pBmadsq6GrqNsqH+iRCfXJlmtSwmWeLv3OGKBHEuNpzIkN+ssCP4hStMrRPQhKBOrgrmvWZX5dI5kVvPP/1keSokchu8awKiRri7Ho/LqaiiUNklWZ8leTcSR5vNrF32zfvraPGhoLBB0rG0ALq5BFzCPsbQIBXZQgYFmLa+FNCDPXpmqcbBw6RVhI+9NDa44bErkH06ExcWsCXBPZVCFhwSmaHx1EHh87esLT5AIVwaEQdUjLdpJVmuRVMC4nm2KopUCikDhsJAF6+hmns+niqYggStoQyksJKok111izPiv9jaq3CotLbU2F95vp9Bm+ae0v507xQQvKoXepiU8f5UhPsS8bVhQOWTErZp3liPfIkXJxzN8619ZPs5WHTayNVm82l+3oj6aOmaP28j867R94TkIwG+H65rNvJEAesJx18StM6qTbzxAylK4KeTna78ipuNrTTFYTpvo4JFhvU0zKY0jh54kFWydaRr56eBdVCX2LLEfqcFQJQ6J62Ts1JE5PZeZvAvrI0yISJcEJme8sFvJ6nPWRDu16xjqPIifWkzZ3As95yoswF2U1zQt4lrk/JnprIp+jARPR8bHOo+w91wA7/4eF3kMVQ+GM6DiO4h0GwEPOR/B5H04yA02m6L/2KjqWN6Z5broM0LmM0UD1bER6ajtaZHHVwJJC1hiCLtdUcoe2YG+iUALR3g7BLn6zRIa475yBOoUWGakztUYg69XHp1dVGH9wwwdm31tWVZfupu92SBDkO92RKHt9/78NDkJA9RG/3KMo69QaNhqqNYeivMdpPKyxGcquN0zaVkbMuzjv4M8S62QrICUYmecpVoj2JvZfYBDDm0zHKOi+1gv/Vciv4rH27A4YUPg1jwORpWK6zhUoxylp4VzFX3j6gCZ0a/L22r9I1hpdt1KgAr/t25jrZue9mp8/KpmxyIwtD51qdS7XHcS2C9oSuRbANHE3+N9yQrhCP7obH8iug9tR+JdtbP0ehG2JmG3VjOQlF2d9BfJ3QGfmN5tG7PspolUE1CW3uzChrpWVnQEvnXmjv1V0gLoqzYFuUHHZoX2w71AokfCeJjRJGFZRUWNiq2myXItfT6VcWYaueGZBK2VJX5wN92tMEtZNvwhGZd4NqhIl3B+FUkWMgJ/9kwSYgwwmEo75kSL2vehAl23Wc+mz7osuoi/2LQdZMsOBi4yJ5nDOEfVd/Bth0xR0Zkkv8ndtRgc58BUmJoNrM+KAtB3gxMdDymG0QEiqImdikaeBHiFbuEkQZLB3ZmzDG7KPQXaMQKpftde7bclEye9k4TjPaiRaG0V5ekJJ0BgIWxbBp6MiXbe2LxfLi5eLblxeLDxevLpeLy4s//8t+7tQn+1Px/8lc0DPr/Jx3bxP5p1F2eSgdx3eLk/kBQ2S4CytIs6YbLpPp9A/Lbrdsc1lWZj2e6UIOeQL7pRn1yYxYYGoESxZF9Ic5j2DOokCPYdOw+3ECmx5acWEbrdadompCZxCGLyadetlFTdmiMuS5ZJVoOSw9OmZ+RAVdDyW/ZXHynpDJdlFksbayItQaaW0Q6jSMjlIMD6eA4iTzPUA0QhylIpmOVboBE4UOAZMmhy2tUCbplKS9IFaXmOKy9FLgGD53fkl9N+q1cWduE5zWQ1VF6R+B8HpcPmalTVmbeIocg+IZwSuKMp4x6nSM0amLeqMVCWmXL7LHhGYYsIai5iVwCNMWVdFEMetc9r1iPQetZND84xTGqGQHxqZ5oMQE/moj7kFibCX6BaSgLy6tFzwFffE8jrR6Z5Z6zoG6q5K2aWvuM2aJFIWxAuwHGpupzNsj0rAgahxYvpaUjU4rHD64cDSDhpcBY0PB1THlCK8hm5X1rcqDNyqHRIm6RnrKtjYUdsyJuqXdJXHFcsXjFUe3XxHZwLnDEDuWePzDmhutWbNoAC+7SW+D5P8VLZ7Zjs7IfW5X9Stx9AUYvrMiaTpc/OWwCssrS9tXj4Vfc/WTe4d+gULKD8q1JLxoU8W0Q64Hmqda/aHhpidOZUGVTXFZCipG1zfWx+ghhVvHIiqfmRXFmYWijKRn4aOF8xRZu/jBymJ2/1i2C7As0L2b3nnxQ+etVOlmF9zXzssSTTabZwG64Ri2FxDHkiwAjmVfPdWMyYbbvyBx/YldV7aPPZrb+ts9vOXXg8Enkitstr7sDdVSZON5pVIaUscCMUfYjGUqHttdF0Jb0ePmPRNkI8nOU/dBJ90bdsL9lkiZ0q7acMkm54yA0Y0G3RNFFR47OgdGq+Cs3xZUWSDK3A7rgyZ9Djop7eFt5YwUX9voAw1m1Dx7JpLxJos3blea3uBKrXvaDHBjJCsQH25/FS/CUo3BKtngDXqhJ3lQaUnCb+ua1xVH+oy34JSQIS9fE1DrfG1yp1jtzoo2ByZ/BU7WsfcI98iR5uQ5DW+zcsheI90yO2uaxUmwgbYFGgHFNo7nazfltdjzJMe7ZkDgmmt3cyfCColJhTvCxRxYsae32ij+NPgCDVHAcKlT8dPvAK+kJgFIr1vL2kDyOzILqaDP7j4JEa29hzu/4rgnLq8Y+m4mdzevL29n1v3U2sapdUf+s4KIWsOtEbvn51792PdqZt09uMT4C18SK01X8KDGNxstADfrqT5n9nnFnxaDi/FY4d3Y/MI3OiDx/yXrd9wkQZE3YdbIW8zKtvUyjCZx9BHD6aQgBBV6To9S0hFUoGmfsKrZTNTtIAobjIABz5dvBCxJWlwNNGAydLLT2Ylw4ZQk0bbtwZm1fNO6FpgI91BR0Ti/kt/XDLQalLoUXcnCZEZescdP/XHmBCgt1+7RPuph6ZYINMSUxH3WbmJbt2lbVDDq+VKMIP8x28YPke9uHlnbPk7H+s2fFs/zpyX5uSA/r8jP62et8z19+1zedVzs5dMoB5SqUwtttYUETrJuodqDuwOurcqLCzRPwr2jz8JKOyOrUqssxnYPK2nooLzkoKK0de+e4r5Z3Fa2wQTv/IP+0d9dSG+bLrtKqbH9HetovdcpvM/ehShFm2IoTthefH2hkrR0mM+YbG1xl9HdYdLmMYqrlO6g8RaGobh0Q/EUufCjUT/VLQCibvjVuqEb+Xn1iXI1QF1dfF+oRzBrMVqIa3qbLTrqTfZaFrgwBkAfuGomSYN74J1OxMsH/FNjUzcVAd8Yg5UE+R758RDEqYfSARiarUHQvJ2wu9hY4VxlI0v1qggzWitwyx7XOrTYLS/LA9pwjUhqyN1xYQRLL9TM6DiGlkX4ZrFufLugEMtqx68obM4akNEQo01uzeAxmm0uHDlGF0vnDcnMkFSEslgTF2NcvXaz6KM5bwjtm+OwfLpPjMNFR30c/qgRaovNmfMyOKD2QTGa6xgmQCY0GSYrBmTwmPkpDqAkui8dTPy887FEJUWavhRK0cGEHjV40MslzIIHu4fiVNGDYZu1XnkxlSNEzeIZc60QOsKFUagwlLf4RQiKwPkmIZkKer8Lr2rh63flVVOD8kUL5wCxc7uTWeGN8GUT9JYR6EuiXc/e1coeh7C81YiAllWRsBDVVr1yl25SuXeIRlTrB59eHaLjUwCSu51c8q3WGxvAvqRgGZW5W9vTVaBrV1l6w68EQKLioB2ErluviztQu1dqpBX7Ua6/Btx8/bv8Bqk+6/ZUKMb3bfL2ZutKZo5Z7K4cRzPSlae6paCvorOC54MUVwquj/bKTiOqMI9M7pTXa5Ddb29647O+qqYpBR1ne6zgrthk6qWkUjRG2ilbt3LUrY6hgc5EGUWsM1CFgTsdoJVDAx8XUw/n4T1G9ZyDwp+Rvroi4Im1NkboE8XWT39HCX90VkHzFq0Sa7ywzdCJ/d6NrB/JFIJMH6gg+Jb292V6TD57eHhw1gRC8Z78SdzoUbMwY4cxLJXAHjQINZBC1TiVlM1QqjpKAEEFwoEk3mWN1AEVmfovYKHAEk+FVbsSS2MLgtLOQSN1wLwDJZZt3jU2ISQ0tIBHrBXfAFzR1QuOUjGkJgtSbuI66DSG0RdCUEqUQeiwW1SNKO1/3k2k9wAKKxVk2zdGeija9VeGG6JPbuSlsR/v0RdRHXk1g2YKaG6apY+1Hf10klfEoM8blGTWxyjYxB56F9HfEIvlbhTdlk7Tr5GfsimVtXFzf5c51m8IWb9eW998e+FY8DVZ2NrnOLPWyCL8v3zTUONs2Rai+Mqq3VK8X9DA+tY2sX5Bui9w4YIEjIdV49W+7fddlKE0Sclgp/veXzKF/ZjUmMwTok8dCBbXpg7rpnJd+1pfAbdaayYURF2+WbxZzGvSd719EMEsuPMus07LbsJJVDO/fzVHJZlzim7u0hqagVmDQHdReSFDMr+pqjGCiLKhR+umgypPqRuqq0vCUjYfxOSFbMazVem2prlxayA7lDduTaRmyt1Fx9eqmKx9q8zIJYJlu/+qmjjK6P91ZWAtwv9GwkCOB0d31r1nZOc4lXbEJUEhhWFj2kgc/OxhAYgeDSgCD0P9VgVFcA8cJkrS/2TZMFh/wrpzNZogTDAOi7tMMOOQW0jZlGqOexjhxPLg5AXGrt+1BGBKPoB8yUEaMyHRMYwV3nssLRTgjFko8ZuS/x9QSwMEFAAAAAgA2pkyQ09Xx/3OAgAAzwsAABsAAAB0ZXN0cy90ZXN0X25vdGlmaWNhdGlvbnMucHm1Vctu2zAQvOsrWF8ooQ4V2YmRGE0PLdBjLvWpQSDQEh0z0avk6hAE+feSkiyRtOzGqCskgCXuzO7MkkueV6UA9MRhW6/nHm9fUwoMeM68jShzBEyCJDXwTKIu4BuV7Lv6n6KspKnneUlGpUQrFbnaCkZTfxcRLD2knpRtUBzzgkMc+5JlmynKGWzL9J7m7A6LutBY3EXrR9YVE/7AOEUaFpCeZcAHA0iFEGji0d1OFSlK4BueUOBlIUlXoC7cx+YSDhwiWnHF4k+2AJVchqF6Jy0nSco8tGjDNqsMF9Hidr6IJoHXC9cGxux3TTMOr416Qyf8W6HKdqYaYgm/QzDQE66tiI4BPmmAXa1qJ8R6MabgVvwsy0JRGgwEylh/9QNlTPXqB1bsAzbZ8KPC4tllNL+IZhfzaDWbL69v1d8v/HFPNO2eB1zyQgItEuYDMVNO+w1Ndj/c7ghWCVdnR9svdWIDbTD+0laCHt4u3x+/YrIpRa6s6sHObiSyXj+zBMgTAx8Dh4zpLtpFpCxjwGIVKhPBK63YramhFExWygzmYzxFs8srZ9u2NH6/hT8jHJqcuMs7vhvIWBVOhrxMXuIWqrviu0K4jOuiadS4pWa6IbYx1lxqvzvcORUvH3Hl2qm5opBse1OcxaQsNmrPvb0fdaZJfaIVksEpDXX6ZCuo4WhTRxVhteMpXqofXfSapep1JWo1vDF/KkrRfPhBM8ne9/Ubh8razq6slrBhCaYHDu9PA3CqjeexUJ++U87FIfXW2TiPXOMKNYHnvEhN3o9fp6bYg3PZKtkagu31Zft8jnv2+mZxFd3chBMr2+6ZmAn37uIj097o+DD4TTLVbglifHSfYVofmM1mBTvI6UO5O+7HprKVyIAMw9mOaJf3Ux09sPVaTSE0ytcj1zrpXokdcgw64PZH8Jmm7n+asSNaVMnmRFXbEt2XBftbx/8AUEsDBBQAAAAIANqZMkP5xhXWngIAAG4IAAAUAAAAdGVzdHMvdGVzdF9tb2RlbHMucHmtVFFvmzAQfudXWLyYaBSxtttDtfShVbVN2lop6p6iCDnhoO4wzmyjtYvy32tjIOBAN1WLFAnsu+++77vjKNtyoVBO1UO1PvOofRXwqwKppJcJzpAyj1GlaCFRE3BFJFzrf4ju9aV9WjRJV8864etdiKhMts9nnudtCiJlHfmZqi/V+m79CBsVtKmzCw/pXwpZXSoxRZNHyctAQpE1t+bH0bxlGjGeQiGjPmB0SNztZ12Wrg2aMpW0lIqUGwh4+BrMbITxNRcQtKJ7fCWoH1uXpqy2IIJhcojqoMgmHMiZ0yif0lWXNVqGBgnYCreowbBgrvA6Op+h+RzhT02Zk41GRkSh+GkXXzztL3GUccGICmiqY92CY80QumA7J9EC5JaXEnrKRPQAJAUhl/gbkerkO09pRiHFK52IM87xWOjNPcltxJqIfoQgv/WpM2MB3u1xBOVGmxbMEM2amUPaQkDmss9Hd19VMjHBGuo0jr3u0gjsDIysXhGamKM5MncjklxNg+hWVStr6O6a8wLIGwweCvrw/vR/+DUcTStjQagEGbQzaofzRgguws6zRkWIrG8hOo/PjwaXKCgoo2aEGaElLfOjj8fAiVYt7jKw+82ACuxDTSqpRIHeoTo+aRPcZjRUR1iY1nyMhxUY3/xMbCbVZIKxvVB7MLbIkkTjqiSpOYaIgXrg6S1hMMeiKk0CfmVj9KydRR3UAcTx4m+TYoOccTmPD3oZSElyc4p3fvPiXyCf+SHywZCR+nXpg7/aYxd2fNIalMlha+4dknWtqW1ozbZV/2Ul9vffAb1ZhD1ItGSrS/ejlGoKr73pw2kzEXMhGolTMB1E1Nk/H5zK3AEkjPx5yyKebvxU9w7Z8Ho3xNF+hL4cvLzlbatX2HsBUEsDBBQAAAAIAG2jI0OJaPDq+QAAAPoBAAARAAAAdGVzdHMvZml4dHVyZXMucHldUMFqwzAMvfsrdIsNwS30NugOu+3UDyiluI3MPBIryO6glP77nERJl/mkJz+9Jz3P1EEgCF1PnOHjnjF9HpRASnOV7kkp1aCH3uUvHV2HNXTU4L7iyrwpKI8x3zgC9Rh1VXRy2nwnipvH9llZT9y5PA6aadKI4JVixpj1IHwe/yc56cN+snx9W0bXaGNT5tBrM5JDRnaXFgu7OhbD0+IoMkLzwyX2BzkFiucQPcE76F0NW3FdO0tlMV7LxuL1z28u1yQJQwJdtqiXzjwmMbhbOxg+nuqPdEHlCvChoFCSTbYNKTeBV/nO+YvKcaCf6mWvCb+O0QM26hdQSwMEFAAAAAgA2pkyQ6jYMBFCBAAAMxIAABMAAAB0ZXN0cy90ZXN0X3B1bGxzLnB5tVhRb9s2EH73r+DyQhkzpKbNgC1YHrZg3fawYgi6p6IQaOlks5VFjqTSBYX/e4+kZEmUbclpZyCIJd19/O7j3fEsvpNCGbLhZluvXy0KJXZkJ7KPhPsHkpls628b0EbHteGlbp/+yjTc49+KlILli8UiK5nW5C1a/l2X5QP8W+PXqDVb3i4IfnIoSJryips0jTSUxYrswGxF/obt4I6qurIAtLG2H11LUFEAuyLWdxkfoDqQZeeJJrFEJ3LXBukuddwnaNlH1N6ny8CXSY6u0dXWGKlvkwSvYw8UZ2KXKJBCJ5pvduyRq1q/vEkOyzwlVwes/ufKEUiuf7xaLg6CaDD/SKfG3Li9x6WhHqxiI9IPWlTR0gPGmx4bu9cperCSm6eQlXyGlpgWgAnT43hHZIcY8xxBaSEEDUjkLekegQYMtVe9eNY2w2JtmDL6E9KL6M828WgY1sFtCjEAs0GSJsoRaFYKDaPtcwnkoB8Y16CjVrbfufmjXv+mlFCrTpTYoTTQB4BSbDjuUnfX8vGFGYv1B8hMdHI3VoTWMmcGVcAYSS1vBxlZy1iBqVWVPrKyBtyCt6qGgUm4cZ5jL+0aHG+XZqwsIU9FlUHqdBtVQC8BuSmhH/5a5E/I2K2QjyTOeVEcVViBlqJCUpSpbMsf7ZYPDDbQ5D0Wb/AoE1WBYX8e0KRbYDkoTW+DB+7hL1kG0uAzyqQsecYMF1XyWOVtX7BE6cBvv+i+nSwJ5xctyXdYCHTI0nbk1NvjWjoKpeE63YHaQD6hD12Rly9uzqhDvic0cVB0eYZpt95yFtHjVG76VM6tQbgmr1mp4UJVDKgUm/QOKqMnlFHwyOFTa43knPedLYcpudoV+oplmFMV/Ndvt0M249bINa+w32DhRNkq6K8Pjt29d54veb+rZUE385CkwRwVm2PLta7hpIIXnKrXP43O1U56bzBXeqdlyauP+h09KP/+mPSd6kEcc7V3bjpu/OI/7eU33QOHeH4LcHE+mbyWIb88afkwZ8danMpg7kTshML/8b27P0+XYYgFL2EqQru+M7woSIfcD7E4UZaewtm8KMKatJn+Gv2elwrFmeGCWNhROrhmOCGT79y2yb8YzYUnmvzAqj0NKY4MDE+4N6KCfdDCL5ln3CLhGVCJdkwIT4920gkEC/AuPXNsUO98RO9dcD6FUVCtGWqAB/lf7qCh+6mVW8ML09zNajNHl2ObN2N+6Y8s0xOKI0T354YRz/lZ04gCIaH66mHYw5yahtub324YDlf+X2dcu8CoxD27Ga3weIkfsuxcnjSV/Zk6ZjZH7MFBLS17sbYX2JmMe+RY7r+mA/iQpjZxlH2NEqcmv0ELmURpIqSd7BelM57NoKTi4993c0afnrudgYLGYA2U9/FTynjKUjNnrBZn/AbDhWbPy0gqP9SktSpRjfadRu99xqk3GXaF5PrVDyjeF1BLAwQUAAAACAA0lz5DaMYr1+QDAADdCwAADgAAAHRlc3RzL3V0aWxzLnB5nVZLb9s4EL7rV/BGKVDltLkURr1A23jbAgu0SN1TEAiMRNmMZVJLUjbSIP+9Q5HUO113dbApcr5vnpwRO1RCaqQeVcDs8kEJHrDCbCVHKhUTPGW8EOgdCq9idBktAwSPk64505oq/QYR1b4EtFR0VswrkfTfGl5bpVumd/X9VVBIcUAHke09sCI629ltJvzmh0fg+vLVbntqf7iB9UeiqD31ihKlZZ3pWlLlBY3QF64oV0yzI71mmQ4CptLq8Qqtpu7/5dwPgiCnBSoFyUNODtTF4wQeGGt3dtOEo7An5nkARhPYpIEVUXMgKdjD0YNjbMExRCCnKyyx43aCoqI8xMZXtTBki6fLZ5wUQh6Itlot0piYlUQp9AFcNG6GPkiJj45jtnFPa1mCgXindaWWiwWpWGJPkkwcFjhoZI2NiuofVahoWUSdc+Y12QKBy2LyienP9X0YDSWI3CoQGm9nghew/YRJWYpTKmnOJM20wku0kTV9Hko3tbGyZZGI+weQDLscU2XypZLvdhEj7M7wSKnbNnn2rFAhRGqwrnVWUyKvxYnP+usgouojSrFl8+LbxJ7hWlGJwbAK8nMSMsc9uOFMYZ9KbdwYE9mTgQNJBlGjOWKqCVYr6oLaBhh+qsde5E0uYrQ/uZxMKFNzEMxqtpAVGkpAw8A50QQjxju1ne1OhinGIc48o2ErdGuBdzHK4QpGQ4x5oMLRPkZHQ10ypafQhGl6UGE0A24y4G9fXh8qFT7tl+j4HN2+Xr56fTcL8P4ajTZIXtNAvGtzc+CxkSZoI7IBNqflFNSJNFH4TXSd2n1n89xxp2DfN2jfUzQoBuiXVKemMF+4t+avq2AQr6BybXbjpqWltqVB1nWt0sx0tjeXlzGiPFvhWhev3uJ4moQUMipXfxOIcIwuLnaU5NCMe/mVoLu9+DdebWejTHoaTYl3bz0ZMELkjJvmBctBObe2D8Pc9flWYNzs/QOh0ZSbJmPiCX0/MlOItR2jp6xx93cM+Baa/V3b7d1BNEHIRJITyN+40LhR6QHWYYhTNCrk5m6a0Tc14v9Szt2N/+DqKKbwl6DRIGuuUMZQtw3wmakf+up68Q6Y8ZseSVmbSpJducOVpdoXOwzRcdf3Iw9fr/9Zb9bYCs3Pv+eOdkv1GZyf1htP2CKbuXgG9tv7zcfPU7RQ5yj+9vX7jOb6LOiPKZILndox9mcDr2kOHY0Vtp8eaymFvCFMOc4YFTXPoJHYuXdxYdtev53YTyxrbcPUwFU4/KZpiC1bOCbrPrvGJer+nTrbJ4m3LNvVfJ8q9pOeY19dURmO+OPG7Mj2mI4uCn4BUEsDBBQAAAAIANqZMkPatWq6QAIAAFMHAAATAAAAdGVzdHMvdGVzdF9hdXRocy5weaVVy47aMBTd5yvc2dgZocC0XaGyoFVfm6qq2hVClkku4NaJXT/6FP8+dkJehqFUEwmR2OeenHvOjcxLJbVFO273bvMs2WpZIgvGmsxZLgzizT55yQy88r8JEpIVaZIkuWDGoM8eu3R2LzX/wyyXVYdM5wnyVwFbRCmvuKWUGBDbCSrB44sPrIQF1q4KFPiIDpdxCjQ5IZ6gUJ1mHVlPk/a1HpIxX4YWbU/1o8nGIkMTBLPhGk5jGsU9y83eWmXm06l/zBrKLJfldFRrpnezm6Tr14D9oupmr2+rqfn/TjpcZiX9avxK2lBmu7RXFCKl8N0xwe3vWBl7nFl+DMCPyEDwArF+N+OF5797GP4kwMdKNSh9orKp67bqYu+bZdqan14+wS+WY40RawECLJzkErg0GOVjBILxBD2dPY9yGFSGsTgS9zHV0j4xbsCQ1sm33L5zm9daSz3puz1SRfyVtDRnQkBBYm4hd7wiD7vdaosYS5l/ow02zCeJvXCqYP/0Yhx5MGYWvUZJYwe2tHueOwzV324hXNjkUoHBc7TCzgvD6277MGbNZbUN5TjweHz4OzzC86bZgbP1R+o2NFhBBv2fNfho1e1tkJGOsJesvj7B4wtSxA16w4SBq4ajkz9sS5AgctVavR5HssKsKGi75x1eYf85yUEQl1mH1TGzLsfEUcJdrqsm1HWdr4ZS/gB6MhiHc4IuUYWbc4oHqmLB3laoa3EzNWj58T0+g6FOiwYXTgJ/EMAvVioB4RTA53TeA1BLAwQUAAAACACHtdZCGY8HIS0EAABCFQAAEQAAAHRlc3RzL3Rlc3RfYXBpLnB5vZjdb9s2EMDf/VcI2IOUwVPsOXVTA30o2m7rw4YAzZ6KwKCls8RGFlWSapYM+993JK1vkZY9YAYSKb6v3/HIIxl6KBiXXkJlWu5Wsz1nB6/MqZQgpEeN8B7f3xMBRnpg0WMlKYiM0rn3B8vfkywjuwx+R+lsNosyIoQ2fHf3KagcXG1mHn5i2HsC5J9FICDbH79UH/VnqP2/Na4D/wgWkoKGSerPPVJKJgqI3laSX6n8rdxddZ0kKbqo3YVCEi6Dq1kdXgLhH9hTbiVAE1Z0LYTcYvCUcfoCfTvCE4ERAz9jCc0R0y9wAJ4Yj/H9iy8iVsDSf8DvcybBPz63Jc/CiB3U3/68dlZ9fL/Jqh6HmuBHFXOQdqMQIgBwuY2wMhBvn9BBZdNNSiOflRDWG5rIyrMpV8h2XyGSQbtopjxobxxdeUR4+nXTyTfBYJWZAerlp6F0Rh4VNMeK5hEEyby2Ms/BdGjZ4ZBPsf2YS+AFpwK6XjTW5FGF2suFA4zfpFIWm+vrJIWQ5t9JRuNr/7xxb3L5vytw2Sh+2awe+iOZUCFto7f8eTUfLhJtYVkfSja5iOiQJjnjsJVwKDIi7Qv/7hnXHdZxjGbgxMrW1/wPpKKPaucRQcNyrLAdSYQGBieBd89L6IFQLPsWFbYcCmZl6GkNh6KrMDYMPy2rRmQBKNHkNIDRcgBohbMB4Ds2AHf0o4oltJGeHXfPsow9nUq80aqawjhErTfGUXeuCUA0TyYAKa0pQKh3OZBqAO7RMRoWAi0ci256tjO0mstbKkQ5XJx1H8FDCXC1HeiJTyXjz/WG4Pw9OD60NRqs0YzbYJbe1Nc71ZmcMRq00XFi6ObkfnkiJe3DlYtSmNxetYXqBONtbQA3rNEJ3JZv9wpoFM+uQCuGdejVSZlD7FwflY4b9Kh1+UIV5S7itJCU5e71ioqi0TxB1da9iC3igLug81Tix1AHQU9/+3uagfA3eBMwbw//DKdB269l3rZUps9cteKmdRt8Lkemp3ZgW0lKOJnlQPhjPHLrqnEk/CXNZUj//EIyMbJgajcWqEo+mYtFkkVkUM4qXiW2HpKOCu6DEfYbktMXoiaFNVJbxzqR21qOKdzPsij1ceobNmD7zJ0wITp+LCVo60wuQ7PjTcQbsrVcWMgajclcAgiP0rM2bvXEBmiu+o/wrO91Q9yuZwtxR+lcaPd2VZGN3Fo69m6ySbtRH2z0dN7fR61YxtqNZT24u7DgQGhmxdJSB5axdmNpnclYKglbt9Aya5dQ0jO6A8fJmtEDVcsQCfORE/sP3n2Kva3g5m7iEY9DwkEI7EMezT2Zgvfu7lNL/zOAd7uMbheL9avbeHez2t+ub5Zvdm+ixev1zT5argmJV/F6sVi8Hq7UIREWofe/xmCkB4xk0s/2Baw9WImsnR6F/S7/L1BLAwQUAAAACADamTJDtCBoQp0CAACaCgAAFQAAAHRlc3RzL3Rlc3Rfc3RydWN0cy5wec2WTU/cMBCG7/kVFpckUjAL3BDbQ3toObSHFk5VFXnDJDFN4sjjlFaI/95xnOxi71JKKbSR9sP2zOuZZyZOZNsrbRj+wEiW9od/A41SdbnsSsVOWXKcsUV6EjG6pDMeOmkMoDliAteDCBqEnWbRNK6kqYfVcVRq1c4DjkYPhcHZ560074bVmQEtjNLO1GogH4xs1mavBcIb+jiDVhVf55VemKKOoqhoBCI7J1dfMpldp5QugbIGc9EnCE05TdoLhx50si2QsdGQO6d0Y0+zXPQyH3TDliyujenx5OCAprhLlheqPRiQ8Ma+Vze05HG48GclzQWxz9aZt1u2hjmK8wv6ztZa912jQpVGawoWc16DuCSNEMZ9sUjKaejMFI/kYzTzSoPT/+qX0YAR1TLeK5VaCb1S1YB78QYrVRGorJJPkfEKTBKflfsfVAf7722145QtCbivEOSloddhUpP0eolLJ3TqZ8o+3yxuM+Yq9+VVzEulW2ESL6e5MiHPDr6bLZqjsQbsVYeQxFY4zlguacPluR4gaCqb8d16B8uF6koqz03cCy1ajE+YRZNRBzpiNHFze+v7XL1MbwWk3dbcMklS3qhKdhb4OJ4K4Gb9YO3tnTsJOpcwCRkXtgly20aPJp090H1/kf9WR6Ps0IiugOQugF3Ad4OU3Ma+q/X/gJ4N+QF4BO5osXheNk5qDPajkAiYfDKqdz1K0Wdjr8wnTBo9LlPojNSQX9eygbxRavvI/xf35ZP64mXAjWc8HaGiqAHzxX+BzfPZ8Xg6/I1zzH8GPvXefNYSaCiJcB2iv6Z43CsPV6srKEwSvqzE+ViIPKenJL2tyY3vhh6f1VNvUfLZd0qLzoqmgcvkTvDOjpzB5DaHQCLQ97vhgT1+AlBLAwQUAAAACACHtdZCAAAAAAIAAAAAAAAAEQAAAHRlc3RzL19faW5pdF9fLnB5AwBQSwMEFAAAAAgA2pkyQ0yVvcy8AQAA3gQAACwAAAB0ZXN0cy90ZXN0X2lzc3VlX2F1dGhvcml6ZV9vcHRpb25hbF9zY29wZS5wed1STW/UMBC9+1eMtock0sbZdiUQlXqAHuAEB3pDKHKT2cQi8aSeSVfLr8f5ol2Cqh44YSmRZb95894b27YjL1BZqfv7vTp4akGQhXUvtmGw0/0Hw3gbPqU2m42qRbrrLJuLupP2aEqpsaSCNfkqQ5ft9Fu9myG6lra5mOF6Pvto5VN/r9icGLigDhmMR/D40FuPJQhBEXgFwTgwvdTk7U8jlpxWi4ISH7EJpX4hLajNHvcZDfjsYqpPTerwmJ5RQGwExLYIdFBHb8W6ClK42l3u0927dPcmgdKyqTwij5aVKhrDDHchmy/dQGGar4PqeIkmuVYQVomHMcB86Yf5MWjLR4sxY3OYgcMKzHBL3akzLMHymP7QYcoGxsYLdigNQXNHjjGOzuxE20F68oSd8ryBb9G4vQyAaXcVff+DstK/lcafyeEWpv/EkZyDHUlemKbBMk6eeEzotOKKekY/9A3m+Ei+jNac4QbD67JsHYtxBcZmu7zFkYr1++c+V5VzKA99CE1PwgIb3PkeV8lNoJAgSt5S8eO5gxHSUGVdnLxsax3RzeLqpflTL39/Aq8Z62sG9i8H9Z8MKFG/AFBLAwQUAAAACADamTJD4pIpIFocAACbuAAAEwAAAHRlc3RzL3Rlc3RfcmVwb3MucHntXemX2zaS/+6/gnE+UJ3I1H10v3R2xh7n2E0y+xJnPkyvnwKSkMRYIjUk1R2nX//vi8JBgiBIghTtZI9O3K0DKFT9qlAoHAUGx1MUp1aUPAvYq+Q9ebmFP849jpMgCjdBuI2sL6zBbGiNr26eWeSHFz6HQZriJJ1aKMnePMOHBGuLiTZ2Qbo/u7Nn2zg6ijeibIxPhBn6jY9SnAZHLL4S79m3QDBxzmlwSESBwUuU4Ffk39A6RMi/YgWPkfdOlDih1NsP6Ueb6ITDZ8+eeQeUJNYbQu1HaDpIo/h9RoiL6+OttSE4BOlmM0jwYUtI4HQf+T+gI76143MI9W1eGn6S8wnHgyLVoQVVr5yMUk7jKq9IijgAgnXLsHAktkCqgQ0f21dXzzLWEpz+fKJ8GXLAKhg2mn3ppNHm1yQKB1eMjrNTKKBTQAjY+zQ9JTejEXnrMO06XnQcUcKjJNgd0X0Qn5PpfMR175zej+xcHNDsBvn+xosOB+RGMSJ8lMRjXCWnKEzwwLaH1nQ8V/g5ndNBxtjnli3TK3JiKzW9KNwSUR5tYnPIvrF+iEL89EyRNklwnP6IggQnAyHJ10H6zdl9HcdRPMxhdVRphpa9jYgSFZKHaBeEkl5YEzV0BsDYlRUk1leI9LoWFe068Wn/YDSIA0gGV6pyYm8f3GNVJ3uMfOIzKHAEwRSH6Qs/SKglEToER3sbHHAInQbEf6rSJqdPlToeWp99xikrbO5wUb8pil10OIyOKElxrNOpcz6BFxk82kkaY3QkLL2Jz/hJUkQZOi6sArVagXQa4l32TpCAjAOmXxPNcPKCe7ukfi3lrBD59hwegvCd+kWdJiXM/3UmGiV/03Mcbu7R4YydGD0QF4HfDcYlF6EpveGqhr/J+Yh9on8ziODNhjgVeNcNK9KPikTaNakDUSnxR8ClNe7fgxM17hiFfnSM8bYsrAYoXosARWqQkUpTuWRAf4TIMPJko7LkAR+IX2Wj9sB+HD858LXtbKP4iNLBZgOuZLMh41E0tDzSoVN8C/1Z8kkZEUpY8iz2g/s5MToSuGz9YnFJGL3NbX0JpIgPBBuPfIn9TRR6eAMtlhvL6mwBgWggf+A8xEGKK2m5gtiGjkiqQ3YPkdswQkIR2TvsEYzVMw+768UST7eTOb5eLq+32F/O1nO8WHvXaLK4HqPpbDLf2vXGSYa/ETSQjGzyltCWAILPSVM5ooxZKKPYb5AEYZIiIvQAygxFbAhRhPOSfFKqQejFtCyJaYh+0oQB/8VLRViTQc0lnYOYWQOKtJBKWoWDlcJJPhLlaBShYG3apRFLg8iQh2asjvOS/jF39wXErqxbovwv8ijPYuSsO8bJ2y/VeIxEcMcgbUCHFSpb2Wrpe97Sc+fu9Xo5Hs/mLl5P3BUxMuR70/USTSYLhK5XDVbGyOtsrAxXjrHgnFQQELKPaJD7ir5saSqsPv1D3JoRKKKwBA7/ZBOAN5jM1uP1bNoMAKmRjIgrzLxgTuaqFSIZ+xKBYckR5j85dKRwhh153R68E4oxBzFpRo+UDsi0Q0LOJVMzsCu0nkzwBE1X4+1ygbHnLherxQJ7aLb21+u15+Kt546RZFcQSPZrkSAL6MNxnMdJrhWXTkOhuRZaKeAiUTBSC4fJeZW9bK0YOko3a4QVk8czHtUDsmRueT6RGV0jcowK7cyivjFSnNGsnglArA6Bh71oHShLU825PNUsBV9l9iC0helDJc0M06G1IWFAzKKYAr5JYeAot1GDHK0+tPzAS1WxTG1iQ2LGP9IuCnWy2Tmxc3RMyCTu0YaY9obNqp+eOpoRD5JpFPzBLCqHlsarxqEbzIUn8uBBGwVk//H1P373X70M3K+vg/8Kc3xx6EV+EO6gDDiT5VzCnod/4+3UW84XM+ItZ9PtauzPVsiduvMVdq8xWkyJR0R45SlKI+JXxH9NCynZwgB5zV+R6FhwSj4UL58uWW6RoB3mzQjSrVddZE1BNx5abC0AYijbrFqZCahNtNDJZjoFHooBuZH/nmhmYH9HKFphsNunFh96LDIMWSG+x7GFrF0U+VbgY+RY30L/QB6JF8kUDll2qYvYLomqrF9+Jvz/YkXur9gDYqFv/fL3eIfC4HcEYuVfEflJS8g6RKmOWrSlHEWhhdI0DtwzwQC4gKkl4SDdRyQMKJWwgjCNtORCbP0CK7t/9bzoHKa/WGztl5Q+oneY0CN6IUwFx9MBx45VjmP9+WSxXI6vx5PJHK0WU+zO0Hrlu952Ol/NsDsn/WU73s6auosIZEnYMBIxXRY5QKDa2ItAe+QF/CH9h8zeMXk36aPTcH6GnHYxzm7VX4SVyl1GDISmdTMmhhYIeTuuJKF38RXUPk6gmzduOnNS+iiom+r9iJME7UDH9vfveTe1xIdlWWx0Jp0jBkvRymnDaAfEvkWh9SqKfZR4kYYOLYuPKDjwsfUv+DcEvQPQqSoPC6xQfDoer1+MVy/G128my5vJ7GY2/nwyvRmPNRWfNDIwKWFaTMTQFYBoGTrOjXWn52TlT9zZBK/mGM9mS3+y8Fx/OlnNJ663XqPFbIX98XKGxmVf8VbTXBpjKtcaOrm39BfL9fXKHc/X3mpFPMF8vF5t14v5dr6cLpaT2VQnZn23hj9PDa4DRlruPkpLdR17e5DCEjs0fklPD+SO3tDdm/oqocUZKq4BdZusM7rEu75r6IR0Yw264NRoO6heUdBeLyoCQoaKqcOVyp+tgOQrPy3nQQDFHcPhLYUkkkZ26B5cKBLoP7VmT6rcmVNV7/soatI7FFFdr16pULIyxi1092yoLjsS4Xy/IcToa63zC7fBrtqBwxzlBsL6uOy8np7p3/UQHID8hR7e0WFQpTAyj7IsT+YRAiXBsGwbXBSq0nbLdWmlMBJL8XI/2Bdn4hLNzz4r9ZG6ProXNg6VHTCHbiYeJMm5tBmr2Dgtoxp5GqQHOjknU9gkjc9eam3A0rNg2iKRdXSOreghbIppaQMG8z/aJnlF//YRsNKGh4xeV3tkCHYes1h1xkE+YjFEnG/hj7mX5fMy+yuYktAwP/vq05J1if1sKHcLv1oNCRLbLNy/mHnyabALMSF3DIDoAbn4kNDlH/m4wdCaDK072z3vbDr73wN/dJL61kDYR1s0Q8wob9GGJpM0olMh2nxOy6r8sRmLpAp78XQZgsMKCC5CVu3v7/D7ht5OSpgNaKSgQZ8FcsRDJ8n+RZwgizhs4jTdaHdOKiYBEr6ivzODBkp9dHpCB4JWjbvt5gAA0rrAtTwctLASIK7jNbeJM6GROP+BO8Y41MYaTIKWMTMK3iUazUIEMjCAD+nxKjrntLfjMfm/Fz1TVnrVNMPqg+maka/XNvcAtKjzHfzupvbM4TWoPneMRurPircYzUsL710VnjXeq9JzpD6AynPifOtAVXRWwPlevOqm8NP50NTNoYiZmqFkGw1T/83eDdmGAnzKTy40DgOwj0nthAhyjjE/bdGLyYAgvVoLhbl5MeMio6Ft1LsJqiDnP8nvH9mpqu5Gs4GT0EbzhN7th008biDi+7MZjYRK7/YjIz4eZmOk6WSzpSXJrWmNqgbpns2teaMYtmqNLAzWOklhAyPju79QeARGk528IpAne0RtiLgveNmH8ZB2FJV2tBQAC+iMgMgFi6ZAp6ved/Qk1BbHmJDupnPCVnpuOjfCCplpnpXFyUhordECoAb1LcnZ83CS9KJnxsYwN55hTr+ryjlWtQOLboGJ19OzUmMqYo2J1Xd+on/0BymTK+tLeUe7jQmkaNegf1LCvNuTwrJcYiOsuMQKFInGx84M0JD2yGiokm2PWTbbb5a9wFCh9P5EK2bbcEB7h/U7aBW7Z/nO1w9RaiHr5zevaMqSbnk321PbxWi7RSmZOh2DcBfd/2UH39DttcpV3AJ6uj0k8uHp/eDqqQDfHaCwoYLCwj37iL1VygE+eRGOnVSIzG/k2kOlYA9bHgR8OfQq/27qfPmxcYexNVA3E2C+mvlOWzkwXtV3wcgr2GoIZfIffZeHH0Jd1/GhUbE9p2FS6usUNtmtv0E7bR3a20lp5dQ0Kd4if6Q1xnDW3ouLSGul5a4CTtrJ7o79awb6AGdZHjD8Vs7RwY8XVx/Yp/EDuJ4R5yAffvROL8ZN8TTdNTZ3e6S0zu+Jzee7R5qfIjKpJtTvRT71OpPxeLVY1AKU+TnGVV1JHjWtFu5svppNr/Fs661XyFut19cLD01cvFj7xHeR96spmthPui1ziPc3Yt9cTffS735f7jtijC/dz6Z6bbenRKs07WVdFOfTFrTb4m/INy0DN+LEcdpku9qkSqkmWO7dzYvJ24ro7BJtsmZaK5Bz1wkNg3V1E0TEsvpoWhW1Xo4LW/+edoSHCvpiqsm4azRQLSn1uEQj3NFDSFOZ68EWxZqybUQ5hngNx6JZLnoPXTMjOc3OK4iPnL/xFy3BwX7jYTGWAK4MJzRHzqRX6tfvL5ouAc9kJPqqS0ozlbcijbmFOVIyXTJg5fky+YsTLw5O9DDLW3ZwOq454ktbrd31N9J5kFyc614+Ry/nusP+Um3fUDm4XCEqRZvz0AqYXWCYeZYXbPIW0gG6kRLeaeWQWOhzGVgim0eZPZx2Mz3u1IASPehU9KetvQI7LNR+kKIi9OejKbncP3c9a0PsWWzt99E/Ba1kRPFo6pxZ0710zIyaLRpvCYXpeaMGENj+WMOwzVrrzx4YvWk/JzLMjmI0wJBFi937Wsd4UAoEe0CWxYKXn2owP87QACw7yDCicU6dieVnAvqCglFkEVafO/+QHJh136YVdzri6jMK631S5XJ7lnCnXIhzJt+G+LdU7mZFTq/qcDurNgMZRF2QEYn3Zln8LaARhFsj41Ygk3FaC8wlSf9FZESakcHUQsoYM8Yny2Jqi49XgU/Gby0+3rC3bJ1Cq5soNIs7L8FLikBHHww/SZI8zvzYkBql+bONl7YINgP2+GQIV9DK2jrcH1HHpLpNzW82go9GMDk3FUAmMLLVRMI6xgIiItv1obfsDabjyWxoLelZ3TH7P6d2DtPgoC091ZSuFhoaZclik9mL8fLFePJmPL6h/xss9duUjUL9aV6/BWqUj1v6e8hku6W/O+CnFaWEm5bh/zN4qR4iZOkGUdx3RCOTbukpqkKaArcfKqqpNQIU0kwrenFdrrJGXilc5s030rNTQtCiN3yZ+pmi3rN1W9N14BaKz2i3HlD9Cr3n3NYq3e9rHZg2iu8NYjZaqA04jGprZHAFMpzJWlhw3hdYcef1fceAgiZWmmVyGiMikjWb+p7sIOIKOBh/tWjEPaVhcsbe3tlJFKdswTrED3AXbW0/ZiwW1q0FqU49ma4WmiVZGqukNtWy0kZbL5zk/Dctnuwr9M2Er9X3xYl+tCG2eGCY52eMcylvj0HL9ikbwGcvJPiDCow467UgBZcmnzFu7qR0B9Yh4FVtd+DcsZIthkjRIDt7SBuj91OaNPbZZ6x2p/5GaZgNDlLR9lYx6nmkKPBtOl5wY6C1mEl0HjpgodUoc84YJ54/d6H/ASpN7uddBaZUplos312+IktbYquphmlmxghmyWZZsUOFpLz9WlkPfa+1HlC4O6Nd2e9+esN8+uiGamp0A+9GWXFYR/71nMBBULh3jTSA6P3rEUdGs30jg8ioNK9v89bM4BOSNCGYnk+HthshtIk8c6xFRpqxpRTy0rKixwpxJV5q5T1+gHQtykCI0wcSZ32AGB6kPCCPx7lwpN7mjcHryVUhxm90ygqfHyuMD6M02AYeYkXq0ZHLtrGYQht198Gzgez28eliV15ossmnh1UqKWBTq5Ew10ihlvNmH+Nuk06aCGSWJmasicpksToNnCrgYQzWwnK6OI2O6qeycXbSqMOkTZU3T1yhoaN0/UBN43+Hor20LjLsIDC4Eel1JjxAxdtCtV74ERmCbViBOrd2Oy6KFg/nvo2S1oztXUpda1wwoK03rRdckK3VyOQoObvJiQwoUgetZdbOK3w4tosqgkSFHfod975EnBOWdVW1+iux8XF2tAFpLw7cDyB4TtlIcomRjyQ6TwI0zStso3I1uzCrQLNaykP/T2l0+paQp4Orki1UYSeMd3qoROFHf61UUm1yjJTZ/m1Twp85/pAIY5TTZww8z+rLCqUVItOWa6VMhZSkKF1FLaQ6NXnDQhqUkgSVL8laxXwocWoohTosUVIHGiYDWRNq8OShNrABzctXGSgZM1PUBauVyqISN2lLMBjFOxKbkiotLfKIyBSlzZyBnsJcKK2oTwRrnCCoaeY0WuI7b93VURamu1pKh9k0SLXuGbXU+Obx5MVk/WZyfbOY3Yzn/9SBlx+rPyCiQkBvg/g2hZZGS5PA8a7pGKr+Xl1mC6V7b4CegRWot1jk91TQS85G/LaKy1IqKDPqJQMX2oj2pCJDURKmKIThTcmXnobJTYXfWi6yt9+y6wkLFx6rym6WYlii0db9dLpqST0CU72i1XAGOm9ecwF2jTXUKj6jqTkLffkaGLudWYULnh9ZSHLOninJk9YLJe/4Hc/UCuADtVCse2Dlr4VHn2imJQ6jqtuEVWSAq1X4I83MFkSadU7nrA3qLrTbn8YLZKc93jQEnv3Y1DVYISOMeFFDsXjr0tOdLnswh/kNNk1yZBNsk0QjaNb0CLohLtvK3KKuc/EYH6N7fHG2miZltpiwVkqKaT2AajgVd0cY4GoWaunQME7QaUe2W6YOneEo+pEnP1mb5QfC3VU8qbf8aLgkOsdeqfe39fSMSt+enlFt9vQJTsUKB03+bFpzkIqWMnHP2nUWbVnNPUZimUVMNEjoEuxCeOQK+YDa1EVxpSrokDdCKXfvGsUri0poatvQrl3oNzN+koi17AI9abVi9UyUvUAh1aJ1x1+W+WMDbnYTlMHISS9iMRk5xbU8vY2c9BKaipHTeKEpB8TwlhgTSOB+GDNMqq8w6QoKUKxEpf0VJGzrp3uyX/HGAynd7+W5ZF7Vdx+4wW7D7yHP7y9G8N9l83dZur6m8UY3LnGs4LKlQ3Gd+uDIT2UmcJRuoCpZUUFHpTssixFOg0R9M199zGdAb+QQtLhS9BdhVUkqWQU3BlU3jdd4/OuMDkFayg5WG4a4qxTXMAHoIeYrlbB4Xgo8zrxh7Us8UIc9cE+7BqbEKtnTF7OnNTZ2JPnavSiy6EWWNUtG8CM9A9D+5/H6/tuv/33vBS8Dd+pPvIfb22YCfLOX1PfxPT5Ep+Yq+SOx5Pv76PMHpAdc2ZoHTZWYl55LVU+rjzsot/QpAk0X4GkTlAtOJI+kcaq7Zo4aVP6UzqGkTssFceC1ZXbpP0fKVDfs50K9GBGpnSzgVDwjtbaQWKKEmw/rruuorMxs/21fyxXcc3VzCOoKRmeHUNBOzcOPJHdBh5NyifbOQeROIjye+q5SoJ/nH0kgm95JeUGXlFVa6JJsBO7YHTk8/xv7AL+MrJ8+oF2cumRc5HFT0UovGhskeYeWbCGXmGOVNcrgaqzR2K4uvtvoAeN3h/eb7Lm258ZH4GpqEI5fkzncrf1ceozNc1WffJW8EHQ6sM2H4+TO/g4l6YvvI59MmLHPtqgAi4YVgxQRAzohIpwXnJC6cPBQwFwn6pXOXmBlZfBAG7OjhxDz0JxoW7fYWa5DLEKtYaQUDdjqoxM7SvQaIufBw9B6fGppH1KK8gZ5aXCvib9Vd1As3fYUUTJSCSgarU6izjmsPTrx0O257Wq6Lj1FFCTE9JpvYtBV6gJMIfW6sFLVkFssM2t+1okNHpwEnHoqHb82BM0nvo72/9BrNh+5cBeQCvWNYCqw1wTPIUhMbOcZexL2G4KCGIEH8KTsV+Qflx5Q2myCkFjuhjI1tI6YTKn8H0jAfWvH5xBqyzdpJ+cTjgcyTTaEXTkZnZxCeTylNbJV/1KEkE2S2Vah6kpOgfA+WU14tGGucTKQ/XwqqbeSZVa8PZdFFrI9EPP7wotWZLrMcAF+8gpFTuY2I1lqw+FPRxdLg/WUPpEoFWWBKxHPcWktUEfFOQThOzIQ7wJ6NkDVNKek0N+nx0PbBqCOrgVBq8t+myDC99y4Qqy7x/HT2y+zx8DbP77+69++f+3E0Km04W7vke4Hn9qxCLiIJDzbvd8JW0aaiXfx7MwreRKOm3LdbNkBez0EvTxDoteZ/Z93Dv/RbIPB2v/8XWlgUDFl/yCTJWkUF5eO9DmKC5rmo7h/yMaf0nUofPzJL/nWjuCD5/s0PSU3oxHkPTJQ4MDhiOXeVpxRGD3XDq/P85vCZ7P1+nr2/Mo4HlCF18YDtfLyElIMUDGmGw0i/oEPH4K+dfcudk7hrnw+o7e7/jtucxOZxW3+1R2sfklCHqIzcobHmvOTAOgeo6bpD4q9fXDfcEyNsCACAInziCif8gCZfNptu4FNxniHJvqJYX6zgQXrzYZYQzS0mB9n84fi/hclQglLLNoP7udst2zr35RMXgGNi7/1ZZarn4WitpLV2cINSdFA/sB5iMnkpJKWK4ht6JjS8niwdikmRg+kC+J3A1VH2tJiYIS/yfmIQQK2ean2X4FSyfRIl4b7+JwgyRYZoXhYcHqk0DmEyLHiewNa+b7qnwAFOz2eykOVwr5SKMegRe1qqSX/NJf9k964ZULSaAg37vQ5En5DbzY3HQXh0p9sXMhuAOLjH7uM/SOMffxG9+vp/HraYtyTRdWOeRXSZd81j3dVc9i9MWiyMTB+bq19TscJwNQn1cU/geIdBmGozIdh4M66g9l0usd+5CV/vnGYotjnSCwRbDsW8z2FFofzTM8Rj/o4mSdJtunngF4FbpuKo3pGIBo8KobfuqaZDhZOT+Vf6p+0CDPEYEf3tU7nhB68AN9EXBP+DR1PB0yfWKjs0Ys7SG6sO1ZLeUSYjXx/I5WB9SPyvlQsPpqUosvpWByaleaJBbGNHpeYlcyzkviRbM5H/nTEnLfiAxJ1JPKil1gle9aO2fPNaoy0ZI/8UTbF5wwam+FmiwJoobEPz0t9uMoSC/pSp/uN3YuKU3UOv/HEpibf51Prq3MYvrcgShtaYfRvrRxVKdlwBG1UJht2XN1g4205f+cSP0WxaLX2IBIBIf2rx6BLIttmH4FWkJbBS5eaS6ftspvcP0ZAJm5oH01m6/F61iYo00BRsT/RLL1c8JL9iYrg7o8OeoRk+ucJtljjK+4SyETbDtuGmwTsxv3KywleCVM1Xy8uOKHSjLHikQbl0EGTER357yEmeLMP6MV3yBKWR7/petRFwCzWavl6u7kDKxK4MDVLIVYlbCdXGXwQTxm0dJRB0VMUcrq5lxTPWPtI/hEekbFa+p639Ny5e71ejsezuYvXE3eFF2vke9P1Ek0mC4SuV89N55VeBylVQwCobi0vpylvglbtgNJqsP/Z1SEEDf4g0GwVBtumbFajJU99aCY6Az8Zdfto/9Xz8Ilu/KDT6cDziUb3oS/sARiyn2r6GFEIZbogaqclRCkXXYSYfxYUKEdNMDC2L8OhcLLjeEJxAON7r2c7BNVWzuYkd0JOwJE4zDoi/+BjuRy4GmCE1pMJnqDparxdLjD23OVitVhgD83W/nq99ly89dwxWjmOU0Gps9My9QUnxRPk0FklH1B9SOQiNSgWe2KHRI6nAn1uywkJPk7yMnWp8ie88v9w93X6f+cFIPTguv4bUEsDBBQAAAAIANqZMkMZQq1OWgYAADgsAAASAAAAdGVzdHMvdGVzdF9vcmdzLnB51VpLj9s2EL77V6i5UEZd2ZvmkqB7aZC2l6ZAsDktFgItcW0mkqiK1KabYP97Z0i9JetleZEIWNtrDoffNxySM0PzMBaJsg5cHdP9r6v7RIRWKLzPFjcNMVXecWP9DV+ZRsWkkk6qeCBzmd+pZG/hb2MFgvqr1coLqJTWDUjeMBraefv6zcqCx2f3luvyiCvXtSUL7jdWyNRR+O9pyK5JkkbYk2TS+Mg0Zomd69tY2GntFDrK3uuyC4g4CqSt65ycI5KDdDQixGkTbCbrRh8ac+jy4qhULN9st/CvY/o7ngi32EVur17vdrvXL1YFHcnUx1hzGURtRMcCLVodJdxPUkT22ihyDutyeJwTN2Fx0oQA08BggoomrQowKJoo+QVGs8lvN9oKDWXs35QGXD02FaoJ5swGrxC8tlSpyeE+KCP3QpDTXX7CLnVo1PfdkIV71mKruyVMxiKSzCZkY73cvWpYOk6VXczzzxbZGlVyizgasp6I7gHiN+JTRckb672I2NOq4S4a8QfKJZN2bpk/ufor3b9LEpFsSjJOiXxjeK8byiKhXI8GAfObDhKIA4/s07at6LZJBxVc0q7pxME6dnO+sTt4iVjEpKhI6tfnsCiOA/bMhlvUoNoipIvIkD19FjDF5liz0hMN2mQ0xTpG1YI2ybBNtAXzuRqwhN460Bq7pm/h8VMxRq83fSMRnAHwgbwVQUD3oJHAFhxyKQEYfk/9kEfk6RyXQzYb7bhNww6aTxtC97S4tP6ggWQ9UzOgp8LRsJo4K0cqZ6/4A+tb8aeBF2POWlNcjt73Xw1Dzvf9FMbrBV0OS4zsickbhK9YkmmSAwz0OBtLd7m+SdJmXHOKTAcPLnkEx33kMTti/6lKQFHDs4awInd8HF06H+F16gShRu0KA/z07E/hp5VOZ2ewALeiX/vJWWtZ5wO+ciWSx4ncExaKB3ZGYNLY93t9dPKmVUPXvXudcSzUuWerZJb55m5IXcbr3pPmms5EGZcx3KQtsZJc/ZMcaMS/UmxbMsmq6h2fbEE60EwOagBNkgDfT0y5UNM2Uxs/jk+6ulh0Jl9DwHOhhVIw0NTIwKqjWa1UDDC76jFuBZMIBXC30YHV4scKSVgcWviWoBpyVzSIXtrYpeW7wkEdmMmRqjCZlqONXH/Iqpoz4eobF3qhYU3pwhH7T8xT9kmeED/ps0Jn9nC4U2lxVeLFhytYqSpNIveBBimwt7CHfXu3rolVl3cduknJYKQ97Ywf8MlKAFhosdetFgcjW0yXUUO7tRyqiRRP11FkUM9MQr14jJJsh3QFHNWucftKAjwuDZ3oNeWO/YP5jDkOnsFjcKBL+0ubTA+WSb7iJYyqUSFDFm6+3F01s0shTwSaNbE8z6whL5LOVmxZZKFm3Ha7z6SX8FhlSSn+2yV2FCGL6UGr6mqPE/4AFoBm7RtdGiDfguQ3ZRKEcGZPyHzhn3m/hC++RHiA9yiiKZxAGCT0AMLpdrkPElcdrbDe+CESCYOFFcaB4dak/rQqP83eHyq+s1BQV8lEukYpnDCbbSuzxPXVcyQnHi4lGiycncTpPuCeu0SSoq1VA7lkrN3WPi9JyeZT5YX5EfWs4R0nO0OW2XHMuO129B8XhXD93t51bSZFnQxFSJzKI7nYulP6PuTS607PUz4VFX7Xht2ohVfccSxf88RMaHbJc6xj7HkQ8OjgspDyACdWn8RtOUi0Yho99kgMaQiER/MT7YRI7qXt5kWcC20+pSab97Hnl2MLFXmEc/Ltu691IpXFSp3SrR0Oi9SYB46bDi51DBVKtSB3fGmTPbBIDdU2tdCk4qZRO7a6qblV0FQrt+Yr5x2+zandfh/V6YLh8sXpug8tzbOufTLdBrhxZevvuFhfkyru6mKaYMADp1X1Gm6UgS5fzp8IxezsF8ZTmO82t92dNqQu5uGdZhCQp1noseezXI6UxZJxcfN4X8uj59lBQwltyVC0w+aGfnUrmxtbmn2Cfz3ntqn1m43u07Xlg+h5Z4RoTejTL9K7tJx15TQ/zLrUjR1SvNiFXUv5maHe0MXddM4/ZN22dpN34dJtZaxLVm97KbUGaiGbVMsdW1I5dRyYGXfTJMBVmP1I85z1ZyoUu6k7k+bxy5U2EfruhHyyq5Ch1V0tcGSc+jlnAz/e6428wP0fUEsDBBQAAAAIAG2jI0PL4EsAfAEAAEEFAAATAAAAdGVzdHMvdGVzdF91dGlscy5weaVTy27CMBC8+yvcE4maINsBKkXi0ooeq6qKeugFmcYBS86jtkPVv+8amjRAQEGskkN2Z2dnx3Gmyxyvpd3Uq2hcW6kMlnlVaoutzIWxPK+WFdc8F1ZolDm0hbQ5xD5yI57g3QNSboXrbqrNN0LoU3FjcAIMSUP/2rB7DYsfI4QhUpHthi0bAuMZoTIo479oNeJ5O8VjhJIAzwJM4WHwTgMcEb9tchxjkCG0XXzVXHkj1xGSWUhoQllMp3FERkGfAV6b8/0jjVuuZLpTaqyWxfpEKuQBY0Cp1yZddKaPgnOVjq6LkAlAxpRFjN4TFpPh8HAwnFE6/egA/43NSt05EVm0O8cHrCf+tz3Xei6Lm1xnIYXVJj1Ls/3S27vjWibN5pojuIx9IGewt3j6xqWBm/LOVS0WWpe619VO8tjVoizEcsOLVPUY2hmU6Fp4fQf2AgQB5kqV3zuyuUP6WBrsKr0XcajoPfXB6i46s57BG3HuR7E/1aDVhsqhPvoFUEsDBBQAAAAIANqZMkMW9uuPlQcAAJAnAAAUAAAAdGVzdHMvdGVzdF9pc3N1ZXMucHnFWl9z2zYMf/enYN0HyjdXjpNu3XzLHtrrtt5tfdh1L/P5XEWiEzaSqIpU0qyX7z6QFCVSf2xLyVLX7VkSAAI/gAABlSYZywW6pOKquDib7HKWmAufcl4Q7ocsSUgqENWk7+TdN/peJz25aVK/vemjjYMLEhvaP+RFJ1lCY8IFS4kh/dPc6CJ31p6UF1EgiKBJySCAm/uFoHFF/Trg5A38naOYBZEmS1h4bZ5ngQivJpNJGAecow8gQOnrGb7ZaoLgE5Ed2m5pSsV263ES7+YoIeKKRe+DhJzjvEglKy6p5YcXGcm9SuAcSa6ZXwmp2Wc1D5D4MTrXmHlSYw8rMPGsQRVkFOi86ZUQGV8tFnDta7ykZxc5yRhfcHqZBDc0L/jpy4VBM7tbTCtZ9meqVuKL18XldDapzOZE/J0pmw9bp2l7DdKXvmDbT5yl3kyz+ZfWatKFW/K5CGIq7pqrHoQGfEjAqWbZcxTXvP720TEziN2yVOzol2mfIs+kIq6JsFjeNK9kqh758UzagH9WNqP115P7zS/Y37E8CYQBM1UR5Arnok+2eVKKtmQ0REQkJoK03C7pc8IzlnLiYTxHpycvG+62OGWUlrrVgasU+SugnHDP4PsbFb8XF2/znOVzo5SW02RPmdiGQRyTqBVm7JKmXo8LjFZNpIpMZpADZuowk7aeNNZU2cMy1XkYsnQH8fYVwxIBXsEPiTP8wCm5VT/nCIcsZrm8F+zkH3x/PxYvbcocvYf8qf9tYrcfoRIKix1Rjn4NYk72uGC/MNvS0sAGSDIXbzUvBbQHSXx+tEgrvVc15jFTfCX0+DSfQGjUuuh8VhXEcen+mqQpLJcTKv6FW58LWQ77kn21Fl8sfxyQ71umduZ81zp963DePyopJmVSrMSj9c3SP/FPIDcOz4OlNC2hyf+tk2DyqEkwqZPgMVuwRqEgW/BaAwXpSXSOmq6FcMzurBXk3TXWIvAGGPDpyfL0BXzPlh9Oz1bf/wTff3BF7waO5G4ZQzlNuQjSkHhgkpI8rw6CvvnRtIIKkm91vT4y3SuW8w950dy6l0RUnkXfIbzQYrHlJlpDYy+8zxY6rw68EJ1FCCdZHRHvQEAgWL6P2UvJF+HRGWwtdVgY6OKjymCdnUaXQicVVXWxlaCwoCJWlXLHGJ63n4PVQj0PY8ZJ1EUSER7mNJP2SsIVz4L8GgxYdRLr+Fyp6Dzrj075uZ/Uv0buartUDynSiV2kx5fnSoyGt0bxAEwuZp1IDSrFqpN7zDKsBB5fguUm1Tro8qv6zCfptHRHu1gOqLuObZ01tzZHX47vsw4CY0cTlQWU1rw+jYB92UP7TNKOqPq0rPpKLbTuwRs9X7ZPAUEUDUv8kNz2ZH9wd1/6d+iax3+8npL0SmZrOWOZbvDI9EH92qC5zpDjzwdajClWtmgPW9rilutLRnDnerOnLmmy9clmXF2CR/SydfQYiJaS0YOUwaO6ewuS9FDIZxefSCi8cuNhElHAAWxEJFo525pEEESiyNPtTRBDdJ4jGTYOibMJSpX6svh+N/ZKw/aewC5DWnu4quJ+WiQXJEd013qEwGdEVSdHShUsa3l8jmdox3IUI5oaAZpg0wRHq1uaAnU2JFsJs9fKjSZvyepf+e+CRXcAv2Nd9VAdBOYobRcrrYtzuxldquw9LLiUiOHb72nDTdvpRkRh7XkVP4Ro7ax4MA90OGD8f4RUFU0qO+iI0tPjp4iqoh1I1siwM2b0iPxAJVEF09A2C4PdPqxXL5YbWURKWr54+eoH+NqJKqyRNqvjiqrhcSv1hnNnqN8iVbU1nEnLc8EVdKa8vulW/FC2DnMCII6CSBbd5cFCa0A6VGq/Yule1R+UbznU9djZGuDuWAa7s7eQNEDu5K8Tv7MfDp/eLe92C3btnfVFwFHelAnoGB8+xmC06vdScov0xXhnScWHuUeZOr6fKgVYyg+EmnJdi6K+aZVepSZrmlfm+GgbCADWiarjRagUKCc0LCMpPiygxqtj0mK26sAscPzMxcoFB+ciRndHsdnsYftDSVNvRY8zUpEOMlELtw2U7mlZVOrQbs8sHMjcemfbXQpIZylQDEPjOScJuyG6kXiE6anVZC3U7H/kOJX6tmKQxTuFjRuuurI9I3oMbLD2vn51qLG1uAc0PxAhcRCW1nF9Ls1j91yax81z6do9tHXiZVmrWvwGDwjtO+itNx3vDywtHzrmzYqxfT50mtM5ml4E+UPafNeaOarsHRCqvY1+A6q1GQWCznjzeN1+0z+ytDw0qqWMQ/X94d3J8AZJsT9tZ1cC6rZ237JNh4ZKHx90K3W4B4fqQvIsp+1GvDWAtGjlLLJ5hJIUy7NXTTHTaT2D1fGEOEvUKyJIYQptjj5mRRx/lC7JoAIitpNfcUXQxyuRxNsih4cSRf1/j4w484rV71ysc4gqNWxPmBXwb+Uw1gWb+mZ5d75RzaKtOXTfBFpapgbNvUuqZMA4FSwHD3pTW5JMY7WwqYS9NcFXR4SuMf4xE23FvHesTW4MkHohJyL06eTYuTY5QpKhtTeaVOEc1Y4nqhGnEHVy1I13wTXpPi8D4zPJ+B9QSwMEFAAAAAgA2pkyQ8FaZVzsBAAAARkAABMAAAB0ZXN0cy90ZXN0X2dpc3RzLnB5tVndb9s2EH/XX8F0D5Q6Q07ipOuCesBWrO1e+tB2T0FgKBJlcZVFTaTWBUX+9/FI6sOUZEuyJyAJRd4d7373QepCdzkrBOJP3KEx/PH/IQWnLNvQLGboDXJXC3Tp3TlIPlQTlxkVgnBxjQJevzgk5aSXzDHvWyqS8nHlxAXbVS+oXuOC6xVg4X4paMqrVfe3gJO38meBUhZEnuM4YRpwjr5I2veStSYwikYkRhtpARWbjctJGi/QjoiERR+DHVnjosyAExtqeHiZk8Kt5C0QMHl+LaPh9hoWSeKD4mit9feVKqChi2ECexZxkFNJixMhcn63XMpXX+Pgh2y3VDKWq9dXq9evrrFTG8KJ+DNXVhzVV5MeVbGe9gXb/MVZ5noLQ+s1+4IjNlwU9tYSeAIhY1aUIA+t1/szPo1sWQXJh4TVS400/AZ0RfffL58ffsF+zIpd0FLdFh4WJBBkI4HckUx04AK2gvCcZZxo71SkeIGuL68szHJWwQQ++xHhpaHm2KIMWRZLdL/jKBABvpODRxY9yQF+DAr8/OxYIaDs/RRQTrhrkkA6RXwoH38vClYsGp/5+yZZ+6ZsS6XfnI5bBtjdjywjHqIcwWA0F8ZdHkWcMYlgkKYkasWbkUY5zbgIspC4w4IBHhl2OizNrArPt7327lj4daPly+rEXdv/EUmJIEf8rnx9Y0lucYK3B/x7iiP1Dp4zAsE93w46yag8ESIS0TGJoUC6tBMiEGFyDKN6Fp46IfZm9QrhYUFz0BISBV7xoksW05RwlVIwulIjuZWApJVsMWPI5FibrXk7xWWAle2wo25RAKt8eRfI0/CAu4/IePmyxvVe4/gw0deyXH4d6+vjxQ+kDVa+U2AGwSfnRW+5UQDU9eW9OjEmIUj5Ji8fUxoOnX/NSVdT6mOwXtCzXblS2aKQ5s0oVltiuQZkYRvCKS5o9DljgWoZORV2QYrqkODTjnHFu/5SlJ1Lmg3a0cM8D4pgB7UHDr5WgIdyNSP/tq9Q+wp73dxuhWd4vvOu3paOgymRv1jxNBkmOgOl5ABKVIM0jFFSYWQ0Vhh90OM5GKlTxEZIQQIrA5pqpq6eLb52omv6+8uHA3bVrJV9MFbGvZODzk7qRlzzyKu9TCfBv8lcds3NGNhwv8lQrnuDYq8wfBYs/0PSB4DeQuGwVxgaUV73Kh/L+Erm3ibakXboMKy2UWdqPT0tCAC4OZU2L/srbW8qnHIGgtwzll5l78REKbO5KFmX5/8VKK3lGaEyZo8D6wf0K0csl5cjEiHBkPqeodkWBRmS28v0+YZ0V0LmDBKyeu1jbMqZDXKiv84bpQxdu5hMSatE1aPevGoXWdU0GFFn+1lhpw1wz7lhtcSqIgcC++qb0aVT4sjfZZBS0UFyO6YPY8cA1PFtI8KnkZRyNUx+AeR2+8mc4OfuQhmx45tR5lZR49Bzy2jBUt+c+ttULw62qW5W11ern2/qm9Ty1e3tT9e3Lya1rSwDe7tXY2xqE7ZaWp0vyqOP9vPYgAtPALodWLWJaxQ2wg+FYsVxARwzmmxVSwkEYGybO65NsNc/m9Uu6GmZwd+5PbPKCVM/3dt8TZds1hf8nihtzfGaaBUTU/bOXUyM2PHFJGm3jXvOiHaAVx8XnXviUOokMyT3AZ6YEp40kqt/YECnPWYMD/NdAN9/UEsDBBQAAAAIANqZMkNhqRrc5AIAABILAAARAAAAdGVzdHMvdGVzdF9naXQucHmtVk1v2kAQvfMrfFtbsuwEiCCouTRqm1MrReQUVdZij2ET22vtrFNVVf57Z/2FWUggEZYQNvPmzZvZmcEiL6XSzlroTbWajFIlc0cDagwqLTJ0RGN3v3KEW/r4TiZ54o1GozjjiM6SsLcyz4XuId5i5NCVQOpEkSiEjiIXIUt9Jwe9kclPnsMNU1VhfFmLNhdWJSh3y+g7xs0Lepatv7d1IkgQ13jnpssjoO+glWX0uqxBMI+Ud+JMmpGCUtXqBjooL6Cce1NL7wWoudL4h2K47Mtty2gR8oo0qohj9EAsNnVFGgeUgYX2bA0CRUFRixjcyu+zq8iGgfGwoze0Gk4WsO/wGQ2DZriHFBQY8Bn7oSc9vSUUhdvth62ypiUIYfphx4uXgrxcttG6xEUY0nPQcJhKhdQSEkMU65y/CFXheBp2Ecq/Ieu5hhcjBDmmGG6AJxjmHKncw75B0A+lfVDvJN/gP5BvBwi0jJ5QFq7XUAXrT40DMVmz0Idie92z4xbI1RPE9iT9oNH9VRv2pimBDDTs1aahw1IWCC5jvjO+mFr1GHiaU22Jtwddq7vnAgHdrmok5K5afVNKKr+vastkExSSpo1nGST2SWRyLYr9MbL4bK9cxs9RAxWUlmtXoioTfrQSpqVNMS4s8pLreDOoxY4xloVpnX873csoGmcL69faghtjYCl/BnPr7yNSqagVFs5SVbBrfh1t7z59IE0p/EYCO9/BtCXeZlYncNo5HTgM8p8O2/LEcLRvne88Qzgad7B1lwrOunAN3+m7VhPaWj61oGbPGut5F63ZqG8sWxMMw9nVajKdTcbXMEnj+YzHs/n8+irmlyu4mic8Tel5NuaXH9jCw4ocXMBvFaE3nrJ940rhsSGv63loytegj804K7niOZrBZk008WImlV2y18FE6u4todbdyXrvzUD7e5kf/iuwl/+y7o6TZ+xA5Frk48XvXQV3HDdvKOgcLCXGg5T8B1BLAwQUAAAACADamTJDK4aMZdUGAAAQIwAAEwAAAHRlc3RzL3Rlc3RfdXNlcnMucHnlWl9v2zYQf/enYAMEsltHdhK3a4N6KDZ0bVGkGNr0YQgCgZZom40saiSVNBv63XdHSZZMSbHkOH2ZgcSReHe8u9/x/kjhq1hITdSd6vE5frk3TCouIo9Hc0Fek/7pkIwHZz0CH54SJxHXmil9QqhaX/RYqFgtWS+7XnC9TGanvbkUK7IS/nVOGFPtL9PbSK/cRPNQ5av936hiv8PPkISCBoOUMKCaab5iOVV+3ev1/JAqRS5A0kd2t+bOTAjYnHhgG9ee11csnA/JiumlCD7RFZs6MomQ0cmo8aOSmMl+Jm5IkGfgrkUUzIOCA0jca3ZHprnNbqLAqy7qgzb0HVh1BhYHjTlwHCy1jtXZaASXbsru+mI1QgkjYFOj4/FBb22LYvprbAzZpnJK2VLLfNHVwvumRNQfpGLcxaDYG8Hy2N8JDbm+s3W4bim3UAhQYxiKa72m5LoQ5/KAPJuS40byJ0i+qZvS0lYr58pWkHOAO60Vgx+bWLK4RO0qTaVWt2Bb33n9FSjIR0TT2jtgIdOsggxKkUzFIlKs7zhDcjKeWJiUODEmMsFFmBilPlOumOrnHn7H9ftk9lZKIYeFLakkW0AktOfTMGSBHQ2hWPCo34hIrpnFhUfZS0khb6i+7YkkxsO5xRN4INAZY0u4yQ0lX2ws+iKaQ5j9u76LHwd2o86Zddes4CZnxJnTa2b2q1JorkOGNJ/YLUkvNql+9Iq/dsYl9ciQfBJR9tvGKEeiEYrMqSUJhCvyB4Uk3ALtBmlPn67depm68Wo71qV8+2dIo30mXJTXPuPGQF1JOkYlK0Ai4DVxIJkNr6Ni6uPiZDy2VnwRhnQmJNVCKqA4tgliyW/Aix6kC4EEJyWCH/ahaJGa0J4iN+GVi5o3Z6c1g/MazSaXaODVr04t7EYeVx7SWDBiTtsnjCivPYyIWwVGo1JaOvHGDrVTjRRfrOgNl4k6mbSvoGXla0tos77r5boqmsuArmtJFdW6TI84DyGTMV8ErOzUjV0NGZlaN9yUCxyl50cvK3VJMkBcLW2DDw4OLpaQQRQ2UyKlVQTyBuERFLzIZwpvZ9xkLiRZCBFAEFCVSOYC/z1F7rRS5BZMN2V1YwkEo/ZWIuBzzgKw0b7O+z3Ib7d9rMlyjpf9zSN5SIfkMCCHM3L4Fzl8f3Z4fnb4hbw7vyjORN3mTNMF7JF9OS8mk9nz2fj4+XP2YjKe0Fe+P5kFr4KXs2PKfjkdO0WaZt9j5msWeEtGAwiEanX6MD86z8w4+sIjk2w2jCsljV6Nbjl+FzKxT46EXgxgyypRlvW9tFF59/bCGa7PSrXyNX0yO6a2Ye0lgBbiFsIu4BIkqGmqeAvIsap1cyxyHJ1jxwBORfT+h64szp1JlHU91YbxHZu5FnULxadlqJxxK1WoqFsFQ9pOX5b5zj5AJftdyIAqX2Ax29SHBoHHVpSH+BcYpGr7zJa9mXFMRSIk4rkQzu5tNIZNOuS6YvYNkOtXiwVsUtmYKWeAI3bclP+rxmealsljK4gF5Jw0ki8N9ZUNcY0eW5p3Q61MrB0Picc1k9OaQwVtUZb0U/u9RIbkGTGBOspkdOnwncsDMODNjEqs8gdXTnPqfFAAMAiBy6vu+NecujrfGhhyK9p03BtopTPZns9AndCfdQzq9t56Emq9sI/DUK/NQ8f6R4r/vYR/vcW7nYD8ZnnwuGeTBx4FmGZglS8ixgDY7RhNmrvSTYDMRDeiM38Ee43yPTYnCqdhWDfmWpo5IMoxoT53mub2FsbOBfYDPFrsEo7lBhxtHK2lja5ZFMF0JhnX/2wzq9DBsdi6WQMlw2M3LNJbaw0SpW3NPaWmYl0qu8YarvIBpx+x77o0hJV1GsDklp+b9Jb7Fr/amblNrVGczELul5x2jyopbWr0Ll5OEYOEu8XRRfvYxc9r6d1dXShW9nZRG3Y3dvsReYixIH1XY1Gx/Rkr5OInnKERbKNGVitganu11HzRIv4A4ilqbT3GqPNKyQLzTLNVxWnn8JLotC8Y3Dd37X7WNyGBOY3xG2g0HhMXa5PuwWhr+Vi+aW1Cu4Roq/3QzIgvdmC43gISNgPdMcpkd8cmV6odJqZTcT/jb66FvNvJDclM+ZLHKcmjOKO8ww4u2VDw5zkG3762fY3VxR0ot7sXjDbV4vGRdbWt1fu5xodJ6Qs6554n751mmpq3dvnrmvKDoLp3d2aYQEJOoze+gCGDusp3a2lnMKEgKaoNWrPvdBWHzKhslmpYllwyOjNvBxHUPb8WNLimSOxxzHrIe72N9ea5qcuexaizGYFN/0OQdHkPZCuCDxSTQtS9/z9g6J8g/X9QSwMEFAAAAAgA2pkyQ0ZxxoFHAwAACQ0AABQAAAB0ZXN0cy90ZXN0X2V2ZW50cy5weaVWS2+cMBC+76+gJ0BaWap6i5pL06jtpY2i5IQiRJZZ4sZggs2utlX/e8cvHuaxWxUpLJ7HN9+MZ+zQsuaNDAoqX9rnD5t9w8tAgpCCtJIyEVCj/5QJuMG/bcB4lhuztqJSmTqbB/xWNpvNZscyIbTg9gCVjJx7fLUJ8MlhH6QpRf80jQSw/TYoQb7w/HtWwnXYtJVyDa21ekRbQxN1gNtAecWkA+nd494HTQgcgmuXHS7QVxDDSSUShVoUxp4XRyej500RxpuOtQD5WGvK58kZ24v5WDWRPP0peBXFg7CqzCm8tRmj8uSHh3/MELcGcLs6OtcB9FiE5gj3fsn4nTIe08IK+YwUf0SZZER2vD4NKqKkiS7xkzPnPZXFSim3STpU0ErIrNpBhCERc9s540KQH02RVfRXJqlyHqfQQN34OVjYToUUcEtl1khxRNwo/HhrCuthMYoveapB+Ii2OV6yKmfQCMwumktv2znMPJ5DWmcntcupA52URUOSAalYbbjAeYU8cl7kFU5i2nBUpHX7zOhuoTZuf3s7A27FRjY6De4M3a82buSOjMG5oCPveFlSqd5uMgbRrRjr9zu03+GVHVfcLp46Yfxnxsev4DiU/V3rLmuSdLGf+k5T4QWxCnKPqxsHOE4w58dKM/Zyy5lOy6m7vDrBICdt66fTAedsLYmcJT3mJAGnIZ/th09/zxnjR5/8XnPHESmg35EWQw9Z+4Qt1H6N7T5xqAOqCliQR3xP2TWvcJhnp3Uw6pd1dhrqHDuLOimk6gBBJW9OPscCJ9JnWGiGStPx04sVfhqmWGNXJAZkwE2tBfmC7+nEixZU+05mTlPT6o6bWcXbYDKFWjM3hj79Pt5udeQSG2yQhBYI8k39nPGdGVTr7SZVoyyMqjaFw9xBtFyUMykbuP/MeUyzhPIZJrdYqSka3cUjaaHKNXpl4lAvGsm6ZayBt+lU1pqgUuMt/NbCoPeVcI1mj1mvMa2TMfyAr5ILcofve6NcoD03EfXC/XOgcLyk9YfQ5/jPNLChfq/DLTSuhAyhzY07IG4uTqXsWOuFGmR9HI7PRpTqfrm0eXTU1QsUr04d8Mn7D+0BhWf8NKXVU3bVXXNf6Ne/UEsDBBQAAAAIAG2jI0OcuQUE+wMAAC8NAAAQAAAAZ2l0aHViMy9hdXRocy5webVWTW/cNhC961eMnYO0wEbrJj4JVVCjRdtDkEPqnAxD4UqzXsaSKJOUF6jh/94hqQ9yV2l8cHTZ5XDmzczT8FHn5+fRHdf7fvs+Zb3eqyj3nyi63nMFjaj6GqEUrWa8VaD3CFfkLST/l2kuWhDbb1jqNIrOCTDaSdHACFthKSTTQirgTSekBokPPZeoii1TvCxM3jCE8mE9uf/F9d/99nchMYqismZKhcmT2WGVRRHQQ1VcU42Z9c6+hrX+Giw/fJ2LN6HXBwEs8KeONWtLVFCyFrbEwx7Le6yg5vcISmRDUvOwXyDPgb3zDWfWYC1XbQXEp+n/kdXYatBH4SmvHAL9OTKfjWZr/wcRWE3ZYa91l202FT5iLTqUqaMxLUWzeXy/EaabzRv78zboTL1lHZ8Ic38q3EFR8JbrokgU1ru1ZWMNCpWimPyTaA3NY2mqp4xJwKjxrXerdIIJAFZT6JsM/kAaKHrTbCt6bceKdV3NS0d80rIG19DLeg4y0Ck5QW7rSu9QJzGt4zU8PQfYn1H3cnFYtbjHNkS0pgDTWgg1jgPUK0ptygrDjYWix+IcgjGeAnz5/NFrtxX6GIosBbUcFDMa4xUISYg+4Cfa8wn0Wz2FPoFdgvzIlQaxA1XSPBkGaWbtizELEYIOPj6sM1HrN7dh6y1/6BFolAn7B7WaY+BB8orgLo7GoKDxHVkvtj2vK8MRjUMw5BSotEwG1FVQUcU0ak7vzkkAKVNHukTnkrd3cNjTSJyUCQdGQiCRIqs0rGewFkxTVeacTNt85/Uyu8XeQVpGcb1R/Z0pM1kG+Ykt9V31kpZmt8WWApTvtuSDrHw1Mi0MauShS3u+IQ7lHG6eLp5vP8TpTsiG6WQ6ngEiPkzqJogOeQo7DWHuPCbddQAtvhTgbBHA9eorrK+plqFj9bSsjRpqfX9bukjHFHSDosZj0kjn3cZwqH3qzB2w1ESxFaJG1jouCw/YnsDVGt5dXK7h8uLyJXW5zofGnVLkN7fEQVUV3lI2/soIVR7H62C06Bl1kfbCJr/YLAtNpvNlm3VMsoZucRI7lyuDRHTGi9XUFY1dzUpUCwdmEL0DHxobH/JUuJhgbi9MMkqsMB8W5ITVYvhEx/9ES2zE42k8nTTLUxjZ4sFah5tjWYmPEAzT30Hxb7Vjymc4N1XUg5moyH9f3vdESZSb++RP+rqZufymRLsgQQMpwUswN8fTeAllg8tz4DKguRk2i2GcO6H0PNlrI6Ysr+yEe5ePkb75dS7knncp/7x45RrmmVgowQ3DXMXk/MpF2LcvvPlYqMV+ZmTWhT6Hpm+ZbAp6jZr8okzQwjU0qa7ZX4X709hdyx6jEx1029F/UEsDBBQAAAAIAH2YPkNM4vwfzAUAAAsVAAARAAAAZ2l0aHViMy9ldmVudHMucHm1V1Fv2zYQfvevuKYPloFU7lZsD0JTLGjWLsC2BkGKPQSBTVt0zEUSFZGy4xX97zseKZqSZbsNNj/Y1t3x43fHu+Pp5ORkcC/0sp69ifmKF1oNzlqfweBmKRTkMq0zDnNZaCYKBXqJDxlTKuJqBBXPmOYpaAm/WpDBCQIPFpXMoYFHCJ4pEHkpKw0fhf6tnn2a/c3nejAYEJZdHIWqUTIYAH4Q7ga3TMgumZIhvKWfd1OQZBvDpQalq3qu64orYEUKS/zKuOWbMs0IrOJoUCDf2QZWgpHSQip4u9S6TMbjFKORyZJXseUfz2U+Xr0Z2yC9m04ISeG2QhYgFwRimcP51WVsad+sJdgVMGcFzEwE85JVuHcmHjgomTgHzYf/AGdnwH8MBS9IQJJz9EcvmQY8D/5YixXLTBR0ByMWqYXBPx3xi0bcxNT+SfkCJhNRCD2ZRIpni1NLGoPfrFc1hiKiGJ2CMRnFfoW19aatQ68Vr/yZf8aHfjNZ3XurT9U9K8Q/zATWW79M/NkbFHjb2iA2Mp8HeL4lnj+SEsU9nQuba1nFW2eQf0wyOCNS1oX4nutoSPLhaARiAbtiwBTm8KcseEgNM4trkfNeAuslL4gFocGaYS5U3NRLh5GTTvCEz6xkgtlcGuCQ4NYMWYYsPhfiseaA5+zSkRa19zC5Ebol0mEL43ehNLAsg1IqJWZY8npTYv0goqvsFhyeG+K1wtEOGxoMgzTqLAyPOuquavGyBW+4wJECxYMSK6E3rlLHxH/cpk04rTgYSRAJ2zZMekxKtskkSydOpMjeo5xiuM05602L7oWgvsCqDayRHZ2GA4rhyv7ZtipT0FiDwrUkgzvZ5sZLgIkRJcc8Dx1u++u2RnecF2GwnbIT8GvqkTCd6rrMeCTXBa9OTWJLJbASNpOC5Xw0nbY3Mvp2YI0kCCxmx9YQ3S6kpvTpSRGHZff3ktuh2Xh4F6syE4g/7vC+LFIxx/pQpu4w7BXF3qYP7lfWs0zMASsfd+7Un9O16FsZOhA0SlPdrlEGqW0vFRjaSwluv7z+evduGC9klbMgYW6TVz/dteD4o++60hDexfSVe2YtfAe3AAX/VoAXXYBflMbim+cYKZl6yAybAKWcigIsvC5sd1gxkTHTGpq0IlNzm3S3xXbO02i3hB74BqGDKAg1sZHuRhVRv+9E/co4xlZbFdiBkwRohlkL7Gt4BaemO89pYBEFvI5/3i5KLHOVwEzKDF69gpvKtFTX09x+Yn4KH5i5CCiaa6F4SLg3+pYmTjp0ZlixudDm2ww8Lj7O7dbFSAUXO8PmhrxG4XsrGriiapqLvSGsLmy8Tn/rdXeY5wFOtGtwSoU5CiamBqXxIsWuYJ6PO9BYNh5cuOde+o1xL3+vNA5cdAiE6uP0FzLL5PoQ+f7ppctXswp/e9k61V0zZ+wovoVl9cBXR0Mc5obt0L1cCY33cnWqJjEsSLSjPs74HrvEIb5GH7wHqP4kNla9PElhWH4M9mnEx9kJpWpukvwQRTLyHC/N0z6jbnGS8aHqpGW9nlmNcY1Aoq4idO65NR/Se1bRExfqhs8J4P8TjH6mOc9n25p7fn1bnF6STrVb343iOMuyzrKKPx4ucWPkiV7hwzW+API9lWOMcUghg17WLQPDPUCM9lh9syPHSqvlyjVfCb7+b+6yAOlZia05O0g8fEe9Qdvva8TPuVdwk/5bxSiM0zcB5UZ8qEnYYbwHkRT7Or9VHsI1/vTikmK3Oqz46JE0r1bRk8N2Vk+o3xkqcZMvZDR8T8OVSwWaE4dJZ+Q6dZb0Kt2YNNs55QXP+H6lmzM8fDN4OP0Hmi281o4aXlc9BBpzvQea87LMNnt2NTeeX2kuvEaO8HW+Z1HY8f1ifwuGRqqtpibv9H9QP/N6296c7opG20aXsXyWMnhKYDj0Br69eATf9nZtWqXcXRBwvqrVco/PpjDO0+3pmNJwqr+Ynvcs+zr4F1BLAwQUAAAACADamTJDDVfjmTAiAABruwAAEQAAAGdpdGh1YjMvZ2l0aHViLnB57T39c9s2sr/7r+CkP1C+yrSba++90dWdy7S5Nnft5U2Szs27JCNTEiyhoUgeSVlRM/7f334AIECCFCU718yrNa0jkcACWOwXFovFo0ePTpayWm1mf4z435NL53Ny8moly2CdLTaJCOZZWsUyLYNqJYI1fAu+l9UPm1lQirKUWRpks1/EvIpOTh4B4JPrIlsHv5TwXK7zrKiCxWadl/y4EP/eiLIq9SsFgV/qLsWbamVKPIEfWSF/jatWOXEj0hrUU/zlFlhKq6nv4Yf7WpYldEa/f4a/xgE9nOZxEa9Lt3gilvF8p4v/SL9UJf7xQuSZ/v5zKQq3OiBTJFZvEIPfZoVwS2XF0pR5Xizj1DvyAloyxbDZUlZZsXMLbaALphD2Zxz8XTTKLMQ8K2KoawriDMlClFOchXH9cxaXck4PXQhpVslrOadOGiCvVoWIFycnJ/MkLks12FE95tPJSQAfIJeX0DbMQZwkRF2aomR6nRVrAgpkhWVfrUQhghj+r7ZZsI13QI5ZkGRLKAtfsLKiyif/84yrTCb8L37sPuteQmWZmhLL4JKfjDaEqxx6vs2KxamnRJW9E+kl/fW9ZgBOISqVFcM6xgNxACsU9nVNFensmwOi3TniePivhE4A08/i+bttXCyA+9c5TMRMJrLawdt0LmAgEsYJk7ZDxMOcbOMySGlaADKBm+spVbPCMiLYwkgDpCJgVkU1ATGbqIBaI00W9O9CXAfTqUxlNZ2OSpFcjxm/l2FY44B+8GjCUNEVfspNLgpFcuMAa59GBtiH2xo18pqr11WpOlSIeDbpbwNjuphIoDoVCOJ0YTq1D1Y9gdZAgakLNVBrHACf6k8Va5B0dOEXotoUaRB+rVD9+sPF64u3t2+/CSPmolEbQj2EZu24Ci7ef7iYvL+t68sFd8vpL8yg8HRYwcOnTun31jT+IQYxZ9VBfHDhvzjyp64vsa3rLEmyrYKxXck5CKh0s54hQYsqXloQN0UCJM/jnm1kspjCk1GIxB+qui0UcGlsaaShQqWxkp3YwCW10uypJRp1f2Nba6kOy8UUwFp9BDr/XlS2rAviWbap3NrB1ZVcXF1FtciYEMOg3FMwJ8FIdWZxCn1OJShZeBVk18SBDrgaCo+6nAQTktKTK0fVBl87P7+5srttvpOavwz+kaXCpljo2kgNN/gmuHDJtWNqnF6WMEllVWggpw4A1ShDwB+KvpeiGgEoQMHji4vW7DrDGWE1JRawwwQS1LPgobTmUdjyp+ZfgDDPclFeYi2gxawSJI/wC44Kfzhd5888kcA8U8nCS/0qxRx66goxQPXzGdpeIF0aVEGCiLWHq/sCoCbrkYEFr9o0BDjmMdkk5CtkJFtPuQQsLIUQKJbl2M8YpwO0NuiHXbYBBQFEW6Gm4f6D5o7zHNVI5iJKRiIaByFacIAi5ltfvxDTbmP4RPFRD/G7EHCuXChIpBqR2EOlq3wAzGy6EB5fBPMVFJqDPAmeI/WpksE7sUPYznhJIiE6gAhiHAAjqKc9phe3zS872+TSTpM4vGazONxGwx9LTODEGC62VRNYF8GorVMdjd1WgsOkiitIFnEVQ6UPIdJAOCFSAGLTFKGe4FcfFwdBaKYeiprvY/OckV6/49+3LqFfa5ZpNYHdex3y2/Atjo6+tqrvMQ+sCWiJTFg5kMwcU2OX+IdI9wsXUSgZ20ChSYJJDY9Ofe8jNcttw2dID8uo2T9cSY6ol81u3kXKz1di/m7q09nxfA7Dm7LV58pl4i5LNJRg8qYBCCqWb2DQrrIFsRZCV/LuJk7kAuxoAwntYRRVK1lVMl0CwYEpkAQFMmMi1xLWrzMxjxEsaPPrWCZioQ3OqhLrvFJGM36eXdcMjKY8tQaGB5rdYI0rFL0qcMmaoeG+lQDXfW2A/TUGRNkawwiCWZYlXjbPW/ys1tG6gKaGPEJdbbEPzKb7TLHOqcv11myQbBguBqx5UqYF1gUzGVoOCWDpVdUtmsaaNlG4lAzmYI0EZY+MqZuXvJ5mhFx+aDXlyBI2J1pixJGf+Llttm7ZsThLIk5H2CWyiFA9fNliGJpmixVID0xR7yoWWIhyXkjSMePgGuivhFFsZoDOS6Qklyu+1dorFdsAgVgEBNSZZop2cb2YF9mNXAiLQGdQM83S3TrblH5bxeqMa/RaL5BRsOlm/YWE9ScNwK2Kj4IUVqClWp2WZTaXMIwFVUHdWsiG2EXdiW4xmB5YGUTLCKz0D2GZx+uoeo9T9SFUr+F7+FepvGjor3LgRFEU3t5eXTX7ipOnsOxq+HX8jrU0jlCVQNbAqejR2ej8Cr52/GIRPuvQ1zB7RAKkHC3UwmAccgi5A/CYv3SoSUI6FKJ/a/XXwavUO0tTD9Rdus8digFHO0QfdCxAFV+Qd5AZwy8ssm0Ki0X/u8I46joKVLJKRMe7WbbY8TLD/x6mWS5TIfrKrBH/FbzvK5TEM0DJ5eu3fs5O2UMa4BIEyBCYmPw6YT24kJCwCGa7ICR01IY78ReNEoQu/hNabI4jHJtxjOvejlWfyPuHbiXND34ZQW26LM5CRy2H6b2vYj0Et3b9nMSEryoNxq31ioYJbTK+wBAA8cZktPCBwOG7vP4Kdbl4X+mOS3Y2r+Pi3QIG0RRIazQIvKA1Tl3wP2qk5KIoM16LUUEHsGlYO/YasM0sucD/SQsL8/II4LSa5Ilv9BtfQLfpHQvuqEf0kYu+ln3s9I/oaYf0w/n2ODWIbsjssAgCf/LkNzQxgSBBVZcesXSw6p+e2C3gc69rD19EjghiUbGfZ6wGPgteiGVcLKAEqPAyQwsVTc4trg+3RZaCFvungJ/AZZs0niXCXRhagKgPTQk7VIbC8leZFmoQ8KDHilCrZbOYV45jEDDoFPCLAA87Ihh63CwPL9ySsHregAmOFbTO5oUA2Npgv5GFAH2DdgB7zmxBL1HFnSUSlDQ7vHsI8+/QwNfOZk0EjzpoUgkOTZY21bA8RULEoQyxhpUXNITyzSUx4MHUaCjYD0pkT/S8YX34BX9v9znoAKxnWalUcHtlWY8WMGJr7SbNaXk6gOyQh3o0N8oR/xvL4unw5wXBCrgpj5eis0BeyBvoxSWZ2x0w4pKZuyTDurvQVr6Te4qgfkiyeNEHCpCU0YZIX6eAPkG0ZIWY4mIzicnB2cGtllg8lGER+y4X4hOt+GrA+9cERlH4iupp2ldOzZard2D9cnWF6Ly6Ghs3nYM0Vc3qb0QeWaDCeJNUE6hPqO6w92sC6GlYkGR22Yj3sRnnsOzvaZ6hdLaOlLW3bUcX4Adr3UfrhmgPG76pdtc+GIZoeK/hcYCPZZzIX8UAimwzTcNFbdE2lA10KdsKwg/wy58DhrRQXk/uIAhG5Z4xrbfUSx0WUGsZ6nZUvwFlYyBEEazKixR0GqIJu3h1FZSrbJMs0HKlpXu6FIhhWAR8cWG5mktbHOxb3mnlQ32xtE/tjIWm0fWKAjnoWX22XSiavaGg/oprVOZKXKTyN19Nw3pY1/wY8xskcPUcv3bUN3SoiprfAMXMHLwz3z1w2pQDFdoP6zX0HRy7SoXW1HCH5fFCJMIx7eDbVC5cRfEdFSItQNZVnskU1QIujXZAc1yna6uT33ZtdQJQWnF+z+FMbbbodFpiTxQCsfuq47aB1TKrFObgecQDH/ndamgqj/4BNnR2IwogxtbOsYNDZ3ebVqwu+n7Srp+2UlV1udbAXb4x1wTkc+VDcKbcnOw7tDDFjRxignLbIHRCPeZuf6r2aCoK39S7vV/6fZtYu3ZtWj7Njq34svasbUpcGlFIUi7m8lqiBF6oaIM77MW7jsm7+ul6PWgdO+jH7Z4PdZ8xopvyShN1nC43yAcO4l8wEnjrQmtCVOW6uHcTAsZ2GEpUn5DodCuII9OnOyIIC/IORpltijm1E572IaVsRs40cJEoP0d8E8uEDS9d04sRXd7gkFwj94CkjkCZTtTgOvj1215ZJ8up4fxuifct7ZzJ6y6pJ8vAQDlQ9jkeQS0I51Z7jhjyt03FbR/AAMmpiOvjS06Hil3Jac9Wh+TE2vsmsKziApDpRsagVXfYJCowDOCcPF1DJ5E9ctn1HnOc3GrexaWv3h3n0DgID5pMhYTQxeN/ekI3M7SuZ3efUwwjNcBUnO7veHIZFbneff7oU8zzaXaqgpbbWYdNurP6V1HNV8of/9mES0w4xGxVVXk5OT9nyySaZ+vzCe+znE+sbZOh+zFmbvevpbs2ZYb5h9Au0wOxa/Mg+U2TOu5h62CA398irX63P0+kmq/mnLuGFwXJxklCvs5STT7XvDz7YszB2ypWkcJZ+WsOtch5iT9dkngGENGUwAVMIODPzvbySd4DzIoFuQVgIUWbB8op67eSzWzY/hB65vCsFBTfz8OMHOR8p505OCTF0LwtSNSw9rVKI3cbhSmunMEsYNpEGoxi1KtlYz5QQFe8JMAweUILQPJ6DxG1bltPX8VLZqQ4yAtxI7NNqc/CBOr0QmlvLeJHpAtaIfvGo6dsKB7JNsxF0RgVdcAjHZciFXQsBGEd6FDysUWHgLR72WVlUjg2xhMrDlAx2XWTfVE7OtompPkPJ0wH6BNS+EOnkPp62weoGfztcBvt3bS57WgOYxXa4i3a4wMFm9PiiKN7j+ExPhdUM5fDUB4x1Mtcnwi9mzFpQj+UuDHGv7kbh88OI2iqdyAl0+mCITTspdnDjiUwyTohsT1020OoLoy+7R4+V4ThXU2sxGjFoP7DwHAM7WCfS6xD27OicVDoGGJvdHS/SnGIvl56u3D+o1zQT7j90dhvgoMcAJ3R0kMI2Wm6jzDbJCnWgOcjSZHqBvFiAaBL0UuLR9BPE/rRBNQA9AlQEAY3HrVzw7N1IHVga22iqCmAzvIeRwEqCpJBHDXJfJDYrxI7NaI1tzdOYOdvLxToLHStzhRm6OnBMoErHzjb1FTPdLPzqjab+FynOkW1f/b1cly6UcS2gnIRY9pjOyauMcmAcDX5Zysm3qioPijuWZYhYQ7azWEvQzodkYfTcd0/Dyk7BNUQU6biJ0TD3RZZFwH73ag2uSIUPopyGjXosIe+9bnT0JQGKejQ/B46bzi5PyKdsx08E7ZXWvWatkcJ3H5Cz0WGZ8CtmgbaIVE9H5ncVS8PFNuqFhqdzY3P3xPNI00Op3neZhhG87T7qOgdG0fZegjJp5mpRo5kvf86Dr5/+io4J/D2+SV4aiCcE87OJxoAl/4tiJNzjxxtUnC/Px3K7N6Y7qFMPQuDveUoWHUldfrXtjzaxxAHHiEZYrLgaA5btTipT/SBwSRR4ZS4cAcRKTF5RrrUD2sO6FnyD7J6NY2GmHmj7khbEnNsW9I44OxqEaA9ZzReGM6AXGhZmuxckH5wRBipPnasuQzVmw17KLetsm2wjtOd21jNdL89/zh1NC9xdpyam5zeR/y2w+/EziDP4QScX6cxU/JDCO8w7CxJbi1OgjrufHbVdkqh78n+fVtTWwcrOoM7kCUZFfrQ5GHMmRVLFcSnF5UkU65lAm8p70JZxSpdgzryRA+zouoM4qYGoL25jgV3dlQOXLWyd3cZpzrFU1jqSN7OjVUDDPqbpUsidVkdE1Kd2bmlPLUZTxN17gGav4mTTfOQ+ihUJ09w4zpU2z74dY3dztTzeie4cdYgzuWZicytQfm6Q3PV7g30IMtFSq0nWbmnBSrqNQXUKaN5tl7HZ6XAN9hK0j5pxKc9XfIIZ5vleCPHf1nJ5crffaAqb+8tnG3yhf6K/Wgsuluj6TlJZkjU22RczkMVV9sHH9+3gLd30Z6T4Geyja8roQKwcSiu05epVrG9WCi/MB6Zx1O/wRXWqORaXGH0EDx99vL5f//p4gvPwTb8EHw+gaNmBGNbH59dfHX2+OLV4z9OvriYPP6vf9UDqHa50P3XTWFLjVM8g807NeT96+xxh4HHAH57DXWHze4OiY8p7EItb0MVVV1T2mdOij0++L2K0wUfLFAJxkxKsLbms2uPWEwpWa4FOUvxcc0HSk4fpnxUaj9b9wxQO47KuZOyuYuioSOS9a6dR5OAshlhMIutB8LyVJGlX6M86IQHnfCgEw7QCU73uraI/v8qgt+Z6Eexeo/yn2n6rkqAFuadKkDNbfBPyQ4Akm4GhqsbNKE+aIYHzdCC/6AZHjSDBnJAJMH/Qw1h1AEGN7rqwBOGPSgjD35Yf7Dod1P9BEZ87oOhNA/XIt3DX2slo17VaqYb2ED9oygfs3Lh6M/tk9kkDfxZVQo7uwg7sHqT/bQT/BweXT48otzKeaMytf0BqBl45dl3CMC8/s/rpjrTD3QJe9Ta0vLVMhQ0GVb+QQO24T9owN+9BuzZCfVJuWMzRrm1rIMilv/JygOltJ+VI0pz+5B8l8EetWkSsA+CxXqy0XlSsa/fDlhhYb6iO4UIIoB7DhAlkAdu8++yDWVA+JQouysb1YHRgh2ppYbYVNBcT1QJepWPC6Ly0IG9smWCUHFW1ybOygqSqhnZA4pSVKu8P22wLTqr8XdI1BTtkm9XWUltqFTqslzpEw+Hk63b1aOjmh0wvz01O3U0ZdvX6NQkjniM7FeHxljtCWNRhzx5N+SIEBbNSKr+QZxkD+uwXXP74CCaAPsXC/0BLX1LA8VAzlG1QbI5igJgQMwvPYe14RLM1klwEf3Jbv+FWAOTLjiPArG2WTSq3L0FDiMVZRnhCRzLg0f9sWHJtKzoNiMPeSOOGtmi9rjAkoRmlfKi1gl0rTRF5BBDnDasTSePFcHptpwP6JDfos435Yq/XW+SZEopmfq6o6HsMa8PQZRtdo+bo4eHIA9Fqs4MWb1sLDWovkeUf6wTqY6ctOv+9sLx2IOc+OFklnfK89V21ny4tUUsrTiAUQ/kEV/cUsSUPCIJhn+c49bIItzQAbTf1wxJR/zjNGPIXg3Kpuc+aLWANd8OFP/W2dheD5Ungcdd5f2w0EWHp3T+D0oBRp24ojXtYNPJrw6+srv3ZAEWHU882mv11BitUFpsiPldcxWhxSAD6eQt5rO3Ybn/Th1P0j/LlsOh2/fiZHgCfZhUFxJFWi14gxGJQ5IPABUT7Dvzo8pRbh5D7FYly/mGufnpcDwzAnTLe8q9Q6zrjpGIxsaI4jvCY/jlg1C+2+n6I84AGNZ3F/VeKR1iITw7T2VDUxjTMervtSRnyVSQ/TVNQQ6MGNLpUH2hU+EcnQ+gX+bZuVjuvp50JZmT8sYjzwyYOxyg8YkRe0xGnDjE4BctD4z28RnNobfTveHS/pxBx/NCpz+lXuu4yZ4Grfo6nX0Dd4X6ln51vkXDPl5lH6NOVyu/Pt5pJLzsvMHhriu5h0Xbw6Lt0xFb+Dly0WZ7r+6+eHtYpx1rs3T46eocy71ZbL3xXpjruJavs50CcYd8tgDRQ8FHXXFxj3fJOrsQ936TbONOir5UuHzrs/csrLnAmn/y9dIefZktS+ukHN51ru56RYWZF1kFtAeTibIW79zuiN02RzH33XxQ3/PaW46vzPYV6jgDuu9+bPcK0MtgVJ8DbV8aScfXum7tNpBWIl4gySmG9dy556SswZvaOPVQGHzO0G8tq0lfu6S94+I9rIbW2YKjOummmPcUzRkU8ZaPezZz+6YL2gQO4mImqyIGUa6BBotsvsGN2Y77bAC0y4hV424oXZ+1HTbkg4PddXVXqHvAi/Xl9dprDqjh+Q590pX16L6wVDu2w8BczV6pO+YbHoeKTnyj24VcLtyWMQh5OJ6oAzqUCsh2e8XF8YYegxO6jycOXjx98t1PT6P1Ai8JdvoFPcVnummPREMknJ0FP7z66cc6xCJwCtuEry4zcGSZN7OootGWQsVhDZF0ZvpQWcdb/wW3TjetVl/rSwrPUPnSFbMhlj3Pk1haAUaDN61Mb/z37FqnRdUwiahafMkX3+I76hN1v1mTSIw0to0CJLnTLoBYhQDilxZATeIdldVrqt8kE/yo2aV7GB3zAmo314udVyzhnzGBumQFoybqUv3buj4JYEXZu3afTVzIvyM1xU0lFoYdtxOQrAMzpCc7OYmwIt5RgjWTGgsm49tn371Q7KHsjJ1Ko1+7PupUWquYr+iW6TxbYzmQ+DdyLoJVlr1TwZ8gnUGDUkZ4MLD3LAS/8vJiF63CGA9ObV6jKJtXGdhWShuU8c6juy18ibjEvUexXGqJ7fMdl7wcjBsXAaIC5GPzgLFdtgkXLNKecx/IuxP77DAwZqWEuSI1oUofgiM1SAdNNfGa+21znaIQrz6Bnty20GoRYk22bDCFoYVUa+O6Oy28Qauz0a2WO0Zt1ImdDssJ3zgl3WPdDg4sOAjlfHqykdH9OEPV7sUdLnfJN7NyM4PBzTYzNSsoQdFmzeV8TGbnLJ6/G6tb5jtuCDtnOwwXyRZAYna/1aOsFedqvlZ4pnG6Np0Im7R+1WHC5nS7rn0VMIguV5j6El+jZcppr885Odr5hP71Gk4KN23r7ecXz1gEwuJRyBuhrHzCkdfxwMh1JUO5inHvjF/xHYcIUnkQMMbUGc3LH558Efzw05NvNYHn8Q6vKNIXHfruk+rMlE4ej0IoCxBM2Wq+Mi/XqGbxySjUKHz9Zvtm8ebsTfRm8vbz8zfbz+lJND2DXwqP8DBUZFVPGQYwbkpfTnayAegGTqxB3zS+6UdjLpUZ8hq6BFNJ1gBTMiCSnxEc0wO/m5NL6nbCmvxP3za1s5oxr0URxXkOluqIwakrvjUHNZapHaICKjYMrc84SlhSSpjgby+f/4PbCp5hJD6odbXNOKMLVtb0sgHAuin9/P3Zdrs9w5Jn0KAANY3bqLAUA+18LVNQ1KIQZDinAl5AwQaw9SapJCYMOScgrebM1Hov+Om0jXhxxanwvXPU+Piy5XPTJ5aQo7zp5LQ7Jm2+Xb+ZPd+TKv8hU/5hwc7ajoiceVLTQSaFz/1iwe6Y0i7LwnK3NuyK2n8GymCGtikZH3XsoS/We9h0D5/VHqvkDvtbHR64/cHrffndQx/W78ELd9i9dUgNpYiL+arzTJYJlQc1iu4m+l1UnLj9osHzErChzjTMdlxRX8GLdQfeTN414fvKqENEe0yjzgNFFiTVXxcWrTNoyxgR5sh1+04Fg53mamVJSRlh+hBqCTqgRF4ReGnkee7ctdW+vUqT8Y9iGc93DbmS0MPIetcdtWsHMJiewvoE/cn1g9Nb7WO2nqGfmQnIcsp00Dh3yTrMiJu3hDeX8PcpKpf2Blv+ZvGloiwavKJI9NK6nsx0E49cNHjqtYXZUaJZiuLjA0pDilXftjjK3kY2zKMvVtObyTUv9WwhW1vOdPOBZ1H9komyuVWHbNjLfB5K964LVbebl4XwU7oukY6V2jlR75sp+naGMecdsiaa3KzRCdaf923NUqwZ3xsG5pu9leZtmLDfWGtgk3wfhcQrefH31RUQRRpWdXpap9nBx+n2yQEU9h1iAF8dfEyl5lqto2qmbbGgJUk0HYAc0V9VyJKRL/UPx6Fb72b2zIRvv/E1x1+h3xG/OIqZJ6O1bUmaCFcARD5emFSVgNK3exI3hExH2jhXvPTJHJzGUWGLHBoZ1W9LHPvKFa+6Hh8oSlTi5LvLkE9aCNgJrMNfMqlybnTcw/PpigM3T7IjDvrTJd+3UeAw9iDs/vYsvlckmhg0LRFx/1xLxfuyTJjhbFGhY0+6ZQTO7Whjy4gNooYqtmUEXVOhZAR99zK/YXwq4md7ejVw+TWQQI9TVs4NHKEe1rFe4k0L/QDyQ9t570M+7uz711jVdJ5IkVZTuTBxKsav5czAE7pojbevxY1IspwzbgMMfCiLwEBi3x7/Us5Oe1XCpZ/jdr7twPLPJl4i/vjizNxeH6zEe5BVc7mOE6tFLcLUreI/2LeKt52yX+4BqDptAXV4ttGATRRuTIMlwExXUX4taJ1nNYWWCH25dSeH4j5BnqWVFZbCDzpnR6dCrycGQxboKVVUWQEoG+0Cg46ud8FWVit7frrPStQdmAQvGRDd5m5DoxPTzsza2PtRziiawsQaPtKcl+/OP6htwttHOvOB/fYi+uqRF+3ymsSr1TmnyUaC6f7AkxB55+wJQoFpqUHe9kd6ofLZdxPrSzzs4VywevD9qtovOMQZ0fYmtn2Cx90a/9Huzb2vK+S7JklvMu2dKV3w9zxdQ2/C/ciTtknV9Rade8w/xe9E943VWd68eHzYNHrshuPQf583hffgeiESAQLs7ugeIsp+plK/Z+64kzC7v7kaKtF+rov+nmftHmTafc0d2Rtk4lmXHugLn3GtoL7PoJM9bth5ts7jdKcKJxnbXOrnCtrF3B/6RpOZzPz3+LiSk4I7ZUkSdKx6qqK/OGAMd9FaRqP90tjO6mrc+uxuFDxJEvssr50/Trss+m5JYLsw/Fu2SoOXa+gE5i/HdKh1DJGnrloWqsq/QOWoxMp/Ee/jdZ4IjBbxRtMi+k09DI+YnJ9vt9vIqnf+C4E6x6IdEbk0RxP9pbOXevomGKBbCHPbKj1vJ0SjoFo9xxNtUtMpGpdr7PFI4FAdlZ7ENxnGpOiwzEN0HqnXS+soXYsH6Kyksqs5OpxmgUl6rJFRE21Nr70bMDACK7bPYqD6bGjXTjEt9Tv3iK2YMllvEWtSjgK+78ouZV/1Vum7c/Xwubmatt1mjz5W2uPPOPBi5ONz5RybI8c6dHPcRjI5NuotZLOM691L/lWkfQGywb83mYpZpZn5l6CkiurS7uB/BSYioANudHDjKUeHPl0uTzxTAVN2iLsIuuYEbFpaRyPCp1nc+Ez4zREyUwz6CS4vEXV1wOYJUYcaz1OoV+SFLMWIHyik4D65uak8qEuxz01RtyJhIvIYvqhDAOqEKCKnYgVPLgDMxROncwEoBDG23pTGpaJi6n5EQeUUBV2jrriRqaxknMhfY1llqQoXSx0AhSjNkQpmyoWo8Lbb4Bdsi6JuVS4ILFLfjkZD/Jr//eZKjUpx3yuSuxSUxYFS0EW7UZGa41Q4pSNWDOdxLs9v/nhO4YJxVWeHRGsrxmMqcxTjUHGGV8ZHJzZ5IIlOpzjg6VT7edAly+IMD6mY40dhqA8fOWGb5SYHtmhOsHL/RQa2snY0NAXKCt5juiPxMWWChb9RgR6jfBSeh6fB50GoxmpFAk9xU7lQnbe6paPXv25T1euLCEC//SaM2Gbgqr0GU7xYyxSTIZgLC1kkulytY+rioJSon4NtvNPbOFhXliBy4fUs21RMe+UO+NlzrI62UnJ1rLY/eEOdo1Tbk440DCk+no5AxkuOOFBRw0aihhgmVdpRCS4Ekx+SyvB1ef5EqrUYwhuc/R5KxF/rBAuPM6IdkdGpczjU7Ll2DaRPVWP3u4fpDm0fHM/ABykeYahOrdsIijti1/jXODpQN1G1hrh9SXJZsea3YGvV4vZJUCZCvMOtK1Fcx3Ohjx8rbnlJdBkwBPLIcsAoH7XA41ziRpkXqgNYmeJI1WHiQCekRalj3Lo2RbRET4dQ4U60BIq9/+ARHiaamLVTVMdlHyE8uAvf2DULMNxyvfL9QwzUaNX3UwOXOkLhEhWccqCwvSbEl0QOvAw0m4612Mqlx/ig21HhFcF1F73W0RY1wFAXDC27l3HaA1pjfWgLmjtUFbstzDA0XYOlBZzf1yKWO1PlDmq3VTF0DjjR896x6jIHtepUghb/D1BLAwQUAAAACACOtdZCD75/OqIFAABVFQAAGAAAAGdpdGh1YjMvbm90aWZpY2F0aW9ucy5weeVXS2/bRhC+81dsnAMlQKbcxL2okYHAQdscGhS1gB6Kgl6RI2ttkstwl1YMw/+9sy9yl6LkuG3QQ3WxNZr95v3t7MnJSXTD5LZdv00qLtmGZVQyXoloOfaJotWWCVLyvC2AZLySlFWCyC1+KagQIEgDBSJUN0RyEiAmUXQFQGgh+IJspawX83kO91DwGprEOJFkvJzfv53TTLJ7Jh/mAcI8OkF3o03DS3IreEVYWfNGkrwta2HELhb0EArhFH5i8ud2fckbiKJIO0pW2wZoPul/mS4igh+0sMJoFlprcW3UyDvz9+Ka8PUtZJLsGlqLID5MglIRCVEp0lhdfli14U1p1Oiat1JnrIGaCyZ580BuoILGpg1/8XFnSqLhRKttzwitcgtAMQuYV/XrasetC2hOSFplWIyMVmSNtdlCdgc5KdgdEEz/whxRH/kdWS6JfOMLXmmBlrxHU1hw+Nyye1pAhZ4PjicsNwj4z0D8yom1vCu+/vb3GuD1PYPdKT0VmKkCTk28rm76bw4bkqasYjJNJwKKzcxkc0awOQWCLD/xyhXbZBWtT0x9lVKxmSYdQHh02h9CtSSlNSNLA5/cgJzEbVPEvdLrBbnkZamS1oCo0X+2xqnBVtgrcgic2VMBthXGM/L4FNhYuaJ3PRai2aYIwIzMYnXqwQTp7nQD9FvXqr7lXmoYwLq9o8gQNAcy9MRr+KV3eOI51qsY52xFfKu/b6HS9mxgyhwOqyRtnVMJeWjTClOq0mnKJmRTS1aCb7dXi6eBtY854RvPXIjOBnlleVj/DyxTBaEYMaJge4iu/GNwWmHYUSKEVH4q7x0TYcawuzDvjjx0LrSG+tYKaIjO0yGjSj9VYpMjz7j/i+cE2+wf7OfpEO4g93sqg5527EYeeItdgd8yQEYYIchhj+lTQRxGFqbxypCpK+6ngHEhuUlmZLdl2RbZT7Qwr9uimOdss1FsKNUdyCofztx66hbg5gJQepTkXf1DLy2Vh25aYTygmbban18ji+3sGs5TjWA5z6O3BmTbVCS2Nxj54/Hs6c+LODFkMfG9sdTAZAFqCDxo+NyRKcdsNfv43TQsjUbH+gaggq8FeDUGgHc5SEjRT5E1rFYpHcaJ/P9BaxFfy06brpkKP+nJbmEMiwVZc174ON3/OHxd465bVuQpSnSdOgPIUmsqQP2w7C6F6WhwqbID1HiepCamCR5Ekntzdj4j52fnXtaZSE2VRyJdQYFEgZOhZtGjQozTdguGje2S+NH4vhit3lhJm7sRO7+g2Mengrw8i0dyUFOZbSd93lQivh8mQoDcr/zMlXkNeGuzmwo3uDx0/gpkx4CxONoWXjw1bWipg/EsLMikUSuQsjFDpyQ0Jatwv8L0BwsKEVveFnlAhmtHXriA6Rs26Mcxwzacl1pFS4FhC3PMaFc9s+/+cH3lZ+md/+3i+hvNCKoiwmPcpzteBNWNbSAotv89dYdvDdkbWPXFdVYr1WjN1HVJl/qBMEHMqW6xs70B9QOdKBi7d6hUaxP4mFCXRAVeXx5no0u1c5unEW7jshXuqhnrR8mfZSn3IvkPKnQoyeq+cPz1z3JqH2XBkeeeZscSET7THHtVZjC9NTQogrdBJ2NPlpe+VTA9+FQxxk99S889WFD3meeKH+3eo8U/Pv5kQY0DDxa7PumtkQlvDActOm/2XwTh/tXZGNu+uiW2217N9oQjsnPrfVAbteRniLS331vh+I7pXOiVBtv9+18/6vng4TWKt68k8IUJKcbeUqkdKQffS+Nj6F7fHbbQKw2thL8Mt0RH9t4BR5sz8iM2MQwOeKX1zngk3B37+h0zGMkDm6aFnw63uwOgR1ancG8YW6BsBo5BW5XgWO/lsZO9VrCr/KvrScAa/9Mlxb/Lvtmu0PXSsxuD0XRc299ryDuOcv8CUEsDBBQAAAAIAG2jI0Oi6PERzwEAAAUEAAAQAAAAZ2l0aHViMy91dGlscy5weYVSTY/TMBC9+1eMAivZLGna7oIgUpUD4rAXOFBxoJTKJNPWkNjBdlmttvx3xk6bdJetyMHxfL15bzxraxqopEevGgTVtMb63mbrELX4a4fOu1Fpmlb6Y9J36chrld6wg8ciY8/gVvkt+K3UPx14A1vvW5dnWWkqHG2M2dQYgLI2+0Gw9i6tTSnr0C1TzlGjrEIvVV2oanbNbj59XL15PZ7AjNAjAVUjT77xtOBFvpikb5eLMR0vRBH/99d/RMondJ8u9+MYJ/uK7AnZCYMnvyQm7umcdnCCz/mUblfkDKWdM+f0f3VinMXrs/jXUbxcioJ/2S8u0yXRfgK5Az6LF5MKUTxPBGOswjWEgTkvm3bVSisb9Gh573sJsq7N7UobjbO53aHIWYRWJ4WgHHyghLxvStGhLn/AxaLfWR3ze7+VyiF8lvUO31trLE/mPfbv4IVSam1oUzAWBu6HNsopTYm6xFPSx7UTQ+9D3z5ppJxZG9tIz/+HNuyneCAxMDqu1YiAyu1QJR6pfqyQJzeapKlqYJTDhQujDLASuiDBpwH+3Hv27wqdFo9VFJ8IuBiQxdkpdMr/nf+7bt6yLLH14O9aDOSox1CahA4UONEs2F9QSwMEFAAAAAgA2pkyQ73wA4W/DAAAWDYAABAAAABnaXRodWIzL3B1bGxzLnB57Vtfc9s2En/Xp0CcB0oTWU7SPmmi9tqkuXim/yZx5h7sjEyRkIWEIlgStJtJ891vdwGQAAjJlpPe9OH0YIuLxW8XwGKxu4SOjo5GV0Jt2tU3s6otima0cD+j0dlGNGwr87bgLJOlSkXZsLQomNoAoUibhjes5kWqRHnFlGSIAoQ/Wt6oZjYaHYGE0bqWWyAysa1krdg2VdlGE983srTkvN1WjSZbneC/bX0ut1uh/GZQjBeN5fi3UK/a1W+r9zxTU/P0XNZ8yn5MG479eRkAtA2vu/5v4cFvznkm61TJngdHJmreLNNWbXxm0TQw6Fmm5dgOp0j1ZLe1UHxbwZR1E/L29emZIY1GI5pW9jtM5AuYRFHC3Mpy3I9nMh+NGHxgas9gFebEP78MOrBnAeG7SyZpbma6+xvOYSUbOWcbpar5yUnOr3khK17P9JBwKCfX35yQYZw8vOLqOD1uYJ0Lfoy0Y7PMnTb6S87XbLkUpVDL5bjhxXoKpAZWJIeJy1ATGAAzn6YFeeNA0ynDbpNZh/KrLPmk6/Nwzl5YKCbXZIpbXl9xdgN6wxI1FTSiMSq03rwH7sUC/qzThy163VwpL7Utr3nNy4yzRtVo5EainksfEXgRCwTOYLbGCTwnnt5FuuKFRdipmOZygYjiQ9llR6tlzzyDniENlrvmFUwGGB7tTdT5pgQT92RhBxCFM9w1iLUjGhkSZ8XCnihrHLJP2WDJ3rz6wQ48o63MUkVPG57mvk7NJvVGD8/O2IllCWOTyzLdcuBMklgjDdZv9QaGTNGBedjIf6553+l+2OCos0Oq2+88IaoFKOSVKMMBISd0G4dQ01CnibvLcIXNLnNGUnPV1iVLnn16/Jmdf3ry+d13yWwta/C7Y9/yp47BTTzX81IUfOx6VIMfcTrIqr0NfvtSN1OIRnnupTleA2zTOZl+9J6PqZAr6llQq4FL0ex7DTRmlNQtZpUA8CtajEFANr8/UoxNOSCW6iO9UalqGxdryqDDbMqSNM95Hth7o9l97YgWKNhuV2CcAAsoAtcfZJTaSw4V7nk84I68CxuOZH4bds/jYXfkXdjZJi2vIOLYpjnvHPwQ3rJ54IboQ799/TPiXAt+Q3O9KuSKwVbZhYzty7YufGhL3Y9dpzdwzqzXel2j8MAyRDdEH/x3jKHYFQcXAVFDzlYfNaYbf/nYFfXwkImUHOJRcD+x1xqe0cY/BycT+hdr1b5LMd38SMbs6tCnWBHPnIfQs5zd+OEmg9hUpXBSNyxLS7aCfbzh2QeYnEJ8gONbzk3ghJ/qCVvAXDx1CQ+IQJQfypzBbGK0d50WGM+poPtM5BoBvgTkB5Z8Hwd4q58DLvRmTQMbZUHHbMzpmTkb+j23e3ioppVAAwEWc5iD1YHP8S0Pg2kv7Ap2CDYvBuFrD4oMGCEkP9IXD1rmHy20t7Jb0DcdSEJuV10kRPTdBZo27NXZLz8PQZcbtS0GyEQ9DB4iegE+kP+pIkKQPBSC1KGQfZ579473PHgn5h4OfLcIz5F3Ilw/3vFnhWxgL7p8mrRMlasKO41M5gZmc8V5aVBcxXPwf0psbUTuR703G172aDeAEgDo88LqAdrpnQCxfoWgY900wdDRDAAyTu7Hy/4RpXO9JpBgqP7wDdFfiOeWFQ+CcSnBkphNGCdxVHtmDJCH54avqIjpKSJqilBL7cSRn/Ts8Zi41WgMZ1RrEVP60CWuOZ6JgVBNjC6yo0LHlUz2HuZ0kMNxJTNB5y+lnlaLMM9crwdjtUR/oHgMliABcyKWrhWvB1vBxybGfd4WGcjbvqIvoTAcVsR5BULA8Q0GYIlDzLYUAMLgILwVWfj+QOzX0JluKrYEWEgaqNlRXVf0EJFhF6c1J+BClB/AYGt5LXIbS+ESU46U1h+1TXNdrcrSonA9EEuW1D+ZsVOVNFgmaDMIlzgGEBtZ12ItMjhyJdrPNv3A9fYopPwAO7uQyoHKCp5S0ncK85WBAyUsNK+NyZa1qjeyLUBPPnf6smN2eYkzcXmJkt+3je6BhzqM32QQbgdGEUkDIQnwuMEIJpvNyRxz+ZM5PpjYZF6S9wiFWm8TF0zhdOf/pJ5JWpYvU0nX26xOJwO/a5QjNq1ZqNTfokgoH/dJMDHdfkqVqsWqVTzsVHN0NMs7TKzdX19xeSNTiRW3bjPAbtQWH1StyDIX7JNXGkmwLZn3AebUb+7OwDlLTpLZeynK8XnHjGWRIs04pCqoIQZGerbBpXk48U+P/i7g1zCuXncWRZ7P9rRLGbAE6+fKYY9goF1D1+3zyJ3tAw88CsN7l6QfPTe4bZF0UKQVgNIANC16huomCpSM/Gig9J8NB5HOsUYVWr4FfuqWriCnBAes44uIdGLwhmapsGQvIdHyqzpWnlCd0wSvS37WFI1hE5VS7ZC0xDrKDnm6bRisO4UkLSFWTqKWpW5ZmtqSL8JpDGSYymvAny9XHw8uEd9spF2uLmiLLvnqo631Yn+TVuJikzK3xMR2sbWrtGcAuSGhZP3Rl6i9kDdATdofvtBLJQ+ISIOIoKN6yUksPvd38TDYeU3tti8pY1/jzNhPf1ZpmTc6MLy81CO4vAyrvqEEnOX+bdDY6qUTEKvkLdNde3p1Z+7uMCxwV3smYX8WgAdSKHx/BhOgDxYr0u4u2xaY6W0ixqP6rDu/uLnIL44vZhfzd49OxhdvHk3s3+/n2qP/hfiT708u8kdJ7Bjxw8lgybEQBqMyJf0pS3ozTiZ6E2krR8eMhTAIg8vZsNivu6D+s6tatlUzHli39j3O/hmWfX3XpB3SAEcJVXQ4UQPQHC4UUQ7Iwig2TTFAQY7+BZlOyKj0GpwlbZXfISHruYKE7A7ObZeelORJL1K7NVMZ+Fz9oqtjgu3Z8d3ysqwjGC963/Lr+cNI6VX7GQ+T/9EVDyWehUPgLhdbaI6udqkBSn5XgAdRAL2GbgHTLVnSyoflSbIGW6Qk3n/5r94tOBVlwvk6Ojp6jvRG70dv1tAfy1bRqQcGMeudyVwPppmzlZSFCxYdrh7VuN8/0764B25BV4vc4jqm/BFNtUvpigq+uKbqNgda3Y4o2vtgxg+bYPEp+SHLeKUwsk6rqhAZ1QZOrsvcJgMoL/k8CYeHYmd424PuMRjDXuKkQNQ0xtYpe/r48ZR9+/jbiXMYdSMVzVKHDbGFwZp8g7lwwzmiDyLQPqI9bHH02WGUbUWRo/c2wRE4aqw7I2XRTeJg4P5A+2nHUwCH/K0esjNQxevucDL2rXfg4vgJpGQqvQpL9KDxqaKXNkxem0DYP6mD2pk7CVVap1smYFm0lDkby4ryMlSwHBQhcZr12GbsBV+nbaF853T8xLTrWz3pdSoKirAtwiwUDj6axuWL/uksvWJ0vSVlFR7asm26BaUXdXCcpVvuCedlXkG+pyKLbF5sSRqNdfU63jL1UfbMe/zu8oI1h5hFF9AcYBm43GNQeGy87FQXVjxFzKrjn5ihiMPtpPENRXxlOxFfaibin2Ul+qJYHxLA/5mm3ctGxFcxEa3AHtugOw739yDUPVKP/go2oqHvbSHU/Z9kH7ErKwfaBY3pK1hFfztlp13oNOTLjxidk/z/oLmTibiXNtkz9+lQU/EthEqk525V8iBzcRUZmsyOAJnCH2M3pqJk3qYvksQ3ml+oWnUHu8Cl8bH8RTJEXI8VxwpRbmvV3rJEq2N3CPQg7k4jdxYDjTxRpgtdMR5/SnxWiJB9ghMSf0FQSW+LbF98MBFl1VJEOSWlFviHgsvHQWkkUiFEkHO6ePYuNBzdpMNmaO2Wn6pd+7MOYvlfph362tFXzjt2mH/NZcXL6AQcYwsVg+m9vpsl/m1ZIYpM9m9YB2GqSzfk38HWAMJ8pUJPxO2/pb533cIE7u9cr1TklZycfqiI32214xJMrDfp7ncf63lxs+YDpt/s7U+mZjVnZt71faA5M1Ovi2NzLf9zuEs9Z2Kv3G7h+FyW0DKmXTpyvQ1SfB+zc793W1DvIbPvyRURrt3+Ljz2j91NtrUUbPcvIRsrPKudF+OGRq9Furt4Xroydn4bEb+Otz/rslfy2JmufGpvr+RIizeVNy/wCH8igpx4l6/75cQB1/gyusaXPXUJD4hAlNuu8WX2Gl/mXePL7DW+7N7X+OyAb73Pl9nzfO+VviDFDC71hRjuVYe7vwaiO7V9NSJa/4yducB7wE8FIj28OqhR+rdaXAnwDowq5fgjDTALYTQcXpyVhn3ZsS983QYMiS/v9xTzJbkDvsLWABFpwZ1cKxuTL3NlJPbub5eOvWr4UvKxCz389YSzUmji4W9ITNxAF2w8IV3DQfd+zasu6wVil35xLWf024bJ6L9QSwMEFAAAAAgAbaMjQ5oOioPbDAAAzjgAABAAAABnaXRodWIzL3VzZXJzLnB55Vtfk9u2EX/Xp4CdB0odHc9O0heN5YkbO4mTjuOxz9PpuB4JIiEJPopQCPKUq8ffvbsLkARI8E46O2nS3nh8JIBdLBa//YMl7v79+6ONLLfV6qu40qLQo7n7MxpdbKVmO5VWmWCJyksuc83ElSiuy63MN6wQGS/xoVTsDTKIR6P7wHS0LtSOvdcqZ3K3V0XJ0mq316a5KmQpdnugFHXvm1fPL2yTGVNLBXPlpa6HPcM3fwAIJ7JmwPey/KFa/bx6L5Jyat++VYWYsr9xLZ4kiaq6DFKRqIKXqmiYFOKXShZCL3hVbkejUZJxrdlP4nrcMpzMRgx+YK0XW8FmNGS2hDHsEfz3eMkUyRCzl5mAmZkWwooTaUbjnqqk2sFyQH8qJ2aPtmW5n52fp7DoTO1FERsZ40Ttzq++OqcdOr8U1/r88XLB1qqArSlAhzk87ogPqB85XRwUg3HQo0ueJ0KzhOdsBXu4FcmlSFkmL0EmNZuZ8fhz+ZDN5+zyS7fhHjVQy5M8ZYAFVM0Vz0Bu2HKfPJap4QAPneZ7bjPiA3+nYs0WC5nLcrEYa5GtpyjzFFSlNSxl/kLltZrxR1egkfFPZkS2nsQNrUs1acfDoHjB95LNkW+8EeU4qoosmrIoaod9MWO4g6X4tWRqzUp45klZ8QyJfGaoUYcXPPT5VLn8pYItSWtmSMRrYPr8UF8tO5kGpJIlGB6ywb1nG34l0NIsX5+bGeswpAbg6Si7EPvCKtvRbCHKqshZ9AgtGHHO3n548PHd4yg2uBq3/D1uuhxmVivMHS9+aTZawRKKASoDIxqBkHEY5OJYBveCDKp9Cg7GAZsLL4JLB1LY1ACLhn7jO4eaNfggUYquLgDpT6kDdkySB6mx3xV5sVIKHEVuVL1w2BGEJ1P25YOvp+zrB1/fLIdZoV0g7Vh3nSDBGxpkZEK0tEY82/OC7xhsrCGesbGdJ51Yfg6uQ2TQ3CFyDAttYS0z0RIaHegZw/W7MjbPFEPmDJ1B0ybXVhYOTglnbHpID7zkQPHBGsCs1gMZ7AzHf/TG2xmMsvHF6n3Py2Tb7sGUGM8pjo3xcUK78mDiioXkvjSGvkYe9k+8fouCi6ISXWR8xzMtmvjzMgN4uPEtHIJwGHuE/ztByIRxfgmBQOalKMDDYdA+QHihjYHAa0KQE0oYX6mqZNy4HghiEswpHM6eAAQhIsgE1phSHnBCPPsCnNUZ0J9xl8sZdkKUM8h2Q2Ub9/ReJHItE0g6XNQE4gqurxdKUEe9WEIjXTf8otqtYP2A4ERlGejE5Aq+3/C6AEvIxThhr8d38C/4rrGmZgMaljn2upywIRoQbV9AUAaTBv+uOqLZrgV1eQy9Hp/z6z1PwLqyTB1E6vPT1OXyoZaT4gxhNBRjcI0TkICNXyjQN+SZfHNizEEWLYHUi3UhQo75W8yENLkSNA74xxkONQsbneKiutNj+IqQVxRYirVmNJKxk5NObCrVsWaKyBSXu9a8Bd+XgT2jCwSlVJCzFGTejQFbgyZ8GUYayNGCjjNMsD4nnSQvcEo+WVE+WX3pNtyjhqPyyarOJysvn6zqfNI0N4Y/ZPko9i0p5Rs7xPMDHp3n4nNV2oTrei8Cvh6bwT4iZBuNXKt6/rQ2d+Qe4XkDMMFgQ74vOJgiL3xT29jWBSWKSGMMzmkPJLMQSNjZGXnJrcSTD4URbELJ62Z/JmzhK0of22nqxsiymDiL+YLS07x1QNUqk8liI3WpB1wUjWD+COOhHFpPALcDhHjgCsBeWpfXBbyd+Ad1YLsq2bJU6ks8umqIIClbXTf694XAYYtK4364IrTNXQEG3S9Th7yeCQDen4r6F12/3M4Z6DeT3zi3Ud9tc5eq5FnDu6/yQH9v7gsc4+79cPDx2fWXGujv6/kfWwn7iG65XRW6DtWJmDRibvIkB0TwCjw/fJw4XE1VYQGnQU+ctrlvV89MIeLNq7+zulIRs2e/7sH/apNILZe0kOR6ufQFa9mWMJ1T6hi3PRN0LY5YAm2Wkl5XiO8UheTCyDFGg+asrqV0jr7remxvmV6PXWlDuw6PhnQxrJfv6u6bVUOnsQVy7WrH499V0LpWzXpAKQTR3gqb1r683xPmb5QVqcG3dgVtmHaFbDpI0lai8B7+XGx4Lv9NHuuYfVTu+N5Ke73d/YQZX4lEyCvwCw6Gb56zsBSLAUMJ9AfnBXuGvFeK4+aE0YGZbGuXPyQiBZwwewROe3/zX5vOW6AKPhRQSpnVcokCdJHgzNHFgtNFaHDFDOPhdbXSSSH3x+JBu+P7y+/2uno7MoXO1Ebmg2UTnGuwblI1udSRhROeAoh2XGYLeIJebWexb37O/iRNKXxr8BaQrBBdPbKui3mnSJtoNTy4SbbDFQ/LyC9f9OaAx8DZIAOjx1joDRfaFT6o6t7yhR6/tY/vTtSc6OhO6Pnbd2EFdsTEU8Jy2bwC9kPKbHNwk70OKpOU0XADfSqCI8+6+hSkUThGwLv4VLXaMs7bd26y3krhJerGamzlrZIZ2ec4ooWBvdB07pHY4d8vE4GPGwO5rQ81M1J16OGku+1IeUQp8XijaCqMXYOgrxzOaeMzgN/IdtezcWhlx+N9gPo2yA+pJ4T6WmOtvwg4k8+J+0Ls1FUQ+YMKPRW6t1eZW+ya2maL4MnUs4DeT6cmbQsuHNz+JhdiYU1kyiigTM0BQUJCcH1jKYbye1tfsLxS1JfUuhKY9ht+5y27YLmmLqHgmpenqLI+hvSkBvXWa4P+m1XjRNKj9gKDN+YMvUJ/XcWqs2RXpberEX43lAB2olouwy6AOl0HMATL25TpZ/SxoPRq3J4A5p9LLSUwNBloXeelisGcyhVTe0Sdnz0E8yv5plv9AemfYy0cvAOW5+zpi+1FgRWFzjG6rzIU1E7om7rKs2vjC2zNwzLG0ovrXPCn72C608i8tAvxZ2nP35Y9WIhRZMyeijWvsnLGzh56s9ltxMIu41fgKKjmY+jjECRQbf60zy74xvhJDgd/cSVVpemDudBlnTVoLMG684o83StYyA0RvrZWOqKwR/7n/5haHy//xcKhf88hcYfQbw/wkZcC2C3yBEKCmO/3IFhdZnJcZtgv/AWJpmzFtcD3eftxLgxkROcYFj02OwW6I0dLS7GAxP+6eG4O5xbSJ4IY9d+wMOXGQQTfDq2WUwBdnkbPHobR9d9B1Ubkgj65uNBya+lDSBoICY0eok8HgCk337L/raO/w/5T+R6iJ/p8K/ltzux2KBimd3Yy5nbR/xAYQLm/PRjwrs/dcWDDDzIZ8gRxzGA0HtPpCDabsQfxX++ADprjzuBA6j8QNtpbXCciA9fxGUBBd5wGMaGKjZ/0QMNdcx2uUWPXDEMhLzC1ds6LbmmxYZRyvV0pXqQx+6eq2K4Cva+6VRfYiCspDoS4cK4JvP2jZu58DA9O/DunQ3/ibMiAM4rcJAj1fUwFxCZQcNIBCvxN4Pqtc55OOfkzJvPllpft/bktx90xc8XsefstFs9JN5/7p+wa4H6QABW8+1J/88IasZfl25tpB6lbbg0lnQyI3CU54WiRwnm92Mlc2GNeqNzpbTNMBpkAiBSSGLze+6o5pvxella7nj9ghvhph48Oiv/UpxD72cJaolZFSQYHCAR/TZdI7PuJZtkUU/CbkJ1kKDVtc5Nky/NNk504GnyCSQuJR7huhGMEJTQW7aAIw93e5kaGJYDcZdfcaHvy8vldcuR6QeZDd2sX3q47NjIdCEH+l3THLnClnbqiRHfDoqQQ6AEiNj6APzDmANKwA9fe7HbcBI0/Mh92PKK22oWkDOwC/YPeUlSfhGRqlB4WjOskoslSAU8Dp0fT+QfyBK9aNTTugFQTtz2Pw1VF748LDBLs3xW0pCPHe8BKNV1Xxc2NZrTHEH8btUJT89xeXDXWberHixyMbmw4Bf2H+72yKcfhV05rxCilsdyTnMgrpzJqZjdOoOdM3G+SdzvO+H7D8FuZTPNTD7aedHc32v8j8AYQ5uaQnkI/w3HIhVk3YB1zDR6PFhbo9HXEPq8ytbGPidqBTVybt25dP1MJdwJefSuuzktXUoXAu+5kZnTSsiidWvlot90b13gBoeHS7dwX6kpiuLNXOtsQFz5i4bJnTMSbGLzJj2qbs9c74A8bgtcLqARPY4LART01xO+BONZI/I34le/2mcCLokF3jUpt6Owt08PhEDt05++J1TkODfKwuzEL9dWb0euklLnemxmCAO2V7Nlcow8JK9XMxny2zviVwti948VlCs5x6ONHyGroCIEunO5oz0it9bc4eKXf8E4rnpGO+l+PIrtsGGCfgKJeLjTWjwHK5qLmrNEAziYVTibVTUGDLnPcZtBUD2hH3fz3Et2viTTD7/OXEv8BUEsDBBQAAAAIAIWYPkOZqSJPLAEAABoCAAATAAAAZ2l0aHViMy9fX2luaXRfXy5weV2RTW6DMBCF9z7FiC6AKnX+Fq2QsmmK2khtNxwAGTBhVPC49lApty8JpCL1wpbf55n3Rg6CQByRm77Yit24hMi0hobZJsvlxOxJOq4rSe64hJocVFT2nTasGMlIIZKS7MnhseEEojKGzWq9eRi2LRQnOCgDe3KV8iWJpMVSG68T+KAKa9QVPGcvC/CD6fthn35m6cWhI6eh0qyw9UIEQ06R54zc6jyHHYRTsnBQVc8NuVGee53Z5DbCueMZ/oUe8f56ncX/3+9HOz+MPBas5KNcz1U0NV0Q97bVERqOML6Mg4AGZuXS2xY5CmUYx0LUjjqYJpLKDo87S47h/paM5xW+Ir/1xWI6U8PaWYdeX5Vs+J3e33boqNKtv+2QOkdOiDuoW/WlnxIw9K3EL1BLAwQUAAAACABtoyNDG1tndmIDAACICQAAFQAAAGdpdGh1YjMvZGVjb3JhdG9ycy5wed1WTW/bMAy961cQ6cFOkXqfh6FAgH11XQ9Lga49B4pNx1psyZXkptmw/z5KthK7XrcdtsuMALEk6pF8fJQ8mUzYWtiiWb1IMkyV5lZpw+ajh7HrQhioVNaUCLVWdyJDA4c9YBXYAkGjsaBy/16KleZ6x9iE3LBcqwryRqZWqdKAqGqlLWw1r027pvG2od0mIS94sLhCUytpkHVjZRizencKcATxQkGq7lDzNU4ZgJurd7ZQ8rkfedzPVgu5vrgMgPvxCADvU6wtXHi7M62V/o2XFwcvQgX8tzuLhuC52btijKUlN4aSaXMMC3F4mZ56qAxz4oFnscEyn4GcnzybwTHXa0N/x5ute+tM2zgOyRngElSZnRi7oxp5fzMwFDqXkYXGIJimRr3frNE2Wu4Rkr7fKUXcxnLbCKrpkje2iF31Ou9U0veh+K72UlmEbSHSAtTqC6YWKiSGMhMgwCEoLb5yK5RMnCQczmsvgBZ5z4AzXboFCreL6HEOnDHM4QMvSSNhUuRQcMOtDfujpUFjyHPU29rb7s2SYJT4WaUHluEZWhbEGmqTrNHG0Zt+jtGUWOwF5DCHvrsKuOQfSXNvTg2Bw81edaF5hy1zLuzHZuUFPNhyBJ9UugEOL58+c53a9tUgIqJijZKkbnGZ8w0u0aEsg3E8YiT6NqmICmqNySlMrjq9+GRRWpF6KibfowRlSkHG0wHCcKS5IJX2oo91a9AR1dfFQ4GuuBHpz2T6ucZU5CKF2JtMH4R2OMOStlr+oKMfNUz2Z8omSy15hU9qarmt0hkLwtprgXozg61yjUgGG9hS3Qh8gxIoKnI07A4Wgv9LPfKrdvChjdX//yk1fkSqo/KNxTs+B6b/SM+/TKkyazrRLbeNWTrnc2JnBj4QOsLnUWPzk1fhgHMEhbuzi1Invc203Bt16wGLFsNrt6L51gM+uL8opIBNONISbe7fNBWJeg7XusEHyzTr0dr7ZsAHkXAEN0RZ5Yrf+7jYUjkCNS66TKXkQFpfH3/J8bJsPy6EVGDEWlJmxBvhcerQTJi65DsKiSA19XC5Y9QTyh/bKO/i6PxscXb15vpicb58f/nu5tPZ4ppGl4toBgslcQrzOUSdhqOO4P7d6LIaH0U0W/JqlXG4P4V7J2upbvn4m+IHUEsDBBQAAAAIANqZMkOjFt/WMAQAAMALAAASAAAAZ2l0aHViMy9zdHJ1Y3RzLnB5jVZNb+M2EL37VwySg6TCEZz2ZlR7WWy7AbbbokjRw2KhpS3KYiOTLknFDYL8986QEk1KSdEgiB1x5s2brye2Wh1hr/qe761Q0oA4npS2cGe5ZlbpVUsGB2G7YfdDeVQN74PNz8J+HHbvleZrGHR/Ytrw1Wq175kx4+EEk8e208NiuwL8ubq6uu84bJ3f9lvq+A083EmduTbA+h5UCxbtBVrU38GR2041pkQUh9bwFupaSGHrOje8b9eY3iCto4jfe7MGw43BZNeAlNnRVJ+VRFrcsoP7OvKinwvtcgb6/BJwimB+vYVftTgIyXqQw3HHNbFFpkcDmv89cGN5E6wJqFSTfeV5xlifZxA9by0IGdJ3DUrQHMRrUH/8/sm5+WoOhjdgFRzZAyFlBlqhDXb0w32KhzVDNPybPq7ZSeDzySQO9N4F2HEhDyHMniE2tc6nYdWMNI5URZ2JcX6j1nBLTR8bjuXTT2CsRugUwLcRMfyXGVfNj+qR1xI7m0fmUdfgTw6NAqksulgMJrAgNPcU9jQRwTNpS7I9MzlaRalcY4dPmpOR8/twzw7Qcdagp+Z20BKLsXsaRwqDYfUtwZ47hrDXcNd6TPwlJn4oEUli2eCsZGaxrI5g4IbhTri0HJhsIiIWETOPQuBw9pTLuL73E8WPnuIj6wf+CtG0mLQjWGfiFoN5DAMHLmkq0b9V2jHEiZomP0XqRpcKN2nOq6d5CbkZzmXqS+d1OF/S+UT+xjI7GNyEhtLac/E4Xz0HM5pVsFmFU9E6MbjIwGuss7v2hgLf/MLsvsu2zuVlFYkQzcOoF5GknJjt/E45wcynJSpKOglmvhOQ/ZjqIXx53qDyPN++fH2XlVhlHKL8svprB1/ELJxOLlg4MfSL4EQx2uZ1vFTrsKLB9VKDuCSX6p070XPIYz2q4OYWlI416h1sChpbYpIWOmqsX+ADt3nEt5qYjZGr8bNYtms+KNPXNyzDLEx2pX9S0xAlPjghnkVK3fd3FCMaDi8LfS35P6SAGpk+QcfMRVmiwo3AXoamZaMSBTpjpiVVJKPtzYolgXhR/8szDfyXUTJUnP7JJ981fL/ZFAuazgG1itJckthhqg+pzzXutTwM7MDNON34PgeDao7j0oh9oq3cvyvKeVSB9tgUuec5EVg7x1eKMKZDH6VDymcZkEAJepmSydL/SfC+ocXIhV+Bwkc3w869QnN3kbhcDwrAixH3DsXrLfFzf1PBLUGlq+C9NwvH1BD3aLOk+ka5w9hFU9AL+TDOAB1ldI1J2foX/uTrTfEZWmZZIit0vJSVcXxxwvHdpserUoYiVNfzUfWTRidh7CatKuYqSMHyi0NERPMWs+vCTU82gu6xrK9+YljSKGZyP0quXjH7COFt+f8y0/6vEyJt3ez28f8SpONLUiHdiH5kWIbqF6t/AVBLAwQUAAAACABtoyNDA4G9gHgHAADVGgAADgAAAGdpdGh1YjMvZ2l0LnB5pRnfb9M4+D1/hTUe0kgl3Y6Jh2pFN+BgSOgOjfGEUHEbtw0kcc52hnbT/vf7Pttx7DRd25GHLrG/37/tnZycROtcbZrFixT+RrPuiaKbTS5JybOmYGTJK0XzShJaFERtYKGgUjJJBCuoyqs1UZy8zxV5SxVNo+gzYwAq+ZRslKqnk0nGblnBayZSwy9d8nJy+2ICX5PoBMSIVoKX5IfkFcnLmgtFsqaspVleUMlenrcbi5fnGVvyjJnNVgEQlRWyBQJhrprFP4sfbKnG9usNF2xMXgOxN7wsQd8Av5FMOPQv8BFuI0tBFe9gBPu3yQWTc9qoTRRF2ibkdcEXI597Mo0iAg9oeQOWm2qw6XeEIxf4++o74RoyNYBHGW8BBOTEcTAvGVuR+TyvcjWfjyQrVmOCcCAJsY9sgNwIuY8JAiSpg9eQHSBspnNa52SmaaRrpkZxI4p4TOI4iRzgsym5pr90pLBKEb7ScaJRQmIthE/PrsVJyir07Cgk/BcuYpRZqqJj1CPOWkifervYE/etDqLsAJEzCzkLNHAw+arPfEZiE7NxZ/IBai6SRz7dUMrP+X/MF43kFVncKSZDESWC+UrjQpwElK4uz3xKPQIbGuJvaGsvE06C1cKGkxdIgqlGVCTWkUy+3p9O07PTh2+v4nTFRUnVqCWeuAyB5MAyMeqSckeKWEByYV+6RCG6OOWyiqFOQA4uVXFnRQHDKq6poZ6Y1GTkEigh8CYcOm4jOKkFrFdYc+oiX0JFgzIElpK8ZJoUJFyJlUmxEmogvEIoAnnhap4VTKb7MzEDcEw6KYHL7G9esa28tPpupWaA2vdt61ojyZBzEd137lCOdzBejlvHmao56groDr+ZTXJh/va9hnHEJFgbLKkNC6AlzRgGNo1MTNVc5lBq755SEQ3JQ2qigdzjizcOKHBFDzfM2SxfqrZnYj2gihSMSqX9U9ESuhAraV4QWmVocWZ6qrHFL9ql9jMIPcEAIAudhR2HC3CXwTEOM4vgs/uHhMDu/YNH58OKvL+yKSJJlRcT1Bb5VmD9nwy0FWBkQzdH16AS/RDR23PUoK2FZskIgOsDbaFvDZmXeUGBS2VKBCYb5CCawPKnSol80SjW7xyorGJ9xd36Dt0XBa1+avoY3ViufVNwvRr1VDU0A1Udm0e1bZPgRkDQXuAvJIDn3gUEbrWWoHGvyShEmBF0i99ZfEURJE4GWorFRW6jbYSx1SmM1YOquk1lqOsP0/uzrbruR8SYeKW+ZWD3qZzjRNVnA8l5CQYta4UBYJkOxQGh0tYGfFoTI0lyEcxvKa69+p6CGcm6oYJCR4UxlUJs6xpDF7zRaeiI3dIiz3J1Z8onRD63M2OesnRMNvRWZzAp+BoKFAhlE3IOSR2MbW216dnQ6W1TZbczXHwdba4uMZ5sMVejhw3nKDkD7jLcodZwMm8bxLaba7ZiAmYqtn9ScKDkwr0+2ndEC2Xau3EpgUJEf7P7AOFDWg+A7ek7To+t1uPjDjdxgOj3cK9CoeGc/qSmagPtKF2nWio52TCayYlcTlZgFGgKlyELgPE5wEtI3RvezPlHj2/m1VZCjznP0R92YHM8jN+AjcMcOYZmz1T6YypZFyJYzPqFDMj7xJoau7LnLN892tA9Z2xn9J/h8bAlDWdUpthAZr/VGyaTnIG8ZJrahjUlC86LR5PMiINgjFa2UHt8dZRAU/jj9HxMzk/PHxfYmMJaAor7mIDdlmz2DlKChSp8qe0ss0uFGupKSaQSSGhKRpZjlmjK7nQX5KaHiBoZ7oDLaxwcaJFYgcy4bySAKl1xdZTp9GQwI/d6NJ4aRWNNGL70326i0LcUdiiY44c1K6TSctOZ2Iz6M32PoUf3RBv9tEsXaO+IPtDQXQTifhLsWyffiIb1Ha994p+zbPLY88TuY9ZQptri+VgVA5Chs0t769KrWwA91uPNVjVSd7U+47YdJDCF3pzhnp1p4Puokyme0ayCQ6kfnE1v6HqPtQACxjq6/q1bG0XXh3QJANuyL7DesqzCtS3LfoZRoLszAZieXSneksCvNStdh4Xcjn4lVDW6ZpgDw3RaAI+WXQrp9Y8B7VlIH4LMcciKCmpC1G9Ju9aDvy8wrBzVfHbqMNBwHJ+nNhwMlKF4Q6d28YYT+56A8w8SvxFyQOCgmAO4PaPJjQUJY9DHC5xS5FJfrrUKXVG5IRf46xTqXWbZ48xXhBmpxPgN7wdwwzvZjMnXb8m3Y3yChHcXgZaOYMtGyKEufW12QBZ7YtUSDXXpIfcNdp5d3QTV9HqJboFydh8b4fJbbEzxWfyQjIP2ED5Bu3GdA2IOGfUHl7YfEQZtxBxE2zjVnjjgVnvAt08P1mdmLn9On+P3/tDFC4WtYEVZtoJVQ/ox+gmmYDxUrfKid+mA8zG4BzFM5OFCWHXeARL+p6SHiSsBJi70RnHb+DZaSDOEb1/N2g7YEbIt0CPU3hIjod7Vn7kY7pAHL4bb0juAr68OPfTg6hCwv1x/7B0BdaYCMRMv5PLTh5AknEoCknhKOaay6iDbmcX/A1BLAwQUAAAACACOtdZCOLuwWkoGAADiGQAAEQAAAGdpdGh1YjMvbGVnYWN5LnB5pVhLb9s4EL7rVxDpwQmQKl30ZjQBdgu0WyDoFk2CPRSFQku0zYYWtSQVr7fof98ZPixSkl+tL7aHw29mOMOZTzo7O8sW3Czb2etcsAUtN9l18smy+yXXZCWrVjBSytpQXmvidImcfWOl0WQuFWk1I2uAImbJyB2jqlwWRMMylzWRcxRnv3/6kGdZnpPCKUzJ0phmenVVsWcmZMNU7rzJS7m6en59pa3aVZadgaPZXMkVycEXJjThq0YqQ95z82c7eysVy7KsFFRrcmud+6B1y8675YtpRuADQPfg4NSqTh8jXfIm+nPz6IPLiT0A94fgr1psLBK4rDYYdkV4jUfzrXXBbk9hOm/rcvrogig44mq79U04cx+t8zJPFG8ec/JQw8matqaGic2lj5Usqa4nxgK1TQVrlbXmdhO0iW5Qwc2GGGkTg+shWVTj3w1h/3JtSC3XkBLEumOMUKHlsUl54b5fRnFhlvC7YnNSFLzmpijONRPzS2K1LsFJrcG564+yDhnBj27BzHl0/qgp5hf5FiXdf7Hd+WJKeOXriywUfaaGKkLLUra16fABLA+rBWy4dg7lC2bOJ9HC5JJMJgn6J6k5nmeK1XhpChSkgPIqAXEFVrerGVMpkJOlME42APnoVCHWZ2kYViIEDRXpdpJPSs7oTEBi53O8dpC8DWSiUazEGknNOoTEqhUNjGJ9Gb4K5UMUAmpWG14v7JmXitHojjvE1JhVYVVBDVi0kkIb1SDseeRApza5OM0HuMuGWI2tB2QNde6vR+qNFzpvOvORI51Gz5EuA3AVVuCAT8J41EElOeUgHRz0H7La7DnDGS4nSCgZlus9N9Cod+MYu54AWdEQ6eHz7R6cpVmJolUihQrSETQNFQ2DQy547ypBf+rVP0qGCALbFTgk6Az7P20awbH1yegWpMheM8F2MkD/8jVBvzOQ8iRe6Fk5yy8JdEAobkVKIXW/lrTdlRiwIu991AyxZn0zjPqeYqZVNZn40eP7xJfvr35Mv//24+vNJIcBsKLmfHtSl3HbuOjNvM+skUeOPFQNEw9/9wfeWtFG482j3kkfeqvDpUunG8Qn9YHBZnVuHn9t3FgQbqTih4cO6h41cz57xWTkJLtPa0iVL6a0OcKxIubxzRG1k954amM83Y/gROdWYpDpUvFmAGUTskkBY91r0oUSyYeXvOuwcymEXDOlU9StOMHcStO26o4TrtBTT1s9geI7KD+207p60gdDdFp96LHeLgWjNXlJ1ksGeVE2OR0qUjpSyXUtJK00Npta9sgLaBSdRmwyWRkN6yjzjsbttO2X+4ad+OetUmDLT3ynVbvYt4nCUYvRxFqzGVhh9slkbwqXcsUaumCpFS8c1uctrRctqgfevxdcBO0YPAhHip+u2MGaq1EpxkPBvotk51dE0rdIuDCW10g+qOS/1rVD3eujtFoJJkqGXv49XhkA3Sj+bJvXSGWEtdiAl43WxYn8EUEtfWxavbQMo2feifd0a6fxy0T2OEeiyeEECa0p8ck42aVRlJydlWCq8zTZd/y/LSUaDgyNqwkMCAYFc79pLIaLuMdFcS1GQAEWCUpOpI8dCArG70TUHxolbQZgNjmO0gO1xDbCHKO03RVrmGwEPnKYculSaStYDkO2Kv3pFYTu8E4mjZbKIWe8GuGM9uJddq0jwue68LembwEo1dslK2G28cFNjy5nYF6RU/H97JFTTOGR5BRVAznF331yuqR1JaBr8dqFGh7PA1Mls02PnmJRHKKnVufm8RdfhzhL4KBFOXIvW1EuXrp/h0hteAo4SGofto8LEalNdh/fnGCEuwdd/2bFtiXPEffyyK49ouWfJrMn24+6YlDrjBGNQ5TqjmQW6fuiU5loF9sOJnoSoHMmuD/UBrB3rRCkjvkCutDDAx3PFiL/vHDYzt6Hl2e86mjTEDV9i9YB732J9lDzf+DBNrypGwXu4Y3BBPa1k2V123ezrFtZps9CQ1dEUEkQvXCIGCaOPzY2igiDqwcHkiHWMYk9IanRjGpngpeukROcCrZL7rDglO0D+7YYO3OD1T21PrA3djpOKTZhJQPYPWym27qLzQQmMjTveUgHEXiIfREVgWwzPd12kJSRHGQqg9T12MrJw9+OShz+/cFvHbjI/gdQSwMEFAAAAAgAbaMjQwN5KSnCDwAAQDYAABEAAABnaXRodWIzL21vZGVscy5wec0bXXPbNvJdvwJ1xkOplWn30rvpaOpO3dRNfJOviZ25ufN4ZIiEJNQUyZKgHNfj/367C4AEQMpOci+nB0cCFruLxX4D2dvbG62kWjeL5/GmSEVWj469z2h0sZY1g7kmE6ysiq1MRc3UWrAFr2XC9CrW1CJlMmcWWXk3Gu0B8tGyKjbsj7rImdyURaVY2mzKWg9X4s9G1Kq2U7Woa1nk/mScFJuSKwvTVFnJq1poIEsuFUlRcVVULS5cLitRz3mj1ho45UoouREtJ+a3h8pOzudbUSE387mez4rVSuYrO78S6jWMiGo0ms+BqXnCk7WYz9kxu3+AIUS8LKoNVzQW7f/7YH9zsJ9e7L+a7b+Z7Z//JwIoQFrTfItuPJ+XPLnhK8A1GY1GScbrmr2U6lWzeLf4QyRqXNA/k9mIwQeEfAGHMSO42bULyH5yf/18zfTCmJ2Ys9O4VcEWgnDVzYKG4CgXd4bmi6ISjOcpK+DMK72EFACO5LZoMjNxK2vRridkhhgqAf5MxRJkKnMJ8hjXIltOSSvMLjT1ErbvsjxlCDiJ23WTFlgujVLVLC8Ue1vkosNE2GBlLBRfgXARMi6LchydXvBVNCXwSR8ceFdzUGi5lCACd91rmDl4Y2Z6CGjxHKHnoFPcrBy1+1YFTdK2nQ2DaD4I1VQ5mRNtpxIl6KzIFWqaQssLxIifSi8KqHbk5rWqStQ/I2f8imM+6RdFDhoOxsdzdnb+jv34j6PvmdZYBbsHeNL2HNSDd6YzwA4chaXgH4Hh066NW7Ys+JT5djIJt4hi1vv6hRRrI9S6SNuNol1qySZZ3dOnTrywQ5nXiucJbGDJrq8B/PqaNgs7Jeu+vsbV19dDggboMeEOzBFNw9PXx0yS7Oin7rtjjuRhNeLWwdbFRtuktlQ4k0ouGiXIXAdMkQN2OM47dMTLJkOoNd+K2DL0mA2imdXHpNLD1oj89mxRS8RRgjWvkU1ADGcRzY0zjya+UjxjMhaxdfVovzxRDc+yO1AzTc4IJrDPGswK/sYWcTstMiCO84BryA+YhbhmHNqsZYMg2rm14Ck4f3TlAe/vcuQzSUSp2D/P370FFanLIncX4yc6IZBoxiJelplMuAIqh9s8jXWYibfPYzim7DuUYjR9hMrHi98PfmQiTyDOpowMfYDSwYs1BkWi2KjlwY89nCfZLb8DvRJ5inaNzPuIwB8ocDwHF3elADR7LuPI5V6I8VwoVjQVK27BRJpagRV9rEV1cLICNMZ/+CS6aeSzSxUO748eolh7gbETeCcdyYfR8MnF5qzipkQ/MzY/Jx34M1gA9sFqngu0AN5kKsClOcEojpF6rVRZzw4PeSntaUEKEjn+dY5u2piQo97GXUQ/mZ0dJBQ7FTv6dH80+/Twc7tHmeq1EwdpJTbFVsxz0GBjm3jYDnrQcgx1ODrkZ9shoMHGN1O2nWBClslajXFNLJXY1ONJYI+AdTtsOZqzjBZf3ly5vLbRbNoaAPgHxVVTz1FRfaGAUMmR2yGb9sQyXxbj6ATizabUEa/AREhbFk6isNA8yUVz9sHQYlGPUaNhtyB5wwhDRth+ysSnErwJot9PA7NwZahRx84u/C2556DVZlEUmeD5eFAEU/bD0Q8Typxa3Ik2sd7pgYBaGBKtn5t07qiFMkPhSY6t/scgxjBrmTBQDG+esqEJMTkoFlnbsAl7hGwslRDjJn0tgcnLgNjVALdEdJBQL7+K+ic8GSZLe9hJzSZ8UTTZpX6kbLe8Zvu1NiTNAJpahDLF8zH2AaEGlS/q5Snwj2MdVi9CA1FVI4xuLDlgCk2FiBkN353XdirmbtoZDpXCW3HccTF4jribC4B4DMk3xw7/pOHu7M/HoPlHA8g5lgg6wp9WVVG1dtMT5++I3REoeCGhrFcELz1l3357c8urVe1Irz3WVCya1Tj67fT16cUpnCojp7BfR2atWTmcTtuwYkj6xByWULm+jJ+XpxdfywwS28kJ1MbJ+gt5eX9y8eLV13KjCe7mp6g90WD4oORSJ5vHqF2DTJqSztccU09R04Ai0QThaNQxEW2YXnJEWWFkfEGEkVATDLPRd5BtVJByUw3m5kDGVXrgGsVli/bKph33YfqEXD0M+Bx7AO/OXW2YOmeAu/jck0BRO4sGj6P5UkV9//GrFRWJ7VSMRSOzFJMsw8+3CDDIEdQrvyIw1AYsF7fs5P0ZMqHTgDqpUAG9Qq3kWMges0uNSrt+qJwEktOBL8z0rvzFsfgEx5eO/U22eCGbHZcTSq1K1CWa6FDciDuAUk2ZiTFN7Yw2tC/MRXi3IxIyoPBSDFRtRAvEvP6Sr78B9jeSmjeoygTOFpYcDpEsguUO5ksgh4E0OoziPwqZhzsxJ95fYyp0qF2hZFR33YlDBr0jR967P4prwLARD5Bpw49cqKxIHuAbuJf1w57NlPWxNZU0mvQLIo0ho1fGND1CqKvSLWLtatiWbRyOO2S0FtLiyixOiiZXRt+powAL+KY23gubSWGVDEr4UuSighId8WAHkpSEWjcgECrwu1pkRgixqaJpzdir4pZteH7HKDvHBFhLKB5aA4zN2O+yqqEs/PAagSHwVopMNYTX/QTYxQz/dIixGaLra1Ysw0V6v5Tnzdi4KDH55tmEvcdxiIeQhOrdCdueDTGAoZCg3OVThlmY1nVcim020M8sc8XYlS9uXxfQNUnXINbZw5mRdKhU/uy4d5r6kPUe9XFOdqkuYIAAspEKyzIuczChge7d22azEBW2lNpO9gKbWTbNIbaxAcE7hK42aL7hhOBwR4PCoKbgsdPqMwZh0w+vdv0OTBfpzIlQBHL/29FR2PFo92P7m+QrcRk4ofuHifltoWDwaIfTb2E6Y6rEEpK6dWtOeSq1DhxTShc25w4AXyXFVgdfr+CzNmRUVZdRJC2EdRgignT3oCuVvrVhOu7yMmNnS6azEECVs1sBBpRlsCteJWsizUGP4Rj9qkgHfdZvBsMCU0qxQvdyHa6x4UItOg8XlBupgEgmF/raBBddv+h4hFJXK9T1HDAkJBNQMwRLi6QeUCEUebf1C7JQDueLJ93ZLB3flmcNVRg4tiyyrLhFKPGJbyCAzdhsNvKYrQRoMUbBKrYHrENhRTc+2Fio5gQ0jm5EDq58XQmp/oomVx2if4GeFo3q8TF1rxIWWE4wXlX8Tjdq0d1eX0c1ifKuaFp04dUDNjvRyaXFY/wT1/Jprt3Vw7umhe721hJ0B2QKUqdeJjpaJQ9K7KajO28h45iZBley5vlKpLMZO4r/7gHMh1TBj/zYpYLQmYL1ZOi8nFbV4fb54TNH4Q+sdxp0MU6z88FNQFyL6VWDvduSfr1n8F5GZ8vWWA7OJZgolet9FB4G09Q1dziPY0clOXiDSWGHGVeNBvZov8E5ej2ppx0t5BhTu/zYthkDF/t5t1JeC33qp9CDvra9d/gVUtoXxWYDhYbTmh++dnBg2U/Oj533gKjbL2WtdIvsrK4bXdy/b7JWCZlBUj92r5domKntuvduFRxuetcKvcVdI3fGPuYS2GBnv1lnaKC7bImEKfHyzk5RPJNp5CH6tUjvQhxsfAJVTyXBYHO8/3TmRBWE0QWuD2jg2JNUnBs2iAFlBhH0QEHtAdTPIRaWJUzAig2vbtLiNu/alc/AJlQSD/Axx/VDzNDEF3K0VpssHqCB44M0cMKnEdwV+neatxhxXerYeUvAaQL9gK4ZnXPVGmZ7g+jx0QFGk/+RE13Oh5yY0ac56QCjySS8sQAHEkoQKzK/Oandosxv6hB2TqO+qC90VadPFC8RzVa4TZV9vHhW9pYj2olHsBIt3gSNKTo1qSA7kG4EIXwINzdwfbxtnEC+B9ygw00Hp/caKNVjBMOlLkjk1nlz8WfroShv6FelrfM41hDw3UWQi89F8M0gAq0dgZfsVasDjtCLD7pi8Z+3WBJOo9TPtX+jCU9JBgsRzJUHswQv83cb3LHbnSUlp6D4g77/eJRbAfmFEQa6Ep/jU5jcyW9Xa+JCqDUNgRRoY8No0XdzU/bG+FRPrVrn9yXCAM0muh6mXRlE15/VOUQvlfE/1C7V7c57HVJmROxhEiYbhpN+zxQ/pvNhNM6/qw/O1Gv3+x34IO2Qn591SCfpkCp87FCLaotlcfuQDOsQXc/jwJZXsmhg8q4EqGJJZwgYNY6a2XsaG6VP3p89+dBBo3g6J5HDKYkcykhCvy53unXwseevTjw/LcOspV7zAA+M+DiMZDfACF8Jf7kZDFCYUR/Na3DlyAuYEeZyWDftZssC+XjNKGzz8spP0XRjaivBDK354dHlT0UkF7sdDqRo2qJWWkFZ0hofdgirpczTcXQ4FEW0oFvYS8m+Y9/Prr4iVhAm6+vhx1dEC0TxjYfCMbqThJpYn2V1BlabnfkR2p00DzWpUG4bKVDMbO8YFFzKNgss3nfViufyL92Tsc8a4gJb7O4UkLFXyHYlPvXoVgDRqo5xrOWoftJieZI8Ya9mlz2D9Vd6iY7IshobCZD+QZKEDgYNgRvZKS0kX0cJKHjCIGmN0VYECJ85uStDyEH/0QF1eh/alYlofAsxosIkb1Xp7z5GPWbMqsPbDfedk4N9kRUrHx+OeJhwoI/jLd8IJ+iWPL8LEno96KEyYwMbfjR5p0YYV7pxaE/PKSUeqSR2n6NbRwyc5mP1yDASf0OnBxsuM8bTFPZRW0mhaRyCRfkcCwJ1BUUjnoieUdqetz3oUhRl5jb0SJsRg3dKLbwGdF+REOl22CPfjuqG8JNctLQNmXqYhxZaCwIdVMv/EFu6bx2y1fapH+0VGDUZaBV0+GTqN7wxWBb6EdzjB5ZZKBebHezbChiQzFnuWMwutAjn44SRnrk8YyJexWyJd0NzQkutNfzmkv0gePYZVAnCJYoD+hrVqe9c0PZ7rF8qjs0rxEc1pVlkMtEt2B3aQRCmfwuZe5fxDfPtYvT4dyf6Ckyis6/+nDaqtnES+A5fadmI6LJvKbMgJ3PSm46ZILlxUdsSxenJLGQBXr5cB74Uhn2XLIv/s2r3qUeS9zXFxwd2Cd9IyA8z+IZK9HDVPZWsjwnBzjIaRbCzhraJgF9Ae4+49VOk00/4irbLMwbSEXyttON9NOHoZSG0wLc+87iL3knRtYeqJP6nD3NnLxCPv5X2QZh+6xUG1PYR2OADMB1KECldf3T3GqoKilcCsqgGniCibpr6AkRXJBJjnH4i0me8Jb2p0VvT5K5qxCC3FYlh1jyDd/4bSlj1Okj1mjBk9/c/sKRdIej8Z/RQesP/Aj9+/vzxXZGkzINOcoyXbwtbmF19yWNhR4XAFI483bfk7PsV/RDVwQ0JyG7UgIzdf//gozMPWw3mnRfgZic7UNvlo/8CUEsDBBQAAAAIAG2jI0OYqP+DjgsAAP4zAAAOAAAAZ2l0aHViMy9hcGkucHntW1tzG7cVfuevwLgPpDzURlbStLMTdarGcqIZ2/LITmeaTIYCd8El6uVivdgVzXTy33sObgvshSLVtE460UO8xO3cPpwLgDx58mSS8XrdLD+PaMknF+3fZBInotxVPFvXMZklJ+T87Nk5We7IW55t6N951cjzLyZxzhNWSBaTVyLlK85S8re3z+dEMkZeXn999frtFVmJimxExUjKaspzOZk8AbqTVSU2JNLkCd+UoqrJN7z+tlnOzb9XRc2qsuKSTSbZmlyY5tnJZDJJ2YrQpl6Liv/EZrnIeDEnJZVyK6oU6APzTM5JIWp2MZ3qj0VT5epHknNW1Aue4q8JCf5Mn2RJxWroP4nVAGD5ZgnsF4QWjjCtuShILd6zQklZr5nhkVy+uY4mamZc0opuiKwrotgEbVbsQ8Mrlp50B1gBxsbkXNZGNn/InNCKUUl2oiFbWtTACJeGr1oQWpb5Dj5aUXnEojmZZrAcqGPaSFZNu7ygxoCIKFFImp9oHRK6FE2tJA20MDQb9R2uAA1OUcgVTwYnO/uEs8/PSLKGQQnAgtxcAnkzkrxnO7Xuds2TtZMSRAcjUmRaK2OEjrZ1SOuLUVp6NJJzhBRZjxyK5xGE4U1VgMXiJAcDx3eXAX6+Cn7+5W5iAaf+1ZNJto4OhHuLdQ/oXZSP4N3uLEVghrAo6IZdvBYFa8mZn0pA840bC7/azfK1KEDDTVLDfkmtEGbrAD00PPgKs1kkkxJENxvmHYJ3y/PcTev5AzuDcPACClUwpazEPU9Z2t93VpBYC0bwe3zr2S+HVDWpO16JHxtoDKKrh/7vbl8SsXLiEE8eDtqiRcJGAGMmfGWdtf430s1dxGTgKdEYuhU05AypbGHFOyHCSuHAkTkn2/I2AzlOcBmjZkCXWp6wXLLWJbslohA8PkwVtZNJgGuDOHRFM54uimbTguiW1RVn93pD4QgC9gXwqDgDoejuTs+4uwttzgsciT2hl2wK/qEBZadoBrvmqMqBnKdwWcsI28b3py+Ck6rmWQGxb1GzTZkD5mc5LbKGZiyQEldQTsOMUtCzI61sjkUA1zgP4wRHeZKzQWZUsEG83kPUpsu8ZU/2WLJjnQBoenk4l9IFdQ64W9A8X1SsFHIGylyy6uL02ZxA9pB1vMw1DEZq4h68NACl2hE1jdcCPrmWA6DH1EbekS2DNEQ76bQPGU2rE/NUG4rmFuYMY6sRJ3LAf85WtMkhjCCvRjEEBDFY23TdA4oT0rp6RzOi0iIKzozdc9FIgvBloFygiMJI67rwjxVpKYDzjjEyVqBahGLb4vm21YtDtRIpanvGsT1oFW2SnuFw5z/CcDhtwGQSkAK7vSnVntDu5ljTKY48mwW2ctr89dnsO1SJs5aSIsK2A+zkG2HATqDyoj7KSGWzhHSN6InHGkDPGrHAoAFap6PnfmJLXCETrSmMFlTrA8YIND1giZXIc7FFY7URc79ZXqKvRWncVOT07s7O70bDMAPy46HOhkwsLGEhVc1oZx4QcDoTq+MM37LobD/ft/t++5tv3J7G+CqVsgmZyqF++LEPCF5kxwOiZKKEHeNDwVhAPgoSOOQxnnbJgH1re5WpWWJ+bTbkjP/PYDBkxQNhoDLObgl2vL9Wy2Cmrz9sSWNrJcfCXnx4ugau7dw5KKx2abRdGyoEBxv8w8qGUZdxh/UfjoyOQ5imdVgs/xXB6PhyYgAFHQj5cMG8bMGlBGZnYlvgmDYTnpMNz0EKQIsBElSbtfkePhkApjHxsuM3aDP4ssU/hGbArF1MVPW+tVLwLQlOt+M5VLrHI1pLRyBGKQE/a+Xrg1eNiENvptrsj3Zyd2rbE6sqZv8MBKxTbky0UNOn0znuuevnONl1dykpI8SEJgkrcTfc07xRB3tTUbICD+aSXEiWTtvqmpb8NLWA18O6q1rLxcgGcrHXpeMMZ9z44bHa8DFJxGZDTyXDHuTdFoCqX1d/YNEoi1pMTJdNNm/4/K9rnq17bCOIBnVhyjV1Tlmm9hPpY2I1phszq0vFQXGQFJUJrp0y+HdkXewLFkUsh37kpsh3Fqx0VTPjFZF1dazlFl4ys92hGNWnXgktsJWSOxxdc4jgaEFovX578+cvz56hk93Q2kqmdheuC7JBrDEaV0f1p2d/PD0/e3f+efzsLD7/0/ea6XpXMsuzJYEU9PzjPLERcX8pHCT1esYn9sTXyETrijVPkWrtOmMIdtpp6DNM5xe6YcZ660OdsPG/44ey3p/dzp4Ptu5Xe96DVnG4N963G0k8YVCS2Q8/BtFFVNkj6hOYRQtzrC1REJFw5Sy2oPv/vGA5PjtFMY5PHT4pbN1YC98bT6ktilGyyO96IK8YNOiBmSn2mXMgcxGBXqWXC/TCfouaQcSOIckkssHxm01jZckSfRp8d6d4cVCKIgI5A94R0BRy1TgmZ9GXrkvdbcXa58LCOU1gUecR7FaWx1/goSZCUHTDjJMdwk2eY7hRngI/NgwV5EWeyzfXpI32OHw4ah5IbziSlo1c669Vk+cLtPooC3aFPWH1UNn9UDvvSgqNZAt1AuAQK0mPMy+dUHOJABxUW7wjPsoVHHGaG4Qwf95v40TXLi2W/wQbyV6E05geC2nDm91EHj+sHBVPIPxVsH0ODilBHRCYzqykb4MODCg+IEyCrw6ft2uBV4uwon+VLvAxw+/gOv66YMzIA9WrbJYyqbiS7fBEYw8q9HpLAAYo4hfEhs+nw4h/qPU7Vh6Hlb0ACBGjg5A6GplhDDDT5mSF+bX3BMG8/cB3B6LYbVBk71SsDwNvsTDtlGt8nOR19++P9SopT2rNRrgANumiWOe+bS7clnFcOVLq8ptEFDVk/Lqmc8P+NZUl3UT1x3oaww8zCL6nL5CG+S0hyYmmP//csd7jD6Me0DkhfyCz1wLIw1b07ppV5jxUCmm7tra6tBaC0jljwL+aSWK7TwoS60Of+IBTH1/z3nWw6t132jMyr/taJNjT3hTNsu4ZUfwRtae3QR5QotH1hlbvUxg1q9lHQM1GpPrlm4LEx1p9V3R78YJCSu9f+BepqnAJrZa8rihIbJciqUgaLDv7qsYlQ/H1+4WPtd0bdq52akikd+4ELIZuamopq4Orabba9FJNI044T6gjF/WGEGO2lzoiDb1Qmzmq4xh8IBec6iGf4Hhgb6oOQ8eVGlqEziHJUogclRpyo4eCm251kPP3eKxze3X5/NVVtEnxkRYBrlqmCmFJdrCDQp+ekm/fvXrZnv4oTY8BZgAJDgYKAxYyIqlFQuuZpLtOaL11D7YYlXiExTITP1AX3ceNUtcidBfqAR/+4I3+dk1rDJbTVOvhRpNV4ZLuOuJC7s85YFHhyIwcE9Tj34nk1cA6YzVCebP6QyZ+W7RYgN0WC3LRHW17DK2yUQ8iVBA91slV9mkTLuIi8W/K3wWc73V7b2DkrRnonB9Ol5HXNe4BD1S0MUvb0x/bA8PewRNP+QEo+u2GtmS0StYDZ4D2yA+fqqrXdw4VL3iR2rNUyFTVMHXgaEYeYPYhI+/rNxcPwQPiAy8hvFUMf+E6aq+rPBgV4V7JelDCsqBelJAldL1Fhq9m1aUirCgh6ZV4zcDIs7Ozz0qVVYTwsncOFmYvWUaTXSfG5qox8vrGcXa49UJz6/rY9M3J06faK7Y2fqu10c3b0d6jVh5Qb/8yRj/tCxVpW1GZkJ6h91727qz+21bAzH/ECNj1oA3GVBoqXr9y6m0pT93mQcLj9fy/UFb4xiBQ1v6nBoNqCFXENpTnM/XfnoKcclR3XzWqua+Ynn//ZaTwOTUyIIMjUdzrmqhnBIGD9ltsWIANnPMNrwFbQKPAtxmtRr4xTxlcX1Ciq8ij6m580NJ7/Yp18ohsA1QNPz+xov/ulpIPDf5fFi7V+p6pYtO8eyT/YPigXp15qjPTK52dXWXZMa+EFenJvwFQSwMEFAAAAAgAbaMjQyrxn6DDDAAAtEMAAA8AAABnaXRodWIzL29yZ3MucHntW19z2zYSf/enQNIHSjMKbad50kWZc5PcnWeubSbnPOUyEiTCEhqKYAjQrpPJd79dAAQBEfprNXVuqgebAheLxWJ3sfhh9fjx45M5V4t6+mMqqrk8GXmfk5OrBZdkKbI6Z2QmCkV5IQnNcyKuiVpAW06lZJJULKeKZUQJAlxowT9TxUUh05OTxzDCyXUlluQ3KQrCl6WoFMnqZSlNczM8u2GFkg3Ba/wWEoAcLHcEP1HJLmYzURdqQP7J1b/q6UtRsbBLxUrherzFL1yJ6i4kqiWrHNE7+BK+zthMVBS6OZqKfap5xeSY1mphiOuKK7YsUQuO09vLK9t0cnKiNUWuGF32WmH7w5MTAh/Q0RVoc6iJhhOkIs/x74sJEdPf2EylhvDqVhCFb2EdFC1moPoZLcgUVmLBZh9hBXL+kREphpYzftQ5GY2Ieuo3PNINuuWiyAisMs7phuagdVjFsHvKM8MBHlaaHzXNuv0/jIF1wOhkoVQ5PD3NYFFzUbIqNdpMZ2J5evPjKZraKU5EnjoNmIeMXZPxmBdcjcc9yfLrgZ7wgICZSTCp0S+iQL01YsgauPeuLEl+3U9d76Bfv+0BVOmYlpyMNOt0zlQvqas8GZAkael+GBJt/kiTSFLQJUtDJtgUMMGGkMO7gn+qGbl81XiMJg7ZoHY9JjwLWbxh1ZLrOZAc1NkwmleiLkNGZUvpM2ybQ8a/1Mspq5DfkuET2HcBrO2UV4S0JGPtcAH74I03QsM0RovaDmT52RK/e/tv0nhNSl7/XtIik+QWjIdMJqb3ZBKXDHiiYJ7b9eyrPuHtHCGEMIJGFFeFiRjitgBfmt6tVYcmiyjDaw8n6IIPB58FUUmvEIpQ0kSNfoS/JceZdQfxXsJInu/A28r6jucnFVN1VZBEhxXy/svZ1w8vkvRaVEuqes6aA0bsk3NBARZXdbk58x0ZChcIDIOC7crgUZRBXWagGT8M+I6v3XjV17HNebym/XsYrRvmNMvGxiQs+1zMeeHxh4h0kWVgdfrFZIJ7m2cNjm5opiKHZCpE7nd3z2b9jHDTmucZLppzhsSOPSBT2NLw1ciFqH5UYWMcidHCrNu4rFUPevUH5OnZswF5dvZs+9TRhOzE8TE2b2zfMO2SVmBIUlWawZD07GAZyIFmNSQJbqyn+DY5gra00SdG3G+mKkg4GMSRFV8CaV/pF4caxAYJvRHNtHYVlWVc2RVFTx6QNuyPYFsLpH8NtNtWFZn4qxqjaYcASlFiykdRubDn1LneT8taLvA/zZbc3352UBLEbC2Da9AzpYqCdXwxW+3QTtXf4oaeVF+Dvjr/bCwLvzRGQdVs0Wp8oAcZ6Qy1h499vQZn/YAZSIcsQunwY/g0oQtp+h0au/5XVc1WbeIfkD+xNgYuqNzsqy8x75MojltP7EToDJJDid7bePL37ru49UV9F/XE5dZorjWFimpDOiiM2sTApFUbPUL3CpWlm7QRNmkZ6u0B7Q2blaZYZdUmm9ChE6HRk/MBYYrOV7NtkPwSOuEpR9yA0nDGTWK1WYEcEiXDPAwVhcu8zDEMDJZ7I6SB77xi17TO1ZA8OW+opBEEz6RweqmZjK0cTiUc9vUVnRN9cqOkrNgNF7XU5zomldny4BQFyxoMz4qsFDCRyPrOWcH0IRFn0pzj8CxJngfHzBTbXkz+S+Rh1rCzGaB6eiBrzygYpgy9Bvp4a5cW/6wag3bUw03BT0zXxaNDTMMk5f9PptFiEa2B6Fmm7ZsXk2AIAwTsZTdN3L2v1bQydW1nTTpSsSVof2tQfqvJvJCsFX9oILYx2EZ0WCsjxQOKxza92ycHtZrcmAU4NdqkfRctfkdb/zqtWVTtVw9y7Hm44Bp4zScnz/1vMbjNxzP3gt2Eht3EU7/hkW7YCXYTDewmAthNNLCbOBR22w64AdkWvM1XWgd387u3y4vpvFBmedVduZLXu2awocTnnrQa+WFoUOFd8BMDJlvkBAQywEnbug4JKytYDRXuZCvQjyUxe6XPPXgBJn/Wb2VvwTBH/qCwsE2ClvU057PxWnnf6Pf3Ebs7wsFI3iE426qZuMbkEAypg1TFkKTJBIngGZSDe1bFEGy0UIsfcrzYfVHc6SQZiKjC2AH0EIJACnPzAhFJBH65rCFjaSgcG6Q0eRmkZaXN3MydBIGA7A2YpuiybBi6qrkTYmohdAADp4HoUubsd67uyK+9op8akm4WpgF/iKEBuztRV2GQRZWIIr9DuaU7VJHbBSschK7PXAGfJZ7imWwp9E4H2waMPQURUnJ5jYORWwqxdiZ0JIegyxFAgPYwHC1EnWe4JYEd3bCWKco2w7lMJu3qwzKKwqwKEoWABZjNTOV39zxS+msdY4Tjhny6WtphE4cMgCi8BjDALB4J9KL1+qENINyA/PFWKO2iNPix27lKPS8xCeAGyGN3xHK9l7W4ZeNkD9GkUcoHadJWfQca9F5J5X7m+y3sVBuZTq/3N9JZxZrd39hpZyj8aMAy+iZjclZxfQ4dJUmcZiGWrKRztpbA5iAjLe4aHlSOuZRwnB0hALme6JZ/5FtIMnFb5IJmm1jhAox5NjqLvwYdCp05bpIZ0lg+L0TFxs0+3sG0X2r1w9ZWtUdrbSarO6rBShkODO6n+ExXLgS4nYcL7gaOD4KA3UoQ6+utsw88xEib5d5Eh7G8WfYQyLhEqBPXZTIZWOvUkIYmDdTcCpySizeXaM4GTJlM9KJ4+Zo/amtJGwZmBZ3mjBg6XJFgZL06G4Y3XNaOjia6fWxcE6Q89ujO+reL4EiD8Z197i0DYmbWscLB4XDoVRqYGH7LIbpPsWQAtgcvf9Du5+4JVgSJzto5azgoNhNs5jTnn9mKE6Qx0+569Ar45/lTQ/E3LWMY4GHz1WwydGsrHh4etN16I7vcZ08Ezs8cbmlV8GKOq4LiwS5pN1XQbSEgcyvmJjsvyPnZGZktYLYz2JuOjtmtuQXzIgs0et+6QTVpQgsQNo94j2aCA16imadYT+f12Nd9GZg36Ge2HR/X9HfuYEndd7wqbGwM3rnnCJ+uBUGHbmN7B2iTAXAZ8oKcde8VU3Np1/uSWDLgZ5++trpfe4sopL5qMdeHGqc672QRrWnpm0ELnTSXiavn8XWJhihmjObbL7wMXXvwTGRzdl7w0hX7rDltHg75haf5PwMytakYLl5wJY6+NcZHOXr/wb8hl5104gKMegnOviZVwAoh2dVfa6bNfltkzdwoKdjtHhfuNgaag9+c3+BRQbjIvsoh51J58/ODaQBmwY6UzsOrk/eJiX+nmVDXPAe//hCTz9NWGKrNo/SwS/w8AbvDKgCIkk+ekJ7d0foOvUEAFaEZrBAAHRJdIQCTYFXH1YNrJbNhcdxU/fqsyNhyYcb2R9Sj4aKgaGRaKy3DscfW/OKDD8zIKMJ9R92wufkVpFHXXbODtAYEbe2XSPT1rCEouZBft4UHfVDbssHdK8jqIts2vLYFYXvG2baiJpz+FNIpiAxjtqQ81/j4CgGCB7S4i71a2ycXMx1BYu9wDSLXr20Vz7oQ3jpvIHMQHH4yb4xkiE9UmA/27P4fPZbY+W07vXTHskhxMFQcFjPK2DaCDZkRmu2blzWxAD92XhGoC+w7+A5+YjUAb+xTxEOavk2fZlLQ1DxCq+d/recYs7UXfwVIaOqQ2pUFQ8aWMIe5d32Tz75b3LStsGn3oqZ9inVa+BcvEAw4Gi3geVAlmdtqlYIU6ThaMCyPqYwj53HbS5HM9dxh5Sf21yM+4nNIpYllo0sHcCapX1gSnjw7WLDtS2/A3/HQHz33/kn1JvritD3oGlFT3bp3NZLpfISyEj38hmqke5WmrZalbd4jt1tGwy9iGmH+d27wlibrx2TvIVrE91ecFsajw6wiiJJ/GccfbhydPeQbFjBiOQlelOxrI6awI3p3EE+udTlLCIjCka1ErMAUHoZG0EtoUxyPysEno5/EQ+DgEST4iCpLpKgrOAImwPjizWWIWzW7k+b5l+HuWVd5JDxWTxtrZr6EaCPWM0GmdviCh4tghnmfIN/kA/4kDB728h6/kNNwMy6xGU7z7lcPKw3Wl+T6KoJWDAdWR4u8lvf2fM3aTWi6pvtDMmAfudkz1u4CrOxiJObHtDvW+RqT5p+3l/r+TD+yfbBoy/ohHmX2/RnZfsXQmw97rrTX9Tw6gP/gip1jxT7RkudIxc/xi1P20fAfUaji6+jAWhXvZsTecK0q1wRLHY1MSbSxRl6YnwzroqapqM0tNJElm/Frrn8z7fiYxQDesfUIL7C9JanNL+Z5ZjOw1euO/bHuGNIH+sbA10y+eyG4JcaCXbjOIQy2DoXz4Y+ze2HW/wNQSwMEFAAAAAgAbaMjQ7HF7AvHAQAAqgMAABgAAABnaXRodWIzL2dpc3RzL2NvbW1lbnQucHltU7Fu2zAQ3fkVF3ewDKRU22xCHKDt0KlZmkxF4dDUSWJDkS6Psoei/96jLCmMEU7k8e69u/fI1WolWhO7YX8jW0ORpPZ9jy6K928tIb77erAI2ruojDOuhdghWN8aDY0PoOAbw3ydQMSK8UUTfA8zS+9rtASmP/gQ4YsinJNfpQ2EYcl65IMQQltFlOMXWfmmEgJ4MeNDZwj8/jfqCAEPAYnviVubZgPv+JDGleeah5Nf7oyjqJxGAq0c7HnUDvUz1mDNMwL5auJJS3+E7Rb0pzxwNQbGyGdXA3eCfwZzVDaBx4tyaeozAm8uwldzeIz/QARlmR26GA9VWdZ4ROsPGORZseRbebwpRxPLaRgqF03Omxob2O3Yt7jbFYS2uZ7nvgZCIuPd9t47ZDHnbmhgkiITPWXaZiMXnEuEzcuE7yqoRteqp+Qh3L6yV6bY3ROcOg+9qnF8SvP7yyAenWVkMDGp6XwEBvTaqMiunBgQ2CiltR+ystTjyAJbSBMtF6aZKWSLsVinnHU272Vx6rF4o2KSgRuE4j49nyMG1eImFzo9vknojCFgHIKD9W0SFSZV4effD/9+3a0lf6JexWJpQaa/xZr+B1BLAwQUAAAACABtoyNDOYYWb8MCAACLBwAAGAAAAGdpdGh1YjMvZ2lzdHMvaGlzdG9yeS5weZVVPW/bMBDd9Ssu7iAJcAW33dw4QNChWdqhTaeiUGjpbDGRSIekbBRB/nuPpPVBRR6qQRDJu/d47z60WCyiPTdVu/2U7bk2OqvoLdXf6P3cE0XfZNnWCIUUhnHBxR5MhVDLPS9gJ5VbfSWIOw8DcvuIhcmiaEFM0U7JBjq+RpZYa+DNQSpDTuau3X6RCkOrVqPqjX7RIoqiomZaj2mSwTtdRxHQQ3z3FIvnB4UHhRqF0SAFwpEwuRSQ0I0VHrldpCB3wMCqkHmI+5OEsxzAhTZMFKihYAK2pECFxROWUPMnBC3XZ1r7VB9gs4Hq43jjym24nVtRAteAzy0/spruBGbinnX3czDdas7gKjDoAvcfJe4gzylJJs8TjfVu2UWzBI3aemy+kxqkWIes2wOqZCSstax3adbjTBHSwZcMs5wdOGw6nmyPJolbVcdLiON0CPHdGn7e3VrBbb0Usmm4AcqpLDgzJOqJkk9HpNI0dsfSyxMSnbdnyGwRwamS0LASLae2CWRijzpEdoYbV2dJGATtxFQiCl5eR8GPSUpOhTZpDE8CVDum1Z/JD4HVVC2UnBoNQeglsLLk/nOMZqRhdXg5D5Z7sGnwwSFJ8PIa3k60zZZiszXe8Tk1QorhbDPD6Zl6G2JZXSLp45shGc4uk/Q2b0mcMiOqcyJniLzlZRJ3/pagpBo0vMFhajB7Fct1qlCMa/bE5nj9IRVyzkxHT8TqYFHDuhqbxmk67lzLfu7cUYsqNK0SEF/bLoVuzP5+Wb3+uYkzGsENM8m4SwJMfO5ngaQw1FvgsME23iycMB5K4H9BXV2EIh1yO3WnkdIg+4FGcTy6lnWTGUjQ8VzIhsStPatew9r9H9YPTqHr8Pfmxrs9uHmIxkz9d/DzGXyG35Q2ve2jdkPI59cuvPC5zWw/DtMlfFyt0qk4FiixPucRG/0DUEsDBBQAAAAIAG2jI0Ni40CMiQEAAAoEAAAVAAAAZ2l0aHViMy9naXN0cy9maWxlLnB5lZNLS8QwEMfv+RRDPbSFNQjeFvXoAxRB1pNISdu0G2mTJZmwqPjdnaaPLVsUNqckM/nNfx6JoojVCrc+v+S1cuh4pRrJzheLsSdT+kZCYTQKpZWuAbcSGlOrAipjw+mOELcEAJN/yAI5i4jPKmtaGKO0ppSNA9XujEV6gPc+fw7ejLGiEc5NlGRuTdeMAS0ibrbKgZU7K53U6ELk6hCVTOitliXkn6A0SisK7PTuSQL0WfasBwSHhjABYcUevG3AVBNxdWBr0dKxEbr2oqadU18ShC4DqCsKSeGTxH5TygqyjIqFWZY42VQrEIhW5R6lo4RgWM7vpE3GtIlNrimfXs7esOnN2Ro2g+jXl8epA0GrGAvLDyEIyck56zK8nsngtcQkHixxeszv0p5X5IjYXQWXJXI0ncw8mTc2BWh4TKEEUutDr/8IMPkvg4ymZZDQ779FB/OS110vWcO4/IMbPZbEwRKn8xHrPsMwYrOx6v8BxFfdZEH4l2/fFz/vNzGncWkFJlO9U/YLUEsDBBQAAAAIAG2jI0NOb4oviAgAAPkeAAAVAAAAZ2l0aHViMy9naXN0cy9naXN0LnB51Vndb9s2EH/3X8GmD7YBR0nWYg9eXbRLP4GiGNYUwxAENm3RFhtZdEUqQVDkf9/dkZRIWXbcrsAwP7QSdfzd8b6POTo66q2kyar5k2QltdH0b2+y9ev1LjKp2VqlVS7YQhWGy0Izkwn2FnawRc61ZjxXhWBLVTIt15tcLqS5S3q9I+CyLNWafdGqYPBFlYal1Xqj7bKXANBFrj3BW2neVfNzVYqYKhULVXKjypqyFF8rWQo95ZXJYmJ7qIVar0VhGmRtzu1SF/VSwhED0jfw3kUHCgEp7kLSd3Yppq60aGT9DC+9Xs/qC7cMmnMOx70egx/oi7St5l/EwrBM5SnqNid1ywL0u+ZGgipLYaqyECmb36G6gBvjc1UZxhmKmFi4v+ALk4bdqYoteMG8NgAALAVo1wSMO9gAxKrWslgRNQfdIwLqFXbIBTciHY6YSAEO9oK5hBG7dqtbMLYZJoz9bTlbrFwrdqQNL48Q4qgq7HMAsgLfYhFUxm9ESwp3uItbZbdJxCkWQtMZ5+CkmVhcg25yeS2YVmOnXPytzthkwla/hAuPaIFWXhYpA/WjV93wHFVlWtsTmVoEeGgtP/LLtP5JCDrxmGXGbMYnJ6m4EbnaiDKx7oG+eXLz5IRc6qS2v31IxZJNp7KQZjodaJEvRyzlho+YFlqDA0w+QryB13gJdAXAA/QqJMmXw6TeHe0b1jsej9nHaj0XJVNL7xgaPcOgA1IyqMEBMKlJJiRJshJm0PeL/RE7HfZC7M+F/FqBz6aUFGrMJAZFZbL+t9P7fmJ9e9BgyxRQ+/1hjPtK6EUpNxQEILj3nRg2DYhCcYN1ix1AM5GsErKVBmPxjQzNZG10FnOZAlEEX5X5Fixo4s8PVlKnAsaNC9kR8RzVTElBAdcWv8ys8ynwiHj6xX5k2d+VygUEgz3wHINJNspCF99Uc8jSGIebEnzdiJiX+xxyskvh4awWMI3EXkEroInLq0ioC2Bf1C5nt4WKafmGx4UwHAScYuWCIknBRsGJKE86MK9bUGeXZvElZgcLU4TY0nD4ocO8kQQ6w/9b/F8czF1nO7jbDx3cgVAYuRa+YpRiA+UQcyWY/BaSZmP0Ww4JshSYQluadqtTcMyJM6o25QZxg3hsqNoxuVcI5A8lDzIpUjRRgOJUm7RDHLf6gDgNVSQOlB7wr1CDtBKHx5iK8HiGJZk9i6p1gmvPZzuPYvHVMkgctYpb5/CiIOKAXlxuxli0H6HpEQxT+VZQQeeBzn/p2xA6+WWf1vtXl8urISXWJVQ/Fn266s7wFlAWu8PNcQzCDVdiS7suJwrbEdRZsCcsebUG/RB7Frw8n7USmqNxx3RUg8yrCQ+Y+QO6dGdpbHK5CmR7zD6KWwZBoiOBz33VwhAdFAobJCOgQwXfGbaiwJFuhWD4oSMEkYU8mIPcwUDuxH9DefBhdMqOW9j1aohsuwvxte4tFLhwGbQTtr1savTEUtTNjQUoxKEAj7oBIKwdws6tITkG4076Pnkau4Rm4up53U44lPDcNnGEXVXYR5Hnt1snSkG+gSLaF/Hk4cFtjpw6j3Es5iq9C1hAj3dOZGDKoCEP4rImHW94ydcM1EQgYzZwbLEVxxXfAjmcZqNVih5HMemCocl40YyUBCQQqaG89TONcRObsfwaJDMSrl7An3VDq7l5JfMUXTDqF+dcC1yc1L3UMEJwrOxXfHFZaaNgcoJ91nSTb31k3h+TDPegll9Oz4Zt3whONkCoIA8Tm1Ya3mFcO/O03Q/U88oPQx0WrA0xh5aMHR9jUcZIILMRIjapWAx1tYAZRi+rvFv3YVxM57bBczoJJLOaRDU8HbGnp0/3+yuOcz4Qmt540gf7UPaffLuPj/oa578HXDVAAo9V9MDzYcSis3d3GKmEwkvs4+22QpkM+oI1h8mu2jSS/IZokf9ci7uBHjKdqSpPcSpEdjTgFxwaCfjEYdjDRZj0KgBuKHlBySqCawQh+fARKtctDtjBJ2AKQvfxlgR8rY8sIhQq0si/j35QOqEgVYFDSO1CmfZ6BZHETtIICiqAaXYVUPwQN9yWHOiFNNMf4oEYcBCS3+4fygehB0RC204lHMOusFo17yGKdYGO/a7TgZ30FHEGgvFheYSbRdaEjEsndDdFeX9IQXQ6DNFxe4xu9/uSgt/jLOaC9qKsRDuQ33DIOnujE2t3R7p5Y+9t9iWbMOvbFgxaWjhAY+ERm83QbLOZrcy3Uotuq+9I5X7I25fHH8rhe9L1IXkadST11A6mHYo6x3sgHMi0EHb+9cNHNABDtO/N2Gg83G53jKzhaMFNzg+ma7tzr63hHHgbBqX9ew/ituFNIEZzdFfGcKY56HAyxPJn/DHPQJAHHGNPLcOu1btGVMJIS5DyfHelXeGyVwqT4zMYuQ1ftW/GQOAPdE/ddcW1XcAkpF6LGBefYvuuDOyB8mAnp25QzSz4vRJLXuVmzI7PoErkeURKV7qxQN2lEMspHiqW5fUFXzG6aObgg+JGqkrTVbjAMVsRmoZiEAkkinSjZGePuBKFoHv1cK4lkp/aPP67njByGVTmAA4zsGYBnVBHGAjhnAH/6fIfue0+sc+8x+JKtvL9tdztOxeZ0A0RmRvaCGcRiEKyFeK8/OM9FfO4K0FbMd7UsVtscSRN6zPSvZ+UZ7OAaZIwEA9nEp6mIh2P2Wny6w/6s/w57oww4DBqISn5UHeE+oqg4ruH7/TC+lqh8w8ySXzZ8L1eKH+aEzoZ2p5H7UpHfn9v/Mm9w9leF0FAj3JHxupUnVPXzF8ctVVFnaH/uEtJ7px0wu3LoOY82APsPU/3Pe9hR4jbl4MFpUtivJcbfFTglaBRvhL7xyCsWB3H+ATLB051voyGDdZ/V0M31Y4auuP89i9xHRr4XBzr/6sS3FDc1sM/UEsDBBQAAAAIAI611kJ6g6BWqgAAACUBAAAZAAAAZ2l0aHViMy9naXN0cy9fX2luaXRfXy5weW2PsQrDMAxEd32F8N54yBbI3KlTx1KMkyixwY6DraT072u7Swu54YaDJ90JIWCxbPahbRabOEH/K4BbmHZH+DJ2NDiGlbVdE2rnkA1hQTCS00wT+uzRatcA3Pfh4iuZOsCsvx/VT+LZOjqJx+A9rWeAyR7iO/8jyp1S6NAwb52UEx3kwkax+RLliDxaWTkJIs+GOQaP9RJav4XIeC29QKk8Tyns8VGCJ3wAUEsDBBQAAAAIANqZMkNNQLAYEwsAAMUoAAAXAAAAZ2l0aHViMy9pc3N1ZXMvaXNzdWUucHntWt1v2zgSf89fwbYPlq+u8rFZ7EFoctdtsrsB2t6iTZ+SwKYlOmYrS6pIJQ16/d9vZkhJpEw7yd7eAQdcHhKbGg6H8/mbURZ1uWK1YHJVlbVmK67T5c4CFz+psmiXs2ZVKbN8LfWymf8QZyIta67LWrVEtfjSyFqoKW/00ieWSjVCxWm5WolCtxvOcPW1WQvSi5sh9enNJtqcz0Xe0r7BL0GylcyF0mXR3fhtu+CTr8pM5N3VfpX6t2b+uqwHVI0S/f0/whfzuKmlFqsq57o75uP7s3O7tLOzk+ZcKXOjqOc9TnZ2GPw8ffr0fClYQlTJjMjYS/pzPGPl/JNIdczONFO6blLdgM4ZLzK2hF9wGaZhc8Y1J2a1AIJCZOxGcnpi+Cn2cql1lezuZqDlvKxEHZtboZV2b37YNQo7nk2ZgvNkWRC7ckFMjNDs1e9nsZH5/LZktIPJQmlepHBCygs2FyxdivQzCJDLz4KpMrG3xB+5z46OmDxwF57QAq28gktJxdCvbniOvqAH22OZGQ7wYbD8pF1udWo+ZGLBplNZSD2dRkrki4mRewLXVAquefQOnAFM0XJTDegmOmtp8sU47vb7O8f9HiCLp7yS7Mhwj6+FjkZNnY8mbDTqCZ8lnZnRfdhLz7NiXAOT16ICG8P9ZXFN6sen9IGY99wYu+XgCyDNNZpcl7Evkn0ifLHaVUcuufA39OoI8UIxoyDDiVXFmobg4j+X2R2LMqHSWlboYOPWuwwrX/Q5Unti48q6On87f/uGLcoaMpkGFdC2e9hOl3qVr/Om5fUDfs+5LJgWX/Vjj6E968fgsj3GseTZAmK6DSkFoS7znEGYFhM4BBYWUuQZu8VViDH0WVdICH+h5UrYbOF70O1SFL2k5DJpXiqRDYQ2i1OOQnsHgHc4l+jIRuOAm7hMrC/oukLZojAPVwsJe9es5uDroFpbPBQrC6OBkJ47Ik/N7apvyNctLYQli4pSM0iQNkePw2ynSBpkjU989o82QS1gx5oNzOq9+uvIUIGOFFQwH3JFqrWBC/br/vU+vn8D+QWqirh1LsLbWjm4BobSOu92dcC5kF+A1dkJxtfGiMLE7/KSmc/lPdU9UwxzqTS6UJtqCR6wl/TneHbJtvsUIQv0qAvaEOXDpEZyAvYoXHnMrtH4qmNmVta10K/7N3hjzkVFt9AhZqdfKyz1t1Am2GxW8JWYzULiIjt0GQd3RP2TMYawIw/8Xc8hrbY6hMRedh+hKPX6uqfo9JBraxrpyIJpxGXSSRGFt28rOgZMFSarRLA3Zs/2fxzEgn3sWcms+RY6kQSMeH2HVlKdv1YNZGWEwyARiySVhTsmvoIbDk5CymlL6Z3nPnFOXQEVgXSMHl0pAHAXl7eX2eWLy/gyuXq+G11+eD5uf/8tMSjun8htvHuZPR9NPN0GQjQYRdGovC3g+lCmII+VSgLwvxuNh06wACNkEEwDD+i3oPTxdV02lYq8gz5oBMtuBZ0wtM7E1jxTIHy2ivZ4WqMl30jnUudiW23WROCxoaVHpHNKMhxMSBR+Xm+qLJDX7ep9eb0nG+T1B6DG22VJysOY3HB1wpHr+A2X2zByyrEt0vMBDuuWH41rUUKze6OE7pkkZrdgxcMs0hP1icwB++JLB/VLOKd28ovpjvqKcmQourbBMCjEQxk8CTNAZ7Es1veOTGvHLr7VF3tX33fhz/7Vd/bsW/H96ngUG5AZ1UeDUAoF8gN+iiMnxY0dIY2reT2R2wWRi671PV6aJeK/+2OAlj3PsqkpOPaAv/D6WjkHQIP2KstsUUJk4dbjjiqpeM1X2Pgy3J+wyB6XgbtiNVRtpFtGd2UDxVItkSPI0DMyygcOQXCAoMAVrftsqre5+LyReYYps6v2EzbnSuDSUdcC9kFBE5V2M36JzEewqI5gz4S69iNSzIQd7O2Nh67iIxAHeCC3KwwFOoOi4OJqu0GoXltj5OW1LAbGoOfKtJqzGVHMZgPDsHPzGWClWuKYI22oK+oYzWaGUGRSz2ZhQxLrhA5CC7YGhK4b74J2I1HcWqPLgCHnZZkHbQZqQehrzvGixqr1Fw4K6x501d8HHi0qaFvjHpGso6ceMsIFo9wxlAPRroJJBDUV9XVp0veP1kwTp/hNrLBbcoE5a3twUv4cZifQ4Gtc3xCI96vdGRB4A4OYrrE2YjBqHI3+B+zQigxoyJSeIKryrjHxDUFaN61jm3CzKVD6+v9VYMOmAGEAQGmHp1DlJHR0MnOsgePCFFEhg9pD8wK9BGQhaXz27h/nxAW6gA75QlSVc81lEbOzRceGkiUygMd5WX7Gdg5D0W29TQACZgYt9tVBXq/4jawbdXC4e15mZay/6hfVnV6WNK8QgAxrSLOW0UhZ0Q73f9z76a8/recFiXNf0oif4rsJcoYGAZN/5XQtPi9vRMA5vRmqbfjtKNV+O54Fndfm6rV+BexlLcWO2V6Ck5q38noJdlKgOoD9NO206seLUrmWjnD4Q2B6ghiybP27L+we5YZ6Q9RQbhxG4IwG7CNI7yYeD0EJGBv2UmOPfFPBQtiHnUK4SLnajXDX2C9MPTzblI5omDH14wMjb5CdiAxcu3WKQRMfqjXIJexR+OS/4EAkwEMs3FtwK6bYZqYBrvhmJqYJyfB9fJ9nHOzt329aB4Q/wsBdboXcgMmVRu7GxPZjm2HtVyp25rMvdZf8LaFJssMRPtjlFI681ztImFDHuNmVVrz+nEEUDmfBm+faQSzbjtlNiWctDvLn/IixmjzDeW87bfG04aKinjfpLmE8TUWF4t3wHJJEgi09NIejvoaNQ0m4U3BCcrz7+Pbn0/dmlEja6u7Wl2FHDPxx0RvUFehtpsODCIIb0/V4vO8EeFXldy2DTQikW49jPKMfEtmSh206qKKGKgapeR8Kbgz4tS9NvfxQBYehYTISVqx9U86USEvzcupgwoRO4wfnAAxFWPtmZwwJs/DCDU741r1CSXq0sRawdtyRMAsGnSFY0l8I1m17klilfh+0dbVYQfmcFjhSQ/m890C4kDws39BcqktSNu3Qu2PDdlgwbNYIjPu6bpTqRwizn9dOKHk4vkszUk2Na4egLZZpxaQTmGjN9j3II9uLwZsOAJmRO6E66mMs2H885C5a1G1FbFto49hHL/b9q50BKQ3Tbmzy2PTmJBTvhidkh5JSF8ciX6y/g4GolM4xAXWZx2XtttaPLqL/Xm104fwU5YkQvtnJx4RRZXSFGA/UbV59PELZZgMGbJlKnNuZOb3TuJZFfvdHFG85g9rNpWJ2Iha8yXXCXuwHXAqEACzaynPDJQR+7szWejtdi2KDoejVkTUTfT5+7FTEnP9nWYlk2N7I2kRGWa61G5RS32TviUiZXNi9RGH0nxv3IQSkXR86eTMnY6RVuB/ZmETumyvhMdv1+IydlKliimN/6EKFrqLCBaAKqu5fQiasqnmqZSpwF9xbO8xAD58ahf3nwd7h7uHeIWxTVVkoqJpnI9CUKDj2NVCZ0yUvrs0YHHY1hZY5O3NYLQUHuMShLSIdf2gq/JeYOOwBqCHB25KSiVxo0TUbhxMGkjzIB8D/3YFjyAUoRizM2GL9zngc8O2q0ndGoZj2GwBVSi2asE2fsde4ReJAGG4HeOHk9M3p+SnWh4ur3k8cOYI6ge4u56lor3NxdZ8CPHI74TPTh4EWiNBVg1ch2reM5llofOcDN/J+GsL+mZ7/hyaqjdv4GARiNfCfn6zWAoF10Ote4BPsWM1Lj/8P1cJDNdOYPHyk9i9QSwMEFAAAAAgAbaMjQxc71v22AQAAigMAABkAAABnaXRodWIzL2lzc3Vlcy9jb21tZW50LnB5XVI9b9wwDN39K5jrYBsI5KbZjFyApFOXLr1MReHoZPqsRJZcSb6gKPrfS8kfUU6LpefHRz6SnTUDnKTvp+MtG0yLyoEcRmM9PHKHX80woPZZl9Imh3ZjPdEjyzKhuHPwzblpjSmS+LLOgM5utzv0CHUk188pG+7S1/0zmOMLCs/g0EsHzttJ+MmiA67bqNXTRdHbk6CYoxwYDTLIUMSIQnZScKX+sCxGHN7MygSpnedaEFFwDUeS6FG8YgtKviI4U9dzTDjiBvZ7EF9S4CoCEXnQLSUF/D3JM1dB3F+EM9nOCnS5gK9WOOI/EIEryg6992NdVS2eUZkRLZt7z6j+6nxbzSar1Xe1djd+W+ygaaSWvmkKh6q7Xm1fg0PnpNH770bjMpRw3EQ5inQCgaq6km1ClxLlu8OwD7Bfk7AT+iIPWF5ulE/1NvWwMHD3YZdYwGjmb72BgbeYDvW9RqqHLakCvwj3pUyQ3VwFrS9CMJelqaMxmKyCQhsPHDwOo+Iey4/qsa1N4F242X7ki+25xxZHu/Q4aaZF2lQN+bzRsC74z7+f//26z1ln7MB9sdlhypwktfM/UEsDBBQAAAAIAI611kITpTA5fAIAAKUGAAAXAAAAZ2l0aHViMy9pc3N1ZXMvbGFiZWwucHmVVEtvm0AQvvMrps4BkBB2E6sHVEeVUrU9RLkkOUWWs4bB3gh2yT7SRlH+e/cBNlvbVQsHxMw333w7j60Fb+FJcga07bhQUOm2k1FtzRuqtnp9kVdYckEUF3IACXzWVKBcEa22IbjlFTY74Heqfuj1FRcYRVHZECnhmqyxSfaOtIjAPJPJ5G6LUDhQ8ehQ8Nl9Lh+Br5+wVDnc6rKkTDWvRkJnBCBTEgg0Dq22RDku/EWlsVNmXAbHJTXiX/PIOW8RgTSSF7BVqium0wpfsOEdityfIS95O325mFIpNcqp45bTQaT7VljDakUZVatVIrGpMy8hA4lSUs4WN5wNJ7OP1IY/uR4wTZ3mu/gwMt3HGFi+Ih2FhWfPN6iSWIsmziCO98CzAq54wwXw2tQABymYb/IMPp3bNyQtHTpgdaaQ84a0eJQyXutNHDIyiw0IrcXwjcqFz2GxRuURqLRg4xMPXPZvTMLw30k+nCKxs9PTHMbHfujg4W32vryM85qLligPHpNIdZpjV5NRgO4qovCUeK/6YCSscTcYDvwl3L2B3iwdKvxTjpnXr85hmkhlX41o5y68XFnAmvNmHHW8qBaFhCX+b5TSVTjN4Hw2z2A+m/9dq69EXwhbpQzc+IXC7x3qhPCOCNKCaYGLLyDpM1VGBMOfzhrM7rFQlzSM9ZtRmjss3B/DysGcvaJsA/FZ/D8ldLfrAuyNsD8Brb1Gwqpex87Vu531Yba0u2Ayhn77DFvsgR+LZYDos/ru2J++UR1R5XbftAxMlcnC3frJ20EOv8ZF36X+lih8yvfUdXyWBqeyqUKtPtcw/tafBv5+xO6EHtWnN34zNzVGvwFQSwMEFAAAAAgAbaMjQ+Ezu8pjAQAAIgMAABoAAABnaXRodWIzL2lzc3Vlcy9fX2luaXRfXy5weW2SwW6DMAyG73kKiwudVMGht0p9gJ23W1WhAKZECgmKQy/T3n1OXOimkQv+Lefzb4eiKNTdxHFpT5UhWpDU5c9R6nM0BJPvF4vQeRe1cQRxZGE1ERIEtDpiD9GDICqlPhBBW/JnGGOcz3Xd4wOtnzFU0q7q/FQ/TrXcqFXBRtQQ/ASrnSUaS2Cm2YcI0UxIUU9zM+ugJ4wYpFpcr2XvSSjVNNrapoELXHPmppTqcRB7QqDDYCxTjsDYiEewukVLLJlzhN4E7KLxjhPGdfh2VsBHrjL36ztrM4BgwDg4lLwPc3fYl0cou4BpKymc0CWUCFpa6oJpWT2hL/C1FFp54xYSqrVPtilteI0ut7Ce9jG5OFNytEFkyP/1ks8XJHy1TWvNXX8NtMz9GvIzpvFo1wXfFRMcbMRttevOusTpkb87jK06gzYltPw0nN75Ow7ybNsYSe04TGmxmCKhBoxLcM8a9QNQSwMEFAAAAAgAjrXWQkpHv8ZXBAAA1AwAABsAAABnaXRodWIzL2lzc3Vlcy9taWxlc3RvbmUucHmVV0tv4zYQvvtXDNKDZMCRnd2gKIQ4KNCgTYBm95DsoS8otDWOuZBElaRiLBb73zt8SCJtuWh1sUjNfPP+SO+kqOGzEg3wuhVSQ9nVrZrtzPYr1/tu8z4rcSsk00KqXkji3x2XqArW6X0szJXqUGUV22DVi/9qFrFYLUqsBrxfuL7vNj8JibFUp3A0+okWs9lsWzGl4JFXqLRoMB115/kM6Lm4uHjeI+RWMH8ZJOFmeL19AbH5jFudwfOekwUFDFTNqgocvBYWas+askLgzU7ImmlOaWIb0WmoeyQFtCexFYpTgjitSQV8EmYW5AkRWKVEDnut23y5LPENK9GizFyc2VbUy7f3S6e1HLGXfTz2t8QdFAVvuC6KVGG1W1g3FqBQKXJt/YF0fA7MozoykQ4xG7lqN88GiEh5PqqRVFawlsPa4mevqNOkk1WygCQZ5b7L4aHERvPdF968QtPVG5RAyRNbzjSWcKDgxkRlsQEvHppwW7GFJ01QIHagqaL1GAqpZAugHDYgJNVMKCyPLCirGhqwOzH+M9fVefxV9u4IVFv5ENTuxKB3qLaSt7ZdLDS117k8lIFsCBvsx+B9W5tpgJtoUDKzN7S26UoaUVMhKo+JbyvRTPGIBieRH3nnNcgzA52O7vkPyXzh++WkjcjVD67GZMN19klzxJmBw55v98AkgtK8qiI/qdJHvpmtwgOHmQv2j2pNgTaDS65n/ptnx1mxqlO2oy+x9ZLANa9xsjqHPTVyVAg4MOUKdtLYfrdgmmz77GvZGvDjClmpZD7tyJQHUT1oUXYnDdthYXvVsM3wie/C3rUiSUBFp9pn/e6V57OA9IyrnvQCVIm6kw0kI6/DH19X3/66TTLH104hBCKDZ3HGAQ80utbkK+TbkGFtEMd8Go2Dlf0xPi97cDoBUeOxN0T3d/bDSRMOIrnzWOWwEaIKNSdjKowUsiZ1q8Cs5Xma4Xer6wVcr66DXHGNsrCnuPLBu9lZX17Fzj6QoCXpNxos08NOCagEQAed/OJmbHLEBpzJKFsmWU2Hr/amc0iFZURWzRfBKHuDWvioM2LgHesqncPlVdSDPm9gDnr2xjhpVr3D2UR6X7FBe/MxZnrmtbcZuLE/ty9/gposAB2YQ5tvOl6VBe2kibNFR+mGKTRb67EO08UzhUgpCakLmCInrYW7U/17f7ne9dWzjU3tac7AdUIOBCeMW9vBo9e4vJ8syPletIAR2sJegfykGzbvi3ZSWppG5xdV1odQmsriwW2fHE9TANaBuDXcIWDuK46QAyYOFAOXQ/VJURtMbOTh6SP88P3qCiyZOsKJGe83ei4fHy/v7p7v7/PHx/zp6ff/M8OUeEY99NXfMfK+hv4ik/vcRzbNE10e8rg0Pb/mPqZvg7b9E+BpPeR1V6DIiBd1/WkWnkxaprf7kVgWNoK1/UeRmte5pZrVPIQ36hMHxUC85vt8YojhWXZ4PDE/0z0bZ/8AUEsDBBQAAAAIAI611kJpDdH5vQIAAOYGAAAXAAAAZ2l0aHViMy9pc3N1ZXMvZXZlbnQucHmVVUtP3DAQvu+vGOCQXWnrhXKL2JVQiwoXVKnc2irkMdm4JHawHVYI8d87trMbZ9NWqi9JZr755u2USjaw5abqskvWyAJrDbxppTLwhZvbLvskFc5ms7xOtYY7rTu8eUFh5oN2Ec+Azunp6UOFEDtk/DhA4Wp43zyCzH5hbhg8VFyDbjHnJc/Tun6FAtNaO64dBQRoDTRJda54hgVwAaZCB/D0+sfmxoOuKmPaeLUqyKiWLSrmc2K5bFYvlyvu4CtPuXlMQFMMXAqQpeMj3j5fuP56x2ZO+LCTPgjyrE0qctSQpwIyhLzC/IlCqvkTgpZx7C3swQtYrwE/hoITJ3CSa0GJaMDnjr+ktSU3R+Y25oabhBeeaPj+M+jkCLTvhnsWWEKScEGqZK6xLpc+pSW4kqzvpdg30B7dUe3mQ7+WYG0W7EDRGzuzg9UZ2M6b1xapnp4/DpQA8yivpcYiWkKkkPoj/Lvusr659qtBtd1jSlRIBaevEZEFCds4j6NJ41v7HsQST4OhnNmWLcEHMSRLqTHf4LUHsi2aeeRex5Tfbq8tmx0TX2g2ZglaFjIdxAGbwydpy8fQTtU2IwKGfkfbBFf7RXW9Y05IG7WrqFgUG42VdWjz2aUamrTAozCdHfl1z4OKl2EgThcFM2FPGV4Tfpn218TdiGviyqnnU/5+skbZ3ndNhsoWus9DT6vs1n1SZCul8p2P+YrUoOEN9ncOKGwVajtAYmur5u6TfsVtxXKFZFEc99ZLk9SOie+eNqq1xGFeAyxajMP4zN1dk6pXm1rNxZOGUirnvO3qmuJ6poKasVurSXrNOOFQQ0m/vffu/K7j82HTJXlQQScVmk6JycSuPfD4CvF0Av+T7uSfdLYFPeGUKfJ/CvC/je9nb+fv8AHeLt5/biJGFWtSM//LpDHhZmcZLPUBuZj9BlBLAwQUAAAACACOtdZCADdUsAkDAAB4CAAAGAAAAGdpdGh1YjMvcmVwb3MvY29tbWVudC5weZVVTW/bMAy9+1dw2cEOEHhtdxhgLMU+gG2HYociPRWFq9h0rNa2PEleURT976Pkj8iKB2y+xKbI98gnklmtVsGB67Lbv48ltkLFmahrbHSwXXqCYFdyBbXIuwohE41mvFGgS4Rriv7ax0JWMaWCYEXghRQ1jAw5ZkIyLaQCXrdCapD4q+MSVco6Xc6diQSryfELUzjAz906hUe4G/oIgsDyuxlFTvg6CYAeSm5HaSfWN7l30//ofFzeg9g/YKZjsKUryh5txRaFN4WQNdNcNMD2otPAYFAQjAkKTkJx82bl5RT+HAc2dvckJl9SUbMmI+SMNbAnbUvMHjGHij8iKJEkfYx5snPYbiG7cA1vrMFaPjc5UKJG2N+sMuDaC4953iPQi2d+M5pHjexvjgWkKW+4TtNIYVVsxsQ3oFApqn77UzQ4SGse1bUoI0dI41kV63jC8RHWU+zbBEwQJ1lyo+JTybPSNtko1xOjJmQ5xkc+Are9S9imvNE1PqCOwukgnLHcXF+BKGbIRPed6x/d3oMudV2lnax85NE+BzadVfEGoenqPUqqACXOeOiGKpExjblHZMM8EmM7JWiZJlWEhbVtdsryF51spMdhbAscpmVNc1MLG+CcF8V/8IzRPtdgn/PlpIbmNQ4DZwaGRo2CeHMwnM0JZdfmCwoO1pRpn/d44jDzwg87dvEyprWkSsvWpBt5DrOarsSBlBt6zKwqKkRAhYV2i/ELMH5bMBPlZjkvhXzC9VKmfbDZhNFCxDCGgTPXRudhrh1AibqTDYR2GfZ7C8YFefty9vru5fz17jKM+/0XnSYyzdxt8uFuc0wurnpNJIThFOUm1EvpLZp/Wi1j5Bgzl3Vp89iLHPePdf80/0sas+qhh5z2In92EqI1eWOP6U5prqdLnRySlklW03+HtKEJRANJfkwx6QVXCbmIysWe3h+UHSW/LyzkTP/BsS/PfPQ9mtJF6uGVtXxjJo5tX0IDECYW55Ua5OLsbB24BAZhodMmuc35enY+NM9Odug31DdWKQz+AFBLAwQUAAAACABtoyNDZfcLCQszAACWFAEAFQAAAGdpdGh1YjMvcmVwb3MvcmVwby5wee09a5PbNpLf/St4yQdp7jTyI9nc3qwnt17bu3ZdnKQyzl7t+lwjSqQkrilSS1Izmbj8369fAAEQpEhpxnbdRa7ySCTQaACNRnej0f3FF1/cWyXVejf/alrE27yk/++dNz737r1eJ2WwyaNdGgeLPKvCJCuDah0HP2G9pMqLmyCf/yNeVMH1OlmsAyi+K+MoqPIgXCzikktfhUWS78p727CoyiBfBn9Jqhe7+ag04Tz58eX03r0vALl7yyLfBP8o8yxINtu8qIJot9mW/HgelvE3X6sX82++jrNFHsX8cpGnKSCT5ICmlHgapmk4T6WA6ncUL/IihHZ1uSL+5y4p4vIy3FVru3B8FWeVLvgcf9kF4K96+6c0n0+Cp/lmk1QT6N4yLgDBeBK8DlfwXxE7iCRluYs1bPp1CcMUbspJ8BJ/+YozRqoSFfNgJWWh93Gqyn6HP7zFNkkal1WexaroK/XALg7UEKcaYZ7Ip3nhlMryKlkmi9CaiovdvFwUyRYfwlisiziM7GrbXVrD/hF+/ASzAljYpZho50WYIcXJuNMvX7kFzIUxWkhxT/lRW+mkUThpKwtTlRh0+lQ/8ZfPKpOSnsrvCSyQNInCKr7E5qG1Ki58AKL8OkvzMFIAnslvX9l1nr9T5V7Ad1+ZsgqrXT099KutnIV1kcx3sHiwhrdCFa7MIQTat0sBj6hX3s/wYxL8V3zjlKmSmhaqZANkEG62vDhiPUC7IqnizTaFwdPwfnr5Wh7du3dvkYalyWfGNcmenN27F8AHeM5r4FJnVPRsZvCkx/X3b2fC6abBS+QWW+AVNJnr/FqWAQGDhxGgnS3zYkPkH4TzfEc1GFICi43bfX2d149voA70EHhFGSzCLJgDx13Hi3fATNPkXRyU+Zmgi5/iYXB+HhSPzAf/Qg/oyZMsQlaMLA1IC6m/cqpPk4ghwBfn8b+ox/T8Io6DMIXWg3VVbc/u34+A+aT5Ni6mPFO4DO5ffXWfenJfjyh/ieJlcHmZZEl1eTku43Q5oR5PYJjKEgbn/HtgMDAPCoNyB4DH9ahjwXR5MtUwrNonut6XZzDt3+m9Z5EiI7tKwuDF69c/Xkxr+ABtSm8vd0UanBM201VcjUf66WgSjEYW6NkMFyfS4ExRQU0BSbaCzS/O3H3xOoSJBBZXxZHbPj+9DCtAgJ5cllWxRfhjAx9danRiYfMs1lwU91JstqYip6nIKGt21ngu3a1bCHAxZLvNPC4QPhDyu9Js3/M62IRRzMgA2bViw2VNPOgJYPDAROAMtjQXUhBSS//ZBNiAN7Jh/Rm2kSADnhHAhKT5Ksnu4y8HEBS6pEIWNPW0OUZPicKQhnYlUsAKt/t4upriN1glxtook9UmvEqKXfno6/t6p7sxcfwxBckKaxJE6EQAHCDM8uxmA3ITk7MzllC4QcLyrEnA/72OgUxgvooAdubG2K5hZNTeAlwjQ3kpspuDIpd1EbNR683gZqGfJIAEVRECsyuarYqE5DbJjwe3h6vlOnmXtPeS3rqt4UObAGiukSWWMNvmFJts0T/byKlk4a5zILltuIpp0vHJtshpl3EQg3JUzEJMHjap00JuGCkayAkqQajkPBepapM2aFA9bBLhz1kCwlwAO8w+roV7kwEyiZhDGLC+C7PVDscDcIQdo3IhpOq9CUc9bKL2KikKGP8WYBt62+hp/bg5AcY+gPyjZg2eEf8e2c6+IWnwJj9b+l7zZeiJLC2LeXsLBHnW3TqW9S1E47nLxC0V8TqLC9D2LL4LyCiJCyXA4LElHE7x2bf+3RZQNdoxVzg15OKOzwBrBGhsr4zTJHj/4WSiNmElVezZirYFSFVV7OxF8tQaH3k2UJrAqYCBYak3YI2kDK5Bkwy2u3JtMC3oPUg7nVPHNfbIGrqQI2pcJL/uJ80SC5m9xgcNcri4eEGbm1oIfxzOlrRgZ6NDch6Ad9Eq140lK8+aDODlMoDNN/4lKVEdw2qdjf31e7exq6zZGD87QJy0CcBBAORKc/5328gjYsrTPdNelzLnnYuHW3sX9LI5WxS8DitQWYoWfsM6H5VRfWwlKQXJwkA9bIqLP4YF6jhK/kQhcBIkxpQKp/mDodvNnAnMd8XCIWN6ZEwdQDTK1kpLE4ihbhovRJk5CPWzdtS3DMLiO/TIgzq/8KCugbio8wsf6qDbhbu0CsQQowSYelJdVYSKX0pxWxsxXzXI7AzUixI0/mAsBU/6tsn1fE1abzwtvo7DTUmMYIyiZBgoK4OzTios11j6+qkHMhpj+kBGA04Tsn7qgfyc7ZT7QbNBswG7fuwbkHDVazygWHM45KEHrBLk+sBW8luzAeuNp5WLKixW4a/IUfY3U1LhAks3eboG1NKSYR3r09bCKN60SDgvfR1jk+q8Z8/q0s2e2e/a22JjQu/GqHhba/qlp7lXcdGPLDZUsCme68ce4M+0KrsfvlJuGy1ordfbCOyOyjAJwstFzYrJyHRpM2w2/BsL0JZOSEOWYwiUhBTkafD8l22YRaDSVmuQK3gvnjkbhAscmzaMpGOF0QltPAq9OC3jAM1zdZ9gH0pWWewoAfppE/EnukIX1igZuDhbQF2E9UvCuMbKgzIzeAdj9bCJ8J9U8S58ubqLsQnURVi9I3w1Sj5003zu4IpPPIhSwS4sy3XYQFHBauCHLxg5guvBDG1LyMcbBifN3C38/gICDBUfiKIJ0cVSvSNENT4tuBbxsokrPvTjSsUPwFVB9OGK7zSu1IAH16pw1xM9aWL5uij20KUHRQ3LxY9eEHKMgAczPh1ykFMPm/hdqOIDUTQhuliqd4SoxseDq1KS7e2TnjUxfSqFByJqwHPxlFeEpkKlJ5ZIG62YImUuDsPWgXsExrTruAPr36iequLDNykTqA9ZfKexpTb6osvbn7xq21zVKfGhu6sB/gjs5XzYFQLbBluKd+G8DavGTmWCbCLL7wRZacE/1KgauoSBz7x0oU7KOzfWsESTCD6ZzdZxGHmIRDXgGWV8pQaZcPOJMMVinVzZaMszj/gihbtwVpX5vFdjD+y+IdLUzTQEGn7F4ow06kHeY4HlRy1UfbCw6BcT6Q0LiQzdgyJ7cFi2CHzSRBC9OwJx7zgETw3WRZNe7MGSnF0cY754u3hQ1Z4wh+BpA3aRpbeELKPkwZVcaWzTv+lc00T3e8v3pnPbSLIFLLgJknGawhfbSonuWskiARaSZCu3Xw0k3K5RAeoa98DTNXJNsueBHzU79R0X7Rz/EA2qrslAgXPR4zeEn6DhIMiuC/E/LccFw1WhiKtdkdUHVtIL5TfB1dGsKwCaVUeGe0nw5v2DD2+/HU2Zj4wNcxtDKqt2QPYRtlGLDbwtHWA7r+tY0TwIIUjsjXCJi0ugAeSwAa2INzmwuAxGcUwF9Hty5zvn8VXPYOyxkG2OZC2bwc13SUp6t7ARULJxj8An59pMfWJVl3b4Lf5gM+YlDHQ1hnqM+DkhNwkePXh44o6m4Xc2RgDuqCDa1IpDMH+0XQjV0IVRdIl+ieGcPQ5l+MgTwRi/L7744kmEOwe9wH2kDMLArEhOlZbNXFc+I68okJALhnsWjAWZ6ESaUsc4qGzX9bjL5Vkwz/M0OD0FLQOPaEHY3pH7JhDVJPhziB3N8Wj9OiljE2Vj7MotDDsVNeeX0ekzwWZXcaKp5v75loYFHPQiDvWU72jGaZq/ngRfP/i6MddYu6Zy2XplhnglTgIUoc5HI1w/y3MxHI/smftLXNHgVmExB06KDgi/Jlv6qrZzNlXLQSIeqQM0YwYv4rinh5USyu5/CQzzVMCfpkn2zksP3AubINA1d1vFEfodApnDy5FgPppYgzuSXhi8WEDjoEC9nCx4IY4xPkFHqIJPrJawnwXlOt+lEfqyleGVcW6JnwrYjTpCSEpdhw66t0V+lUSAYMIH0ygLoomTuT2M6jy2YF0X6DOZqeKLXUGnGRH0d2EfLxFZVuRhV4XvYnQrgkZPycVOjuJCPGtN07rH1c02lg7DiE6ohm+oYUbNITlylXUtM4uLqs57Vh9PPg6LMcPGrPZZmGoZQO8Grkbc0InjQlv5NewNPB/lOXZ/gkMWhxv6YdhNtyDeo1tBHPk6RPCRCuz1jo9xlT/gVW53axm5IybAaEqth/IiKZUv5hj6EFZVMcayMHI41ni2TW6LE+1cftIE0+gL9tNbivBD+I23uMH4IVMdBK0Rm4/smfDX5YVEEle5ncqyeqOUzNMoKWl3QbfAt82RgXpcZbpMsmg8Uuv1fHQS/FsA361Hjfo10gzlTXL2VqFuzxjwysV6l71DyiVMEzysEyzH9OoSvQzOf/fwkWfsl9GUJopLOsBZIDXmxlt/keZlPHaq1ivNmkzZS+RtvZ2gLVX2knId+ncMLAO9jFCSBjKZ3yhrjn93h1c2K4cHamdHUB6eo86P0WJcO9nA3yk++Xbm8qHmPo8fa/2YHKllNwf4yGnInDwiNLuZR5vYJjyE9vAHje0be0AyWqtQRvNABneZCSTOlqngU2KlSHjdWX1zgsXtSRFIlrsT7yJcFmp1TRTXfsx/v515h71FnCb4faQtdQgxmoiD2qFy9Z4J4qGvxejOiWJDZNeSCQP0tgXJgvSVE6kxJS/1s+UuW5zNasPnTPsHoB31GUj8GhybgIevMQbcMXn1jRG+PMDf72qVieX27hZY3YVhc6jsoTKXyjqaRB1TKldvpGxzbpKsMgDZU1Q7lSpDLl0FAHZqXM3onjGs9Nj4cZdzhvL7iCSgsTE0dzmBOBf9Z5CMrEJcMoWI2oS2f3sKn4qttbrO1UGCf1khAIdNwhO9ROvLVL7K2K5dWdl4iUWHK7yZWBHEjqk2zNCP6+/Nia4HZdi8IkJiogB5aDSdTkfwF3G31arm5/Ynvu7f/g1SqZQy1SxSorbr3M4xNkt9NCDLjtS9bQ5rlG/gkCDDhw8GObwUx3JUFWsdD+ZvUe1AlMZbHlpnmwQ3+Y61PXgSow5d82+Ql0jLKm5g6BbvNBagq5j3nPDzvjH0WkidbqJRfY4yhpEMvsRLBEBW+nAFLyiIMtAEJPr59sYGYxX84F0Noj8bBE2DAiOHyLG/uAVGBDcyApi+se3654SGBF6gu2UmTuahLNL7LADcr0KnnWeskiufu87VJEP0WH1Df+2C5sa3oo7kmtzESJHnESsGQeAN2/P3IxgymDr4/4O7jGw1kFkn9sxRN/Rqk8k3eKwuF6c+YGlStgDDZsbjfxh+/qhq6hYE/Amxzn+gikQL3GUAew2TYtI1tBQZZJguvFMNZOOweqoAJERKi1jdpU6bwiKvXd5ND/2KS11XYWFXBtmVroCjerGrlqe/H/ksLUL20sLFiycyLIYRyqQ6FPHOg9HInH7VPJtPGo2SGUJ1r4/I7ahE+wRutFADmPeK9IFO9fyMFG7wUH390Etc72EGl+5jpaZqzAOF78QfZB2OGqQHD/tQni0jzvPoRuRYsrgi/cJXMUfIzzTJ4vOHLWSpRD+8c6s0A78oAk05ogg8UcSyAaYVrrwWvoZqoK6LR77STRtpEadhhTsZMXtz66xyhb415H5pSA2KDRzHBk0J8S/KDholy6UB2QMNZWqs54FU+/V7kARQ9i4XqW3j4S2I2r6zwh7KL00iGQeBSPHvmDqC36Cf9OMk+DZ44HBdvdCw/uhMCHGExeEX/oFfOGHwi/Yeryw30oazMz0/9pLcd0KGn356nqFD7JEr8XP3J2YDlYz9XEEbAWQtTshLjfZtDpiAFfPi/P0HtQRBVIFfHYwhqfiWWw+DjjTqXekdzAFRtOvgtiPrB1+qAwZEwpoBgU3icwmrzIWOooLqe6OF0rZN4ElKWMltMa5icxSxainLCYjk8WZb3UwMGOqMRRs85eJskeeVB/FpQFcPyJmQhOcEbxSCNI/Xp9T9EWq0Pg8KMwtQWBShcUoj/SZJkqfaZlDQUk6THk1EwSeU7aVU8kEU1sd7VWxgxePPEV3Mj/BhmPKhknFqZAHBC1PT4M9yhvaepbGzYPRUER3d3sRtPd6ESTqyOQsV/2P8S7jZpjGe4mFBPJFHEH+Dz+mrV6fPnr1+8eLs1auzi4t/gy8PHow+eMdB07lnKDxjofpvDzONZaBjaJTT4EJPCWkLqCbIqZFMOtexwOj60w5mr6xgpsW5zRrWXz1oYf2yLHkucakR069Fbs04PFJ3t7hWs97eApsgA5Os2Rc59cIDZmNyP6ukDYUR8+8pPPZQjL9odPAE+qymiFsT/WrbQU+LXzcrR6HBsino8dCSLKuhLN15x6Bm7ywBCudvWiY0tydRJeni9QNjmtQn7tyv0/CUjoAH6PWmFJW4l61vaQ+a31QYO8ancNE6JhsLU6mg0HaQzZNi8xk500ARkAfa2C5AGfDZEEp1Odm5Kdi4UDyQ32W5FV8HZnmVXHEAlga3a3B+s6ba5tBWPA3+lu+CzQ522nIbL5LljQVrnsMshhJHBHgLsftDNiwmS9UyzEDKbg6oTnv2VtxiDJRpv94Cf0Vuf+Mg7CJpgXMR1vzato8Z2mbTzuMPZzWVAt/OziYuLOzCqN+e8MEv69duyDTueHRr8PWajyDxu+aUMAFm9Vf0cXmOoRrGaN4bf49KzFVcwApqHlGr7vO4zsnYQcuKRTfQ+hsg9m1NtP4RdXOPGmI3GGT6YsrhPpzX4fHUQJ1Q5Dv43TCd4KdzB/OZIeT67Jms7JZdzNyzPJHOxvr9yb5t0FebX54M17Va98mdtU1i6EGu3WIo0SOjTHE0w4r41cOmKQWfateL0VtAxbIiGq9cg6ILgRpiAHrjrp+7tWWTx0K9NvG8eCebeF6swiz5NdQGmbYdGMMy9T0+N4H6/BbRymmWqbcgW1Jn8/+7YJdFnWbr1vBut3EIpOJZdS1R3AvMPjsmYMOBypHY3o/MerAczJ8fTHuz6/rjhdplL1cOVY8M/mYo+xIg4GgBEW+zG34ZJBcuk9VE7rqev6HIJEjCIL3AHs/OYn6io4CHfVX8ps9GZkThQVAtMgmiZ1d8F9+ckh8lcOcEI1xQINSQHQnLuELneVsF166gvnZI1+fu2yKEXP9V+JHPZJGsVqBwRwiyIQ6iryEPmw3oWqJkmZDUAZy9pBT4jtWE0QyCx/j/0BXU4cGitkgYa1eRUwTiOYppWZIUMWGI+iY6PhPkiBvkXY9aljAJaHm/6lLdaORRdaMvt62i4Ygfv/7ohgwvQL8hsUqqtEUxIztph+Km72V3ldG3Y7oK8f2M1g3HCCLXd/lTtxwVCR8pBkDQOk4OTL3IODloraaGwjGzu3755OFPRRu6jATJa5gG0YCvB9HROSLHhl+H+DXg0ExVHGdCvClUW8GYgjXNZpvZjJiEXvV1bGATjBbrJaSwLqXjeOFNo81UXZRCmNdorERFBpUaCxpaEqcNv3OmBWcc+f4ODt52m96w1umYWJ2pIWc8BYtYbr6UM8Oyg9vxXVG3n/T0GKMWDzjyHqJCtBPRugucIwlFRshV5KtnydR32VB+V9/xRIP6i2ca9KVmSU1pmTDyX94xmTUV68WFdZC4WzqNYASFN7rMkSbkeO4IO7sIJzId8KBF+IjibZrfYIHhDAcq+arA44agEVTxL13eh/8FRZw4evDolnZmRhj3Y0TNv3e69Asl4Rf8/6EPkUC5j3PFCwblePKgVeRIryloon4K4TDs1i2gAwRUYG1o61KGNQLqq06Y2PVZRtVnRWlubTd5Y8ch2OyIBBP55TLEfyN08Bmp72PGgY1UwsvxlAcNDR1USnc5G1yU2pvSuwbB2pasI8VKHJl+kl+as5kd/k5xc9iOR1+OTnqRsvDaj0HMNGTHk7PeKWyeh1E3RDoLjKjRXfIaAd7Fl91Ggloa6b0o9oltm4ZYYvpuYEdswYEeNSrX9+Os7tV35fDaCB0N4R2RCJ2ztPcDv/M1b4ydjUTUDOfd2Q8eWRvGy4sfgt9/8+ChHN2hmRmKIeV0ucNq+axTcjt4JbasjPpC/H47CU8Q2Xwzz8A7cQwrDr9qIdS6M1Hp0RnXahKyFSH9zJwkPMKlKcDH9KVLkDrwEvTxXEFP4fGcwbj0LaNXO4NPajWwZZ1j7aDg+9QSLF15KlAGBxXpQ7gzeS1nKw1KuXar6CA9OYNXeWt4oMvmhpISbbg6HCRGYCc3Ng+Ypi+6gJGrwd21mxrkJizeYSg5c/HW5Naxfo2L6vUKpnvyU+MVLWF7ofSWBFtXj62X4MDiL6SK5krC8YK3+OeDS6VM1Sad8YLpSZWXSEGmFYM1ko7bCl6qJDpkJezL2Yy++AgNdW3WeOy7J1SRldrPjOw+AcmgVphVokCit12LrEUFgCxkwiwaaqGZHnTjFOvL4Yp4qWNk+K6eabIpVEKnbgeDhlO+MWsYp+Mm+OcuTJNlAmvdNDxr8M4+y2YYDCF3H4ekvM9zDkQqkaujPC6zUYW7WVEp12wsz3zVgiaJvDAGQRpTlOnrPCiBPtZxOalTcz358aW6fUFea0nVOO72usRevHjyUJQN0CpKuS9SD5xpw/Iczqhi1hmxfuzKI8crBgXGfYCdB8MxLPIdkO7o/ggI9zx4pHxJWyhY3x1AaWIdoiyxDnspB+JahPPzUTQEPXzHywIchK++oilC9ARDX6xiin9GsTJMVWE0allNkn9K3CL3um37SM12fnTcUxR8rxO10gfMi56mPlABI/wD+zHy2SIGMTAlE/zgDTSlLYD0D/IpeeUjRTCNkmsgOh/gl2WYpLsi9uoH9fjZ0oEEvofVkS8SRI8WN3tTUve8q7JV2yjXlE+vqXMwsK6V8/6DuW6UjzUPo3+F2DJ2MKr7iKKE/tFygtIqgfdaYypaZJ+7sbezyjgAZvdtu+7FVYUrJWdjtkDte0EdgFVyiWZrermKC++opclqXV3H+P85Bc9oWXmUoK3vYUm4aj8qhZe+Ol73NWx0yOUKY3ljaiTDe5oOP2EUzOVouhTIUDnNo80fE58wnHlMaQhwLCORpawRVf4TynlTru40Fi8dDPOUNG85wT6rkh1IHhh0w5JeWc0xBO2MjKo7buyYRYxxdNul811jvhsOZzT/E8UPKaEUaNKha9cgUtNXm3VxEzTN3Dis95ETnyMZSCJmnXMJ31Jv7q8BirWtw4OeoubUAx19ATySgwXssSE5tImrJlga/nDl3/lN2dMQHGkfx4uU5X287kvjiRLkXs8w1ZDpGKbYqiJh+oGRVZg+TrDjX7UZ38MV8VU8pPZ5cIkPG8kpLTwXm0THEs1rRtwuw125rsbd8g0Oyd3KNzKQLVfV+s6TM79AlUcxcWAWiouTtzf1H7+2C0J8O6QHP6ajyuZFE3YATeKyvmsCfHC3gP7Etmuuusrw5r260kR/76MrMM4Zpnd1bzHgO3o+0QRCrBAVTsUaWQAeff31fLn4JsKb7x/e+lizHgybXZHSYF6VobvfoXsbI5d0NywEZfE1kUaHPoEJdx2eA09u60DMc9GAp9xzy6BepdZNAD0eovvS90GLDMN3fxQtAkfuoIURxWlcxW7sShjgZ/Sii+pvMT6hYTewwwQa6PG4mfEC9/er45YDC57GDQf3NoOXCbfecNDDJRcJ0pw928PKF2vhtchJGMVVLS3tyv20+PlZMBb+8zOvKQZ/Qom48YqEhjTwkgQPi1ySoMOdDeaH1gvH8GYfGBpB95xlN7aze6/e9rg+oSOPEL5Ji5LoyqTE94yAQP3Q8V2o0HHIOAzGJKDY9vbFiJHtxGLfo/AKor/dmvg4tyaG33IbdJXZe2mgIZDe1oWBTr9/bdr6v+rvL/y/3eX/gVfgHODl3+aZP9wnX7ac2jMJvjWiahn7BPoMicEo1lJihK6BdOYBa6EwfJdKElzuZP+VYwFBN3h87h4MyAjYET+7/YQwfJYA7Kbx/Zu/Gya4HnDJ8aSOl6LLbLfpCGKmymsrw02AJ51JZIzqdAqibYGGATdW0Q8ZSl6PTh98dfrwoX2dd44b1baIF6FOEVknsaIt+7Xr87iJYaVIwFzg/mmeoYXhOi/etZxtUefaAqupnnUwQ4VQ8Fh9uyVJm06UeOibR0otRFLnpGZKkfp3GTGhOyKXGpMjjPBxpCIj2L0g25L9aI+vjsod7XsnWWu91XTm7ba3mCm77Z2eEl8BOwmkR/x9HiWNnN6H3O7ovnjbajl/yfLabIaYYdKExTqEBdWQn0zbus+ziQ7WtMOQAhec4mHclQ2KT9F2GbcUeS39aiJ7I6trWE0Nx3QvdrRlCC01sJvNcCdBzDYYhrtlXgxqnHIt2h9aqgXb3TxNFjbeFqzD+lATfUc3OJ+8yjmydCImNIbW7kyUlE7tJqGb4G5hYtRa3d8lHGQseWinzPpNx/xbpjeLzezvmy66fzH4O6cB3HXvmDeZLPJQ9uTJ2nsHHOrWJEfc8zzeuV3+eYrDoQeJfPX4Jank7GeKxWBNvdSxrv7h82qS9SPl8KvUrwWPM5scvV6GVubjM2eKuzwLcVz2ehZioZ6ehZhduzaCWaoQNeVThbi4yjJjhyHEj7YcNqOls6CvJZuk7Jkk5ek6XrxjzxIipzphStJImNL3OlhrzhRlIrqjpCkfJz9Kq+5jiqst+VGcWapja/cL0g3lT4a5dAyJtT0gwpA1JPVh5z49pOHycFjkoKMcEPaG+T0uVI9xBXuvcotlD1Ed7XvOd3+H+BB1UV0TNlXFO5qzvnd3hS+qq377eGJiXCQlXghMr0xQSFEQiJ+5l2UN7DpPYNRsIQ9pPUtHEcTD0oYYd3Q65348biB/Mwa2dhpm311/oGseq9p0RoGt1Q1W/2Lgt44Cat3Ebbut3DHsd3T1tGMFyaj0XkH6iicuIal8V0vo2BuetQG1jenZBtOu+537+Z91w9N/afP2rmkewvwMg+od876eNy9xjtz7lf454nuV7vrkVJDDbUPOhcrP5upir1nUdw7vMqNL79uGxGQxbZNm6Ba3PT99CARehSuPpe8lVCNP3Cv0iMMkeldhQom29FZG1/0l1Ira0DbhjZkYTopGe5i0oUPXTNpqhns+1aHxrVE8fSjvyzZMfVQYs1Ol0fZz9I6jQ5kQc1NdJfmu1BdU5Oy7NBMKET1lEQWN9VDsKs5i0YKWmnx/RtnAuSCOz76d/U/g9/3tsUn33p2RGsbGzjIJ6MwNERBSwP9OHPJRmYoOo546sVNc9vJ43U8bGtxA0lD1PiN6cFNN/U8QDyIDI4vUsVTAKHTQAYatu1zSCGSLm8OpAeEEGk6wxSOxODb1mp/UpNELzEqyWhXxyrgbYDCKKEo40TIeBytXknoQMX4VZ0S5BcpDdLxkB6TmkbeZ7KjSZ0BzeLRcwt78powXeRaVfHcPxgNnXQ+jG1VexvOtuZtPp6hnxGdnwRPoHzr6A+hkUcqBZ0kbgdBciEHMpniwCq/QILNYhGWzIf7ohDOoxuikM9mNHOaW7O0iQaxL6Bf5KRYeSEklHadLrWyyQrqJr9FgFZaVXKTB61kq+I7c5fJBK7kfhKA0fx0m6MO+RCSK+FRmCfR0+6AZqB67C+MbRzBgD6b/7vdD6bhFUbIxw1x9t7DekRw6VztHuD9snavadKcI5lNdOG6E3j1kFWrgA/m/qvcZrMX9CRkGygNGUrNjCcNAowd9XOZZwyKpyWUotSz5Bq2Zjs5jttxrssTpIUdtgwxrKOTVT0CsNJC/Ud9x1OdPj/ERqTGpLinUX1IdKJzgthDcxKGeZqAkBRHVWkdK6Z8xvN4h79+i0OHKHHJXmHfdVN1x4ure08yPTHU6ZVwCMu5vssQnlSWs1XILqxTndu/yNG4tq+RSdZ4pw+neXLieAUSSU6t5gpvFQoVH2mVVkvbZbLQo0uNskrcb6wZviBdv6nj8fOcfNxwjtoqFOC4pH+xmgiqFnXV3kS4RVGvlh2iBxmb9Pu8+h25xaBSzfhGHqdiqoEN8M9KJTLlM0soYNOCCYzOEjDTSiPbyf2wblSaQ1Gz4P+DtdDU44bKKxZlD7kg5GXHmcaCS4LG3aLAIMw5yP8MamOyGMjjC09nLix8wotSsjkpja2bYAgfMNJg7yzaMp4KIALmg2yFaLx0dEo706XskiHp6NFTUcdNCtwk6nKCSL9Eb/vdmFrJmdhgPsxrRZFDgng3QXLjZXurkPWN653WIHVGPW6rRuxMjXUPTN4XRP9m3I/TLrTNETEsqldyTt4PmTpDxDpkXajsIAeNzuSt9kDmphtjLzMNxuTPXvZR8SNhGgi9vNsgqLOChzdSvY2MxDOB7NrrC+yzIhlXJ4X113c9AoLt1o7bZvz00Wa9Py0OEptXqjLGQ8SUsKZzoljhYnQbynmR9Wcuwx9hIDSpx7oQMTJ70m/IByFh1zLw6MsgYOqSRX4fk5alb6tvfDKGfWHnpzST6rG13eju0GO1HeuA5qj6ZbPos+zesz/WeUjfLqHt38NFt0yv80+9yvrtVA/c380bUsXSrkOigV06PcRixSrKTPg68+ylCZU4Zdm5WkwPX/4xoAbOtGn6vjN+Ung4mCslmcjxFUPMd5ECpkZQJJi8qChM3kCwIRu/MUtiKPTsqVJsK5mzNwngEuxJME3L5PI3k2zX6xcPegWGerXsRqvRweuReDCRHqvQZ0WBbGq0htNcnW1aLpI1zy0GhuyetVRpHAKhXw59h0njdWa9M3uJwSEuAfIwPY4hUFfBbob0NMz7dDmtc58MpkVD5jCjRdB8fyPz65IbqQxPYeAfrYzfBjjxLfdIgGYH4ve97pFtCyyVMTRx1lDGSLbXggby7/XUEtL/YkyHAMJp73++xv/dZL3KT0lwlNMtRsNvCwzoDtsQF8S+elsxKIzRyccDl0b96o3l6kg24e48nnr3XjO5NHaUwgOYJDb6ulJlLyYqGI/NuA5HYLt11fQmX0G4XnpYxlsIeqQRKXJaDKVozN5rvVpNdMvnjOlmtRxo87c979mSOqhZhX/meWTSyT3h1Ce/waXLcOxlhuRjJvUIPqBbbu5DZpzK9qxjgrIz97vTRg9ePvjp7+ODs0b///VCrfNum8b3eNKTTLdbDP93oO6a4W6gRKuoR+Iz2js5bFQM3k84UVz7Lvi+dF0ZulMVKUXjkuyX71JlTSABCFsD84ARn1QhGZ6Q0gTHxykJvjGxhmEG2mXpkv3Wff095eY6tRmhM+OygHMuJKQcDVrwCmcCkXqYd4Tn4uEK/b6b96tyiX3Kc+S4rKiN7mNpaGtvOb9prbxsozYqjzpqL8DCdVq/E29Nua2yacl6XyI83aw6kJTMu0+2QEoE6mJCw9qcno7257gbSSo+cc33oA5ruUACY2R1IB5Le8nZIoM6VeRgRcP3PiAx63MgaSBG9Urf1oYnvJINeO1Vkq124OuZqy7bIVzABGzS1a3AUmfF2fJ1rmAON6YSCrv0Z0Eu126bDLrdo7G+BFKj1DlKok6IpC6mRdq/WuHtp1/gZymOsrHP9eM2gnHrl4KR6/Qy66/yaXODQGjiwQczdhgKrqJNbjAOYYcaOIXqkftyGhdX4UK1z//o05mygM0dd89MvTq9o2Cs74UDW3jv3oJ4pM42JJ/OjdwEq23IXjbXlPFH0NGoQR60CmlZsJ8OKYdWe2ND09xoOnv6O302CqxPcLNCII6rdFHgS6GsnjsYo8R3GV3SYD38wiZQM1Jt3b6F4EHypspJRpljrKrP6RLBfi/L5ro4Rr8Ih04sWq70Frg/bfVUrwF2KXxZXeNp8nOpXK31hIABxhWoWmgDl/j9W/447vMS1qhc0rFR0kUnDRYxJHWB8yQLCY47fH+71PGzqhfjl4APPHoogEHeyxKDa6HOjXA/TVHkeYpT2ZJFsyWtCPdxnJ5fPIZu9hU6/DLzsuJg6HrslbsEhuwrVENHgtEh3mAwrsPYY/GDCSwxbj82F/rw21nB4GtRpuex+uMHuVCwcCxyyLeaGaTMCaNPOyy7oMHS7ilyg7BbFJu0Ye8VvOVYh1pNN3N/sa8EycoLerdn3E3KE12ukg5olWCM85bfDDpYtCL0PmO0jC6BpNMymTgiPkUVL5Ixt/HbK7ve+1uWP3pavmrHH/TttH97Gg969a1LaUI+6ghkq5SuOe687NS186zs8WDJTtdL+eoBWcuDhm+Rc9XAD6jzeR8EizGdQKHIyM+CHwsuIMs6rOZjNsAKsiuUpR6pRC3o2K2FnCsuzKJ4nYTab+ZCSfLINpGqcaLeUC0LYgK0RPP8lREkUI3uK6y4GsnIa2i+YcGsHyyXWrH56ZuRVQfpmyx2ohRCEA91eKs7lJnkXp2l+Dev3pE96dHXewyoDnvVYIJyW1WkOLWZJ9I2L2RaT9p8N9WE2xlh2cxxM4KUYzm5ebkEAHOZFJgKQTkbbU/IhpiIN2iRJmXlVojMc2pKjoeAOBF+Gryrs4uGLCmt/+rU0IJtv28qhGFoy4LYJpVjhqnBz6KrCNeFhNKoeVfdpCv+KtW7jfpJK7NxuA8R7nKvw17jor4HS/khnH8H1Og/WGEgawRQqY85x1t8ao6HWJZyPRZHMsaomz8+IMm/tzlA9RHcfCcsY1ANtFEwqGs5txSUyZ/v/DaEMopK6lx+BTCTzsScgyiATgYKjwqJwiMUF5mrsuKruzcnNaStNmIbEtYfMZER2WwQkNKfADL3Yoet9RhTGaaODx/y3k65GtUAxIBz1kEzYfciPEe0gQBSHDmRQWPWok26LWkDV2uSlKkjA+3GlmmLsOp+eWtD7HNt5LF8Gb1jV/qS8fb3gX2MG3SHOMFWMbmAHUgbW5VxmIQVXPWrv8jGV19hCP4mbi35GZIEI1dtUDjLrFB+1UwchZJYPks0Wzy+x2l4awu7fAhFhW70pCK3GXis63SJFc1Ujv/IrqNK0TXtCryhbdEt6CNWAPbHPYt7TS4kcjKYqnDP4GdqXV+3mQd2O+SosOgM/yW4AmWylLMlssWUEyWLb8CVGYx+m3+TyBsF+n19Pg+e/wD5dsf/Hy4sfAjQpi93JzYX0N/icvnp1+uzZ6xcvzl69Oru4+PtsNq0NRF+Qgfnhg9MH/4EG5q/+4+zBw79/0Zbk5a4MtDjxdNiJU9C4QI85NPT8NI4Z3oz0y8uwIquHfuAnVTuE/HZXNRJDItyTfXnkHj34XY8Mwpu4WKkg9DgEbDzVGYQbBP1jXOBUAiehmryKZzOshAlQMmAnsxkC8oWmN2yHRvS663XMt7dheAkqn5AYcXia9tB91dviDdVZeY1lpDKcAu6SVFanXdmbAaQtrMoQUqSR3EeDOkMqFpJU3ZjuhykS/9ge2tJRi0YQhsr9eakyrZLPNX/XhY9P1V2PRd9I3dozokdKBNP/PJI8wQemRdhlyT8xd07kJEhouqE3J7+Xg4iXEm4x6YHlUWImPuhmD/S5mwDtuvN9px7N0ZcikPSYfdNwfzwB2NNuwu7KutzXMH/Xs68s+R8h44XRr74Ti5vchhe0fyp/ev7k2avn+2zgjdHXWeQfq2/DOC7jtYfjHpoOiRHqP0RLIXn45st8pI8KWLZjkxnROryxCP01sq1cor4aadJ1uHg8tSF1MvgzGVQkh7ZOSK4hqcTktL2U97kcZb8jGGyOqVD5Im3uPvxHb0FyK0u8MQQi703NgEjBuCmreKNCpqiQMNmN0T9EQ5LRg7amTiwRMFnWa3i1ZwcdcqjTKDz5CMYqnT1WvgniX+hmIIMq4wIUuRO/YAJ4mIyhLkJeDPTWCpfrEQX2nTUMYQbYYB8GYJ9CwJ+7Wv66H0ckvZFzun559n6iwnY+vTrXHgme+9zLO1PrmVlXzEaGKBfQwy0MpZ1W6uMk1aOGfRpDS0JxZzoRQOdclXGl7P0kKhvHnmy6nwTJKstxRK1puxDWLnd7TRA+Pu938qpbsWcuQseVTYLexux0Ymi1zFqsUaJLrxQ7KlIE05LT1mxcujW0ZTcwqYDZ17DDR/4wuzBH7LH5q4WDwGCxK64eNHTANeZpJKjAY/lW6wrd5wWc3fSwfdKnuQLYRhpPIUizo0ewmAbJukyFNW0vVf7UT/qwJ8jvM9Zj2u5u5LsZ+dCBxlGFDb4z3yZu5TAAJIdDWWP4JEQf8KciM8PzbVFoQF19uq426eDUnBwGrp46ANYxY2SvNjdlslsP2Y4HZt4UG/cdpt2EHnC6285pK3TSxpY8qVhieGLUxugDlK7hh9fO+MOTu52AIu533nTEDODgHs6oJGfxEpRlmSIOqiu2mAmFwCT/bu4DyeBd0VfM+OFs44Edy3Oq8TM1zN6A0DjIVNgwiFR0tDGbSbuOagGzLG7Migi0Eva0+PlZMH5KQTACgf6MhJATjrd3YVBHr5CdgkJ5/0sepdPwlFBFgtvA/mVoAmxYBlbmp2IJMG6QMQUSl1MPAjqPDeN3t9HQACNHy67lzKgmnXDMTWJjVz1Ug4mY9FqF8zSfm0uxXxd8+drpFBxBOAnZWVlypE19TqFuyYiW1ZCgMBC+N/I6VMyJJsUxSGmn0IGUDwuQ/qxmNRVb84yxOTlkTq25ao11nuPxHMv2oBZa4Ci+u0/yei820VG/zM6Oi7VM5chnnrDjqapJn9ZWCyOIteN9JoVJucURN6JqaM4wvwH11/GyLELMK/1X9DJ+XhSgYOGVqPH3OQAE5Rdo9aTBPlQXeCjpcgBBFj4/OmmC2MeuaZUh6sq4TtFXjS715edqzEaKP+5j5qqR82D+zdegr+aRHrCTaRTT79GuWp7+fmRX1BZ2ZRk/q3mxMcl68I246F6GPNLkC6WuwjQhfo8P+elYv2+7i6fDq/tqS+KBD1bVpjss2eh77XY+eZ1qu/ufTLEeE1y7BBTnVS0l9bB5JwCfvtGV8fjBspkZr2RjbYVADTEAfdJQP3dry7aNhfpszG7yV2T5aV5MMHLwJT5onI0ZGyvnhFVpYP1b06A8sOa2kuaFuxfBI0or6G1H8HV85+LrXnlnW00f3EWhIx4sypG73zaCZZ21v43oXBRDJvDw+4wd8GasOiOdJqFLPWPBi0oZJdoNHzjZnF9RpU9a5LusatUaebesQM1R+dwCqlA6Nlid50eFvobtbR1C7es8iDHYMl7/mM3CNMWY07BmZrP8OqNTi+B5aFzewEohbJDL6uaUKqcxparC+MQ65JmNCbLpKtbgHZOpbPjU2vQEr1+8oVtGb988eEsCIG/JVIZCWdL41NzJqPC7h24NMj2juSWrvOozDstRkcNh39cnLTcOgZCRR8XmVu4VCzojhcGxgrODgL6ptjfGNNkuWUZgcbw8R33DuKsh9JCGv8KNcLPFGOYkPuG+Qab1dYzkZQE71edUVXCVhIwXd9GKc31bwcGNu2B7zQeWDVHpOrYNutxO2XmPkp8G5+c4vo68wcNq3BJpbjAIyNlERFmaYrsj9FByb4vg1TFm6PT2rb/md2FZnb7KI0q93Q7CLta4iUZ7wv8CUEsDBBQAAAAIAI611kJcGomyCgMAAIgJAAAXAAAAZ2l0aHViMy9yZXBvcy9jb21taXQucHm9Vt9r2zAQfvdfcc0enEDQsq4wMHWh23sfSvcUSqrY51qrY3mW3FBK//edJP+QXbcUNmYCcU53333f6XTKYrEI7oXOm/1XVmMlFUvk4SB0EM88QXCTCwUHmTYFQiJLzUWpQOcI1xT7w0ZCUnClgBeyxCBYEH6Q1fIAXRb6BnGoZK3BBYyXCRwL1Xl85wrnvBqFde/0k34EQeDyDkSWQ/AqCoAeInNDXCPrGd15nM+H94s7kPtfmGgGVi1VpUaFpSZN4IoDXFm8R4FHTGH/RCs+qBJa1k93LQB9UpFlWBMGWBW8Vd4mslg16qYuCc16mJKaQqVcc1DkI2TJAut4c5QdDSq+5mWCChJewp62JMfkgTAK8YCgZBS5EPMkXyCOITn1DSfWYC2XZWqI4u9GPPLCMNWTcKZy7iDM23ThpF/oKm2/U8xgtxOl0LvdUmGRrVvua1KlFKmKr6hP2v0xj2oqrJfDdhjHIluxHmUSv+ojP0X9JpiOgPNRszBjo7095hJ4o3NZU51MmR0eGwhQOuY8IO5W71EvQ2cMh4wi870HDa9hTPKlZ3Kq2O4vRDhm+j0VnctUSG+f0dKvzcjx8QZFvfUjorrz5k0D1p27Wfaz1N/k/SZpgmmngmd8RXhMwDb8KDtZwpEsM07K5rCnksgMeJoKc1JpRPIU6Xi+02C9awybtxFpFuIHEQfXKaLUvPAwk5yX9zQzWrBMFKgmWNqG+DhU5lEhNNcqXM21vCfMRWxb79v2FHUOXiVnRcxG9w5z0R3t2Ui7GHp73Bbb6qdKcA1HmtHmdhOZcGNdm/k9W20XNe4OawvXsL1ts7jpZy6Qdvp5BXPzHsLz4cLoboXt8+bl9iJkmawPvG1Y6rxt9M0HNnfKFJTG7rXDNTtrPLpB7FKqiii7njeM3RuvxHpUy9GTIzVereLn8DJJsNJhBCGvqkIk3OzD58cyZe4wM5MvfFlNJZq0zPxZMLdKd1x3eykL5OXSrK7hdLNZw9nmbAV0+SNc2f8OndKK6yR/X6p1+Z9abcJ/KPYPUEsDBBQAAAAIAG2jI0P5qRtwjAYAAO0VAAAZAAAAZ2l0aHViMy9yZXBvcy9jb250ZW50cy5wee1YbY8TNxD+nl9hrh82kcLe9aCoWhHUK6CCRCmCo1KFUOLsOlnD7nqxvXdNEf+9M37Z2E6uvVaqVFXdL0m842fGM48fj3NycjLZcl0P63u5ZL1QeSk6zTqtJoujz2RyWXNFWlENDSNoTHmniK4ZeexmErH+wEpNeibxJe+2RAvy+unFkx+fKkK7iggwl2TDG6YmuqaalLQja0ZoWTKlWEWuODWQP3D9bFiTi1fP88nkBGKdbKRoyQclOsLbXkhNqqHtlR1eU8Ue3Pcv1g/uV6wUFZvjV9bhV2vnFwyf3vixaFuu49ewRtYob2FDeSxkAoI+JNVCjpaSfRq4ZGpJB11PJpOyoUqN2ZnugWbFhMAD67qEtRbGrliNaXzovz1auZTm5LkmtWgqm3DebYRsqeaiM0BQjZJJk3Da7YirJJgRSkxxOYS5M/ExpYM02/wixOW1COYpTQFR+fKUNSs/wrSGf2REiaKwc4zrr8liQcrzcOCOGTAjF1B0YA0m5oo2CK6T6bmqqYXAb+mLO+ML8+YNA640EAGpte6L09OKXbFGAOFyWxZgcXt6de/UrPrUU/rUp9t8VmxDlkvgp14up4o1m7lf+ZwooCFkdfFSdL5K+KgBXEx9WdCs2czyESSdPhsnfgU56z6qPRBMzJe052ThneZbpqfZIJssmFaQJ7zE+lKom9gcQzFDKczSjAJSCPX29QvEwILbzUhgF+3zFcPWum2WEE2K7MePYAMZDThuK1xavP/3bmNHYH3MjxtO3MAoVDtcyUjWDcHdDPoCVVpbeYodjcPLG1weGETOiarF0FTAu2u6U7gdMqs3WRjga6YHCXpo5AZXPqCcQZ6DWPM4rtE0CcePZ3OSxZGMPHOCZ7WtMtJqJa8KY/reWN31Vj5jLoGowklE3iIJyP04iAdIym6EJhRLst5ppvYitiHXjGigNPDCBhyiwWBZU0lLDYeEYtoQayeGOc5q+bbWZsVDh+9BmdivJetxk5Drmpd1CHXNm4b0EtQBJQdCckeTPS4YZr2UjIIW5uSnjvQ7XYvuHCyBSNyIbIimaOvWo7SEuVCAQWNx7bx7GKSnSUnBM3q06yMtA5Mqjk3XlhbRYhHjmqsa0wDkmROWb/N5OHG18mVxxXafoB56c/fbbLZa5aF9npMrJlGQwFO3ZVVRkLP8m/w8rroDg6pne0rDtkpIuhh5b/gWEmYvlEdAx+N4Gk6xwGw6iwhuiNNBtuekp7qeW0/8t6gaL7EasQokPEaElMQ45hgcYL2iuvYidRwL40ixcOwQ6w3EmcSVCBEapNoDYwB1FiM9u3BMS4IxZ2UCUNPDUC53vQnFW5JphqlFQ7Vr8YwwX73uBZONG43TEz84dsQRlfDWbjfRNTuURyQzpgFBrC5blzm5dNvrGls/TBMOh3C94NgAaZHEY72kEZnRUJXsyQ5nv3Qne3CESyPQJPPNFXn3+ezL+0dZblup6VjsCIt9GnsE07seAsZsX1izEKJjt4Jw3U4w/bu4n/SI0JsyzRxiCw0H3TLsYLCPBS0xrQtsHJgiZNrHQAv0xEy3SmePgPFt0YMetcg8j1uQqQuimnkf/p3VcFVKvmammJK1Apq8FK6CRmYfHiAKo9m0AURQmU6E7SyyY8tBtSMJxgcXBGXjJYo2CqTMVDTTcBBCwYM3J7+AmraD0kT1rOSbXYS1hiwDL41MoMKwlvImPxq4zeNB1MKsprJp9J4hnQ2M8c5IfORxXH8YsjkQe4oXn7mR/zDgNMgILg3YEkkVwV3ClOphcOPJ7dij1SSkw/jdXK0WBAkTHgKeCJH7imrUoc+Ze5sVeyIaQSpGTs+jif7JxnyAKXCGAyJb4qAdnY7vZzcA2LrcMNu+nH05PJaWhqRs2cEyp7iMWWTjkmBN8YeVhWWw50z3PjcpWJgrqIUBWpyfncVokD630AxJgXjFwWqcS1ucKf565ye9dxeNVC/Q6A8lYugxI4cS4brHW2vFW4PzT2iFjfAYmm8pEjSr2dga+Zhcmxlttf8lZ//8+yWHjw2KSUkn8B7n/3zYX6rNHWIW7xxJuWLkZ9oM7KmUQk6xe5y+xP8woOUFxs0ONpq/xtgl459O0e0kmx1C3FIcTfRHW+H9hWr8J8qva5Y277dXWH8fK/Zb+j+puv2g/57k2vR4zTXl+XMhtp78XzpeiC3UgRInof919Z6gTh/LYuWYDitxF/vg/jILR8yOzA7bSbtv3Q9D2d8BUEsDBBQAAAAIAI611kIWe9MwgwQAAOANAAAVAAAAZ2l0aHViMy9yZXBvcy9ob29rLnB5rVdLb+M2EL7rV0zSg23AldPdnIRq0UV32/RSFKiLHoJAS0tjixtZVEjKgRHkv3dI6kE62tQpqkMiDYffvD/Sl5eX0Y7rst28jyU2QsWlEPdR+uKJonXJFexF0VYIuag147UCUVdH0CXCDW0DsfmKuYatkPAr1zftZqbcwsc/fouj6JKMRVsp9vBViRr4vhFSQ9HuG+XEvScF5kIyLaTqlSQ+tFyiyliry1CZXMJqUHR2fxYSoyjKK6acB/NRvkgioIecWZPfidVJvlg3fzR/P3zp4ojBhlyyuqhQ2Sh5TbHtmebkvkTdyhoLi7Y5dpaBbUSrwWRRgUJNGQIGNrWcAjpSGoz++lFYHUJUmtU54eeshg2ltsT8Hguo+D2CEkniNpin/AHSFMp3vuDCCqzkY10A+WsydWAV1hr0yfaYFw6BXk7EF73Yyv9EBFaRdSi1bpLVqsADVqJBGbu0x7nYrw7vVzawlY121afV/i9wC1nGa66zbK6w2i5tvEvKiVKUvvR3UfelMI9qCXx+06lU20U87A72LcYdpBVnrOGQWuh4h3o+a2U1W8JsNup9l0DBNGq+x75ByWvqJcoQr3fwWGJNxTWVNgV5ZAqoJTS0jdlWxKHBTpoxTWZNDMMy3/puDGozL8hpFBeI0rIxPs6nQc6Px/SpUbAvQ0i5xIloOum/+DFqnfhhBqhmxo/tYO3Egl32C2QEYXU+H8hzRXXgeQla8t0O5bfg0On6gE4UQv5dIgFIICKqhXbVtRNuKIxJM1+UE5ZrfkAzoW52Q1Pdqm/KiUJTn3hu6IDJY8+KfRHoc8t3rXR0YUixJ8rTKljFwJIThZb+qvlDSxxUvJJuM+AeDC8IwptH0yjdPHpt6ZgMZpb+4Pbp6vnuwyx2TDcfqhgA4cMw1sJk+iXa4E7qNAZucQA1ngtwMQngZsOnFp9MbCef8oft7p5FrO5P4bHSg9N5ghpPs0TM9skujGQRj+SaOK9VAhshKn/TZFyZ0UJWu/RmnkVLaYslvLu6XsL11fU5rmaq3ahc8sZ02mt+I7QKJZ3K/gY6JlxIL06pMwMjzh3oY9PyqshIMp/5NoiTN0yhWUjHKN+QGtp4dlKw4LprDDdH6dPzEhxPpLd3S2BFkXmfcu99BWTdUUS6li2GKf1MNqYboWGS7aEgWuisJzAXNgnMhHCPx+/peKZBbhinCw7NMl0TDHOrjiO4CnywF7IT9IrTAeV8DtEdiXYsqUrRVoXzkm4WHbViEcCTzUn0MUehhQ6beoYgSYmo1PYPum1i66P3yiXzktU7or5peyjIK6Yl7g+CjNu7YG8+iIwy+3b7pvm6qofG/WRaWBu/VXzLrBBrMRqWp57hk65J6M7SnS5Jh/rs3yy6dATxGajb/vi7I1D3Gvn7vCpO7B1X7f7xM8AYqzEBQWUQB/RRBvURxF73e4YwH91sN0zn5ch6S4uZ2h8Ec/O6sCN/tQjcMfsnrlTDiWDWF8F6xy5miKNTyvmFrrn4KptoVHqCU9ckHnvq/+BLY0j9d6Ik7tYvaPIfUEsDBBQAAAAIAI611kJK2warjgAAAMcAAAAZAAAAZ2l0aHViMy9yZXBvcy9fX2luaXRfXy5weU2OwQrDMAxD7/4Kkw9IDr0V+hPbbmOEtPWaQFKH2C3s71c6xqabBHqSMQaWpHEbO9uossDwL4BbTIKF5y0TTrxqSKugxsPkIEKCjXLQtC6ojCchKbdEYgGuRBiycI9RtfbOzbRT5krNfjbtxMXtnTt7DsxxBp6NC55fMJXKTfHypb4AvA85e48D3n/xA95QSwMEFAAAAAgAjrXWQuNmkdLkAwAAOAoAABkAAABnaXRodWIzL3JlcG9zL2Rvd25sb2FkLnB5hVZdb9s2FH33r7hIHywDiuA02YswFx0SbA0wZMOaPg2DSkmUxZUiVZKqkRX977uXkmh9GK3gB5k8POd+U5XRDRyFq7v8Nml0yaUF0bTaOPhNuHddfq8N31RTVMkLbZjTJiAN/9wJw23GOlf34EJLyQsntAqoeyYlyyXfbDaFZNbCgz4pqVkZnZV26Qbwubq6eq45pB6XfhyB8PP49uYj6PxfFEjgkfRbVOfKWaj1aTAccKG0nk6oSpuGkTXAct05qITkFrqWuHgJToNDvXJgt3jW2w66Akb02gp0+CXZeL4kgRMzSqhjmvYr9Pyh4PX+5vZ6f3t9cxMjobDwy5+PCEW+rm11L5SjDtlbMIcL+ctgbgLPeCCQNZxh5FzNHNBPvYATDY9H3wrdyfLM04u1DKOMFpMrJMxcoBsJ4IRJ9AHoDMIMKO1EwRP4oJyQ8IiBUSUQQDio0fCccxVYznYP7p2ElBiehgm1VI+BSZI61kTlgTkPTJ3yETFIlYwZ7yNZ8gqyTCjhsiyyXFZxSEuMabEW03J40mosFXqQi5voYQKT1S4JLKvzu/NJRCYZawUcgkxy5C7adkZuY9huz9hXKXz46/fRxRFN6RkyOGetXSMzZFkxjxsX6JX43HEQ5UoES/GiCEKX9KJE4v2M94lh5heUCyJFkCUVLa6tfOC2MKId++M7pOUEueSe7K0l3ov/fmSwJciSlBZX3r/DkdCMDWDPrSKKTjLjR0Eo9cDHV74MGxm2nnJrd2bbKxvutXI4n8C9tD9yrOihmYcuZaabQ9gmXUNzcOiaSXcY7jqjYBuGJ/z9df/tnzfbpJ+KUSiAgeztfJ6P/Hg3cMeX7Ni4D36jD2yoWIGTE0+jscJPDGrwhUV98+VaSxx2vRXZRMT35S7GoXoXw93+buKqZV84s8N4aJmrDxiJmU3vEbGwaBjyBAfb8kJUgrIcTqVYFKwB64zHpBBpX55MohHojtL9WeQMx+NLw82nEvUxCMpLFp0xlP0Sg1rQPeLHsN/yfRfoJtfBjA1FCoZc7BPH+4gq9loKfO/vQMDiPXEpz570AbYpUHCnYQnv3h/XOzqT8i4ezkNhM8mabcedjKpxNuZo3kt9whrsvbSHZ9PhhYXh5Kzxf3ZT9XnyiZsyve8zPTcJ0cIKZR1TBY9QmTlnIjIUO+BkhKNW8FdCHD4yFhT0UNgyH7YDkDlrAA1Top3t4BcR/z7Zrwwhl9l0y1WwNJ8MOY/QBoq6U5+oTigCCbpisqHHo59uXl/yoky8y5E/uVsGipIabLt4upDa8mh+cGjIWVSGNe8czjCInjR+dnzhhh0xk/8DUEsDBBQAAAAIAI611kKPFA3FwAEAAOcDAAAUAAAAZ2l0aHViMy9yZXBvcy90YWcucHmVUk1r3DAQvetXDJuDd2ErF3IzTSBQaAqlLcn2VIKjtce2iiwt0jghDfnvHcn21lnIIbrsembee/PxVquVaDV1w/5cejy4IEm14uL0CbHrdIDe1YNBqJwlpW0A6hBuGLVTLbj9H6wIGufhi6brYZ9xnuNXP79KIVasIxrvepjVmAtNAN0fnKcJ8iNxCCEqo0KYqdfL5KYQwI/5dixepMLifm7i0/Tn8n7qR0JqPJDzOParLbfYK9LOJiaemlNoSdsWVGqZOkXwqAJUHhVhDc5yJq1HM9ETzxORt4igTHAFdESHIs9rfEDjDujlOKSsXJ8/nOcJmZ8ZHegD84d5gvRbYwNlqa2mslwHNM029jCNGV8YmHE9DbaFWLKRR0SsPZaeFfBd9QiuSaNyTv6nYZy0MXuREi3SOovf2Sv8r5tv6YYRP+4dWrTo0x7+6sNeGQO8c1fpFHrkSd8Qm6rLwZul5iL8DmlS/h3SU/Wp9CL8WvqzrqIhlH+azR3dELlvr69A2To1N62Vr9prOlEcg0uxMZJt4fllIxanjoabTr24skcavIUsOXi0GURH/37++HJ3mcnRtCNqyRbobbLjycU/UEsDBBQAAAAIAI611kIYnSlMewMAAKUKAAAbAAAAZ2l0aHViMy9yZXBvcy9jb21wYXJpc29uLnB5vVZRb9Q4EH7Pr5iWh+xKS7YHPK1YpF4f7k5CCJXyhFBwkknja9YOsbMVQvx3Zpw4idMt3EmIvOxmPPN9843H45yfn0e30lZd9jxpsdEmyfWhEa00WkX7R54ouqmkgYMuuhoh18oKqQzYCuFqjAad/Yu5hVK3MGCqW7D3mt8O0ho4SsEx0V/S/t1lcPn2nySKzimhqGz1AXxaRIO1AXlodGuhd77SLYZeY/IE7X2vyXblLFEU5bUwZpbfakJa7yKgh6hvSMLOee4+zaS8nP6/+jQIS8AVAVUuGtPVwqKrgEOSilQfhJUU26LtWoUFZF+G5E+WY0AlnQqEA3GKpNXtFyoLG256Z58UldwKlRNtLhRktBEV5ndEVMs7BKN3uz6Mn/wP2O8hfzY3nDmDs1yqAljL504eRY3Kgl2EJ37THIx/O+VwFjg4j3eIIGrKyL1V1ja77bbAI9a6wTbpt5BDtsfnWyd7O8Rvn/SC8SlV6umclfuEfwssIU2lkjZNVwbrcjPUyO8qP6YjntW0iRtgz3UyBvqQKYLWk1Q0EvYeL7lFu4q7to43EMeT65MdvL9+TRWjhsZ7dwpmuyR8y4bQlT3UKWEt4b09xH+L1E2K96WW6o6pLPfeRJOE6A37s+spimDxpA5D+8UyClmW1Fj2HlE5w+z0LhjZ9RSZty/0CJtXjm0sj5sTYe2WojjopCC/EJL4czxNAXg5/R/PMZ+zFg0V1x1IyiATBkGXExY8nhT7psMJ3s8GzirIcOYVrzfwRisMUv0TK0lHkCogKhTFgoOOue3MUnVvDSW/6Q4ZtpT7OGMdHo2eBaQzpzSRFqDe/jPYrE/4AW5vPwE8LvwMmRsGW5qqyJPwhw1htRV1Og6mkDBYDElfS2OZ8j82yLLVJ8IP4X6v/V3HmQfJjGl8PJVHIXnuF2jyVma+CUtZo7tiZSlx2RH94kKxM9Js+vBxHc1GI7f3MBpnE7G/lSCe3WycyteLb34nXsVJf4mtHhY7IMDP4+TVlHn7kCUs2753C6+IHkrh/4I6exSKu2gpmW6M6x7EzzZ/h/T4pqGK9nOf6zneAJvR58HDpwVbs/8aX+Y5NjbeQSyappa5u/u3R1X424354m/rpR6mTfgLioe7LAf+TOsahVrx6gaeXVxs4MXFizXQdxC66TEpdcPvx1Kdy+/U6gh/odjvUEsDBBQAAAAIAI611kLiJpm6NQIAAJwFAAAXAAAAZ2l0aHViMy9yZXBvcy9zdGF0dXMucHmVVE2L2zAQvetXDOnBCQT5sDezWSgU2oXSls3uqRSvY49jFdsyGjk5LPvfO5KcxEq3LdXFtvTmvTcf8mKxEHtlm3F3Iw0OmiTZwo4kNm8sIR4bRdDpamwRSt3bQvUEtkHY+ijQu59YWqi1gY/Kfhp3CTGu65SFwAvvv90LsWBVURvdwUmbObElUN2gjZ1iv3qyGDcSmjPsiT+EEGVbEE0OlvPQVSaAF6s9ssXM47LnyepteN49T6Yl+OS4CAYJe8sqPefRFVbpHpwJT+aSfeBCnTLmfKTwJ1tEKFrSGTTWDlmaVnjAVg9oZHAvuRLp4Sb1dU5DPZDSk0f/rLCGPFe9snm+JGzr9VS4KRe3aGTOZdDnYwat5CUmoM/gdxlUhUWrOjx155yi6vc+n9JgyFLX/pvmzbzIspD0UKzywsIm7ORkzeDoJ2m5R7tMLrhkFZk5dcH1Dm6jtkq3x/04NhqmeG/njz54yjZ+CH6X1uZKd9u4iamQSqOGebKhjjH7HLaBOfnsJIn4w9zB/Qc//P+ooqquaFUVszlTGLdjDSj3cg0JjWWJRAm/DthX3ET3Wheqxcq9oTGcfSxIni/W9Hux7NPDZ7AaDgqPfMsNRleg2OnRzgzFCrYwzJqPpr2SuRwk/zeVPCcs5xCzah4LgnFwsVWsP22GwfyiezwfqzrycwEmszv1Ns9fBnxOsxKzu+vymO7ujN+gHU0PyfTXge8vxFPwmr2EHy6+/rhLZKj1kjY+WPwCUEsDBBQAAAAIAG2jI0NYjldIbwEAAE0DAAAXAAAAZ2l0aHViMy9yZXBvcy9icmFuY2gucHltUrFugzAQ3f0Vp3QApMiq1A3RDMnQdskQdasqMMQObsGO7GOoovx7AQMGWg8Y3b17fvfuhNE1XCSWTf5Ea33mlQVZX7VBeJH42uQHbTgRc5ThV21poeta4og9tbFDHyGEFBWzFvaGqaIMPUsUE2jPZrN5LznEPSrOHAwSd+8y0PkXL5DCG0Kpq7MFbNFSCW1qhlKrQVfPZTg2RllguW4QGOSOrAWxPj8+0smzErX5gWTZRvelPr3L6Ciyv89cQJpKJTFNQ8srsR3e2ILl1rZyno9aja11xzZXbsL9BKpERCeGVW00VT3EcGQ1By36dh2OetKWhqoO8DzmLhzDoAsFC5bT4IhnCezCBjclSPx/57nxHABZ1vWUZav3h4kvFbjgTIMUc7T35S+NVxDOEs4zmv5n0dhckFZSfdsAGKKReYN8JbVPr5QONVu43SMyG267AWYY7myMbrMgSGarM6zqx+3x/rkLqNvIcJpNRH4BUEsDBBQAAAAIAG2jI0MiTP/4YgIAAHMFAAAWAAAAZ2l0aHViMy9yZXBvcy9zdGF0cy5weW1UTYvbMBC951cM6cE2pE5hb6FZWPbQFkopZHsKwVHs8UZd2TLSOCGE/PeOJCe20/hgPJ7Rm6/3VBpdQSEISVYIsmq0oZs9KZ33XdK+3T2llS5Q2WvMN0nf292rNndRrUVzC/rDxmQyKbAEoQhNzcDZEfEjdq9kMQF+DFJrajh7wz2RJcGHdQkuKlrc6kldJvfBAVUTy5o8zjo6RpskmfUAoigkSV1bPhwiRLQZ+LkRHPuLkT/XVSWp9+ZX74W7yZWwFl51TUbuWtJmRYJs3A+E+/LB0+n0bS8t6N1fzAkaow+yQAso7AlEniPDkAZZl9pUwtXTzQIL2J2A9uhhuFmSlmRuwTKOC+PRsBdefv9IQ6oVIuyJmsV8XuABlW7QpGElKTczPzzNDTbaznuwOXBasA3msmQzvdUcPtzOskzWkrIstqjKmS/EZqEbtrh8rmX5S9fYbdJX23Lq+H46LlyVSdojPsJKbiifFsMB84igYUrIvFXCcOuC+MWTNaiYGm6KfX7Ok4qW9nxs6Qk4ypW+I8VR8EczOF+Sx9nfNAkFdVvt0Lhxd4yAcDIsaLsN1nabjtOTP7yE/xN7TzTK9JPXceW6OkEh/YqFkWjvYF2EfQjrPdzOejOCfuk0Jw/IDSjVs+dBslH3brg3vor+guioLOoisJjpa7BCP6UPPFnPKRT5fojGYquwJrdFx1rFDafAmoXPz/dan7F2w/9ewrMhFgvVu3sF85E8/Luq9o4LirLr5Nb3t1DiCz660voRb4YKYNmYTgEDlnd3VvR1yNJVL9T1+ctl8xylQdnxgJTJ5B9QSwMEFAAAAAgAs5g+Q8EfbAg/FwAAhUgAACoAAABnaXRodWIzLnB5LTAuNy4xLmRpc3QtaW5mby9ERVNDUklQVElPTi5yc3StXG132kqS/u5f0Xu998TOAQG2k0y8mzkhNrHZ69hewDeTT0agBnQtJEYtmZB77v72faq6JbVA2CYzPjMTQN1V1dX18lR1a+aR50/8sZv4UVgTbizFQsZzP0mkJxZx9Oh7+JDM3AT/I8UkCoJo6YdTMY5Cz6dJiiftzWVyurfXckRPer5KYn+U6qfRRKgojccSUzwp5qlKRCwT1w+ZojuKHunRYhX701ki9sIo8ceyhoe+EgFIEQWbW+itiQJ+48D15zJ29o42BQCjkR+68QpT4nkmANbmpRDq3y6DMAvb86JxOpdhwqqlKY0oFhEexWLuJjL23UAVKl76yYzn2cI7e8eOGODH0J1LkoGlTZNZRDRWAnKKkRSpoj2KhAy9KFYYGBPdeZRIoZeZKIgDjo8YN8ETvTAVTZIlbR7xjtJEqIUckzFglg8ay5jMINQGoRTLsze47PZF/+bz4Gu71xH4fNu7+b173jkXn76JwWVHtO8Glzc9MRy2+3j86pVoX5/jv99E5x+3vU6/L/Bwr/vl9qqLOSDSa18Pup1+TXSvz67uzrvXFzXx6W4grm8G4qr7pTvAsMFNjWln0/aKeeLms/jS6Z1d4mv7U/eqO/jGHD93B9fE7TPYtcVtuzfont1dtXvi9q53e9OHnBB/77zbP7tqd790zh3wB0/R+b1zPRD9y/bVlb2cTx0I0/501dEEsZzzbq9zNqhhLdfZR6wAmoAcVzXRv+2cdelD5x8dSN3ufavRys9urvud/73DIDwU5+0v7QusYe/gmcVDyWd3vc4Xkg0L7t996g+6g7tBR1zc3JxrnfY7vd+7Z53+f4mrmz7r5a7fqYHHoM2sQQNKwWNazl2/y+rpXg86vd7d7aB7c30o9i5vvkIBELONueesyJtrXi50cdP7RlRJD6znmvh62cHvPVIdFjbotVkh/UGvezawx4Hj4KY3EMUyxXXn4qp70bk+69DTGyLztdvvHGJfun0aAJp7xPhrG1zveNm0H5BLf7TMsMa7JrqfRfv89y4JbgbvYaf7XWMVrLezS6N0mPK5VOPYX5CjnQrHEf7cncrT0z1h/c2SZKFOG43YXTpTuEk6csbRvKH86dx99ONUHZ009O/HzmLV8OSjDKJFg0mpxnR2XA+iaeQswmlONv9QzBPwRhcBZr6I5UyGCo6KWDxO8G+wEoYofJfijvyexG4UexTSfDxViTsKZEF1GbsLeCyicpSaMHXhJ5fpSLRvu+Lg8fjQ2RSlL6WARrFJ35wY4Q6REsxW4pdRLN0HBLhfxHjmhlhTxeRuCBmCgONc/mPd+tucYmm5pO7/FAt/gQjKBC0FbY4+lwuEOxmOfaleyLSOsP/PVKpE3QsxWonfZBhKRN2e9JMf1qgUcU/OF1iQBOt7Gtp1Q3EGpbtqHG0Shu3cZ6RPc5OxzOVBc4qJUSMbWZpe5llJpGRz1vhNec6i0KQQy+ye1s1tIF1kDuy2Npkh+3MXsQi+OLwXWTKr2H4S3x79vPCWw4yCaJR7jU2FzHCT1wCKsxf1f/pvc+C3KBVjbFqchgJap6Q7HNq2VY/ZGvxY0rKUk3xPhkNKotkAzuEZuSLRjyR8A7BBC0KpVvnYhxXIz90H/aDuyYUaDpFSEvJslU7hOASoVpDKiwqynIaBF1wB1SSpGyCF41PEmqbEjy0JpU7uyPNGNEri4EsCEjdFT7HOiq2pI1ogpwNssBVfEAj6JONw5sZeYo2aR+MHHvHFh5vLQHyOYOzWgDEAUoyQxoOuIcAnNxnPZABQUW0QGd9KY5hCjlEmRiMbWpqfMdTzMT2U3ijnyVQITjaycY3SbFpPPpO+OGTYUBjMWDlRPG3IsEG+o5LGpvxXwH6hkuuesznwC2Nn0kb/HDCRZ91X68M8/XnfuEJqB3TYpN757sL+KoJgdZRniAkt3LMNzcmWpaGwxbdpdK5MI95i9YRGfcTl784smQf7RL8u1yXc3Z27llN6VuTXaHbdkYV0pk5FhtmWdZ6JC6Wx+4Kxt+3pL2eUz6uY02ZYv7aLFZqwMpE4sE3nsDoRAEaIGwY51XlyS6r8LBEGJjFZTEQFhs4KhXUiJyQu4l8o+mDxcAM3nCBE5siBcxwXS5YGKP5R3TJzHy33Et2Jjoy+CnwoqEzQ5xgKYDSRcZzVojRcwQrASsi56wckpcWokPNj4APDUA1HvmYx/WZkQRUWUW3Hijp49F1N8NCutTyYwzhBkOcqzeKTr7Jhgjx/BiM2HjIVX69t6auZzi7jIEUZrAjlEb4Tnpu4WzyvWEXuf4p0ExndcPQoRMB+TKXXeAo15R8uoZAoXjXOGNUBo+ZPPqz/bU5uOu+c1qk4araO68339ePmNsOqNq225xVOvCITWkdcUJSLQXe97sD8zEkO0RZGAM0K1NpKIWKV/MsKb1bhzQaZaDwEMssZUhy3LDKOVXEP9u9/h7Gh7E0xMl5RrocEC5fq6+GQghswWwDIABa3KQJHz8A62FIag+qK6nVLuo9xNJXxLK3k1pNzakEMh1kyBGGXagIKFraybOIfpYLNygfljp5dwn7rpGWtY+Jr3+k8kjbZpbxIqvAVYud38pVqg/y3olSyomZmRW/qrfe7WRFWB311aXXOOIiUHA5r+Q+xRL0U0i9UMmW/wmb8aUjA7KBrtNJ8WxE2tYkOh0AbwEU6Bvg/2Jw0RuRYODRlFdui/p3RiH4ayiVZS2KbgGngUB3238afs9outqvLx+NGRFwb+yxB3Q3rJSH+Pryv3HAjNTJzIu8nfmBUki688g+eDKT1gyXhcOgTWBxnBUQU3yvyI0SYsdKTzYD53E/uuUT1k9U2Kh6YcLkD0yWL5r1YSvkQrDISMOgwsbXak4sIoRHBCb/ayhv9Ac94Yt16mTkbvUh8naPyijxVcKCsSOGZnPc5or66z7G/LeWdYh99dv4MKEnrbeSSiZJNuJBIxiyQvVyHlbZALKHaoYokdQLJgt0kjbkdOBxeRtGDIz2fVDhDxNBVuodhITc34dgIHYvIh5vbzy3F4telDAKH4ufpZhKtNNGPo/dvJkfvW+7Ju/dvTlpvTty37t/G3rvx0dH7t2PPc9+P3raarbcnVcsY5jBCexBEp1ItRLLPmpmu7odgn4Dm5m4IhB/XGNbVLAG3wSz8caI28mouB4dEdTo7XR9Kf6n4gEcOeMcHr+wQ9qoiPDSdt0X6O6k33+6e/uATbgDH4ewUuCMZlPNGO5B/wIzjSFygGPwhDj662S9T+mGLVE1Lqje7SzUcqihOcg8CymQjXzfZ8u45SrrxeHZPulNmbikWVA+Pye632LlxvSLQmPBa0JoiIilQVEmWKOfS1YcNKDhMh4VynSXJH9T4J++daeyjawcTxElqYujqqp7CuL/dr+d+6M9RrQM3TWn8AVsm5DM/OFOZXOEjWZMR+dXhcFiZanqyjvLJDf0fGr0QXqU63RUjSCAO+gsYikgXgjWGtFvTKV1/1IpYrHgBrr3cCRIQnzZQhwHKU+moPo+8NKCqiWqYlVDgmqycSrHOUAzR0oZDIO9YqtnBIE7loQY8rrUVKonpgMFsb5d1GDF+GVNHA6DZEmoZxQ+KNszgHI+8vlrNSJLGBqwYTjHCHY/lIjFxWAL0Eq94ypCPSONByf6M3a2T8qJKvl+oRCtWF42TaOwWPlEYoBVarFEjqByqXizgSJYUVKuQNudSKeoMkzXrYhCruNGzsR0r6giFU+DagwE+PCAmLPHrFrthyPjIhz6yjKgn4nbVv/nb22arco3apMqaMf6obaX8iDw7f77h3hVEHNE28Vvp5G9rtMxNb2llvNjgXZ1LGMmd6YrLyTHAknJdFMfayFjbCXC/FvaVKtcITycp+LRPuK+wPToAFBHX1AgCQB5cCORhkt2Lw2GG+CoU1kFuixexz6AAxl4rxf/fYoJc4HJB4BLh34t8NUeWHqVxCAuptIi+pF5YkBVHWmDCLiSDH+sWBzZDmXYinTe4cXb2OBx++FC1v//xgTuZoZhHiJ9jlyhz33Lpo+phgMprTEMfey1869iYWo7aOmi+jeU4LtWotreo9C/b+miV+gf6oHSaQqnQFNUx83mqjzpoiOFmw5isxtMnpqwE2uY6HafCp0gV3HiAHugg2BzLjujgk9dDZD06mA5KPQs9YgYtUlvoEXmY7BnjPdprZALpVThZ03njHGfZ+Hjn4kYnGZQrlIwyQysMDPtn4caxwbO0cDdEfP2YLGRS0ZgloY4KoZpHuwnVT6KFVUN6kg/0ae9HqwTI1Og5loCnod5+wN63J3ogWRFVpErsvzuqli0HVUf1o9Zusl1GCYra7+SYuuBdziTlKXLDvLTl3XfpkCPQJ+pKVpwxQJJCjtZWcFclRavZ/FUcUMP5UFfuWXt62x6bTJH3890wRD00lt495Sn3PgfvW6GITSG/oYD1mayNHVnHzS8C0P6cqZoYuG0Uw2YTJl+GnfXfvlBAsSLx8T/UHKiwVcPAydDHIc36SsGiffW1/a1v2n/iojPIjvXYgxHusOMrxFIBICIDH/BxK1GGNDlhpsjnpaDJMdEVVL+BnkrHM11N+RO6dTGzu9Zb/vbtgquIdXRng4te4U5dCslPC1tBlkPjEpmDZr6ic1Kp4ZDOfp42+mdK0212wyB4RKcB4qu+9YNQp8G1r4rmKxVsXlRpPv+qUfmWUTEGQODWEOCg1dxqUrQOGkTHaX5VjbdPJ28qSSeTn2IMLwLU/OA79E+lFG1jPUqSPqEh7AzveBQCBE+p10uaoyHUHIqzAE7HGFm5Tu6gSj0jY9sU22kjYCFjheSNUEZXdLDYIWDfdLkKwwah0Ac/GVYcQW3uOZd6nE4BClC4VXeUkLZt/1YO9T3yLtCDXKkMGBHOUHqBkamkpK6jXr9GPn/92l4U0QIIo/mOuI50MPat1EESShc+hyFm6Wx9skjCyVp/9dGnhno4Pc3KfuqknRInh/g8szpdXBVJlda4SEcomvB4xD0K8uaRRFaJGXl7joAyqg4ditqA/rGpMARDRHlGGHfh5zomwe51wTccvlJW/yeXJ8e5T7eW6Qzk/k/dbCC0qc8oYNfUA1Z/WaURF8a5J+hik2H2C+gXdE3pXhPUZ9ykX6E47n051E03zfRn9FR0ASpDTt3UiKnu1eUAURcHphGWY1TdAtCoWc+LliFPLIWJnMpTHLHngT8u8cyuDHJLMX+uNWLsXkcPcoUSRwuuamhrJnFsGcnMHLN7hyG1zOB3+r7eE0JCDnJ9FACFILR4c/yp+PALW2kuh24n5cmJmwZJ0Soo6LE+kZOh6pijQT32PRSpXBC4ZhNQm3kbazYXLWoYNZXYB39cRZ920vU8U+JRgaLTnjJBo0SUBpMMWoRMXxd+Pos3aRmlAUVvOvMsMm0a5h2LEk2Ig6VXHyEVJaR2MYdPW5x8/w8ON9oKpYG5layVyOvWUjKQ7qYV1Mxd1Zhup2ZWU6Kn49kz3vZ0INALxl7c6whjxNayKtPZ0hdpr3S/M9KSarhuAiM9dssaHkVRAPixxZTJJkh6zdViSrd0XzqX8nwutd4QhN3AHcuqxfA6lHZFo9SSwGrGFmQG8wH1IlmZ1ZPVA0yiCFeTNGCQoCkBBlNlZyav2ZimlCvQ6pHwudaVWXtm+1UbeQ35lwh9ERVCBBjVIo39KFUm/HXiOIp5U06aJwjaDFrwTdfhVcYv9YzlDAVzwp0RXa/Spv6holBfbIKDLKgP5Ig2DC8/iyEcWWjIbg1oT8wOBF5nXcTX2fDrKJSEwn1eBu0yBLbth/u8tnm7PstFO/Gd2jfsJwfdUC38WGeA/ZP3lR0VrZp+goSruCNJInEPc8sBaV6/VZ6NjoJo2midoKxMF/gOoermVmU9iep6YB3J6tEfy/L1QCoG8zsA284MaVD5HlQZ423ebN1GzEjV4CoYRfBxPaNUZ0plLusAtHLt64Oq6u6TrO5u7Vh3W1EqkFN3vHKu+B/Cc9t8H/Dp/k8POT6IXE/VdHSrLf0H/y9uKEuNa/ObA87afArjMaBoIvM4bpK//rWU/ddDNheQZS/foJhFak8uAO+4sLNTfCz5yuZzUXsd2G5TBx90xg/M2aCgMuOJ+0jvL0zMKmmwvcSntfMSihV6e9Ha6Aj0iVXpa9QvlkIP30GIF4DWXBbkiqkkN3qxOPmMHXBoSTx6lSV7v0c5g1lcWX7kEqYhDXixeHr4tta8XfrYJEFQcQEXlm5S5BlM47CtQCV7hWXjtoCZXeElVfK9a/76XJOuWfRwW/jPT4akl7lg7oC8evpYHTXWJ+VuxvPMty0Bxxz1l0hQHCzCIH81sZA/U0DMo6FKkEzpDakiLP6LLmo5qG7985cN8VHxV1efuzti2Q2Zaf49X2jGuDQz79isStDWFUm6CPLXs/i4iMnaL21Zc/2k7MnAbhH1zZOKVPWTrmw5sjkt4Yv9W1f3RHldzYCKps8o6x2q7XmdxCb/lX95okzZoOVkZ/IkHuPr0km9USIJtDHV3GTkV2jCLATQ+30cY/gAJZSmGUEXMk1RlNE0LEpk85cHJKwc+EifssPoCbxn78hldLhRbAlCZ//3NOGgElLmB8vxVDk3+uBfl27FwWj5qJGuPa8WUlW29bjp8jrH1ZDHpplVBBpvLyX2n06VZGEK+pZUZUOqTy36jACN5eOT4fD+HmHg3jpKd3KFMcXIHGILusy7U4d4S3+Y/l580kB/sTW4cLyDtCZe5cFiVX060Q4rXWpHiV8iTXkBLxBN5DdWQfCXX37h/Xmgi5xkytmj5Yx2mS9ak/lziuXOah5/SiT/bP4FUtXskEvC5CC/8Km99yA+LCt7X/ykIGtUtrwFUSXaWRrzLeCsHs6M1LxDCy4TyT3SLW3BzZa2OEj1uXYWvymCHT4x6Te5suY84BtdVXtqRpH/15k1OFwuXD9+bv7AnVqT6f79c3Jmdx2tafo41hPm2LgySr1dx0Zat3SyaY26W0xjat3R+0fZ7eeW03S+VxfHHMWerWLZQBr7tLfZxSiOZXX7wKQKqumTbVSrrSdOj6sW+6X9P/ROL8p7eov4otPfYjbluy5AtvT66Ijbp/X636sf6xcvLIBMhD7F0YMMs5b5a8yfpOE4f1vdOgbQMdecOtBee9kVVNP0Xy8hifVrq9UehRa8LpewPYOmK8VgiF2G1zWmRDfuamtc7ZRT3LkuXZGtxIlt7tz+kJyMTRdeC+7Y25O9b2e9vyLOTPueVLF0V+WLtOY+rL5stv1ajbWKJy7YFLxKPMbFJWJzGpfG5tLB2KAO3Zqyl/Jmw63ofRPyqm1vBTXNpQg269bxLmZNJ35k1HSWZpRbXDoS4xRoZU4hopLpyPKm1o7vd1xi/4GH3zSbWY9wJKm5+bNXnHKK2S067i7qS0u/DoVazUdR8BIm9p5q9wnoXSSmHSLCZBf6GSvyfVcuSfjqfdmQbt00EP2lGyc/RMmMFnig+PfDSm6er5AeV9n5RX6ax45ffnHF5nfwUSFcuqry3m9rlNtIs36848WZNAQs1q+R0nus/NYbXyHg64pkmVZrdQa1ZC1e+6Xy/eN39nLjZyOLmaxjgzXz2i5xmPZTxXlr1CwWvus17P7a1Ru6DUdYuLQwgHD62Vcz6VWCMt1Y53fIzKtdOsnqnrHkNZSGt/XrZo98m1q/YRbd+7QJ5WvW9MyCDPxSB1lFKfRqK4qAIsoFzBVdJOE7c2ZHTTUwMSfzEV8KZh58zEFPGEzl21TZVnz/t1+LyDVaWbZTjL4F+COkeCrurn+7vvl6vXdGrkfvycan4lwnfb6qa9rqp6fiDWjf6v+jEvBu9LnTXJpnXsmlwTf9rmgv6I4hyhZ7TJcCMiWUdur5fEnvNGcIpZbGghugy5xa8OIK0T2lFWH47QoKDXcYSp+Odh3vvN15xrsdZxzvOt7ZdRXHzq48umVrxC9nRt//D1BLAwQUAAAACACzmD5Dxycf1sABAAAVAwAAJgAAAGdpdGh1YjMucHktMC43LjEuZGlzdC1pbmZvL3B5ZGlzdC5qc29uhVLRitswEPwVoacEDiWXcBQOXK5cSy8vbbj2rYQg25tErSW5q1VyIeTfuyvnIC2Fe7K9szuzs+OT7lwDIYG+V/oZWpcIXZ3JxaBsaFVOoFxQKWZsoFRqFywe1SaiTzfq4GinIpZnzKT0jdJtbLKHQOtgPSQmPukWUoOuF1oR+vjp2+PzYvl98fWLwUT6zFPSLNiWmXI9N/1RuDyQbS3Z9R4wXaZnZipQEwPZhkTgx0lj7Mq4zbwICg7euq4wot1sLDWx8y5s4/5hK4hpotdXugsb1GPE1qYm6vOKkS0EQEvMxnAtp1kfdgCdGk3N7NZMxzJOwGWE39khvK5y9aV9bH5VFXebW2mv2Y+3L/LaH2W2qmZmbu6kkIMjKc2qamruuH9V1kjZe764LLE8srmgDmj7HlAyULQD9dnRU67Vh+VitCPq7yeTFvbQRe4xwznF7GQ/Lxv3GH9CQ+uM3RDOUxwuILOJhy8J9EeDYFsW4ECTibgtOWEOb/lVo4vj8X8tC1xMj/9yLeXie6zFNrwQWllLQFH+R0g+GElq9J7FmG9gQ0fg+84S8B8kGGclUQ23vPqLpubdEEkRGjiL1Or8B1BLAwQUAAAACACzmD5DpfomWhAAAAAOAAAAKAAAAGdpdGh1YjMucHktMC43LjEuZGlzdC1pbmZvL3RvcF9sZXZlbC50eHQrSS0uKeZKzyzJKE0y5gIAUEsDBBQAAAAIALOYPkOFog2xXgAAAG4AAAAgAAAAZ2l0aHViMy5weS0wLjcuMS5kaXN0LWluZm8vV0hFRUwLz0hNzdENSy0qzszPs1Iw1DPgck/NSy1KLMkvslJISsksLokvB6lR0DDQMwJKa3IF5eeX6HoW6waUFqXmZCZZKZQUlaZyhSSmWykUVBrp5uXnpeom5lXCRIwRIlwAUEsDBBQAAAAIALOYPkNR7Iu7JRgAANpKAAAjAAAAZ2l0aHViMy5weS0wLjcuMS5kaXN0LWluZm8vTUVUQURBVEGtXG132siS/s6v6J3snOAcEGA7ycR3MyfEJjE7ju0FPLn5ZARqQGMhsWrJhMyZ/e37VHVLaoHwy9zrc+8Yo+7qqup6eaq6lS8ycT03cZu/y1j5UXgiDp127dJdyhMx95NFOjlyVpta/rTtvHU6tWG6XLrx5kRcb5JFFIp17K5WMhazKBbJQorPfnKeTkT3ul9fJMnqpNXy5L0MIoxxNFVnGi1b90cHtfNoKZsrd471aKjCWLPuauPE0vVAz4umyoniea2bYrn4RPTdUJxGseeqaWS+bMql6wdgOnZnMzeZRsHSD+fR/Yc5fU/L1S78qQwVFhpIz1dJ7E/SBEIJN/REqqTwQ6GiNJ5K/mbihxCRRFqqhliDJwHp6HeUJqI2kP+b+rFUzTOQOhEx/pQqUaL+6/uOc+hAsq0RaewncrkK3ERCozSujXHtg9p1HN37Hsb1viexeyIS0NmevIymd6L+HqTbTufgH0LSUPH+vXhJo19uD59gV5fu90fHrTb0NREGx87rxwmnoZ/Qg0Oa03ZeVzJTW0aeP/OnLmm3IdxYCmz8kmZ6YqWl9WAnbsLGMouCIFpjs8Q0Cj2fJimeVFvK5KRW6zhbG6ZENMt2ahp5UixTCBFDZuwgUXQn0T09Wm1if77AZoVRgr1v4KGvRABSRMFeLfS2WMF608D1lzDY2uEuA1jIso+MAcjmpWDq386DMILV4AnpUoaJmxluCzYZ4VEsljCs2HcDVaiYjZbm2cw7tSNHjPBlCCcnHphb9iHQ2AjwCfshhwA/kZChF8VwDjwF3WWUSKHFhK3XPKx4j3EzPNGCqWiWrGnzMkdRKzklY8Asn/wnJjMItUEoxfzURuf9oRhefRp97Q56Ap+vB1e/9896Z+LjNzE674nuzej8aiDG4+4Qj1++FN3LM/z/m+j983rQGw4FHtb6X64v+pgDIoPu5ajfGzZE//L04uasf/m5IT7ejMTl1Uhc9L/0Rxg2umow7WxarZgnrj6JL73B6Tn+7H7sX/RH33jFT/3RJa32Cct1xXV3MOqf3lx0B+L6ZnB9NQSfYL921h+eXnT7X3pnDtbHmqL3e+9yJIbn3YsLW5yPPTDT/XjR0wQhzll/0DsdNSDLZfYREkAT4OOiIYbXvdM+fej9sweuu4NvDZL89Opy2PufGwzCQ3HW/dL9DBlq9UeEh5JPbwa9L8QbBB7efByO+qObUU98vro60zod9ga/9097w3+Ii6sh6+Vm2GtgjVGXlwYNKAWPSZybYZ/V078c9QaDm+tR/+ryQNTOr75CAWCzi7lnrMirSxYXurgafCOqpAfWc0N8Pe/h+wGpDoKNBl1WyHA06J+O7HFYcXQ1GIlCTHHZ+3zR/9y7PO3R0ysi87U/7B1gX/pDGgCaNVr4axer3rDYtB/gS3+0zLDBuyb6n0T37Pc+MW4G17DTw76xCtbb6blROkz5TKpp7K8STpaOI/wlpbaTmrB+sjwXu2s7Gyofqerej1N1eNwqcm+WOltMSrXmi6NmEM0jZxXOc7L5h2KegDe6CDDLVSwXyHtwVMTiaYLfwUZk+djjuMMRHPmUQpqPpypxJ4EsqGb53Y2j1ISpIsWLOvK4s8vKUEoBjWKTvjkxwh2BAzfciJ8mSOt3CHA/ienCDSFTxeR+CB6CgONc/mXT+tmdYmm5pO7/FCt/hQjKBG1QszP6TK4Q7mQ49aV64qLNPPPfCjHZiN9kGEpE3YH0kx/WqHL2v6WhJRCzQxi2c5uR3oZGbC53eqWYFmplI0vTy2tWEinZnDV+l5/TKDQpxDK7h3VzHUgXmYNAHJvMmP25j1gEXxzfiiyZVWw/sW+Pfpx5y2EmQTTJvcamQma4u9YIirOF+j/9szvwW5SKKTYtTkMBrVPSHY9t22rGbA3ASySWcpLvyXhMSTQbwDk8I1ck+omEb0gGfvQn/ET52IcNyC/dO/2g6cmVGo+RUhLybJXO4TgEqDbgyosKspyGgRdcAdUkqRsgheNTxJqmxI8tCaVO7hOZsUZJ3ID3hHEsnkLOiq1pIlogpwNssBV/JhD0Ucbhwo29xBpFkJVHfPHh5jIQnyIYuzVgCoAUI6TxoEsw8BGwfSEDgIpqg8jWrTSGOfiYZGy0sqGl+dmCej6mh9Kb5GsyFYKTrWxcqzSb5Mln0h/b1UlLhi3yHZW0dvk3tce25+wO/MLYmbQxPANM5Fm31foIsnrm7/rGBVI7oMMu9d53F/ZXEQSrozxDTGjhlm1oSbYsDYU9vk2jc2XurfcsjfqIy9+dRbIMXhD9ptzm8Pnu3Lec0rMiv0az244spDN3KjLMvqzzSFwojX0hGHvbnv70hfJ5FXN0aby1ixWasDKRqNumc1CdCAAjxBWDnOo8uSdVfpIIA7OYLCbiipuzQmGdyAmJi/gXiiGWuLuCG84QInPkwDmOiyVLAxT/qG5ZuPeWe4n+TEdGXwU+FFQm6HMMBTCayTjOalEarmAFWEpwM4G4tBYq+PwQ+MAwVMNxX6FY9JvhBVVYRLUdK6p+77ua4IFda3kwh2mCIM9VmrVOLmXLBHn+jIXYeMhUfC3b2lcLnV2mQYoyWBHKI3wnqKOzx/MKKXL/U6SbyOiGo0fBAvZjLr3WQ6gp/3AOhUTxpnXKqA4YNX/yfvtndzI3lk7EYbtz1Gy/ax619xlWtWl1Pa9w4g2Z0DbigqJcDLoZ9Efma05yiLYwAmhWoNZWChGr5F9WeLMKbzbIROMhkFkvkOK4ZZGtWBX3YP/+dxgbyt4UI+MN5XpwsHKpvh6PKbgBswWADFjiOkXgGGRdpWmUxqC6oXrd4u5DHM1lvEgrVxvIJbUgxuMsGYKwSzUB93wsZdnEP0gFm5V3yp08KsKLznHHkmPma9/p3ZM22aW8SKrwJWLnd/KVaoP8t6JUsqJ2ZkWvm513z7MiSAd99Uk6ZxpESo7HjfyLWKJeCukbKpmyb2Ez/jwkYFbvG62031SETW2i4zHQBnCRjgH+DzYnjRE5Fo5NWcW2qL9nNKKfhnJN1pLYJmAaOFSH/dfDvdZWRKu2XjAHTTdslpj4dXxbueGGa2TmRN7O/MCoJF155S88GUjrC4vD8dgnsDjNCogovlXkR4gwU6UnmwHLpZ/cconqJ5t9VDwswuUOTJcsmvdiLeVdsMlIwKDDxNbqQK4ihEYEJ3xrK2/yBzzjAbm1mPkyWkj8uUTlFXmqWIGyIoVnct7HiPrqNsf+Npc3in300fkLoCStt4lLJko24YIjGTNDtrgOK22FWEK1QxVJ6gSSBbtJGnM7cDw+j6I7R3o+qXCBiKGrdA/DQm5uwrEROlaRDze3n1uKxbdrGQQOxc+T3SRaaaIfJu9ezw7fddzjt+9eH3deH7tv3F+m3tvp4eG7N1PPc99N3nTanTfHVWKMcxihPQisU6kWItlnzUxX90OwT0BzSzcEwo8bDOsaFoP7YBZ+OFEbfvUq9QOiOl+cbA+ln1S8xyMHa8f1l3YIe1kRHtrOmyL9HTfbb56f/uATbgDH4ewUuBMZlPNGN5B/wIzjSHxGMfhD1D+42Tdz+mIPV22Lq9fP52o8VlGc5B4ElMlGvm2y5d1zlHTj6eKWdKfM3FIsqB4ek93vsXPjekWgMeG1oDVHRFKgqJIsUS6lqw8bUHCYDgvlOouTP6jxT9670NhH1w4miBPXtKCrq3oK4/5+v176ob9EtQ7cNKfxdbZM8Ge+cOYyucBHsibD8suD8bgy1QxkE+WTG/o/NHohvEp1uism4EDUhysYikhXgjWGtNvQKV1/1IpYbVgA1xZ3hgTEpw3UYYDyVDppLiMvDahqohpmIxRWTTZOJVunKIZItPEYyDuWalEfxak80IDHtbZCJTEdMJjt7bMOI8YvU+poADRbTK2j+E7Rhhmc45HXV6sZSdLYgBXDKUa406lcJSYOS4BeWiueM+Qj0nhQsj9jd9ukvKhy3S9UohXSRdMkmrqFTxQGaIUWa9QEKoeqVys4ksUF1SqkzaVUijrDZM26GIQUV3o2tmNDHaFwDlxbH+HDHWLCGt/usRuGjPd86CPLiHomrjfDq1/etDuVMmqTKmvG+KO2lfIj8uz8+Y57VxBxRNfEb6WTv63R8mp6Syvjxc7a1bmEkdyprricHAOsKddFcayNjLWdAPdrZl+qco3wcJKCT/uE+wrbowNAEXFNjSAA5MGFQB4m2b04HGaIr0JhPeS2eBX7DApg7I1S/P8tJsiFVT4TuET49yJfLZGlJ2kcwkIqLWIoqRcWZMWRZpiwC/Hgx7rFgc1Qpp1I5w1unJ09jsfv31ft73+8505mKJYR4ufUJcrct1z7qHoYoLKMaehjr4VvHRtTy1FbB823sRzHpQbV9haV4XlXH61S/0AflM5TKBWaojpmuUz1UQffAdCr2TAmq/H0iSkrgba5Scep8ClSBTceoAc6CDbHshM6+GR5iKxHB9NBqWehRyygRWoL3SMPkz1jvEd7jUwgvQono/P2oywbHz27uNFJBuUKJaPM0AoDw/5ZuHFq8CwJ7oaIrx+SlUwqGrPE1GHBVPvweUwNk2hl1ZCe5AN92vvJJgEyNXqOJeBpqLcfsPfNsR5IVkQVqRIv3h5W85aDqsPmYed5vJ1HCYra7+SYuuBdLyTlKXLDvLTl3XfpkCPQJ+pKVpwxgJOCj85ecFfFRafd/lnUqeF8oCv3rD29b49Npsj7+W4Yoh6aSu+W8pR7m4P3vVDEppDfUIB8JmtjR7Zx85MAtL9kqiYG7hvFsNmEyadhZ/3zQiigWJH4+A81Byps1SzgZOjjgGZ9pWDRvfja/TY07T/xuTfKjvXYgxHusOMbxFIBICIDH/BxL1GGNDlhpsjnpaDJMdEVVL+BnkqnC11N+TO6dbGwu9Z7fl7YBVcR6+jOBhe9wp27FJIfZraCLIfGNTIHzXxJ56RSwyGd/Txt9I+UpvvshkHwhE4DxFd96wehToNrXxXNVyrYvKjSfP5Vo/Ito2IMgMCtIUC9095rUiQHDaLjNL+qxntBJ28qSWezv7UwvAhQ873v0K9KLrrGepQkfUJD2Bne8SgECJ5Tr5c0R0OoORRnAZyOMbJyndxBlXpGxrYpttNGwEKmCskboYyu6EDYMWDffL0Jwxah0Ds/GVccQe3uOZd6nE4BClC4VXeUkLZt/1YO9T3yLtCd3KgMGBHOUFrAyFRSUtdRr14hn796ZQtFtADCaL4jLiMdjH0rdRCH0oXPYYgRna1PFkk42eqv3vvUUA/n2V1I7qSd0EoOrfOIdLq4KpIqybhKJyia8HjCPQry5olEVokZeXuOgDKqDh2K2oB+2VQYgiGiPMKMu/JzHRNjt7rgG49fKqv/k/OT49yHW8t0BnL7p242ENrUZxSwa+oBq7+s0ogL49wTdLHJMPsJ9Au6pnRvCOoz7tKvUBz3vhzqpptm+iN6KroAlSGnaWrEVPfqcoCoiwPTCMsxqm4BaNSs50XrkCeWwkRO5aEVseeBPy2tmV0Z5JZi/lxrxNi9jh7kCqUVLbiqoa2ZxLFlIjNzzO4dhtQyu9d3gCsMomASfJDrowAoGCHhzfGn4sMvbKW5HLqflCdnbhokRaugoMf6RE6GqmOOBs3Y91CkckHgmk1AbebtyGwuWjQwai6xD/60ij7tpOt5psSjAkWnPWWCRokoDSYeNAuZvj77+SzepHWUBhS96cyzyLRpmHcsSjTBDkSvPkIqSkjtYg6ftjj5/tcPdtoKpYG5lWyVyNvWUjKQ/q4VNMxd1Zhup2ZWU6Kn49kj3vZwINACYy9udYQxbGtelels6Yu0F7rfGWlONVw3gZEeu2UNT6IoAPzYY8pkE8S9XtValG7pPnUu5fmca70hCLuBO5VVwrAcSruiUWqJYbVgCzKD+YB6lWyM9GT1AJMowtUsDRgkaEqAwVTZmclbNqYp5Qq0eiR8rnVhZM9sv2ojL8H/GqEvokKIAKNapbEfpcqEv14cRzFvynH7GEGbQQv+0nV4lfFLPWO9QMGccGdE16u0qX+oKNQXm+AgK+oDOaILw8vPYghHFhqyWwPaE7MDgVdZF/FVNvwyCiWhcJ/FoF0Gw7b9cJ/XNm/XZ75oJ75T+4b9pN4P1cqPdQZ4cfyusqOiVTNMkHAVdySJJe5h7jkgzeu3yrPRSRDNW51jlJXpCn+Dqaa5VdlMoqYe2ESyuvensnw9kIrB/A7AvjNDGlS+B1XGeLs3W/cRM1y1uApGEXzUzCg1mVJ5lW0AWin79qCquvs4q7s7z6y7rSgVyLk73TgX/Ivw3D7fB3y6/dNDjg8i11MNHd0aa//O/4sbylLj2vzmgLM1n8J4DCiayDyOm+Svvy1l/+2QzQVk2ct3KGaR2pMrwDsu7OwUH0u+svlY1N4GtvvUwQed8R2vbFBQeeGZe0/vL8yMlDTYFvFh7TyFYoXeniQbHYE+IJW+Rv1kLvTwZzDxBNCa84JcMZfkRk9mJ5/xDBxaYo9eZcne71HOaBFXlh85h2lIA57Mnh6+rzVvlz42SRBUXMCFpZsUeQbTOGwvUMleYdm5LWBmV3hJFX9v2z8/1qRrFz3cDv73N0PS01wwd0CWnj5WR43tSbmb8Tzz156AY476SyQoDhZhkP80sZA/U0DMo6FKkEzpDakiLP6LLmo5qG798x877KPir64+n++IZTfkRfO/c0GzhUsz847NpgRtXZGkqyB/PYuPi5is/dKWNddPyp4M7BZR3zypSFV/05UtRzanJXyxf690D5TX1QtQ0fQJZb1DtT3LScvk3/I3D5QpO7Sc7Eye2GN8XTqpN0okhnammpuM/ApNmIUAer+PYwwfoITSNCPoQqYpijKaZokS2fzlAQkrBz7Sp+wwegLv2TtyGR1uFFuM0Nn/LU2oV0LK/GA5nivnSh/869KtOBgtHzXStefNSqrKth43XV7luBr82DSzikDj7bXE/tOpkixMQd+SqmxIDalFnxGgsXx8Mh7f3iIM3FpH6U6uMKYYmUNsQZd5n9Uh3tMfpp8nnzTQT2wNLhyvnjbEyzxYbKpPJ7phpUs9k+OncFMW4AmsifzGKgj+9NNPvD93dJGTTDl7tF7QLvNFazJ/TrHcWc3jT4nkn+2/QKp6OeSSMKnnFz6199bjg7KyX4i/ycgWlT1vQVSxdprGfAs4q4czIzXv0GKVmeQe6Z624G5LW9RTfa6dxW+KYAcPTPpNbqw5d/iLrqo9NKPI/9uLtThcrlw/fmz+yJ1bk+n+/WN8ZncdrWn6ONYT5ti4Mkq92cZGWrd0smmNulnNY2rd0ftH2e1neuv9e3VxzFHs0SqWDaT1gvY2uxjFsaxpH5hUQTV9so1qtfPA6XGVsF+6/03v9KK8p7eIP/eGe8ymfNcFyJZeH51w+7TZ/LX6sX7xwgLIROhjHN3JMGuZv8L8WRpO87fVrWMAHXPNqQPttZddQTVN/+0SkpZ+ZbXao9CC1+USdmDQdCUbDLHL8LrBlOjGXWNrVTvlFHeuS1dkK3Filzu3PyQnY9OF14w79vZk79tZ76+IU9O+J1Ws3U35Iq25D6svm+2/VmNJ8cAFm2Kt0hrT4hKxOY1LY3PpYGpQh25N2aK83nEret+E/8GIPW8Ftc2lCDbrztFzzJpO/Mio6SzNKLe4dCSmKdDKkkJE5aITy5s6z3y/4xz7Dzz8ut3OeoQTSc3Nv3vFKaeY3aLj7qK+tPTzWKjNchIFT1nE3lPtPgG9i8S0Q0SY7EI/Y0W+78olCV+9LxvStZsGYrh24+SHKJnRCg8Uf39QuZrnK6THTXZ+kZ/mseOXX1yx16t/UAiXrqq899uZ5DbSbh498+IM/Ssh5jVSeo+V33rjKwR8XZEs02qtLqCWrMVrv1T+4uitLW78aGQxk3VssGZe2iUO036oOO9M2oXgz72GPdy6ekO34QgLlwQDCKevfbWQXiUo0411fofMvNqlk6zuGUuWoTS8q183u+fb1PoNs+jWp00oX7OmZxZk4Jc6yCpKoVdbUQQUUS5gLugiCd+ZMztqqoGZOZmP+FIwr8HHHPSEwVS+TZVtxXe//FxErsnGsp1i9DXAHyHFE3Fz+dvl1dfL2im5Hr0nG5+IM530+aquaaufnIjXoH2t/6ESrN0acqe5NM+8kkuDr4Z90V3RHUOULfaYPgVkSijd1PP5kt5JviCUWhqL1QBdltSCFxeI7ilJdJL9G0nPGEqfDp873nnz7Blvnznj6LnjnedKceQ8d41+2RrxzanR9/8DUEsDBBQAAAAIALOYPkO1QxFBDgsAAIoTAAAhAAAAZ2l0aHViMy5weS0wLjcuMS5kaXN0LWluZm8vUkVDT1JEfZfHlqNak4XnvVa/iajCm0EPJISQsMKbCQsPEt6jp//Jezs7UWZ1TcgcaH3Eidjs2GeI+6H/PWxPL82HbAx+Neuhz3wYw/9HE/oamdAEPmcoAJ3IxBAe+slkNQZM42ekGfhAkVHQ4F19QBAUAv/7v4YvXFUPeZKH/pDXVb+jsjodoGN5086hViyo45CCBcAaONfYKtkPsgdqZfTwcQmYAwLCyBu0rKO42NOWG0dJWas2CL6yQSxgecIat0yLszkYiiRAQHXFc70TFeYAQxj5SUvyZRi7eI/q0yq1zITHaq28LGSseYBMoYQozwikPxw/6EWeBVoPmcIDBuJvdTVj8VYWOPXO7XiEVAefavtlCagmcqwgC/fXpWXbRMbuzjhivb70BxTHqE/YOORvnNV/TJepuy71AJe8q60cHz4nK1pC1rAUupgm+1I+uOj4um3NQoi3ovxxyPawAA0r6JiqM4JBCoKuF0F0EUJc/deotLqtEWfc93NFY5j6AJEE9g5r8h3qfFrE181S5pWTwsC48+TFXa8uHIRpcDnzxmscC5dTwGlwDhiKwm+ofujGcNhXZkQTFmXFdH/MtuRBpE7aaRKWctgaqiHrAj5dAnQyV9YWDzABoZ84z8urfPC8HQolzozSPMjrSfMBT7+VFoBxdDwqsfosMUlsOMtlkUwbL8bhXbB534/xP02ru/wVe3XzIV2/8PqwbuLdK+pScxvDvfYuwRSQ8lwcnSSDWDFnWQtH+0xmOsKw/msqmQMEo+9K6eKm3h/dwYZ5XrXX5XpVRga/1uw9BzOFtV88OqBqlTGcDoNzXxLhASXgL6n8Q6u7dA8DKsIHaym9eSd2Dq+6g7rEFRxwrwm0V+xa6lXEGneeJVM8QBACvzfgu/gqHk7TY7ZkGi0SFxLpnmtsC1mmXpexsrlnoeuuq51W0rwdIATFfnZzTytFQ5H55UkhyQXCeq0LKowUV1yRn/du9sRnMSgJJ66gsakPhGDyDZfm/ZtilhSIhGPRUIvmqeESXU7LUUdg6UmEFHFup7szjKGlQgypHHAUhL7Bhh1quJ7gmMKDmnO9+XSDFtkvyGkCxxOYo6seX8JM81HrYgmbhZAI+t6zPu72dUl5IsVsxOsSIwqSx6HmtXslHkBaYq7N62WhaYVgj0mg9QeSIt61EU9x9XbKkbiKTKANORHYy5Afn7HGn6EYMrhmgh1rhSlZWwm1Ga10c+CPz/9fE0c2BgD+In5Bv6KtcUBeJfVv68owwidZxC7R06Jr8Tne0YJMR9cWJ5FAhfMVjGak4ZNrdq/njk3JTSngX8Eiox/PR/34yfbWzdcChbaANdNKhJKaLAAzzqFyHpJN3S5zj6P06wXqlANEQTj8V7rK0LJ6Phz++qMzo9Hq7a7fZOlX1w+flcz+M3jdaLtu2dU6QRcmL3xvvHVjEPkh4DonoOjn2c2bbbQQieHYX1/SrB///3r0dfX5gmcKwIJ874o1MgpGCOBaANk+B12vk2qQk7oi5UJd9CneORAk9Vf8UDdesUmg+DUs/3cCKsrzEzBWYyg2OMY2A2I7BmPR40owpNhgTElOLuI/8z48fPji//J/f/d+e8XPABtbd0Gd/bBzZ+JMVo+b68fPVHk2gAVS5mqrT2maNyURX434/UOU5cKfu9NL9JsVz25iYjppqeFY5g30tc6uKQ2/XKkPWO5IHjCE/BLl7x8J46WDaIGNGBTLZBCBZxsvIYnEJYeObSa4nlPN4zHwjjPkczM/ivhq4O//L16QauTzSupQkI00cEqLQfVgL15rT+tDxBvpyp79KodVh5u3zYRDX8Tv9of7HW+VgCh027ISvYhYxj4/0/ykAyeXov02d45uSxRLamyGBe9q+54GWhGdO8qsee9YjD4FXbCqpaTnAzScQDLVLFLadYwqis82GSIUBO+K+uYvNRGRw1BT6dFLraVe6K4pDTNy7L5MB9afKd4FfR99gNBz0wOG7lB/WJZ6pqOqpbBGe8I7l4E5wp0u55vO5/xwvjTyBKIcdzXG1kI/RvnFiuKw7vyhfqvNxRcSj1knLzkYdE3k/AReEC0fZUl6XDHMuKs3Jh0Ar23SA4yiX6by+2ciYBq9RpUugBYJDe9uQDesQxYzOIt4xvLHIN3Ef9LuvjqTW/AByTeR7TixLlyruB0Mwky5AXSwwPMnZ1JYhJsHC0iPi4gdIWeEU+aAk/huiEWc+uG6QzUx6nbgJSZPWBAOJqb6ZdU3utkR43yVC/iGjXJulhIH1Qcch/Ev1I/UWkc9YVfr9VrXD47Uee/iMVqF8N61n64Q6WA+ek70oQ3NdBMESe6O957DcOyMPj2aETRgQdUrTZ6elaFoj9eRjobLMMWE9Bp9x3TjzWoRZGfkv79FB7cNbsFsbVEJq8IlsxFUW5lAP6qtLtiPkBRIWL529AzbW0kEgsD7jn9ssLAuy80pdkghdYBxLuntJFbNG1IKCbSf2BxmRkfltC0xh1kpK4tkaD5QCPkdmG3PuttPIH86cxBBDAjRbpoAlalFL8cIgAeVaNOlxjgCFOjJyUMJ3RYLAn0nJnmxz3EnR8aTBTInWBDRO/88RS+0rm1rBniCW41H0Pe3sjcXvdqODCLod9zHc4ebHwPbXjGPHZmTAJzKJH9OrEIPNQ1YSxohTG17bSDniDYfCGrvF//i/vB90kEEg33FzZ1JRL4UUIWrlPczFryms+krKYzALqPQD5TaogmFfBH/TV///tnxurh9Eklup4SzzQpa5T6Z1tbAzY4vPCr24qA4g3VS9dVmRCC6CxSfxJ9TlicVhy4O00fAnUTqRTf4V92bSkwl2AoCdOubCXEGZVsFDxSI/yAWfrCtvF0cU54c+mj72ifaCJel5IFfhPUxXxKDxlag4eYrl8mLZBjgJkQQ+gH8Qx9FZjluV4xLqbSv8lGtgpUQyTlWiUczuBchp8SE1Dt/0Yv0QILwD2S5CWcTY7Xv5QuqqanSFIyd0c5HTc9F9WpuNM259uVHuBkx6og5z47dHAom0R/Qfxbr/q7HPzWUYIGojbJkmaL7emxRKhcAUxLuy0tFMNq8twP3mpzt4Piuk//cKf4wGnXC4m5VI9mF0RNwY8918Gwl1z8+6mMVuBBEQ1EZXUyE+bgc4+R34sdz30WHhM65fOaMDEHZkwetUHQUaSx/uFxMpxxG2IxGvpAPLyVAEvxjhW/ubHdgUgN+10FIhWt2rGHDI3JcfWCmvgJXp1QFhsIjNCi+b4xPYDV8SycgmFAUyIiZkJGgJ5/WktFldpHHhCf4O1BE69AJZmsp8HYzxSHkOzKr6+f+o7aZVOcnIrS5tCvVM3SqBXhOJCdO/DZmG5t12A7TJq/fEjiGwd9xfxBjUNkP5wFnozpeUANjTBhfg9nD8q5G0CMI9Atfu5ipVuY2Z4r6TozquSpqP9p/1tg9cYTti+hVVoXzJVP92cACo7+dUjfvJrsmOYdz4PqOHmAc+jGXwU/3l46iGVNXeDU0xiVqd7nzzfGkAqJbmVKRIap0z7XSkvBxs0XqZ33bkBu/y7eQvF94EMR1NZ76zfJY9GPmA0ZY1NbtdlIeVtSQ0kMj3ZDXINLYLvgw9h3aD/4wvoUzA599B3zKj9xTLIMCWUl3IIzEnsb5Vr3gPiJVIXgRmnDcchDy48hB51dhtr9Q6oaGoZaHc8d4OldcfOpulOglIbCGkzbbcYvTY3nMwmQ+kOgfC3y7n4IeiswpUOWYVXS5Sh2zuY1GNKup8XEXq3imei2d+dMmwy3ybbz/AFBLAQIUAxQAAAAIADSXPkONiblWuBEAAIKCAAAUAAAAAAAAAAAAAACkgQAAAAB0ZXN0cy90ZXN0X2dpdGh1Yi5weVBLAQIUAxQAAAAIANqZMkNPV8f9zgIAAM8LAAAbAAAAAAAAAAAAAACkgeoRAAB0ZXN0cy90ZXN0X25vdGlmaWNhdGlvbnMucHlQSwECFAMUAAAACADamTJD+cYV1p4CAABuCAAAFAAAAAAAAAAAAAAApIHxFAAAdGVzdHMvdGVzdF9tb2RlbHMucHlQSwECFAMUAAAACABtoyNDiWjw6vkAAAD6AQAAEQAAAAAAAAAAAAAApIHBFwAAdGVzdHMvZml4dHVyZXMucHlQSwECFAMUAAAACADamTJDqNgwEUIEAAAzEgAAEwAAAAAAAAAAAAAApIHpGAAAdGVzdHMvdGVzdF9wdWxscy5weVBLAQIUAxQAAAAIADSXPkNoxivX5AMAAN0LAAAOAAAAAAAAAAAAAACkgVwdAAB0ZXN0cy91dGlscy5weVBLAQIUAxQAAAAIANqZMkPatWq6QAIAAFMHAAATAAAAAAAAAAAAAACkgWwhAAB0ZXN0cy90ZXN0X2F1dGhzLnB5UEsBAhQDFAAAAAgAh7XWQhmPByEtBAAAQhUAABEAAAAAAAAAAAAAAKSB3SMAAHRlc3RzL3Rlc3RfYXBpLnB5UEsBAhQDFAAAAAgA2pkyQ7QgaEKdAgAAmgoAABUAAAAAAAAAAAAAAKSBOSgAAHRlc3RzL3Rlc3Rfc3RydWN0cy5weVBLAQIUAxQAAAAIAIe11kIAAAAAAgAAAAAAAAARAAAAAAAAAAAAAACkgQkrAAB0ZXN0cy9fX2luaXRfXy5weVBLAQIUAxQAAAAIANqZMkNMlb3MvAEAAN4EAAAsAAAAAAAAAAAAAACkgTorAAB0ZXN0cy90ZXN0X2lzc3VlX2F1dGhvcml6ZV9vcHRpb25hbF9zY29wZS5weVBLAQIUAxQAAAAIANqZMkPikikgWhwAAJu4AAATAAAAAAAAAAAAAACkgUAtAAB0ZXN0cy90ZXN0X3JlcG9zLnB5UEsBAhQDFAAAAAgA2pkyQxlCrU5aBgAAOCwAABIAAAAAAAAAAAAAAKSBy0kAAHRlc3RzL3Rlc3Rfb3Jncy5weVBLAQIUAxQAAAAIAG2jI0PL4EsAfAEAAEEFAAATAAAAAAAAAAAAAACkgVVQAAB0ZXN0cy90ZXN0X3V0aWxzLnB5UEsBAhQDFAAAAAgA2pkyQxb264+VBwAAkCcAABQAAAAAAAAAAAAAAKSBAlIAAHRlc3RzL3Rlc3RfaXNzdWVzLnB5UEsBAhQDFAAAAAgA2pkyQ8FaZVzsBAAAARkAABMAAAAAAAAAAAAAAKSByVkAAHRlc3RzL3Rlc3RfZ2lzdHMucHlQSwECFAMUAAAACADamTJDYaka3OQCAAASCwAAEQAAAAAAAAAAAAAApIHmXgAAdGVzdHMvdGVzdF9naXQucHlQSwECFAMUAAAACADamTJDK4aMZdUGAAAQIwAAEwAAAAAAAAAAAAAApIH5YQAAdGVzdHMvdGVzdF91c2Vycy5weVBLAQIUAxQAAAAIANqZMkNGccaBRwMAAAkNAAAUAAAAAAAAAAAAAACkgf9oAAB0ZXN0cy90ZXN0X2V2ZW50cy5weVBLAQIUAxQAAAAIAG2jI0OcuQUE+wMAAC8NAAAQAAAAAAAAAAAAAACkgXhsAABnaXRodWIzL2F1dGhzLnB5UEsBAhQDFAAAAAgAfZg+Q0zi/B/MBQAACxUAABEAAAAAAAAAAAAAAKSBoXAAAGdpdGh1YjMvZXZlbnRzLnB5UEsBAhQDFAAAAAgA2pkyQw1X45kwIgAAa7sAABEAAAAAAAAAAAAAAKSBnHYAAGdpdGh1YjMvZ2l0aHViLnB5UEsBAhQDFAAAAAgAjrXWQg++fzqiBQAAVRUAABgAAAAAAAAAAAAAAKSB+5gAAGdpdGh1YjMvbm90aWZpY2F0aW9ucy5weVBLAQIUAxQAAAAIAG2jI0Oi6PERzwEAAAUEAAAQAAAAAAAAAAAAAACkgdOeAABnaXRodWIzL3V0aWxzLnB5UEsBAhQDFAAAAAgA2pkyQ73wA4W/DAAAWDYAABAAAAAAAAAAAAAAAKSB0KAAAGdpdGh1YjMvcHVsbHMucHlQSwECFAMUAAAACABtoyNDmg6Kg9sMAADOOAAAEAAAAAAAAAAAAAAApIG9rQAAZ2l0aHViMy91c2Vycy5weVBLAQIUAxQAAAAIAIWYPkOZqSJPLAEAABoCAAATAAAAAAAAAAAAAACkgca6AABnaXRodWIzL19faW5pdF9fLnB5UEsBAhQDFAAAAAgAbaMjQxtbZ3ZiAwAAiAkAABUAAAAAAAAAAAAAAKSBI7wAAGdpdGh1YjMvZGVjb3JhdG9ycy5weVBLAQIUAxQAAAAIANqZMkOjFt/WMAQAAMALAAASAAAAAAAAAAAAAACkgbi/AABnaXRodWIzL3N0cnVjdHMucHlQSwECFAMUAAAACABtoyNDA4G9gHgHAADVGgAADgAAAAAAAAAAAAAApIEYxAAAZ2l0aHViMy9naXQucHlQSwECFAMUAAAACACOtdZCOLuwWkoGAADiGQAAEQAAAAAAAAAAAAAApIG8ywAAZ2l0aHViMy9sZWdhY3kucHlQSwECFAMUAAAACABtoyNDA3kpKcIPAABANgAAEQAAAAAAAAAAAAAApIE10gAAZ2l0aHViMy9tb2RlbHMucHlQSwECFAMUAAAACABtoyNDmKj/g44LAAD+MwAADgAAAAAAAAAAAAAApIEm4gAAZ2l0aHViMy9hcGkucHlQSwECFAMUAAAACABtoyNDKvGfoMMMAAC0QwAADwAAAAAAAAAAAAAApIHg7QAAZ2l0aHViMy9vcmdzLnB5UEsBAhQDFAAAAAgAbaMjQ7HF7AvHAQAAqgMAABgAAAAAAAAAAAAAAKSB0PoAAGdpdGh1YjMvZ2lzdHMvY29tbWVudC5weVBLAQIUAxQAAAAIAG2jI0M5hhZvwwIAAIsHAAAYAAAAAAAAAAAAAACkgc38AABnaXRodWIzL2dpc3RzL2hpc3RvcnkucHlQSwECFAMUAAAACABtoyNDYuNAjIkBAAAKBAAAFQAAAAAAAAAAAAAApIHG/wAAZ2l0aHViMy9naXN0cy9maWxlLnB5UEsBAhQDFAAAAAgAbaMjQ05vii+ICAAA+R4AABUAAAAAAAAAAAAAAKSBggEBAGdpdGh1YjMvZ2lzdHMvZ2lzdC5weVBLAQIUAxQAAAAIAI611kJ6g6BWqgAAACUBAAAZAAAAAAAAAAAAAACkgT0KAQBnaXRodWIzL2dpc3RzL19faW5pdF9fLnB5UEsBAhQDFAAAAAgA2pkyQ01AsBgTCwAAxSgAABcAAAAAAAAAAAAAAKSBHgsBAGdpdGh1YjMvaXNzdWVzL2lzc3VlLnB5UEsBAhQDFAAAAAgAbaMjQxc71v22AQAAigMAABkAAAAAAAAAAAAAAKSBZhYBAGdpdGh1YjMvaXNzdWVzL2NvbW1lbnQucHlQSwECFAMUAAAACACOtdZCE6UwOXwCAAClBgAAFwAAAAAAAAAAAAAApIFTGAEAZ2l0aHViMy9pc3N1ZXMvbGFiZWwucHlQSwECFAMUAAAACABtoyND4TO7ymMBAAAiAwAAGgAAAAAAAAAAAAAApIEEGwEAZ2l0aHViMy9pc3N1ZXMvX19pbml0X18ucHlQSwECFAMUAAAACACOtdZCSke/xlcEAADUDAAAGwAAAAAAAAAAAAAApIGfHAEAZ2l0aHViMy9pc3N1ZXMvbWlsZXN0b25lLnB5UEsBAhQDFAAAAAgAjrXWQmkN0fm9AgAA5gYAABcAAAAAAAAAAAAAAKSBLyEBAGdpdGh1YjMvaXNzdWVzL2V2ZW50LnB5UEsBAhQDFAAAAAgAjrXWQgA3VLAJAwAAeAgAABgAAAAAAAAAAAAAAKSBISQBAGdpdGh1YjMvcmVwb3MvY29tbWVudC5weVBLAQIUAxQAAAAIAG2jI0Nl9wsJCzMAAJYUAQAVAAAAAAAAAAAAAACkgWAnAQBnaXRodWIzL3JlcG9zL3JlcG8ucHlQSwECFAMUAAAACACOtdZCXBqJsgoDAACICQAAFwAAAAAAAAAAAAAApIGeWgEAZ2l0aHViMy9yZXBvcy9jb21taXQucHlQSwECFAMUAAAACABtoyND+akbcIwGAADtFQAAGQAAAAAAAAAAAAAApIHdXQEAZ2l0aHViMy9yZXBvcy9jb250ZW50cy5weVBLAQIUAxQAAAAIAI611kIWe9MwgwQAAOANAAAVAAAAAAAAAAAAAACkgaBkAQBnaXRodWIzL3JlcG9zL2hvb2sucHlQSwECFAMUAAAACACOtdZCStsGq44AAADHAAAAGQAAAAAAAAAAAAAApIFWaQEAZ2l0aHViMy9yZXBvcy9fX2luaXRfXy5weVBLAQIUAxQAAAAIAI611kLjZpHS5AMAADgKAAAZAAAAAAAAAAAAAACkgRtqAQBnaXRodWIzL3JlcG9zL2Rvd25sb2FkLnB5UEsBAhQDFAAAAAgAjrXWQo8UDcXAAQAA5wMAABQAAAAAAAAAAAAAAKSBNm4BAGdpdGh1YjMvcmVwb3MvdGFnLnB5UEsBAhQDFAAAAAgAjrXWQhidKUx7AwAApQoAABsAAAAAAAAAAAAAAKSBKHABAGdpdGh1YjMvcmVwb3MvY29tcGFyaXNvbi5weVBLAQIUAxQAAAAIAI611kLiJpm6NQIAAJwFAAAXAAAAAAAAAAAAAACkgdxzAQBnaXRodWIzL3JlcG9zL3N0YXR1cy5weVBLAQIUAxQAAAAIAG2jI0NYjldIbwEAAE0DAAAXAAAAAAAAAAAAAACkgUZ2AQBnaXRodWIzL3JlcG9zL2JyYW5jaC5weVBLAQIUAxQAAAAIAG2jI0MiTP/4YgIAAHMFAAAWAAAAAAAAAAAAAACkgep3AQBnaXRodWIzL3JlcG9zL3N0YXRzLnB5UEsBAhQDFAAAAAgAs5g+Q8EfbAg/FwAAhUgAACoAAAAAAAAAAAAAAKSBgHoBAGdpdGh1YjMucHktMC43LjEuZGlzdC1pbmZvL0RFU0NSSVBUSU9OLnJzdFBLAQIUAxQAAAAIALOYPkPHJx/WwAEAABUDAAAmAAAAAAAAAAAAAACkgQeSAQBnaXRodWIzLnB5LTAuNy4xLmRpc3QtaW5mby9weWRpc3QuanNvblBLAQIUAxQAAAAIALOYPkOl+iZaEAAAAA4AAAAoAAAAAAAAAAAAAACkgQuUAQBnaXRodWIzLnB5LTAuNy4xLmRpc3QtaW5mby90b3BfbGV2ZWwudHh0UEsBAhQDFAAAAAgAs5g+Q4WiDbFeAAAAbgAAACAAAAAAAAAAAAAAAKSBYZQBAGdpdGh1YjMucHktMC43LjEuZGlzdC1pbmZvL1dIRUVMUEsBAhQDFAAAAAgAs5g+Q1Hsi7slGAAA2koAACMAAAAAAAAAAAAAAKSB/ZQBAGdpdGh1YjMucHktMC43LjEuZGlzdC1pbmZvL01FVEFEQVRBUEsBAhQDFAAAAAgAs5g+Q7VDEUEOCwAAihMAACEAAAAAAAAAAAAAAKSBY60BAGdpdGh1YjMucHktMC43LjEuZGlzdC1pbmZvL1JFQ09SRFBLBQYAAAAAPwA/AM4QAACwuAEAAAA=", ++ "encoding": null ++ }, ++ "headers": { ++ "accept-ranges": [ ++ "bytes" ++ ], ++ "cache-control": [ ++ "max-age=31557600" ++ ], ++ "content-disposition": [ ++ "attachment; filename=github3.py-0.7.1-py2.py3-none-any.whl" ++ ], ++ "content-length": [ ++ "117140" ++ ], ++ "content-type": [ ++ "application/octet-stream" ++ ], ++ "date": [ ++ "Thu, 12 Mar 2015 13:22:35 GMT" ++ ], ++ "etag": [ ++ "\"6550854f02f7bf10b944070b84f38313\"" ++ ], ++ "last-modified": [ ++ "Fri, 15 Nov 2013 22:35:23 GMT" ++ ], ++ "server": [ ++ "AmazonS3" ++ ], ++ "x-amz-id-2": [ ++ "9+TuHhbd7y2BUJaEV+mFpaDgjl1g9uSAPiZxwc6b2cYydhlhZSyKSuB7PQyiPBPD" ++ ], ++ "x-amz-meta-surrogate-control": [ ++ "max-age=31557600" ++ ], ++ "x-amz-meta-surrogate-key": [ ++ "repository-3710711 user-240830" ++ ], ++ "x-amz-request-id": [ ++ "4B4BFE6BF5135B8D" ++ ] ++ }, ++ "status": { ++ "code": 200, ++ "message": "OK" ++ }, ++ "url": "https://s3.amazonaws.com/github-cloud/releases/3710711/365425c2-4e46-11e3-86fb-bb0d50a886e7.whl?response-content-disposition=attachment%3B%20filename%3Dgithub3.py-0.7.1-py2.py3-none-any.whl&response-content-type=application/octet-stream&AWSAccessKeyId=AKIAISTNZFOVBIJMK3TQ&Expires=1426166613&Signature=78anFgNgXLm3TIbo%2FbTEEk7m%2F34%3D" ++ } ++ } ++ ], ++ "recorded_with": "betamax/0.4.1" ++} +\ No newline at end of file +diff --git a/tests/cassettes/stream_response_without_content_length_to_file.json b/tests/cassettes/stream_response_without_content_length_to_file.json +index f2bf898..75944d0 100644 +--- a/tests/cassettes/stream_response_without_content_length_to_file.json ++++ b/tests/cassettes/stream_response_without_content_length_to_file.json +@@ -1 +1,174 @@ +-{"recorded_with": "betamax/0.4.1", "http_interactions": [{"request": {"uri": "https://api.github.com/repos/sigmavirus24/github3.py/releases/assets/37944", "method": "GET", "headers": {"Accept": ["application/octet-stream"], "Accept-Encoding": ["gzip, deflate"], "Connection": ["keep-alive"], "User-Agent": ["python-requests/2.5.3 CPython/2.7.9 Darwin/14.1.0"]}, "body": {"base64_string": "", "encoding": "utf-8"}}, "response": {"status": {"code": 302, "message": "Found"}, "url": "https://api.github.com/repos/sigmavirus24/github3.py/releases/assets/37944", "headers": {"access-control-allow-credentials": ["true"], "x-xss-protection": ["1; mode=block"], "vary": ["Accept-Encoding"], "location": ["https://s3.amazonaws.com/github-cloud/releases/3710711/365425c2-4e46-11e3-86fb-bb0d50a886e7.whl?response-content-disposition=attachment%3B%20filename%3Dgithub3.py-0.7.1-py2.py3-none-any.whl&response-content-type=application/octet-stream&AWSAccessKeyId=AKIAISTNZFOVBIJMK3TQ&Expires=1426166613&Signature=78anFgNgXLm3TIbo%2FbTEEk7m%2F34%3D"], "x-content-type-options": ["nosniff"], "content-security-policy": ["default-src 'none'"], "x-ratelimit-limit": ["60"], "status": ["302 Found"], "x-frame-options": ["deny"], "x-served-by": ["8dd185e423974a7e13abbbe6e060031e"], "server": ["GitHub.com"], "access-control-allow-origin": ["*"], "strict-transport-security": ["max-age=31536000; includeSubdomains; preload"], "x-github-request-id": ["48A0C951:54E7:48B5311:55019319"], "date": ["Thu, 12 Mar 2015 13:22:33 GMT"], "access-control-expose-headers": ["ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval"], "x-ratelimit-remaining": ["58"], "content-type": ["text/html;charset=utf-8"], "x-ratelimit-reset": ["1426170017"]}, "body": {"base64_string": "", "encoding": "utf-8"}}, "recorded_at": "2015-03-12T13:22:33"}, {"request": {"uri": "https://s3.amazonaws.com/github-cloud/releases/3710711/365425c2-4e46-11e3-86fb-bb0d50a886e7.whl?response-content-disposition=attachment%3B%20filename%3Dgithub3.py-0.7.1-py2.py3-none-any.whl&response-content-type=application/octet-stream&AWSAccessKeyId=AKIAISTNZFOVBIJMK3TQ&Expires=1426166613&Signature=78anFgNgXLm3TIbo%2FbTEEk7m%2F34%3D", "method": "GET", "headers": {"Accept": ["application/octet-stream"], "Accept-Encoding": ["gzip, deflate"], "Connection": ["keep-alive"], "User-Agent": ["python-requests/2.5.3 CPython/2.7.9 Darwin/14.1.0"]}, "body": {"base64_string": "", "encoding": "utf-8"}}, "response": {"status": {"code": 200, "message": "OK"}, "url": "https://s3.amazonaws.com/github-cloud/releases/3710711/365425c2-4e46-11e3-86fb-bb0d50a886e7.whl?response-content-disposition=attachment%3B%20filename%3Dgithub3.py-0.7.1-py2.py3-none-any.whl&response-content-type=application/octet-stream&AWSAccessKeyId=AKIAISTNZFOVBIJMK3TQ&Expires=1426166613&Signature=78anFgNgXLm3TIbo%2FbTEEk7m%2F34%3D", "headers": {"accept-ranges": ["bytes"], "content-disposition": ["attachment; filename=github3.py-0.7.1-py2.py3-none-any.whl"], "x-amz-id-2": ["9+TuHhbd7y2BUJaEV+mFpaDgjl1g9uSAPiZxwc6b2cYydhlhZSyKSuB7PQyiPBPD"], "x-amz-meta-surrogate-key": ["repository-3710711 user-240830"], "x-amz-request-id": ["4B4BFE6BF5135B8D"], "last-modified": ["Fri, 15 Nov 2013 22:35:23 GMT"], "x-amz-meta-surrogate-control": ["max-age=31557600"], "etag": ["\"6550854f02f7bf10b944070b84f38313\""], "date": ["Thu, 12 Mar 2015 13:22:35 GMT"], "cache-control": ["max-age=31557600"], "content-type": ["application/octet-stream"], "server": ["AmazonS3"]}, "body": {"base64_string": "", "encoding": null}}, "recorded_at": "2015-03-12T13:22:34"}]} ++{ ++ "http_interactions": [ ++ { ++ "recorded_at": "2015-03-12T13:22:33", ++ "request": { ++ "body": { ++ "base64_string": "", ++ "encoding": "utf-8" ++ }, ++ "headers": { ++ "Accept": [ ++ "application/octet-stream" ++ ], ++ "Accept-Encoding": [ ++ "gzip, deflate" ++ ], ++ "Connection": [ ++ "keep-alive" ++ ], ++ "User-Agent": [ ++ "python-requests/2.5.3 CPython/2.7.9 Darwin/14.1.0" ++ ] ++ }, ++ "method": "GET", ++ "uri": "https://api.github.com/repos/sigmavirus24/github3.py/releases/assets/37944" ++ }, ++ "response": { ++ "body": { ++ "base64_string": "", ++ "encoding": "utf-8" ++ }, ++ "headers": { ++ "access-control-allow-credentials": [ ++ "true" ++ ], ++ "access-control-allow-origin": [ ++ "*" ++ ], ++ "access-control-expose-headers": [ ++ "ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval" ++ ], ++ "content-security-policy": [ ++ "default-src 'none'" ++ ], ++ "content-type": [ ++ "text/html;charset=utf-8" ++ ], ++ "date": [ ++ "Thu, 12 Mar 2015 13:22:33 GMT" ++ ], ++ "location": [ ++ "https://s3.amazonaws.com/github-cloud/releases/3710711/365425c2-4e46-11e3-86fb-bb0d50a886e7.whl?response-content-disposition=attachment%3B%20filename%3Dgithub3.py-0.7.1-py2.py3-none-any.whl&response-content-type=application/octet-stream&AWSAccessKeyId=AKIAISTNZFOVBIJMK3TQ&Expires=1426166613&Signature=78anFgNgXLm3TIbo%2FbTEEk7m%2F34%3D" ++ ], ++ "server": [ ++ "GitHub.com" ++ ], ++ "status": [ ++ "302 Found" ++ ], ++ "strict-transport-security": [ ++ "max-age=31536000; includeSubdomains; preload" ++ ], ++ "vary": [ ++ "Accept-Encoding" ++ ], ++ "x-content-type-options": [ ++ "nosniff" ++ ], ++ "x-frame-options": [ ++ "deny" ++ ], ++ "x-github-request-id": [ ++ "48A0C951:54E7:48B5311:55019319" ++ ], ++ "x-ratelimit-limit": [ ++ "60" ++ ], ++ "x-ratelimit-remaining": [ ++ "58" ++ ], ++ "x-ratelimit-reset": [ ++ "1426170017" ++ ], ++ "x-served-by": [ ++ "8dd185e423974a7e13abbbe6e060031e" ++ ], ++ "x-xss-protection": [ ++ "1; mode=block" ++ ] ++ }, ++ "status": { ++ "code": 302, ++ "message": "Found" ++ }, ++ "url": "https://api.github.com/repos/sigmavirus24/github3.py/releases/assets/37944" ++ } ++ }, ++ { ++ "recorded_at": "2015-03-12T13:22:34", ++ "request": { ++ "body": { ++ "base64_string": "", ++ "encoding": "utf-8" ++ }, ++ "headers": { ++ "Accept": [ ++ "application/octet-stream" ++ ], ++ "Accept-Encoding": [ ++ "gzip, deflate" ++ ], ++ "Connection": [ ++ "keep-alive" ++ ], ++ "User-Agent": [ ++ "python-requests/2.5.3 CPython/2.7.9 Darwin/14.1.0" ++ ] ++ }, ++ "method": "GET", ++ "uri": "https://s3.amazonaws.com/github-cloud/releases/3710711/365425c2-4e46-11e3-86fb-bb0d50a886e7.whl?response-content-disposition=attachment%3B%20filename%3Dgithub3.py-0.7.1-py2.py3-none-any.whl&response-content-type=application/octet-stream&AWSAccessKeyId=AKIAISTNZFOVBIJMK3TQ&Expires=1426166613&Signature=78anFgNgXLm3TIbo%2FbTEEk7m%2F34%3D" ++ }, ++ "response": { ++ "body": { ++ "base64_string": "", ++ "encoding": null ++ }, ++ "headers": { ++ "accept-ranges": [ ++ "bytes" ++ ], ++ "cache-control": [ ++ "max-age=31557600" ++ ], ++ "content-disposition": [ ++ "attachment; filename=github3.py-0.7.1-py2.py3-none-any.whl" ++ ], ++ "content-type": [ ++ "application/octet-stream" ++ ], ++ "date": [ ++ "Thu, 12 Mar 2015 13:22:35 GMT" ++ ], ++ "etag": [ ++ "\"6550854f02f7bf10b944070b84f38313\"" ++ ], ++ "last-modified": [ ++ "Fri, 15 Nov 2013 22:35:23 GMT" ++ ], ++ "server": [ ++ "AmazonS3" ++ ], ++ "x-amz-id-2": [ ++ "9+TuHhbd7y2BUJaEV+mFpaDgjl1g9uSAPiZxwc6b2cYydhlhZSyKSuB7PQyiPBPD" ++ ], ++ "x-amz-meta-surrogate-control": [ ++ "max-age=31557600" ++ ], ++ "x-amz-meta-surrogate-key": [ ++ "repository-3710711 user-240830" ++ ], ++ "x-amz-request-id": [ ++ "4B4BFE6BF5135B8D" ++ ] ++ }, ++ "status": { ++ "code": 200, ++ "message": "OK" ++ }, ++ "url": "https://s3.amazonaws.com/github-cloud/releases/3710711/365425c2-4e46-11e3-86fb-bb0d50a886e7.whl?response-content-disposition=attachment%3B%20filename%3Dgithub3.py-0.7.1-py2.py3-none-any.whl&response-content-type=application/octet-stream&AWSAccessKeyId=AKIAISTNZFOVBIJMK3TQ&Expires=1426166613&Signature=78anFgNgXLm3TIbo%2FbTEEk7m%2F34%3D" ++ } ++ } ++ ], ++ "recorded_with": "betamax/0.4.1" ++} +\ No newline at end of file +diff --git a/tests/cassettes/test_x509_adapter_der.json b/tests/cassettes/test_x509_adapter_der.json +index 0f4072a..8fd5c0c 100644 +--- a/tests/cassettes/test_x509_adapter_der.json ++++ b/tests/cassettes/test_x509_adapter_der.json +@@ -1 +1,68 @@ +-{"http_interactions": [{"request": {"body": {"encoding": "utf-8", "string": ""}, "headers": {"User-Agent": ["python-requests/2.21.0"], "Accept-Encoding": ["gzip, deflate"], "Accept": ["*/*"], "Connection": ["keep-alive"]}, "method": "GET", "uri": "https://pkiprojecttest01.dev.labs.internal/"}, "response": {"body": {"encoding": "ISO-8859-1", "base64_string": "H4sIAAAAAAAAA7NRdPF3DokMcFXIKMnNseOygVJJ+SmVdlxArqFdSGpxiY0+kAHkFoB5CsGlycmpxcU2+gUgQX2IYqAasBEAYvDs5FMAAAA=", "string": ""}, "headers": {"Server": ["nginx/1.10.3 (Ubuntu)"], "Date": ["Thu, 20 Dec 2018 20:02:30 GMT"], "Content-Type": ["text/html"], "Last-Modified": ["Mon, 19 Nov 2018 20:48:30 GMT"], "Transfer-Encoding": ["chunked"], "Connection": ["keep-alive"], "ETag": ["W/\"5bf3219e-53\""], "Content-Encoding": ["gzip"]}, "status": {"code": 200, "message": "OK"}, "url": "https://pkiprojecttest01.dev.labs.internal/"}, "recorded_at": "2018-12-20T20:02:30"}], "recorded_with": "betamax/0.8.1"} +\ No newline at end of file ++{ ++ "http_interactions": [ ++ { ++ "recorded_at": "2018-12-20T20:02:30", ++ "request": { ++ "body": { ++ "encoding": "utf-8", ++ "string": "" ++ }, ++ "headers": { ++ "Accept": [ ++ "*/*" ++ ], ++ "Accept-Encoding": [ ++ "gzip, deflate" ++ ], ++ "Connection": [ ++ "keep-alive" ++ ], ++ "User-Agent": [ ++ "python-requests/2.21.0" ++ ] ++ }, ++ "method": "GET", ++ "uri": "https://pkiprojecttest01.dev.labs.internal/" ++ }, ++ "response": { ++ "body": { ++ "base64_string": "H4sIAAAAAAAAA7NRdPF3DokMcFXIKMnNseOygVJJ+SmVdlxArqFdSGpxiY0+kAHkFoB5CsGlycmpxcU2+gUgQX2IYqAasBEAYvDs5FMAAAA=", ++ "encoding": "ISO-8859-1", ++ "string": "" ++ }, ++ "headers": { ++ "Connection": [ ++ "keep-alive" ++ ], ++ "Content-Encoding": [ ++ "gzip" ++ ], ++ "Content-Type": [ ++ "text/html" ++ ], ++ "Date": [ ++ "Thu, 20 Dec 2018 20:02:30 GMT" ++ ], ++ "ETag": [ ++ "W/\"5bf3219e-53\"" ++ ], ++ "Last-Modified": [ ++ "Mon, 19 Nov 2018 20:48:30 GMT" ++ ], ++ "Server": [ ++ "nginx/1.10.3 (Ubuntu)" ++ ], ++ "Transfer-Encoding": [ ++ "chunked" ++ ] ++ }, ++ "status": { ++ "code": 200, ++ "message": "OK" ++ }, ++ "url": "https://pkiprojecttest01.dev.labs.internal/" ++ } ++ } ++ ], ++ "recorded_with": "betamax/0.8.1" ++} +\ No newline at end of file +diff --git a/tests/cassettes/test_x509_adapter_pem.json b/tests/cassettes/test_x509_adapter_pem.json +index 0f4072a..8fd5c0c 100644 +--- a/tests/cassettes/test_x509_adapter_pem.json ++++ b/tests/cassettes/test_x509_adapter_pem.json +@@ -1 +1,68 @@ +-{"http_interactions": [{"request": {"body": {"encoding": "utf-8", "string": ""}, "headers": {"User-Agent": ["python-requests/2.21.0"], "Accept-Encoding": ["gzip, deflate"], "Accept": ["*/*"], "Connection": ["keep-alive"]}, "method": "GET", "uri": "https://pkiprojecttest01.dev.labs.internal/"}, "response": {"body": {"encoding": "ISO-8859-1", "base64_string": "H4sIAAAAAAAAA7NRdPF3DokMcFXIKMnNseOygVJJ+SmVdlxArqFdSGpxiY0+kAHkFoB5CsGlycmpxcU2+gUgQX2IYqAasBEAYvDs5FMAAAA=", "string": ""}, "headers": {"Server": ["nginx/1.10.3 (Ubuntu)"], "Date": ["Thu, 20 Dec 2018 20:02:30 GMT"], "Content-Type": ["text/html"], "Last-Modified": ["Mon, 19 Nov 2018 20:48:30 GMT"], "Transfer-Encoding": ["chunked"], "Connection": ["keep-alive"], "ETag": ["W/\"5bf3219e-53\""], "Content-Encoding": ["gzip"]}, "status": {"code": 200, "message": "OK"}, "url": "https://pkiprojecttest01.dev.labs.internal/"}, "recorded_at": "2018-12-20T20:02:30"}], "recorded_with": "betamax/0.8.1"} +\ No newline at end of file ++{ ++ "http_interactions": [ ++ { ++ "recorded_at": "2018-12-20T20:02:30", ++ "request": { ++ "body": { ++ "encoding": "utf-8", ++ "string": "" ++ }, ++ "headers": { ++ "Accept": [ ++ "*/*" ++ ], ++ "Accept-Encoding": [ ++ "gzip, deflate" ++ ], ++ "Connection": [ ++ "keep-alive" ++ ], ++ "User-Agent": [ ++ "python-requests/2.21.0" ++ ] ++ }, ++ "method": "GET", ++ "uri": "https://pkiprojecttest01.dev.labs.internal/" ++ }, ++ "response": { ++ "body": { ++ "base64_string": "H4sIAAAAAAAAA7NRdPF3DokMcFXIKMnNseOygVJJ+SmVdlxArqFdSGpxiY0+kAHkFoB5CsGlycmpxcU2+gUgQX2IYqAasBEAYvDs5FMAAAA=", ++ "encoding": "ISO-8859-1", ++ "string": "" ++ }, ++ "headers": { ++ "Connection": [ ++ "keep-alive" ++ ], ++ "Content-Encoding": [ ++ "gzip" ++ ], ++ "Content-Type": [ ++ "text/html" ++ ], ++ "Date": [ ++ "Thu, 20 Dec 2018 20:02:30 GMT" ++ ], ++ "ETag": [ ++ "W/\"5bf3219e-53\"" ++ ], ++ "Last-Modified": [ ++ "Mon, 19 Nov 2018 20:48:30 GMT" ++ ], ++ "Server": [ ++ "nginx/1.10.3 (Ubuntu)" ++ ], ++ "Transfer-Encoding": [ ++ "chunked" ++ ] ++ }, ++ "status": { ++ "code": 200, ++ "message": "OK" ++ }, ++ "url": "https://pkiprojecttest01.dev.labs.internal/" ++ } ++ } ++ ], ++ "recorded_with": "betamax/0.8.1" ++} +\ No newline at end of file diff --git a/meta-python/recipes-devtools/python/python3-requests-toolbelt/720240501dca0b4eacc3295665d7ced8719e11d2.patch b/meta-python/recipes-devtools/python/python3-requests-toolbelt/720240501dca0b4eacc3295665d7ced8719e11d2.patch new file mode 100644 index 0000000000..0439b09829 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-requests-toolbelt/720240501dca0b4eacc3295665d7ced8719e11d2.patch @@ -0,0 +1,546 @@ +From 720240501dca0b4eacc3295665d7ced8719e11d2 Mon Sep 17 00:00:00 2001 +From: Quentin Pradet <quentin.pradet@gmail.com> +Date: Fri, 28 Apr 2023 23:28:43 +0400 +Subject: [PATCH] Test urllib3 2.0 + +Upstream-Status: Submitted [https://github.com/requests/toolbelt/pull/356] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + .../redirect_request_for_dump_all.json | 302 +++++++++++++----- + tests/cassettes/simple_get_request.json | 16 +- + tox.ini | 11 +- + 3 files changed, 239 insertions(+), 90 deletions(-) + +diff --git a/tests/cassettes/redirect_request_for_dump_all.json b/tests/cassettes/redirect_request_for_dump_all.json +index f713ff3..dc8fefe 100644 +--- a/tests/cassettes/redirect_request_for_dump_all.json ++++ b/tests/cassettes/redirect_request_for_dump_all.json +@@ -1,17 +1,25 @@ + { + "http_interactions": [ + { +- "recorded_at": "2015-11-14T22:53:20", ++ "recorded_at": "2023-04-28T18:04:50", + "request": { + "body": { + "encoding": "utf-8", + "string": "" + }, + "headers": { +- "Accept": "*/*", +- "Accept-Encoding": "gzip, deflate", +- "Connection": "keep-alive", +- "User-Agent": "python-requests/2.8.1" ++ "Accept": [ ++ "*/*" ++ ], ++ "Accept-Encoding": [ ++ "gzip, deflate" ++ ], ++ "Connection": [ ++ "keep-alive" ++ ], ++ "User-Agent": [ ++ "python-requests/2.28.1" ++ ] + }, + "method": "GET", + "uri": "https://httpbin.org/redirect/5" +@@ -22,14 +30,30 @@ + "string": "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">\n<title>Redirecting...</title>\n<h1>Redirecting...</h1>\n<p>You should be redirected automatically to target URL: <a href=\"/relative-redirect/4\">/relative-redirect/4</a>. If not click the link." + }, + "headers": { +- "Access-Control-Allow-Credentials": "true", +- "Access-Control-Allow-Origin": "*", +- "Connection": "keep-alive", +- "Content-Length": "247", +- "Content-Type": "text/html; charset=utf-8", +- "Date": "Sat, 14 Nov 2015 22:53:18 GMT", +- "Location": "/relative-redirect/4", +- "Server": "nginx" ++ "Access-Control-Allow-Credentials": [ ++ "true" ++ ], ++ "Access-Control-Allow-Origin": [ ++ "*" ++ ], ++ "Connection": [ ++ "keep-alive" ++ ], ++ "Content-Length": [ ++ "247" ++ ], ++ "Content-Type": [ ++ "text/html; charset=utf-8" ++ ], ++ "Date": [ ++ "Fri, 28 Apr 2023 18:04:50 GMT" ++ ], ++ "Location": [ ++ "/relative-redirect/4" ++ ], ++ "Server": [ ++ "gunicorn/19.9.0" ++ ] + }, + "status": { + "code": 302, +@@ -39,17 +63,25 @@ + } + }, + { +- "recorded_at": "2015-11-14T22:53:20", ++ "recorded_at": "2023-04-28T18:04:52", + "request": { + "body": { + "encoding": "utf-8", + "string": "" + }, + "headers": { +- "Accept": "*/*", +- "Accept-Encoding": "gzip, deflate", +- "Connection": "keep-alive", +- "User-Agent": "python-requests/2.8.1" ++ "Accept": [ ++ "*/*" ++ ], ++ "Accept-Encoding": [ ++ "gzip, deflate" ++ ], ++ "Connection": [ ++ "keep-alive" ++ ], ++ "User-Agent": [ ++ "python-requests/2.28.1" ++ ] + }, + "method": "GET", + "uri": "https://httpbin.org/relative-redirect/4" +@@ -60,14 +92,30 @@ + "string": "" + }, + "headers": { +- "Access-Control-Allow-Credentials": "true", +- "Access-Control-Allow-Origin": "*", +- "Connection": "keep-alive", +- "Content-Length": "0", +- "Content-Type": "text/html; charset=utf-8", +- "Date": "Sat, 14 Nov 2015 22:53:18 GMT", +- "Location": "/relative-redirect/3", +- "Server": "nginx" ++ "Access-Control-Allow-Credentials": [ ++ "true" ++ ], ++ "Access-Control-Allow-Origin": [ ++ "*" ++ ], ++ "Connection": [ ++ "keep-alive" ++ ], ++ "Content-Length": [ ++ "0" ++ ], ++ "Content-Type": [ ++ "text/html; charset=utf-8" ++ ], ++ "Date": [ ++ "Fri, 28 Apr 2023 18:04:52 GMT" ++ ], ++ "Location": [ ++ "/relative-redirect/3" ++ ], ++ "Server": [ ++ "gunicorn/19.9.0" ++ ] + }, + "status": { + "code": 302, +@@ -77,17 +125,25 @@ + } + }, + { +- "recorded_at": "2015-11-14T22:53:20", ++ "recorded_at": "2023-04-28T18:04:53", + "request": { + "body": { + "encoding": "utf-8", + "string": "" + }, + "headers": { +- "Accept": "*/*", +- "Accept-Encoding": "gzip, deflate", +- "Connection": "keep-alive", +- "User-Agent": "python-requests/2.8.1" ++ "Accept": [ ++ "*/*" ++ ], ++ "Accept-Encoding": [ ++ "gzip, deflate" ++ ], ++ "Connection": [ ++ "keep-alive" ++ ], ++ "User-Agent": [ ++ "python-requests/2.28.1" ++ ] + }, + "method": "GET", + "uri": "https://httpbin.org/relative-redirect/3" +@@ -98,14 +154,30 @@ + "string": "" + }, + "headers": { +- "Access-Control-Allow-Credentials": "true", +- "Access-Control-Allow-Origin": "*", +- "Connection": "keep-alive", +- "Content-Length": "0", +- "Content-Type": "text/html; charset=utf-8", +- "Date": "Sat, 14 Nov 2015 22:53:18 GMT", +- "Location": "/relative-redirect/2", +- "Server": "nginx" ++ "Access-Control-Allow-Credentials": [ ++ "true" ++ ], ++ "Access-Control-Allow-Origin": [ ++ "*" ++ ], ++ "Connection": [ ++ "keep-alive" ++ ], ++ "Content-Length": [ ++ "0" ++ ], ++ "Content-Type": [ ++ "text/html; charset=utf-8" ++ ], ++ "Date": [ ++ "Fri, 28 Apr 2023 18:04:53 GMT" ++ ], ++ "Location": [ ++ "/relative-redirect/2" ++ ], ++ "Server": [ ++ "gunicorn/19.9.0" ++ ] + }, + "status": { + "code": 302, +@@ -115,17 +187,25 @@ + } + }, + { +- "recorded_at": "2015-11-14T22:53:20", ++ "recorded_at": "2023-04-28T18:04:55", + "request": { + "body": { + "encoding": "utf-8", + "string": "" + }, + "headers": { +- "Accept": "*/*", +- "Accept-Encoding": "gzip, deflate", +- "Connection": "keep-alive", +- "User-Agent": "python-requests/2.8.1" ++ "Accept": [ ++ "*/*" ++ ], ++ "Accept-Encoding": [ ++ "gzip, deflate" ++ ], ++ "Connection": [ ++ "keep-alive" ++ ], ++ "User-Agent": [ ++ "python-requests/2.28.1" ++ ] + }, + "method": "GET", + "uri": "https://httpbin.org/relative-redirect/2" +@@ -136,14 +216,30 @@ + "string": "" + }, + "headers": { +- "Access-Control-Allow-Credentials": "true", +- "Access-Control-Allow-Origin": "*", +- "Connection": "keep-alive", +- "Content-Length": "0", +- "Content-Type": "text/html; charset=utf-8", +- "Date": "Sat, 14 Nov 2015 22:53:18 GMT", +- "Location": "/relative-redirect/1", +- "Server": "nginx" ++ "Access-Control-Allow-Credentials": [ ++ "true" ++ ], ++ "Access-Control-Allow-Origin": [ ++ "*" ++ ], ++ "Connection": [ ++ "keep-alive" ++ ], ++ "Content-Length": [ ++ "0" ++ ], ++ "Content-Type": [ ++ "text/html; charset=utf-8" ++ ], ++ "Date": [ ++ "Fri, 28 Apr 2023 18:04:55 GMT" ++ ], ++ "Location": [ ++ "/relative-redirect/1" ++ ], ++ "Server": [ ++ "gunicorn/19.9.0" ++ ] + }, + "status": { + "code": 302, +@@ -153,17 +249,25 @@ + } + }, + { +- "recorded_at": "2015-11-14T22:53:20", ++ "recorded_at": "2023-04-28T18:04:56", + "request": { + "body": { + "encoding": "utf-8", + "string": "" + }, + "headers": { +- "Accept": "*/*", +- "Accept-Encoding": "gzip, deflate", +- "Connection": "keep-alive", +- "User-Agent": "python-requests/2.8.1" ++ "Accept": [ ++ "*/*" ++ ], ++ "Accept-Encoding": [ ++ "gzip, deflate" ++ ], ++ "Connection": [ ++ "keep-alive" ++ ], ++ "User-Agent": [ ++ "python-requests/2.28.1" ++ ] + }, + "method": "GET", + "uri": "https://httpbin.org/relative-redirect/1" +@@ -174,14 +278,30 @@ + "string": "" + }, + "headers": { +- "Access-Control-Allow-Credentials": "true", +- "Access-Control-Allow-Origin": "*", +- "Connection": "keep-alive", +- "Content-Length": "0", +- "Content-Type": "text/html; charset=utf-8", +- "Date": "Sat, 14 Nov 2015 22:53:18 GMT", +- "Location": "/get", +- "Server": "nginx" ++ "Access-Control-Allow-Credentials": [ ++ "true" ++ ], ++ "Access-Control-Allow-Origin": [ ++ "*" ++ ], ++ "Connection": [ ++ "keep-alive" ++ ], ++ "Content-Length": [ ++ "0" ++ ], ++ "Content-Type": [ ++ "text/html; charset=utf-8" ++ ], ++ "Date": [ ++ "Fri, 28 Apr 2023 18:04:56 GMT" ++ ], ++ "Location": [ ++ "/get" ++ ], ++ "Server": [ ++ "gunicorn/19.9.0" ++ ] + }, + "status": { + "code": 302, +@@ -191,34 +311,56 @@ + } + }, + { +- "recorded_at": "2015-11-14T22:53:20", ++ "recorded_at": "2023-04-28T18:04:58", + "request": { + "body": { + "encoding": "utf-8", + "string": "" + }, + "headers": { +- "Accept": "*/*", +- "Accept-Encoding": "gzip, deflate", +- "Connection": "keep-alive", +- "User-Agent": "python-requests/2.8.1" ++ "Accept": [ ++ "*/*" ++ ], ++ "Accept-Encoding": [ ++ "gzip, deflate" ++ ], ++ "Connection": [ ++ "keep-alive" ++ ], ++ "User-Agent": [ ++ "python-requests/2.28.1" ++ ] + }, + "method": "GET", + "uri": "https://httpbin.org/get" + }, + "response": { + "body": { +- "encoding": null, +- "string": "{\n \"args\": {}, \n \"headers\": {\n \"Accept\": \"*/*\", \n \"Accept-Encoding\": \"gzip, deflate\", \n \"Host\": \"httpbin.org\", \n \"User-Agent\": \"python-requests/2.8.1\"\n }, \n \"origin\": \"<IPADDR>\", \n \"url\": \"https://httpbin.org/get\"\n}\n" ++ "encoding": "utf-8", ++ "string": "{\n \"args\": {}, \n \"headers\": {\n \"Accept\": \"*/*\", \n \"Accept-Encoding\": \"gzip, deflate\", \n \"Host\": \"httpbin.org\", \n \"User-Agent\": \"python-requests/2.28.1\", \n \"X-Amzn-Trace-Id\": \"Root=1-644c0ac8-450daa2735c478ca518c5c8d\"\n }, \n \"origin\": \"83.198.52.66\", \n \"url\": \"https://httpbin.org/get\"\n}\n" + }, + "headers": { +- "Access-Control-Allow-Credentials": "true", +- "Access-Control-Allow-Origin": "*", +- "Connection": "keep-alive", +- "Content-Length": "239", +- "Content-Type": "application/json", +- "Date": "Sat, 14 Nov 2015 22:53:18 GMT", +- "Server": "nginx" ++ "Access-Control-Allow-Credentials": [ ++ "true" ++ ], ++ "Access-Control-Allow-Origin": [ ++ "*" ++ ], ++ "Connection": [ ++ "keep-alive" ++ ], ++ "Content-Length": [ ++ "306" ++ ], ++ "Content-Type": [ ++ "application/json" ++ ], ++ "Date": [ ++ "Fri, 28 Apr 2023 18:04:58 GMT" ++ ], ++ "Server": [ ++ "gunicorn/19.9.0" ++ ] + }, + "status": { + "code": 200, +@@ -228,5 +370,5 @@ + } + } + ], +- "recorded_with": "betamax/0.5.1" ++ "recorded_with": "betamax/0.8.2" + } +\ No newline at end of file +diff --git a/tests/cassettes/simple_get_request.json b/tests/cassettes/simple_get_request.json +index 68378cd..a97bcf1 100644 +--- a/tests/cassettes/simple_get_request.json ++++ b/tests/cassettes/simple_get_request.json +@@ -1,7 +1,7 @@ + { + "http_interactions": [ + { +- "recorded_at": "2015-11-14T22:33:32", ++ "recorded_at": "2023-04-28T18:04:48", + "request": { + "body": { + "encoding": "utf-8", +@@ -18,7 +18,7 @@ + "keep-alive" + ], + "User-Agent": [ +- "python-requests/2.8.1" ++ "python-requests/2.28.1" + ] + }, + "method": "GET", +@@ -26,8 +26,8 @@ + }, + "response": { + "body": { +- "encoding": null, +- "string": "{\n \"args\": {}, \n \"headers\": {\n \"Accept\": \"*/*\", \n \"Accept-Encoding\": \"gzip, deflate\", \n \"Host\": \"httpbin.org\", \n \"User-Agent\": \"python-requests/2.8.1\"\n }, \n \"origin\": \"<IPADDR>\", \n \"url\": \"https://httpbin.org/get\"\n}\n" ++ "encoding": "utf-8", ++ "string": "{\n \"args\": {}, \n \"headers\": {\n \"Accept\": \"*/*\", \n \"Accept-Encoding\": \"gzip, deflate\", \n \"Host\": \"httpbin.org\", \n \"User-Agent\": \"python-requests/2.28.1\", \n \"X-Amzn-Trace-Id\": \"Root=1-644c0ac0-4986bed42b965a007af785e1\"\n }, \n \"origin\": \"83.198.52.66\", \n \"url\": \"https://httpbin.org/get\"\n}\n" + }, + "headers": { + "Access-Control-Allow-Credentials": [ +@@ -40,16 +40,16 @@ + "keep-alive" + ], + "Content-Length": [ +- "239" ++ "306" + ], + "Content-Type": [ + "application/json" + ], + "Date": [ +- "Sat, 14 Nov 2015 22:33:30 GMT" ++ "Fri, 28 Apr 2023 18:04:48 GMT" + ], + "Server": [ +- "nginx" ++ "gunicorn/19.9.0" + ] + }, + "status": { +@@ -60,5 +60,5 @@ + } + } + ], +- "recorded_with": "betamax/0.5.1" ++ "recorded_with": "betamax/0.8.2" + } +\ No newline at end of file +diff --git a/tox.ini b/tox.ini +index 64b6ab3..e27c275 100644 +--- a/tox.ini ++++ b/tox.ini +@@ -1,5 +1,5 @@ + [tox] +-envlist = py{27,37,38,39,310,311,py,py3},py{27,37}-flake8,noopenssl,docstrings ++envlist = py{27,37,38,39,310,311,py,py3},py{27,37}-flake8,noopenssl,docstrings,urllib3-2.0 + + [gh-actions] + python = +@@ -8,12 +8,13 @@ python = + 3.8: py38 + 3.9: py39 + 3.10: py310 +- 3.11: py311 ++ 3.11: py311, urllib3-2.0 + + [testenv] + pip_pre = False + deps = + requests{env:REQUESTS_VERSION:>=2.0.1,<3.0.0} ++ urllib3<2.0.0 + pytest + mock;python_version<"3.3" + pyopenssl +@@ -34,6 +35,12 @@ deps = + commands = + pytest -W error::DeprecationWarning {posargs} + ++[testenv:urllib3-2.0] ++basepython = python3.11 ++commands = ++ pip install -U urllib3>=2.0.0 ++ pytest -W error::DeprecationWarning {posargs} ++ + [testenv:py27-flake8] + basepython = python2.7 + deps = diff --git a/meta-python/recipes-devtools/python/python3-requests-toolbelt_0.10.1.bb b/meta-python/recipes-devtools/python/python3-requests-toolbelt_1.0.0.bb index b2678952cd..466e01d91a 100644 --- a/meta-python/recipes-devtools/python/python3-requests-toolbelt_0.10.1.bb +++ b/meta-python/recipes-devtools/python/python3-requests-toolbelt_1.0.0.bb @@ -6,9 +6,11 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=6f14302a4b4099009ab38b4dde5f1075" SRC_URI = "file://run-ptest \ + file://090856f4159c40a2927fb88546419f2e1697ad5f.patch \ + file://720240501dca0b4eacc3295665d7ced8719e11d2.patch \ " -SRC_URI[sha256sum] = "62e09f7ff5ccbda92772a29f394a49c3ad6cb181d568b1337626b2abb628a63d" +SRC_URI[sha256sum] = "7681a0a3d047012b5bdc0ee37d7f8f07ebe76ab08caeccfc3921ce23c88d5bc6" inherit pypi setuptools3 ptest @@ -21,6 +23,7 @@ RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-betamax \ ${PYTHON_PN}-mock \ ${PYTHON_PN}-multiprocessing \ + ${PYTHON_PN}-trustme \ " do_install_ptest() { diff --git a/meta-python/recipes-devtools/python/python3-rlp/0001-setup-don-t-use-setuptools-markdown.patch b/meta-python/recipes-devtools/python/python3-rlp/0001-setup-don-t-use-setuptools-markdown.patch index 643d296394..0ab012a982 100644 --- a/meta-python/recipes-devtools/python/python3-rlp/0001-setup-don-t-use-setuptools-markdown.patch +++ b/meta-python/recipes-devtools/python/python3-rlp/0001-setup-don-t-use-setuptools-markdown.patch @@ -9,6 +9,8 @@ dependencies. Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl> --- +Upstream-Status: Pending + setup.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-python/recipes-devtools/python/python3-robotframework_6.0.2.bb b/meta-python/recipes-devtools/python/python3-robotframework_6.1.bb index 19c7652757..154b011aab 100644 --- a/meta-python/recipes-devtools/python/python3-robotframework_6.0.2.bb +++ b/meta-python/recipes-devtools/python/python3-robotframework_6.1.bb @@ -13,7 +13,7 @@ inherit pypi setuptools3 PYPI_PACKAGE_EXT = "zip" -SRC_URI[sha256sum] = "6a9c06deb220099990f190c6e4e772675f625e4d5d84640fca6f0ad46ff538d0" +SRC_URI[sha256sum] = "a94e0b3c4f8ae08c0a4dc7bff6fa8a51730565103f8c682a2d8391da9a4697f5" RDEPENDS:${PN} += " \ ${PYTHON_PN}-shell \ diff --git a/meta-python/recipes-devtools/python/python3-scikit-build_0.16.7.bb b/meta-python/recipes-devtools/python/python3-scikit-build_0.16.7.bb new file mode 100644 index 0000000000..c033c56bad --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-scikit-build_0.16.7.bb @@ -0,0 +1,21 @@ +SUMMARY = "Improved build system generator for Python C/C++/Fortran/Cython extensions" +LICENSE = "MIT & BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7c96d2b08b3cec6d3c67fb864d1fd8cc" + +DEPENDS = "python3-setuptools-scm-native" + +PYPI_PACKAGE = "scikit-build" + +inherit pypi python_setuptools_build_meta +SRC_URI[sha256sum] = "a9b9cc7479b71e6c8d434596dfade025253aae23adb22a9a2d85850fd51cecfd" + +RDEPENDS:${PN} = " \ + python3-distro \ + python3-packaging \ + python3-setuptools \ + python3-typing-extensions \ + python3-wheel \ + cmake \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-sdnotify_0.3.2.bb b/meta-python/recipes-devtools/python/python3-sdnotify_0.3.2.bb index dc1961ac30..ebf000135a 100644 --- a/meta-python/recipes-devtools/python/python3-sdnotify_0.3.2.bb +++ b/meta-python/recipes-devtools/python/python3-sdnotify_0.3.2.bb @@ -17,3 +17,5 @@ SRC_URI[sha256sum] = "73977fc746b36cc41184dd43c3fe81323e7b8b06c2bb0826c4f59a20c5 SRC_URI += "file://0001-setup.py-switch-to-setuptools.patch" inherit setuptools3 pypi + +RDEPENDS:${PN} += "python3-io" diff --git a/meta-python/recipes-devtools/python/python3-semver/run-ptest b/meta-python/recipes-devtools/python/python3-semver/run-ptest index 43c03b594b..cd2bc8537c 100644 --- a/meta-python/recipes-devtools/python/python3-semver/run-ptest +++ b/meta-python/recipes-devtools/python/python3-semver/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO test_semver.py --disable-warnings| sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest -o log_cli=true -o log_cli_level=INFO tests/test_semver.py --disable-warnings| sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-python/recipes-devtools/python/python3-semver_2.13.0.bb b/meta-python/recipes-devtools/python/python3-semver_2.13.0.bb deleted file mode 100644 index b47bcae008..0000000000 --- a/meta-python/recipes-devtools/python/python3-semver_2.13.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "Python module for Semantic Versioning" -HOMEPAGE = "https://github.com/k-bx/python-semver" -BUGTRACKER = "https://github.com/k-bx/python-semver/issues" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e910b35b0ef4e1f665b9a75d6afb7709" - -SRC_URI[md5sum] = "e98b5fb283ea84daa5195087de83ebf1" -SRC_URI[sha256sum] = "fa0fe2722ee1c3f57eac478820c3a5ae2f624af8264cbdf9000c980ff7f75e3f" - -inherit pypi setuptools3 ptest - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - cp -f ${S}/test_semver.py ${D}${PTEST_PATH}/ -} diff --git a/meta-python/recipes-devtools/python/python3-semver_3.0.1.bb b/meta-python/recipes-devtools/python/python3-semver_3.0.1.bb new file mode 100644 index 0000000000..2d85d789c7 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-semver_3.0.1.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Python module for Semantic Versioning" +HOMEPAGE = "https://github.com/python-semver/python-semver" +BUGTRACKER = "https://github.com/python-semver/python-semver" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d9da679db3bdce30a1b4328d5c474f98" + +SRC_URI[md5sum] = "b7502c12ce325ffffeab694fed52f6f5" +SRC_URI[sha256sum] = "9ec78c5447883c67b97f98c3b6212796708191d22e4ad30f4570f840171cbce1" + +inherit pypi python_setuptools_build_meta ptest + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI += " \ + file://run-ptest \ +" + +DEPENDS += " python3-setuptools-scm-native" + +RDEPENDS:${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + cp -rf ${S}/tests ${D}${PTEST_PATH}/ +} diff --git a/meta-python/recipes-devtools/python/python3-sentry-sdk_1.13.0.bb b/meta-python/recipes-devtools/python/python3-sentry-sdk_1.26.0.bb index 001ff6082c..697f102a2e 100644 --- a/meta-python/recipes-devtools/python/python3-sentry-sdk_1.13.0.bb +++ b/meta-python/recipes-devtools/python/python3-sentry-sdk_1.26.0.bb @@ -2,8 +2,8 @@ SUMMARY = "The new Python SDK for Sentry.io" DESCRIPTION = "This is the next line of the Python SDK \ for Sentry, intended to replace the raven package on PyPI." HOMEPAGE = "https://github.com/getsentry/sentry-python" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0c79f8d3c91fc847350efd28bfe0a341" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7fcb29c83dd48cb7b112d0dd81111a89" RDEPENDS:${PN} += "\ ${PYTHON_PN}-urllib3 \ @@ -15,7 +15,7 @@ RDEPENDS:${PN} += "\ ${PYTHON_PN}-datetime \ " -SRC_URI[sha256sum] = "72da0766c3069a3941eadbdfa0996f83f5a33e55902a19ba399557cfee1dddcc" +SRC_URI[sha256sum] = "760e4fb6d01c994110507133e08ecd4bdf4d75ee4be77f296a3579796cf73134" PYPI_PACKAGE = "sentry-sdk" diff --git a/meta-python/recipes-devtools/python/python3-service-identity/run-ptest b/meta-python/recipes-devtools/python/python3-service-identity/run-ptest new file mode 100644 index 0000000000..b63c4de0d9 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-service-identity/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-python/recipes-devtools/python/python3-service-identity_21.1.0.bb b/meta-python/recipes-devtools/python/python3-service-identity_21.1.0.bb new file mode 100644 index 0000000000..2d4145ef12 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-service-identity_21.1.0.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "The tools for verifying whether a certificate is valid for the intended purposes." +HOMEPAGE = "https://pypi.org/project/service-identity" +AUTHOR = "Hynek Schlawack" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8a0f079f4e6a215d6bd6f9d97cab4d5f" + +SRC_URI[md5sum] = "5e5c195d8fcedc72f9068be2ad9b5a13" +SRC_URI[sha256sum] = "6e6c6086ca271dc11b033d17c3a8bea9f24ebff920c587da090afc9519419d34" + +inherit pypi setuptools3 ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS:${PN} += " \ + python3-attr \ + python3-cryptography \ + python3-pyasn1-modules \ +" + +RDEPENDS:${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ + cp -rf ${S}/setup.py ${D}${PTEST_PATH} +} diff --git a/meta-python/recipes-devtools/python/python3-setuptools-scm-git-archive_1.1.bb b/meta-python/recipes-devtools/python/python3-setuptools-scm-git-archive_1.1.bb index 472c4eb1c8..2068871d93 100644 --- a/meta-python/recipes-devtools/python/python3-setuptools-scm-git-archive_1.1.bb +++ b/meta-python/recipes-devtools/python/python3-setuptools-scm-git-archive_1.1.bb @@ -11,5 +11,6 @@ PYPI_PACKAGE = "setuptools_scm_git_archive" PYPI_SRC_URI = "https://files.pythonhosted.org/packages/7e/2c/0c15b29a1b5940250bfdc4a4f53272e35cd7cf8a34159291b6b4ec9eb291/${PYPI_ARCHIVE_NAME}" DEPENDS += "python3-setuptools-scm-native" +RDEPENDS:${PN} += "python3-setuptools-scm" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-sh_1.14.3.bb b/meta-python/recipes-devtools/python/python3-sh_2.0.4.bb index 317f648dcd..fa9f97a8f9 100644 --- a/meta-python/recipes-devtools/python/python3-sh_1.14.3.bb +++ b/meta-python/recipes-devtools/python/python3-sh_2.0.4.bb @@ -3,14 +3,16 @@ HOMEPAGE = "https://github.com/amoffat/sh" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5317094292296f03405f59ae5f6544b6" -SRC_URI[sha256sum] = "e4045b6c732d9ce75d571c79f5ac2234edd9ae4f5fa9d59b09705082bdca18c7" +SRC_URI[sha256sum] = "a18920f0839991bc9dfddb6dcc006c360b1064ba96257359f0ea356e9fa75a60" PYPI_PACKAGE = "sh" -inherit pypi setuptools3 +inherit pypi python_poetry_core RDEPENDS:${PN} += " \ + ${PYTHON_PN}-asyncio \ ${PYTHON_PN}-codecs \ + ${PYTHON_PN}-compression \ ${PYTHON_PN}-core \ ${PYTHON_PN}-io \ ${PYTHON_PN}-logging \ diff --git a/meta-python/recipes-devtools/python/python3-simpleeval/no-build.patch b/meta-python/recipes-devtools/python/python3-simpleeval/no-build.patch deleted file mode 100644 index b090755f8a..0000000000 --- a/meta-python/recipes-devtools/python/python3-simpleeval/no-build.patch +++ /dev/null @@ -1,24 +0,0 @@ -Upstream-Status: Submitted [https://github.com/danthedeckie/simpleeval/pull/119] -Signed-off-by: Ross Burton <ross.burton@arm.com> - -From 08bc99211aec32882d5f1c83896eb5d72b9fb125 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@arm.com> -Date: Mon, 23 May 2022 11:35:00 +0100 -Subject: [PATCH] pyproject.toml: remove build as a build-dependency - -pypa/build is one possible build tool, but not the only build tool. Forcing build to be present as a build dependency is meaningless: either the user is using build so obviously have build, or are using something else so having build is irrelevant. ---- - pyproject.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pyproject.toml b/pyproject.toml -index 052a55a..416482b 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -1,5 +1,5 @@ - [build-system] --requires = ["setuptools>=30.3.0", "wheel", "build"] -+requires = ["setuptools>=30.3.0", "wheel"] - build-backend = "setuptools.build_meta" - - [tool.black] diff --git a/meta-python/recipes-devtools/python/python3-simpleeval_0.9.12.bb b/meta-python/recipes-devtools/python/python3-simpleeval_0.9.13.bb index c9cf33d023..35cd19ffef 100644 --- a/meta-python/recipes-devtools/python/python3-simpleeval_0.9.12.bb +++ b/meta-python/recipes-devtools/python/python3-simpleeval_0.9.13.bb @@ -3,16 +3,13 @@ HOMEPAGE = "https://pypi.org/project/simpleeval/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENCE;md5=dc9277482effe59b734b004cbcc1fee7" -SRC_URI[sha256sum] = "3e0be507486d4e21cf9d08847c7e57dd61a1603950399985f7c5a0be7fd33e36" +SRC_URI[sha256sum] = "4a30f9cc01825fe4c719c785e3762623e350c4840d5e6855c2a8496baaa65fac" inherit pypi python_setuptools_build_meta ptest BBCLASSEXTEND = "native nativesdk" -SRC_URI += " \ - file://no-build.patch \ - file://run-ptest \ -" +SRC_URI += "file://run-ptest" RDEPENDS:${PN} += " \ ${PYTHON_PN}-math \ diff --git a/meta-python/recipes-devtools/python/python3-simplejson_3.18.1.bb b/meta-python/recipes-devtools/python/python3-simplejson_3.19.1.bb index 1aaa1eab02..1fb31a3a3a 100644 --- a/meta-python/recipes-devtools/python/python3-simplejson_3.18.1.bb +++ b/meta-python/recipes-devtools/python/python3-simplejson_3.19.1.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] = "746086e3ef6d74b53599df31b491d88a355abf2e31c837137dd90f8c4561cafa" +SRC_URI[sha256sum] = "6277f60848a7d8319d27d2be767a7546bc965535b28070e310b3a9af90604a4c" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-slip-dbus/9b939c0b534c1b7958fa0a3c7aedf30bca910431.patch b/meta-python/recipes-devtools/python/python3-slip-dbus/9b939c0b534c1b7958fa0a3c7aedf30bca910431.patch index b0e9d2215f..7080047b79 100644 --- a/meta-python/recipes-devtools/python/python3-slip-dbus/9b939c0b534c1b7958fa0a3c7aedf30bca910431.patch +++ b/meta-python/recipes-devtools/python/python3-slip-dbus/9b939c0b534c1b7958fa0a3c7aedf30bca910431.patch @@ -9,6 +9,8 @@ the collections module in Python 3.10. https://docs.python.org/3.10/whatsnew/changelog.html#python-3-10-0-alpha-5 https://bugs.python.org/issue37324 --- +Upstream-Status: Pending + slip/dbus/polkit.py | 6 +++--- slip/util/hookable.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-python/recipes-devtools/python/python3-smpplib_2.2.1.bb b/meta-python/recipes-devtools/python/python3-smpplib_2.2.3.bb index be0bafd33f..25f8f6afdd 100644 --- a/meta-python/recipes-devtools/python/python3-smpplib_2.2.1.bb +++ b/meta-python/recipes-devtools/python/python3-smpplib_2.2.3.bb @@ -4,7 +4,7 @@ LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://README.md;md5=8b4e2ac8cf248f7b991784f88b630852" PYPI_PACKAGE = "smpplib" -SRC_URI[sha256sum] = "c0b01947b47e404f42ccb59e906b6e4eb507963c971d59b44350db0f29c76166" +SRC_URI[sha256sum] = "5215a95b0538d26f189600e0982b31da8281f7453cd6e2862c5b21e3e1002331" inherit pypi setuptools3 ptest diff --git a/meta-python/recipes-devtools/python/python3-snagboot_1.1.bb b/meta-python/recipes-devtools/python/python3-snagboot_1.1.bb new file mode 100644 index 0000000000..e6f3148ce0 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-snagboot_1.1.bb @@ -0,0 +1,21 @@ +SUMMARY = "Snagboot intends to be an open-source replacement vendor-specific tools used to recover and/or reflash embedded platforms." + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI[sha256sum] = "40b045e6225f3544080558e4bd604d116d4cffceea80cb84307579d914e4e498" + +inherit pypi python_setuptools_build_meta + +RDEPENDS:${PN} += " \ + bash \ + python3-fcntl \ + python3-pyusb \ + python3-pyyaml \ + python3-setuptools \ + python3-six \ +" + +do_install:append() { + install -D -m 0644 ${S}/src/snagrecover/50-snagboot.rules ${D}${sysconfdir}/udev/rules.d/50-snagboot.rules +} diff --git a/meta-python/recipes-devtools/python/python3-socketio_5.7.2.bb b/meta-python/recipes-devtools/python/python3-socketio_5.8.0.bb index bfc5437349..5de7490815 100644 --- a/meta-python/recipes-devtools/python/python3-socketio_5.7.2.bb +++ b/meta-python/recipes-devtools/python/python3-socketio_5.8.0.bb @@ -9,7 +9,7 @@ inherit pypi python_setuptools_build_meta PYPI_PACKAGE = "python-socketio" -SRC_URI[sha256sum] = "92395062d9db3c13d30e7cdedaa0e1330bba78505645db695415f9a3c628d097" +SRC_URI[sha256sum] = "e714f4dddfaaa0cb0e37a1e2deef2bb60590a5b9fea9c343dd8ca5e688416fd9" PACKAGECONFIG ?= "asyncio_client client" PACKAGECONFIG[asyncio_client] = ",,,${PYTHON_PN}-aiohttp ${PYTHON_PN}-websockets" diff --git a/meta-python/recipes-devtools/python/python3-soupsieve_2.3.2.post1.bb b/meta-python/recipes-devtools/python/python3-soupsieve_2.4.1.bb index 99b6f7c04b..70c35844a1 100644 --- a/meta-python/recipes-devtools/python/python3-soupsieve_2.3.2.post1.bb +++ b/meta-python/recipes-devtools/python/python3-soupsieve_2.4.1.bb @@ -2,9 +2,9 @@ SUMMARY = "CSS selector library for python-beautifulsoup4" HOMEPAGE = "https://github.com/facelessuser/soupsieve" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=c7a2acf04248c0d02dac4c82ee8a7f56" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=520586fa71ed2cbda50b4a8c89621e09" -SRC_URI[sha256sum] = "fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d" +SRC_URI[sha256sum] = "89d12b2d5dfcd2c9e8c22326da9d9aa9cb3dfab0a83a024f05704076ee8d35ea" inherit pypi python_hatchling python_setuptools_build_meta ptest diff --git a/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.46.bb b/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.19.bb index be9c5b7bd2..a2cf00dfd3 100644 --- a/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.46.bb +++ b/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.19.bb @@ -4,20 +4,22 @@ HOMEPAGE = "http://www.sqlalchemy.org/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b707d50badb798e1d897f2c8f649382d" -SRC_URI[sha256sum] = "6913b8247d8a292ef8315162a51931e2b40ce91681f1b6f18f697045200c4a30" +SRC_URI[sha256sum] = "77a14fa20264af73ddcdb1e2b9c5a829b8cc6b8304d0f093271980e36c200a3f" PYPI_PACKAGE = "SQLAlchemy" inherit pypi setuptools3 RDEPENDS:${PN} += " \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-pickle \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-profile \ + python3-asyncio \ + python3-compression \ + python3-json \ + python3-logging \ + python3-netclient \ + python3-numbers \ + python3-pickle \ + python3-profile \ + python3-threading \ + python3-typing-extensions \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-sqlparse/0001-sqlparse-change-shebang-to-python3.patch b/meta-python/recipes-devtools/python/python3-sqlparse/0001-sqlparse-change-shebang-to-python3.patch index 94121340d5..0c9f29a6b8 100644 --- a/meta-python/recipes-devtools/python/python3-sqlparse/0001-sqlparse-change-shebang-to-python3.patch +++ b/meta-python/recipes-devtools/python/python3-sqlparse/0001-sqlparse-change-shebang-to-python3.patch @@ -1,4 +1,4 @@ -From 7fd00ab8c1b663052d57e735b6b956d5c92fbaed Mon Sep 17 00:00:00 2001 +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 @@ -12,80 +12,10 @@ dropped. Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> --- - 0001-sqlparse-change-shebang-to-python3.patch | 51 +++++++++++++++++++ - setup.py | 2 +- - sqlparse/__main__.py | 2 +- - sqlparse/cli.py | 2 +- - 4 files changed, 54 insertions(+), 3 deletions(-) - create mode 100644 0001-sqlparse-change-shebang-to-python3.patch + sqlparse/__main__.py | 2 +- + sqlparse/cli.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/0001-sqlparse-change-shebang-to-python3.patch b/0001-sqlparse-change-shebang-to-python3.patch -new file mode 100644 -index 0000000..ad6c50f ---- /dev/null -+++ b/0001-sqlparse-change-shebang-to-python3.patch -@@ -0,0 +1,51 @@ -+From 10c9d3341d64d697f678a64ae707f6bda21565bb 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> -+--- -+ setup.py | 2 +- -+ sqlparse/__main__.py | 2 +- -+ sqlparse/cli.py | 2 +- -+ 3 files changed, 3 insertions(+), 3 deletions(-) -+ -+diff --git a/setup.py b/setup.py -+index 345d0ce..ce3abc3 100644 -+--- a/setup.py -++++ b/setup.py -+@@ -1,4 +1,4 @@ -+-#!/usr/bin/env python -++#!/usr/bin/env python3 -+ # -*- coding: utf-8 -*- -+ # -+ # Copyright (C) 2009-2018 the sqlparse authors and contributors -+diff --git a/sqlparse/__main__.py b/sqlparse/__main__.py -+index 867d75d..dd0c074 100644 -+--- a/sqlparse/__main__.py -++++ b/sqlparse/__main__.py -+@@ -1,4 +1,4 @@ -+-#!/usr/bin/env python -++#!/usr/bin/env python3 -+ # -*- coding: utf-8 -*- -+ # -+ # Copyright (C) 2009-2018 the sqlparse authors and contributors -+diff --git a/sqlparse/cli.py b/sqlparse/cli.py -+index 25555a5..8bf050a 100755 -+--- a/sqlparse/cli.py -++++ b/sqlparse/cli.py -+@@ -1,4 +1,4 @@ -+-#!/usr/bin/env python -++#!/usr/bin/env python3 -+ # -*- coding: utf-8 -*- -+ # -+ # Copyright (C) 2009-2018 the sqlparse authors and contributors -+-- -+2.7.4 -+ -diff --git a/setup.py b/setup.py -index ede0aff..dc6a323 100644 ---- a/setup.py -+++ b/setup.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/__main__.py b/sqlparse/__main__.py index 2bf2513..6a3a115 100644 --- a/sqlparse/__main__.py @@ -107,5 +37,5 @@ index 7a8aacb..9c727e8 100755 # Copyright (C) 2009-2020 the sqlparse authors and contributors # <see AUTHORS file> -- -2.17.1 +2.41.0 diff --git a/meta-python/recipes-devtools/python/python3-sqlparse_0.4.3.bb b/meta-python/recipes-devtools/python/python3-sqlparse_0.4.4.bb index c952c71d0b..e4ac403eb5 100644 --- a/meta-python/recipes-devtools/python/python3-sqlparse_0.4.3.bb +++ b/meta-python/recipes-devtools/python/python3-sqlparse_0.4.4.bb @@ -8,12 +8,12 @@ SRC_URI += "file://0001-sqlparse-change-shebang-to-python3.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "69ca804846bb114d2ec380e4360a8a340db83f0ccf3afceeb1404df028f57268" +SRC_URI[sha256sum] = "d446183e84b8349fa3061f0fe7f06ca94ba65b426946ffebe6e3e8295332420c" export BUILD_SYS export HOST_SYS -inherit pypi ptest setuptools3 +inherit pypi ptest python_flit_core RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ diff --git a/meta-python/recipes-devtools/python/python3-sqlsoup_0.9.1.bb b/meta-python/recipes-devtools/python/python3-sqlsoup_0.9.1.bb index 592ba72043..e7f329e9bb 100644 --- a/meta-python/recipes-devtools/python/python3-sqlsoup_0.9.1.bb +++ b/meta-python/recipes-devtools/python/python3-sqlsoup_0.9.1.bb @@ -7,3 +7,5 @@ PYPI_PACKAGE = "sqlsoup" SRC_URI[sha256sum] = "2fafb7732a663dcd59b37e64d1c94d5fb20d4fad32cd8ee260aa1cd9a10340d6" inherit pypi setuptools3 + +RDEPENDS:${PN} += "python3-sqlalchemy" diff --git a/meta-python/recipes-devtools/python/python3-stack-data_0.6.2.bb b/meta-python/recipes-devtools/python/python3-stack-data_0.6.2.bb new file mode 100644 index 0000000000..21e4b77378 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-stack-data_0.6.2.bb @@ -0,0 +1,19 @@ +SUMMARY = "Extract data from python stack frames and tracebacks for informative displays" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a3d6c15f7859ae235a78f2758e5a48cf" + +DEPENDS = "python3-setuptools-scm-native" + +PYPI_PACKAGE = "stack_data" + +inherit pypi python_setuptools_build_meta + +SRC_URI[sha256sum] = "32d2dd0376772d01b6cb9fc996f3c8b57a357089dec328ed4b6553d037eaf815" + +RDEPENDS:${PN} = " \ + python3-asttokens \ + python3-executing \ + python3-html \ + python3-logging \ + python3-pure-eval \ +" diff --git a/meta-python/recipes-devtools/python/python3-stevedore_4.1.1.bb b/meta-python/recipes-devtools/python/python3-stevedore_5.1.0.bb index 66916838c4..d60d017d5b 100644 --- a/meta-python/recipes-devtools/python/python3-stevedore_4.1.1.bb +++ b/meta-python/recipes-devtools/python/python3-stevedore_5.1.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://docs.openstack.org/stevedore/latest/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[sha256sum] = "7f8aeb6e3f90f96832c301bff21a7eb5eefbe894c88c506483d355565d88cc1a" +SRC_URI[sha256sum] = "a54534acf9b89bc7ed264807013b505bf07f74dbe4bcfa37d32bd063870b087c" DEPENDS += "${PYTHON_PN}-pbr-native" diff --git a/meta-python/recipes-devtools/python/python3-stopit/LICENSE b/meta-python/recipes-devtools/python/python3-stopit/LICENSE new file mode 100644 index 0000000000..0b9a5bec37 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-stopit/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2018 Gilles Lenfant + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE.
\ No newline at end of file diff --git a/meta-python/recipes-devtools/python/python3-stopit_1.1.2.bb b/meta-python/recipes-devtools/python/python3-stopit_1.1.2.bb new file mode 100644 index 0000000000..64e3671e1b --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-stopit_1.1.2.bb @@ -0,0 +1,17 @@ +SUMMARY = "Raise asynchronous exceptions in other threads, control the timeout of blocks or callables with two context managers and two decorators." +HOMEPAGE = "https://pypi.org/project/stopit/" +SECTION = "devel/python" + +SRC_URI += " file://LICENSE " +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=497c556f42b1355b64190da2f3d88f93" + +SRC_URI[sha256sum] = "f7f39c583fd92027bd9d06127b259aee7a5b7945c1f1fa56263811e1e766996d" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-setuptools \ + " + +BBCLASSEXTEND = "native nativesdk"
\ No newline at end of file diff --git a/meta-python/recipes-devtools/python/python3-sympy_1.11.1.bb b/meta-python/recipes-devtools/python/python3-sympy_1.11.1.bb deleted file mode 100644 index 4e32936384..0000000000 --- a/meta-python/recipes-devtools/python/python3-sympy_1.11.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "Computer algebra system (CAS) in Python" -HOMEPAGE = "https://pypi.org/project/sympy/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9f6c7fdc2d69e31ad7abaea029c8ac16" - -SRC_URI[sha256sum] = "e32380dce63cb7c0108ed525570092fd45168bdae2faa17e528221ef72e88658" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += "python3-mpmath" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-sympy_1.12.bb b/meta-python/recipes-devtools/python/python3-sympy_1.12.bb new file mode 100644 index 0000000000..088dda3a2a --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-sympy_1.12.bb @@ -0,0 +1,15 @@ +SUMMARY = "Computer algebra system (CAS) in Python" +HOMEPAGE = "https://pypi.org/project/sympy/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ea48085d7dff75b49271b25447e8cdca" + +SRC_URI[sha256sum] = "ebf595c8dac3e0fdc4152c51878b498396ec7f30e7a914d6071e674d49420fb8" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + python3-misc \ + python3-mpmath \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch b/meta-python/recipes-devtools/python/python3-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch index d7085a8565..d7085a8565 100644 --- a/meta-python/recipes-devtools/python/python-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch +++ b/meta-python/recipes-devtools/python/python3-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch diff --git a/meta-python/recipes-devtools/python/python3-systemd_234.bb b/meta-python/recipes-devtools/python/python3-systemd_235.bb index 10614fe374..01d42cd5a4 100644 --- a/meta-python/recipes-devtools/python/python3-systemd_234.bb +++ b/meta-python/recipes-devtools/python/python3-systemd_235.bb @@ -4,20 +4,9 @@ LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4fbd65380cdd255951079008b364516c" PYPI_PACKAGE = "systemd-python" -DEPENDS += "systemd (<=234)" +DEPENDS += "systemd (<=235)" RDEPENDS:${PN} += "systemd ${PYTHON_PN}-syslog ${PYTHON_PN}-logging python3-syslog" REQUIRED_DISTRO_FEATURES = "systemd" inherit pypi features_check pkgconfig setuptools3 - -SRC_URI[md5sum] = "5071ea5bcb976186e92a3f5e75df221d" -SRC_URI[sha256sum] = "fd0e44bf70eadae45aadc292cb0a7eb5b0b6372cd1b391228047d33895db83e7" - -# allow for common patches for python- and python3-systemd -FILESEXTRAPATHS:prepend := "${THISDIR}/python-systemd:" - -SRC_URI += " \ - file://endian.patch \ - file://0002-setup.py-switch-from-distutils-to-setuptools.patch \ -" - SRC_URI:append:libc-musl = " file://0001-Provide-implementation-of-strndupa-for-musl.patch" +SRC_URI[sha256sum] = "4e57f39797fd5d9e2d22b8806a252d7c0106c936039d1e71c8c6b8008e695c0a" diff --git a/meta-python/recipes-devtools/python/python3-telnetlib3_2.0.4.bb b/meta-python/recipes-devtools/python/python3-telnetlib3_2.0.4.bb new file mode 100644 index 0000000000..c7e650d943 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-telnetlib3_2.0.4.bb @@ -0,0 +1,15 @@ +SUMMARY = "Telnet server and client library based on asyncio" +HOMEPAGE = "https://github.com/jquast/telnetlib3" +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fc2166986ad8169d334a342e0d8db8e0" + +SRC_URI[md5sum] = "2dfac7e10ed63c408da50ea712415f87" +SRC_URI[sha256sum] = "dbcbc16456a0e03a62431be7cfefff00515ab2f4ce2afbaf0d3a0e51a98c948d" + +PYPI_PACKAGE = "telnetlib3" + +inherit pypi setuptools3 + +RDEPENDS:${PN} = "\ + ${PYTHON_PN}-asyncio \ +" diff --git a/meta-python/recipes-devtools/python/python3-termcolor_2.2.0.bb b/meta-python/recipes-devtools/python/python3-termcolor_2.3.0.bb index 05c39c2c53..bbaefc7ec2 100644 --- a/meta-python/recipes-devtools/python/python3-termcolor_2.2.0.bb +++ b/meta-python/recipes-devtools/python/python3-termcolor_2.3.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=e5f5f7c9b280511f124dba5dda3d180e" inherit pypi python_setuptools_build_meta -SRC_URI[sha256sum] = "dfc8ac3f350788f23b2947b3e6cfa5a53b630b612e6cd8965a015a776020b99a" +SRC_URI[sha256sum] = "b5b08f68937f138fe92f6c089b99f1e2da0ae56c52b78bf7075fd95420fd9a5a" DEPENDS += " \ ${PYTHON_PN}-toml-native \ diff --git a/meta-python/recipes-devtools/python/python3-tomlkit/run-ptest b/meta-python/recipes-devtools/python/python3-tomlkit/run-ptest new file mode 100644 index 0000000000..b63c4de0d9 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-tomlkit/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-python/recipes-devtools/python/python3-tomlkit_0.11.8.bb b/meta-python/recipes-devtools/python/python3-tomlkit_0.11.8.bb new file mode 100644 index 0000000000..5ec7e6e9af --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-tomlkit_0.11.8.bb @@ -0,0 +1,29 @@ +SUMMARY = "Style preserving TOML library" +HOMEPAGE = "https://pypi.org/project/tomlkit/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=31aac0dbc1babd278d5386dadb7f8e82" + +SRC_URI[sha256sum] = "9330fc7faa1db67b541b28e62018c17d20be733177d290a13b24c62d1614e0c3" + +inherit pypi python_poetry_core ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS:${PN} += " \ + python3-datetime \ + python3-profile \ + python3-stringold \ +" + +RDEPENDS:${PN}-ptest += " \ + ${PYTHON_PN}-poetry-core \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-pyyaml \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} diff --git a/meta-python/recipes-devtools/python/python3-tornado_6.2.bb b/meta-python/recipes-devtools/python/python3-tornado_6.3.bb index d94fd39273..af5009b6ae 100644 --- a/meta-python/recipes-devtools/python/python3-tornado_6.2.bb +++ b/meta-python/recipes-devtools/python/python3-tornado_6.3.bb @@ -6,16 +6,29 @@ HOMEPAGE = "http://www.tornadoweb.org/en/stable/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[sha256sum] = "9b630419bde84ec666bfd7ea0a4cb2a8a651c2d5cccdbdd1972a0c859dfc3c13" +SRC_URI[sha256sum] = "d68f3192936ff2c4add04dc21a436a43b4408d466746b78bb2b9d0a53a18683f" inherit pypi setuptools3 # Requires _compression which is currently located in misc -RDEPENDS:${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-numbers ${PYTHON_PN}-email \ - ${PYTHON_PN}-pkgutil ${PYTHON_PN}-html ${PYTHON_PN}-json ${PYTHON_PN}-certifi ${PYTHON_PN}-threading \ - ${PYTHON_PN}-ctypes ${PYTHON_PN}-misc" +RDEPENDS:${PN} += " \ + python3-asyncio \ + python3-certifi \ + python3-compression \ + python3-ctypes \ + python3-email \ + python3-html \ + python3-json \ + python3-misc \ + python3-multiprocessing \ + python3-numbers \ + python3-pkgutil \ + python3-pycurl \ + python3-threading \ + python3-unittest \ +" -RDEPENDS:${PN}-test += "${PN} ${PYTHON_PN}-unittest" +RDEPENDS:${PN}-test += "python3-unittest" PACKAGES =+ "\ ${PN}-test \ @@ -23,5 +36,4 @@ PACKAGES =+ "\ FILES:${PN}-test = " \ ${libdir}/${PYTHON_DIR}/site-packages/*/test \ - ${libdir}/${PYTHON_DIR}/site-packages/*/testing.py* \ " diff --git a/meta-python/recipes-devtools/python/python3-tox_4.6.4.bb b/meta-python/recipes-devtools/python/python3-tox_4.6.4.bb new file mode 100644 index 0000000000..a8215a91bf --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-tox_4.6.4.bb @@ -0,0 +1,34 @@ +# SPDX-License-Identifier: MIT +# Copyright (C) 2023 iris-GmbH infrared & intelligent sensors + +SUMMARY = "Automate and standardize testing in Python. It is part of a larger vision of easing the packaging, testing and release process of Python software (alongside pytest and devpi)." +HOMEPAGE = "http://tox.readthedocs.org/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=11610a9d8fd95649cf8159be12b98cb7" + +SRC_URI[sha256sum] = "5e2ad8845764706170d3dcaac171704513cc8a725655219acb62fe4380bdadda" + +BBCLASSEXTEND = "native nativesdk" +inherit pypi python_hatchling + +DEPENDS += "\ + ${PYTHON_PN}-hatch-vcs-native \ +" + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-cachetools \ + ${PYTHON_PN}-chardet \ + ${PYTHON_PN}-colorama \ + ${PYTHON_PN}-filelock \ + ${PYTHON_PN}-packaging \ + ${PYTHON_PN}-platformdirs \ + ${PYTHON_PN}-pluggy \ + ${PYTHON_PN}-pyproject-api \ + ${PYTHON_PN}-tomli \ + ${PYTHON_PN}-virtualenv \ +" + +# Install all built-in python3 modules, as the software tested with tox might +# depend on it. Tox will attempt to install all required dependencies +# in a virtualenv using pip, but this obviously does not include the built-in modules. +RDEPENDS:${PN} += "${PYTHON_PN}-modules" diff --git a/meta-python/recipes-devtools/python/python3-tqdm_4.64.1.bb b/meta-python/recipes-devtools/python/python3-tqdm_4.65.0.bb index cb3b56aa81..f54b5c41e2 100644 --- a/meta-python/recipes-devtools/python/python3-tqdm_4.64.1.bb +++ b/meta-python/recipes-devtools/python/python3-tqdm_4.65.0.bb @@ -3,9 +3,9 @@ HOMEPAGE = "http://tqdm.github.io/" SECTION = "devel/python" LICENSE = "MIT & MPL-2.0" -LIC_FILES_CHKSUM = "file://LICENCE;md5=1672e2674934fd93a31c09cf17f34100" +LIC_FILES_CHKSUM = "file://LICENCE;md5=cfdbc9dcca7dc9fb600347958b7d5c4f" -SRC_URI[sha256sum] = "5f4f682a004951c1b450bc753c710e9280c5746ce6ffedee253ddbcbf54cf1e4" +SRC_URI[sha256sum] = "1871fb68a86b8fb3b59ca4cdd3dcccbc7e6d613eeed31f4c332531977b89beb5" inherit pypi python_setuptools_build_meta diff --git a/meta-python/recipes-devtools/python/python3-traitlets_5.8.1.bb b/meta-python/recipes-devtools/python/python3-traitlets_5.9.0.bb index 3f75df6f19..ee4ac64c3b 100644 --- a/meta-python/recipes-devtools/python/python3-traitlets_5.8.1.bb +++ b/meta-python/recipes-devtools/python/python3-traitlets_5.9.0.bb @@ -4,7 +4,7 @@ AUTHOR = "IPython Development Team <ipython-dev@scipy.org>" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING.md;md5=f17a3ba4cd59794dd6e005c8e150aef0" -SRC_URI[sha256sum] = "32500888f5ff7bbf3b9267ea31748fa657aaf34d56d85e60f91dda7dc7f5785b" +SRC_URI[sha256sum] = "f6cde21a9c68cf756af02035f72d5a723bf607e862e7be33ece505abf4a3bad9" inherit pypi python_hatchling diff --git a/meta-python/recipes-devtools/python/python3-trustme/run-ptest b/meta-python/recipes-devtools/python/python3-trustme/run-ptest new file mode 100644 index 0000000000..b63c4de0d9 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-trustme/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-python/recipes-devtools/python/python3-trustme_0.9.0.bb b/meta-python/recipes-devtools/python/python3-trustme_0.9.0.bb new file mode 100644 index 0000000000..6f31aea0e0 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-trustme_0.9.0.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "A utility provides a fake certificate authority (CA)" +HOMEPAGE = "https://pypi.org/project/trustme" +AUTHOR = "Nathaniel J. Smith" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d5a7af1a4b73e57431e25d15a2da745a" + +SRC_URI[md5sum] = "0e4d698e5aecaf8306cf440bf3dcbbe0" +SRC_URI[sha256sum] = "5e07b23d70ceed64f3bb36ae4b9abc52354c16c98d45ab037bee2b5fbffe586c" + +inherit pypi setuptools3 ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS:${PN} += " \ + python3-cryptography \ + python3-datetime \ + python3-idna \ + python3-io \ +" + +RDEPENDS:${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-service-identity \ + ${PYTHON_PN}-pyasn1-modules \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ + cp -rf ${S}/setup.py ${D}${PTEST_PATH} +} diff --git a/meta-python/recipes-devtools/python/python3-twitter_4.12.1.bb b/meta-python/recipes-devtools/python/python3-twitter_4.14.0.bb index addbe16e02..68908bb64e 100644 --- a/meta-python/recipes-devtools/python/python3-twitter_4.12.1.bb +++ b/meta-python/recipes-devtools/python/python3-twitter_4.14.0.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Python module to support twitter API" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=9;endline=9;md5=8227180126797a0148f94f483f3e1489" -SRC_URI[sha256sum] = "5e4c5b5d22f9e5dd9678a708fae4e40e6eeb1a860a89891a5de3040d5f3da8fe" +SRC_URI[sha256sum] = "1f9f1707d6972de6cff6c5fd90dfe6a449cd2e0d70bd40043ffab01e07a06c8c" PYPI_PACKAGE = "tweepy" diff --git a/meta-python/recipes-devtools/python/python3-twofish_0.3.0.bb b/meta-python/recipes-devtools/python/python3-twofish_0.3.0.bb index f45772d507..a8ad4bbdfb 100644 --- a/meta-python/recipes-devtools/python/python3-twofish_0.3.0.bb +++ b/meta-python/recipes-devtools/python/python3-twofish_0.3.0.bb @@ -15,3 +15,5 @@ SRC_URI[sha256sum] = "b09d8bb50d33b23ff34cafb1f9209f858f752935c6a5c901efb92a41ac inherit pypi setuptools3 BBCLASSEXTEND = "native nativesdk" + +RDEPENDS:${PN} += "python3-ctypes" diff --git a/meta-python/recipes-devtools/python/python3-typeguard_2.13.3.bb b/meta-python/recipes-devtools/python/python3-typeguard_4.0.0.bb index e9fce61452..ca17e2b135 100644 --- a/meta-python/recipes-devtools/python/python3-typeguard_2.13.3.bb +++ b/meta-python/recipes-devtools/python/python3-typeguard_4.0.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://pypi.org/project/typeguard/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=f0e423eea5c91e7aa21bdb70184b3e53" -SRC_URI[sha256sum] = "00edaa8da3a133674796cf5ea87d9f4b4c367d77476e185e80251cc13dfbb8c4" +SRC_URI[sha256sum] = "194fb3dbcb06ea9caf7088f3befee014de57961689f9c859ac5239b1ef61d987" inherit pypi python_setuptools_build_meta ptest @@ -11,6 +11,11 @@ SRC_URI += " \ file://run-ptest \ " +RDEPENDS:${PN} += " \ + python3-compression \ + python3-unittest \ +" + RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ ${PYTHON_PN}-typing-extensions \ diff --git a/meta-python/recipes-devtools/python/python3-tzlocal_4.2.bb b/meta-python/recipes-devtools/python/python3-tzlocal_5.0.1.bb index b9307f100f..a59fd93643 100644 --- a/meta-python/recipes-devtools/python/python3-tzlocal_4.2.bb +++ b/meta-python/recipes-devtools/python/python3-tzlocal_5.0.1.bb @@ -3,11 +3,12 @@ HOMEPAGE = "https://pypi.org/project/tzlocal/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=57e0bd61643d81d05683cdce65b11d10" -SRC_URI[sha256sum] = "ee5842fa3a795f023514ac2d801c4a81d1743bbe642e3940143326b3a00addd7" +SRC_URI[sha256sum] = "46eb99ad4bdb71f3f72b7d24f4267753e240944ecfc16f25d2719ba89827a803" inherit pypi python_setuptools_build_meta -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-pytz-deprecation-shim \ - ${PYTHON_PN}-datetime \ +RDEPENDS:${PN} += " \ + python3-datetime \ + python3-logging \ + python3-pytz-deprecation-shim \ " diff --git a/meta-python/recipes-devtools/python/python3-u-msgpack-python_2.7.2.bb b/meta-python/recipes-devtools/python/python3-u-msgpack-python_2.8.0.bb index 7231a51953..8baedcb951 100644 --- a/meta-python/recipes-devtools/python/python3-u-msgpack-python_2.7.2.bb +++ b/meta-python/recipes-devtools/python/python3-u-msgpack-python_2.8.0.bb @@ -1,9 +1,9 @@ DESCRIPTION = "A portable, lightweight MessagePack serializer and deserializer written in pure Python." LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=31e3e7e79c4e2dafffffdd0b4d40c849" +LIC_FILES_CHKSUM = "file://LICENSE;md5=17df11353545c53a2df0ce7655859306" -SRC_URI[sha256sum] = "e86f7ac6aa0ef4c6c49f004b4fd435bce99c23e2dd5d73003f3f9816024c2bd8" +SRC_URI[sha256sum] = "b801a83d6ed75e6df41e44518b4f2a9c221dc2da4bcd5380e3a0feda520bc61a" inherit pypi setuptools3 ptest diff --git a/meta-python/recipes-devtools/python/python3-uefi-firmware_1.10.bb b/meta-python/recipes-devtools/python/python3-uefi-firmware_1.10.bb index 49955c97e6..7db7c8059a 100644 --- a/meta-python/recipes-devtools/python/python3-uefi-firmware_1.10.bb +++ b/meta-python/recipes-devtools/python/python3-uefi-firmware_1.10.bb @@ -15,3 +15,8 @@ SRCREV = "dfb15b068960b771e2e1536d34790dac9b5bfe32" S = "${WORKDIR}/git" inherit setuptools3 + +RDEPENDS:${PN} += " \ + python3-ctypes \ + python3-logging \ +" diff --git a/meta-python/recipes-devtools/python/python3-uinput/0001-setup-use-setuptools-instead-of-distutils.patch b/meta-python/recipes-devtools/python/python3-uinput/0001-setup-use-setuptools-instead-of-distutils.patch index 54a3c18676..b2e1b9cd82 100644 --- a/meta-python/recipes-devtools/python/python3-uinput/0001-setup-use-setuptools-instead-of-distutils.patch +++ b/meta-python/recipes-devtools/python/python3-uinput/0001-setup-use-setuptools-instead-of-distutils.patch @@ -7,6 +7,8 @@ The latter is deprecated, use setuptools instead. Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl> --- +Upstream-Status: Pending + setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-python/recipes-devtools/python/python3-ujson/0001-setup.py-Do-not-strip-debugging-symbols.patch b/meta-python/recipes-devtools/python/python3-ujson/0001-setup.py-Do-not-strip-debugging-symbols.patch index 42cd99a895..8ba8ada556 100644 --- a/meta-python/recipes-devtools/python/python3-ujson/0001-setup.py-Do-not-strip-debugging-symbols.patch +++ b/meta-python/recipes-devtools/python/python3-ujson/0001-setup.py-Do-not-strip-debugging-symbols.patch @@ -8,6 +8,8 @@ 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/meta-python/recipes-devtools/python/python3-ujson_5.7.0.bb b/meta-python/recipes-devtools/python/python3-ujson_5.8.0.bb index 5c431fa003..9486435d73 100644 --- a/meta-python/recipes-devtools/python/python3-ujson_5.7.0.bb +++ b/meta-python/recipes-devtools/python/python3-ujson_5.8.0.bb @@ -4,7 +4,7 @@ DESCRIPTION = "UltraJSON is an ultra fast JSON encoder and decoder written in pu LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e0039a83d8a99726b5418f0b03302d0a" -SRC_URI[sha256sum] = "e788e5d5dcae8f6118ac9b45d0b891a0d55f7ac480eddcb7f07263f2bcf37b23" +SRC_URI[sha256sum] = "78e318def4ade898a461b3d92a79f9441e7e0e4d2ad5419abed4336d702c7425" inherit pypi ptest setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-unidiff_0.7.4.bb b/meta-python/recipes-devtools/python/python3-unidiff_0.7.5.bb index 3f6d2850fd..690acf8634 100644 --- a/meta-python/recipes-devtools/python/python3-unidiff_0.7.4.bb +++ b/meta-python/recipes-devtools/python/python3-unidiff_0.7.5.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://github.com/matiasb/python-unidiff" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=4c434b08ef42fea235bb019b5e5a97b3" -SRC_URI[sha256sum] = "2bbcbc986e1fb97f04b1d7b864aa6002ab02f4d8a996bf03aa6e5a81447d1fc5" +SRC_URI[sha256sum] = "2e5f0162052248946b9f0970a40e9e124236bf86c82b70821143a6fc1dea2574" inherit pypi setuptools3 ptest diff --git a/meta-python/recipes-devtools/python/python3-uswid_git.bb b/meta-python/recipes-devtools/python/python3-uswid_git.bb new file mode 100644 index 0000000000..40adc34c10 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-uswid_git.bb @@ -0,0 +1,21 @@ +SUMMARY = "A pure-python library for embedding CoSWID data" +HOMEPAGE = "https://github.com/hughsie/python-uswid" +SECTION = "devel/python" +LICENSE = "LGPL-2.1-or-later" + +DEPENDS += " python3-cbor2 python3-lxml python3-pefile" +RDEPENDS:${PN} += " \ + python3-cbor2 \ + python3-json \ + python3-lxml \ + python3-netclient \ +" +LIC_FILES_CHKSUM = "file://LICENSE;md5=40d2542b8c43a3ec2b7f5da31a697b88" + +SRC_URI = "git://github.com/hughsie/python-uswid.git;branch=main;protocol=https" +SRCREV = "3223034abef88ae29cf79fdc7fe11ec7e21e11ff" +S = "${WORKDIR}/git" + +inherit setuptools3 python3native + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-versioneer_0.29.bb b/meta-python/recipes-devtools/python/python3-versioneer_0.29.bb new file mode 100644 index 0000000000..bdfbfd1be1 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-versioneer_0.29.bb @@ -0,0 +1,18 @@ +SUMMARY = "Easy VCS-based management of project version strings" +HOMEPAGE = "https://github.com/python-versioneer/python-versioneer" +SECTION = "devel/python" + +LICENSE = "Unlicense" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f4c62131f879a8445e16a7f265aea635" + +SRC_URI[sha256sum] = "5ab283b9857211d61b53318b7c792cf68e798e765ee17c27ade9f6c924235731" + +inherit pypi python_setuptools_build_meta + +RDEPENDS:${PN} += "\ + python3-json \ + python3-netclient \ + python3-tomllib \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-versiontools_1.9.1.bb b/meta-python/recipes-devtools/python/python3-versiontools_1.9.1.bb index ea40d5f6bb..02639b5900 100644 --- a/meta-python/recipes-devtools/python/python3-versiontools_1.9.1.bb +++ b/meta-python/recipes-devtools/python/python3-versiontools_1.9.1.bb @@ -8,3 +8,5 @@ SRC_URI[md5sum] = "602b7db8eea30dd29a1d451997adf251" SRC_URI[sha256sum] = "a969332887a18a9c98b0df0ea4d4ca75972f24ca94f06fb87d591377e83414f6" inherit pypi setuptools3 + +RDEPENDS:${PN} += "python3-setuptools" diff --git a/meta-python/recipes-devtools/python/python3-virtualenv_20.24.0.bb b/meta-python/recipes-devtools/python/python3-virtualenv_20.24.0.bb new file mode 100644 index 0000000000..8b849df31d --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-virtualenv_20.24.0.bb @@ -0,0 +1,22 @@ +# SPDX-License-Identifier: MIT +# Copyright (C) 2023 iris-GmbH infrared & intelligent sensors + +SUMMARY = "A tool for creating isolated virtual python environments." +HOMEPAGE = "https://github.com/pypa/virtualenv" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0ce089158cf60a8ab6abb452b6405538" + +SRC_URI[sha256sum] = "e2a7cef9da880d693b933db7654367754f14e20650dc60e8ee7385571f8593a3" + +BBCLASSEXTEND = "native nativesdk" +inherit pypi python_hatchling + +DEPENDS += "\ + ${PYTHON_PN}-hatch-vcs-native \ +" + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-distlib \ + ${PYTHON_PN}-filelock \ + ${PYTHON_PN}-platformdirs \ +" diff --git a/meta-python/recipes-devtools/python/python3-watchdog_2.2.1.bb b/meta-python/recipes-devtools/python/python3-watchdog_3.0.0.bb index b76c6de0ed..bcd64892a2 100644 --- a/meta-python/recipes-devtools/python/python3-watchdog_2.2.1.bb +++ b/meta-python/recipes-devtools/python/python3-watchdog_3.0.0.bb @@ -4,7 +4,7 @@ DEPENDS = "${PYTHON_PN}-argh" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[sha256sum] = "cdcc23c9528601a8a293eb4369cbd14f6b4f34f07ae8769421252e9c22718b6f" +SRC_URI[sha256sum] = "4d98a320595da7a7c5a18fc48cb633c2e73cda78f93cac2ef42d42bf609a33f9" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-web3_5.31.3.bb b/meta-python/recipes-devtools/python/python3-web3_6.3.0.bb index 5c70febea1..088bfd504e 100644 --- a/meta-python/recipes-devtools/python/python3-web3_5.31.3.bb +++ b/meta-python/recipes-devtools/python/python3-web3_6.3.0.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=1dc2732bdc5e50382737979791cbb3b7" -SRC_URI[sha256sum] = "4b2d420647c81856e3cf398996cd3cc80c719dc3a10881884c5c3b1467e4f850" +SRC_URI[sha256sum] = "d13f17d18eaacd87f7d233b4b2c70d1579b39573628b71ec996adfcd4dac9cab" inherit pypi setuptools3 @@ -13,6 +13,8 @@ RDEPENDS:${PN} += " \ python3-distutils \ python3-eth-account \ python3-idna \ + python3-jsonschema \ + python3-google-api-core \ python3-lru-dict \ python3-requests \ python3-setuptools \ diff --git a/meta-python/recipes-devtools/python/python3-websocket-client_1.4.2.bb b/meta-python/recipes-devtools/python/python3-websocket-client_1.5.3.bb index ab88af4bf5..f7650f9bb4 100644 --- a/meta-python/recipes-devtools/python/python3-websocket-client_1.4.2.bb +++ b/meta-python/recipes-devtools/python/python3-websocket-client_1.5.3.bb @@ -7,7 +7,7 @@ HOMEPAGE = "https://github.com/websocket-client/websocket-client" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=b969e9612325987c823fc0737063ebc8" -SRC_URI[sha256sum] = "d6e8f90ca8e2dd4e8027c4561adeb9456b54044312dba655e7cae652ceb9ae59" +SRC_URI[sha256sum] = "b96f3bce3e54e3486ebe6504bc22bd4c140392bd2eb71764db29be8f2639aa65" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-websockets_10.4.bb b/meta-python/recipes-devtools/python/python3-websockets_10.4.bb deleted file mode 100644 index fac4d7a424..0000000000 --- a/meta-python/recipes-devtools/python/python3-websockets_10.4.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "An implementation of the WebSocket Protocol (RFC 6455)" -HOMEPAGE = "https://github.com/aaugustin/websockets" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=78c2cc91e172ca96d6f8e4a76c739ec6" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "eef610b23933c54d5d921c92578ae5f89813438fded840c2e9809d378dc765d3" - -BBCLASSEXTEND = "native nativesdk" - -RDEPENDS:${PN} = "\ - ${PYTHON_PN}-asyncio \ -" diff --git a/meta-python/recipes-devtools/python/python3-websockets_11.0.3.bb b/meta-python/recipes-devtools/python/python3-websockets_11.0.3.bb new file mode 100644 index 0000000000..e6971c8297 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-websockets_11.0.3.bb @@ -0,0 +1,16 @@ +SUMMARY = "An implementation of the WebSocket Protocol (RFC 6455)" +HOMEPAGE = "https://github.com/aaugustin/websockets" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=51924a6af4495b8cfaee1b1da869b6f4" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "88fc51d9a26b10fc331be344f1781224a375b78488fc343620184e95a4b27016" + +BBCLASSEXTEND = "native nativesdk" + +RDEPENDS:${PN} = " \ + python3-asyncio \ + python3-profile \ +" diff --git a/meta-python/recipes-devtools/python/python3-werkzeug_2.2.2.bb b/meta-python/recipes-devtools/python/python3-werkzeug_2.3.6.bb index 92302f9cd7..11441fca2b 100644 --- a/meta-python/recipes-devtools/python/python3-werkzeug_2.2.2.bb +++ b/meta-python/recipes-devtools/python/python3-werkzeug_2.3.6.bb @@ -12,9 +12,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462" PYPI_PACKAGE = "Werkzeug" -SRC_URI[sha256sum] = "7ea2d48322cc7c0f8b3a215ed73eabd7b5d75d0b50e31ab006286ccff9e00b8f" +SRC_URI[sha256sum] = "98c774df2f91b05550078891dee5f0eb0cb797a522c757a2452b9cee5b202330" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta CLEANBROKEN = "1" diff --git a/meta-python/recipes-devtools/python/python3-wrapt_1.14.1.bb b/meta-python/recipes-devtools/python/python3-wrapt_1.15.0.bb index 54bf1ee99a..e35e1f7a79 100644 --- a/meta-python/recipes-devtools/python/python3-wrapt_1.14.1.bb +++ b/meta-python/recipes-devtools/python/python3-wrapt_1.15.0.bb @@ -2,9 +2,9 @@ SUMMARY = "A Python module for decorators, wrappers and monkey patching." HOMEPAGE = "http://wrapt.readthedocs.org/" LICENSE = "BSD-2-Clause" SECTION = "devel/python" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7a4e084dbc322d180bc74f26cdf8236e" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dc34cbad60bc961452eb7ade801d25f7" -SRC_URI[sha256sum] = "380a85cf89e0e69b7cfbe2ea9f765f004ff419f34194018a6827ac0e3edfed4d" +SRC_URI[sha256sum] = "d06730c6aed78cee4126234cf2d071e01b44b915e725a6cb439a879ec9754a3a" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-xlrd_2.0.1.bb b/meta-python/recipes-devtools/python/python3-xlrd_2.0.1.bb index da0dc26715..5e63d3c307 100644 --- a/meta-python/recipes-devtools/python/python3-xlrd_2.0.1.bb +++ b/meta-python/recipes-devtools/python/python3-xlrd_2.0.1.bb @@ -20,10 +20,16 @@ inherit ptest setuptools3 PIP_INSTALL_PACKAGE = "xlrd" PIP_INSTALL_DIST_PATH = "${S}/dist" -RDEPENDS:${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-io ${PYTHON_PN}-pprint ${PYTHON_PN}-shell" +RDEPENDS:${PN} += " \ + python3-compression \ + python3-io \ + python3-mmap \ + python3-pprint \ + python3-shell \ +" RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ " do_install_ptest() { diff --git a/meta-python/recipes-devtools/python/python3-xlsxwriter_3.0.7.bb b/meta-python/recipes-devtools/python/python3-xlsxwriter_3.1.2.bb index e73e579e37..805a3b7dd1 100644 --- a/meta-python/recipes-devtools/python/python3-xlsxwriter_3.0.7.bb +++ b/meta-python/recipes-devtools/python/python3-xlsxwriter_3.1.2.bb @@ -16,6 +16,6 @@ RDEPENDS:${PN} += " \ python3-io \ " -SRC_URI[sha256sum] = "1239958b12da12be6abf05b32f64ff162eb75fff0fdf00d901ca0f46dc0557cf" +SRC_URI[sha256sum] = "78751099a770273f1c98b8d6643351f68f98ae8e6acf9d09d37dc6798f8cd3de" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-xmlrunner_1.7.7.bb b/meta-python/recipes-devtools/python/python3-xmlrunner_1.7.7.bb index e81e4dabee..7259c3fad3 100644 --- a/meta-python/recipes-devtools/python/python3-xmlrunner_1.7.7.bb +++ b/meta-python/recipes-devtools/python/python3-xmlrunner_1.7.7.bb @@ -7,3 +7,5 @@ SRC_URI[md5sum] = "7b0b152ed2d278516aedbc0cac22dfb3" SRC_URI[sha256sum] = "5a6113d049eca7646111ee657266966e5bbfb0b5ceb2e83ee0772e16d7110f39" inherit pypi setuptools3 + +RDEPENDS:${PN} += "python3-unittest" diff --git a/meta-python/recipes-devtools/python/python3-xmlschema_2.1.1.bb b/meta-python/recipes-devtools/python/python3-xmlschema_2.3.1.bb index ff7e9696d4..9be7cb5551 100644 --- a/meta-python/recipes-devtools/python/python3-xmlschema_2.1.1.bb +++ b/meta-python/recipes-devtools/python/python3-xmlschema_2.3.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/sissaschool/xmlschema" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=0ab20f8e337bea2e6874f372edfd12c0" -SRC_URI[sha256sum] = "5ca34ff15dd3276cfb2e3e7b4c8dde4b7d4d27080f333a93b6c3f817e90abddf" +SRC_URI[sha256sum] = "2eb426c5710833a05610c22c8766713a1b87e9405e3eca0b7c658375bf7ec810" PYPI_PACKAGE = "xmlschema" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-xmodem_0.4.6.bb b/meta-python/recipes-devtools/python/python3-xmodem_0.4.7.bb index 6df392e2d6..80fe945552 100644 --- a/meta-python/recipes-devtools/python/python3-xmodem_0.4.6.bb +++ b/meta-python/recipes-devtools/python/python3-xmodem_0.4.7.bb @@ -3,7 +3,7 @@ DESCRIPTION = "XMODEM protocol implementation" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -SRC_URI[sha256sum] = "089737298f5738eabc43f2519efdc80b402693768f16383f7013b9e6f8f279d7" +SRC_URI[sha256sum] = "2f1068aa8676f0d1d112498b5786c4f8ea4f89d8f25d07d3a0f293cd21db1c35" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-xstatic_1.0.2.bb b/meta-python/recipes-devtools/python/python3-xstatic_1.0.3.bb index 8de3959450..df4b7c8885 100644 --- a/meta-python/recipes-devtools/python/python3-xstatic_1.0.2.bb +++ b/meta-python/recipes-devtools/python/python3-xstatic_1.0.3.bb @@ -6,8 +6,7 @@ LIC_FILES_CHKSUM = "file://README.txt;md5=1418684272f85f400cebf1b1a255c5cd" PYPI_PACKAGE = "XStatic" -SRC_URI[md5sum] = "dea172b7b14b0dbcd5ed63075221af4b" -SRC_URI[sha256sum] = "80b78dfe37bce6dee4343d64c65375a80bcf399b46dd47c0c7d56161568a23a8" +SRC_URI[sha256sum] = "402544cc9e179489441054f09c807804e115ea246907de87c0355fb4f5a31268" DEPENDS += " \ ${PYTHON_PN}-pip \ diff --git a/meta-python/recipes-devtools/python/python3-yappi/0001-Fix-imports-for-ptests.patch b/meta-python/recipes-devtools/python/python3-yappi/0001-Fix-imports-for-ptests.patch index 274f6f527b..476db4b7d0 100644 --- a/meta-python/recipes-devtools/python/python3-yappi/0001-Fix-imports-for-ptests.patch +++ b/meta-python/recipes-devtools/python/python3-yappi/0001-Fix-imports-for-ptests.patch @@ -5,6 +5,8 @@ Subject: [PATCH] Fix imports for tests Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> --- +Upstream-Status: Pending + tests/test_asyncio.py | 2 +- tests/test_asyncio_context_vars.py | 2 +- tests/test_functionality.py | 2 +- diff --git a/meta-python/recipes-devtools/python/python3-yappi/0002-add-3.11-to-the-setup.patch b/meta-python/recipes-devtools/python/python3-yappi/0002-add-3.11-to-the-setup.patch index a9bf612db8..d40bd2b7cc 100644 --- a/meta-python/recipes-devtools/python/python3-yappi/0002-add-3.11-to-the-setup.patch +++ b/meta-python/recipes-devtools/python/python3-yappi/0002-add-3.11-to-the-setup.patch @@ -4,6 +4,8 @@ Date: Fri, 25 Nov 2022 15:58:03 +0300 Subject: [PATCH 2/2] add 3.11 to the setup --- +Upstream-Status: Pending + setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-python/recipes-devtools/python/python3-yarl_1.8.2.bb b/meta-python/recipes-devtools/python/python3-yarl_1.9.2.bb index 6f6f85d78a..63700024c2 100644 --- a/meta-python/recipes-devtools/python/python3-yarl_1.8.2.bb +++ b/meta-python/recipes-devtools/python/python3-yarl_1.9.2.bb @@ -1,9 +1,9 @@ SUMMARY = "The module provides handy URL class for url parsing and changing" HOMEPAGE = "https://github.com/aio-libs/yarl/" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e581798a7b985311f29fa3e163ea27ae" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[sha256sum] = "49d43402c6e3013ad0978602bf6bf5328535c48d192304b91b97a3c6790b1562" +SRC_URI[sha256sum] = "04ab9d4b9f587c06d801c2abfe9317b77cdf996c65a90d5e84ecc45010823571" SRC_URI += "file://run-ptest" diff --git a/meta-python/recipes-devtools/python/python3-zeroconf_0.47.1.bb b/meta-python/recipes-devtools/python/python3-zeroconf_0.71.0.bb index 0c0304aa2b..78bdfc6f0c 100644 --- a/meta-python/recipes-devtools/python/python3-zeroconf_0.47.1.bb +++ b/meta-python/recipes-devtools/python/python3-zeroconf_0.71.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] = "65ab91068f8fafe00856b63756c72296b69682709681e96e8bb5d101345d5011" +SRC_URI[sha256sum] = "c3040b3ad60f77fd29ca90b013c99aa7a0266eab9e4953106fc6f5fc8ba5641a" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-zopeinterface_5.5.2.bb b/meta-python/recipes-devtools/python/python3-zopeinterface_6.0.bb index 0384d46e5c..264898adb6 100644 --- a/meta-python/recipes-devtools/python/python3-zopeinterface_5.5.2.bb +++ b/meta-python/recipes-devtools/python/python3-zopeinterface_6.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e54fd776274c1b7423 PYPI_PACKAGE = "zope.interface" inherit pypi setuptools3 -SRC_URI[sha256sum] = "bfee1f3ff62143819499e348f5b8a7f3aa0259f9aca5e0ddae7391d059dce671" +SRC_URI[sha256sum] = "aab584725afd10c710b8f1e6e208dbee2d0ad009f57d674cb9d1b3964037275d" PACKAGES =. "${PN}-test " diff --git a/meta-python/recipes-devtools/python3-attrdict3/python3-attrdict3_2.0.2.bb b/meta-python/recipes-devtools/python3-attrdict3/python3-attrdict3_2.0.2.bb index cb44ea71a4..ee099c7ac9 100644 --- a/meta-python/recipes-devtools/python3-attrdict3/python3-attrdict3_2.0.2.bb +++ b/meta-python/recipes-devtools/python3-attrdict3/python3-attrdict3_2.0.2.bb @@ -10,3 +10,5 @@ SRC_URI[sha256sum] = "004c171ca1120cc1755701db99d7fa4944afb1e68950434efdaa542513 inherit pypi setuptools3 BBCLASSEXTEND = "native" + +RDEPENDS:${PN} += "python3-six" diff --git a/meta-python/recipes-devtools/python3-reedsolo/python3-reedsolo_1.6.1.bb b/meta-python/recipes-devtools/python3-reedsolo/python3-reedsolo_1.7.0.bb index 51651f3bcf..b6c40921c3 100644 --- a/meta-python/recipes-devtools/python3-reedsolo/python3-reedsolo_1.6.1.bb +++ b/meta-python/recipes-devtools/python3-reedsolo/python3-reedsolo_1.7.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/tomerfiliba/reedsolomon" LICENSE = "MIT-0 | Unlicense" LIC_FILES_CHKSUM = "file://LICENSE;md5=ffde61aeb8917e70e0257e0a4b6d103c" -SRC_URI[sha256sum] = "a7ce6b0efad8df491a70b87b6ab3543e751f7700dc4ac0b12081a456ef634f5d" +SRC_URI[sha256sum] = "c1359f02742751afe0f1c0de9f0772cc113835aa2855d2db420ea24393c87732" inherit pypi setuptools3 diff --git a/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb b/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb index 29e7a267d2..aba127897d 100644 --- a/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb +++ b/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb @@ -15,7 +15,7 @@ SRC_URI = "git://github.com/storaged-project/blivet-gui.git;branch=master;protoc " inherit features_check -REQUIRED_DISTRO_FEATURES = "x11 systemd" +REQUIRED_DISTRO_FEATURES = "x11 systemd gobject-introspection-data" inherit setuptools3_legacy python3native diff --git a/meta-python/recipes-extended/python-cson/python3-cson/0001-setup.py-Do-not-poke-at-git-describe-to-find-version.patch b/meta-python/recipes-extended/python-cson/python3-cson/0001-setup.py-Do-not-poke-at-git-describe-to-find-version.patch new file mode 100644 index 0000000000..dc3f8657ec --- /dev/null +++ b/meta-python/recipes-extended/python-cson/python3-cson/0001-setup.py-Do-not-poke-at-git-describe-to-find-version.patch @@ -0,0 +1,40 @@ +From 0d0ffab004306b1379f247016200ade381d1d181 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 8 Feb 2023 23:03:47 -0800 +Subject: [PATCH] setup.py: Do not poke at git describe to find version + +OE uses git snapshot and git describe --tags will emit a string which is +not PEP440 compliant version scheme. setuptools 67+ is strict about it +and fails to build. Therefore inject a static version.py from OE +environment and use that for version number based on PV + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + setup.py | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +diff --git a/setup.py b/setup.py +index a77138f..df675cd 100644 +--- a/setup.py ++++ b/setup.py +@@ -28,14 +28,8 @@ def main(): + # Also, when git is not available (PyPi package), use stored version.py. + version_py = os.path.join(os.path.dirname(__file__), 'version.py') + +- try: +- if sys.version_info < (2, 7) or (3,) <= sys.version_info < (3, 2): +- version_git = subprocess.Popen(['ls', '-l'], stdout=subprocess.PIPE).communicate()[0] +- else: +- version_git = subprocess.check_output(["git", "describe", "--tags"]).rstrip() +- except: +- with open(version_py, 'r') as fh: +- version_git = open(version_py).read().strip().split('=')[-1].replace('"','') ++ with open(version_py, 'r') as fh: ++ version_git = open(version_py).read().strip().split('=')[-1].replace('"','') + + version_msg = "# Do not edit this file, pipeline versioning is governed by git tags" + with open(version_py, 'w') as fh: +-- +2.39.1 + diff --git a/meta-python/recipes-extended/python-cson/python3-cson_git.bb b/meta-python/recipes-extended/python-cson/python3-cson_git.bb index c4fcc61ec0..aba1d8fff3 100644 --- a/meta-python/recipes-extended/python-cson/python3-cson_git.bb +++ b/meta-python/recipes-extended/python-cson/python3-cson_git.bb @@ -7,17 +7,22 @@ LICENSE = "MIT" SECTION = "devel/python" LIC_FILES_CHKSUM = "file://LICENSE;md5=7709d2635e63ab96973055a23c2a4cac" -SRCREV = "f3f2898c44bb16b951d3e9f2fbf6d1c4158edda2" -SRC_URI = "git://github.com/gt3389b/python-cson.git;branch=master;protocol=https" +PV = "1.0.9+1.0.10" +SRCREV = "69090778bccc5ed124342ba288597fbb2bfa9f39" +SRC_URI = "git://github.com/gt3389b/python-cson.git;branch=master;protocol=https \ + file://0001-setup.py-Do-not-poke-at-git-describe-to-find-version.patch" S = "${WORKDIR}/git" -RDEPENDS:${PN}:class-native = "" -DEPENDS:append:class-native = " python-native " +RDEPENDS:${PN} = "python3-json" inherit setuptools3 PIP_INSTALL_PACKAGE = "python_cson" +do_configure:prepend() { + echo "__version__=${PV}" > ${S}/version.py +} + BBCLASSEXTEND = "native" diff --git a/meta-python/recipes-extended/python-meh/python3-meh/0001-setup.py-switch-from-distutils-to-setuptools.patch b/meta-python/recipes-extended/python-meh/python3-meh/0001-setup.py-switch-from-distutils-to-setuptools.patch deleted file mode 100644 index 2eb6be5a18..0000000000 --- a/meta-python/recipes-extended/python-meh/python3-meh/0001-setup.py-switch-from-distutils-to-setuptools.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 034ac41561409ffc7836683331b6b94a641436e4 Mon Sep 17 00:00:00 2001 -From: Tim Orling <tim.orling@konsulko.com> -Date: Mon, 28 Feb 2022 09:41:02 -0800 -Subject: [PATCH] setup.py: switch from distutils to setuptools - -In Python 3.10 'distutils' is deprecated with removal slated for Python -3.12. Switch from 'distutils.core' to 'setuptools'. - -This also allows for a 'wheel' binary archive format to be built with -'setup.py bdist_wheel'. - -Upstream-Status: Backport [cf9eafdd165347f86bb4a2534c41fd805db52322] - -Signed-off-by: Tim Orling <tim.orling@konsulko.com> - ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 9c12180..3ba5195 100644 ---- a/setup.py -+++ b/setup.py -@@ -1,6 +1,6 @@ - #!/usr/bin/python3 - --from distutils.core import setup -+from setuptools import setup - - setup(name='python-meh', version='0.50.1', - description='Python module for handling exceptions', diff --git a/meta-python/recipes-extended/python-meh/python3-meh_0.50.1.bb b/meta-python/recipes-extended/python-meh/python3-meh_0.51.bb index 1d9af438da..e83514af1b 100644 --- a/meta-python/recipes-extended/python-meh/python3-meh_0.50.1.bb +++ b/meta-python/recipes-extended/python-meh/python3-meh_0.51.bb @@ -9,9 +9,8 @@ inherit setuptools3_legacy S = "${WORKDIR}/git" -SRC_URI = "git://github.com/rhinstaller/python-meh.git;protocol=https;branch=rhel9-branch \ - file://0001-setup.py-switch-from-distutils-to-setuptools.patch \ - " -SRCREV = "c321ce22950aff76611a3c6beffa02b5ea3adbed" +SRC_URI = "git://github.com/rhinstaller/python-meh.git;protocol=https;branch=master" + +SRCREV = "eb5d4adc3b838704b6a68f0f77ada2063a11ab1b" FILES:${PN} += "${datadir}/python-meh" diff --git a/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch b/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch index 5f95d74bf1..309a00122a 100644 --- a/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch +++ b/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch @@ -9,18 +9,17 @@ we support basic/digest authentication. Add KickstartAuthError to report authentication failure, which the invoker could parse this specific error. -Upstream-Status: inappropriate [oe specific] +Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - --- pykickstart/errors.py | 17 +++++++++++++++++ - pykickstart/load.py | 34 ++++++++++++++++++++++++++++------ + pykickstart/load.py | 32 +++++++++++++++++++++++++++----- pykickstart/parser.py | 4 ++-- - 3 files changed, 47 insertions(+), 8 deletions(-) + 3 files changed, 46 insertions(+), 7 deletions(-) diff --git a/pykickstart/errors.py b/pykickstart/errors.py -index 8294f59a..3d20bf82 100644 +index 8294f59..3d20bf8 100644 --- a/pykickstart/errors.py +++ b/pykickstart/errors.py @@ -32,6 +32,9 @@ This module exports several exception classes: @@ -52,16 +51,15 @@ index 8294f59a..3d20bf82 100644 + def __str__(self): + return self.value diff --git a/pykickstart/load.py b/pykickstart/load.py -index 30e2fcfa..b984876d 100644 +index eb76b65..f51cf08 100644 --- a/pykickstart/load.py +++ b/pykickstart/load.py -@@ -18,9 +18,12 @@ +@@ -18,9 +18,11 @@ # with the express permission of Red Hat, Inc. # import requests +from requests.auth import HTTPDigestAuth +from requests.auth import HTTPBasicAuth -+ import shutil -from pykickstart.errors import KickstartError @@ -69,7 +67,7 @@ index 30e2fcfa..b984876d 100644 from pykickstart.i18n import _ from requests.exceptions import SSLError, RequestException -@@ -28,7 +31,7 @@ _is_url = lambda location: '://' in location # RFC 3986 +@@ -28,7 +30,7 @@ is_url = lambda location: '://' in location # RFC 3986 SSL_VERIFY = True @@ -78,21 +76,20 @@ index 30e2fcfa..b984876d 100644 '''Load a destination URL or file into a string. Type of input is inferred automatically. -@@ -39,7 +42,7 @@ def load_to_str(location): +@@ -39,7 +41,7 @@ def load_to_str(location): Raises: KickstartError on error reading''' - if _is_url(location): + if is_url(location): - return _load_url(location) + return _load_url(location, user=user, passwd=passwd) else: return _load_file(location) -@@ -69,11 +72,30 @@ def load_to_file(location, destination): +@@ -69,11 +71,31 @@ def load_to_file(location, destination): _copy_file(location, destination) return destination -def _load_url(location): -- '''Load a location (URL or filename) and return contents as string''' +def _get_auth(location, user=None, passwd=None): + + auth = None @@ -101,7 +98,7 @@ index 30e2fcfa..b984876d 100644 + if user is None or passwd is None: + log.info("Require Authentication") + raise KickstartAuthError("Require Authentication.\nAppend 'ksuser=<username> kspasswd=<password>' to boot command") - ++ + reasons = request.headers.get("WWW-Authenticate", "").split() + if reasons: + auth_type = reasons[0] @@ -113,8 +110,9 @@ index 30e2fcfa..b984876d 100644 + return auth + +def _load_url(location, user=None, passwd=None): -+ '''Load a location (URL or filename) and return contents as string''' + '''Load a location (URL or filename) and return contents as string''' + auth = _get_auth(location, user=user, passwd=passwd) + try: - request = requests.get(location, verify=SSL_VERIFY) + request = requests.get(location, verify=SSL_VERIFY, auth=auth) @@ -122,10 +120,10 @@ index 30e2fcfa..b984876d 100644 raise KickstartError(_('Error securely accessing URL "%s"') % location + ': {e}'.format(e=str(e))) except RequestException as e: diff --git a/pykickstart/parser.py b/pykickstart/parser.py -index b23e54f1..e10f06b5 100644 +index 7edf8aa..46c5299 100644 --- a/pykickstart/parser.py +++ b/pykickstart/parser.py -@@ -796,7 +796,7 @@ class KickstartParser(object): +@@ -790,7 +790,7 @@ class KickstartParser(object): i = PutBackIterator(s.splitlines(True) + [""]) self._stateMachine(i) @@ -134,7 +132,7 @@ index b23e54f1..e10f06b5 100644 """Process a kickstart file, given by the filename f.""" if reset: self._reset() -@@ -817,7 +817,7 @@ class KickstartParser(object): +@@ -811,7 +811,7 @@ class KickstartParser(object): self.currentdir[self._includeDepth] = cd try: @@ -143,3 +141,6 @@ index b23e54f1..e10f06b5 100644 except KickstartError as e: raise KickstartError(_("Unable to open input kickstart file: %s") % str(e), lineno=0) +-- +2.34.1 + diff --git a/meta-python/recipes-extended/python-pykickstart/files/0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch b/meta-python/recipes-extended/python-pykickstart/files/0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch index 4a001f3386..f5483db825 100644 --- a/meta-python/recipes-extended/python-pykickstart/files/0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch +++ b/meta-python/recipes-extended/python-pykickstart/files/0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch @@ -1,7 +1,7 @@ From 62fdead139edb0f29b2f222efcb8f39be15b057e Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Mon, 30 Jul 2018 15:47:13 +0800 -Subject: [PATCH 2/4] pykickstart/parser.py: add lock for readKickstart and +Subject: [PATCH 2/4] pykickstart/parser.py: add lock for readKickstart and support https without certification - Add lock for readKickstart to fix race issue @@ -9,18 +9,21 @@ Subject: [PATCH 2/4] pykickstart/parser.py: add lock for readKickstart and - Support to download kickstart file through https without certification Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- +Upstream-Status: Pending + pykickstart/load.py | 2 +- pykickstart/parser.py | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/pykickstart/load.py b/pykickstart/load.py -index c6f013f..7adb751 100644 +index 8da8051..e856c8d 100644 --- a/pykickstart/load.py +++ b/pykickstart/load.py -@@ -30,7 +30,7 @@ from requests.exceptions import SSLError, RequestException +@@ -32,7 +32,7 @@ log = logging.getLogger("anaconda.main") - _is_url = lambda location: '://' in location # RFC 3986 + is_url = lambda location: '://' in location # RFC 3986 -SSL_VERIFY = True +SSL_VERIFY = False @@ -28,10 +31,10 @@ index c6f013f..7adb751 100644 def load_to_str(location, user=None, passwd=None): '''Load a destination URL or file into a string. diff --git a/pykickstart/parser.py b/pykickstart/parser.py -index e44099b..e68174d 100644 +index b95ba90..a55a9a3 100644 --- a/pykickstart/parser.py +++ b/pykickstart/parser.py -@@ -55,6 +55,20 @@ from pykickstart.i18n import _ +@@ -51,6 +51,20 @@ from pykickstart.i18n import _ STATE_END = "end" STATE_COMMANDS = "commands" @@ -52,7 +55,7 @@ index e44099b..e68174d 100644 def _preprocessStateMachine(lineIter): l = None lineno = 0 -@@ -788,6 +802,10 @@ class KickstartParser(object): +@@ -791,6 +805,10 @@ class KickstartParser(object): self._stateMachine(i) def readKickstart(self, f, reset=True, username=None, password=None): @@ -64,5 +67,5 @@ index e44099b..e68174d 100644 if reset: self._reset() -- -2.7.4 +2.34.1 diff --git a/meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch b/meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch index 7ab7346860..6242e23b9c 100644 --- a/meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch +++ b/meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch @@ -6,7 +6,7 @@ Subject: [PATCH 3/4] comment out sections shutdown and environment in Both of them is disabled by default. -Upstream-Status: Inappropriate[oe specific] +Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> diff --git a/meta-python/recipes-extended/python-pykickstart/files/0004-load.py-retry-to-invoke-request-with-timeout.patch b/meta-python/recipes-extended/python-pykickstart/files/0004-load.py-retry-to-invoke-request-with-timeout.patch index bf5a197230..abe2c87e00 100644 --- a/meta-python/recipes-extended/python-pykickstart/files/0004-load.py-retry-to-invoke-request-with-timeout.patch +++ b/meta-python/recipes-extended/python-pykickstart/files/0004-load.py-retry-to-invoke-request-with-timeout.patch @@ -8,22 +8,21 @@ network, it failed and wait 300s to break, we should retry to invoke request with timeout explicitly. So if it the network is up, the fetch works. -Upstream-Status: inappropriate [oe specific] +Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - --- pykickstart/load.py | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/pykickstart/load.py b/pykickstart/load.py -index f75fe5d3..a8f3ed1d 100644 +index 58faba6..e856c8d 100644 --- a/pykickstart/load.py +++ b/pykickstart/load.py -@@ -21,12 +21,16 @@ import requests +@@ -20,12 +20,16 @@ + import requests from requests.auth import HTTPDigestAuth from requests.auth import HTTPBasicAuth - +import time import shutil @@ -34,10 +33,10 @@ index f75fe5d3..a8f3ed1d 100644 +import logging +log = logging.getLogger("anaconda.main") + - _is_url = lambda location: '://' in location # RFC 3986 + is_url = lambda location: '://' in location # RFC 3986 SSL_VERIFY = False -@@ -72,6 +76,29 @@ def load_to_file(location, destination): +@@ -71,6 +75,29 @@ def load_to_file(location, destination): _copy_file(location, destination) return destination @@ -67,7 +66,7 @@ index f75fe5d3..a8f3ed1d 100644 def _get_auth(location, user=None, passwd=None): auth = None -@@ -93,6 +120,10 @@ def _get_auth(location, user=None, passwd=None): +@@ -92,6 +119,10 @@ def _get_auth(location, user=None, passwd=None): def _load_url(location, user=None, passwd=None): '''Load a location (URL or filename) and return contents as string''' @@ -76,5 +75,8 @@ index f75fe5d3..a8f3ed1d 100644 + raise KickstartError(_("Connection %s failed" % location)) + auth = _get_auth(location, user=user, passwd=passwd) + try: - request = requests.get(location, verify=SSL_VERIFY, auth=auth) +-- +2.34.1 + diff --git a/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.34.bb b/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.48.bb index 6bf9ada581..3c6c478328 100644 --- a/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.34.bb +++ b/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.48.bb @@ -18,7 +18,7 @@ SRC_URI = "git://github.com/rhinstaller/pykickstart.git;protocol=https;branch=ma file://0003-comment-out-sections-shutdown-and-environment-in-gen.patch \ file://0004-load.py-retry-to-invoke-request-with-timeout.patch \ " -SRCREV = "bfd836cfdd8439d984595aca015811ed5c6be733" +SRCREV = "fa6c80c0e5c6bee29d089899a10d26e6f7f8afd8" UPSTREAM_CHECK_GITTAGREGEX = "r(?P<pver>\d+(\.\d+)+(-\d+)*)" diff --git a/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.12.0.bb b/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.12.0.bb index 9dd362766d..7a0d3987d2 100644 --- a/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.12.0.bb +++ b/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.12.0.bb @@ -17,7 +17,10 @@ DEPENDS += "parted" RDEPENDS:${PN}:class-target += " \ parted (>= 2.3) \ - python3-stringold python3-codecs python3-math \ + python3-codecs \ + python3-math \ + python3-numbers \ + python3-stringold \ " RDEPENDS:${PN}:class-native = "" diff --git a/meta-python/recipes-extended/python-rich/python3-rich_13.4.2.bb b/meta-python/recipes-extended/python-rich/python3-rich_13.4.2.bb new file mode 100644 index 0000000000..e7ddf70983 --- /dev/null +++ b/meta-python/recipes-extended/python-rich/python3-rich_13.4.2.bb @@ -0,0 +1,15 @@ +SUMMARY = "Rich is a Python library for rich text and beautiful formatting in the terminal" +DESCRIPTION = "The Rich API makes it easy to add color and style to terminal output. \ +Rich can also render pretty tables, progress bars, markdown, syntax highlighted source code, \ +tracebacks, and more." +HOMEPAGE="https://github.com/Textualize/rich" +SECTION = "devel/python" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=b5f0b94fbc94f5ad9ae4efcf8a778303" + +SRC_URI[sha256sum] = "d653d6bccede5844304c605d5aac802c7cf9621efd700b46c7ec2b51ea914898" + +inherit pypi python_poetry_core + +RDEPENDS:${PN} = "${PYTHON_PN}-pygments" diff --git a/meta-python/recipes-extended/python3-portalocker/python3-portalocker_2.6.0.bb b/meta-python/recipes-extended/python3-portalocker/python3-portalocker_2.7.0.bb index 1762ae3a5e..03c4f2f40e 100644 --- a/meta-python/recipes-extended/python3-portalocker/python3-portalocker_2.6.0.bb +++ b/meta-python/recipes-extended/python3-portalocker/python3-portalocker_2.7.0.bb @@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=152634da660a374ca18c0734ed07c63c" -SRC_URI[sha256sum] = "964f6830fb42a74b5d32bce99ed37d8308c1d7d44ddf18f3dd89f4680de97b39" +SRC_URI[sha256sum] = "032e81d534a88ec1736d03f780ba073f047a06c478b06e2937486f334e955c51" inherit pypi setuptools3 diff --git a/meta-python/recipes-extended/pywbem/python3-pywbem_1.5.0.bb b/meta-python/recipes-extended/pywbem/python3-pywbem_1.6.1.bb index d109fa4601..1ab1bde449 100644 --- a/meta-python/recipes-extended/pywbem/python3-pywbem_1.5.0.bb +++ b/meta-python/recipes-extended/pywbem/python3-pywbem_1.6.1.bb @@ -16,31 +16,33 @@ HOMEPAGE = "http://pywbem.github.io" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbc093901857fcd118f065f900982c24" -SRC_URI[sha256sum] = "c5f7e458c2530c61358fbc6333be74faf366aace78eae33741431267adf32610" +SRC_URI[sha256sum] = "abdbd6ce08b6c597cdd6c7730e6b49a842d913f2f6b3cc62b585c58ec3ee7945" inherit pypi setuptools3 update-alternatives DEPENDS += " \ - ${PYTHON_PN}-ply-native \ - ${PYTHON_PN}-pyyaml-native \ - ${PYTHON_PN}-six-native \ - ${PYTHON_PN}-wheel-native \ + python3-ply-native \ + python3-pyyaml-native \ + python3-six-native \ + python3-wheel-native \ " -RDEPENDS:${PN}:class-target += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-ply \ - ${PYTHON_PN}-pyyaml \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-stringold \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-unixadmin \ - ${PYTHON_PN}-xml \ - ${PYTHON_PN}-nocasedict \ - ${PYTHON_PN}-nocaselist \ - ${PYTHON_PN}-yamlloader \ +RDEPENDS:${PN} += "\ + python3-datetime \ + python3-io \ + python3-logging \ + python3-netclient \ + python3-nocasedict \ + python3-nocaselist \ + python3-ply \ + python3-pyyaml \ + python3-requests \ + python3-six \ + python3-stringold \ + python3-threading \ + python3-unixadmin \ + python3-xml \ + python3-yamlloader \ " ALTERNATIVE:${PN} = "mof_compiler" diff --git a/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_1.1.1.bb b/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_1.2.0.bb index 1d449cb0e9..ab631b256f 100644 --- a/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_1.1.1.bb +++ b/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_1.2.0.bb @@ -4,17 +4,10 @@ HOMEPAGE = "https://pywbemtools.readthedocs.io/en/stable/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa" -SRC_URI[sha256sum] = "aacf4bfffa872bb0e3d0c19ee0630e3c0997d4f13553189b63b297787341735f" +SRC_URI[sha256sum] = "921fb57ea2ae3ae2806e18895bb0457697f27221b345c8b05afa4cb304a7f939" inherit pypi setuptools3 -DEPENDS += " \ - ${PYTHON_PN}-pyyaml-native \ - ${PYTHON_PN}-pywbem-native \ - ${PYTHON_PN}-six-native \ - ${PYTHON_PN}-click-native \ -" - RDEPENDS:${PN}:class-target += "\ ${PYTHON_PN}-ply \ ${PYTHON_PN}-pyyaml \ diff --git a/meta-python/recipes-extended/send2trash/python3-send2trash_1.8.0.bb b/meta-python/recipes-extended/send2trash/python3-send2trash_1.8.2.bb index 963351a2e2..eac89e6297 100644 --- a/meta-python/recipes-extended/send2trash/python3-send2trash_1.8.0.bb +++ b/meta-python/recipes-extended/send2trash/python3-send2trash_1.8.2.bb @@ -2,8 +2,13 @@ SUMMARY = "Send file to trash natively under Mac OS X, Windows and Linux" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=a02659c2d5f4cc626e4dcf6504b865eb" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta -SRC_URI[sha256sum] = "d2c24762fd3759860a0aff155e45871447ea58d2be6bdd39b5c8f966a0c99c2d" +SRC_URI[sha256sum] = "c132d59fa44b9ca2b1699af5c86f57ce9f4c5eb56629d5d55fbb7a35f84e2312" PYPI_PACKAGE = "Send2Trash" + +RDEPENDS:${PN} += "\ + python3-io \ + python3-datetime \ +" diff --git a/meta-python/recipes-networking/python/python3-ldap_3.4.3.bb b/meta-python/recipes-networking/python/python3-ldap_3.4.3.bb index f2c0d2ee13..0bf1ff14a8 100644 --- a/meta-python/recipes-networking/python/python3-ldap_3.4.3.bb +++ b/meta-python/recipes-networking/python/python3-ldap_3.4.3.bb @@ -22,8 +22,9 @@ do_configure:prepend() { } RDEPENDS:${PN} = " \ - ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-pyasn1 \ - ${PYTHON_PN}-pyasn1-modules \ + python3-pprint \ + python3-pyasn1 \ + python3-pyasn1-modules \ + python3-threading \ + python3-unittest \ " diff --git a/meta-webserver/README b/meta-webserver/README.md index d23f6cc65c..d23f6cc65c 100644 --- a/meta-webserver/README +++ b/meta-webserver/README.md diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch b/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch new file mode 100644 index 0000000000..996eabf586 --- /dev/null +++ b/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch @@ -0,0 +1,31 @@ +From 5c9257fa34335ff83f7c01581cf953111072a457 Mon Sep 17 00:00:00 2001 +From: Valeria Petrov <valeria.petrov@spinetix.com> +Date: Tue, 18 Apr 2023 15:38:53 +0200 +Subject: [PATCH] * modules/mappers/config9.m4: Add 'server' directory to + include path if mod_rewrite is enabled. + +Upstream-Status: Accepted [https://svn.apache.org/viewvc?view=revision&revision=1909241] + +--- + modules/mappers/config9.m4 | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/modules/mappers/config9.m4 b/modules/mappers/config9.m4 +index 55a97ab993..7120b729b7 100644 +--- a/modules/mappers/config9.m4 ++++ b/modules/mappers/config9.m4 +@@ -14,6 +14,11 @@ APACHE_MODULE(userdir, mapping of requests to user-specific directories, , , mos + APACHE_MODULE(alias, mapping of requests to different filesystem parts, , , yes) + APACHE_MODULE(rewrite, rule based URL manipulation, , , most) + ++if test "x$enable_rewrite" != "xno"; then ++ # mod_rewrite needs test_char.h ++ APR_ADDTO(INCLUDES, [-I\$(top_builddir)/server]) ++fi ++ + APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current]) + + APACHE_MODPATH_FINISH +-- +2.25.1 + diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.54.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb index 4f30eca59e..00f8aaa415 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.54.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb @@ -16,6 +16,7 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \ file://0008-Fix-perl-install-directory-to-usr-bin.patch \ file://0009-support-apxs.in-force-destdir-to-be-empty-string.patch \ file://0001-make_exports.awk-not-expose-the-path.patch \ + file://0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch \ " SRC_URI:append:class-target = " \ @@ -27,7 +28,7 @@ SRC_URI:append:class-target = " \ " LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3" -SRC_URI[sha256sum] = "eb397feeefccaf254f8d45de3768d9d68e8e73851c49afd5b7176d1ecf80c340" +SRC_URI[sha256sum] = "dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a" S = "${WORKDIR}/httpd-${PV}" diff --git a/meta-webserver/recipes-httpd/apache2/files/apache2-volatile.conf b/meta-webserver/recipes-httpd/apache2/files/apache2-volatile.conf index ff2c587046..0852a8859a 100644 --- a/meta-webserver/recipes-httpd/apache2/files/apache2-volatile.conf +++ b/meta-webserver/recipes-httpd/apache2/files/apache2-volatile.conf @@ -1,2 +1,2 @@ -d /var/run/apache2 0755 root root - +d /run/apache2 0755 root root - d /var/log/apache2 0755 root root - diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee/0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch b/meta-webserver/recipes-httpd/cherokee/cherokee/0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch index f3be7c6e52..b16060f2a1 100644 --- a/meta-webserver/recipes-httpd/cherokee/cherokee/0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch +++ b/meta-webserver/recipes-httpd/cherokee/cherokee/0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch @@ -7,6 +7,7 @@ Fixes errors like | Makefile.am: error: required file './README' not found | Makefile.am: error: required file './ChangeLog' not found +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- configure.ac | 2 +- diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee/0001-make-Do-not-build-po-files.patch b/meta-webserver/recipes-httpd/cherokee/cherokee/0001-make-Do-not-build-po-files.patch index d4c0b6e8c6..1d6a2182bd 100644 --- a/meta-webserver/recipes-httpd/cherokee/cherokee/0001-make-Do-not-build-po-files.patch +++ b/meta-webserver/recipes-httpd/cherokee/cherokee/0001-make-Do-not-build-po-files.patch @@ -5,6 +5,7 @@ Subject: [PATCH] make: Do not build po files Target fails to build +Upstream-Status: Inappropriate [Cross-compile specific] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- Makefile.am | 2 +- diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb b/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb index 7100ef4341..3dc4ca8bbb 100644 --- a/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb +++ b/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb @@ -75,3 +75,5 @@ python() { if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): raise bb.parse.SkipRecipe('Requires meta-python2 to be present.') } + +CVE_PRODUCT += "cherokee_web_server" diff --git a/meta-webserver/recipes-httpd/monkey/files/0001-configure-Respect-LIBS-variable-from-env.patch b/meta-webserver/recipes-httpd/monkey/files/0001-configure-Respect-LIBS-variable-from-env.patch deleted file mode 100644 index 7a229513b6..0000000000 --- a/meta-webserver/recipes-httpd/monkey/files/0001-configure-Respect-LIBS-variable-from-env.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b0526a9b5325bd4758dad8d14efd85c98ef2ebff Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 14 Jul 2017 18:25:23 -0700 -Subject: [PATCH] configure: Respect LIBS variable from env - -For musl we need to pass -lexecinfo from env -this change accomodates that - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index 4286c34..f1c65db 100755 ---- a/configure -+++ b/configure -@@ -620,7 +620,7 @@ LIBDEFS = -DSHAREDLIB -fPIC \$(DEFS) - INCDIR = ./include - LDFLAGS = $LDFLAGS - DESTDIR = ../bin/monkey --LIBS = -ldl $libs -+LIBS = -ldl $libs ${LIBS} - OBJ = monkey.o mk_method.o mk_mimetype.o mk_vhost.o mk_request.o \\ - mk_header.o mk_config.o mk_signals.o \\ - mk_user.o mk_utils.o mk_epoll.o mk_scheduler.o \\ --- -2.13.3 - diff --git a/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb b/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb index d3e22757c4..ee5dc16198 100644 --- a/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb +++ b/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb @@ -39,6 +39,10 @@ inherit cmake pkgconfig update-rc.d systemd OECMAKE_GENERATOR = "Unix Makefiles" +do_configure:append() { + sed -i -e 's|${STAGING_BINDIR_TOOLCHAIN}/||g' ${S}/include/monkey/mk_env.h +} + do_install:append() { rmdir ${D}${localstatedir}/log/${BPN} ${D}${localstatedir}/run ${D}${localstatedir}/log rmdir --ignore-fail-on-non-empty ${D}${localstatedir} diff --git a/meta-webserver/recipes-httpd/nginx/files/CVE-2021-3618.patch b/meta-webserver/recipes-httpd/nginx/files/CVE-2021-3618.patch deleted file mode 100644 index be42a1ed5e..0000000000 --- a/meta-webserver/recipes-httpd/nginx/files/CVE-2021-3618.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 6dafcdebde58577f4fcb190be46a0eb910cf1b96 Mon Sep 17 00:00:00 2001 -From: Maxim Dounin <mdounin@mdounin.ru> -Date: Wed, 19 May 2021 03:13:31 +0300 -Subject: [PATCH 1/1] Mail: max_errors directive. - -Similarly to smtpd_hard_error_limit in Postfix and smtp_max_unknown_commands -in Exim, specifies the number of errors after which the connection is closed. ---- end of original header --- - -CVE: CVE-2021-3618 - -Upstream-Status: Backport - https://github.com/nginx/nginx.git - commit 173f16f736c10eae46cd15dd861b04b82d91a37a - -Signed-off-by: Joe Slater <joe.slater@windriver.com> ---- - src/mail/ngx_mail.h | 3 +++ - src/mail/ngx_mail_core_module.c | 10 ++++++++++ - src/mail/ngx_mail_handler.c | 15 ++++++++++++++- - 3 files changed, 27 insertions(+), 1 deletion(-) - -diff --git a/src/mail/ngx_mail.h b/src/mail/ngx_mail.h -index b865a3b9..76cae37a 100644 ---- a/src/mail/ngx_mail.h -+++ b/src/mail/ngx_mail.h -@@ -115,6 +115,8 @@ typedef struct { - ngx_msec_t timeout; - ngx_msec_t resolver_timeout; - -+ ngx_uint_t max_errors; -+ - ngx_str_t server_name; - - u_char *file_name; -@@ -231,6 +233,7 @@ typedef struct { - ngx_uint_t command; - ngx_array_t args; - -+ ngx_uint_t errors; - ngx_uint_t login_attempt; - - /* used to parse POP3/IMAP/SMTP command */ -diff --git a/src/mail/ngx_mail_core_module.c b/src/mail/ngx_mail_core_module.c -index 40831242..115671ca 100644 ---- a/src/mail/ngx_mail_core_module.c -+++ b/src/mail/ngx_mail_core_module.c -@@ -85,6 +85,13 @@ static ngx_command_t ngx_mail_core_commands[] = { - offsetof(ngx_mail_core_srv_conf_t, resolver_timeout), - NULL }, - -+ { ngx_string("max_errors"), -+ NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1, -+ ngx_conf_set_num_slot, -+ NGX_MAIL_SRV_CONF_OFFSET, -+ offsetof(ngx_mail_core_srv_conf_t, max_errors), -+ NULL }, -+ - ngx_null_command - }; - -@@ -163,6 +170,8 @@ ngx_mail_core_create_srv_conf(ngx_conf_t *cf) - cscf->timeout = NGX_CONF_UNSET_MSEC; - cscf->resolver_timeout = NGX_CONF_UNSET_MSEC; - -+ cscf->max_errors = NGX_CONF_UNSET_UINT; -+ - cscf->resolver = NGX_CONF_UNSET_PTR; - - cscf->file_name = cf->conf_file->file.name.data; -@@ -182,6 +191,7 @@ ngx_mail_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) - ngx_conf_merge_msec_value(conf->resolver_timeout, prev->resolver_timeout, - 30000); - -+ ngx_conf_merge_uint_value(conf->max_errors, prev->max_errors, 5); - - ngx_conf_merge_str_value(conf->server_name, prev->server_name, ""); - -diff --git a/src/mail/ngx_mail_handler.c b/src/mail/ngx_mail_handler.c -index 0aaa0e78..71b81512 100644 ---- a/src/mail/ngx_mail_handler.c -+++ b/src/mail/ngx_mail_handler.c -@@ -871,7 +871,20 @@ ngx_mail_read_command(ngx_mail_session_t *s, ngx_connection_t *c) - return NGX_MAIL_PARSE_INVALID_COMMAND; - } - -- if (rc == NGX_IMAP_NEXT || rc == NGX_MAIL_PARSE_INVALID_COMMAND) { -+ if (rc == NGX_MAIL_PARSE_INVALID_COMMAND) { -+ -+ s->errors++; -+ -+ if (s->errors >= cscf->max_errors) { -+ ngx_log_error(NGX_LOG_INFO, c->log, 0, -+ "client sent too many invalid commands"); -+ s->quit = 1; -+ } -+ -+ return rc; -+ } -+ -+ if (rc == NGX_IMAP_NEXT) { - return rc; - } - --- -2.25.1 - diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc index 260f5f320c..1ea32f7c94 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -44,6 +44,8 @@ PACKAGECONFIG[http2] = "--with-http_v2_module,," PACKAGECONFIG[ssl] = "--with-http_ssl_module,,openssl" PACKAGECONFIG[http-auth-request] = "--with-http_auth_request_module,," PACKAGECONFIG[ipv6] = "--with-ipv6,," +PACKAGECONFIG[webdav] = "--with-http_dav_module,," +PACKAGECONFIG[stream] = "--with-stream,," do_configure () { if [ "${SITEINFO_BITS}" = "64" ]; then @@ -147,7 +149,7 @@ do_install () { pkg_postinst:${PN} () { if [ -z "$D" ]; then - if type systemd-tmpfiles >/dev/null; then + if type systemd-tmpfiles >/dev/null 2>&1; then systemd-tmpfiles --create elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then ${sysconfdir}/init.d/populate-volatile.sh update diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.20.1.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.20.1.bb deleted file mode 100644 index d686c627f2..0000000000 --- a/meta-webserver/recipes-httpd/nginx/nginx_1.20.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -require nginx.inc - -SRC_URI += "file://CVE-2021-3618.patch" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=206629dc7c7b3e87acb31162363ae505" - -SRC_URI[md5sum] = "8ca6edd5076bdfad30a69c9c9b41cc68" -SRC_URI[sha256sum] = "e462e11533d5c30baa05df7652160ff5979591d291736cfa5edb9fd2edb48c49" - diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.25.1.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.25.1.bb new file mode 100644 index 0000000000..702eac39e2 --- /dev/null +++ b/meta-webserver/recipes-httpd/nginx/nginx_1.25.1.bb @@ -0,0 +1,6 @@ +require nginx.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=79ad2eb837299421c4435dedc8897b3d" + +SRC_URI[sha256sum] = "f09071ac46e0ea3adc0008ef0baca229fc6b4be4533baef9bbbfba7de29a8602" + diff --git a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.2.0.bb b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.2.1.bb index 45de455643..34b710e885 100644 --- a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.2.0.bb +++ b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.2.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.phpmyadmin.net" # Main code is GPLv2, vendor/tecnickcom/tcpdf is under LGPLv3, js/jquery is under MIT LICENSE = "GPL-2.0-only & LGPL-3.0-only & MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://vendor/tecnickcom/tcpdf/LICENSE.TXT;md5=dd6470bbcd3436ca317f82d34abaf688 \ + file://vendor/tecnickcom/tcpdf/LICENSE.TXT;md5=d0ff7e060074497f34481cf574e8a581 \ file://js/vendor/jquery/MIT-LICENSE.txt;md5=de877aa6d744cc160ff41c26a8e4811f \ " @@ -11,7 +11,7 @@ SRC_URI = "https://files.phpmyadmin.net/phpMyAdmin/${PV}/phpMyAdmin-${PV}-all-la file://apache.conf \ " -SRC_URI[sha256sum] = "66da31ca295f06182ac3f2e6e96057dc824c459baedf4b29de6ed0d3be039230" +SRC_URI[sha256sum] = "373f9599dfbd96d6fe75316d5dad189e68c305f297edf42377db9dd6b41b2557" UPSTREAM_CHECK_URI = "https://www.phpmyadmin.net/downloads/" UPSTREAM_CHECK_REGEX = "phpMyAdmin-(?P<pver>\d+(\.\d+)+)-all-languages.tar.xz" diff --git a/meta-webserver/recipes-php/xdebug/xdebug_3.1.1.bb b/meta-webserver/recipes-php/xdebug/xdebug_3.2.0.bb index 580ae7e89a..fe6fc5bf9a 100644 --- a/meta-webserver/recipes-php/xdebug/xdebug_3.1.1.bb +++ b/meta-webserver/recipes-php/xdebug/xdebug_3.2.0.bb @@ -6,7 +6,7 @@ DEPENDS = "php re2c-native" SRC_URI = "http://xdebug.org/files/xdebug-${PV}.tgz" -SRC_URI[sha256sum] = "9be3ae0fdb4dc4a4c68084626cddc56f12396487e309a8c8dd318f0f900d1a68" +SRC_URI[sha256sum] = "7769b20eecdadf5fbe9f582512c10b394fb575b6f7a8c3a3a82db6883e0032b7" UPSTREAM_CHECK_REGEX = "xdebug-(?P<pver>\d+(\.\d+)+)\.tgz" diff --git a/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi-1.6.4/fix_configure_ipv6_test.patch b/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi-1.6.4/fix_configure_ipv6_test.patch deleted file mode 100644 index 9409dd2b15..0000000000 --- a/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi-1.6.4/fix_configure_ipv6_test.patch +++ /dev/null @@ -1,35 +0,0 @@ -Testing for IPv6 support got broken by configure.ac changes in 1.6.4 -As a temp workaround, revert back to the 1.6.3 version. - -Upstream-Status: Pending - ---- spawn-fcgi-1.6.4/configure.ac -+++ spawn-fcgi-1.6.3/configure.ac -@@ -66,8 +47,8 @@ - # Check for IPv6 support - - AC_ARG_ENABLE(ipv6, -- AC_HELP_STRING([--disable-ipv6],[disable IPv6 support]), -- [case "${enableval}" in -+ AC_HELP_STRING([--disable-ipv6],[disable IPv6 support]), -+ [case "${enableval}" in - yes) ipv6=true ;; - no) ipv6=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-ipv6) ;; -@@ -75,13 +56,10 @@ - - if test x$ipv6 = xtrue; then - AC_CACHE_CHECK([for IPv6 support], ac_cv_ipv6_support, -- [AC_TRY_LINK([[ --#include <sys/types.h> -+ [AC_TRY_LINK([ #include <sys/types.h> - #include <sys/socket.h> --#include <netinet/in.h> -- ]], [[ --struct sockaddr_in6 s; struct in6_addr t=in6addr_any; int i=AF_INET6; s; t.s6_addr[0] = 0; -- ]], [ac_cv_ipv6_support=yes], [ac_cv_ipv6_support=no])]) -+#include <netinet/in.h>], [struct sockaddr_in6 s; struct in6_addr t=in6addr_any; int i=AF_INET6; s; t.s6_addr[0] = 0; ], -+ [ac_cv_ipv6_support=yes], [ac_cv_ipv6_support=no])]) - - if test "$ac_cv_ipv6_support" = yes; then - AC_DEFINE(HAVE_IPV6,1,[Whether to enable IPv6 support]) diff --git a/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi_1.6.4.bb b/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi_1.6.5.bb index 808d4528c1..307919f775 100644 --- a/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi_1.6.4.bb +++ b/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi_1.6.5.bb @@ -4,11 +4,9 @@ HOMEPAGE = "http://redmine.lighttpd.net/projects/spawn-fcgi" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579" -SRC_URI = "http://download.lighttpd.net/spawn-fcgi/releases-1.6.x/spawn-fcgi-${PV}.tar.gz \ - file://fix_configure_ipv6_test.patch" +SRC_URI = "http://download.lighttpd.net/spawn-fcgi/releases-1.6.x/spawn-fcgi-${PV}.tar.gz" -SRC_URI[md5sum] = "e970de4efe8045c01dd76280f39901aa" -SRC_URI[sha256sum] = "ab327462cb99894a3699f874425a421d934f957cb24221f00bb888108d9dd09e" +SRC_URI[sha256sum] = "a72d7bf7fb6d1a0acda89c93d4f060bf77a2dba97ddcfecd00f11e708f592c40" inherit autotools diff --git a/meta-webserver/recipes-webadmin/cockpit/cockpit_276.bb b/meta-webserver/recipes-webadmin/cockpit/cockpit_289.bb index 93198e3569..2f920b417f 100644 --- a/meta-webserver/recipes-webadmin/cockpit/cockpit_276.bb +++ b/meta-webserver/recipes-webadmin/cockpit/cockpit_289.bb @@ -6,12 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI += " \ https://github.com/cockpit-project/cockpit/releases/download/${PV}/cockpit-${PV}.tar.xz \ - file://0001-remove-tests-dep-on-gobject-intro.patch \ - file://0002-fix-makefile-use-copy-rule-for-unmodified-files.patch \ file://0001-Warn-not-error-if-xsltproc-is-not-found.patch \ file://cockpit.pam \ " -SRC_URI[sha256sum] = "dde91a157ee8514112334653fa2775a99d71bd1b604067a48eaf7411114d19de" +SRC_URI[sha256sum] = "3f8e369b21dbe9f5e05ac6ffd8c7a58ad5759065bea29b3b14c937a17f030eb5" inherit gettext pkgconfig autotools systemd features_check @@ -92,7 +90,10 @@ FILES:${PN}-storaged = " \ ${datadir}/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml \ " -FILES:${PN}-networkmanager = "${datadir}/cockpit/networkmanager" +FILES:${PN}-networkmanager = " \ + ${datadir}/cockpit/networkmanager \ + ${datadir}/metainfo/org.cockpit-project.cockpit-networkmanager.metainfo.xml \ +" RDEPENDS:${PN}-networkmanager = "networkmanager" FILES:${PN}-machines = " \ @@ -130,6 +131,8 @@ FILES:${PN}-ws = " \ ${systemd_system_unitdir}/cockpit.service \ ${systemd_system_unitdir}/cockpit-motd.service \ ${systemd_system_unitdir}/cockpit.socket \ + ${systemd_system_unitdir}/cockpit-session.socket \ + ${systemd_system_unitdir}/cockpit-session@.service \ ${systemd_system_unitdir}/cockpit-wsinstance-http.socket \ ${systemd_system_unitdir}/cockpit-wsinstance-http.service \ ${systemd_system_unitdir}/cockpit-wsinstance-http-redirect.socket \ diff --git a/meta-webserver/recipes-webadmin/cockpit/files/0001-Warn-not-error-if-xsltproc-is-not-found.patch b/meta-webserver/recipes-webadmin/cockpit/files/0001-Warn-not-error-if-xsltproc-is-not-found.patch index b3b0988b12..db583cfd29 100644 --- a/meta-webserver/recipes-webadmin/cockpit/files/0001-Warn-not-error-if-xsltproc-is-not-found.patch +++ b/meta-webserver/recipes-webadmin/cockpit/files/0001-Warn-not-error-if-xsltproc-is-not-found.patch @@ -1,27 +1,25 @@ -From 588bb5cb248aaeaf0fea33084229c99ad1574291 Mon Sep 17 00:00:00 2001 +From 7c1f95995ce9180221bac03b7b1e1696b8a79de7 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 7 Sep 2022 11:12:28 -0700 Subject: [PATCH] Warn not error if xsltproc is not found Upstream-Status: Inappropriate [oe-core specific] 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 7659f41..537203e 100644 +index 6896c19..2a1fb52 100644 --- a/configure.ac +++ b/configure.ac -@@ -177,7 +177,7 @@ AC_SUBST([systemdunitdir], [$systemdunitdir]) +@@ -182,7 +182,7 @@ AC_SUBST([systemdunitdir], [$systemdunitdir]) # package as xgettext, and we find them by PATH, so just check for the one. - AC_PATH_PROG([XGETTEXT], [xsltproc], [no]) + AC_PATH_PROG([XGETTEXT], [xgettext], [no]) if test "$XGETTEXT" = "no"; then - AC_MSG_ERROR([Please install gettext tools]) + AC_MSG_WARN([Please install gettext tools]) fi # ssh-add --- -2.37.3 - diff --git a/meta-webserver/recipes-webadmin/cockpit/files/0001-remove-tests-dep-on-gobject-intro.patch b/meta-webserver/recipes-webadmin/cockpit/files/0001-remove-tests-dep-on-gobject-intro.patch deleted file mode 100644 index 8f70fe9434..0000000000 --- a/meta-webserver/recipes-webadmin/cockpit/files/0001-remove-tests-dep-on-gobject-intro.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 788aace494f79e8201b18ebcdf1592b5030c5295 Mon Sep 17 00:00:00 2001 -From: Adrian Freihofer <adrian.freihofer@siemens.com> -Date: Wed, 4 Dec 2019 17:23:46 +0100 -Subject: [PATCH] remove tests dep on gobject-intro - ---- - src/ws/Makefile-ws.am | 54 --------------------------------------------------- - 1 file changed, 54 deletions(-) - ---- a/src/ws/Makefile-ws.am -+++ b/src/ws/Makefile-ws.am -@@ -58,46 +58,6 @@ pam_cockpit_cert_so_LDFLAGS = -shared - pam_cockpit_cert_so_SOURCES = src/ws/pam_cockpit_cert.c - - # ----------------------------------------------------------------------------- --# test-server: server for running the html/browser unit tests against -- --check_PROGRAMS += test-server -- --test_server_CPPFLAGS = $(libcockpit_ws_a_CPPFLAGS) $(TEST_CPP) --test_server_LDADD = $(libcockpit_ws_a_LIBS) $(TEST_LIBS) -- --test_server_SOURCES = \ -- src/ws/mock-service.c \ -- src/ws/mock-service.h \ -- src/ws/test-server.c \ -- $(NULL) -- --test_server_CPPFLAGS += -I$(top_builddir)/src/ws --nodist_test_server_SOURCES = $(GDBUS_CODEGEN_GENERATED) -- --BUILT_SOURCES += $(GDBUS_CODEGEN_GENERATED) --CLEANFILES += $(GDBUS_CODEGEN_GENERATED) --GDBUS_CODEGEN_GENERATED = \ -- src/ws/mock-dbus-tests.h \ -- src/ws/mock-dbus-tests.c \ -- $(NULL) -- --EXTRA_DIST += $(GDBUS_CODEGEN_XML) --GDBUS_CODEGEN_XML = $(srcdir)/src/ws/com.redhat.Cockpit.DBusTests.xml -- --GDBUS_CODEGEN_INVOCATION = \ -- $(AM_V_GEN) gdbus-codegen \ -- --interface-prefix com.redhat.Cockpit.DBusTests \ -- --c-namespace Test \ -- --c-generate-object-manager \ -- $(NULL) -- --src/ws/mock-dbus-tests.h: $(GDBUS_CODEGEN_XML) -- $(GDBUS_CODEGEN_INVOCATION) --header --output $@ $< -- --src/ws/mock-dbus-tests.c: $(GDBUS_CODEGEN_XML) -- $(GDBUS_CODEGEN_INVOCATION) --body --output $@ $< -- --# ----------------------------------------------------------------------------- - # Unit tests - - check_SCRIPTS += src/ws/mock-cat-with-init diff --git a/meta-webserver/recipes-webadmin/cockpit/files/0002-fix-makefile-use-copy-rule-for-unmodified-files.patch b/meta-webserver/recipes-webadmin/cockpit/files/0002-fix-makefile-use-copy-rule-for-unmodified-files.patch deleted file mode 100644 index 48702c3d1e..0000000000 --- a/meta-webserver/recipes-webadmin/cockpit/files/0002-fix-makefile-use-copy-rule-for-unmodified-files.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 1edf0756bf4fd002f5b60cf2b86d4b97a00aff20 Mon Sep 17 00:00:00 2001 -From: Michael Haener <michael.haener@siemens.com> -Date: Wed, 25 Mar 2020 08:32:07 +0100 -Subject: [PATCH] fix(makefile): use copy rule for unmodified files - ---- - pkg/Makefile.am | 27 +++++++++++++++++++++++++++ - 1 file changed, 27 insertions(+) - ---- a/pkg/Makefile.am -+++ b/pkg/Makefile.am -@@ -7,6 +7,33 @@ TESTS += $(pkg_TESTS) - %.metainfo.xml: %.metainfo.xml.in - $(AM_V_GEN) mkdir -p $(dir $@) && msgfmt --xml -d $(top_srcdir)/po --template $< --output $@ - -+dist/playground/hammer.gif: pkg/playground/hammer.gif -+ $(COPY_RULE) -+ -+dist/sosreport/sosreport.png: pkg/sosreport/sosreport.png -+ $(COPY_RULE) -+ -+dist/apps/default.png: pkg/apps/default.png -+ $(COPY_RULE) -+ -+dist/storaged/images/storage-array.png: pkg/storaged/images/storage-array.png -+ $(COPY_RULE) -+ -+dist/storaged/images/storage-disk.png: pkg/storaged/images/storage-disk.png -+ $(COPY_RULE) -+ -+dist/shell/images/server-error.png: pkg/shell/images/server-error.png -+ $(COPY_RULE) -+ -+dist/shell/images/server-large.png: pkg/shell/images/server-large.png -+ $(COPY_RULE) -+ -+dist/shell/images/server-small.png: pkg/shell/images/server-small.png -+ $(COPY_RULE) -+ -+dist/shell/index.html: pkg/shell/index.html -+ $(COPY_RULE) -+ - metainfodir = ${datarootdir}/metainfo - nodist_metainfo_DATA = \ - pkg/sosreport/org.cockpit-project.cockpit-sosreport.metainfo.xml \ diff --git a/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch b/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch index 4212917f6e..489318b4bd 100644 --- a/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch +++ b/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch @@ -1,11 +1,11 @@ -# Hack in support for an "exclude" config option for the init module, so -# we can hide certain system services that shouldn't really be configurable -# via the web interface -# -# Upstream-status: Pending -# -# Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> -# Signed-off-by: Jackie Huang <jackie.huang@windriver.com> +Hack in support for an "exclude" config option for the init module, so +we can hide certain system services that shouldn't really be configurable +via the web interface + +Upstream-Status: Pending + +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> --- init/index.cgi | 27 ++++++++++++++------------- init/init-lib.pl | 5 +++-- diff --git a/meta-webserver/recipes-webadmin/webmin/files/media-tomb.patch b/meta-webserver/recipes-webadmin/webmin/files/media-tomb.patch index 46f3109796..dfc962bfb7 100644 --- a/meta-webserver/recipes-webadmin/webmin/files/media-tomb.patch +++ b/meta-webserver/recipes-webadmin/webmin/files/media-tomb.patch @@ -1,3 +1,7 @@ +add mediatomb support + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> diff -Nru webmin-1.570.bak/mediatomb/index.cgi webmin-1.570/mediatomb/index.cgi --- webmin-1.570.bak/mediatomb/index.cgi 1969-12-31 16:00:00.000000000 -0800 +++ webmin-1.570/mediatomb/index.cgi 2011-10-26 10:00:05.992522036 -0700 diff --git a/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch b/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch index 5549392851..6ae3dced72 100644 --- a/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch +++ b/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch @@ -1,8 +1,8 @@ -# Add support for configuring network interfaces on a generic linux system -# -# Upstream-status: Not appropriate [config] -# -# Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> +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 diff --git a/meta-webserver/recipes-webadmin/webmin/files/remove-startup-option.patch b/meta-webserver/recipes-webadmin/webmin/files/remove-startup-option.patch index d957f4a3bc..358e53ab8c 100644 --- a/meta-webserver/recipes-webadmin/webmin/files/remove-startup-option.patch +++ b/meta-webserver/recipes-webadmin/webmin/files/remove-startup-option.patch @@ -1,9 +1,9 @@ -# Remove "start on boot" option from webmin configuration, as -# end-users should not need to configure this from the web interface -# -# Upstream-status: Inappropriate -# -# Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> +Remove "start on boot" option from webmin configuration, as +end-users should not need to configure this from the web interface + +Upstream-Status: Inappropriate [OE-specific] + +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- webmin-1.570.orig/webmin/index.cgi +++ webmin-1.570/webmin/index.cgi @@ -79,20 +79,6 @@ print &ui_buttons_start(); diff --git a/meta-xfce/README b/meta-xfce/README.md index 3d6158628f..3d6158628f 100644 --- a/meta-xfce/README +++ b/meta-xfce/README.md diff --git a/meta-xfce/recipes-apps/catfish/catfish_4.16.3.bb b/meta-xfce/recipes-apps/catfish/catfish_4.16.3.bb index 8fe879b816..249c8e1bd8 100644 --- a/meta-xfce/recipes-apps/catfish/catfish_4.16.3.bb +++ b/meta-xfce/recipes-apps/catfish/catfish_4.16.3.bb @@ -3,7 +3,9 @@ SECTION = "x11/application" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" -inherit xfce-app python_setuptools_build_meta gtk-icon-cache mime-xdg +inherit xfce-app python_setuptools_build_meta gtk-icon-cache mime-xdg features_check + +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" DEPENDS += "python3-distutils-extra-native" diff --git a/meta-xfce/recipes-apps/menulibre/menulibre_2.2.3.bb b/meta-xfce/recipes-apps/menulibre/menulibre_2.2.3.bb index 65aa7a53e2..609caf3461 100644 --- a/meta-xfce/recipes-apps/menulibre/menulibre_2.2.3.bb +++ b/meta-xfce/recipes-apps/menulibre/menulibre_2.2.3.bb @@ -10,7 +10,7 @@ DEPENDS = " \ " inherit setuptools3_legacy gtk-icon-cache features_check -REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES = "x11 gobject-introspection-data" SRC_URI = "git://github.com/bluesabre/menulibre.git;protocol=https;branch=master" SRCREV = "86ee9ad7568128fe9555e54799933b2d3762331a" diff --git a/meta-xfce/recipes-apps/ristretto/ristretto_0.12.2.bb b/meta-xfce/recipes-apps/ristretto/ristretto_0.13.1.bb index 66836422ed..4aac89fe79 100644 --- a/meta-xfce/recipes-apps/ristretto/ristretto_0.12.2.bb +++ b/meta-xfce/recipes-apps/ristretto/ristretto_0.13.1.bb @@ -10,6 +10,6 @@ inherit xfce-app mime-xdg RRECOMMENDS:${PN} += "tumbler" -SRC_URI[sha256sum] = "0eee869922ec00a253dafa446c2aad2a2f98e07e1db7262e8337ce9ec2dad969" +SRC_URI[sha256sum] = "d71affbf15245067124725b153c908a53208c4ca1ba2d4df1ec5a1308d53791e" FILES:${PN} += "${datadir}/metainfo" diff --git a/meta-xfce/recipes-apps/xfce4-notifyd/files/xfce4-notifyd-get-var-abs-path.patch b/meta-xfce/recipes-apps/xfce4-notifyd/files/xfce4-notifyd-get-var-abs-path.patch new file mode 100644 index 0000000000..719267fd16 --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-notifyd/files/xfce4-notifyd-get-var-abs-path.patch @@ -0,0 +1,41 @@ +Native pkg_config only return basename of the variable queried. Invoke `which` +to get the absolute path. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0f49e2b..a589147 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -116,7 +116,7 @@ AC_MSG_CHECKING([for gdbus-codegen]) + if test x"$GDBUS_CODEGEN" = x""; then + GDBUS_CODEGEN=`$PKG_CONFIG --variable=gdbus_codegen gio-2.0` + fi +-if test -x "$GDBUS_CODEGEN"; then ++if test -x "$(which $GDBUS_CODEGEN)"; then + AC_MSG_RESULT([$GDBUS_CODEGEN]) + else + AC_MSG_ERROR([could not find gdbus-codegen in \$PATH. You can run +@@ -129,7 +129,7 @@ AC_MSG_CHECKING([for glib-compile-resources]) + if test x"$GLIB_COMPILE_RESOURCES" = x""; then + GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` + fi +-if test -x "$GLIB_COMPILE_RESOURCES"; then ++if test -x "$(which $GLIB_COMPILE_RESOURCES)"; then + AC_MSG_RESULT([$GLIB_COMPILE_RESOURCES]) + else + AC_MSG_ERROR([could not find glib-compile-resources in \$PATH. You can run +@@ -142,7 +142,7 @@ AC_MSG_CHECKING([for glib-genmarshal]) + if test x"$GLIB_GENMARSHAL" = x""; then + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` + fi +-if test -x "$GLIB_GENMARSHAL"; then ++if test -x "$(which $GLIB_GENMARSHAL)"; then + AC_MSG_RESULT([$GLIB_GENMARSHAL]) + else + AC_MSG_ERROR([could not find glib-genmarshal in \$PATH. You can run diff --git a/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.3.bb b/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.8.2.bb index 6086608110..7dbd90c188 100644 --- a/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.3.bb +++ b/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.8.2.bb @@ -1,10 +1,10 @@ SUMMARY = "Easily themable notification daemon with transparency effects" -HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-notifyd" +HOMEPAGE = "https://docs.xfce.org/apps/notifyd/start" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + DEPENDS = " \ - dbus \ - dbus-glib \ + glib-2.0-native \ libnotify \ libxfce4util \ libxfce4ui \ @@ -14,7 +14,9 @@ DEPENDS = " \ inherit xfce-app -SRC_URI[sha256sum] = "56a9f895aed460042f2abe09bb1a899e29b7c7d5a76ecac63dead3ced990859f" +SRC_URI:append = " file://xfce4-notifyd-get-var-abs-path.patch" + +SRC_URI[sha256sum] = "e3a28adb08daa1411135142a0d421e4d6050c4035a4e513a673a59460ff2ae84" # Avoid trouble with other desktops e.g KDE which also ships dbus service named # org.freedesktop.Notifications diff --git a/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.13.bb b/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.13.bb index ab1b827266..feb9121609 100644 --- a/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.13.bb +++ b/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.13.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" inherit python3native gettext gtk-icon-cache features_check -REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES = "x11 gobject-introspection-data" DEPENDS += "intltool-native" diff --git a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-cross-compile.patch b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-cross-compile.patch index f726064e21..eabcaaae69 100644 --- a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-cross-compile.patch +++ b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-cross-compile.patch @@ -6,11 +6,15 @@ Upstream-Status: Inappropriate [cross compile specific] Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + configure.ac | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + diff --git a/configure.ac b/configure.ac -index f0ec537..05c393d 100644 +index 6f149bb..3890677 100644 --- a/configure.ac +++ b/configure.ac -@@ -230,9 +230,9 @@ dnl --------------------------------------------------------------------------- +@@ -237,9 +237,9 @@ dnl --------------------------------------------------------------------------- # AC_DEFUN([AC_CHECK_X_HEADER], [ ac_save_CPPFLAGS="$CPPFLAGS" @@ -23,7 +27,7 @@ index f0ec537..05c393d 100644 CPPFLAGS="$CPPFLAGS $X_CFLAGS" AC_CHECK_HEADER([$1],[$2],[$3],[$4]) CPPFLAGS="$ac_save_CPPFLAGS"]) -@@ -241,9 +241,9 @@ AC_DEFUN([AC_CHECK_X_HEADER], [ +@@ -248,9 +248,9 @@ AC_DEFUN([AC_CHECK_X_HEADER], [ # AC_DEFUN([AC_TRY_X_COMPILE], [ ac_save_CPPFLAGS="$CPPFLAGS" @@ -34,9 +38,9 @@ index f0ec537..05c393d 100644 +# CPPFLAGS="$CPPFLAGS -I$includedir" +# fi CPPFLAGS="$CPPFLAGS $X_CFLAGS" - AC_TRY_COMPILE([$1], [$2], [$3], [$4]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$1]], [[$2]])], [$3], [$4]) CPPFLAGS="$ac_save_CPPFLAGS"]) -@@ -257,15 +257,15 @@ AC_DEFUN([AC_CHECK_X_LIB], [ +@@ -264,15 +264,15 @@ AC_DEFUN([AC_CHECK_X_LIB], [ ac_save_LDFLAGS="$LDFLAGS" # ac_save_LIBS="$LIBS" diff --git a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.16.0.bb b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.18.1.bb index 685c4c1f65..2c5cba0d8f 100644 --- a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.16.0.bb +++ b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.18.1.bb @@ -13,7 +13,7 @@ DEPENDS = "dbus-glib garcon gtk+3 libxklavier libxscrnsaver virtual/libx11 xfcon inherit xfce-app SRC_URI:append = " file://fix-cross-compile.patch" -SRC_URI[sha256sum] = "6d4d143e3e62db679ce83ce7da97903390773ee0a8ceb05ff4c3dac36616268d" +SRC_URI[sha256sum] = "b731e8abd68a18cc5d3b523351aa8f9f293c9f63290c1781c9155259deb04a5c" do_install:append() { install -D -m 0644 ${S}/data/xfce4-screensaver.common-auth ${D}${sysconfdir}/pam.d/xfce4-screensaver diff --git a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.10.bb b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.10.3.bb index bb44ec7829..10427dab32 100644 --- a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.10.bb +++ b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.10.3.bb @@ -1,13 +1,13 @@ SUMMARY = "Application to take screenshots" -HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-screenshooter" +HOMEPAGE = "https://docs.xfce.org/apps/xfce4-screenshooter/start" SECTION = "x11/application" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+3 glib-2.0 libsoup-2.4 exo libxfixes xext virtual/libx11 libxml-parser-perl-native" inherit xfce-app perlnative -SRC_URI[sha256sum] = "04b4178527f5b98cfe76ae427e95581067edf262a530639d332f6db9a68292d7" +SRC_URI[sha256sum] = "a454159847becfeca274a5b58c0e5817d4a260a29345a37bbc3b4ff46f8f3818" do_compile:prepend() { mkdir -p lib diff --git a/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.5.2.bb b/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.5.2.bb deleted file mode 100644 index a3d10cd256..0000000000 --- a/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.5.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "Easy to use task manager" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -inherit xfce-app - -DEPENDS += "gtk+3 cairo libwnck libxfce4ui libxmu xfce4-dev-tools-native" - -SRC_URI[sha256sum] = "bd25143f47a29000b4148874863dffa521b1a37cb01dbc026f423ea3160f9a35" diff --git a/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.5.5.bb b/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.5.5.bb new file mode 100644 index 0000000000..802d6af4a4 --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.5.5.bb @@ -0,0 +1,9 @@ +SUMMARY = "Easy to use task manager" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +inherit xfce-app + +DEPENDS += "gtk+3 cairo libwnck libxfce4ui libxmu xfce4-dev-tools-native" + +SRC_URI[sha256sum] = "f64f01ba241a0b8bbf2ed3274e5decc2313c9f8b0e4d160db3ba69b331558ae5" diff --git a/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.0.0.bb b/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.0.4.bb index 85b0812ed5..edb0c614ec 100644 --- a/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.0.0.bb +++ b/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.0.4.bb @@ -10,6 +10,6 @@ FILES:${PN} += " \ ${datadir}/gnome-control-center \ " -SRC_URI[sha256sum] = "593b6a7bd9b18851e51854e075990109b7896a22713b5dd8b913b23f21db6576" +SRC_URI[sha256sum] = "78e55957af7c6fc1f283e90be33988661593a4da98383da1b0b54fdf6554baf4" RRECOMMENDS:${PN} += "vte-prompt" diff --git a/meta-xfce/recipes-extended/imsettings/imsettings_1.8.3.bb b/meta-xfce/recipes-extended/imsettings/imsettings_1.8.3.bb index cdf4557cd3..21e9b3908f 100644 --- a/meta-xfce/recipes-extended/imsettings/imsettings_1.8.3.bb +++ b/meta-xfce/recipes-extended/imsettings/imsettings_1.8.3.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" inherit autotools gtk-doc gobject-introspection gettext features_check -DEPENDS = "gtk+3 libnotify" +DEPENDS = "autoconf-archive-native gtk+3 libnotify" REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin/0001-check-for-fstab.h-during-configure.patch b/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin/0001-check-for-fstab.h-during-configure.patch index d81f702891..64f06cebb5 100644 --- a/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin/0001-check-for-fstab.h-during-configure.patch +++ b/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin/0001-check-for-fstab.h-during-configure.patch @@ -9,6 +9,7 @@ plugin Makes it compile/build with musl +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> Patch Reworked for xfce4-mount-plugin 0.6.4->1.1.2 diff --git a/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.4.bb b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.4.bb index 69996d2a3f..eb1165c578 100644 --- a/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.4.bb +++ b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.4.bb @@ -13,6 +13,8 @@ EXTRA_OECONF = " \ --disable-xnvctrl \ " +LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -fuse-ld=bfd', '', d)}" + do_configure:prepend() { sed -i 's:LIBSENSORS_CFLAGS=.*:LIBSENSORS_CFLAGS=-I${STAGING_INCDIR}:g' ${S}/configure.ac } diff --git a/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.7.1.bb b/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.7.1.bb index 6621099cbd..3dfc76f246 100644 --- a/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.7.1.bb +++ b/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.7.1.bb @@ -6,5 +6,3 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin cmake SRC_URI[sha256sum] = "04ae0c1764a0d5ec70f18a760d998a2109bb6724f048554d7d6999d9072ca63e" - -RRECOMMENDS:${PN} += "menulibre" diff --git a/meta-xfce/recipes-thunar-plugins/archive/thunar-archive-plugin_0.5.0.bb b/meta-xfce/recipes-thunar-plugins/archive/thunar-archive-plugin_0.5.1.bb index c2c4b9fa57..044a39a3c0 100644 --- a/meta-xfce/recipes-thunar-plugins/archive/thunar-archive-plugin_0.5.0.bb +++ b/meta-xfce/recipes-thunar-plugins/archive/thunar-archive-plugin_0.5.1.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4cf66a4984120007c9881cc871cf49db" inherit thunar-plugin -SRC_URI[sha256sum] = "8eca88a358282a5acdea72984db0d930efdf658b4bc5b82ef7bcd06224366ffa" +SRC_URI[sha256sum] = "a81b3ab1d3cd77c7b3d6db15b37a3c12d65b06e373edc3c21083f02d605d8bed" # install tap files in ${libdir}/thunar-archive-plugin EXTRA_OECONF += "--libexecdir=${libdir}" diff --git a/meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.3.0.bb b/meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.3.0.bb deleted file mode 100644 index 06695f694c..0000000000 --- a/meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.3.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Adds ID3/OGG tag support to the Thunar bulk rename dialog" -HOMEPAGE = "http://thunar.xfce.org" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -inherit thunar-plugin - -DEPENDS += "taglib" - -SRC_URI[md5sum] = "5e332113e4b0e548ee7abd87629667f7" -SRC_URI[sha256sum] = "e265c4415abac40337cc5566c6f706efcf0be4e97723abe22ba8b874c93a591b" diff --git a/meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.4.0.bb b/meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.4.0.bb new file mode 100644 index 0000000000..00afa2bbb2 --- /dev/null +++ b/meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.4.0.bb @@ -0,0 +1,10 @@ +SUMMARY = "Adds ID3/OGG tag support to the Thunar bulk rename dialog" +HOMEPAGE = "https://docs.xfce.org/xfce/thunar/media-tags" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +inherit thunar-plugin + +DEPENDS += "taglib" + +SRC_URI[sha256sum] = "9592111e11699e449c1fbd5f72d1633ef39b00f17a988cd251ba228dab4fc90a" diff --git a/meta-xfce/recipes-xfce/garcon/garcon_4.18.0.bb b/meta-xfce/recipes-xfce/garcon/garcon_4.18.1.bb index 6a1ee7b7fd..c139bfd4c2 100644 --- a/meta-xfce/recipes-xfce/garcon/garcon_4.18.0.bb +++ b/meta-xfce/recipes-xfce/garcon/garcon_4.18.1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Xfce Menu Library" SECTION = "x11/libs" -LICENSE = "LGPL-2.0-only" +LICENSE = "LGPL-2.0-only & GFDL-1.1-no-invariants-only" LIC_FILES_CHKSUM = "file://COPYING;md5=04a01abcbdabffae1ca26335a293276b" DEPENDS = "xfce4-dev-tools-native libxfce4ui intltool-native" @@ -11,7 +11,7 @@ inherit xfce gtk-doc gobject-introspection features_check ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" SRC_URI += "file://0001-xfce-applications.menu-don-t-bloat-settings-menu-by-.patch" -SRC_URI[sha256sum] = "54633487566a8b8502b71c11a7f719efe27c069bd5773cc95f11ff4ea8f11a14" +SRC_URI[sha256sum] = "fe7a932a6dac95eb1438f3fbfd53096756ff2e1cb179d10d0fb796cefbb4c20b" EXTRA_OECONF = "--disable-gtk-doc" diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.18.0.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.18.3.bb index 7ff9d1b124..417858c98e 100644 --- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.18.0.bb +++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.18.3.bb @@ -12,7 +12,7 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" # TODO: Check if 0001-... can go SRC_URI += "file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch" -SRC_URI[sha256sum] = "532247c4387c17bb9ef94a73147039b8d013c3131c95cdbd2fa85fbcc848d06b" +SRC_URI[sha256sum] = "afa3a46eeed3ab612d2f7e1308edaf5819f6c33ccc16c13080efabd58f010abd" EXTRA_OECONF += "--with-vendor-info=${DISTRO}" EXTRA_OECONF += "--disable-vala" diff --git a/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.18.0.bb b/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.18.1.bb index 3dd1f55b46..683f6c3373 100644 --- a/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.18.0.bb +++ b/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.18.1.bb @@ -6,4 +6,4 @@ DEPENDS = "intltool-native xfce4-dev-tools-native glib-2.0" inherit xfce gtk-doc gobject-introspection vala -SRC_URI[sha256sum] = "1157ca717fd3dd1da7724a6432a4fb24af9cd922f738e971fd1fd36dfaeac3c9" +SRC_URI[sha256sum] = "8a52063a5adc66252238cad9ee6997909b59983ed21c77eb83c5e67829d1b01f" diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb index 64f8863116..711059c8c4 100644 --- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb +++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb @@ -50,7 +50,7 @@ RRECOMMENDS:${PN} = " \ xfce4-verve-plugin \ \ ${@bb.utils.contains('DISTRO_FEATURES','polkit','xfce-polkit','',d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "bluetooth", "blueman", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "bluetooth gobject-introspection", "blueman", "", d)} \ \ thunar-media-tags-plugin \ thunar-archive-plugin \ @@ -63,6 +63,6 @@ RRECOMMENDS:${PN} = " \ xfce4-taskmanager \ gigolo \ mousepad \ - catfish \ - xfce4-panel-profiles \ + ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "catfish", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "xfce4-panel-profiles", "", d)} \ " diff --git a/meta-xfce/recipes-xfce/thunar/thunar_4.18.0.bb b/meta-xfce/recipes-xfce/thunar/thunar_4.18.4.bb index 508416b039..921dba0631 100644 --- a/meta-xfce/recipes-xfce/thunar/thunar_4.18.0.bb +++ b/meta-xfce/recipes-xfce/thunar/thunar_4.18.4.bb @@ -10,7 +10,7 @@ inherit xfce gobject-introspection features_check mime-xdg perlnative # cairo would at least needed to be built with xlib. ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI[sha256sum] = "d1f4b080c97b9e390eff199aaaac7562fb20f031686f8d5ee5207e953bfc2feb" +SRC_URI[sha256sum] = "c4463ce2fb1d628adce70a828e8b4de5fa0802236894d2c40f749471619bedcc" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" PACKAGECONFIG[pcre] = "--enable-pcre2,--disable-pcre2,libpcre2" diff --git a/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch b/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch index 10c456f45e..154f72d186 100644 --- a/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch +++ b/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch @@ -14,7 +14,7 @@ Upstream-Status: Pending Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> -Rebase for xfce4 4.18.0. +Rebase for xfce4-panel 4.18.3. Signed-off-by: Kai Kang <kai.kang@windriver.com> --- @@ -22,10 +22,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com> 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/windowmenu/windowmenu.c b/plugins/windowmenu/windowmenu.c -index ba245a3..f8fdee8 100644 +index be7dea4..2f432b0 100644 --- a/plugins/windowmenu/windowmenu.c +++ b/plugins/windowmenu/windowmenu.c -@@ -250,7 +250,7 @@ window_menu_plugin_init (WindowMenuPlugin *plugin) +@@ -262,7 +262,7 @@ window_menu_plugin_init (WindowMenuPlugin *plugin) g_signal_connect (G_OBJECT (plugin->button), "toggled", G_CALLBACK (window_menu_plugin_menu), plugin); @@ -33,8 +33,8 @@ index ba245a3..f8fdee8 100644 + plugin->icon = gtk_image_new_from_icon_name (NULL, GTK_ICON_SIZE_BUTTON); gtk_container_add (GTK_CONTAINER (plugin->button), plugin->icon); gtk_widget_show (plugin->icon); - } -@@ -680,19 +680,19 @@ window_menu_plugin_active_window_changed (WnckScreen *screen, + +@@ -695,19 +695,19 @@ window_menu_plugin_active_window_changed (WnckScreen *screen, /* skip 'fake' windows */ type = wnck_window_get_window_type (window); if (type == WNCK_WINDOW_DESKTOP || type == WNCK_WINDOW_DOCK) diff --git a/meta-xfce/recipes-xfce/xfce4-panel/files/0002-use-lxdm-to-replace-dm-tool.patch b/meta-xfce/recipes-xfce/xfce4-panel/files/0002-use-lxdm-to-replace-dm-tool.patch index b06e26e91d..66a33c722a 100644 --- a/meta-xfce/recipes-xfce/xfce4-panel/files/0002-use-lxdm-to-replace-dm-tool.patch +++ b/meta-xfce/recipes-xfce/xfce4-panel/files/0002-use-lxdm-to-replace-dm-tool.patch @@ -9,15 +9,19 @@ so use lxdm to replace dm-tool Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + +Rebase for xfce4-panel 4.18.3. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> --- plugins/actions/actions.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/actions/actions.c b/plugins/actions/actions.c -index 474798e..63eb41d 100644 +index e1f1fa7..440f430 100644 --- a/plugins/actions/actions.c +++ b/plugins/actions/actions.c -@@ -905,12 +905,12 @@ actions_plugin_actions_allowed (void) +@@ -977,12 +977,12 @@ actions_plugin_actions_allowed (void) GError *error = NULL; /* check for commands we use */ @@ -32,7 +36,7 @@ index 474798e..63eb41d 100644 g_free (path); path = g_find_program_in_path ("gdmflexiserver"); if (path != NULL) -@@ -1027,9 +1027,9 @@ actions_plugin_action_activate (GtkWidget *widget, +@@ -1099,9 +1099,9 @@ actions_plugin_action_activate (GtkWidget *widget, break; case ACTION_TYPE_SWITCH_USER: diff --git a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.18.0.bb b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.18.3.bb index 5dcd69d357..7e70754431 100644 --- a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.18.0.bb +++ b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.18.3.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] = "be80023fd546587831bab25ded15ae4c9e346289a75744b6ba4cf4ee53794710" +SRC_URI[sha256sum] = "4ae0b8615c9811194bbda0172a63567ed7fdb5519ea48f7a4637f4e6e5365e1b" EXTRA_OECONF += "--disable-vala" diff --git a/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.18.0.bb b/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.18.1.bb index f61c9cd6a5..f7f72356d8 100644 --- a/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.18.0.bb +++ b/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.18.1.bb @@ -11,7 +11,7 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += "libnotify libxrandr virtual/libx11 libxext xfce4-panel upower libxscrnsaver" -SRC_URI[sha256sum] = "2eee467886252f9fa704c978ec67dafad5274ede93e59b092a688faa7e72c39a" +SRC_URI[sha256sum] = "6b08b10c4cb7516377dbd32c6cc2296a9faf47022c555f11e75b38fde14aff03" EXTRA_OECONF = " \ --enable-network-manager \ diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.18.0.bb b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.18.2.bb index 25d30cebe3..4021243e41 100644 --- a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.18.0.bb +++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.18.2.bb @@ -8,7 +8,7 @@ DEPENDS = "libwnck3 libsm libxfce4ui virtual/libx11" inherit xfce update-alternatives features_check SRC_URI += "file://0001-configure.in-hard-code-path-to-iceauth.patch" -SRC_URI[sha256sum] = "38badb500b272012f494543a60a9c0563c381647cc95bed73b68aec0b0b89a7f" +SRC_URI[sha256sum] = "01ff7fe8d4c2091adefc2925c6b7bb93152ba0732e95c9b9e64d8207fdbdeb8a" REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch b/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch index 0463d2ebdb..3a4c00913f 100644 --- a/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch +++ b/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch @@ -6,7 +6,7 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Upstram status: Inappropriate [configuration] +Upstream-Status: Inappropriate [configuration] Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> @@ -22,11 +22,11 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xfsettingsd/xsettings.xml b/xfsettingsd/xsettings.xml -index 65ba1ee..9efb3cd 100644 +index d8fe2ac..0f5246b 100644 --- a/xfsettingsd/xsettings.xml +++ b/xfsettingsd/xsettings.xml -@@ -1,8 +1,8 @@ - <?xml version="1.0" encoding="UTF-8"?> +@@ -6,8 +6,8 @@ + <channel name="xsettings" version="1.0"> <property name="Net" type="empty"> - <property name="ThemeName" type="empty"/> diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.18.0.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.18.2.bb index 0692970f79..0a182273bb 100644 --- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.18.0.bb +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.18.2.bb @@ -9,7 +9,7 @@ inherit xfce features_check mime-xdg REQUIRED_DISTRO_FEATURES = "x11" SRC_URI += "file://0001-xsettings.xml-Set-default-themes.patch" -SRC_URI[sha256sum] = "ed3f75837cb33cd694610fc87cd569c4782b7ac4e099143a3dbe8fff1f1c6a9d" +SRC_URI[sha256sum] = "4661361087faae57efb49741ffcf90bf9078760e163bbdef63b924083bdc4f22" EXTRA_OECONF += "--enable-maintainer-mode --disable-debug" diff --git a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.18.0.bb b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.18.1.bb index 6895b7912b..f4d5fef8e4 100644 --- a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.18.0.bb +++ b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.18.1.bb @@ -2,13 +2,25 @@ SUMMARY = "Xfce4 Desktop Manager" SECTION = "x11/base" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "libxfce4ui libwnck thunar garcon exo" +DEPENDS = " \ + cairo \ + exo \ + garcon \ + glib-2.0 \ + gtk+3 \ + intltool \ + libwnck3 \ + libxfce4ui \ + libxfce4util \ + thunar \ + xfconf \ +" inherit xfce features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[sha256sum] = "661783e7e6605459926d80bca46d25ce2197c221456457a863ea9d0252120d14" +SRC_URI[sha256sum] = "ef9268190c25877e22a9ff5aa31cc8ede120239cb0dfca080c174e7eed4ff756" PACKAGECONFIG ??= "notify" PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" |