diff options
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-connectivity')
13 files changed, 76 insertions, 92 deletions
diff --git a/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/0001-Make-alpha2-to-be-3-characters-long.patch b/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/0001-Make-alpha2-to-be-3-characters-long.patch new file mode 100644 index 0000000000..f1d2cbc5a3 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/0001-Make-alpha2-to-be-3-characters-long.patch @@ -0,0 +1,31 @@ +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-openembedded/meta-networking/recipes-connectivity/crda/crda_3.18.bb b/meta-openembedded/meta-networking/recipes-connectivity/crda/crda_3.18.bb index f99dfd66f9..9abfd61cf2 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/crda/crda_3.18.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/crda/crda_3.18.bb @@ -15,6 +15,7 @@ SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz \ 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 \ " SRC_URI[md5sum] = "0431fef3067bf503dfb464069f06163a" SRC_URI[sha256sum] = "43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb index c86926813d..8d4be95cfe 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb @@ -8,7 +8,8 @@ HOMEPAGE = "http://www.isc.org/" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=004a4db50a1e20972e924a8618747c01" -DEPENDS = "openssl libcap zlib" +DEPENDS = "openssl libcap zlib chrpath-replacement-native" +EXTRANATIVEPATH += "chrpath-native" SRC_URI = "https://ftp.isc.org/isc/dhcp/4.4.2-P1/dhcp-4.4.2-P1.tar.gz \ https://ftp.isc.org/isc/bind9/9.11.32/bind-9.11.32.tar.gz;name=bind;unpack=0 \ @@ -62,8 +63,11 @@ do_compile:prepend() { } do_install:append () { - install -d ${D}${sysconfdir}/default - install -m 0644 ${WORKDIR}/default-relay ${D}${sysconfdir}/default/dhcp-relay + install -Dm 0644 ${WORKDIR}/default-relay ${D}${sysconfdir}/default/dhcp-relay + install -Dm 0755 ${B}/bind/bind-9.11.32/lib/isccfg/.libs/libisccfg.so.163 ${D}${libdir}/libisccfg.so.163 + install -Dm 0755 ${B}/bind/bind-9.11.32/lib/dns/.libs/libdns.so.1115 ${D}${libdir}/libdns.so.1115 + chrpath --delete ${D}${libdir}/libisccfg.so.163 + chrpath --delete ${D}${libdir}/libdns.so.1115 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${systemd_unitdir}/system diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls/0001-ssl_tls-Increase-size-of-padbuf-to-64.patch b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls/0001-ssl_tls-Increase-size-of-padbuf-to-64.patch deleted file mode 100644 index f3ba04f51f..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls/0001-ssl_tls-Increase-size-of-padbuf-to-64.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c3d7321d59e959b357a7d3d69782d9105f3d04aa Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 1 Mar 2021 21:04:57 -0800 -Subject: [PATCH] ssl_tls: Increase size of padbuf to 64 - -This fixes warnings with gcc11 - -git/library/ssl_tls.c: In function 'ssl_calc_finished_tls_sha384': -git/library/ssl_tls.c:3267:5: error: 'mbedtls_sha512_finish_ret' accessing 64 bytes in a region of size 48 [-Werror=stringop-overflow=] - 3267 | finish( &sha512, padbuf ); - | ^~~~~~~~~~~~~~~~~~~~~~~~~ -git/library/ssl_tls.c:3267:5: note: referencing argument 2 of type 'unsigned char *' - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - library/ssl_tls.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/library/ssl_tls.c b/library/ssl_tls.c -index a1a5859f0..4c98a4104 100644 ---- a/library/ssl_tls.c -+++ b/library/ssl_tls.c -@@ -3205,7 +3205,7 @@ static void ssl_calc_finished_tls_sha384( - { - int len = 12; - const char *sender; -- unsigned char padbuf[48]; -+ unsigned char padbuf[64]; - #if defined(MBEDTLS_USE_PSA_CRYPTO) - size_t hash_size; - psa_hash_operation_t sha384_psa = PSA_HASH_OPERATION_INIT; --- -2.30.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.26.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.0.bb index b62ed04ce6..d4a9c7bf8d 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.26.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.0.bb @@ -23,9 +23,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SECTION = "libs" S = "${WORKDIR}/git" -SRCREV = "e483a77c85e1f9c1dd2eb1c5a8f552d2617fe400" -SRC_URI = "git://github.com/ARMmbed/mbedtls.git;protocol=https;branch=development" -SRC_URI += "file://0001-ssl_tls-Increase-size-of-padbuf-to-64.patch" +SRCREV = "8b3f26a5ac38d4fdccbc5c5366229f3e01dafcc0" +SRC_URI = "git://github.com/ARMmbed/mbedtls.git;protocol=https;branch=mbedtls-2.28" inherit cmake diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/1571.patch b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/1571.patch index 37560f30c8..627638ec89 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/1571.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/1571.patch @@ -19,4 +19,4 @@ Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> + LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/linker.version" ) - install(TARGETS libmosquitto RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") + install(TARGETS libmosquitto diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.12.bb b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.14.bb index 06d8211a27..739b7de625 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.12.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.14.bb @@ -8,8 +8,8 @@ HOMEPAGE = "http://mosquitto.org/" SECTION = "console/network" LICENSE = "EPL-2.0 | EDL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca9a8f366c6babf593e374d0d7d58749 \ - file://edl-v10;md5=c09f121939f063aeb5235972be8c722c \ - file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \ + file://edl-v10;md5=9f6accb1afcb570f8be65039e2fcd49e \ + file://epl-v20;md5=2dd765ca47a05140be15ebafddbeadfe \ file://NOTICE.md;md5=a7a91b4754c6f7995020d1b49bc829c6 \ " DEPENDS = "uthash cjson" @@ -19,7 +19,7 @@ SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ file://1571.patch \ " -SRC_URI[sha256sum] = "31cf0065cb431d6f4e57a5f4d56663e839c9d177362eff89582d7cfde191c933" +SRC_URI[sha256sum] = "d0dde8fdb12caf6e2426b4f28081919a2fce3448773bdb8af0d3cd5fe5776925" inherit systemd update-rc.d useradd cmake pkgconfig diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-Makefile-do-not-use-Werror.patch b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-Makefile-do-not-use-Werror.patch index ddc44c3ca0..613858f6fd 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-Makefile-do-not-use-Werror.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-Makefile-do-not-use-Werror.patch @@ -10,14 +10,17 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de> 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile -index 8645aee..50fc0da 100644 +index 0368e41..53d6a9d 100644 --- a/Makefile +++ b/Makefile -@@ -7,7 +7,6 @@ BUILDFLAGS = \ - -D_XOPEN_SOURCE=500 \ +@@ -8,7 +8,6 @@ BUILDFLAGS = \ -DSBINDIR=\"$(SBINDIR)\" \ + -I${CURDIR}/include \ -Wall \ - -Werror \ $(NULL) - SYSTEMD_GENERATOR_DIR=$(shell pkg-config --variable=systemdsystemgeneratordir systemd) + SRCS = \ +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch index c7d371dfa0..8779c251a5 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch @@ -4,18 +4,17 @@ Date: Fri, 25 Dec 2020 11:41:43 +0900 Subject: [PATCH] don't fail if GLOB_BRACE is not defined Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> - --- src/util.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/util.c b/src/util.c -index a4c0dba..fd4542d 100644 +index 841ec12..59595da 100644 --- a/src/util.c +++ b/src/util.c -@@ -25,6 +25,12 @@ - #include "util.h" - #include "netplan.h" +@@ -32,6 +32,12 @@ + #include "names.h" + #include "yaml-helpers.h" +/* Don't fail if the standard library + * doesn't provide brace expansion */ @@ -23,6 +22,9 @@ index a4c0dba..fd4542d 100644 +#define GLOB_BRACE 0 +#endif + - GHashTable* wifi_frequency_24; - GHashTable* wifi_frequency_5; + NETPLAN_ABI GHashTable* + wifi_frequency_24; +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-parse-nm-fix-32bit-format-string.patch b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-parse-nm-fix-32bit-format-string.patch deleted file mode 100644 index 72f04a15ad..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-parse-nm-fix-32bit-format-string.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2f0ff65eaa93f18d9edb5d03329b00d8e5e73869 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lukas=20M=C3=A4rdian?= <lukas.maerdian@canonical.com> -Date: Wed, 4 Aug 2021 15:55:00 +0200 -Subject: [PATCH] parse-nm: fix 32bit format string - ---- - src/parse-nm.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/parse-nm.c b/src/parse-nm.c -index 9b09e34..bf998b7 100644 ---- a/src/parse-nm.c -+++ b/src/parse-nm.c -@@ -136,7 +136,7 @@ static void - handle_bridge_uint(GKeyFile* kf, const gchar* key, NetplanNetDefinition* nd, char** dataptr) { - if (g_key_file_get_uint64(kf, "bridge", key, NULL)) { - nd->custom_bridging = TRUE; -- *dataptr = g_strdup_printf("%lu", g_key_file_get_uint64(kf, "bridge", key, NULL)); -+ *dataptr = g_strdup_printf("%"G_GUINT64_FORMAT, g_key_file_get_uint64(kf, "bridge", key, NULL)); - _kf_clear_key(kf, "bridge", key); - } - } --- -2.25.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.103.bb b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.104.bb index 81e20b9c8e..e26649744c 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.103.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.104.bb @@ -11,11 +11,10 @@ LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" S = "${WORKDIR}/git" -SRCREV = "51c872d856db80281ea810ebc02e05c09d5310fa" -PV = "0.103" +SRCREV = "3e522b7255310bdecca6c781137741dfc4abc021" +PV = "0.104" SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=main;protocol=https \ - file://0001-parse-nm-fix-32bit-format-string.patch \ file://0001-Makefile-do-not-use-Werror.patch \ " @@ -23,7 +22,11 @@ SRC_URI:append:libc-musl = " file://0001-don-t-fail-if-GLOB_BRACE-is-not-defined DEPENDS = "glib-2.0 libyaml ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -RDEPENDS:${PN} = "python3 python3-core python3-pyyaml python3-netifaces python3-nose python3-coverage python3-pycodestyle python3-pyflakes util-linux-libuuid libnetplan" +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" inherit pkgconfig systemd diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.11.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb index 0e125891e9..84eee44195 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.11.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb @@ -31,14 +31,14 @@ SRC_URI:append:libc-musl = " \ file://samba-fix-musl-lib-without-innetgr.patch \ " -SRC_URI[sha256sum] = "3d9ebbf3280c7cf5eac1b15aeff8857b31151abaec4d2987be015a66c2945d98" +SRC_URI[sha256sum] = "155d9c2dfb06a18104422987590858bfe5e9783ebebe63882e7e7f07eaaa512d" UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.14(\.\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_WHITELIST += "CVE-2011-2411" +CVE_CHECK_IGNORE += "CVE-2011-2411" # remove default added RDEPENDS on perl RDEPENDS:${PN}:remove = "perl" @@ -224,16 +224,16 @@ python samba_populate_packages() { mlprefix = d.getVar('MLPREFIX') or '' pam_libdir = d.expand('${base_libdir}/security') pam_pkgname = mlprefix + 'pam-plugin%s' - do_split_packages(d, pam_libdir, '^pam_(.*)\.so$', pam_pkgname, 'PAM plugin for %s', extra_depends='', prepend=True) + do_split_packages(d, pam_libdir, r'^pam_(.*)\.so$', pam_pkgname, 'PAM plugin for %s', extra_depends='', prepend=True) libdir = d.getVar('libdir') - do_split_packages(d, libdir, '^lib(.*)\.so\..*$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True, allow_links=True) + do_split_packages(d, libdir, r'^lib(.*)\.so\..*$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True, allow_links=True) pkglibdir = '%s/samba' % libdir - do_split_packages(d, pkglibdir, '^lib(.*)\.so$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True) + do_split_packages(d, pkglibdir, r'^lib(.*)\.so$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True) moduledir = '%s/samba/auth' % libdir - do_split_packages(d, moduledir, '^(.*)\.so$', 'samba-auth-%s', 'Samba %s authentication backend', hook=module_hook, extra_depends='', prepend=True) + do_split_packages(d, moduledir, r'^(.*)\.so$', 'samba-auth-%s', 'Samba %s authentication backend', hook=module_hook, extra_depends='', prepend=True) moduledir = '%s/samba/pdb' % libdir - do_split_packages(d, moduledir, '^(.*)\.so$', 'samba-pdb-%s', 'Samba %s password backend', hook=module_hook, extra_depends='', prepend=True) + do_split_packages(d, moduledir, r'^(.*)\.so$', 'samba-pdb-%s', 'Samba %s password backend', hook=module_hook, extra_depends='', prepend=True) } PACKAGESPLITFUNCS:prepend = "samba_populate_packages " diff --git a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.1.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.2.0.bb index 7b43b06781..a597fb3ccd 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.1.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.2.0.bb @@ -13,7 +13,7 @@ PROVIDES += "cyassl" RPROVIDES:${PN} = "cyassl" SRC_URI = "git://github.com/wolfSSL/wolfssl.git;protocol=https;branch=master" -SRCREV = "2b670c026debc8e70621eb5c75b60931c9aa0bc5" +SRCREV = "e6c07a296d2996e8d5c3cc615dfc50013bbcc794" S = "${WORKDIR}/git" |