diff options
Diffstat (limited to 'meta-oe/recipes-connectivity')
127 files changed, 2359 insertions, 1399 deletions
diff --git a/meta-oe/recipes-connectivity/ace/ace_6.5.10.bb b/meta-oe/recipes-connectivity/ace/ace_6.5.19.bb index df194f95a0..af4f2c54bb 100644 --- a/meta-oe/recipes-connectivity/ace/ace_6.5.10.bb +++ b/meta-oe/recipes-connectivity/ace/ace_6.5.19.bb @@ -7,14 +7,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d2c090e9c730fd91677782d8e2091d77" DEPENDS += "openssl gperf-native" -SRC_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_10/ACE-${PV}.tar.bz2 \ +SRC_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_19/ACE-${PV}.tar.bz2 \ file://ace_config.patch \ file://no_sysctl.patch \ " +SRC_URI[sha256sum] = "739be290a38229aaa5b5150e6ea55ce427e80970f0ace4c5040ac46644526f41" -SRC_URI[sha256sum] = "90de437926928e98e9fd9132c7c3e886ca79f25567adeccbc24a5996f230d8e2" - -COMPATIBLE_HOST_libc-musl = "null" +COMPATIBLE_HOST:libc-musl = "null" S = "${WORKDIR}/ACE_wrappers" B = "${WORKDIR}/ACE_wrappers/ace" @@ -22,8 +21,8 @@ export ACE_ROOT="${WORKDIR}/ACE_wrappers" inherit pkgconfig -CXXFLAGS_append = " -fpermissive -Wnodeprecated-declarations" - +CXXFLAGS:append = " -fpermissive -Wnodeprecated-declarations" +CXX:append = " -std=gnu++14 -ffile-prefix-map=${WORKDIR}= -fdebug-prefix-map=${WORKDIR}= " EXTRA_OEMAKE += "INSTALL_LIB=${baselib}" do_install() { 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/gammu/gammu_1.32.0.bb b/meta-oe/recipes-connectivity/gammu/gammu_1.42.0.bb index fd6b85ff2e..aa52f62572 100644 --- a/meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb +++ b/meta-oe/recipes-connectivity/gammu/gammu_1.42.0.bb @@ -1,21 +1,23 @@ SUMMARY = "GNU All Mobile Managment Utilities" SECTION = "console/network" -DEPENDS = "cmake-native virtual/libiconv libdbi mysql5 glib-2.0 udev libgudev unixodbc" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=a17cb0a873d252440acfdf9b3d0e7fbf" -HOMEPAGE = "http://www.gammu.org/" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +HOMEPAGE = "https://wammu.eu/" -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}/${PV}/${BP}.tar.bz2 \ +SRC_URI = "https://dl.cihar.com/${BPN}/releases/${BP}.tar.xz \ file://gammurc \ file://gammu-smsdrc \ " -SRC_URI[md5sum] = "8ea16c6b3cc48097a8e62311fe0e25b9" -SRC_URI[sha256sum] = "de67caa102aa4c8fbed5300e5a0262e40411c4cc79f4379a8d34eed797968fc3" +SRC_URI[sha256sum] = "d8f152314d7e4d3d643610d742845e0a016ce97c234ad4b1151574e1b09651ee" + +UPSTREAM_CHECK_URI = "https://dl.cihar.com/${BPN}/releases" + +DEPENDS = "cmake-native virtual/libiconv libdbi mysql5 glib-2.0 udev libgudev unixodbc" -inherit distutils3 cmake gettext +inherit cmake gettext -do_install_append() { +do_install:append() { # these files seem to only be used by symbian and trigger QA warnings rm -rf ${D}/usr/share/gammu #install default configuration files @@ -35,26 +37,24 @@ EXTRA_OECMAKE = " \ -DWITH_BLUETOOTH=OFF \ -DWITH_NOKIA_SUPPORT=OFF \ -DWITH_IRDA=OFF \ - -DWITH_PYTHON=OFF \ -DWITH_MySQL=ON \ -DWITH_Postgres=OFF \ " -PACKAGES =+ "${PN}-smsd libgammu libgsmsd python-${PN}" +PACKAGES =+ "${PN}-smsd libgammu libgsmsd" -FILES_${PN} = "${bindir}/gammu ${bindir}/jadmaker ${sysconfdir}/bash_completion.d/gammu \ +FILES:${PN} = "${bindir}/gammu ${bindir}/jadmaker ${sysconfdir}/bash_completion.d/gammu \ ${bindir}/gammu-detect ${sysconfdir}/gammurc" -CONFFILES_${PN} = "${sysconfdir}/gammurc" -FILES_${PN}-smsd = "${bindir}/gammu-smsd* ${sysconfdir}/gammu-smsdrc" -CONFFILES_${PN}-smsd = "${sysconfdir}/gammu-smsdrc" -FILES_${PN}-dev += "${bindir}/gammu-config ${libdir}/*.so" -FILES_${PN}-dbg += "${bindir}/.debug ${libdir}/.debug ${PYTHON_SITEPACKAGES_DIR}/gammu/.debug" -FILES_libgammu = "${libdir}/libGammu.so.*" -FILES_libgsmsd = "${libdir}/libgsmsd.so.*" -FILES_python-${PN} = "${PYTHON_SITEPACKAGES_DIR}/gammu/*.??" +CONFFILES:${PN} = "${sysconfdir}/gammurc" +FILES:${PN}-smsd = "${bindir}/gammu-smsd* ${sysconfdir}/gammu-smsdrc" +CONFFILES:${PN}-smsd = "${sysconfdir}/gammu-smsdrc" +FILES:${PN}-dev += "${bindir}/gammu-config ${libdir}/*.so" +FILES:${PN}-dbg += "${bindir}/.debug ${libdir}/.debug" +FILES:libgammu = "${libdir}/libGammu.so.*" +FILES:libgsmsd = "${libdir}/libgsmsd.so.*" -RDEPENDS_${PN} += "bash" -RDEPENDS_${PN}-dev += "bash" +RDEPENDS:${PN} += "bash" +RDEPENDS:${PN}-dev += "bash" # Fails to build with thumb-1 (qemuarm) # gammu-1.32.0/libgammu/service/sms/gsmems.c:542:1: internal compiler error: in patch_jump_insn, at cfgrtl.c:1275 diff --git a/meta-oe/recipes-connectivity/gammu/python3-gammu/0001-setup.py-StrictVersion-packaging.version.patch b/meta-oe/recipes-connectivity/gammu/python3-gammu/0001-setup.py-StrictVersion-packaging.version.patch new file mode 100644 index 0000000000..23fe4441dc --- /dev/null +++ b/meta-oe/recipes-connectivity/gammu/python3-gammu/0001-setup.py-StrictVersion-packaging.version.patch @@ -0,0 +1,49 @@ +From 96e8f0b2d13e890d9ffff8673f18dcc94290efb2 Mon Sep 17 00:00:00 2001 +From: Tim Orling <tim.orling@konsulko.com> +Date: Thu, 13 Jan 2022 20:06:33 -0600 +Subject: [PATCH] setup.py: StrictVersion -> packaging.version.* + +distutils is deprecated in Python 3.10 and will be removed in Python +3.12 [1] + +The recommended replacement for distutils.version is to use +packaging.version + +StrictVersion can be replaced by packaging.version.Version and helpers +like packaging.version.parse() + +[1] https://www.python.org/dev/peps/pep-0632/ +[2] https://packaging.pypa.io/en/latest/version.html + +Upstream-Status: Submitted [https://github.com/gammu/python-gammu/pull/67] + +Signed-off-by: Tim Orling <tim.orling@konsulko.com> +--- + setup.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/setup.py b/setup.py +index a458181..bffb09d 100755 +--- a/setup.py ++++ b/setup.py +@@ -30,7 +30,7 @@ import os + import platform + import subprocess + import sys +-from distutils.version import StrictVersion ++from packaging.version import parse, Version + + from setuptools import Extension, setup + +@@ -112,9 +112,9 @@ class GammuConfig: + with open(self.config_path(self.path)) as handle: + for line in handle: + if line.startswith("#define GAMMU_VERSION "): +- version = line.split('"')[1] ++ version = parse(line.split('"')[1]) + +- if version is None or StrictVersion(version) < StrictVersion(GAMMU_REQUIRED): ++ if version is None or version < parse(GAMMU_REQUIRED): + print("Too old Gammu version, please upgrade!") + sys.exit(100) + diff --git a/meta-oe/recipes-connectivity/gammu/python3-gammu_3.2.4.bb b/meta-oe/recipes-connectivity/gammu/python3-gammu_3.2.4.bb new file mode 100644 index 0000000000..1fdb76eeb4 --- /dev/null +++ b/meta-oe/recipes-connectivity/gammu/python3-gammu_3.2.4.bb @@ -0,0 +1,21 @@ +SUMMARY = "Gammu bindings for Python" +DESCRIPTION ="Python bindings for the Gammu library." +HOMEPAGE = "https://wammu.eu/python-gammu/" +BUGRACKER = "https://github.com/gammu/python-gammu/issues" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +PYPI_PACKAGE = "python-gammu" + +inherit pypi setuptools3 pkgconfig + +SRC_URI += "file://0001-setup.py-StrictVersion-packaging.version.patch" +SRC_URI[sha256sum] = "49fc70f01bc192c43ff3ec815e082df5261ea4c8d36a695e977734c4eb4df868" + +S = "${WORKDIR}/python-gammu-${PV}" + +DEPENDS += "gammu python3-packaging-native" + +RDEPENDS:${PN} += "python3-asyncio python3-core python3-threading" + +RRECOMMENDS:${PN} += "gammu" diff --git a/meta-oe/recipes-connectivity/gattlib/files/0001-cmake-Use-GNUInstallDirs.patch b/meta-oe/recipes-connectivity/gattlib/files/0001-cmake-Use-GNUInstallDirs.patch deleted file mode 100644 index ffe0a00673..0000000000 --- a/meta-oe/recipes-connectivity/gattlib/files/0001-cmake-Use-GNUInstallDirs.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 63dc2d0c9384d85482dc4cbb3c179b4b0bb18d4e Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 19 Dec 2019 22:32:01 -0800 -Subject: [PATCH] cmake: Use GNUInstallDirs - -Helps install cmakefiles in right libdir - -Upstream-Status: Submitted [https://github.com/labapart/gattlib/pull/139] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - CMakeLists.txt | 5 +++-- - dbus/CMakeLists.txt | 18 ++++++++++-------- - 2 files changed, 13 insertions(+), 10 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 12d8d71..ded7239 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -152,7 +152,8 @@ endif() - # - # List of file to install - # --install(FILES include/gattlib.h DESTINATION include) --install(FILES ${PROJECT_BINARY_DIR}/gattlib.pc DESTINATION lib/pkgconfig) -+include(GNUInstallDirs) -+install(FILES include/gattlib.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -+install(FILES ${PROJECT_BINARY_DIR}/gattlib.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - - include(CPack) -diff --git a/dbus/CMakeLists.txt b/dbus/CMakeLists.txt -index f5096ce..cef031f 100644 ---- a/dbus/CMakeLists.txt -+++ b/dbus/CMakeLists.txt -@@ -19,7 +19,7 @@ - # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - # - --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.0) - - find_package(PkgConfig REQUIRED) - -@@ -119,4 +119,6 @@ endif() - add_library(gattlib SHARED ${gattlib_SRCS}) - target_link_libraries(gattlib ${gattlib_LIBS}) - --install(TARGETS gattlib LIBRARY DESTINATION lib) -+include(GNUInstallDirs) -+ -+install(TARGETS gattlib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) --- -2.24.1 - 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 d79dbed87a..7ad28d594d 100644 --- a/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb +++ b/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb @@ -1,21 +1,19 @@ DESCRIPTION = "Bluetooth library with attribute support" SECTION = "libs/network" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://CMakeLists.txt;beginline=1;endline=20;md5=8d5efeb9189b60866baff80ff791bf00" +LICENSE = "GPL-2.0-or-later | BSD-3-Clause" +LIC_FILES_CHKSUM = "file://CMakeLists.txt;beginline=1;endline=6;md5=a87ee154f005a6f035b8b34ac2191f3b" -DEPENDS = "bluez5 glib-2.0" -DEPENDS += "glib-2.0-native" +DEPENDS = "bluez5 glib-2.0 glib-2.0-native python3-packaging-native" -PV = "0.2+git${SRCPV}" +PV = "0.2+git" -SRC_URI = "git://github.com/labapart/gattlib.git \ +SRC_URI = "git://github.com/labapart/gattlib.git;branch=master;protocol=https \ file://dbus-avoid-strange-chars-from-the-build-dir.patch \ - file://0001-cmake-Use-GNUInstallDirs.patch \ " SRCBRANCH = "master" -SRCREV = "5c7ee43bd70ee09a7170ddd55b9fdbdef69e9080" +SRCREV = "33a8a275928b186381bb0aea0f9778e330e57ec3" S = "${WORKDIR}/git" @@ -24,9 +22,17 @@ PACKAGECONFIG[examples] = "-DGATTLIB_BUILD_EXAMPLES=ON,-DGATTLIB_BUILD_EXAMPLES= # Set this to force use of DBus API if Bluez version is older than 5.42 PACKAGECONFIG[force-dbus] = "-DGATTLIB_FORCE_DBUS=TRUE,-DGATTLIB_FORCE_DBUS=FALSE" +EXTRA_OECMAKE += "-DGATTLIB_PYTHON_INTERFACE=OFF" EXTRA_OECMAKE += "-DGATTLIB_BUILD_DOCS=OFF" -inherit pkgconfig cmake +inherit pkgconfig cmake python3native -FILES_${PN} = "${libdir}/*" -FILES_${PN}-dev = "${includedir}/*" +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/0001-filter-Rename-some-variables-to-tr_stdxxx.patch b/meta-oe/recipes-connectivity/gensio/gensio/0001-filter-Rename-some-variables-to-tr_stdxxx.patch deleted file mode 100644 index dbc48a2134..0000000000 --- a/meta-oe/recipes-connectivity/gensio/gensio/0001-filter-Rename-some-variables-to-tr_stdxxx.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 601e6e56f44b91d957bb643662455f52540f336a Mon Sep 17 00:00:00 2001 -From: Corey Minyard <cminyard@mvista.com> -Date: Tue, 25 Feb 2020 16:08:40 -0600 -Subject: [PATCH] filter: Rename some variables to tr_stdxxx - -stdout and stderr can be macros, don't use the names directly. - -Signed-off-by: Corey Minyard <cminyard@mvista.com> -Upstream-Status: Backport [https://github.com/cminyard/gensio/commit/601e6e56f44b91d957bb643662455f52540f336a] -Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io> ---- - lib/gensio_filter_trace.c | 28 ++++++++++++++-------------- - 1 file changed, 14 insertions(+), 14 deletions(-) - -diff --git a/lib/gensio_filter_trace.c b/lib/gensio_filter_trace.c -index d39d58b..abe2db6 100644 ---- a/lib/gensio_filter_trace.c -+++ b/lib/gensio_filter_trace.c -@@ -32,8 +32,8 @@ struct trace_filter { - enum trace_dir dir; - bool raw; - char *filename; -- bool stdout; -- bool stderr; -+ bool tr_stdout; -+ bool tr_stderr; - - FILE *tr; - }; -@@ -82,9 +82,9 @@ trace_try_connect(struct gensio_filter *filter, struct timeval *timeout) - { - struct trace_filter *tfilter = filter_to_trace(filter); - -- if (tfilter->stdout) { -+ if (tfilter->tr_stdout) { - tfilter->tr = stdout; -- } else if (tfilter->stderr) { -+ } else if (tfilter->tr_stderr) { - tfilter->tr = stderr; - } else if (tfilter->filename) { - tfilter->tr = fopen(tfilter->filename, "a+"); -@@ -99,7 +99,7 @@ trace_try_disconnect(struct gensio_filter *filter, struct timeval *timeout) - { - struct trace_filter *tfilter = filter_to_trace(filter); - -- if (!tfilter->stdout && !tfilter->stderr && tfilter->tr) -+ if (!tfilter->tr_stdout && !tfilter->tr_stderr && tfilter->tr) - fclose(tfilter->tr); - tfilter->tr = NULL; - return 0; -@@ -331,12 +331,12 @@ static int gensio_trace_filter_func(struct gensio_filter *filter, int op, - - static struct gensio_filter * - gensio_trace_filter_raw_alloc(struct gensio_os_funcs *o, enum trace_dir dir, -- bool raw, const char *filename, bool stdout, -- bool stderr) -+ bool raw, const char *filename, bool tr_stdout, -+ bool tr_stderr) - { - struct trace_filter *tfilter; - -- if (!filename && !stdout && !stderr) -+ if (!filename && !tr_stdout && !tr_stderr) - dir = TRACE_NONE; - - tfilter = o->zalloc(o, sizeof(*tfilter)); -@@ -351,8 +351,8 @@ gensio_trace_filter_raw_alloc(struct gensio_os_funcs *o, enum trace_dir dir, - if (!tfilter->filename) - goto out_nomem; - } -- tfilter->stdout = stdout; -- tfilter->stderr = stderr; -+ tfilter->tr_stdout = tr_stdout; -+ tfilter->tr_stderr = tr_stderr; - - tfilter->lock = o->alloc_lock(o); - if (!tfilter->lock) -@@ -385,7 +385,7 @@ gensio_trace_filter_alloc(struct gensio_os_funcs *o, - { - struct gensio_filter *filter; - int dir = TRACE_NONE; -- bool raw = false, stdout = false, stderr = false; -+ bool raw = false, tr_stdout = false, tr_stderr = false; - const char *filename = NULL; - unsigned int i; - -@@ -396,15 +396,15 @@ gensio_trace_filter_alloc(struct gensio_os_funcs *o, - continue; - if (gensio_check_keyvalue(args[i], "file", &filename) > 0) - continue; -- if (gensio_check_keybool(args[i], "stdout", &stdout) > 0) -+ if (gensio_check_keybool(args[i], "stdout", &tr_stdout) > 0) - continue; -- if (gensio_check_keybool(args[i], "stderr", &stderr) > 0) -+ if (gensio_check_keybool(args[i], "stderr", &tr_stderr) > 0) - continue; - return GE_INVAL; - } - - filter = gensio_trace_filter_raw_alloc(o, dir, raw, filename, -- stdout, stderr); -+ tr_stdout, tr_stderr); - if (!filter) - return GE_NOMEM; - --- -2.7.4 - diff --git a/meta-oe/recipes-connectivity/gensio/gensio_1.5.3.bb b/meta-oe/recipes-connectivity/gensio/gensio_2.8.4.bb index 8c97662df5..1f85c46e2f 100644 --- a/meta-oe/recipes-connectivity/gensio/gensio_1.5.3.bb +++ b/meta-oe/recipes-connectivity/gensio/gensio_2.8.4.bb @@ -1,16 +1,13 @@ SUMMARY = "A library to abstract stream I/O like serial port, TCP, telnet, etc" HOMEPAGE = "https://github.com/cminyard/gensio" -LICENSE = "GPL-2.0 & LGPL-2.1" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a0fd36908af843bcee10cb6dfc47fa67 \ - file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f \ +LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ " -SRCREV = "95ec1ab31ee97411fc37156d12061adcf0331598" -PV = "1.5.3+git${SRCPV}" +SRCREV = "300644fc02b7099ca27ca5bac88c47e159ba8a6b" -SRC_URI = "git://github.com/cminyard/gensio;protocol=https \ - file://0001-filter-Rename-some-variables-to-tr_stdxxx.patch \ - " +SRC_URI = "git://github.com/cminyard/gensio;protocol=https;branch=master" S = "${WORKDIR}/git" @@ -24,4 +21,6 @@ PACKAGECONFIG[swig] = "--with-swig,--without-swig, swig" EXTRA_OECONF = "--without-python" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" + +FILES:${PN}-staticdev += "${libexecdir}/gensio/${PV}/libgensio_*.a" diff --git a/meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2019-16275.patch b/meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2019-16275.patch deleted file mode 100644 index 9cefd4f2ad..0000000000 --- a/meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2019-16275.patch +++ /dev/null @@ -1,79 +0,0 @@ -From d86d66dc073bc21d3b12faf4112062ae00c1773f Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Thu, 29 Aug 2019 11:52:04 +0300 -Subject: AP: Silently ignore management frame from unexpected source -address - -Do not process any received Management frames with unexpected/invalid SA -so that we do not add any state for unexpected STA addresses or end up -sending out frames to unexpected destination. This prevents unexpected -sequences where an unprotected frame might end up causing the AP to send -out a response to another device and that other device processing the -unexpected response. - -In particular, this prevents some potential denial of service cases -where the unexpected response frame from the AP might result in a -connected station dropping its association. - -Upstream-Status: Accepted -CVE: CVE-2019-16275 - -Reference to upstream patch: -https://w1.fi/cgit/hostap/commit/?id=d86d66dc073bc21d3b12faf4112062ae00c1773f - -Signed-off-by: Jouni Malinen <j@w1.fi> ---- - src/ap/drv_callbacks.c | 13 +++++++++++++ - src/ap/ieee802_11.c | 12 ++++++++++++ - 2 files changed, 25 insertions(+) - -diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c -index 3158768..34ca379 100644 ---- a/src/ap/drv_callbacks.c -+++ b/src/ap/drv_callbacks.c -@@ -131,6 +131,19 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr, - "hostapd_notif_assoc: Skip event with no address"); - return -1; - } -+ -+ if (is_multicast_ether_addr(addr) || -+ is_zero_ether_addr(addr) || -+ os_memcmp(addr, hapd->own_addr, ETH_ALEN) == 0) { -+ /* Do not process any frames with unexpected/invalid SA so that -+ * we do not add any state for unexpected STA addresses or end -+ * up sending out frames to unexpected destination. */ -+ wpa_printf(MSG_DEBUG, "%s: Invalid SA=" MACSTR -+ " in received indication - ignore this indication silently", -+ __func__, MAC2STR(addr)); -+ return 0; -+ } -+ - random_add_randomness(addr, ETH_ALEN); - - hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211, -diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c -index c85a28d..2816812 100644 ---- a/src/ap/ieee802_11.c -+++ b/src/ap/ieee802_11.c -@@ -4626,6 +4626,18 @@ int ieee802_11_mgmt(struct hostapd_data *hapd, const u8 *buf, size_t len, - fc = le_to_host16(mgmt->frame_control); - stype = WLAN_FC_GET_STYPE(fc); - -+ if (is_multicast_ether_addr(mgmt->sa) || -+ is_zero_ether_addr(mgmt->sa) || -+ os_memcmp(mgmt->sa, hapd->own_addr, ETH_ALEN) == 0) { -+ /* Do not process any frames with unexpected/invalid SA so that -+ * we do not add any state for unexpected STA addresses or end -+ * up sending out frames to unexpected destination. */ -+ wpa_printf(MSG_DEBUG, "MGMT: Invalid SA=" MACSTR -+ " in received frame - ignore this frame silently", -+ MAC2STR(mgmt->sa)); -+ return 0; -+ } -+ - if (stype == WLAN_FC_STYPE_BEACON) { - handle_beacon(hapd, mgmt, len, fi); - return 1; --- -2.17.1 - diff --git a/meta-oe/recipes-connectivity/hostapd/hostapd_2.9.bb b/meta-oe/recipes-connectivity/hostapd/hostapd_2.10.bb index 68dc123702..dbdc5c1bdf 100644 --- a/meta-oe/recipes-connectivity/hostapd/hostapd_2.9.bb +++ b/meta-oe/recipes-connectivity/hostapd/hostapd_2.10.bb @@ -2,7 +2,7 @@ SUMMARY = "User space daemon for extended IEEE 802.11 management" HOMEPAGE = "http://w1.fi/hostapd/" SECTION = "kernel/userland" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://hostapd/README;md5=1ec986bec88070e2a59c68c95d763f89" +LIC_FILES_CHKSUM = "file://hostapd/README;md5=c905478466c90f1cefc0df987c40e172" DEPENDS = "libnl openssl" @@ -11,11 +11,10 @@ SRC_URI = " \ file://defconfig \ file://init \ file://hostapd.service \ - file://CVE-2019-16275.patch \ " -SRC_URI[md5sum] = "f188fc53a495fe7af3b6d77d3c31dee8" -SRC_URI[sha256sum] = "881d7d6a90b2428479288d64233151448f8990ab4958e0ecaca7eeb3c9db2bd7" + +SRC_URI[sha256sum] = "206e7c799b678572c2e3d12030238784bc4a9f82323b0156b4c9466f1498915d" S = "${WORKDIR}/hostapd-${PV}" B = "${WORKDIR}/hostapd-${PV}/hostapd" @@ -26,10 +25,10 @@ CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers" INITSCRIPT_NAME = "hostapd" -SYSTEMD_SERVICE_${PN} = "hostapd.service" -SYSTEMD_AUTO_ENABLE_${PN} = "disable" +SYSTEMD_SERVICE:${PN} = "hostapd.service" +SYSTEMD_AUTO_ENABLE:${PN} = "disable" -do_configure_append() { +do_configure:append() { install -m 0644 ${WORKDIR}/defconfig ${B}/.config } @@ -49,4 +48,4 @@ do_install() { sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/hostapd.service } -CONFFILES_${PN} += "${sysconfdir}/hostapd.conf" +CONFFILES:${PN} += "${sysconfdir}/hostapd.conf" diff --git a/meta-oe/recipes-connectivity/ifplugd/ifplugd/0001-src-interface.h-Make-declarations-as-extern.patch b/meta-oe/recipes-connectivity/ifplugd/ifplugd/0001-src-interface.h-Make-declarations-as-extern.patch new file mode 100644 index 0000000000..77de9e6c52 --- /dev/null +++ b/meta-oe/recipes-connectivity/ifplugd/ifplugd/0001-src-interface.h-Make-declarations-as-extern.patch @@ -0,0 +1,31 @@ +From b990146a149e1729c12e4541a67e32ed1dd6e578 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 13 Aug 2020 19:41:08 -0700 +Subject: [PATCH] src/interface.h: Make declarations as extern + +Fixed build with -fno-common + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/interface.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/interface.h b/src/interface.h +index d223b1f..fd4a5f4 100644 +--- a/src/interface.h ++++ b/src/interface.h +@@ -21,8 +21,8 @@ + * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + +-int interface_auto_up; +-int interface_do_message; ++extern int interface_auto_up; ++extern int interface_do_message; + + typedef enum { IFSTATUS_UP, IFSTATUS_DOWN, IFSTATUS_ERR } interface_status_t; + +-- +2.28.0 + 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/ifplugd/ifplugd_0.28.bb b/meta-oe/recipes-connectivity/ifplugd/ifplugd_0.28.bb index 0b5c5a6ce8..62651bc308 100644 --- a/meta-oe/recipes-connectivity/ifplugd/ifplugd_0.28.bb +++ b/meta-oe/recipes-connectivity/ifplugd/ifplugd_0.28.bb @@ -1,14 +1,16 @@ DESCRIPTION = "ifplugd is a Linux daemon which will automatically configure your ethernet device \ when a cable is plugged in and automatically unconfigure it if the cable is pulled." HOMEPAGE = "http://0pointer.de/lennart/projects/ifplugd/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libdaemon" -SRC_URI = "http://0pointer.de/lennart/projects/ifplugd/ifplugd-${PV}.tar.gz" +SRC_URI = "http://0pointer.de/lennart/projects/ifplugd/ifplugd-${PV}.tar.gz \ + file://0001-src-interface.h-Make-declarations-as-extern.patch \ + " -SRC_URI_append_libc-musl = " file://Fix-build-with-musl.patch" +SRC_URI:append:libc-musl = " file://Fix-build-with-musl.patch" SRC_URI[md5sum] = "df6f4bab52f46ffd6eb1f5912d4ccee3" SRC_URI[sha256sum] = "474754ac4ab32d738cbf2a4a3e87ee0a2c71b9048a38bdcd7df1e4f9fd6541f0" @@ -20,6 +22,6 @@ EXTRA_OECONF = "--disable-lynx --with-initdir=${sysconfdir}/init.d" INITSCRIPT_NAME = "ifplugd" INITSCRIPT_PARAMS = "defaults" -CONFFILES_${PN} = "${sysconfdir}/ifplugd/ifplugd.conf" +CONFFILES:${PN} = "${sysconfdir}/ifplugd/ifplugd.conf" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" diff --git a/meta-oe/recipes-connectivity/irssi/irssi_1.2.2.bb b/meta-oe/recipes-connectivity/irssi/irssi_1.4.5.bb index 1c5a912f27..5b5af30607 100644 --- a/meta-oe/recipes-connectivity/irssi/irssi_1.2.2.bb +++ b/meta-oe/recipes-connectivity/irssi/irssi_1.4.5.bb @@ -1,13 +1,12 @@ SUMMARY = "ncurses IRC client" DESCRIPTION = "Irssi is an ncurses IRC client" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=55fdc1113306167d6ea2561404ce02f8" DEPENDS = "glib-2.0 ncurses openssl" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz" -SRC_URI[md5sum] = "8547f89e014e23e1bbbb665bcf7e2f70" -SRC_URI[sha256sum] = "6727060c918568ba2ff4295ad736128dba0b995d7b20491bca11f593bd857578" +SRC_URI[sha256sum] = "72a951cb0ad622785a8962801f005a3a412736c7e7e3ce152f176287c52fe062" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" @@ -19,4 +18,4 @@ EXTRA_OECONF += "--with-textui \ --with-perl=no \ --enable-true-color" -FILES_${PN}-staticdev += "${libdir}/${BPN}/modules/*.a" +FILES:${PN}-staticdev += "${libdir}/${BPN}/modules/*.a" diff --git a/meta-oe/recipes-connectivity/iwd/iwd/0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch b/meta-oe/recipes-connectivity/iwd/iwd/0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch new file mode 100644 index 0000000000..9ed73104ee --- /dev/null +++ b/meta-oe/recipes-connectivity/iwd/iwd/0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch @@ -0,0 +1,37 @@ +From b0b51d762f45ff9d320b96bd0acb89313148a446 Mon Sep 17 00:00:00 2001 +From: Zang Ruochen <zangrc.fnst@fujitsu.com> +Date: Wed, 12 May 2021 14:28:24 +0900 +Subject: [PATCH] build: Use abs_top_srcdir instead of abs_srcdir for ell sources + +this makes it build when build dir is outside of sources dir + +Upstream-Status: Submitted [https://lists.01.org/hyperkitty/list/iwd@lists.01.org/message/SYX6Z7SUQHU7UWM6ECZTTJ6SPODIS6KB/] +--- + Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 68035e4..e3f7990 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -628,7 +628,7 @@ ell/shared: Makefile + $(AM_V_at)$(MKDIR_P) ell + $(AM_V_GEN)for f in $(ell_shared) ; do \ + if [ ! -f $$f ] ; then \ +- $(LN_S) -t ell -f $(abs_srcdir)/../ell/$$f ; \ ++ $(LN_S) -t ell -f $(abs_top_srcdir)/ell/$$f ; \ + fi \ + done > $@ + +@@ -636,7 +636,7 @@ ell/internal: Makefile + $(AM_V_at)$(MKDIR_P) ell + $(AM_V_GEN)for f in $(ell_headers) $(ell_sources) ; do \ + if [ ! -f $$f ] ; then \ +- $(LN_S) -t ell -f $(abs_srcdir)/../ell/$$f ; \ ++ $(LN_S) -t ell -f $(abs_top_srcdir)/ell/$$f ; \ + fi \ + done > $@ + +-- +2.25.1 + diff --git a/meta-oe/recipes-connectivity/iwd/iwd_1.8.bb b/meta-oe/recipes-connectivity/iwd/iwd_2.16.bb index bfbf3c7fa6..a6bb7085ea 100644 --- a/meta-oe/recipes-connectivity/iwd/iwd_1.8.bb +++ b/meta-oe/recipes-connectivity/iwd/iwd_2.16.bb @@ -1,13 +1,14 @@ SUMMARY = "Wireless daemon for Linux" HOMEPAGE = "https://iwd.wiki.kernel.org/" -LICENSE = "LGPL-2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" DEPENDS = "ell" -SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git" -SRCREV = "a01754f56aacdc641c819f983c3c0ad374be77b2" -S = "${WORKDIR}/git" +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] = "c1a82032e994861e794cf3b5a16d07ae1aa03a6674f716c73408ffeae2a233ba" inherit autotools manpages pkgconfig python3native systemd @@ -25,29 +26,29 @@ PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--dis EXTRA_OECONF = "--enable-external-ell" -SYSTEMD_SERVICE_${PN} = " \ +SYSTEMD_SERVICE:${PN} = " \ iwd.service \ ${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)} \ " -do_configure_prepend() { +do_configure:prepend() { install -d ${S}/build-aux } -do_install_append() { +do_install:append() { # If client and monitor are disabled, bindir is empty, causing a QA error rmdir --ignore-fail-on-non-empty ${D}/${bindir} } -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/dbus-1 \ ${nonarch_libdir}/modules-load.d \ ${systemd_unitdir}/network \ " -RDEPENDS_${PN} = "dbus" +RDEPENDS:${PN} = "dbus" -RRECOMMENDS_${PN} = "\ +RRECOMMENDS:${PN} = "\ kernel-module-pkcs7-message \ kernel-module-pkcs8-key-parser \ kernel-module-x509-key-parser \ diff --git a/meta-oe/recipes-connectivity/krb5/krb5/0001-aclocal-Add-parameter-to-disable-keyutils-detection.patch b/meta-oe/recipes-connectivity/krb5/krb5/0001-aclocal-Add-parameter-to-disable-keyutils-detection.patch deleted file mode 100644 index cbd5d71fdf..0000000000 --- a/meta-oe/recipes-connectivity/krb5/krb5/0001-aclocal-Add-parameter-to-disable-keyutils-detection.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a9e4057bfda190ad365b503af058b460ab8c7616 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Tue, 1 Oct 2013 22:22:57 +0200 -Subject: [PATCH] aclocal: Add parameter to disable keyutils detection - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> - ---- - aclocal.m4 | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/aclocal.m4 b/aclocal.m4 -index d6d1279..80ce604 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -1679,12 +1679,16 @@ fi - dnl - dnl If libkeyutils exists (on Linux) include it and use keyring ccache - AC_DEFUN(KRB5_AC_KEYRING_CCACHE,[ -+AC_ARG_ENABLE([keyutils], -+AC_HELP_STRING([--disable-keyutils],don't enable using keyutils for keyring ccache @<:@enabled@:>@), , enable_keyutils=yes) -+if test "$enable_keyutils" = yes; then - AC_CHECK_HEADERS([keyutils.h], - AC_CHECK_LIB(keyutils, add_key, - [dnl Pre-reqs were found - AC_DEFINE(USE_KEYRING_CCACHE, 1, [Define if the keyring ccache should be enabled]) - LIBS="-lkeyutils $LIBS" - ])) -+fi - ])dnl - dnl - dnl If libkeyutils supports persistent keyrings, use them diff --git a/meta-oe/recipes-connectivity/krb5/krb5_1.17.1.bb b/meta-oe/recipes-connectivity/krb5/krb5_1.21.2.bb index 6164c82480..7af33e4e7e 100644 --- a/meta-oe/recipes-connectivity/krb5/krb5_1.17.1.bb +++ b/meta-oe/recipes-connectivity/krb5/krb5_1.21.2.bb @@ -14,14 +14,12 @@ DESCRIPTION = "Kerberos is a system for authenticating users and services on a n HOMEPAGE = "http://web.mit.edu/Kerberos/" SECTION = "console/network" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${S}/../NOTICE;md5=aff541e7261f1926ac6a2a9a7bbab839" -DEPENDS = "bison-native ncurses util-linux e2fsprogs e2fsprogs-native openssl" +LIC_FILES_CHKSUM = "file://${S}/../NOTICE;md5=32cb3a99207053d9f5c1ef177c4d6e34" -inherit autotools-brokensep binconfig perlnative systemd update-rc.d +inherit autotools-brokensep binconfig perlnative systemd update-rc.d pkgconfig SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "http://web.mit.edu/kerberos/dist/${BPN}/${SHRT_VER}/${BP}.tar.gz \ - file://0001-aclocal-Add-parameter-to-disable-keyutils-detection.patch \ file://debian-suppress-usr-lib-in-krb5-config.patch;striplevel=2 \ file://crosscompile_nm.patch \ file://etc/init.d/krb5-kdc \ @@ -31,30 +29,32 @@ SRC_URI = "http://web.mit.edu/kerberos/dist/${BPN}/${SHRT_VER}/${BP}.tar.gz \ file://krb5-kdc.service \ file://krb5-admin-server.service \ " -SRC_URI[md5sum] = "417d654c72526ac51466e7fe84608878" -SRC_URI[sha256sum] = "3706d7ec2eaa773e0e32d3a87bf742ebaecae7d064e190443a3acddfd8afb181" + +SRC_URI[sha256sum] = "9560941a9d843c0243a71b17a7ac6fe31c7cebb5bce3983db79e52ae7e850491" CVE_PRODUCT = "kerberos" CVE_VERSION = "5-${PV}" S = "${WORKDIR}/${BP}/src" +DEPENDS = "bison-native ncurses util-linux e2fsprogs e2fsprogs-native openssl" + PACKAGECONFIG ??= "pkinit" PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit" PACKAGECONFIG[openssl] = "--with-crypto-impl=openssl,,openssl" -PACKAGECONFIG[keyutils] = "--enable-keyutils,--disable-keyutils,keyutils" +PACKAGECONFIG[keyutils] = "--with-keyutils,--without-keyutils,keyutils" PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" PACKAGECONFIG[pkinit] = "--enable-pkinit, --disable-pkinit" -EXTRA_OECONF += " --without-tcl --with-system-et --disable-rpath" +EXTRA_OECONF += "--with-system-et --disable-rpath" CACHED_CONFIGUREVARS += "krb5_cv_attr_constructor_destructor=yes ac_cv_func_regcomp=yes \ ac_cv_printf_positional=yes ac_cv_file__etc_environment=yes \ ac_cv_file__etc_TIMEZONE=no" -CFLAGS_append = " -fPIC -DDESTRUCTOR_ATTR_WORKS=1 -I${STAGING_INCDIR}/et" -CFLAGS_append_riscv64 = " -D_REENTRANT -pthread" -LDFLAGS_append = " -pthread" +CFLAGS:append = " -fPIC -DDESTRUCTOR_ATTR_WORKS=1 -I${STAGING_INCDIR}/et" +CFLAGS:append:riscv64 = " -D_REENTRANT -pthread" +LDFLAGS:append = " -pthread" do_configure() { gnu-configize --force @@ -62,7 +62,7 @@ do_configure() { oe_runconf } -do_install_append() { +do_install:append() { rm -rf ${D}/${localstatedir}/run rm -f ${D}${bindir}/sclient rm -f ${D}${bindir}/sim_client @@ -83,6 +83,7 @@ do_install_append() { echo "RUN_KADMIND=true" >> ${D}/${sysconfdir}/default/krb5-admin-server fi + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d echo "d /run/krb5kdc - - - -" \ @@ -95,46 +96,51 @@ do_install_append() { install -m 0644 ${WORKDIR}/krb5-admin-server.service ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/krb5-kdc.service ${D}${systemd_system_unitdir} fi + + sed -e 's@[^ ]*-ffile-prefix-map=[^ "]*@@g' \ + -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \ + -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \ + -i ${D}${bindir}/krb5-config } -PACKAGES =+ "${PN}-admin-server \ - ${PN}-gss-samples \ - ${PN}-k5tls \ - ${PN}-kdc \ - ${PN}-kdc-ldap \ - ${PN}-kpropd \ - ${PN}-otp \ - ${PN}-pkinit \ - ${PN}-spake \ - ${PN}-user \ - libgssapi-krb5 \ - libgssrpc \ - libk5crypto \ - libkadm5clnt-mit \ - libkadm5srv-mit \ - libkdb5 \ - libkrad \ - libkrb5 \ - libkrb5support \ - libverto" - -FILES_${PN} = "${libdir}/krb5/plugins/preauth/test.so" -FILES_${PN}-doc += "${datadir}/examples" -FILES_${PN}-dbg += "${libdir}/krb5/plugins/*/.debug" - -FILES_${PN}-admin-server = "${sbindir}/kadmin.local \ +PACKAGE_BEFORE_PN =+ "${PN}-admin-server \ + ${PN}-gss-samples \ + ${PN}-k5tls \ + ${PN}-kdc \ + ${PN}-kdc-ldap \ + ${PN}-kpropd \ + ${PN}-otp \ + ${PN}-pkinit \ + ${PN}-spake \ + ${PN}-user \ + libgssapi-krb5 \ + libgssrpc \ + libk5crypto \ + libkadm5clnt-mit \ + libkadm5srv-mit \ + libkdb5 \ + libkrad \ + libkrb5 \ + libkrb5support \ + libverto" + +FILES:${PN} = "${libdir}/krb5/plugins/preauth/test.so" +FILES:${PN}-doc += "${datadir}/examples" +FILES:${PN}-dbg += "${libdir}/krb5/plugins/*/.debug" + +FILES:${PN}-admin-server = "${sbindir}/kadmin.local \ ${sbindir}/kadmind \ ${sbindir}/kprop \ ${sysconfdir}/default/krb5-admin-server \ ${sysconfdir}/init.d/krb5-admin-server \ ${systemd_system_unitdir}/krb5-admin-server.service" -FILES_${PN}-gss-samples = "${bindir}/gss-client \ +FILES:${PN}-gss-samples = "${bindir}/gss-client \ ${sbindir}/gss-server" -FILES_${PN}-k5tls = "${libdir}/krb5/plugins/tls/k5tls.so" +FILES:${PN}-k5tls = "${libdir}/krb5/plugins/tls/k5tls.so" -FILES_${PN}-kdc = "${libdir}/krb5/plugins/kdb/db2.so \ +FILES:${PN}-kdc = "${libdir}/krb5/plugins/kdb/db2.so \ ${localstatedir}/krb5kdc \ ${sbindir}/kdb5_util \ ${sbindir}/kproplog \ @@ -145,41 +151,41 @@ FILES_${PN}-kdc = "${libdir}/krb5/plugins/kdb/db2.so \ ${sysconfdir}/tmpfiles.d/krb5.conf \ ${systemd_system_unitdir}/krb5-kdc.service" -FILES_${PN}-kdc-ldap = "${libdir}/krb5/libkdb_ldap${SOLIBS} \ +FILES:${PN}-kdc-ldap = "${libdir}/krb5/libkdb_ldap${SOLIBS} \ ${libdir}/krb5/plugins/kdb/kldap.so \ ${sbindir}/kdb5_ldap_util" -FILES_${PN}-kpropd = "${sbindir}/kpropd" -FILES_${PN}-otp = "${libdir}/krb5/plugins/preauth/otp.so" -FILES_${PN}-pkinit = "${libdir}/krb5/plugins/preauth/pkinit.so" -FILES_${PN}-spake = "${libdir}/krb5/plugins/preauth/spake.so" -FILES_${PN}-user = "${bindir}/k*" - -FILES_libgssapi-krb5 = "${libdir}/libgssapi_krb5${SOLIBS}" -FILES_libgssrpc = "${libdir}/libgssrpc${SOLIBS}" -FILES_libk5crypto = "${libdir}/libk5crypto${SOLIBS}" -FILES_libkadm5clnt-mit = "${libdir}/libkadm5clnt_mit${SOLIBS}" -FILES_libkadm5srv-mit = "${libdir}/libkadm5srv_mit${SOLIBS}" -FILES_libkdb5 = "${libdir}/libkdb5${SOLIBS}" -FILES_libkrad = "${libdir}/libkrad${SOLIBS}" -FILES_libkrb5 = "${libdir}/libkrb5${SOLIBS} \ +FILES:${PN}-kpropd = "${sbindir}/kpropd" +FILES:${PN}-otp = "${libdir}/krb5/plugins/preauth/otp.so" +FILES:${PN}-pkinit = "${libdir}/krb5/plugins/preauth/pkinit.so" +FILES:${PN}-spake = "${libdir}/krb5/plugins/preauth/spake.so" +FILES:${PN}-user = "${bindir}/k*" + +FILES:libgssapi-krb5 = "${libdir}/libgssapi_krb5${SOLIBS}" +FILES:libgssrpc = "${libdir}/libgssrpc${SOLIBS}" +FILES:libk5crypto = "${libdir}/libk5crypto${SOLIBS}" +FILES:libkadm5clnt-mit = "${libdir}/libkadm5clnt_mit${SOLIBS}" +FILES:libkadm5srv-mit = "${libdir}/libkadm5srv_mit${SOLIBS}" +FILES:libkdb5 = "${libdir}/libkdb5${SOLIBS}" +FILES:libkrad = "${libdir}/libkrad${SOLIBS}" +FILES:libkrb5 = "${libdir}/libkrb5${SOLIBS} \ ${libdir}/krb5/plugins/authdata \ ${libdir}/krb5/plugins/libkrb5" -FILES_libkrb5support = "${libdir}/libkrb5support${SOLIBS}" -FILES_libverto = "${libdir}/libverto${SOLIBS}" +FILES:libkrb5support = "${libdir}/libkrb5support${SOLIBS}" +FILES:libverto = "${libdir}/libverto${SOLIBS}" -RDEPENDS_${PN}-kadmin-server = "${PN}-kdc" -RDEPENDS_${PN}-kpropd = "${PN}-kdc" +RDEPENDS:${PN}-kadmin-server = "${PN}-kdc" +RDEPENDS:${PN}-kpropd = "${PN}-kdc" INITSCRIPT_PACKAGES = "${PN}-admin-server ${PN}-kdc" -INITSCRIPT_NAME_${PN}-admin-server = "krb5-admin-server" -INITSCRIPT_NAME_${PN}-kdc = "krb5-kdc" +INITSCRIPT_NAME:${PN}-admin-server = "krb5-admin-server" +INITSCRIPT_NAME:${PN}-kdc = "krb5-kdc" SYSTEMD_PACKAGES = "${PN}-admin-server ${PN}-kdc" -SYSTEMD_SERVICE_${PN}-admin-server = "krb5-admin-server.service" -SYSTEMD_SERVICE_${PN}-kdc = "krb5-kdc.service" +SYSTEMD_SERVICE:${PN}-admin-server = "krb5-admin-server.service" +SYSTEMD_SERVICE:${PN}-kdc = "krb5-kdc.service" -pkg_postinst_${PN}-kdc () { +pkg_postinst:${PN}-kdc () { if [ -z "$D" ]; then if command -v systemd-tmpfiles >/dev/null; then systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/krb5.conf @@ -190,3 +196,6 @@ pkg_postinst_${PN}-kdc () { } BBCLASSEXTEND = "native nativesdk" + +inherit multilib_script +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/krb5-config" diff --git a/meta-oe/recipes-connectivity/libev/libev_4.33.bb b/meta-oe/recipes-connectivity/libev/libev_4.33.bb index 760c2dbce4..346e78b1de 100644 --- a/meta-oe/recipes-connectivity/libev/libev_4.33.bb +++ b/meta-oe/recipes-connectivity/libev/libev_4.33.bb @@ -1,7 +1,7 @@ SUMMARY = "A full-featured and high-performance event loop that is loosely \ modelled after libevent." HOMEPAGE = "http://software.schmorp.de/pkg/libev.html" -LICENSE = "BSD-2-Clause | GPL-2.0+" +LICENSE = "BSD-2-Clause | GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=d6ad416afd040c90698edcdf1cbee347" SRC_URI = "http://dist.schmorp.de/libev/Attic/${BP}.tar.gz" @@ -12,7 +12,7 @@ inherit autotools EXTRA_OECONF += "--with-pic" -do_install_append() { +do_install:append() { # Avoid conflicting with libevent. The provided compatibility layer is # still basic so drop it for now. rm ${D}${includedir}/event.h diff --git a/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_git.bb b/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_git.bb new file mode 100644 index 0000000000..d37c547c98 --- /dev/null +++ b/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_git.bb @@ -0,0 +1,17 @@ +SUMMARY = "Library with common code used by the libraries and tools around the libimobiledevice project" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "\ + file://COPYING;md5=6ab17b41640564434dda85c06b7124f7 \ +" + +HOMEPAGE = "http://www.libimobiledevice.org/" + +DEPENDS = "libplist" + +PV = "1.0.0+git" + +SRCREV = "114098d30e783fbb3def5c9b49427a86621cfcb1" +SRC_URI = "git://github.com/libimobiledevice/libimobiledevice-glue;protocol=https;branch=master" + +S = "${WORKDIR}/git" +inherit autotools pkgconfig 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_git.bb index bcedd6297e..b8d7e8872b 100644 --- a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.3.0.bb +++ b/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb @@ -1,17 +1,22 @@ SUMMARY = "A protocol library to access an iPhone or iPod Touch in Linux" -LICENSE = "GPLv2 & LGPLv2.1" +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" +DEPENDS = "libplist usbmuxd libusbmuxd libtasn1 gnutls libgcrypt libimobiledevice-glue openssl" -SRCREV = "15f8652126664e3a4b980e5d1c039b9053ce8566" -SRC_URI = "git://github.com/libimobiledevice/libimobiledevice;protocol=https" +PV = "1.3.0+git" + +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 EXTRA_OECONF = " --without-cython " + +CFLAGS += "-D_GNU_SOURCE" diff --git a/meta-oe/recipes-connectivity/libirecovery/libirecovery_git.bb b/meta-oe/recipes-connectivity/libirecovery/libirecovery_git.bb new file mode 100644 index 0000000000..2400195975 --- /dev/null +++ b/meta-oe/recipes-connectivity/libirecovery/libirecovery_git.bb @@ -0,0 +1,17 @@ +SUMMARY = "The libirecovery library allows communication with iBoot/iBSS of iOS devices via USB" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "\ + file://COPYING;md5=23c2a5e0106b99d75238986559bb5fc6 \ +" + +HOMEPAGE = "http://www.libimobiledevice.org/" + +DEPENDS = "libimobiledevice-glue libusb1 readline" + +PV = "1.1.0" + +SRCREV = "98c9f7055ec1f2e09fac69ef1413a8757113b838" +SRC_URI = "git://github.com/libimobiledevice/libirecovery;protocol=https;branch=master" + +S = "${WORKDIR}/git" +inherit autotools pkgconfig diff --git a/meta-oe/recipes-connectivity/libmbim/libmbim_1.24.2.bb b/meta-oe/recipes-connectivity/libmbim/libmbim_1.24.2.bb deleted file mode 100644 index c7a04b6642..0000000000 --- a/meta-oe/recipes-connectivity/libmbim/libmbim_1.24.2.bb +++ /dev/null @@ -1,17 +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 = "GPLv2 & LGPLv2.1" -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[md5sum] = "6c2b490af87773c8446f37536e7411ac" -SRC_URI[sha256sum] = "32198c099987849c5f442d1cbf4b6e43e645cbdbe9cfdc197b19ddd63c6981e4" diff --git a/meta-oe/recipes-connectivity/libmbim/libmbim_1.30.0.bb b/meta-oe/recipes-connectivity/libmbim/libmbim_1.30.0.bb new file mode 100644 index 0000000000..a227124498 --- /dev/null +++ b/meta-oe/recipes-connectivity/libmbim/libmbim_1.30.0.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 upstream-version-is-even + +SRCREV = "8415687e4f30ae5e36f407f179c8147f1529725c" +SRC_URI = "git://gitlab.freedesktop.org/mobile-broadband/libmbim.git;protocol=https;branch=mbim-1-30" + +S = "${WORKDIR}/git" + +EXTRA_OEMESON = " \ + -Dgtk_doc=false \ + -Dman=false \ +" diff --git a/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.17.bb b/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.17.bb deleted file mode 100644 index 54decbccfd..0000000000 --- a/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.17.bb +++ /dev/null @@ -1,50 +0,0 @@ -# TODO: include debian's mtp-tools man page (needs xsltproc-native and -# docbook-xsl-native, or we pregenerate it), add support for doxygen -# generation fully with -natives -DESCRIPTION = "libmtp is an Initiator implementation of the Media Transfer \ -Protocol (MTP) in the form of a library suitable primarily for POSIX \ -compliant operating systems" -SUMMARY = "libmtp is an Initiator implementation of the Media Transfer Protocol (MTP)" -HOMEPAGE = "http://libmtp.sourceforge.net/" -LICENSE = "LGPL-2.1+" -LIC_FILES_CHKSUM = "\ - file://COPYING;md5=0448d3676bc0de00406af227d341a4d1 \ - file://src/ptp.c;beginline=3;endline=22;md5=303cc4422fd549ef8689aded20434a9a \ - file://examples/albums.c;beginline=5;endline=21;md5=84f4e55dfec49e898b7f68a828c15620 \ -" - -BBCLASSEXTEND = "native" - -DEPENDS = "libusb1 gettext-native" -DEPENDS_append_class-target = " ${BPN}-native" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" -SRC_URI_append_class-target = " file://0001-Use-native-mtp-hotplug.patch" - -SRC_URI[md5sum] = "81aea5d3139e5189c2e055ed2c98cd91" -SRC_URI[sha256sum] = "f8a34cf52d9f9b9cb8c7f26b12da347d4af7eb904c13189602e4c6b62d1a79dc" - -inherit autotools pkgconfig lib_package - -EXTRA_OECONF += " \ - --disable-rpath \ - --with-udev=${nonarch_base_libdir}/udev \ -" - -PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'largefile', d)}" -PACKAGECONFIG[doxygen] = "--enable-doxygen,--disable-doxygen" -PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile" -PACKAGECONFIG[mtpz] = "--enable-mtpz,--disable-mtpz,libgcrypt" - -PACKAGES =+ "${BPN}-common ${BPN}-runtime" - -RDEPENDS_${BPN} += "libmtp-common" -RRECOMMENDS_${BPN} += "libmtp-runtime ${PN}-bin" - -FILES_${BPN}-common = "${nonarch_base_libdir}/udev/rules.d/*" -SUMMARY_${BPN}-common = "The udev rules file for MTP devices" - -FILES_${BPN}-runtime = "${nonarch_base_libdir}/udev/mtp-probe" -RDEPENDS_${BPN}-runtime = "libmtp-common" -SUMMARY_${BPN}-runtime = "mtp-probe, used for the MTP udev rules" -DESCRIPTION_${BPN}-runtime = "This package provides mtp-probe, a program to probe newly connected device interfaces from userspace to determine if they are MTP devices, used for udev rules." diff --git a/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.21.bb b/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.21.bb new file mode 100644 index 0000000000..94cbef8fc1 --- /dev/null +++ b/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.21.bb @@ -0,0 +1,47 @@ +# TODO: include debian's mtp-tools man page (needs xsltproc-native and +# docbook-xsl-native, or we pregenerate it), add support for doxygen +# generation fully with -natives +DESCRIPTION = "libmtp is an Initiator implementation of the Media Transfer \ +Protocol (MTP) in the form of a library suitable primarily for POSIX \ +compliant operating systems" +SUMMARY = "libmtp is an Initiator implementation of the Media Transfer Protocol (MTP)" +HOMEPAGE = "http://libmtp.sourceforge.net/" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=0448d3676bc0de00406af227d341a4d1 \ + file://src/ptp.c;beginline=3;endline=22;md5=80fd2d5904c4c1f5455d8f4bf515292f \ + file://examples/albums.c;beginline=5;endline=21;md5=84f4e55dfec49e898b7f68a828c15620 \ + " + +BBCLASSEXTEND = "native" + +DEPENDS = "libusb1 gettext-native" +DEPENDS:append:class-target = " ${BPN}-native" + +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz" +SRC_URI:append:class-target = " file://0001-Use-native-mtp-hotplug.patch" +SRC_URI[sha256sum] = "f4c1ceb3df020a6cb851110f620c14fe399518c494ed252039cbfb4e34335135" + +inherit autotools pkgconfig lib_package + +EXTRA_OECONF += " \ + --disable-rpath \ + --enable-largefile \ + --with-udev=${nonarch_base_libdir}/udev \ +" + +PACKAGECONFIG ?= "" +PACKAGECONFIG[doxygen] = "--enable-doxygen,--disable-doxygen,doxygen-native" +PACKAGECONFIG[mtpz] = "--enable-mtpz,--disable-mtpz,libgcrypt" + +PACKAGES =+ "${BPN}-common ${BPN}-runtime" + +RDEPENDS:${BPN} += "libmtp-common" +RRECOMMENDS:${BPN} += "libmtp-runtime ${PN}-bin" + +FILES:${BPN}-common = "${nonarch_base_libdir}/udev/rules.d/*" +SUMMARY:${BPN}-common = "The udev rules file for MTP devices" + +FILES:${BPN}-runtime = "${nonarch_base_libdir}/udev/mtp-probe" +RDEPENDS:${BPN}-runtime = "libmtp-common" +SUMMARY:${BPN}-runtime = "mtp-probe, used for the MTP udev rules" +DESCRIPTION:${BPN}-runtime = "This package provides mtp-probe, a program to probe newly connected device interfaces from userspace to determine if they are MTP devices, used for udev rules." diff --git a/meta-oe/recipes-connectivity/libndp/libndp_1.7.bb b/meta-oe/recipes-connectivity/libndp/libndp_1.8.bb index 07a7a1d239..4d4d3e51cd 100644 --- a/meta-oe/recipes-connectivity/libndp/libndp_1.7.bb +++ b/meta-oe/recipes-connectivity/libndp/libndp_1.8.bb @@ -1,12 +1,12 @@ SUMMARY = "Library for IPv6 Neighbor Discovery Protocol" HOMEPAGE = "http://libndp.org/" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = "git://github.com/jpirko/libndp \ +SRC_URI = "git://github.com/jpirko/libndp;branch=master;protocol=https \ " -# tag for v1.6 -SRCREV = "96674e7d4f4d569c2c961e865cc16152dfab5f09" +# tag for v1.8 +SRCREV = "009ce9cd9b950ffa1f4f94c9436027b936850d0c" S = "${WORKDIR}/git" inherit autotools diff --git a/meta-oe/recipes-connectivity/libnet/libnet/0001-Support-musl-libc-remove-support-for-glibc-2.1.patch b/meta-oe/recipes-connectivity/libnet/libnet/0001-Support-musl-libc-remove-support-for-glibc-2.1.patch deleted file mode 100644 index 98008dba94..0000000000 --- a/meta-oe/recipes-connectivity/libnet/libnet/0001-Support-musl-libc-remove-support-for-glibc-2.1.patch +++ /dev/null @@ -1,58 +0,0 @@ -From ffd7fab744a9ad2893169a8fb6244074604d5d0d Mon Sep 17 00:00:00 2001 -From: rofl0r <retnyg@gmx.net> -Date: Tue, 12 Aug 2014 21:51:39 +0200 -Subject: [PATCH] Support musl libc, remove support for glibc < 2.1 - -Upstream-Status: Backport - -The workarounds for glibc < 2.1 (was released february 1999) break the -build with musl libc. - -It is very unlikely that 2.0 or earlier is still in use, and if so, -1) that's a big security hole -2) code wouldnt compile anyway since noone tested build in the last decade -3) user of it wouldn't expect anyway to get bleeding edge sw built on it, - so he would just use the latest version that works for him. - -Closes #52 - -Signed-off-by: rofl0r <retnyg@gmx.net> -Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> ---- - libnet/src/libnet_link_linux.c | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git a/src/libnet_link_linux.c b/src/libnet_link_linux.c -index 054458d..3c6df3c 100644 ---- a/src/libnet_link_linux.c -+++ b/src/libnet_link_linux.c -@@ -30,26 +30,15 @@ - #include <sys/time.h> - - #include <net/if.h> --#if (__GLIBC__) - #include <netinet/if_ether.h> - #include <net/if_arp.h> --#else --#include <linux/if_arp.h> --#include <linux/if_ether.h> --#endif - - #if (HAVE_PACKET_SOCKET) - #ifndef SOL_PACKET - #define SOL_PACKET 263 - #endif /* SOL_PACKET */ --#if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1 - #include <netpacket/packet.h> - #include <net/ethernet.h> /* the L2 protocols */ --#else --#include <asm/types.h> --#include <linux/if_packet.h> --#include <linux/if_ether.h> /* The L2 protocols */ --#endif - #endif /* HAVE_PACKET_SOCKET */ - - #include "../include/libnet.h" --- -1.9.1 - diff --git a/meta-oe/recipes-connectivity/libnet/libnet_1.2-rc3.bb b/meta-oe/recipes-connectivity/libnet/libnet_1.2-rc3.bb deleted file mode 100644 index 785abf66d6..0000000000 --- a/meta-oe/recipes-connectivity/libnet/libnet_1.2-rc3.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "A packet dissection and creation library" -# libnet at packetfactory.net is dead -HOMEPAGE = "https://github.com/sam-github/libnet" -SECTION = "libs" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://doc/COPYING;md5=3ec839e00408b484d33b472a86b7c266" -DEPENDS = "libpcap" -# There are major API changes beween libnet v1.0 and libnet v1.1 -PROVIDES = "libnet-1.2rc2" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libnet-dev/${BPN}-${PV}.tar.gz \ - file://0001-Support-musl-libc-remove-support-for-glibc-2.1.patch \ - " - -SRC_URI[md5sum] = "f051e6e5bdecddb90f77c701c2ca1804" -SRC_URI[sha256sum] = "72c380785ad44183005e654b47cc12485ee0228d7fa6b0a87109ff7614be4a63" - -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/libnet-dev/files/" -UPSTREAM_CHECK_REGEX = "libnet-(?P<pver>\d+(\.\d+)+-*[a-z]*\d*)\.tar" - -S = "${WORKDIR}/${BPN}-${PV}" - -inherit autotools binconfig - diff --git a/meta-oe/recipes-connectivity/libnet/libnet_1.3.bb b/meta-oe/recipes-connectivity/libnet/libnet_1.3.bb new file mode 100644 index 0000000000..b4648832f1 --- /dev/null +++ b/meta-oe/recipes-connectivity/libnet/libnet_1.3.bb @@ -0,0 +1,20 @@ +SUMMARY = "A packet dissection and creation library" +HOMEPAGE = "https://github.com/libnet/libnet" + +SECTION = "libs" + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=07f291bf6e78efa05cec668cf6a09acc" + +DEPENDS = "libpcap" + +SRC_URI = "git://github.com/libnet/libnet.git;protocol=https;branch=master" + +SRC_URI[sha256sum] = "1e9e9054d688b059bcbaf878d8c4fbf69bfc0c9386cd4e7779fbb53339050d2e" +SRCREV = "deaebdfe2743e8a6f04d3c307d9272afeeecfade" + +S = "${WORKDIR}/git" + +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..978f38d019 --- /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 5be774d..6b4fd25 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,11 +7,11 @@ project(libnfs + set(SOVERSION 11.2.0 CACHE STRING "" FORCE) + + set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for binaries") +-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 "${INSTALL_LIB_DIR}/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files") +-set(INSTALL_CMAKE_DIR "${INSTALL_LIB_DIR}/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/0001-cmake-Test-for-sys-uio.h.patch b/meta-oe/recipes-connectivity/libnfs/libnfs/0001-cmake-Test-for-sys-uio.h.patch new file mode 100644 index 0000000000..de3ab82292 --- /dev/null +++ b/meta-oe/recipes-connectivity/libnfs/libnfs/0001-cmake-Test-for-sys-uio.h.patch @@ -0,0 +1,44 @@ +From d0fa719d49f38777911a8e99717f2d4b30811080 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 12 Feb 2024 19:24:54 -0800 +Subject: [PATCH] cmake: Test for sys/uio.h + +writev() API is used in few places and it will need including sys/uio.h +for getting the funciton signature + +Upstream-Status: Submitted [https://github.com/sahlberg/libnfs/pull/440] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + cmake/ConfigureChecks.cmake | 1 + + cmake/config.h.cmake | 3 +++ + 2 files changed, 4 insertions(+) + +diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake +index 0258fc8..c26a02d 100644 +--- a/cmake/ConfigureChecks.cmake ++++ b/cmake/ConfigureChecks.cmake +@@ -22,6 +22,7 @@ check_include_file("sys/stat.h" HAVE_SYS_STAT_H) + check_include_file("sys/sysmacros.h" HAVE_SYS_SYSMACROS_H) + check_include_file("sys/time.h" HAVE_SYS_TIME_H) + check_include_file("sys/types.h" HAVE_SYS_TYPES_H) ++check_include_file("sys/uio.h" HAVE_SYS_UIO_H) + check_include_file("sys/vfs.h" HAVE_SYS_VFS_H) + check_include_file("unistd.h" HAVE_UNISTD_H) + check_include_file("utime.h" HAVE_UTIME_H) +diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake +index 4016c6c..6263896 100644 +--- a/cmake/config.h.cmake ++++ b/cmake/config.h.cmake +@@ -90,6 +90,9 @@ + /* Define to 1 if you have the <sys/types.h> header file. */ + #cmakedefine HAVE_SYS_TYPES_H + ++/* Define to 1 if you have the <sys/uio.h> header file. */ ++#cmakedefine HAVE_SYS_UIO_H ++ + /* Define to 1 if you have the <sys/vfs.h> header file. */ + #cmakedefine HAVE_SYS_VFS_H + +-- +2.43.1 + diff --git a/meta-oe/recipes-connectivity/libnfs/libnfs_5.0.3.bb b/meta-oe/recipes-connectivity/libnfs/libnfs_5.0.3.bb new file mode 100644 index 0000000000..a6eabc6095 --- /dev/null +++ b/meta-oe/recipes-connectivity/libnfs/libnfs_5.0.3.bb @@ -0,0 +1,18 @@ +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 \ + file://0001-cmake-Test-for-sys-uio.h.patch \ +" +SRCREV = "4379837536d9eac537810dc7b13071136049b22a" +S = "${WORKDIR}/git" + +inherit cmake + +do_install:append() { + rm -f ${D}${libdir}/cmake/libnfs/libnfs-config.cmake +} diff --git a/meta-oe/recipes-connectivity/libqmi/libqmi_1.26.0.bb b/meta-oe/recipes-connectivity/libqmi/libqmi_1.26.0.bb deleted file mode 100644 index db01e7baa3..0000000000 --- a/meta-oe/recipes-connectivity/libqmi/libqmi_1.26.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "libqmi is a library for talking to WWAN devices by QMI protocol" -DESCRIPTION = "libqmi is a glib-based library for talking to WWAN modems and \ - devices which speak the Qualcomm MSM Interface (QMI) protocol" -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libqmi" -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ -" - -DEPENDS = "glib-2.0 glib-2.0-native" - -inherit autotools pkgconfig bash-completion gobject-introspection - -SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" - -SRC_URI[md5sum] = "8da95a97e893311878f8ce12dcf8fad0" -SRC_URI[sha256sum] = "7f0429e0ae58792e21512d09ca2412537840ea42696762795af1284a65fd6e40" - -PACKAGECONFIG ??= "udev mbim" -PACKAGECONFIG[udev] = ",--without-udev,libgudev" -PACKAGECONFIG[mbim] = "--enable-mbim-qmux,--disable-mbim-qmux,libmbim" - -EXTRA_OECONF_append_toolchain-clang = " --enable-more-warnings=no" diff --git a/meta-oe/recipes-connectivity/libqmi/libqmi_1.34.0.bb b/meta-oe/recipes-connectivity/libqmi/libqmi_1.34.0.bb new file mode 100644 index 0000000000..94164a0b5a --- /dev/null +++ b/meta-oe/recipes-connectivity/libqmi/libqmi_1.34.0.bb @@ -0,0 +1,28 @@ +SUMMARY = "libqmi is a library for talking to WWAN devices by QMI protocol" +DESCRIPTION = "libqmi is a glib-based library for talking to WWAN modems and \ + devices which speak the Qualcomm MSM Interface (QMI) protocol" +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libqmi" +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ +" + +DEPENDS = "glib-2.0 glib-2.0-native" + +inherit meson pkgconfig bash-completion gobject-introspection upstream-version-is-even + +SRCREV = "3f07d6e5b4677558543b3b4484ea88ad92257e92" +SRC_URI = "git://gitlab.freedesktop.org/mobile-broadband/libqmi.git;protocol=https;branch=qmi-1-34" + +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "udev mbim" +PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,libgudev" +PACKAGECONFIG[mbim] = "-Dmbim_qmux=true,-Dmbim_qmux=false,libmbim" +PACKAGECONFIG[qrtr] = "-Dqrtr=true,-Dqrtr=false,libqrtr-glib" + +EXTRA_OEMESON = " \ + -Dgtk_doc=false \ + -Dman=false \ +" diff --git a/meta-oe/recipes-connectivity/libqrtr-glib/libqrtr-glib_git.bb b/meta-oe/recipes-connectivity/libqrtr-glib/libqrtr-glib_git.bb new file mode 100644 index 0000000000..3549cac568 --- /dev/null +++ b/meta-oe/recipes-connectivity/libqrtr-glib/libqrtr-glib_git.bb @@ -0,0 +1,21 @@ +SUMMARY = "library to use and manage the QRTR bus" +DESCRIPTION = "libqrtr-glib is a glib-based library to use and manage the QRTR (Qualcomm IPC Router) bus" +HOMEPAGE = "https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib" + +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://LICENSES/LGPL-2.1-or-later.txt;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI = "git://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib.git;protocol=https;branch=qrtr-1-2" + +PV = "1.2.2+git" +SRCREV = "8991f0e93713ebf4da48ae4f23940ead42f64c8c" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig gobject-introspection + +DEPENDS = "glib-2.0" + +EXTRA_OEMESON = " \ + -Dgtk_doc=false \ +" diff --git a/meta-oe/recipes-connectivity/libtorrent-rasterbar/libtorrent-rasterbar_2.0.10.bb b/meta-oe/recipes-connectivity/libtorrent-rasterbar/libtorrent-rasterbar_2.0.10.bb new file mode 100644 index 0000000000..f2de1f468d --- /dev/null +++ b/meta-oe/recipes-connectivity/libtorrent-rasterbar/libtorrent-rasterbar_2.0.10.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "libtorrent is a feature complete C++ bittorrent implementation \ + focusing on efficiency and scalability." +HOMEPAGE = "https://libtorrent.org/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=d8b6cb42d66e6b3c47a909c3ce678a7b" + +DEPENDS = "boost openssl" + +SRC_URI = "git://github.com/arvidn/libtorrent.git;branch=master;protocol=https \ + git://github.com/arvidn/try_signal.git;branch=master;protocol=https;destsuffix=git/deps/try_signal;name=try_signal" + +SRCREV = "74bc93a37a5e31c78f0aa02037a68fb9ac5deb41" +SRCREV_try_signal = "105cce59972f925a33aa6b1c3109e4cd3caf583d" +SRCREV_FORMAT .= "_try_signal" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig python3targetconfig + +CVE_PRODUCT = "libtorrent" + +EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release" + +PACKAGECONFIG ??= "python3" +PACKAGECONFIG[python3] = "-Dpython-bindings=ON,-Dpython-bindings=OFF,python3-distutils-extra-native" + +# Strip host paths from autogenerated files +do_install:append() { + sed -i 's+${STAGING_LIBDIR}+${libdir}+g' ${D}${libdir}/pkgconfig/${BPN}.pc +} + +PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-${BPN}', '', d)}" +FILES:python3-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/*" diff --git a/meta-oe/recipes-connectivity/libtorrent/libtorrent/don-t-run-code-while-configuring-package.patch b/meta-oe/recipes-connectivity/libtorrent/libtorrent/don-t-run-code-while-configuring-package.patch deleted file mode 100644 index 8d8867aea7..0000000000 --- a/meta-oe/recipes-connectivity/libtorrent/libtorrent/don-t-run-code-while-configuring-package.patch +++ /dev/null @@ -1,28 +0,0 @@ -Using AC_RUN_IFELSE prevent people from configuring package for -cross-compiling. Don't run code while configuring package. - -Upstream-Status: Pending -Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> - -Index: git/scripts/common.m4 -=================================================================== ---- git.orig/scripts/common.m4 -+++ git/scripts/common.m4 -@@ -153,7 +153,7 @@ dnl Need to fix this so that it uses t - AC_DEFUN([TORRENT_CHECK_EXECINFO], [ - AC_MSG_CHECKING(for execinfo.h) - -- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -+ AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include <execinfo.h> - int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} - ])], -@@ -168,7 +168,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [ - AC_DEFUN([TORRENT_CHECK_ALIGNED], [ - AC_MSG_CHECKING(the byte alignment) - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ -+ AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include <inttypes.h> - int main() { - char buf@<:@8@:>@ = { 0, 0, 0, 0, 1, 0, 0, 0 }; diff --git a/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb b/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb index 3ee69554b6..c7a0562db4 100644 --- a/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb +++ b/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb @@ -1,31 +1,33 @@ DESCRIPTION = "libTorrent is a BitTorrent library written in C++ for *nix, \ with a focus on high performance and good code." HOMEPAGE = "http://libtorrent.rakshasa.no/" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" DEPENDS = "zlib libsigc++-2.0 openssl cppunit" -SRC_URI = "git://github.com/rakshasa/libtorrent \ - file://don-t-run-code-while-configuring-package.patch \ - " -SRCREV = "756f70010779927dc0691e1e722ed433d5d295e1" +PV = "0.13.8+git" -PV = "0.13.8" +SRC_URI = "git://github.com/rakshasa/libtorrent;branch=master;protocol=https" +SRCREV = "e60f222241319aaae482789517ad00ae9344bd13" + +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" + +CVE_STATUS[CVE-2009-1760] = "backported-patch: patched in our product" S = "${WORKDIR}/git" -PACKAGECONFIG ??= "instrumentation" +CVE_PRODUCT = "" -PACKAGECONFIG_remove_mipsarch = "instrumentation" -PACKAGECONFIG_remove_powerpc = "instrumentation" +PACKAGECONFIG ??= "instrumentation aligned" + +PACKAGECONFIG:remove:mipsarch = "instrumentation" +PACKAGECONFIG:remove:powerpc = "instrumentation" +PACKAGECONFIG:remove:riscv32 = "instrumentation" PACKAGECONFIG[instrumentation] = "--enable-instrumentation,--disable-instrumentation," +PACKAGECONFIG[aligned] = "--enable-aligned,--disable-aligned," inherit autotools pkgconfig EXTRA_OECONF = "--with-zlib=${STAGING_EXECPREFIXDIR}" - -do_configure_prepend() { - (cd ${S}; ./autogen.sh; cd -) -} diff --git a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.0.20.bb b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.0.20.bb deleted file mode 100644 index 5427daac47..0000000000 --- a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.0.20.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Canonical libwebsockets.org websocket library" -HOMEPAGE = "https://libwebsockets.org/" -LICENSE = "MIT & Zlib & BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8c47b078124308a4e1354e8d59f606b7" - -DEPENDS = "zlib" - -S = "${WORKDIR}/git" -SRCREV = "ec9e8ab892f2dc569ae09336c80c2796fd14a6ff" -SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;branch=v4.0-stable" - -UPSTREAM_CHECK_URI = "https://github.com/warmcat/${BPN}/releases" -UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" - -inherit cmake pkgconfig - -PACKAGECONFIG ?= "libuv client server http2 ssl" -PACKAGECONFIG[client] = "-DLWS_WITHOUT_CLIENT=OFF,-DLWS_WITHOUT_CLIENT=ON," -PACKAGECONFIG[http2] = "-DLWS_WITH_HTTP2=ON,-DLWS_WITH_HTTP2=OFF," -PACKAGECONFIG[ipv6] = "-DLWS_IPV6=ON,-DLWS_IPV6=OFF," -PACKAGECONFIG[libev] = "-DLWS_WITH_LIBEV=ON,-DLWS_WITH_LIBEV=OFF,libev" -PACKAGECONFIG[libuv] = "-DLWS_WITH_LIBUV=ON,-DLWS_WITH_LIBUV=OFF,libuv" -PACKAGECONFIG[server] = "-DLWS_WITHOUT_SERVER=OFF,-DLWS_WITHOUT_SERVER=ON," -PACKAGECONFIG[ssl] = "-DLWS_WITH_SSL=ON,-DLWS_WITH_SSL=OFF,openssl" -PACKAGECONFIG[testapps] = "-DLWS_WITHOUT_TESTAPPS=OFF,-DLWS_WITHOUT_TESTAPPS=ON," - -EXTRA_OECMAKE += " \ - -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ -" - -PACKAGES =+ "${PN}-testapps" - -FILES_${PN}-testapps += "${datadir}/libwebsockets-test-server/*" - -CFLAGS_append = " -Wno-error" diff --git a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.3.bb b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.3.bb new file mode 100644 index 0000000000..4518e2faaa --- /dev/null +++ b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.3.bb @@ -0,0 +1,65 @@ +SUMMARY = "Canonical libwebsockets.org websocket library" +HOMEPAGE = "https://libwebsockets.org/" +LICENSE = "MIT & Zlib & BSD-3-Clause & Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=382bfdf329e774859fd401eaf850d29b" + +DEPENDS = "zlib" +DEPENDS:append:class-native = " libcap-native" + +S = "${WORKDIR}/git" +SRCREV = "4415e84c095857629863804e941b9e1c2e9347ef" +SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;branch=v4.3-stable" + +UPSTREAM_CHECK_URI = "https://github.com/warmcat/${BPN}/releases" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" + +inherit cmake pkgconfig + +PACKAGECONFIG ?= "libuv client server http2 ssl ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" +PACKAGECONFIG[client] = "-DLWS_WITHOUT_CLIENT=OFF,-DLWS_WITHOUT_CLIENT=ON," +PACKAGECONFIG[http2] = "-DLWS_WITH_HTTP2=ON,-DLWS_WITH_HTTP2=OFF," +PACKAGECONFIG[ipv6] = "-DLWS_IPV6=ON,-DLWS_IPV6=OFF," +PACKAGECONFIG[libevent] = "-DLWS_WITH_LIBEVENT=ON,-DLWS_WITH_LIBEVENT=OFF,libevent" +PACKAGECONFIG[libev] = "-DLWS_WITH_LIBEV=ON,-DLWS_WITH_LIBEV=OFF,libev" +PACKAGECONFIG[libuv] = "-DLWS_WITH_LIBUV=ON,-DLWS_WITH_LIBUV=OFF,libuv" +PACKAGECONFIG[server] = "-DLWS_WITHOUT_SERVER=OFF,-DLWS_WITHOUT_SERVER=ON," +PACKAGECONFIG[ssl] = "-DLWS_WITH_SSL=ON,-DLWS_WITH_SSL=OFF,openssl" +PACKAGECONFIG[static] = "-DLWS_WITH_STATIC=ON,-DLWS_WITH_STATIC=OFF -DLWS_LINK_TESTAPPS_DYNAMIC=ON," +PACKAGECONFIG[systemd] = "-DLWS_WITH_SDEVENT=ON,-DLWS_WITH_SDEVENT=OFF,systemd" + +python __anonymous() { + if bb.utils.contains('PACKAGECONFIG', 'systemd', True, False, d) and not bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d): + bb.fatal("PACKAGECONFIG contains systemd but DISTRO_FEATURES doesn't") +} + +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-*" +FILES:${PN}-evlib-event += "${libdir}/libwebsockets-evlib_event.so" +FILES:${PN}-evlib-uv += "${libdir}/libwebsockets-evlib_uv.so" +FILES:${PN}-evlib-ev += "${libdir}/libwebsockets-evlib_ev.so" +FILES:${PN}-evlib-sd += "${libdir}/libwebsockets-evlib_sd.so" + +RDEPENDS:${PN} += " ${@bb.utils.contains('PACKAGECONFIG', 'libevent', '${PN}-evlib-event', '', d)}" +RDEPENDS:${PN} += " ${@bb.utils.contains('PACKAGECONFIG', 'libuv', '${PN}-evlib-uv', '', d)}" +RDEPENDS:${PN} += " ${@bb.utils.contains('PACKAGECONFIG', 'libev', '${PN}-evlib-ev', '', d)}" +RDEPENDS:${PN} += " ${@bb.utils.contains('PACKAGECONFIG', 'systemd', '${PN}-evlib-sd', '', d)}" + +RDEPENDS:${PN}-dev += " ${@bb.utils.contains('PACKAGECONFIG', 'static', '${PN}-staticdev', '', d)}" + +# Avoid absolute paths to end up in the sysroot. +SSTATE_SCAN_FILES += "*.cmake" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/0001-include-string.h-for-strncpy.patch b/meta-oe/recipes-connectivity/linuxptp/linuxptp/0001-include-string.h-for-strncpy.patch new file mode 100644 index 0000000000..b117dcf670 --- /dev/null +++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp/0001-include-string.h-for-strncpy.patch @@ -0,0 +1,26 @@ +From 6120cee594c543d17ae015bc601012debcf57177 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 23 Oct 2023 10:43:42 +0100 +Subject: [PATCH] include string.h for strncpy() + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Backport [master: 6120cee594c543d17ae015bc601012debcf57177] +--- + interface.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/interface.c b/interface.c +index 29229ad6f53d..9a83c36933e7 100644 +--- a/interface.c ++++ b/interface.c +@@ -5,6 +5,7 @@ + * @note SPDX-License-Identifier: GPL-2.0+ + */ + #include <stdlib.h> ++#include <string.h> + #include "interface.h" + + struct interface { +-- +2.34.1 + diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/0002-linuxptp-Use-CC-in-incdefs.sh.patch b/meta-oe/recipes-connectivity/linuxptp/linuxptp/0002-linuxptp-Use-CC-in-incdefs.sh.patch new file mode 100644 index 0000000000..3cf3a63b94 --- /dev/null +++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp/0002-linuxptp-Use-CC-in-incdefs.sh.patch @@ -0,0 +1,48 @@ +From cffb4807ac0b9ff7aea2aa4f3842985b5363d184 Mon Sep 17 00:00:00 2001 +From: Luca Fancellu <luca.fancellu@arm.com> +Date: Mon, 23 Oct 2023 10:43:43 +0100 +Subject: [PATCH] linuxptp: Use ${CC} in incdefs.sh + +The Makefile is defining CC and incdefs.sh is using +${CROSS_COMPILE}cpp inside it, allowing both to use different +compilers depending on what the user pass during make invocation +as CC. + +Align them using ${CC} also inside incdefs.sh. + +Signed-off-by: Luca Fancellu <luca.fancellu@arm.com> +Upstream-Status: Backport [master: cffb4807ac0b9ff7aea2aa4f3842985b5363d184] +--- + incdefs.sh | 2 +- + makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/incdefs.sh b/incdefs.sh +index a9e94f777f6b..391e63c7fac6 100755 +--- a/incdefs.sh ++++ b/incdefs.sh +@@ -27,7 +27,7 @@ user_flags() + printf " -D_GNU_SOURCE" + + # Get list of directories searched for header files. +- dirs=$(echo "" | ${CROSS_COMPILE}cpp -Wp,-v 2>&1 >/dev/null | grep ^" /") ++ dirs=$(${CC} -E -Wp,-v -xc /dev/null 2>&1 >/dev/null | grep ^" /") + + # Look for clock_adjtime(). + for d in $dirs; do +diff --git a/makefile b/makefile +index 3e3b8b35fc96..7fc5f6fb8fa8 100644 +--- a/makefile ++++ b/makefile +@@ -39,7 +39,7 @@ OBJECTS = $(OBJ) hwstamp_ctl.o nsm.o phc2sys.o phc_ctl.o pmc.o pmc_agent.o \ + SRC = $(OBJECTS:.o=.c) + DEPEND = $(OBJECTS:.o=.d) + srcdir := $(dir $(lastword $(MAKEFILE_LIST))) +-incdefs := $(shell $(srcdir)/incdefs.sh) ++incdefs := $(shell CC="$(CC)" $(srcdir)/incdefs.sh) + version := $(shell $(srcdir)/version.sh $(srcdir)) + VPATH = $(srcdir) + +-- +2.34.1 + diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/build-Allow-CC-and-prefix-to-be-overriden.patch b/meta-oe/recipes-connectivity/linuxptp/linuxptp/build-Allow-CC-and-prefix-to-be-overriden.patch deleted file mode 100644 index 55ce4c9a90..0000000000 --- a/meta-oe/recipes-connectivity/linuxptp/linuxptp/build-Allow-CC-and-prefix-to-be-overriden.patch +++ /dev/null @@ -1,37 +0,0 @@ -From af485c638c61fa883212ea424e676fbf90bee594 Mon Sep 17 00:00:00 2001 -From: Otavio Salvador <otavio@ossystems.com.br> -Date: Tue, 1 Jul 2014 17:37:31 -0300 -Subject: [PATCH] build: Allow CC and prefix to be overriden - -Upstream-Status: Pending - -Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> ---- - makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/makefile b/makefile -index 22e7d0d..809cc8f 100644 ---- a/makefile -+++ b/makefile -@@ -18,7 +18,7 @@ - KBUILD_OUTPUT = - - DEBUG = --CC = $(CROSS_COMPILE)gcc -+CC ?= $(CROSS_COMPILE)gcc - VER = -DVER=$(version) - CFLAGS = -Wall $(VER) $(incdefs) $(DEBUG) $(EXTRA_CFLAGS) - LDLIBS = -lm -lrt -pthread $(EXTRA_LDFLAGS) -@@ -43,7 +43,7 @@ incdefs := $(shell $(srcdir)/incdefs.sh) - version := $(shell $(srcdir)/version.sh $(srcdir)) - VPATH = $(srcdir) - --prefix = /usr/local -+prefix ?= /usr/local - sbindir = $(prefix)/sbin - mandir = $(prefix)/man - man8dir = $(mandir)/man8 --- -1.7.10.4 - diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/no-incdefs-using-host-headers.patch b/meta-oe/recipes-connectivity/linuxptp/linuxptp/no-incdefs-using-host-headers.patch deleted file mode 100644 index 02dbb23465..0000000000 --- a/meta-oe/recipes-connectivity/linuxptp/linuxptp/no-incdefs-using-host-headers.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8a4cad5e2f2cbb6a34bdc6e877fe499502b8c4c8 Mon Sep 17 00:00:00 2001 -From: Marcel Ziswiler <marcel.ziswiler@toradex.com> -Date: Fri, 23 Dec 2016 18:12:29 +0100 -Subject: [PATCH] linuxptp: no incdefs using host headers - -Avoid using host headers via incdefs.sh shell script. - -Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> ---- - - makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/makefile b/makefile -index 8cdbd15..85174b8 100644 ---- a/makefile -+++ b/makefile -@@ -33,7 +33,7 @@ OBJECTS = $(OBJ) hwstamp_ctl.o phc2sys.o phc_ctl.o pmc.o pmc_common.o \ - SRC = $(OBJECTS:.o=.c) - DEPEND = $(OBJECTS:.o=.d) - srcdir := $(dir $(lastword $(MAKEFILE_LIST))) --incdefs := $(shell $(srcdir)/incdefs.sh) -+#incdefs := $(shell $(srcdir)/incdefs.sh) - version := $(shell $(srcdir)/version.sh $(srcdir)) - VPATH = $(srcdir) - --- -2.9.3 - diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/systemd/phc2sys@.service.in b/meta-oe/recipes-connectivity/linuxptp/linuxptp/systemd/phc2sys@.service.in new file mode 100644 index 0000000000..f66dd2d010 --- /dev/null +++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp/systemd/phc2sys@.service.in @@ -0,0 +1,13 @@ +[Unit] +Description=Synchronize system clock or PTP hardware clock (PHC) +Documentation=man:phc2sys +Requires=ptp4l.service +After=ptp4l.service +Before=time-sync.target + +[Service] +Type=simple +ExecStart=@SBINDIR@/phc2sys -w -s %I + +[Install] +WantedBy=multi-user.target diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/systemd/ptp4l@.service.in b/meta-oe/recipes-connectivity/linuxptp/linuxptp/systemd/ptp4l@.service.in new file mode 100644 index 0000000000..2502181412 --- /dev/null +++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp/systemd/ptp4l@.service.in @@ -0,0 +1,11 @@ +[Unit] +Description=Precision Time Protocol (PTP) service for %I +Documentation=man:ptp4l +After=sys-subsystem-net-devices-%i.device + +[Service] +Type=simple +ExecStart=@SBINDIR@/ptp4l -f @SYSCONFDIR@/linuxptp/ptp4l.conf -i %I + +[Install] +WantedBy=multi-user.target diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.0.bb b/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.0.bb deleted file mode 100644 index 69dee1a2f1..0000000000 --- a/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Precision Time Protocol (PTP) according to IEEE standard 1588 for Linux" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRC_URI = "http://sourceforge.net/projects/linuxptp/files/v${PV}/linuxptp-${PV}.tgz \ - file://build-Allow-CC-and-prefix-to-be-overriden.patch \ - file://no-incdefs-using-host-headers.patch \ - " - -SRC_URI[md5sum] = "1318805702eb6d59f9f247e1dd5ce12a" -SRC_URI[sha256sum] = "d74ceca722c75bfff53c633425f926dd48eb04f4a089451b855155c016d15785" - -EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} \ - EXTRA_CFLAGS='-D_GNU_SOURCE -DHAVE_CLOCK_ADJTIME -DHAVE_POSIX_SPAWN -DHAVE_ONESTEP_SYNC ${CFLAGS}'" - -do_install () { - install -d ${D}/${bindir} - install -p ${S}/ptp4l ${D}/${bindir} - install -p ${S}/pmc ${D}/${bindir} - install -p ${S}/phc2sys ${D}/${bindir} - install -p ${S}/hwstamp_ctl ${D}/${bindir} -} diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp_4.1.bb b/meta-oe/recipes-connectivity/linuxptp/linuxptp_4.1.bb new file mode 100644 index 0000000000..9a5c9b5204 --- /dev/null +++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp_4.1.bb @@ -0,0 +1,62 @@ +SUMMARY = "linuxptp package for linux" +DESCRIPTION = "Precision Time Protocol (PTP) according to IEEE standard 1588 \ +for Linux" +HOMEPAGE = "http://linuxptp.sourceforge.net/" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +LINUXPTP_SRC_URI = "http://sourceforge.net/projects/linuxptp" + +SRC_URI = "${LINUXPTP_SRC_URI}/files/v4.1/linuxptp-${PV}.tgz \ + file://0001-include-string.h-for-strncpy.patch \ + file://0002-linuxptp-Use-CC-in-incdefs.sh.patch \ + file://systemd/phc2sys@.service.in \ + file://systemd/ptp4l@.service.in \ + " + +SRC_URI[md5sum] = "1db8699fc155965341759be5e5aad938" +SRC_URI[sha256sum] = "e1743d44f8208897e30895da3579e670ff919b914feb4b5a949f3e421ddde535" + +inherit systemd + +UPSTREAM_CHECK_URI = "${LINUXPTP_SRC_URI}/files/" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/" + +EXTRA_OEMAKE = "CC='${CC}' EXTRA_CFLAGS='${CFLAGS}' mandir='${mandir}' \ + sbindir='${sbindir}'" + +export KBUILD_OUTPUT="${RECIPE_SYSROOT}" + +LINUXPTP_SYSTEMD_SERVICES = "phc2sys@.service ptp4l@.service" + +do_install() { + oe_runmake install DESTDIR=${D} + + # Install example configs from source tree + install -d ${D}${docdir}/${PN} + cp -R --no-dereference --preserve=mode,links ${S}/configs \ + ${D}${docdir}/${PN} + + # Install default configuration files + install -d ${D}/${sysconfdir}/linuxptp/ + install -m 644 ${S}/configs/default.cfg \ + ${D}${sysconfdir}/linuxptp/ptp4l.conf + + # Install systemd services + install -d ${D}/${systemd_unitdir}/system/ + for service in ${LINUXPTP_SYSTEMD_SERVICES}; do + sed -i -e 's,@SBINDIR@,${sbindir},g' \ + ${WORKDIR}/systemd/$service.in + sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + ${WORKDIR}/systemd/$service.in + install -m 644 ${WORKDIR}/systemd/$service.in \ + ${D}/${systemd_unitdir}/system/$service + done +} + +SYSTEMD_SERVICE:${PN} = "${LINUXPTP_SYSTEMD_SERVICES}" +SYSTEMD_AUTO_ENABLE:${PN} = "disable" + +PACKAGES =+ "${PN}-configs" + +FILES:${PN}-configs += "${docdir}" 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 deleted file mode 100644 index 20f388e890..0000000000 --- a/meta-oe/recipes-connectivity/loudmouth/loudmouth-1.4.3/04-use-pkg-config-for-gnutls.patch +++ /dev/null @@ -1,23 +0,0 @@ -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# - ---- a/configure.ac.orig 2009-08-16 20:29:36.000000000 +0200 -+++ b/configure.ac 2009-08-16 20:30:43.000000000 +0200 -@@ -146,10 +146,12 @@ AC_ARG_WITH(openssl-libs, - enable_ssl=no - if test "x$ac_ssl" = "xgnutls"; then - dnl Look for GnuTLS -- AM_PATH_LM_LIBGNUTLS($GNUTLS_REQUIRED, have_libgnutls=yes, have_libgnutls=no) -- if test "x$have_libgnutls" = "xyes"; then -- CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" -- LIBS="$LIBS $LIBGNUTLS_LIBS" -+ PKG_CHECK_MODULES(GNUTLS, gnutls >= $GNUTLS_REQUIRED, have_gnutls=yes, have_gnutls=no) -+ if test "x$have_gnutls" = "xyes"; then -+ AC_SUBST(ASYNCNS_CFLAGS) -+ AC_SUBST(ASYNCNS_LIBS) -+ CFLAGS="$CFLAGS $GNUTLS_CFLAGS" -+ LIBS="$LIBS $GNUTLS_LIBS" - AC_DEFINE(HAVE_GNUTLS, 1, [whether to use GnuTSL support.]) - enable_ssl=GnuTLS - else 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 deleted file mode 100644 index b6c9422e8c..0000000000 --- a/meta-oe/recipes-connectivity/loudmouth/loudmouth-1.4.3/glib-2.32.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 @@ - */ - - #include <config.h> --#include <glib/gerror.h> - #include "lm-error.h" - - /** diff --git a/meta-oe/recipes-connectivity/loudmouth/loudmouth_1.4.3.bb b/meta-oe/recipes-connectivity/loudmouth/loudmouth_1.4.3.bb deleted file mode 100644 index 4f1430b9ec..0000000000 --- a/meta-oe/recipes-connectivity/loudmouth/loudmouth_1.4.3.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "Loudmouth is a lightweight and easy-to-use C library for programming with the Jabber protocol." -HOMEPAGE = "http://www.loudmouth-project.org/" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=c4f38aef94828f6b280e00d1173be689" - -DEPENDS = "glib-2.0 libcheck openssl libidn" - -inherit gnomebase gtk-doc - -PR = "r2" - -SRC_URI += "file://04-use-pkg-config-for-gnutls.patch \ - file://glib-2.32.patch" - -SRC_URI[archive.md5sum] = "55339ca42494690c3942ee1465a96937" -SRC_URI[archive.sha256sum] = "95a93f5d009b71ea8193d994aa11f311bc330a3efe1b7cd74dc48f11c7f929e3" -GNOME_COMPRESS_TYPE="bz2" - -EXTRA_OECONF = "--with-ssl=openssl" - diff --git a/meta-oe/recipes-connectivity/loudmouth/loudmouth_1.5.4.bb b/meta-oe/recipes-connectivity/loudmouth/loudmouth_1.5.4.bb new file mode 100644 index 0000000000..f67c46b428 --- /dev/null +++ b/meta-oe/recipes-connectivity/loudmouth/loudmouth_1.5.4.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Loudmouth is a lightweight and easy-to-use C library for programming with the Jabber protocol." +HOMEPAGE = "http://www.loudmouth-project.org/" + +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "glib-2.0 libcheck openssl libidn" + +GNOMEBASEBUILDCLASS = "autotools" + +inherit gnomebase gtk-doc + +SRC_URI = "https://github.com/mcabber/${BPN}/releases/download/${PV}/${BP}.tar.bz2" +SRC_URI[sha256sum] = "31cbc91c1fddcc5346b3373b8fb45594e9ea9cc7fe36d0595e8912c47ad94d0d" + +EXTRA_OECONF = "--with-ssl=openssl --with-compile-warnings=no" diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.12.bb b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.12.bb deleted file mode 100644 index b0ab46f3f2..0000000000 --- a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.12.bb +++ /dev/null @@ -1,54 +0,0 @@ -SUMMARY = "ModemManager is a daemon controlling broadband devices/connections" -DESCRIPTION = "ModemManager is a DBus-activated daemon which controls mobile broadband (2G/3G/4G) devices and connections" -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/ModemManager/" -LICENSE = "GPL-2.0 & LGPL-2.1" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ -" - -inherit gnomebase gettext systemd vala gobject-introspection bash-completion - -DEPENDS = "glib-2.0 libgudev intltool-native libxslt-native" - -SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" -SRC_URI[sha256sum] = "a4fc4b33c0e8ae9372885f86fa033f3c1a89a76cd59a3458670eff1824222a3d" -S = "${WORKDIR}/ModemManager-${PV}" - -PACKAGECONFIG ??= "mbim qmi \ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)} \ -" - -PACKAGECONFIG[at] = "--with-at-command-via-dbus" -PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,," -PACKAGECONFIG[polkit] = "--with-polkit=yes,--with-polkit=no,polkit" -# Support WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol. -PACKAGECONFIG[mbim] = "--with-mbim,--without-mbim,libmbim" -# Support WWAN modems and devices which speak the Qualcomm MSM Interface (QMI) protocol. -PACKAGECONFIG[qmi] = "--with-qmi,--without-qmi,libqmi" - -EXTRA_OECONF = " \ - --with-udev-base-dir=${nonarch_base_libdir}/udev \ -" -EXTRA_OECONF_append_toolchain-clang = " --enable-more-warnings=no" - -FILES_${PN} += " \ - ${datadir}/icons \ - ${datadir}/polkit-1 \ - ${datadir}/dbus-1 \ - ${datadir}/ModemManager \ - ${libdir}/ModemManager \ - ${systemd_unitdir}/system \ -" - -FILES_${PN}-dev += " \ - ${libdir}/ModemManager/*.la \ -" - -FILES_${PN}-staticdev += " \ - ${libdir}/ModemManager/*.a \ -" - -FILES_${PN}-dbg += "${libdir}/ModemManager/.debug" - -SYSTEMD_SERVICE_${PN} = "ModemManager.service" diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.22.0.bb b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.22.0.bb new file mode 100644 index 0000000000..6b4336eb80 --- /dev/null +++ b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.22.0.bb @@ -0,0 +1,55 @@ +SUMMARY = "ModemManager is a daemon controlling broadband devices/connections" +DESCRIPTION = "ModemManager is a DBus-activated daemon which controls mobile broadband (2G/3G/4G) devices and connections" +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/ModemManager/" +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ +" + +inherit gnomebase gettext systemd gobject-introspection bash-completion + +DEPENDS = "glib-2.0 libgudev libxslt-native dbus" + +SRCREV = "03f786ce66360d67c669f4f122f8aa458e6f01ea" +SRC_URI = "git://gitlab.freedesktop.org/mobile-broadband/ModemManager.git;protocol=https;branch=mm-1-22" + +S = "${WORKDIR}/git" + +# strict, permissive +MODEMMANAGER_POLKIT_TYPE ??= "permissive" + +PACKAGECONFIG ??= "vala mbim qmi \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)} \ +" + +PACKAGECONFIG[at] = "-Dat_command_via_dbus=true" +PACKAGECONFIG[systemd] = " \ + -Dsystemdsystemunitdir=${systemd_unitdir}/system/, \ + -Dsystemdsystemunitdir=no -Dsystemd_journal=false -Dsystemd_suspend_resume=false \ +" +PACKAGECONFIG[polkit] = "-Dpolkit=${MODEMMANAGER_POLKIT_TYPE},-Dpolkit=no,polkit" +# Support WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol. +PACKAGECONFIG[mbim] = "-Dmbim=true,-Dmbim=false -Dplugin_dell=disabled -Dplugin_foxconn=disabled,libmbim" +# Support WWAN modems and devices which speak the Qualcomm MSM Interface (QMI) protocol. +PACKAGECONFIG[qmi] = "-Dqmi=true,-Dqmi=false,libqmi" +PACKAGECONFIG[qrtr] = "-Dqrtr=true,-Dqrtr=false,libqrtr-glib" +PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false" + +inherit upstream-version-is-even ${@bb.utils.contains('PACKAGECONFIG', 'vala', 'vala', '', d)} + +EXTRA_OEMESON = " \ + -Dudevdir=${nonarch_base_libdir}/udev \ + -Dqrtr=false \ +" + +FILES:${PN} += " \ + ${datadir}/icons \ + ${datadir}/polkit-1 \ + ${datadir}/dbus-1 \ + ${datadir}/ModemManager \ + ${libdir}/ModemManager \ + ${systemd_unitdir}/system \ +" + +SYSTEMD_SERVICE:${PN} = "ModemManager.service" diff --git a/meta-oe/recipes-connectivity/mosh/mosh/0001-Fix-building-with-libc.patch b/meta-oe/recipes-connectivity/mosh/mosh/0001-Fix-building-with-libc.patch deleted file mode 100644 index 100ede17bd..0000000000 --- a/meta-oe/recipes-connectivity/mosh/mosh/0001-Fix-building-with-libc.patch +++ /dev/null @@ -1,24 +0,0 @@ -From efa9e49714b30d7d9128946a2504c93e10d109b5 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 29 Jan 2019 12:20:03 -0800 -Subject: [PATCH] Fix building with libc++ - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/network/network.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/network/network.cc b/src/network/network.cc -index 26da603..e480853 100644 ---- a/src/network/network.cc -+++ b/src/network/network.cc -@@ -335,7 +335,7 @@ bool Connection::try_bind( const char *addr, int port_low, int port_high ) - } - } - -- if ( bind( sock(), &local_addr.sa, local_addr_len ) == 0 ) { -+ if ( ::bind( sock(), &local_addr.sa, local_addr_len ) == 0 ) { - set_MTU( local_addr.sa.sa_family ); - return true; - } else if ( i == search_high ) { /* last port to search */ diff --git a/meta-oe/recipes-connectivity/mosh/mosh/0001-configure.ac-add-support-of-protobuf-4.22.x.patch b/meta-oe/recipes-connectivity/mosh/mosh/0001-configure.ac-add-support-of-protobuf-4.22.x.patch new file mode 100644 index 0000000000..088124391c --- /dev/null +++ b/meta-oe/recipes-connectivity/mosh/mosh/0001-configure.ac-add-support-of-protobuf-4.22.x.patch @@ -0,0 +1,63 @@ +From d9a1a6aac5a3b270449d09ec0d2a556807ab9287 Mon Sep 17 00:00:00 2001 +From: Xiangyu Chen <xiangyu.chen@windriver.com> +Date: Wed, 29 Mar 2023 13:53:44 +0800 +Subject: [PATCH] configure.ac: add support of protobuf 4.22.x + +the protobuf 4.22x is using c++14 as default, this caused the mosh cannot compile anymore and report following error: + +.... +/usr/include/google/protobuf/port_def.inc:200:15: error: static assertion failed: Protobuf only supports C++14 and newer. +| 200 | static_assert(PROTOBUF_CPLUSPLUS_MIN(201402L), "Protobuf only supports C++14 and newer."); +| | ^~~~~~~~~~~~~~~~~~~~~~ +.... + +Upstream-Status: Pending [https://github.com/mobile-shell/mosh/pull/1266] + +Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com> +--- + configure.ac | 8 ++++++++ + src/frontend/Makefile.am | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index ee70c7b..5457009 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -26,6 +26,10 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) + AS_IF([pkg-config --atleast-version 3.6.0 protobuf], + [AX_CXX_COMPILE_STDCXX([11])]) + ++# If current protobuf 4.22+ update the requires to C++14. ++AS_IF([pkg-config --atleast-version 4.22.0 protobuf], ++ [AX_CXX_COMPILE_STDCXX([14])]) ++ + WARNING_CXXFLAGS="" + PICKY_CXXFLAGS="" + DISTCHECK_CXXFLAGS="" +@@ -311,6 +315,10 @@ AC_CHECK_FUNCS(m4_normalize([ + pledge + ])) + ++AS_IF([pkg-config --atleast-version 4.22.0 protobuf], ++ [PKG_CHECK_MODULES([ABSL_LOG_INTERNAL_CHECK_OP], [absl_log_internal_check_op],[], ++ [AC_MSG_ERROR([Missing abseil-cpp library.])])]) ++ + # Start by trying to find the needed tinfo parts by pkg-config + PKG_CHECK_MODULES([TINFO], [tinfo], + [AC_DEFINE([HAVE_CURSES_H], [1], [Define to 1 if <curses.h> is present])], +diff --git a/src/frontend/Makefile.am b/src/frontend/Makefile.am +index 1aa83fd..399ecd6 100644 +--- a/src/frontend/Makefile.am ++++ b/src/frontend/Makefile.am +@@ -1,7 +1,7 @@ + AM_CPPFLAGS = -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I../protobufs -I$(srcdir)/../util $(TINFO_CFLAGS) $(protobuf_CFLAGS) $(CRYPTO_CFLAGS) + AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) $(CODE_COVERAGE_CXXFLAGS) + AM_LDFLAGS = $(HARDEN_LDFLAGS) $(CODE_COVERAGE_LIBS) +-LDADD = ../crypto/libmoshcrypto.a ../network/libmoshnetwork.a ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../util/libmoshutil.a ../protobufs/libmoshprotos.a -lm $(TINFO_LIBS) $(protobuf_LIBS) $(CRYPTO_LIBS) ++LDADD = ../crypto/libmoshcrypto.a ../network/libmoshnetwork.a ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../util/libmoshutil.a ../protobufs/libmoshprotos.a -lm $(TINFO_LIBS) $(protobuf_LIBS) $(CRYPTO_LIBS) $(ABSL_LOG_INTERNAL_CHECK_OP_LIBS) + + mosh_server_LDADD = $(LDADD) + +-- +2.34.1 + diff --git a/meta-oe/recipes-connectivity/mosh/mosh_1.3.2.bb b/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb index 9c439354d1..693ec12d3c 100644 --- a/meta-oe/recipes-connectivity/mosh/mosh_1.3.2.bb +++ b/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb @@ -9,21 +9,21 @@ editing of user keystrokes. Mosh is a replacement for SSH. It's more \ robust and responsive, especially over Wi-Fi, cellular, and \ long-distance links." HOMEPAGE = "http://mosh.mit.edu" -LICENSE = "GPLv3+" +LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -DEPENDS = "protobuf-native protobuf ncurses zlib libio-pty-perl openssl libutempter" +DEPENDS = "protobuf-native protobuf ncurses zlib libio-pty-perl openssl libutempter abseil-cpp" -SRC_URI = "http://mosh.mit.edu/mosh-${PV}.tar.gz \ - file://0001-Fix-building-with-libc.patch \ +SRC_URI = "https://mosh.org/${BP}.tar.gz \ + file://0001-configure.ac-add-support-of-protobuf-4.22.x.patch \ " -SRC_URI[md5sum] = "5122f4d2b973ab7c38dcdac8c35cb61e" -SRC_URI[sha256sum] = "da600573dfa827d88ce114e0fed30210689381bbdcff543c931e4d6a2e851216" + +SRC_URI[sha256sum] = "872e4b134e5df29c8933dff12350785054d2fd2839b5ae6b5587b14db1465ddd" inherit autotools pkgconfig PACKAGE_BEFORE_PN += "${PN}-server" -FILES_${PN}-server = "${bindir}/mosh-server" +FILES:${PN}-server = "${bindir}/mosh-server" NEEDED_PERL_MODULES = "\ perl-module-socket \ @@ -34,9 +34,9 @@ NEEDED_PERL_MODULES = "\ " # mosh uses SSH to authenticate and the client uses OpenSSH-specific features -RDEPENDS_${PN} += "openssh-ssh ${NEEDED_PERL_MODULES}" +RDEPENDS:${PN} += "openssh-ssh ${NEEDED_PERL_MODULES}" # The server seemed not to work with dropbear either -RDEPENDS_${PN}-server += "openssh-sshd ${NEEDED_PERL_MODULES}" +RDEPENDS:${PN}-server += "openssh-sshd" # Fails to build with thumb-1 (qemuarm) #| {standard input}: Assembler messages: @@ -46,3 +46,5 @@ RDEPENDS_${PN}-server += "openssh-sshd ${NEEDED_PERL_MODULES}" #| {standard input}:2103: Error: instruction not supported in Thumb16 mode -- `adcs r7,r7,r7' #| {standard input}:2104: Error: selected processor does not support Thumb mode `it cs' ARM_INSTRUCTION_SET = "arm" + +CXXFLAGS:append = " -std=c++17" diff --git a/meta-oe/recipes-connectivity/obex/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch b/meta-oe/recipes-connectivity/obex/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch index e2c4e9ff6c..c18627b2fa 100644 --- a/meta-oe/recipes-connectivity/obex/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch +++ b/meta-oe/recipes-connectivity/obex/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch @@ -1,10 +1,11 @@ Submitted By: Armin K. <krejzi at email dot com> Date: 2012-07-06 Initial Package Version: 0.4.6 -Upstream Status: Unknown Origin: Self Description: Some build fixes. +Upstream-Status: Pending + Index: obex-data-server-0.4.6/src/ods-obex.c =================================================================== --- obex-data-server-0.4.6.orig/src/ods-obex.c 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 8763709355..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 @@ -1,17 +1,16 @@ DESCRIPTION = "obex-data-server is a D-Bus service providing high-level OBEX client and server side functionality" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" 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 REQUIRED_DISTRO_FEATURES = "x11" -FILES_${PN} += "${datadir}/dbus-1/" +FILES:${PN} += "${datadir}/dbus-1/" diff --git a/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb b/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb index 8790723967..7348274948 100644 --- a/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb +++ b/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb @@ -2,13 +2,13 @@ DESCRIPTION = "The Openobex project is an open source implementation of the \ Object Exchange (OBEX) protocol." HOMEPAGE = "http://openobex.triq.net" SECTION = "libs" -LICENSE = "GPLv2 & LGPLv2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ " DEPENDS = "virtual/libusb0" -DEPENDS_append_class-target = " bluez5" +DEPENDS:append:class-target = " bluez5" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}/${PV}/${BP}-Source.tar.gz \ " @@ -24,14 +24,14 @@ EXTRA_OECMAKE += "-DBUILD_DOCUMENTATION=OFF" ASNEEDED = "" -do_install_append () { +do_install:append () { rmdir ${D}${bindir} } PACKAGES =+ "openobex-apps" -FILES_${PN}-apps = "${bindir}/*" -FILES_${PN} += "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}/openobex-config" -DEBIAN_NOAUTONAME_${PN}-apps = "1" +FILES:${PN}-apps = "${bindir}/*" +FILES:${PN} += "${libdir}/lib*.so.*" +FILES:${PN}-dev += "${bindir}/openobex-config" +DEBIAN_NOAUTONAME:${PN}-apps = "1" BBCLASSEXTEND = "native" 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/obexftp/obexftp_0.24.2.bb b/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb index b4a914d929..f7a98fb61e 100644 --- a/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb +++ b/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb @@ -1,5 +1,5 @@ DESCRIPTION = "A tool for transfer files to/from any OBEX enabled device" -LICENSE = "GPLv2 & PD & LGPLv2.1" +LICENSE = "GPL-2.0-only & PD & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LGPL-2.1.txt;md5=4fbd65380cdd255951079008b364516c \ file://GPL-2.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://License.txt;md5=fcbddc3c1debed80dd80da2d3e5f0dc1 \ @@ -23,7 +23,7 @@ PACKAGECONFIG ?= "" PACKAGECONFIG[fuse] = "-DENABLE_FUSE=ON,-DENABLE_FUSE=OFF,fuse" PACKAGECONFIG[swig] = "-DENABLE_SWIG=ON,-DENABLE_SWIG=OFF,swig" -DEPENDS_remove_class-native = "fuse-native" +DEPENDS:remove:class-native = "fuse-native" S = "${WORKDIR}/${BP}-Source" @@ -32,11 +32,11 @@ EXTRA_OECMAKE += "-DCMAKE_SKIP_RPATH=ON \ -DENABLE_RUBY=OFF -DENABLE_TCL=OFF \ " -do_compile_class-native () { +do_compile:class-native () { oe_runmake crctable } -do_install_class-native () { +do_install:class-native () { install -D -m 0755 ${B}/bfb/crctable ${D}${bindir}/crctable } diff --git a/meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb b/meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb index efa3467a7f..f976ca109c 100644 --- a/meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb +++ b/meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb @@ -11,7 +11,7 @@ These tools are used at runtime." inherit packagegroup -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ bluez5-noinst-tools \ bluez5-obex \ bluez5-testtools \ diff --git a/meta-oe/recipes-connectivity/paho-mqtt-c/files/0001-Fix-bug-of-free-with-musl.patch b/meta-oe/recipes-connectivity/paho-mqtt-c/files/0001-Fix-bug-of-free-with-musl.patch deleted file mode 100644 index 12f9e7abcc..0000000000 --- a/meta-oe/recipes-connectivity/paho-mqtt-c/files/0001-Fix-bug-of-free-with-musl.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 96233a8382b9520293a48b08dc3b204a21205800 Mon Sep 17 00:00:00 2001 -From: Wang Mingyu <wangmy@cn.fujitsu.com> -Date: Fri, 24 Apr 2020 00:53:19 +0900 -Subject: [PATCH] Fix bug of free() with musl - -This fixes build error with musl C library: -/ubinux-dev/ubinux001/contribution/build/tmp/work/armv7vet2hf-neon-poky-linux-musleabi/paho-mqtt-c/1.3.2-r0/git/src/Heap.h:55:24: -error: expected declaration specifiers or '...' before string constant - 55 | #define free(x) myfree(__FILE__, __LINE__, x) - | ^~~~~~~~ -/ubinux-dev/ubinux001/contribution/build/tmp/work/armv7vet2hf-neon-poky-linux-musleabi/paho-mqtt-c/1.3.2-r0/git/src/Heap.h:55:34: -error: expected declaration specifiers or '...' before numeric constant - 55 | #define free(x) myfree(__FILE__, __LINE__, x) - | ^~~~~~~~ - -Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> ---- - src/MQTTReasonCodes.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/MQTTReasonCodes.c b/src/MQTTReasonCodes.c -index 416eab5..479dbac 100644 ---- a/src/MQTTReasonCodes.c -+++ b/src/MQTTReasonCodes.c -@@ -16,10 +16,10 @@ - - #include "MQTTReasonCodes.h" - --#include "Heap.h" - #include "StackTrace.h" - - #include <memory.h> -+#include "Heap.h" - - #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) - --- -2.17.1 - 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.4.bb b/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.13.bb index 2d4e39bf97..6f229001f6 100644 --- a/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.4.bb +++ b/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.13.bb @@ -5,16 +5,14 @@ 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 \ - file://0001-Fix-bug-of-free-with-musl.patch" +SRC_URI = "git://github.com/eclipse/paho.mqtt.c;protocol=https;branch=master" -SRCREV = "2d3d0941a9233889d4d5cc37f5182bbefea261ad" +SRCREV = "07a875788d8cc6f5833b12581d6e3e349b34d719" DEPENDS = "openssl" @@ -22,14 +20,14 @@ S = "${WORKDIR}/git" inherit cmake -do_configure_prepend() { +do_configure:prepend() { sed -i s:\ lib/cmake:\ ${baselib}/cmake:g ${S}/src/CMakeLists.txt } -do_install_append() { +do_install:append() { # paho-mqtt installes some thing that we don't want. rm -rf ${D}${prefix}/samples 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 new file mode 100644 index 0000000000..fba9a8767f --- /dev/null +++ b/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch @@ -0,0 +1,59 @@ +From 2a0dd2b300242230faa92cf8e26ccd70231bc9ef Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 19 Mar 2022 23:37:58 -0700 +Subject: [PATCH] cmake: Use CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_BINDIR + +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/cmake/CMakeLists.txt b/cmake/CMakeLists.txt +index a9f8908..7eadc60 100644 +--- a/cmake/CMakeLists.txt ++++ b/cmake/CMakeLists.txt +@@ -11,7 +11,7 @@ export(EXPORT ${package_name} + FILE "${CMAKE_CURRENT_BINARY_DIR}/${package_name}Targets.cmake" + NAMESPACE ${package_name}::) + +-install(EXPORT ${package_name} DESTINATION lib/cmake/${package_name} ++install(EXPORT ${package_name} DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${package_name} + FILE ${package_name}Targets.cmake + NAMESPACE ${package_name}::) + +@@ -19,4 +19,4 @@ install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/${package_name}Config.cmake" + FindPahoMqttC.cmake + "${CMAKE_CURRENT_BINARY_DIR}/${package_name}ConfigVersion.cmake" +- DESTINATION lib/cmake/${package_name}) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${package_name}) +diff --git a/src/samples/CMakeLists.txt b/src/samples/CMakeLists.txt +index 3ca0a75..c915cd5 100644 +--- a/src/samples/CMakeLists.txt ++++ b/src/samples/CMakeLists.txt +@@ -71,7 +71,7 @@ endforeach() + + ## install binaries + install(TARGETS ${EXECUTABLES} EXPORT PahoMqttCppSamples +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ) + + ## Build the SSL/TLS samples, if selected +@@ -89,7 +89,7 @@ if(PAHO_WITH_SSL) + endforeach() + + install(TARGETS ${SSL_EXECUTABLES} EXPORT PahoMqttCppSamples +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ) + endif() + +-- +2.34.1 + diff --git a/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.3.2.bb b/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.3.2.bb new file mode 100644 index 0000000000..1b2e51c3ac --- /dev/null +++ b/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.3.2.bb @@ -0,0 +1,24 @@ +SUMMARY = "Paho MQTT - C++ libraries for the MQTT and MQTT-SN protocols" +DESCRIPTION = "Client implementation of open and standard messaging protocols for Machine-to-Machine (M2M) and Internet of Things (IoT)." +HOMEPAGE = "http://www.eclipse.org/paho/" +SECTION = "console/network" +LICENSE = "EPL-2.0 | EDL-1.0" + +LIC_FILES_CHKSUM = " \ + file://src/mqtt/message.h;beginline=9;endline=18;md5=c5ceecf5ab99d44dcfaaabdce289071b \ + file://edl-v10;md5=3adfcc70f5aeb7a44f3f9b495aa1fbf3 \ + file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \ +" + +SRC_URI = "git://github.com/eclipse/paho.mqtt.cpp;protocol=https;branch=v1.3.x \ + file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch \ + " +SRCREV = "5e0d1bf37b4826d680ec066ec42afd133851a681" + +DEPENDS = "openssl paho-mqtt-c" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE += "-DPAHO_WITH_SSL=ON" diff --git a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_23.09.bb b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_23.09.bb new file mode 100644 index 0000000000..39c6942c83 --- /dev/null +++ b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_23.09.bb @@ -0,0 +1,21 @@ +SUMMARY = "A multiplatform C++ library for capturing, parsing and crafting of network packets" +HOMEPAGE = "https://pcapplusplus.github.io/" +BUGTRACKER = "https://github.com/seladb/PcapPlusPlus/issues" +SECTION = "libs/network" +LICENSE = "Unlicense" +LIC_FILES_CHKSUM = "file://LICENSE;md5=911690f51af322440237a253d695d19f" + +DEPENDS = "libpcap" + +SRC_URI = "git://github.com/seladb/PcapPlusPlus.git;protocol=https;branch=master" +SRCREV = "4cf8ed44f9dd145f874dc1dd747dfefcfcab75be" + +S = "${WORKDIR}/git" + +inherit cmake + +PACKAGECONFIG ??= "" +PACKAGECONFIG[examples] = "-DPCAPPP_BUILD_EXAMPLES=ON,-DPCAPPP_BUILD_EXAMPLES=OFF" +PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF" +PACKAGECONFIG[tests] = "-DPCAPPP_BUILD_TESTS=ON,-DPCAPPP_BUILD_TESTS=OFF" +PACKAGECONFIG[zstd] = "-DLIGHT_PCAPNG_ZSTD=ON,-DLIGHT_PCAPNG_ZSTD=OFF,zstd" diff --git a/meta-oe/recipes-connectivity/phonet-utils/phonet-utils/0001-Include-limits.h-for-PATH_MAX.patch b/meta-oe/recipes-connectivity/phonet-utils/phonet-utils/0001-Include-limits.h-for-PATH_MAX.patch deleted file mode 100644 index 8bb7e5a188..0000000000 --- a/meta-oe/recipes-connectivity/phonet-utils/phonet-utils/0001-Include-limits.h-for-PATH_MAX.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f7ad9a4471cee2324f216a0d82ba8097ec746c56 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 15 Jul 2017 11:48:12 -0700 -Subject: [PATCH] Include limits.h for PATH_MAX - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/pnstat.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/pnstat.c b/src/pnstat.c -index 661a5bc..76068e6 100644 ---- a/src/pnstat.c -+++ b/src/pnstat.c -@@ -35,6 +35,7 @@ - #include <dirent.h> - #include <unistd.h> - #include <netinet/tcp.h> -+#include <limits.h> - - struct fd - { --- -2.13.3 - diff --git a/meta-oe/recipes-connectivity/phonet-utils/phonet-utils_git.bb b/meta-oe/recipes-connectivity/phonet-utils/phonet-utils_git.bb deleted file mode 100644 index 3c599950fe..0000000000 --- a/meta-oe/recipes-connectivity/phonet-utils/phonet-utils_git.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "This small package provides a few command line tools for Linux Phonet" -HOMEPAGE = "" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRC_URI = "git://gitorious.org/meego-cellular/phonet-utils.git;branch=master \ - file://0001-Include-limits.h-for-PATH_MAX.patch \ - " -PR = "r2" -S = "${WORKDIR}/git" -SRCREV = "4acfa720fd37d178a048fc2be17180137d4a70ea" -PV = "0.0.0+gitr${SRCPV}" - -inherit autotools-brokensep - -FILES_${PN} += "${base_libdir}/udev/rules.d/85-phonet-utils.rules" 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.10.0.bb b/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.13.0.bb index 2ef6b187e9..ea80ec3344 100644 --- a/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.10.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" -# v0.10.0-master -SRCREV = "ffe918a5fcef72038a88054dca3c56762b1953d4" +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" @@ -16,4 +18,4 @@ EXTRA_OECMAKE = "-DBUILD_EXAMPLES=OFF -DBUILD_TOOLS=ON -DBUILD_TOOLS_DOCS=OFF -D inherit cmake pkgconfig PACKAGE_BEFORE_PN += "${PN}-tools" -FILES_${PN}-tools = "${bindir}" +FILES:${PN}-tools = "${bindir}" 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/rfkill/rfkill_0.5.bb b/meta-oe/recipes-connectivity/rfkill/rfkill_1.0.bb index 5c19e65b0e..c9c0738abe 100644 --- a/meta-oe/recipes-connectivity/rfkill/rfkill_0.5.bb +++ b/meta-oe/recipes-connectivity/rfkill/rfkill_1.0.bb @@ -1,15 +1,14 @@ SUMMARY = "Radio enable/disable command line utility" HOMEPAGE = "http://linuxwireless.org/en/users/Documentation/rfkill" SECTION = "base" -LICENSE = "BSD-0-Clause" +LICENSE = "0BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=c6036d0eb7edbfced28c4160e5d3fa94" -SRC_URI = "http://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.bz2 \ +SRC_URI = "http://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz \ file://0001-rfkill-makefile-don-t-use-t-the-OE-install-wrapper-d.patch \ file://dont.call.git.rev-parse.on.parent.dir.patch" -SRC_URI[md5sum] = "b957713a6cfbcd8ac0e94420aeddcf1a" -SRC_URI[sha256sum] = "3e160cca504a53679f2b3254f31c53a4fb38a021bc50fed8eb57a436d33dfa07" +SRC_URI[sha256sum] = "dffc631c611520478b8a286f57c67a35e8cb5802d376c6ca13b057365432389c" do_compile() { oe_runmake @@ -21,7 +20,6 @@ do_install() { inherit update-alternatives -ALTERNATIVE_${PN} = "rfkill" +ALTERNATIVE:${PN} = "rfkill" ALTERNATIVE_PRIORITY = "60" ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" - diff --git a/meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch b/meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch deleted file mode 100644 index 7d09f4382f..0000000000 --- a/meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch +++ /dev/null @@ -1,104 +0,0 @@ -Using AC_RUN_IFELSE prevent people from configuring package - for cross-compiling. Don't run code while configuring package. - -Upstream-Status: Pending -Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> - -Update for 0.9.8. -Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> ---- - scripts/checks.m4 | 34 ---------------------------------- - scripts/common.m4 | 28 ---------------------------- - 2 files changed, 62 deletions(-) - -diff --git a/scripts/checks.m4 b/scripts/checks.m4 -index 83be846..1af80f5 100644 ---- a/scripts/checks.m4 -+++ b/scripts/checks.m4 -@@ -95,40 +95,6 @@ AC_DEFUN([TORRENT_CHECK_KQUEUE], [ - - AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [ - AC_MSG_CHECKING(whether kqueue supports pipes and ptys) -- -- AC_LINK_IFELSE([AC_LANG_SOURCE([ -- #include <fcntl.h> -- #include <stdlib.h> -- #include <unistd.h> -- #include <sys/event.h> -- #include <sys/time.h> -- int main() { -- struct kevent ev@<:@2@:>@, ev_out@<:@2@:>@; -- struct timespec ts = { 0, 0 }; -- int pfd@<:@2@:>@, pty@<:@2@:>@, kfd, n; -- char buffer@<:@9001@:>@; -- if (pipe(pfd) == -1) return 1; -- if (fcntl(pfd@<:@1@:>@, F_SETFL, O_NONBLOCK) == -1) return 2; -- while ((n = write(pfd@<:@1@:>@, buffer, sizeof(buffer))) == sizeof(buffer)); -- if ((pty@<:@0@:>@=posix_openpt(O_RDWR | O_NOCTTY)) == -1) return 3; -- if ((pty@<:@1@:>@=grantpt(pty@<:@0@:>@)) == -1) return 4; -- EV_SET(ev+0, pfd@<:@1@:>@, EVFILT_WRITE, EV_ADD | EV_ENABLE, 0, 0, NULL); -- EV_SET(ev+1, pty@<:@1@:>@, EVFILT_READ, EV_ADD | EV_ENABLE, 0, 0, NULL); -- if ((kfd = kqueue()) == -1) return 5; -- if ((n = kevent(kfd, ev, 2, NULL, 0, NULL)) == -1) return 6; -- if (ev_out@<:@0@:>@.flags & EV_ERROR) return 7; -- if (ev_out@<:@1@:>@.flags & EV_ERROR) return 8; -- read(pfd@<:@0@:>@, buffer, sizeof(buffer)); -- if ((n = kevent(kfd, NULL, 0, ev_out, 2, &ts)) < 1) return 9; -- return 0; -- } -- ])], -- [ -- AC_MSG_RESULT(yes) -- ], [ -- AC_DEFINE(KQUEUE_SOCKET_ONLY, 1, kqueue only supports sockets.) -- AC_MSG_RESULT(no) -- ]) - ]) - - AC_DEFUN([TORRENT_WITH_KQUEUE], [ -diff --git a/scripts/common.m4 b/scripts/common.m4 -index aaf005e..42fb016 100644 ---- a/scripts/common.m4 -+++ b/scripts/common.m4 -@@ -152,38 +152,10 @@ dnl Need to fix this so that it uses the stuff defined by the system. - - AC_DEFUN([TORRENT_CHECK_EXECINFO], [ - AC_MSG_CHECKING(for execinfo.h) -- -- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -- #include <execinfo.h> -- int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} -- ])], -- [ -- AC_MSG_RESULT(yes) -- AC_DEFINE(USE_EXECINFO, 1, Use execinfo.h) -- ], [ -- AC_MSG_RESULT(no) -- ]) - ]) - - AC_DEFUN([TORRENT_CHECK_ALIGNED], [ - AC_MSG_CHECKING(the byte alignment) -- -- AC_LINK_IFELSE([AC_LANG_SOURCE([ -- #include <inttypes.h> -- int main() { -- char buf@<:@8@:>@ = { 0, 0, 0, 0, 1, 0, 0, 0 }; -- int i; -- for (i = 1; i < 4; ++i) -- if (*(uint32_t*)(buf + i) == 0) return -1; -- return 0; -- } -- ])], -- [ -- AC_MSG_RESULT(none needed) -- ], [ -- AC_DEFINE(USE_ALIGNED, 1, Require byte alignment) -- AC_MSG_RESULT(required) -- ]) - ]) - - --- -2.7.4 - diff --git a/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb b/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb index 331f978f86..d9cca404d7 100644 --- a/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb +++ b/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb @@ -1,17 +1,14 @@ SUMMARY = "Torrent client" HOMEPAGE = "http://libtorrent.rakshasa.no/" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "libsigc++-2.0 curl cppunit libtorrent ncurses" +DEPENDS = "autoconf-archive libsigc++-2.0 curl cppunit libtool libtorrent ncurses" -SRC_URI = "git://github.com/rakshasa/rtorrent \ - file://don-t-run-code-while-configuring-package.patch \ -" -# v0.9.8 -SRCREV = "6154d1698756e0c4842b1c13a0e56db93f1aa947" +SRC_URI = "git://github.com/rakshasa/rtorrent;branch=master;protocol=https" +SRCREV = "d067bd802e44f0e6a747aabcc311ada2175fd550" -PV = "0.9.8" +PV = "0.9.8+git" S = "${WORKDIR}/git" @@ -21,6 +18,6 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," inherit autotools pkgconfig -do_configure_prepend() { - (cd ${S}; ./autogen.sh; cd -) -} +EXTRA_AUTORECONF += "--exclude=aclocal" + +CXXFLAGS += "-std=gnu++14" diff --git a/meta-oe/recipes-connectivity/ser2net/files/ser2net.service b/meta-oe/recipes-connectivity/ser2net/files/ser2net.service new file mode 100644 index 0000000000..13d8ee4ff3 --- /dev/null +++ b/meta-oe/recipes-connectivity/ser2net/files/ser2net.service @@ -0,0 +1,13 @@ +[Unit] +Description=Serial port to network proxy +Documentation=man:ser2net(8) +After=network.target +Wants=network.target +ConditionFileNotEmpty=@SYSCONFDIR@/ser2net/ser2net.yaml + +[Service] +Type=exec +ExecStart=@SBINDIR@/ser2net -n + +[Install] +WantedBy=multi-user.target diff --git a/meta-oe/recipes-connectivity/ser2net/ser2net_4.2.0.bb b/meta-oe/recipes-connectivity/ser2net/ser2net_4.2.0.bb deleted file mode 100644 index 13794ad9d5..0000000000 --- a/meta-oe/recipes-connectivity/ser2net/ser2net_4.2.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "A serial to network proxy" -SECTION = "console/network" -HOMEPAGE = "http://sourceforge.net/projects/ser2net/" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f" - -DEPENDS = "gensio libyaml" - -SRC_URI = "${SOURCEFORGE_MIRROR}/project/ser2net/ser2net/ser2net-${PV}.tar.gz" - -SRC_URI[sha256sum] = "1d895f005896e8c5bcff4fe573e2fec3611bf4feee1247857e476b74323d916c" - -UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/ser2net/files/ser2net" - -inherit autotools pkgconfig - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-connectivity/ser2net/ser2net_4.6.1.bb b/meta-oe/recipes-connectivity/ser2net/ser2net_4.6.1.bb new file mode 100644 index 0000000000..e5ebafa54f --- /dev/null +++ b/meta-oe/recipes-connectivity/ser2net/ser2net_4.6.1.bb @@ -0,0 +1,30 @@ +SUMMARY = "A serial to network proxy" +SECTION = "console/network" +HOMEPAGE = "http://sourceforge.net/projects/ser2net/" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "gensio libyaml" + +SRC_URI = "${SOURCEFORGE_MIRROR}/project/ser2net/ser2net/ser2net-${PV}.tar.gz \ + file://ser2net.service \ +" + +SRC_URI[sha256sum] = "78ffee19d9b97e93ae65b5cec072da2b7b947fc484e9ccb3f535702f36f6ed19" + +UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/ser2net/files/ser2net" + +inherit autotools pkgconfig systemd + +SYSTEMD_SERVICE:${PN} = "ser2net.service" + +CONFFILES:${PN} += "${sysconfdir}/ser2net/ser2net.yaml" + +do_install:append() { + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/ser2net.service ${D}${systemd_unitdir}/system/ + sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/ser2net.service + fi +} diff --git a/meta-oe/recipes-connectivity/smstools3/smstools3/0001-Make-extern-declarations-to-avoid-duplicate-var-defi.patch b/meta-oe/recipes-connectivity/smstools3/smstools3/0001-Make-extern-declarations-to-avoid-duplicate-var-defi.patch new file mode 100644 index 0000000000..c714f74916 --- /dev/null +++ b/meta-oe/recipes-connectivity/smstools3/smstools3/0001-Make-extern-declarations-to-avoid-duplicate-var-defi.patch @@ -0,0 +1,606 @@ +From 77532d2e99252e3e07afa0f918bb8c9d73798f39 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 13 Aug 2020 16:56:22 -0700 +Subject: [PATCH] Make extern declarations to avoid duplicate var definitions + +gcc-10+ defaults to -fno-common which flags these errors about mulitple +definitions since the variables are defined in header files which are +included from multiple sources, this patch ensures that extern +declaration is added appropriately + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/blacklist.c | 2 +- + src/blacklist.h | 2 +- + src/charset.c | 2 +- + src/charshift.c | 2 +- + src/logging.c | 2 +- + src/logging.h | 4 +- + src/modeminit.c | 6 +- + src/smsd_cfg.c | 2 + + src/smsd_cfg.h | 274 ++++++++++++++++++++++++------------------------ + src/stats.h | 22 ++-- + src/whitelist.c | 2 +- + src/whitelist.h | 2 +- + 12 files changed, 164 insertions(+), 158 deletions(-) + +diff --git a/src/blacklist.c b/src/blacklist.c +index 7440cca..0c00dd9 100755 +--- a/src/blacklist.c ++++ b/src/blacklist.c +@@ -17,11 +17,11 @@ Either version 2 of the License, or (at your option) any later version. + #include <stdlib.h> + #include <string.h> + #include <signal.h> ++#include "smsd_cfg.h" + #include "blacklist.h" + #include "extras.h" + #include "logging.h" + #include "alarm.h" +-#include "smsd_cfg.h" + + int inblacklist(char* msisdn) + { +diff --git a/src/blacklist.h b/src/blacklist.h +index 4f99050..61fd294 100755 +--- a/src/blacklist.h ++++ b/src/blacklist.h +@@ -15,7 +15,7 @@ Either version 2 of the License, or (at your option) any later version. + #ifndef BLACK_H + #define BLACK_H + +-char blacklist[256]; // Filename of the black-list ++EXTERN char blacklist[256]; // Filename of the black-list + + int inblacklist(char* msisdn); + +diff --git a/src/charset.c b/src/charset.c +index cd7c997..1716d70 100755 +--- a/src/charset.c ++++ b/src/charset.c +@@ -19,9 +19,9 @@ Either version 2 of the License, or (at your option) any later version. + #include <syslog.h> + #include <ctype.h> + ++#include "smsd_cfg.h" + #include "charset.h" + #include "logging.h" +-#include "smsd_cfg.h" + #include "pdu.h" + #include "extras.h" + #include "charshift.h" +diff --git a/src/charshift.c b/src/charshift.c +index 48ba340..2d7b26c 100755 +--- a/src/charshift.c ++++ b/src/charshift.c +@@ -25,8 +25,8 @@ Either version 2 of the License, or (at your option) any later version. + #include <stdio.h> + #include <stdarg.h> + +-#include "logging.h" + #include "smsd_cfg.h" ++#include "logging.h" + #include "pdu.h" + #include "charset.h" + #include "extras.h" +diff --git a/src/logging.c b/src/logging.c +index 6ee2c4e..4af341f 100755 +--- a/src/logging.c ++++ b/src/logging.c +@@ -12,6 +12,7 @@ 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. + */ + ++#include "smsd_cfg.h" + #include "logging.h" + #include "extras.h" + #include <stdio.h> +@@ -22,7 +23,6 @@ Either version 2 of the License, or (at your option) any later version. + #include <time.h> + #include <fcntl.h> + #include <unistd.h> +-#include "smsd_cfg.h" + #include "stats.h" + + int Filehandle = -1; +diff --git a/src/logging.h b/src/logging.h +index 4f27906..4550234 100755 +--- a/src/logging.h ++++ b/src/logging.h +@@ -18,7 +18,7 @@ Either version 2 of the License, or (at your option) any later version. + #include <time.h> + + // 3.1.16beta2: Moved logch() and prch() from charset.c to logging.c: +-char logch_buffer[8192]; ++EXTERN char logch_buffer[8192]; + + #ifdef __GNUC__ + void logch(char* format, ...) __attribute__ ((format(printf, 1, 2))); +@@ -30,7 +30,7 @@ char prch(char ch); + + // 3.1.16beta: changed type: + //int trouble_logging_started; +-time_t trouble_logging_started; ++EXTERN time_t trouble_logging_started; + + int change_loglevel(int new_level); + void restore_loglevel(); +diff --git a/src/modeminit.c b/src/modeminit.c +index 42ff6b4..0d05fe9 100755 +--- a/src/modeminit.c ++++ b/src/modeminit.c +@@ -19,8 +19,6 @@ Either version 2 of the License, or (at your option) any later version. + #include <regex.h> + #include <ctype.h> + #include <time.h> +-#include "logging.h" +-#include "alarm.h" + + #ifdef SOLARIS + #include <sys/filio.h> +@@ -42,9 +40,11 @@ Either version 2 of the License, or (at your option) any later version. + #include <netdb.h> + #endif + ++#include "smsd_cfg.h" ++#include "logging.h" ++#include "alarm.h" + #include "extras.h" + #include "modeminit.h" +-#include "smsd_cfg.h" + #include "version.h" + #include "pdu.h" + #include "stats.h" +diff --git a/src/smsd_cfg.c b/src/smsd_cfg.c +index 35c1198..32472b4 100755 +--- a/src/smsd_cfg.c ++++ b/src/smsd_cfg.c +@@ -26,6 +26,8 @@ Either version 2 of the License, or (at your option) any later version. + #include <ctype.h> + #include <grp.h> + ++#define EXTERN ++ + #include "extras.h" + #include "cfgfile.h" + #include "smsd_cfg.h" +diff --git a/src/smsd_cfg.h b/src/smsd_cfg.h +index 8ae208d..d6ece37 100755 +--- a/src/smsd_cfg.h ++++ b/src/smsd_cfg.h +@@ -15,6 +15,10 @@ Either version 2 of the License, or (at your option) any later version. + #ifndef SMSD_CFG_H + #define SMSD_CFG_H + ++#ifndef EXTERN ++#define EXTERN extern ++#endif ++ + #include <limits.h> + #include <sys/types.h> + #include <time.h> +@@ -126,17 +130,17 @@ Either version 2 of the License, or (at your option) any later version. + #define ALPHABET_UNKNOWN 4 + #define ALPHABET_DEFAULT 0 + +-char process_title[32]; // smsd for main task, NOTIFIER or CHILD, name of a modem for other tasks. +-int process_id; // -1 for main task, all modems have numbers starting with 0. ++EXTERN char process_title[32]; // smsd for main task, NOTIFIER or CHILD, name of a modem for other tasks. ++EXTERN int process_id; // -1 for main task, all modems have numbers starting with 0. + // This is the same as device, can be used like devices[process_id] if IS_MODEM_PROCESS. + +-time_t process_start_time; ++EXTERN time_t process_start_time; + +-int modem_handle; // Handle for modem. ++EXTERN int modem_handle; // Handle for modem. + +-int put_command_timeouts; +-unsigned long long put_command_sent; // 3.1.16beta. +-char tmpdir[PATH_MAX]; // 3.1.16beta. ++EXTERN int put_command_timeouts; ++EXTERN unsigned long long put_command_sent; // 3.1.16beta. ++EXTERN char tmpdir[PATH_MAX]; // 3.1.16beta. + + typedef struct + { +@@ -284,204 +288,204 @@ typedef struct + + // NOTE for regular run intervals: effective value is at least delaytime. + +-char configfile[PATH_MAX]; // Path to config file +-char d_spool[PATH_MAX]; // Spool directory +-char d_failed[PATH_MAX]; // Failed spool directory +-char d_failed_copy[PATH_MAX]; // 3.1.17. +-char d_incoming[PATH_MAX]; // Incoming spool directory +-char d_incoming_copy[PATH_MAX]; // 3.1.16beta2. +-char d_report[PATH_MAX]; // Incoming report spool directory +-char d_report_copy[PATH_MAX]; // 3.1.17. +-char d_phonecalls[PATH_MAX]; // Incoming phonecalls data directory +-char d_saved[PATH_MAX]; // Directory for smsd's internal use, concatenation storage files etc. +-char d_sent[PATH_MAX]; // Sent spool directory +-char d_sent_copy[PATH_MAX]; // 3.1.17. +-char d_checked[PATH_MAX]; // Spool directory for checked messages (only used when no provider queues used) +-char eventhandler[PATH_MAX]; // Global event handler program or script +-char alarmhandler[PATH_MAX]; // Global alarm handler program or script +-char checkhandler[PATH_MAX]; // Handler that checks if the sms file is valid. +-int alarmlevel; // Alarm Level (9=highest). Verbosity of alarm handler. +-char logfile[PATH_MAX]; // Name or Handle of Log File +-int loglevel; // Log Level (9=highest). Verbosity of log file. +-_queue queues[NUMBER_OF_MODEMS]; // Queues +-_device devices[NUMBER_OF_MODEMS]; // Modem devices +-int delaytime; // sleep-time after workless +-int delaytime_mainprocess; // sleep-time after workless, main process. If -1, delaytime is used. +-int blocktime; // sleep-time after multiple errors +-int blockafter; // Block modem after n errors +-int errorsleeptime; // sleep-time after each error +-int autosplit; // Splitting of large text messages 0=no, 1=yes 2=number with text, 3=number with UDH +-int receive_before_send; // if 1 smsd tries to receive one message before sending +-int store_received_pdu; // 0=no, 1=unsupported pdu's only, 2=unsupported and 8bit/unicode, 3=all +-int store_sent_pdu; // 0=no, 1=failed pdu's only, 2=failed and 8bit/unicode, 3=all +-int validity_period; // Validity period for messages. +-int decode_unicode_text; // 1 if unicode text is decoded internally. +-int internal_combine; // 1 if multipart message is combined internally. +-int internal_combine_binary; // 1 if multipart binary message is combined internally. Defaults to internal_combine. +-int keep_filename; // 0 if unique filename is created to each directory when a message file is moved. +-int store_original_filename; // 1 if an original filename is saved to message file when it's moved from ++EXTERN char configfile[PATH_MAX]; // Path to config file ++EXTERN char d_spool[PATH_MAX]; // Spool directory ++EXTERN char d_failed[PATH_MAX]; // Failed spool directory ++EXTERN char d_failed_copy[PATH_MAX]; // 3.1.17. ++EXTERN char d_incoming[PATH_MAX]; // Incoming spool directory ++EXTERN char d_incoming_copy[PATH_MAX]; // 3.1.16beta2. ++EXTERN char d_report[PATH_MAX]; // Incoming report spool directory ++EXTERN char d_report_copy[PATH_MAX]; // 3.1.17. ++EXTERN char d_phonecalls[PATH_MAX]; // Incoming phonecalls data directory ++EXTERN char d_saved[PATH_MAX]; // Directory for smsd's internal use, concatenation storage files etc. ++EXTERN char d_sent[PATH_MAX]; // Sent spool directory ++EXTERN char d_sent_copy[PATH_MAX]; // 3.1.17. ++EXTERN char d_checked[PATH_MAX]; // Spool directory for checked messages (only used when no provider queues used) ++EXTERN char eventhandler[PATH_MAX]; // Global event handler program or script ++EXTERN char alarmhandler[PATH_MAX]; // Global alarm handler program or script ++EXTERN char checkhandler[PATH_MAX]; // Handler that checks if the sms file is valid. ++EXTERN int alarmlevel; // Alarm Level (9=highest). Verbosity of alarm handler. ++EXTERN char logfile[PATH_MAX]; // Name or Handle of Log File ++EXTERN int loglevel; // Log Level (9=highest). Verbosity of log file. ++EXTERN _queue queues[NUMBER_OF_MODEMS]; // Queues ++EXTERN _device devices[NUMBER_OF_MODEMS]; // Modem devices ++EXTERN int delaytime; // sleep-time after workless ++EXTERN int delaytime_mainprocess; // sleep-time after workless, main process. If -1, delaytime is used. ++EXTERN int blocktime; // sleep-time after multiple errors ++EXTERN int blockafter; // Block modem after n errors ++EXTERN int errorsleeptime; // sleep-time after each error ++EXTERN int autosplit; // Splitting of large text messages 0=no, 1=yes 2=number with text, 3=number with UDH ++EXTERN int receive_before_send; // if 1 smsd tries to receive one message before sending ++EXTERN int store_received_pdu; // 0=no, 1=unsupported pdu's only, 2=unsupported and 8bit/unicode, 3=all ++EXTERN int store_sent_pdu; // 0=no, 1=failed pdu's only, 2=failed and 8bit/unicode, 3=all ++EXTERN int validity_period; // Validity period for messages. ++EXTERN int decode_unicode_text; // 1 if unicode text is decoded internally. ++EXTERN int internal_combine; // 1 if multipart message is combined internally. ++EXTERN int internal_combine_binary; // 1 if multipart binary message is combined internally. Defaults to internal_combine. ++EXTERN int keep_filename; // 0 if unique filename is created to each directory when a message file is moved. ++EXTERN int store_original_filename; // 1 if an original filename is saved to message file when it's moved from + // outgoing directory to spooler. Works together with keep_filename. +-int date_filename; // 1 or 2 if YYYYMMDD is included to the filename of incoming message. +-char regular_run[PATH_MAX]; // Script/program which is run regularly. +-int regular_run_interval; // Number of seconds between running a regular_run script/progdam. +-char admin_to[SIZE_TO]; // Destination number for administrative messages. +-int filename_preview; // Number of chars of message text to concatenate to filename. +-int incoming_utf8; // 1 if incoming files are saved using UTF-8 character set. +-int outgoing_utf8; // 1 if outgoing files are automatically converted from UTF-8 to ISO and GSM. +-int log_charconv; // 1 if character set conversion is logged. +-int log_single_lines; // 1 if linefeeds are removed from the modem response to be logged. +-int executable_check; // 0 if eventhandler and other executables are NOT checked during the startup checking. +-int keep_messages; // For testing purposes: messages are not deleted and smsd stops after first run. +-char priviledged_numbers[SIZE_PRIVILEDGED_NUMBERS]; // Priviledged numbers in incoming messages. +-int ic_purge_hours; // If internal_combine is used, concatenation storage is checked every ic_purge_interval minutes +-int ic_purge_minutes; // and if there is message parts older than defined, they are handled or deleted. +-int ic_purge_read; // 1 = message parts are stored as single messages. 0 = parts are just deleted. +-int ic_purge_interval; // +-char shell[PATH_MAX]; // Shell used to run eventhandler, defaults to /bin/sh +-char adminmessage_device[32]; // Name of device used to send administrative messages of mainspooler. +-int smart_logging; // 1 = if loglevel is less than 7, degug log is written is there has been any errors. +-int status_signal_quality; // 1 = signal quality is written to status file. +-int status_include_counters; // 1 = succeeded, failed and received counters are included in the status line. +-int status_include_uptime; // 3.1.16beta: 1 = include started & uptime line in the status file. +-int hangup_incoming_call; // 1 = if detected unexpected input contains RING and we want to end call. +-int max_continuous_sending; // Defines when sending is breaked to do check/do other tasks. Time in minutes. +-int voicecall_hangup_ath; // If ATH is used instead of AT+CHUP. ++EXTERN int date_filename; // 1 or 2 if YYYYMMDD is included to the filename of incoming message. ++EXTERN char regular_run[PATH_MAX]; // Script/program which is run regularly. ++EXTERN int regular_run_interval; // Number of seconds between running a regular_run script/progdam. ++EXTERN char admin_to[SIZE_TO]; // Destination number for administrative messages. ++EXTERN int filename_preview; // Number of chars of message text to concatenate to filename. ++EXTERN int incoming_utf8; // 1 if incoming files are saved using UTF-8 character set. ++EXTERN int outgoing_utf8; // 1 if outgoing files are automatically converted from UTF-8 to ISO and GSM. ++EXTERN int log_charconv; // 1 if character set conversion is logged. ++EXTERN int log_single_lines; // 1 if linefeeds are removed from the modem response to be logged. ++EXTERN int executable_check; // 0 if eventhandler and other executables are NOT checked during the startup checking. ++EXTERN int keep_messages; // For testing purposes: messages are not deleted and smsd stops after first run. ++EXTERN char priviledged_numbers[SIZE_PRIVILEDGED_NUMBERS]; // Priviledged numbers in incoming messages. ++EXTERN int ic_purge_hours; // If internal_combine is used, concatenation storage is checked every ic_purge_interval minutes ++EXTERN int ic_purge_minutes; // and if there is message parts older than defined, they are handled or deleted. ++EXTERN int ic_purge_read; // 1 = message parts are stored as single messages. 0 = parts are just deleted. ++EXTERN int ic_purge_interval; // ++EXTERN char shell[PATH_MAX]; // Shell used to run eventhandler, defaults to /bin/sh ++EXTERN char adminmessage_device[32]; // Name of device used to send administrative messages of mainspooler. ++EXTERN int smart_logging; // 1 = if loglevel is less than 7, degug log is written is there has been any errors. ++EXTERN int status_signal_quality; // 1 = signal quality is written to status file. ++EXTERN int status_include_counters; // 1 = succeeded, failed and received counters are included in the status line. ++EXTERN int status_include_uptime; // 3.1.16beta: 1 = include started & uptime line in the status file. ++EXTERN int hangup_incoming_call; // 1 = if detected unexpected input contains RING and we want to end call. ++EXTERN int max_continuous_sending; // Defines when sending is breaked to do check/do other tasks. Time in minutes. ++EXTERN int voicecall_hangup_ath; // If ATH is used instead of AT+CHUP. + + // 3.1.5: +-int trust_outgoing; // 1 = it's _sure_ that files are created by rename AND permissions are correct. Speeds up spooling. ++EXTERN int trust_outgoing; // 1 = it's _sure_ that files are created by rename AND permissions are correct. Speeds up spooling. + + // 3.1.5: +-int ignore_outgoing_priority; // 1 = Priority: high header is not checked. Speeds up spooling. ++EXTERN int ignore_outgoing_priority; // 1 = Priority: high header is not checked. Speeds up spooling. + + // 3.1.7: +-int ignore_exec_output; // 1 = stdout and stderr of eventhandlers is _not_ checked. ++EXTERN int ignore_exec_output; // 1 = stdout and stderr of eventhandlers is _not_ checked. + + // 3.1.7: +-mode_t conf_umask; // File mode creation mask for smsd and modem processes. ++EXTERN mode_t conf_umask; // File mode creation mask for smsd and modem processes. + + // 3.1.7: +-int trim_text; // 1 = trailing whitespaces are removed from text: ++EXTERN int trim_text; // 1 = trailing whitespaces are removed from text: + + // 3.1.7: +-int use_linux_ps_trick; // 1 = change argv[0] to "smsd: MAINPROCESS", "smsd: GSM1" etc. ++EXTERN int use_linux_ps_trick; // 1 = change argv[0] to "smsd: MAINPROCESS", "smsd: GSM1" etc. + + // 3.1.7: +-int log_unmodified; ++EXTERN int log_unmodified; + + // 3.1.7: +-char suspend_filename[PATH_MAX]; ++EXTERN char suspend_filename[PATH_MAX]; + + // 3.1.9: +-int spool_directory_order; ++EXTERN int spool_directory_order; + + // 3.1.9: 1 if read_from_modem is logged. +-int log_read_from_modem; ++EXTERN int log_read_from_modem; + + // 3.1.16beta2: log_read_timing for performance tuning. +-int log_read_timing; ++EXTERN int log_read_timing; + + // 3.1.16beta: +-int log_response_time; ++EXTERN int log_response_time; + + // 3.1.16beta2: +-int default_alphabet; ++EXTERN int default_alphabet; + + // 3.1.17: Child process for the mainprocess: +-char mainprocess_child[PATH_MAX]; +-char mainprocess_child_args[PATH_MAX]; ++EXTERN char mainprocess_child[PATH_MAX]; ++EXTERN char mainprocess_child_args[PATH_MAX]; + + // 3.1.17: Notifier for the mainprocess: +-int mainprocess_notifier; ++EXTERN int mainprocess_notifier; + + // 3.1.17: If *_copy was made, evenhandler can use it instead of original file: +-int eventhandler_use_copy; ++EXTERN int eventhandler_use_copy; + + // 3.1.17: This defines how long to sleep while looping: +-int sleeptime_mainprocess; ++EXTERN int sleeptime_mainprocess; + + // 3.1.17: Defines how often PID is checked to detect if another smsd is running: +-int check_pid_interval; ++EXTERN int check_pid_interval; + + // 3.1.18: start script/program for mainprocess: +-char mainprocess_start[PATH_MAX]; +-char mainprocess_start_args[PATH_MAX]; ++EXTERN char mainprocess_start[PATH_MAX]; ++EXTERN char mainprocess_start_args[PATH_MAX]; + +-int message_count; // Counter for sent messages. Multipart message is one message. ++EXTERN int message_count; // Counter for sent messages. Multipart message is one message. + +-volatile sig_atomic_t break_workless_delay; // To break the delay when SIGCONT is received. +-volatile sig_atomic_t terminate; // To terminate when SIGTERM is received. ++EXTERN volatile sig_atomic_t break_workless_delay; // To break the delay when SIGCONT is received. ++EXTERN volatile sig_atomic_t terminate; // To terminate when SIGTERM is received. + +-char username[65]; // user and group name which are used to run. +-char groupname[65]; // (max length is just a guess) ++EXTERN char username[65]; // user and group name which are used to run. ++EXTERN char groupname[65]; // (max length is just a guess) + +-char infofile[PATH_MAX]; // Hepler file for stopping the smsd smoothly. +-char pidfile[PATH_MAX]; // File where a process id is stored. ++EXTERN char infofile[PATH_MAX]; // Hepler file for stopping the smsd smoothly. ++EXTERN char pidfile[PATH_MAX]; // File where a process id is stored. + + // Command line arguments: +-char arg_username[65]; +-char arg_groupname[65]; +-char arg_infofile[PATH_MAX]; +-char arg_pidfile[PATH_MAX]; +-char arg_logfile[PATH_MAX]; +-int arg_terminal; ++EXTERN char arg_username[65]; ++EXTERN char arg_groupname[65]; ++EXTERN char arg_infofile[PATH_MAX]; ++EXTERN char arg_pidfile[PATH_MAX]; ++EXTERN char arg_logfile[PATH_MAX]; ++EXTERN int arg_terminal; + // 3.1.7: +-char arg_7bit_packed[512]; +-int do_encode_decode_arg_7bit_packed; ++EXTERN char arg_7bit_packed[512]; ++EXTERN int do_encode_decode_arg_7bit_packed; + +-int terminal; // 1 if smsd is communicating with terminal. +-pid_t device_pids[NUMBER_OF_MODEMS]; // Pid's of modem processes. +-char run_info[PATH_MAX]; // Information about external script/program execution. ++EXTERN int terminal; // 1 if smsd is communicating with terminal. ++EXTERN pid_t device_pids[NUMBER_OF_MODEMS]; // Pid's of modem processes. ++EXTERN char run_info[PATH_MAX]; // Information about external script/program execution. + +-char communicate[32]; // Device name for terminal communication mode. ++EXTERN char communicate[32]; // Device name for terminal communication mode. + +-char international_prefixes[PATH_MAX +1]; +-char national_prefixes[PATH_MAX +1]; ++EXTERN char international_prefixes[PATH_MAX +1]; ++EXTERN char national_prefixes[PATH_MAX +1]; + + // Storage for startup errors: +-char *startup_err_str; +-int startup_err_count; ++EXTERN char *startup_err_str; ++EXTERN int startup_err_count; + + // Storage for PDU's: +-char *incoming_pdu_store; +-char *outgoing_pdu_store; +-char *routed_pdu_store; ++EXTERN char *incoming_pdu_store; ++EXTERN char *outgoing_pdu_store; ++EXTERN char *routed_pdu_store; + + // Storage for getfile errors: +-char *getfile_err_store; ++EXTERN char *getfile_err_store; + + // Text buffer for error messages: +-char tb[SIZE_TB]; ++EXTERN char tb[SIZE_TB]; + + // Buffer for SIM memory checking: +-char *check_memory_buffer; +-size_t check_memory_buffer_size; ++EXTERN char *check_memory_buffer; ++EXTERN size_t check_memory_buffer_size; + +-int os_cygwin; // 1 if we are on Cygwin. ++EXTERN int os_cygwin; // 1 if we are on Cygwin. + +-char language_file[PATH_MAX]; // File name of translated headers. +-char yes_chars[SIZE_HEADER]; // Characters which mean "yes" in the yesno() question. +-char no_chars[SIZE_HEADER]; // See details inside read_translation() function. +-char yes_word[SIZE_HEADER]; // "yes" printed as an output. +-char no_word[SIZE_HEADER]; // "no" +-char datetime_format[SIZE_HEADER]; // strftime format string for time stamps (not inside status reports). +-char logtime_format[SIZE_HEADER]; // 3.1.7: strftime format string for logging time stamps +-char date_filename_format[SIZE_HEADER]; // 3.1.7: strftime format string for date_filename +-int translate_incoming; // 0 if incoming message headers are NOT transtaled. ++EXTERN char language_file[PATH_MAX]; // File name of translated headers. ++EXTERN char yes_chars[SIZE_HEADER]; // Characters which mean "yes" in the yesno() question. ++EXTERN char no_chars[SIZE_HEADER]; // See details inside read_translation() function. ++EXTERN char yes_word[SIZE_HEADER]; // "yes" printed as an output. ++EXTERN char no_word[SIZE_HEADER]; // "no" ++EXTERN char datetime_format[SIZE_HEADER]; // strftime format string for time stamps (not inside status reports). ++EXTERN char logtime_format[SIZE_HEADER]; // 3.1.7: strftime format string for logging time stamps ++EXTERN char date_filename_format[SIZE_HEADER]; // 3.1.7: strftime format string for date_filename ++EXTERN int translate_incoming; // 0 if incoming message headers are NOT transtaled. + + // 3.1.14: +-int logtime_us; +-int logtime_ms; ++EXTERN int logtime_us; ++EXTERN int logtime_ms; + + // 3.1.14: +-int shell_test; ++EXTERN int shell_test; + + // Next two are for debugging purposes: +-int enable_smsd_debug; +-char smsd_debug[SIZE_SMSD_DEBUG]; // Header of an outgoing message file. ++EXTERN int enable_smsd_debug; ++EXTERN char smsd_debug[SIZE_SMSD_DEBUG]; // Header of an outgoing message file. + + // 3.1.20: Alt keys in communication mode: + #define COMMUNICATE_A_KEY_COUNT 10 +-char communicate_a_keys[COMMUNICATE_A_KEY_COUNT][256]; ++EXTERN char communicate_a_keys[COMMUNICATE_A_KEY_COUNT][256]; + + /* initialize all variable with default values */ + +diff --git a/src/stats.h b/src/stats.h +index bd5cdc9..a614af1 100755 +--- a/src/stats.h ++++ b/src/stats.h +@@ -33,17 +33,17 @@ typedef struct + int ber; + } _stats; + +-_stats* statistics[NUMBER_OF_MODEMS]; // Statistic data (shared memory!) +-int rejected_counter; // Statistic counter, rejected SM, number does not fit into any queue +-time_t start_time; // Start time of smsd, allows statistic functions +-int printstatus; // if 1 smsd outputs status on stdout +-time_t last_stats; // time when the last stats file was created +-char d_stats[PATH_MAX]; // path to statistic files +-int stats_interval; // time between statistic files in seconds. +-int stats_no_zeroes; // Suppress files that contain only zeroes +-int status_interval; // time between updating status file in seconds +- +-char *shared_buffer; ++EXTERN _stats* statistics[NUMBER_OF_MODEMS]; // Statistic data (shared memory!) ++EXTERN int rejected_counter; // Statistic counter, rejected SM, number does not fit into any queue ++EXTERN time_t start_time; // Start time of smsd, allows statistic functions ++EXTERN int printstatus; // if 1 smsd outputs status on stdout ++EXTERN time_t last_stats; // time when the last stats file was created ++EXTERN char d_stats[PATH_MAX]; // path to statistic files ++EXTERN int stats_interval; // time between statistic files in seconds. ++EXTERN int stats_no_zeroes; // Suppress files that contain only zeroes ++EXTERN int status_interval; // time between updating status file in seconds ++ ++EXTERN char *shared_buffer; + + /* Creates shared memory variables for statistic data */ + +diff --git a/src/whitelist.c b/src/whitelist.c +index 4ee7a69..3d90bf4 100755 +--- a/src/whitelist.c ++++ b/src/whitelist.c +@@ -17,11 +17,11 @@ Either version 2 of the License, or (at your option) any later version. + #include <stdlib.h> + #include <string.h> + #include <signal.h> ++#include "smsd_cfg.h" + #include "whitelist.h" + #include "extras.h" + #include "logging.h" + #include "alarm.h" +-#include "smsd_cfg.h" + + /* Used with >= 3.1x */ + int inwhitelist_q(char* msisdn, char *queuename) +diff --git a/src/whitelist.h b/src/whitelist.h +index 88aea86..3f904f4 100755 +--- a/src/whitelist.h ++++ b/src/whitelist.h +@@ -15,7 +15,7 @@ Either version 2 of the License, or (at your option) any later version. + #ifndef WHITE_H + #define WHITE_H + +-char whitelist[256]; // Filename of the white-list ++EXTERN char whitelist[256]; // Filename of the white-list + + /* Used with >= 3.1x */ + int inwhitelist_q(char* msisdn, char *queuename); +-- +2.28.0 + 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/smstools3/smstools3_3.1.21.bb b/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb index 6e6413b4bc..9e54968633 100644 --- a/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb +++ b/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb @@ -1,13 +1,15 @@ SUMMARY = "SMS Gateway software" DESCRIPTION = "The SMS Server Tools 3 is a SMS Gateway software which can send and receive short messages through GSM modems and mobile phones." SECTION = "console/network" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=4d21efa1bb2a186360dde4035f860682" HOMEPAGE = "http://smstools3.kekekasvi.com" SRC_URI = "http://smstools3.kekekasvi.com/packages/${BP}.tar.gz \ file://sms_binpath.patch \ - file://scripts_no_bash.patch" + file://scripts_no_bash.patch \ + file://0001-Make-extern-declarations-to-avoid-duplicate-var-defi.patch \ + " SRC_URI[md5sum] = "6a9f038fb38a49cc3a4f8f14a88fb8af" SRC_URI[sha256sum] = "a26ba4c02b16f6cf13177bffca6c9230dc5fefaeba8e3030cd4e4905f6a92084" diff --git a/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.1.bb b/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.1.bb index 2b05c61a0d..e083039232 100644 --- a/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.1.bb +++ b/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.1.bb @@ -2,7 +2,7 @@ SUMMARY = "Telepathy Framework glib-base helper library" DESCRIPTION = "Telepathy Framework: GLib-based helper library for connection managers" HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" DEPENDS = "glib-2.0 dbus hostpython-runtime-native dbus-native dbus-glib libxslt-native" -LICENSE = "LGPLv2.1+" +LICENSE = "LGPL-2.1-or-later" SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${BP}.tar.gz" SRC_URI[md5sum] = "cbeb0a24acc26e7f095be281c324da69" @@ -10,9 +10,11 @@ SRC_URI[sha256sum] = "9e0df1d8f857e0270cf0b32e2d1ca5a24aa7282873361785d573f72ad7 LIC_FILES_CHKSUM = "file://COPYING;md5=e413d83db6ee8f2c8e6055719096a48e" -inherit autotools pkgconfig gettext gobject-introspection vala +inherit autotools pkgconfig gettext gobject-introspection vala gtk-doc -EXTRA_OECONF = "--enable-vala-bindings" +# Respect GI_DATA_ENABLED value when enabling vala-bindings: +# configure: error: GObject-Introspection must be enabled for Vala bindings +EXTRA_OECONF = "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '--enable-vala-bindings', '--disable-vala-bindings', d)}" -FILES_${PN} += "${datadir}/telepathy \ +FILES:${PN} += "${datadir}/telepathy \ ${datadir}/dbus-1" diff --git a/meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb b/meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb index 7cb25b6775..039cfc3a89 100644 --- a/meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb +++ b/meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb @@ -2,7 +2,7 @@ SUMMARY = "Telepathy IRC connection manager" DESCRIPTION = "Telepathy implementation of the Internet Relay Chat protocols." HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" DEPENDS = "glib-2.0 dbus telepathy-glib openssl libxslt-native" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://src/idle.c;beginline=1;endline=19;md5=b06b1e2594423111a1a7910b0eefc7f9" @@ -13,7 +13,7 @@ SRC_URI[sha256sum] = "3013ad4b38d14ee630b8cc8ada5e95ccaa849b9a6fe15d2eaf6d0717d7 inherit autotools pkgconfig ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "pythonnative", "", d)} -FILES_${PN} += "${datadir}/telepathy \ +FILES:${PN} += "${datadir}/telepathy \ ${datadir}/dbus-1" python() { 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 485d7a4b0b..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,9 +12,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> --- a/build/cmake/DefineInstallationPaths.cmake +++ b/build/cmake/DefineInstallationPaths.cmake -@@ -22,11 +22,11 @@ - set(BIN_INSTALL_DIR "bin" CACHE PATH "The binary install dir (default: bin)") - set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "The library install dir (default: lib${LIB_SUFFIX})") +@@ -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)") -set(CMAKE_INSTALL_DIR "lib/cmake" CACHE PATH "The subdirectory to install cmake config files (default: cmake)") -set(PKGCONFIG_INSTALL_DIR "lib/pkgconfig" CACHE PATH "The subdirectory to install pkgconfig config files (default: lib/pkgconfig)") diff --git a/meta-oe/recipes-connectivity/thrift/thrift_0.13.0.bb b/meta-oe/recipes-connectivity/thrift/thrift_0.13.0.bb deleted file mode 100644 index e3880b357a..0000000000 --- a/meta-oe/recipes-connectivity/thrift/thrift_0.13.0.bb +++ /dev/null @@ -1,63 +0,0 @@ -SUMMARY = "Apache Thrift" -DESCRIPTION = "A software framework, for scalable cross-language services development" -HOMEPAGE = "https://thrift.apache.org/" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=394465e125cffc0f133695ed43f14047 \ - file://NOTICE;md5=2659b43daca219f99a2f2626ea128f73" - -DEPENDS = "thrift-native boost flex-native bison-native openssl" - -SRC_URI = "https://www-eu.apache.org/dist/thrift//${PV}/${BPN}-${PV}.tar.gz \ - file://0001-DefineInstallationPaths.cmake-Define-libdir-in-terms.patch \ - " -SRC_URI[md5sum] = "38a27d391a2b03214b444cb13d5664f1" -SRC_URI[sha256sum] = "7ad348b88033af46ce49148097afe354d513c1fca7c607b59c33ebb6064b5179" - -BBCLASSEXTEND = "native nativesdk" - -inherit pkgconfig cmake python3native - -export STAGING_INCDIR -export STAGING_LIBDIR -export BUILD_SYS -export HOST_SYS - -EXTRA_OECMAKE = " \ - -DBUILD_LIBRARIES=ON \ - -DBUILD_COMPILER=ON \ - -DBUILD_TESTING=OFF \ - -DBUILD_EXAMPLES=OFF \ - -DBUILD_TUTORIALS=OFF \ - -DWITH_CPP=ON \ - -DWITH_JAVA=OFF \ - -DWITH_PYTHON=OFF \ - -DWITH_STATIC_LIB=ON \ - -DWITH_SHARED_LIB=ON \ - -DWITH_OPENSSL=ON \ - -DWITH_QT5=OFF \ -" - -PACKAGECONFIG ??= "libevent glib" -PACKAGECONFIG[libevent] = "-DWITH_LIBEVENT=ON,-DWITH_LIBEVENT=OFF,libevent" -PACKAGECONFIG[glib] = "-DWITH_C_GLIB=ON,-DWITH_C_GLIB=OFF,glib-2.0" - -do_install_append () { - ln -sf thrift ${D}/${bindir}/thrift-compiler -} - -LEAD_SONAME = "libthrift.so.${PV}" - -# thrift packages -PACKAGE_BEFORE_PN = "${PN}-compiler lib${BPN} lib${BPN}z lib${BPN}nb lib${BPN}-c-glib" -FILES_lib${BPN} = "${libdir}/libthrift.so.*" -FILES_lib${BPN}z = "${libdir}/libthriftz.so.*" -FILES_lib${BPN}nb = "${libdir}/libthriftnb.so.*" -FILES_lib${BPN}-c-glib = "${libdir}/libthrift_c_glib.so.*" -FILES_${PN}-compiler = "${bindir}/*" - -# The thrift packages just pulls in some default dependencies but is otherwise empty -RRECOMMENDS_${PN} = "${PN}-compiler lib${BPN}" -ALLOW_EMPTY_${PN} = "1" -RRECOMMENDS_${PN}_class-native = "" -RRECOMMENDS_${PN}_class-nativesdk = "" diff --git a/meta-oe/recipes-connectivity/thrift/thrift_0.20.0.bb b/meta-oe/recipes-connectivity/thrift/thrift_0.20.0.bb new file mode 100644 index 0000000000..23db052b9e --- /dev/null +++ b/meta-oe/recipes-connectivity/thrift/thrift_0.20.0.bb @@ -0,0 +1,71 @@ +SUMMARY = "Apache Thrift" +DESCRIPTION = "A software framework, for scalable cross-language services development" +HOMEPAGE = "https://thrift.apache.org/" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c40a383cb3f747e0c7abbf1482f194f0 \ + file://NOTICE;md5=2659b43daca219f99a2f2626ea128f73" + +DEPENDS = "thrift-native boost flex-native bison-native openssl zlib" + +SRC_URI = "https://downloads.apache.org/${BPN}/${PV}/${BP}.tar.gz \ + file://0001-DefineInstallationPaths.cmake-Define-libdir-in-terms.patch" +SRC_URI[sha256sum] = "b5d8311a779470e1502c027f428a1db542f5c051c8e1280ccd2163fa935ff2d6" + +BBCLASSEXTEND = "native nativesdk" + +CVE_PRODUCT = "apache:thrift" + +inherit pkgconfig cmake python3native + +export STAGING_INCDIR +export STAGING_LIBDIR +export BUILD_SYS +export HOST_SYS + +EXTRA_OECMAKE = " \ + -DBUILD_LIBRARIES=ON \ + -DBUILD_SHARED_LIBS=ON \ + -DBUILD_COMPILER=ON \ + -DBUILD_TESTING=OFF \ + -DBUILD_TUTORIALS=OFF \ + -DWITH_AS3=OFF \ + -DWITH_CPP=ON \ + -DWITH_JAVA=OFF \ + -DWITH_OPENSSL=ON \ + -DWITH_QT5=OFF \ + -DWITH_ZLIB=ON \ + -DFLEX_TARGET_ARG_COMPILE_FLAGS='--noline' \ + -DBISON_TARGET_ARG_COMPILE_FLAGS='--no-lines' \ +" + +PACKAGECONFIG ??= "glib libevent" +PACKAGECONFIG[glib] = "-DWITH_C_GLIB=ON,-DWITH_C_GLIB=OFF,glib-2.0" +PACKAGECONFIG[libevent] = "-DWITH_LIBEVENT=ON,-DWITH_LIBEVENT=OFF,libevent" +PACKAGECONFIG[javascript] = "-DWITH_JAVASCRIPT=ON,-DWITH_JAVASCRIPT=OFF,nodejs" +PACKAGECONFIG[nodejs] = "-DWITH_NODEJS=ON,-DWITH_NODEJS=OFF,nodejs" +PACKAGECONFIG[python] = "-DWITH_PYTHON=ON,-DWITH_PYTHON=OFF,python" + +do_install:append () { + ln -sf thrift ${D}/${bindir}/thrift-compiler + # remove absolute paths + sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/thrift/thriftnbTargets.cmake + sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/thrift/thrift_c_glibTargets.cmake + sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/thrift/thrift_c_glib_zlibTargets.cmake +} + +LEAD_SONAME = "libthrift.so.${PV}" + +# thrift packages +PACKAGE_BEFORE_PN = "${PN}-compiler lib${BPN} lib${BPN}z lib${BPN}nb lib${BPN}-c-glib" +FILES:lib${BPN} = "${libdir}/libthrift.so.*" +FILES:lib${BPN}z = "${libdir}/libthriftz.so.*" +FILES:lib${BPN}nb = "${libdir}/libthriftnb.so.*" +FILES:lib${BPN}-c-glib = "${libdir}/libthrift_c_glib.so.*" +FILES:${PN}-compiler = "${bindir}/*" + +# The thrift packages just pulls in some default dependencies but is otherwise empty +RRECOMMENDS:${PN} = "${PN}-compiler lib${BPN}" +ALLOW_EMPTY:${PN} = "1" +RRECOMMENDS:${PN}:class-native = "" +RRECOMMENDS:${PN}:class-nativesdk = "" diff --git a/meta-oe/recipes-connectivity/transmission/files/0001-configure.ac-Fix-no-libsystemd-daemon.patch b/meta-oe/recipes-connectivity/transmission/files/0001-configure.ac-Fix-no-libsystemd-daemon.patch deleted file mode 100644 index 130ead0842..0000000000 --- a/meta-oe/recipes-connectivity/transmission/files/0001-configure.ac-Fix-no-libsystemd-daemon.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 73ee7e68402a77287054df779f0e44ae1a4f9f0b Mon Sep 17 00:00:00 2001 -From: Leon Anavi <leon.anavi@konsulko.com> -Date: Mon, 11 May 2020 17:01:35 +0000 -Subject: [PATCH] configure.ac: Fix no libsystemd-daemon - -Replace libsystemd-daemon with libsystemd. - -Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> ---- - configure.ac | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index df8cb5007..9a6fb9b2e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -249,10 +249,10 @@ AC_ARG_WITH([systemd-daemon], AS_HELP_STRING([--with-systemd-daemon], - [Add support for systemd startup notification (default is autodetected)]), - [USE_SYSTEMD_DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto]) - AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [ -- PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon], -+ PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd], - [AC_DEFINE(USE_SYSTEMD_DAEMON,1,[Use systemd startup notification])], - [AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"], -- [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])] -+ [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd not found.])] - )] - ) - ]) -@@ -558,7 +558,6 @@ if test "x$enable_nls" = "xyes" ; then - GETTEXT_PACKAGE=transmission-gtk - AC_SUBST(GETTEXT_PACKAGE) - AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package]) -- AM_GLIB_GNU_GETTEXT - transmissionlocaledir='${prefix}/${DATADIRNAME}/locale' - AC_SUBST(transmissionlocaledir) - fi --- -2.17.1 - diff --git a/meta-oe/recipes-connectivity/transmission/transmission_git.bb b/meta-oe/recipes-connectivity/transmission/transmission_git.bb index 412bd9d3fa..735db1441e 100644 --- a/meta-oe/recipes-connectivity/transmission/transmission_git.bb +++ b/meta-oe/recipes-connectivity/transmission/transmission_git.bb @@ -1,31 +1,30 @@ DESCRIPTION = "Transmission is a fast, easy, and free BitTorrent client" SECTION = "network" HOMEPAGE = "https://transmissionbt.com/" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=0dd9fcdc1416ff123c41c785192a1895" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=73f535ddffcf2a0d3af4f381f84f9b33" DEPENDS = "curl libevent gnutls openssl libtool intltool-native glib-2.0-native" -RDEPENDS_${PN}-web = "${PN}" +RDEPENDS:${PN}-web = "${PN}" SRC_URI = " \ - git://github.com/transmission/transmission \ - file://0001-configure.ac-Fix-no-libsystemd-daemon.patch \ + gitsm://github.com/transmission/transmission;branch=master;protocol=https \ file://transmission-daemon \ " -# Transmission release 2.94 -SRCREV = "d8e60ee44f4295935bd98bf741f85ed19f5a7dfb" -PV = "2.94" +# Transmission release 3.00 +SRCREV = "bb6b5a062ee594dfd4b7a12a6b6e860c43849bfd" +PV = "3.00" S = "${WORKDIR}/git" -inherit autotools gettext update-rc.d systemd mime-xdg +inherit autotools-brokensep gettext update-rc.d pkgconfig systemd mime-xdg PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" PACKAGECONFIG[gtk] = " --with-gtk,--without-gtk,gtk+3," -PACKAGECONFIG[systemd] = "--with-systemd-daemon,--without-systemd-daemon,systemd," +PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd," # Weak default values for transmission user and group # Change them in bbappend if needed @@ -34,15 +33,19 @@ TRANSMISSION_GROUP ??= "root" # Configure aborts with: # config.status: error: po/Makefile.in.in was not created by intltoolize. -B = "${S}" -do_configure_prepend() { +do_configure() { sed -i /AM_GLIB_GNU_GETTEXT/d ${S}/configure.ac cd ${S} ./update-version-h.sh intltoolize --copy --force --automake + aclocal + libtoolize --automake --copy --force + autoconf + automake -a + oe_runconf } -do_install_append() { +do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then sed -i '/USERNAME=/c\USERNAME=${TRANSMISSION_USER}' ${WORKDIR}/transmission-daemon install -d ${D}${sysconfdir}/init.d @@ -59,12 +62,12 @@ do_install_append() { PACKAGES += "${PN}-gtk ${PN}-client ${PN}-web" -FILES_${PN}-client = "${bindir}/transmission-remote ${bindir}/transmission-cli ${bindir}/transmission-create ${bindir}/transmission-show ${bindir}/transmission-edit" -FILES_${PN}-gtk += "${bindir}/transmission-gtk ${datadir}/icons ${datadir}/applications ${datadir}/pixmaps" -FILES_${PN}-web = "${datadir}/transmission/web" -FILES_${PN} = "${bindir}/transmission-daemon ${sysconfdir}/init.d/transmission-daemon" +FILES:${PN}-client = "${bindir}/transmission-remote ${bindir}/transmission-cli ${bindir}/transmission-create ${bindir}/transmission-show ${bindir}/transmission-edit" +FILES:${PN}-gtk += "${bindir}/transmission-gtk ${datadir}/icons ${datadir}/applications ${datadir}/pixmaps" +FILES:${PN}-web = "${datadir}/transmission/web" +FILES:${PN} = "${bindir}/transmission-daemon ${sysconfdir}/init.d/transmission-daemon ${datadir}/appdata" -SYSTEMD_SERVICE_${PN} = "transmission-daemon.service" +SYSTEMD_SERVICE:${PN} = "transmission-daemon.service" # Script transmission-daemon following the guidelines in: # https://trac.transmissionbt.com/wiki/Scripts/initd diff --git a/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_1.1.1.bb b/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb index 3860fd8b99..569d6a41cf 100644 --- a/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_1.1.1.bb +++ b/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb @@ -1,22 +1,23 @@ DESCRIPTION = "This daemon is in charge of multiplexing connections over USB to an iPhone or iPod touch." HOMEPAGE = "https://github.com/libimobiledevice/usbmuxd" -LICENSE = "GPLv3 & GPLv2 & LGPLv2.1" +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" +DEPENDS = "udev libusb1 libplist libimobiledevice-glue" inherit autotools pkgconfig gitpkgv systemd PKGV = "${GITPKGVTAG}" +PV = "1.1.2+git" -SRCREV = "79c8b38d1488a6b07e1e68f39d8caec3f1a45622" -SRC_URI = "git://github.com/libimobiledevice/usbmuxd;protocol=https" +SRCREV = "01c94c77f59404924f1c46d99c4e5e0c7817281b" +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/" +FILES:${PN} += "${base_libdir}/udev/rules.d/" -SYSTEMD_SERVICE_${PN} = "usbmuxd.service" +SYSTEMD_SERVICE:${PN} = "usbmuxd.service" diff --git a/meta-oe/recipes-connectivity/wifi-test-suite/files/0001-wfa_cmdproc-Store-return-value-into-location.patch b/meta-oe/recipes-connectivity/wifi-test-suite/files/0001-wfa_cmdproc-Store-return-value-into-location.patch new file mode 100644 index 0000000000..074f0fe7bb --- /dev/null +++ b/meta-oe/recipes-connectivity/wifi-test-suite/files/0001-wfa_cmdproc-Store-return-value-into-location.patch @@ -0,0 +1,32 @@ +From 2b7d6cf62296ff4e25e5ad909aa39a257bf9ff78 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 31 Aug 2022 19:37:35 -0700 +Subject: [PATCH] wfa_cmdproc: Store return value into location + +Fixes +| wfa_cmdproc.c:100:20: error: incompatible integer to pointer conversion assigning to 'int *' from 'int' [-Wint-conversion] +| paramValue = atoi(str); +| ^ ~~~~~~~~~ + +Upstream-Status: Submitted [https://github.com/Wi-FiTestSuite/Wi-FiTestSuite-Linux-DUT/pull/57] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/wfa_cmdproc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/wfa_cmdproc.c b/lib/wfa_cmdproc.c +index 9f5fd16..49a3f16 100644 +--- a/lib/wfa_cmdproc.c ++++ b/lib/wfa_cmdproc.c +@@ -97,7 +97,7 @@ int getParamValueInt(char *pcmdStr, char *pParam, int *paramValue) + if(strcasecmp(pcmdStr, pParam) == 0) + { + str = strtok_r(NULL, ",", &pcmdStr); +- paramValue = atoi(str); ++ *paramValue = atoi(str); + return 0; + } + return -1; +-- +2.37.3 + 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/wifi-test-suite/files/fno-common.patch b/meta-oe/recipes-connectivity/wifi-test-suite/files/fno-common.patch new file mode 100644 index 0000000000..fc5e2e99c5 --- /dev/null +++ b/meta-oe/recipes-connectivity/wifi-test-suite/files/fno-common.patch @@ -0,0 +1,29 @@ +Mark extern variables with 'extern' keyword + +This ensures that compilers with -fno-common does not generate multiple definitions + +Upstream-Status: Pending +Signedd-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/lib/wfa_cs.c ++++ b/lib/wfa_cs.c +@@ -71,7 +71,7 @@ int wfaExecuteCLI(char *CLI); + + /* Since the two definitions are used all over the CA function */ + char gCmdStr[WFA_CMD_STR_SZ]; +-dutCmdResponse_t gGenericResp; ++extern dutCmdResponse_t gGenericResp; + int wfaTGSetPrio(int sockfd, int tgClass); + void create_apts_msg(int msg, unsigned int txbuf[],int id); + +--- a/lib/wfa_thr.c ++++ b/lib/wfa_thr.c +@@ -41,7 +41,7 @@ + /* + * external global thread sync variables + */ +-tgWMM_t wmm_thr[WFA_THREADS_NUM]; ++extern tgWMM_t wmm_thr[WFA_THREADS_NUM]; + extern int resetsnd; + extern int resetrcv; + extern int newCmdOn; diff --git a/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_git.bb b/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_10.10.1.bb index 99cfb32051..eda01ca388 100644 --- a/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_git.bb +++ b/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_10.10.1.bb @@ -8,12 +8,14 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=0542427ed5c315ca34aa09ae7a85ed32" SECTION = "test" S = "${WORKDIR}/git" -SRCREV = "f7a8d7ef7d1a831c1bb47de21fa083536ea2f3a9" -SRC_URI = "git://github.com/Wi-FiTestSuite/Wi-FiTestSuite-Linux-DUT.git \ +SRCREV = "12e85fbeca8ca21a632d18e55089a8a7606d64aa" +SRC_URI = "git://github.com/Wi-FiTestSuite/Wi-FiTestSuite-Linux-DUT.git;branch=master;protocol=https \ file://0001-Use-toolchain-from-environment-variables.patch \ file://0002-Add-missing-include-removes-unnedded-stuff-and-add-n.patch \ file://0003-fix-path-to-usr-sbin-for-script-and-make-script-for-.patch \ file://0004-run-ranlib-per-library-and-use-AR.patch \ + file://fno-common.patch \ + file://0001-wfa_cmdproc-Store-return-value-into-location.patch \ " # to avoid host path QA error @@ -35,4 +37,4 @@ do_install () { install -m 0755 ${S}/scripts/sta_reset_parm ${D}${sbindir} } -RDEPENDS_${PN} = "wpa-supplicant" +RDEPENDS:${PN} = "wpa-supplicant" 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/wvdial_1.61.bb b/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb index b985d39abf..99e3ccacac 100644 --- a/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb +++ b/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb @@ -1,22 +1,22 @@ HOMEPAGE = "http://www.alumnit.ca/wiki/?WvDial" DESCRIPTION = "WvDial is a program that makes it easy to connect your Linux workstation to the Internet." -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" inherit pkgconfig DEPENDS = "wvstreams" -RDEPENDS_${PN} = "ppp" +RDEPENDS:${PN} = "ppp" -SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.bz2 \ +SRC_URI = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${BPN}/${BP}.tar.bz2 \ file://typo_pon.wvdial.1.patch \ file://musl-support.patch \ " SRC_URI[md5sum] = "37e9a2d664effe4efd44c0e1a20136de" SRC_URI[sha256sum] = "99906d9560cbdbc97e1855e7b0a7169f1e11983be3ac539140423f09debced82" -COMPATIBLE_HOST_libc-musl = "null" +COMPATIBLE_HOST:libc-musl = "null" EXTRA_OEMAKE = "" export WVLINK="${LD}" 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/wvdial/wvstreams_4.6.1.bb b/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb index 20becaf57d..3453f3e964 100644 --- a/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb @@ -1,13 +1,13 @@ HOMEPAGE = "http://alumnit.ca/wiki/index.php?page=WvStreams" SUMMARY = "WvStreams is a network programming library in C++" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=55ca817ccb7d5b5b66355690e9abc605" -DEPENDS = "zlib openssl (>= 0.9.8) dbus readline" -DEPENDS_append_libc-musl = " argp-standalone libexecinfo" +DEPENDS = "zlib openssl (>= 0.9.8) dbus readline boost" +DEPENDS:append:libc-musl = " argp-standalone libexecinfo" -SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz \ +SRC_URI = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${BPN}/${BP}.tar.gz \ file://04_signed_request.diff \ file://05_gcc.diff \ file://06_gcc-4.7.diff \ @@ -28,31 +28,31 @@ SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz \ SRC_URI[md5sum] = "2760dac31a43d452a19a3147bfde571c" SRC_URI[sha256sum] = "8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633" -COMPATIBLE_HOST_libc-musl = "null" +COMPATIBLE_HOST:libc-musl = "null" inherit autotools-brokensep pkgconfig -TARGET_CFLAGS_append = " -fno-tree-dce -fno-optimize-sibling-calls" +TARGET_CFLAGS:append = " -fno-tree-dce -fno-optimize-sibling-calls" -LDFLAGS_append = " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib" +LDFLAGS:append = " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib" EXTRA_OECONF = " --without-tcl --without-qt --without-pam --without-valgrind" -PACKAGES_prepend = "libuniconf " -PACKAGES_prepend = "uniconfd " -PACKAGES_prepend = "libwvstreams-base " -PACKAGES_prepend = "libwvstreams-extras " -PACKAGES_prepend = "${PN}-valgrind " +PACKAGES:prepend = "libuniconf " +PACKAGES:prepend = "uniconfd " +PACKAGES:prepend = "libwvstreams-base " +PACKAGES:prepend = "libwvstreams-extras " +PACKAGES:prepend = "${PN}-valgrind " -RPROVIDES_${PN}-dbg += "libuniconf-dbg uniconfd-dbg libwvstreams-base-dbg libwvstreams-extras-dbg" +RPROVIDES:${PN}-dbg += "libuniconf-dbg uniconfd-dbg libwvstreams-base-dbg libwvstreams-extras-dbg" -FILES_libuniconf = "${libdir}/libuniconf.so.*" +FILES:libuniconf = "${libdir}/libuniconf.so.*" -FILES_uniconfd = "${sbindir}/uniconfd ${sysconfdir}/uniconf.conf ${localstatedir}/uniconf" +FILES:uniconfd = "${sbindir}/uniconfd ${sysconfdir}/uniconf.conf ${localstatedir}/uniconf" -FILES_libwvstreams-base = "${libdir}/libwvutils.so.*" +FILES:libwvstreams-base = "${libdir}/libwvutils.so.*" -FILES_libwvstreams-extras = "${libdir}/libwvbase.so.* ${libdir}/libwvstreams.so.*" +FILES:libwvstreams-extras = "${libdir}/libwvbase.so.* ${libdir}/libwvstreams.so.*" -FILES_${PN}-valgrind = "${libdir}/valgrind/wvstreams.supp" -RDEPENDS_${PN} += "perl" +FILES:${PN}-valgrind = "${libdir}/valgrind/wvstreams.supp" +RDEPENDS:${PN} += "perl" diff --git a/meta-oe/recipes-connectivity/zabbix/zabbix/0001-Fix-configure.ac.patch b/meta-oe/recipes-connectivity/zabbix/zabbix/0001-Fix-configure.ac.patch index af14a1a56c..97339d3ff9 100644 --- a/meta-oe/recipes-connectivity/zabbix/zabbix/0001-Fix-configure.ac.patch +++ b/meta-oe/recipes-connectivity/zabbix/zabbix/0001-Fix-configure.ac.patch @@ -1,5 +1,7 @@ uname can not get version of kernel correctly while cross compile +Upstream-Status: Inappropriate [configuration] + Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> --- configure.ac | 2 +- diff --git a/meta-oe/recipes-connectivity/zabbix/zabbix/0001-initialize-msghdr-portably.patch b/meta-oe/recipes-connectivity/zabbix/zabbix/0001-initialize-msghdr-portably.patch new file mode 100644 index 0000000000..a7a1dc1986 --- /dev/null +++ b/meta-oe/recipes-connectivity/zabbix/zabbix/0001-initialize-msghdr-portably.patch @@ -0,0 +1,52 @@ +From 37b662cf44e14b33e93759d4b129d23095b41372 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 31 Aug 2022 23:55:02 -0700 +Subject: [PATCH] initialize msghdr portably + +on linux we have musl as an option for system C library and current +initialization assumes the structure to be same as glibc, therefore +initialize the elements of structure instead, so it can work on both +glibc and musl. + +Fixes +net.c:115:79: error: incompatible pointer to integer conversion initializing 'int' with an expression of type 'void *' [-Wint-conversion] + struct msghdr s_msg = { (void *)&s_sa, sizeof(struct sockaddr_nl), s_io, 1, NULL, 0, 0}; + ^~~~ + +Upstream-Status: Submitted [https://github.com/zabbix/zabbix/pull/77] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/libs/zbxsysinfo/linux/net.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/src/libs/zbxsysinfo/linux/net.c b/src/libs/zbxsysinfo/linux/net.c +index 1425a3604d..98f03de0dd 100644 +--- a/src/libs/zbxsysinfo/linux/net.c ++++ b/src/libs/zbxsysinfo/linux/net.c +@@ -114,13 +114,21 @@ static int find_tcp_port_by_state_nl(unsigned short port, int state, int *found) + + struct sockaddr_nl s_sa = { AF_NETLINK, 0, 0, 0 }; + struct iovec s_io[1] = { { &request, sizeof(request) } }; +- struct msghdr s_msg = { (void *)&s_sa, sizeof(struct sockaddr_nl), s_io, 1, NULL, 0, 0}; ++ struct msghdr s_msg = { 0 }; ++ s_msg.msg_name = (void *)&s_sa; ++ s_msg.msg_namelen = sizeof(struct sockaddr_nl); ++ s_msg.msg_iov = s_io; ++ s_msg.msg_iovlen = 1; + + char buffer[BUFSIZ] = { 0 }; + + struct sockaddr_nl r_sa = { AF_NETLINK, 0, 0, 0 }; + struct iovec r_io[1] = { { buffer, BUFSIZ } }; +- struct msghdr r_msg = { (void *)&r_sa, sizeof(struct sockaddr_nl), r_io, 1, NULL, 0, 0}; ++ struct msghdr r_msg = { 0 }; ++ r_msg.msg_name = (void *)&r_sa; ++ r_msg.msg_namelen = sizeof(struct sockaddr_nl); ++ r_msg.msg_iov = r_io; ++ r_msg.msg_iovlen = 1; + + struct nlmsghdr *r_hdr; + +-- +2.37.3 + diff --git a/meta-oe/recipes-connectivity/zabbix/zabbix_4.4.6.bb b/meta-oe/recipes-connectivity/zabbix/zabbix_6.2.7.bb index 0e0ddd5779..8708852ce7 100644 --- a/meta-oe/recipes-connectivity/zabbix/zabbix_4.4.6.bb +++ b/meta-oe/recipes-connectivity/zabbix/zabbix_6.2.7.bb @@ -17,29 +17,28 @@ organisations with a few servers and for large companies with a \ multitude of servers." HOMEPAGE = "http://www.zabbix.com/" SECTION = "Applications/Internet" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=300e938ad303147fede2294ed78fe02e" DEPENDS = "libevent libpcre openldap virtual/libiconv zlib" PACKAGE_ARCH = "${MACHINE_ARCH}" -SRC_URI = "http://jaist.dl.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${BPN}-${PV}.tar.gz \ +SRC_URI = "https://cdn.zabbix.com/zabbix/sources/stable/6.2/${BPN}-${PV}.tar.gz \ file://0001-Fix-configure.ac.patch \ + file://0001-initialize-msghdr-portably.patch \ file://zabbix-agent.service \ " - -SRC_URI[md5sum] = "e666539220be93b1af38e40f5fbb1f79" -SRC_URI[sha256sum] = "22bb28e667424ad4688f47732853f4241df0e78a7607727b043d704ba726ae0e" +SRC_URI[sha256sum] = "6d423810667b948ed22052d9aa84a035e2d4b92cbe8efdb669cac529806b722d" inherit autotools-brokensep linux-kernel-base pkgconfig systemd useradd SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "zabbix-agent.service" +SYSTEMD_SERVICE:${PN} = "zabbix-agent.service" SYSTEMD_AUTO_ENABLE = "enable" USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "-r zabbix" -USERADD_PARAM_${PN} = "-r -g zabbix -d /var/lib/zabbix \ +GROUPADD_PARAM:${PN} = "-r zabbix" +USERADD_PARAM:${PN} = "-r -g zabbix -d /var/lib/zabbix \ -s /sbin/nologin -c \"Zabbix Monitoring System\" zabbix \ " @@ -57,15 +56,16 @@ EXTRA_OECONF = " \ --with-zlib \ --with-libpthread \ --with-libevent \ - --with-libpcre \ + --with-libpcre=${STAGING_EXECPREFIXDIR} \ + --with-iconv=${STAGING_EXECPREFIXDIR} \ " -CFLAGS_append = " -lldap -llber -pthread" +CFLAGS:append = " -lldap -llber -pthread" -do_configure_prepend() { +do_configure:prepend() { export KERNEL_VERSION="${KERNEL_VERSION}" } -do_install_append() { +do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/zabbix-agent.service ${D}${systemd_unitdir}/system/ @@ -73,6 +73,6 @@ do_install_append() { fi } -FILES_${PN} += "${libdir}" +FILES:${PN} += "${libdir}" -RDEPENDS_${PN} = "logrotate" +RDEPENDS:${PN} = "logrotate" diff --git a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb b/meta-oe/recipes-connectivity/zeromq/cppzmq_4.10.0.bb index 0b66970a9d..dcea339dfd 100644 --- a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb +++ b/meta-oe/recipes-connectivity/zeromq/cppzmq_4.10.0.bb @@ -4,10 +4,9 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=db174eaf7b55a34a7c89551197f66e94" DEPENDS = "zeromq" -SRCREV = "8d5c9a88988dcbebb72939ca0939d432230ffde1" -PV = "4.6.0" +SRCREV = "c94c20743ed7d4aa37835a5c46567ab0790d4acc" -SRC_URI = "git://github.com/zeromq/cppzmq.git" +SRC_URI = "git://github.com/zeromq/cppzmq.git;branch=master;protocol=https" S = "${WORKDIR}/git" @@ -17,4 +16,5 @@ EXTRA_OECMAKE = "-DCPPZMQ_BUILD_TESTS=OFF" PACKAGES = "${PN}-dev" -RDEPENDS_${PN}-dev = "zeromq-dev" +RDEPENDS:${PN}-dev = "zeromq-dev zeromq-staticdev" +DEV_PKG_DEPENDENCY = "" diff --git a/meta-oe/recipes-connectivity/zeromq/czmq_4.2.0.bb b/meta-oe/recipes-connectivity/zeromq/czmq_4.2.0.bb deleted file mode 100644 index 7c9a33e8c1..0000000000 --- a/meta-oe/recipes-connectivity/zeromq/czmq_4.2.0.bb +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION = "High-level C binding for 0MQ" -HOMEPAGE = "http://czmq.zeromq.org/" -LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3" -DEPENDS = "zeromq" - -SRC_URI = "https://github.com/zeromq/czmq/releases/download/v${PV}/czmq-${PV}.tar.gz" - -SRC_URI[md5sum] = "7e09997db6ac3b25e8ed104053040722" -SRC_URI[sha256sum] = "cfab29c2b3cc8a845749758a51e1dd5f5160c1ef57e2a41ea96e4c2dcc8feceb" - -UPSTREAM_CHECK_URI = "https://github.com/zeromq/${BPN}/releases" - -inherit cmake - -PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-staticdev ${PN} ${PN}-dbg" - -FILES_${PN} = "${bindir}/*" -FILES_lib${BPN} = "${libdir}/*.so.*" -FILES_lib${BPN}-dev = "${libdir}/*.so ${libdir}/pkgconfig ${includedir} ${datadir}/cmake" -FILES_lib${BPN}-staticdev = "${libdir}/lib*.a" - -RDEPENDS_lib${BPN}-dev = "zeromq-dev" - -PACKAGECONFIG ??= "lz4 uuid curl ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[lz4] = ",-DCMAKE_DISABLE_FIND_PACKAGE_lz4=TRUE,lz4" -PACKAGECONFIG[uuid] = ",-DCMAKE_DISABLE_FIND_PACKAGE_uuid=TRUE,util-linux" -PACKAGECONFIG[curl] = ",-DCMAKE_DISABLE_FIND_PACKAGE_libcurl=TRUE,curl" -PACKAGECONFIG[systemd] = ",-DCMAKE_DISABLE_FIND_PACKAGE_systemd=TRUE,systemd" - -BBCLASSEXTEND = "nativesdk" - diff --git a/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb b/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb new file mode 100644 index 0000000000..5ae72df862 --- /dev/null +++ b/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "High-level C binding for 0MQ" +HOMEPAGE = "http://czmq.zeromq.org/" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3" +DEPENDS = "zeromq" + +SRC_URI = "https://github.com/zeromq/czmq/releases/download/v${PV}/czmq-${PV}.tar.gz" + +SRC_URI[md5sum] = "471e9ec120fc66a2fe2aae14359e3cfa" +SRC_URI[sha256sum] = "5d720a204c2a58645d6f7643af15d563a712dad98c9d32c1ed913377daa6ac39" + +UPSTREAM_CHECK_URI = "https://github.com/zeromq/${BPN}/releases" + +inherit cmake pkgconfig + +PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-staticdev ${PN} ${PN}-dbg" + +EXTRA_OECMAKE = " \ + -DCMAKECONFIG_INSTALL_DIR:PATH=${@os.path.relpath(d.getVar('libdir'), d.getVar('prefix') + '/') + "/cmake/"} \ +" + +FILES:${PN} = "${bindir}/*" +FILES:lib${BPN} = "${libdir}/*.so.*" +FILES:lib${BPN}-dev = "${libdir}/*.so ${libdir}/pkgconfig ${includedir} ${libdir}/cmake" +FILES:lib${BPN}-staticdev = "${libdir}/lib*.a" + +RDEPENDS:lib${BPN}-dev = "zeromq-dev" + +PACKAGECONFIG ??= "lz4 uuid curl ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[curl] = "-DCZMQ_WITH_LIBCURL=ON,-DCZMQ_WITH_LIBCURL=OFF,curl" +PACKAGECONFIG[httpd] = "-DCZMQ_WITH_LIBMICROHTTPD=ON,-DCZMQ_WITH_LIBMICROHTTPD=OFF,libmicrohttpd" +PACKAGECONFIG[lz4] = "-DCZMQ_WITH_LZ4=ON,-DCZMQ_WITH_LZ4=OFF,lz4" +PACKAGECONFIG[nss] = "-DCZMQ_WITH_NSS=ON,-DCZMQ_WITH_NSS=OFF,nss" +PACKAGECONFIG[systemd] = "-DCZMQ_WITH_SYSTEMD=ON,-DCZMQ_WITH_SYSTEMD=OFF,systemd" +PACKAGECONFIG[uuid] = "-DCZMQ_WITH_UUID=ON,-DCZMQ_WITH_UUID=OFF,util-linux" + +do_install:append() { + mkdir -p ${D}/${includedir}/${BPN} + mv ${D}/${includedir}/sha1.h ${D}/${includedir}/${BPN}/. + sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/czmqTargets.cmake +} diff --git a/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch b/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch index eb3dee4d31..3b0300c8aa 100644 --- a/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch +++ b/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch @@ -1,6 +1,7 @@ +From 24ad50286a87833329213dc0b0e68c21aeeee95f Mon Sep 17 00:00:00 2001 From: Niko Mauno <niko.mauno@vaisala.com> -Date: Wed Apr 22 09:00:00 2020 +0300 -Subject: CMakeLists.txt: Avoid host-specific path to libsodium +Date: Wed, 22 Apr 2020 09:00:00 +0300 +Subject: [PATCH] CMakeLists.txt: Avoid host-specific path to libsodium Avoid propagating full build host specific path to generated ZeroMQTargets.cmake when building with libsodium, which changes the @@ -17,10 +18,16 @@ Upstream-Status: Pending Signed-off-by: Niko Mauno <niko.mauno@vaisala.com> +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e92141d..d0775c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1210,7 +1210,7 @@ - target_link_libraries(libzmq ${OPTIONAL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) +@@ -1428,7 +1428,7 @@ if(BUILD_SHARED) + endif() if(SODIUM_FOUND) - target_link_libraries(libzmq ${SODIUM_LIBRARIES}) @@ -28,8 +35,8 @@ Signed-off-by: Niko Mauno <niko.mauno@vaisala.com> # On Solaris, libsodium depends on libssp if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS") target_link_libraries(libzmq ssp) -@@ -1240,7 +1240,7 @@ - target_link_libraries(libzmq-static ${OPTIONAL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) +@@ -1473,7 +1473,7 @@ if(BUILD_STATIC) + endif() if(SODIUM_FOUND) - target_link_libraries(libzmq-static ${SODIUM_LIBRARIES}) diff --git a/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb b/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.5.bb index 02a4c04fd7..555458217a 100644 --- a/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb +++ b/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.5.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ZeroMQ looks like an embeddable networking library but acts like a concurrency framework" HOMEPAGE = "http://www.zeromq.org" -LICENSE = "LGPLv3+" -LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=d5311495d952062e0e4fbba39cbf3de1" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3" PACKAGECONFIG ??= "libsodium" PACKAGECONFIG[libsodium] = "-DWITH_LIBSODIUM=ON,-DWITH_LIBSODIUM=OFF, libsodium" @@ -10,8 +10,7 @@ SRC_URI = "http://github.com/zeromq/libzmq/releases/download/v${PV}/zeromq-${PV} file://0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch \ file://run-ptest \ " -SRC_URI[md5sum] = "2047e917c2cc93505e2579bcba67a573" -SRC_URI[sha256sum] = "ebd7b5c830d6428956b67a0454a7f8cbed1de74b3b01e5c33c5378e22740f763" +SRC_URI[sha256sum] = "6653ef5910f17954861fe72332e68b03ca6e4d9c7160eb3a8de5a5a913bfab43" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/libzmq/releases" @@ -26,4 +25,4 @@ do_install_ptest () { install -m 0755 ${B}/bin/test_* ${D}${PTEST_PATH}/tests } -FILES_${PN}-doc += "${datadir}/zmq/*.txt" +FILES:${PN}-doc += "${datadir}/zmq/*.txt" |