diff options
Diffstat (limited to 'meta-oe/recipes-support')
21 files changed, 147 insertions, 108 deletions
diff --git a/meta-oe/recipes-support/exiv2/exiv2_0.28.0.bb b/meta-oe/recipes-support/exiv2/exiv2_0.28.0.bb deleted file mode 100644 index 958810cf7..000000000 --- a/meta-oe/recipes-support/exiv2/exiv2_0.28.0.bb +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | SUMMARY = "Exif, Iptc and XMP metadata manipulation library and tools" | ||
2 | LICENSE = "GPL-2.0-only" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" | ||
4 | |||
5 | DEPENDS = "zlib expat brotli libinih" | ||
6 | |||
7 | SRC_URI = "https://github.com/Exiv2/${BPN}/releases/download/v${PV}/${BP}-Source.tar.gz" | ||
8 | SRC_URI[sha256sum] = "89af3b5ef7277753ef7a7b5374ae017c6b9e304db3b688f1948e73e103491f3d" | ||
9 | # Once patch is obsolete (project should be aware due to PRs), dos2unix can be removed either | ||
10 | # inherit dos2unix | ||
11 | S = "${WORKDIR}/${BP}-Source" | ||
12 | |||
13 | inherit cmake gettext | ||
14 | |||
15 | do_install:append:class-target() { | ||
16 | # reproducibility: remove build host path | ||
17 | sed -i ${D}${libdir}/cmake/exiv2/exiv2Config.cmake \ | ||
18 | -e 's:${STAGING_DIR_HOST}::g' | ||
19 | } | ||
diff --git a/meta-oe/recipes-support/exiv2/exiv2_0.28.2.bb b/meta-oe/recipes-support/exiv2/exiv2_0.28.2.bb new file mode 100644 index 000000000..faae24799 --- /dev/null +++ b/meta-oe/recipes-support/exiv2/exiv2_0.28.2.bb | |||
@@ -0,0 +1,11 @@ | |||
1 | SUMMARY = "Exif, Iptc and XMP metadata manipulation library and tools" | ||
2 | LICENSE = "GPL-2.0-only" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" | ||
4 | |||
5 | DEPENDS = "zlib expat brotli libinih" | ||
6 | |||
7 | SRC_URI = "git://github.com/Exiv2/exiv2.git;protocol=https;branch=0.28.x" | ||
8 | SRCREV = "04207b9c39bf7b3b1a7144f7ed4e4f16b4f29ef6" | ||
9 | S = "${WORKDIR}/git" | ||
10 | |||
11 | inherit cmake gettext | ||
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb index 61dc1b795..8dc3cb267 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb | |||
@@ -119,3 +119,13 @@ CVE_STATUS[CVE-2014-9819] = "cpe-incorrect: The current version (7.1.1) is not a | |||
119 | CVE_STATUS[CVE-2014-9820] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | 119 | CVE_STATUS[CVE-2014-9820] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" |
120 | CVE_STATUS[CVE-2014-9821] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | 120 | CVE_STATUS[CVE-2014-9821] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" |
121 | CVE_STATUS[CVE-2016-7531] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.1-0" | 121 | CVE_STATUS[CVE-2016-7531] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.1-0" |
122 | CVE_STATUS[CVE-2016-7534] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
123 | CVE_STATUS[CVE-2016-7535] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
124 | CVE_STATUS[CVE-2016-7536] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
125 | CVE_STATUS[CVE-2016-7537] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
126 | CVE_STATUS[CVE-2016-7538] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
127 | CVE_STATUS[CVE-2017-5506] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.4-4" | ||
128 | CVE_STATUS[CVE-2017-5509] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.4-4" | ||
129 | CVE_STATUS[CVE-2017-5510] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.4-4" | ||
130 | CVE_STATUS[CVE-2017-5511] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.4-3" | ||
131 | CVE_STATUS[CVE-2007-1667] = "cpe-incorrect: CVE should not include a CPE for imagemagick" | ||
diff --git a/meta-oe/recipes-support/iniparser/iniparser_4.2.2.bb b/meta-oe/recipes-support/iniparser/iniparser_4.2.4.bb index 8c6c60a79..aeac9c30b 100644 --- a/meta-oe/recipes-support/iniparser/iniparser_4.2.2.bb +++ b/meta-oe/recipes-support/iniparser/iniparser_4.2.4.bb | |||
@@ -4,7 +4,7 @@ HOMEPAGE = "https://gitlab.com/iniparser/iniparser" | |||
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=8474d3b745f77e203f1fc82fb0bb7678" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=8474d3b745f77e203f1fc82fb0bb7678" |
6 | SRCBRANCH = "main" | 6 | SRCBRANCH = "main" |
7 | SRCREV = "762715ca6cdba9dcf31a5af9297b444f3b5b8c00" | 7 | SRCREV = "4e5d1cc10215ce328c61bb5fd7839746e47375f9" |
8 | 8 | ||
9 | SRC_URI = "git://gitlab.com/iniparser/iniparser.git;protocol=https;branch=${SRCBRANCH}" | 9 | SRC_URI = "git://gitlab.com/iniparser/iniparser.git;protocol=https;branch=${SRCBRANCH}" |
10 | S = "${WORKDIR}/git" | 10 | S = "${WORKDIR}/git" |
diff --git a/meta-oe/recipes-support/libee/libee.inc b/meta-oe/recipes-support/libee/libee.inc deleted file mode 100644 index 592109b95..000000000 --- a/meta-oe/recipes-support/libee/libee.inc +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | SUMMARY = "An Event Expression Library inspired by CEE" | ||
2 | DESCRIPTION = "The core idea of libee is to provide a small \ | ||
3 | but hopefully convenient API layer above the CEE standard." | ||
4 | |||
5 | HOMEPAGE = "http://www.libee.org" | ||
6 | SECTION = "base" | ||
7 | |||
8 | LICENSE = "LGPL-2.1-or-later" | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=1c2687de35e36ba3b999136236a66cd6" | ||
10 | |||
11 | SRC_URI = "http://www.libee.org/download/files/download/${BPN}-${PV}.tar.gz\ | ||
12 | file://libee-parallel-make.patch \ | ||
13 | file://run-ptest \ | ||
14 | file://ezapi1.sh \ | ||
15 | " | ||
16 | |||
17 | inherit autotools ptest pkgconfig | ||
18 | |||
19 | DEPENDS += "libestr" | ||
20 | |||
21 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'testbench', '', d)}" | ||
22 | |||
23 | PACKAGECONFIG[debug] = "--enable-debug,--disable-debug,," | ||
24 | PACKAGECONFIG[testbench] = "--enable-testbench,--disable-testbench,," | ||
25 | |||
26 | TESTDIR = "tests" | ||
27 | |||
28 | # We presume the tests we are going to install so just build them directly. | ||
29 | # | ||
30 | do_compile_ptest() { | ||
31 | oe_runmake -C ${TESTDIR} genfile ezapi1 | ||
32 | } | ||
33 | |||
34 | do_install_ptest() { | ||
35 | install -d ${D}${PTEST_PATH} | ||
36 | install -m 0755 ${B}/${TESTDIR}/genfile ${D}${PTEST_PATH} | ||
37 | install -m 0755 ${B}/${TESTDIR}/.libs/ezapi1 ${D}${PTEST_PATH} | ||
38 | install -m 0755 ${UNPACKDIR}/ezapi1.sh ${D}${PTEST_PATH} | ||
39 | } | ||
diff --git a/meta-oe/recipes-support/libee/libee/ezapi1.sh b/meta-oe/recipes-support/libee/libee/ezapi1.sh deleted file mode 100755 index e9db5e614..000000000 --- a/meta-oe/recipes-support/libee/libee/ezapi1.sh +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | echo --------------------------------------------------------------------------- | ||
4 | echo A very basic test for the event class | ||
5 | echo --------------------------------------------------------------------------- | ||
6 | rm -f infile | ||
7 | ./genfile 100 > infile | ||
8 | ./ezapi1 -iinfile | ||
9 | if [ $? -ne 0 ] ; then | ||
10 | echo "FAIL: $0" | ||
11 | exit 1 | ||
12 | fi | ||
13 | echo "PASS: $0" | ||
14 | rm -f infile | ||
diff --git a/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch b/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch deleted file mode 100644 index 8bb23aafc..000000000 --- a/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | fix parallel compiling problem | ||
2 | |||
3 | without specifying libee_convert_DEPENDENCIES = libee.la, libee_convert | ||
4 | can't find libee.la when linking as libee is not generated yet. | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Yao Zhao <yao.zhao@windriver.com> | ||
9 | --- | ||
10 | diff --git a/src/Makefile.am b/src/Makefile.am | ||
11 | index 08aaa9e..f0c78f7 100644 | ||
12 | --- a/src/Makefile.am | ||
13 | +++ b/src/Makefile.am | ||
14 | @@ -46,5 +46,6 @@ libee_la_LDFLAGS = -version-info 0:0:0 | ||
15 | libee_convert_SOURCES = convert.c | ||
16 | libee_convert_CPPFLAGS = -I$(top_srcdir) $(LIBEE_CFLAGS) $(LIBESTR_CFLAGS) $(LIBXML2_CFLAGS) | ||
17 | libee_convert_LDADD = $(LIBEE_LIBS) $(LIBXML2_LIBS) $(LIBESTR_LIBS) | ||
18 | +libee_convert_DEPENDENCIES = libee.la | ||
19 | |||
20 | include_HEADERS = | ||
diff --git a/meta-oe/recipes-support/libee/libee/run-ptest b/meta-oe/recipes-support/libee/libee/run-ptest deleted file mode 100755 index 3cb660764..000000000 --- a/meta-oe/recipes-support/libee/libee/run-ptest +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | ./ezapi1.sh | ||
diff --git a/meta-oe/recipes-support/libee/libee_0.4.1.bb b/meta-oe/recipes-support/libee/libee_0.4.1.bb deleted file mode 100644 index ef2c20db5..000000000 --- a/meta-oe/recipes-support/libee/libee_0.4.1.bb +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | require ${BPN}.inc | ||
2 | |||
3 | SRC_URI[md5sum] = "7bbf4160876c12db6193c06e2badedb2" | ||
4 | SRC_URI[sha256sum] = "c0dac01938593deee06c3d161e4eda4ecc0fd7317e1321bd96e301aceb7fb027" | ||
diff --git a/meta-oe/recipes-support/libfido2/libfido2_1.14.0.bb b/meta-oe/recipes-support/libfido2/libfido2_1.15.0.bb index d453d0ab9..74844855d 100644 --- a/meta-oe/recipes-support/libfido2/libfido2_1.14.0.bb +++ b/meta-oe/recipes-support/libfido2/libfido2_1.15.0.bb | |||
@@ -7,10 +7,10 @@ LICENSE = "BSD-2-Clause" | |||
7 | SECTION = "libs/network" | 7 | SECTION = "libs/network" |
8 | DEPENDS = "libcbor openssl zlib udev" | 8 | DEPENDS = "libcbor openssl zlib udev" |
9 | 9 | ||
10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5f14cb32bdf2b87063e0a2d20c4178d0" | 10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=20be19aaa222f71738712b26f7f8717b" |
11 | 11 | ||
12 | SRC_URI = "https://developers.yubico.com/${BPN}/Releases/${BPN}-${PV}.tar.gz" | 12 | SRC_URI = "https://developers.yubico.com/${BPN}/Releases/${BPN}-${PV}.tar.gz" |
13 | SRC_URI[sha256sum] = "3601792e320032d428002c4cce8499a4c7b803319051a25a0c9f1f138ffee45a" | 13 | SRC_URI[sha256sum] = "abaab1318d21d262ece416fb8a7132fa9374bda89f6fa52b86a98a2f5712b61e" |
14 | 14 | ||
15 | inherit cmake pkgconfig manpages | 15 | inherit cmake pkgconfig manpages |
16 | 16 | ||
diff --git a/meta-oe/recipes-support/libraw/libraw_0.21.2.bb b/meta-oe/recipes-support/libraw/libraw_0.21.2.bb index 4d089f3b7..6b1355fa3 100644 --- a/meta-oe/recipes-support/libraw/libraw_0.21.2.bb +++ b/meta-oe/recipes-support/libraw/libraw_0.21.2.bb | |||
@@ -9,3 +9,6 @@ S = "${WORKDIR}/git" | |||
9 | inherit autotools pkgconfig | 9 | inherit autotools pkgconfig |
10 | 10 | ||
11 | DEPENDS = "jpeg jasper lcms" | 11 | DEPENDS = "jpeg jasper lcms" |
12 | |||
13 | CVE_STATUS[CVE-2020-22628] = "cpe-incorrect: The current version (0.21.2) is not affected by the CVE which affects versions earlier than 0.21.2" | ||
14 | CVE_STATUS[CVE-2023-1729] = "cpe-incorrect: The current version (0.21.2) is not affected by the CVE which affects versions earlier than 0.21.2" | ||
diff --git a/meta-oe/recipes-support/links/links_2.29.bb b/meta-oe/recipes-support/links/links_2.29.bb index e3a15d181..311d84e48 100644 --- a/meta-oe/recipes-support/links/links_2.29.bb +++ b/meta-oe/recipes-support/links/links_2.29.bb | |||
@@ -9,3 +9,5 @@ EXTRA_OECONF = "--enable-graphics \ | |||
9 | --without-directfb --without-pmshell --without-atheos \ | 9 | --without-directfb --without-pmshell --without-atheos \ |
10 | --without-x" | 10 | --without-x" |
11 | SRC_URI[sha256sum] = "22aa96c0b38e1a6f8f7ed9d7a4167a47fc37246097759ef6059ecf8f9ead7998" | 11 | SRC_URI[sha256sum] = "22aa96c0b38e1a6f8f7ed9d7a4167a47fc37246097759ef6059ecf8f9ead7998" |
12 | |||
13 | CVE_STATUS[CVE-2008-3319] = "cpe-incorrect: The recipe used in the `meta-openembedded` is a different links package compared to the one which has the CVE issue." | ||
diff --git a/meta-oe/recipes-support/mcelog/mcelog_199.bb b/meta-oe/recipes-support/mcelog/mcelog_200.bb index 0a48fc48c..9d72e7859 100644 --- a/meta-oe/recipes-support/mcelog/mcelog_199.bb +++ b/meta-oe/recipes-support/mcelog/mcelog_200.bb | |||
@@ -10,7 +10,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;; | |||
10 | file://run-ptest \ | 10 | file://run-ptest \ |
11 | " | 11 | " |
12 | 12 | ||
13 | SRCREV = "c17897deb52daab300c585a6a6c2456d062d80cf" | 13 | SRCREV = "955fd0917ab1b9f159443e5cbba1d0fa73486fac" |
14 | 14 | ||
15 | LICENSE = "GPL-2.0-only" | 15 | LICENSE = "GPL-2.0-only" |
16 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 16 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
diff --git a/meta-oe/recipes-support/openct/openct/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch b/meta-oe/recipes-support/openct/openct/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch new file mode 100644 index 000000000..73c9d0666 --- /dev/null +++ b/meta-oe/recipes-support/openct/openct/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch | |||
@@ -0,0 +1,65 @@ | |||
1 | From c4351058da555e1e6a2b4b15d913baee80f55865 Mon Sep 17 00:00:00 2001 | ||
2 | From: Wang Mingyu <wangmy@fujitsu.com> | ||
3 | Date: Thu, 27 Jun 2024 06:27:18 +0000 | ||
4 | Subject: Fix incompatible pointer type error with gcc option | ||
5 | -Wincompatible-pointer-types | ||
6 | |||
7 | | ../../../openct-0.6.20/src/ifd/ifdhandler.c: In function 'ifdhandler_run': | ||
8 | | ../../../openct-0.6.20/src/ifd/ifdhandler.c:239:52: error: passing argument 2 of 'ifd_get_eventfd' from incompatible pointer type [-Wincompatible-pointer-types] | ||
9 | | 239 | sock->fd = ifd_get_eventfd(reader, &sock->events); | ||
10 | | | ^~~~~~~~~~~~~ | ||
11 | | | | | ||
12 | | | int * | ||
13 | | In file included from ../../../openct-0.6.20/src/ifd/internal.h:17, | ||
14 | | from ../../../openct-0.6.20/src/ifd/ifdhandler.c:7: | ||
15 | | ../../../openct-0.6.20/src/include/openct/ifd.h:182:65: note: expected 'short int *' but argument is of type 'int *' | ||
16 | | 182 | extern int ifd_get_eventfd(ifd_reader_t *, short *); | ||
17 | | | ^~~~~~~ | ||
18 | |||
19 | | ../../../openct-0.6.20/src/ifd/process.c: In function 'do_memory_write': | ||
20 | | ../../../openct-0.6.20/src/ifd/process.c:461:61: error: passing argument 4 of 'ct_tlv_get_opaque' from incompatible pointer type [-Wincompatible-pointer-types] | ||
21 | | 461 | || !ct_tlv_get_opaque(args, CT_TAG_DATA, &data, &data_len)) | ||
22 | | | ^~~~~~~~~ | ||
23 | | | | | ||
24 | | | unsigned int * | ||
25 | | In file included from ../../../openct-0.6.20/src/ifd/process.c:20: | ||
26 | | ../../../openct-0.6.20/src/include/openct/tlv.h:40:62: note: expected 'size_t *' {aka 'long unsigned int *'} but argument is of type 'unsigned int *' | ||
27 | | 40 | ifd_tag_t, unsigned char **, size_t *); | ||
28 | |||
29 | Upstream-Status: Submitted | ||
30 | |||
31 | Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> | ||
32 | --- | ||
33 | src/ifd/ifdhandler.c | 2 +- | ||
34 | src/ifd/process.c | 2 +- | ||
35 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
36 | |||
37 | diff --git a/src/ifd/ifdhandler.c b/src/ifd/ifdhandler.c | ||
38 | index 12686c9..ebd1b53 100644 | ||
39 | --- a/src/ifd/ifdhandler.c | ||
40 | +++ b/src/ifd/ifdhandler.c | ||
41 | @@ -236,7 +236,7 @@ static void ifdhandler_run(ifd_reader_t * reader) | ||
42 | sock->fd = -1; | ||
43 | } | ||
44 | else { | ||
45 | - sock->fd = ifd_get_eventfd(reader, &sock->events); | ||
46 | + sock->fd = ifd_get_eventfd(reader, (short int *)&sock->events); | ||
47 | } | ||
48 | if (sock->fd == -1) { | ||
49 | ifd_debug(1, "events inactive for reader %s", reader->name); | ||
50 | diff --git a/src/ifd/process.c b/src/ifd/process.c | ||
51 | index 4563bdf..7088a76 100644 | ||
52 | --- a/src/ifd/process.c | ||
53 | +++ b/src/ifd/process.c | ||
54 | @@ -458,7 +458,7 @@ static int do_memory_write(ifd_reader_t * reader, int unit, | ||
55 | return IFD_ERROR_INVALID_SLOT; | ||
56 | |||
57 | if (ct_tlv_get_int(args, CT_TAG_ADDRESS, &address) == 0 | ||
58 | - || !ct_tlv_get_opaque(args, CT_TAG_DATA, &data, &data_len)) | ||
59 | + || !ct_tlv_get_opaque(args, CT_TAG_DATA, &data, (size_t *)&data_len)) | ||
60 | return IFD_ERROR_MISSING_ARG; | ||
61 | |||
62 | rc = ifd_card_write_memory(reader, unit, address, data, data_len); | ||
63 | -- | ||
64 | 2.34.1 | ||
65 | |||
diff --git a/meta-oe/recipes-support/openct/openct_0.6.20.bb b/meta-oe/recipes-support/openct/openct_0.6.20.bb index e4b99089f..e013fb26e 100644 --- a/meta-oe/recipes-support/openct/openct_0.6.20.bb +++ b/meta-oe/recipes-support/openct/openct_0.6.20.bb | |||
@@ -18,6 +18,7 @@ SRC_URI = " \ | |||
18 | file://openct.init \ | 18 | file://openct.init \ |
19 | file://openct.sysconfig \ | 19 | file://openct.sysconfig \ |
20 | file://openct.service \ | 20 | file://openct.service \ |
21 | file://0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch \ | ||
21 | " | 22 | " |
22 | 23 | ||
23 | SRC_URI[md5sum] = "a1da3358ab798f1cb9232f1dbababc21" | 24 | SRC_URI[md5sum] = "a1da3358ab798f1cb9232f1dbababc21" |
diff --git a/meta-oe/recipes-support/openldap/openldap/0001-fix-incompatible-pointer-type-error.patch b/meta-oe/recipes-support/openldap/openldap/0001-fix-incompatible-pointer-type-error.patch new file mode 100644 index 000000000..e6ab4e5a4 --- /dev/null +++ b/meta-oe/recipes-support/openldap/openldap/0001-fix-incompatible-pointer-type-error.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 634017950c1c920d0de63fffa5c52e621de1d603 Mon Sep 17 00:00:00 2001 | ||
2 | From: Wang Mingyu <wangmy@fujitsu.com> | ||
3 | Date: Wed, 26 Jun 2024 07:41:01 +0000 | ||
4 | Subject: Fix incompatible pointer type error with gcc option | ||
5 | -Wincompatible-pointer-types | ||
6 | |||
7 | lib32-openldap do_compile failure with gcc-14: | ||
8 | | tls_g.c:971:57: error: passing argument 4 of 'gnutls_fingerprint' from incompatible pointer type [-Wincompatible-pointer-types] | ||
9 | | 971 | keyhash.bv_val, &keyhash.bv_len ) < 0 ) { | ||
10 | | | ^~~~~~~~~~~~~~~ | ||
11 | | | | | ||
12 | | | ber_len_t * {aka long unsigned int *} | ||
13 | | In file included from tls_g.c:44: | ||
14 | | /usr/include/gnutls/gnutls.h:2406:32: note: expected 'size_t *' {aka 'unsigned int *'} but argument is of type 'ber_len_t *' {aka 'long unsigned int *'} | ||
15 | | 2406 | size_t *result_size); | ||
16 | | | ^~~ | ||
17 | |||
18 | Upstream-Status: Submitted | ||
19 | |||
20 | Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> | ||
21 | --- | ||
22 | libraries/libldap/tls_g.c | 2 +- | ||
23 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
24 | |||
25 | diff --git a/libraries/libldap/tls_g.c b/libraries/libldap/tls_g.c | ||
26 | index 7c23875..b4b487d 100644 | ||
27 | --- a/libraries/libldap/tls_g.c | ||
28 | +++ b/libraries/libldap/tls_g.c | ||
29 | @@ -968,7 +968,7 @@ tlsg_session_pinning( LDAP *ld, tls_session *sess, char *hashalg, struct berval | ||
30 | keyhash.bv_len = gnutls_hash_get_len( alg ); | ||
31 | keyhash.bv_val = LDAP_MALLOC( keyhash.bv_len ); | ||
32 | if ( !keyhash.bv_val || gnutls_fingerprint( alg, &key, | ||
33 | - keyhash.bv_val, &keyhash.bv_len ) < 0 ) { | ||
34 | + keyhash.bv_val, (size_t *)&keyhash.bv_len ) < 0 ) { | ||
35 | goto done; | ||
36 | } | ||
37 | } else { | ||
38 | -- | ||
39 | 2.34.1 | ||
40 | |||
diff --git a/meta-oe/recipes-support/openldap/openldap_2.6.7.bb b/meta-oe/recipes-support/openldap/openldap_2.6.8.bb index c229667d6..330636b83 100644 --- a/meta-oe/recipes-support/openldap/openldap_2.6.7.bb +++ b/meta-oe/recipes-support/openldap/openldap_2.6.8.bb | |||
@@ -7,7 +7,7 @@ HOMEPAGE = "http://www.OpenLDAP.org/license.html" | |||
7 | # basically BSD. opensource.org does not record this license | 7 | # basically BSD. opensource.org does not record this license |
8 | # at present (so it is apparently not OSI certified). | 8 | # at present (so it is apparently not OSI certified). |
9 | LICENSE = "OpenLDAP" | 9 | LICENSE = "OpenLDAP" |
10 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=beceb5ac7100b6430640c61655b25c1f \ | 10 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3a41b4ed95ab4a20f366a8d82536afe4 \ |
11 | file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \ | 11 | file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \ |
12 | " | 12 | " |
13 | SECTION = "libs" | 13 | SECTION = "libs" |
@@ -19,9 +19,10 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$ | |||
19 | file://slapd.service \ | 19 | file://slapd.service \ |
20 | file://remove-user-host-pwd-from-version.patch \ | 20 | file://remove-user-host-pwd-from-version.patch \ |
21 | file://0001-build-top.mk-unset-STRIP_OPTS.patch \ | 21 | file://0001-build-top.mk-unset-STRIP_OPTS.patch \ |
22 | file://0001-fix-incompatible-pointer-type-error.patch \ | ||
22 | " | 23 | " |
23 | 24 | ||
24 | SRC_URI[sha256sum] = "cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930" | 25 | SRC_URI[sha256sum] = "48969323e94e3be3b03c6a132942dcba7ef8d545f2ad35401709019f696c3c4e" |
25 | 26 | ||
26 | DEPENDS = "util-linux groff-native" | 27 | DEPENDS = "util-linux groff-native" |
27 | 28 | ||
diff --git a/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.15.0.bb b/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.16.0.bb index 88033e58c..f559295db 100644 --- a/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.15.0.bb +++ b/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.16.0.bb | |||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" | |||
9 | DEPENDS = "nlohmann-json" | 9 | DEPENDS = "nlohmann-json" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/open-telemetry/opentelemetry-cpp.git;protocol=https;branch=main;" | 11 | SRC_URI = "git://github.com/open-telemetry/opentelemetry-cpp.git;protocol=https;branch=main;" |
12 | SRCREV = "054b0dc207c1f58e290d78cdaac5f314bc328b31" | 12 | SRCREV = "fd57e7aa23ffc352f62e504f34fd1c6b7b2ecac3" |
13 | 13 | ||
14 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
15 | inherit cmake pkgconfig lib_package | 15 | inherit cmake pkgconfig lib_package |
diff --git a/meta-oe/recipes-support/pcp/pcp_6.0.5.bb b/meta-oe/recipes-support/pcp/pcp_6.0.5.bb index 10545b65e..f6f2a6575 100644 --- a/meta-oe/recipes-support/pcp/pcp_6.0.5.bb +++ b/meta-oe/recipes-support/pcp/pcp_6.0.5.bb | |||
@@ -93,6 +93,10 @@ do_install () { | |||
93 | sed -i "s#PCP_SORT_PROG=.*#PCP_SORT_PROG=sort#" ${D}/${sysconfdir}/pcp.conf | 93 | sed -i "s#PCP_SORT_PROG=.*#PCP_SORT_PROG=sort#" ${D}/${sysconfdir}/pcp.conf |
94 | sed -i "s#PCP_ECHO_PROG=.*#PCP_ECHO_PROG=echo#" ${D}/${sysconfdir}/pcp.conf | 94 | sed -i "s#PCP_ECHO_PROG=.*#PCP_ECHO_PROG=echo#" ${D}/${sysconfdir}/pcp.conf |
95 | sed -i "s#PCP_WHICH_PROG=.*#PCP_WHICH_PROG=which#" ${D}/${sysconfdir}/pcp.conf | 95 | sed -i "s#PCP_WHICH_PROG=.*#PCP_WHICH_PROG=which#" ${D}/${sysconfdir}/pcp.conf |
96 | sed -i -e 's#${RECIPE_SYSROOT}##g' ${D}/${sysconfdir}/pcp.conf | ||
97 | sed -i -e 's#${RECIPE_SYSROOT}##g' \ | ||
98 | -e 's#${RECIPE_SYSROOT_NATIVE}##g' \ | ||
99 | -e 's#${TMPDIR}##g' ${D}${includedir}/pcp/builddefs | ||
96 | } | 100 | } |
97 | 101 | ||
98 | PACKAGES += " ${PN}-export-zabbix-agent ${PN}-testsuite \ | 102 | PACKAGES += " ${PN}-export-zabbix-agent ${PN}-testsuite \ |
diff --git a/meta-oe/recipes-support/tbb/tbb_2021.11.0.bb b/meta-oe/recipes-support/tbb/tbb_2021.11.0.bb index f834726bd..0f9f02655 100644 --- a/meta-oe/recipes-support/tbb/tbb_2021.11.0.bb +++ b/meta-oe/recipes-support/tbb/tbb_2021.11.0.bb | |||
@@ -25,6 +25,7 @@ inherit cmake pkgconfig | |||
25 | EXTRA_OECMAKE += " \ | 25 | EXTRA_OECMAKE += " \ |
26 | -DTBB_TEST=OFF \ | 26 | -DTBB_TEST=OFF \ |
27 | -DCMAKE_BUILD_TYPE=Release \ | 27 | -DCMAKE_BUILD_TYPE=Release \ |
28 | -DTBB_STRICT=OFF \ | ||
28 | " | 29 | " |
29 | 30 | ||
30 | # Hard-float 'd' ABI can't be used for a target that doesn't support the D instruction set extension (ignoring target-abi) | 31 | # Hard-float 'd' ABI can't be used for a target that doesn't support the D instruction set extension (ignoring target-abi) |
diff --git a/meta-oe/recipes-support/tree/tree_2.1.1.bb b/meta-oe/recipes-support/tree/tree_2.1.1.bb index 0b6114960..1eaea6a22 100644 --- a/meta-oe/recipes-support/tree/tree_2.1.1.bb +++ b/meta-oe/recipes-support/tree/tree_2.1.1.bb | |||
@@ -1,10 +1,10 @@ | |||
1 | SUMMARY = "A recursive directory listing command" | 1 | SUMMARY = "A recursive directory listing command" |
2 | HOMEPAGE = "http://mama.indstate.edu/users/ice/tree/" | 2 | HOMEPAGE = "https://oldmanprogrammer.net/source.php?dir=projects/tree" |
3 | SECTION = "console/utils" | 3 | SECTION = "console/utils" |
4 | LICENSE = "GPL-2.0-only" | 4 | LICENSE = "GPL-2.0-only" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833" |
6 | 6 | ||
7 | SRC_URI = "http://mama.indstate.edu/users/ice/tree/src/${BP}.tgz" | 7 | SRC_URI = "https://oldmanprogrammer.net/tar/tree/${BP}.tgz" |
8 | SRC_URI[sha256sum] = "d3c3d55f403af7c76556546325aa1eca90b918cbaaf6d3ab60a49d8367ab90d5" | 8 | SRC_URI[sha256sum] = "d3c3d55f403af7c76556546325aa1eca90b918cbaaf6d3ab60a49d8367ab90d5" |
9 | 9 | ||
10 | # tree's default CFLAGS for Linux | 10 | # tree's default CFLAGS for Linux |