diff options
Diffstat (limited to 'meta-openembedded/meta-networking')
116 files changed, 2024 insertions, 1834 deletions
diff --git a/meta-openembedded/meta-networking/MAINTAINERS b/meta-openembedded/meta-networking/MAINTAINERS index dc549d7582..4f7ef4e310 100644 --- a/meta-openembedded/meta-networking/MAINTAINERS +++ b/meta-openembedded/meta-networking/MAINTAINERS @@ -2,13 +2,13 @@ This file contains a list of maintainers for the meta-networking layer. Please submit any patches against meta-networking to the OpenEmbedded development mailing list (openembedded-devel@lists.openembedded.org) with -'[meta-networking]' in the subject. +'[meta-networking][styhead]' in the subject. When sending single patches, please use something like: git send-email -1 -M \ --to openembedded-devel@lists.openembedded.org \ - --subject-prefix='meta-networking][PATCH' + --subject-prefix='meta-networking][styhead][PATCH' You may also contact the maintainers directly. @@ -26,14 +26,9 @@ Please keep this list in alphabetical order. Maintainers List (try to look for most precise areas first) COMMON -M: Khem Raj <raj.khem@gmail.com> -M: "Joe MacDonald (backup)" <joe@deserted.net> +M: Armin Kuster <akuster808@gmail.com> L: openembedded-devel@lists.openembedded.org Q: https://patchwork.openembedded.org/project/oe/ S: Maintained F: conf F: recipes-* - -OPENTHREAD -M: Stefan Schmidt <stefan@datenfreihafen.org> -F: recipes-connectivity/openthread/ diff --git a/meta-openembedded/meta-networking/README.md b/meta-openembedded/meta-networking/README.md index ab2640618f..ef7933e319 100644 --- a/meta-openembedded/meta-networking/README.md +++ b/meta-openembedded/meta-networking/README.md @@ -18,21 +18,21 @@ Dependencies This layer depends on: URI: git://git.openembedded.org/openembedded-core -branch: master +branch: Scarthgap For some recipes, the meta-oe layer is required: URI: git://git.openembedded.org/meta-openembedded subdirectory: meta-oe -branch: master +branch: Scarthgap URI: git://git.openembedded.org/meta-openembedded subdirectory: meta-python -branch: master +branch: Scarthgap Maintenance ----------- -Layer maintainers: Khem Raj <raj.khem@gmail.com> +Stable Layer maintainer: Armin Kuster <akuster808@gmail.com> Please see the MAINTAINERS file for information on contacting the diff --git a/meta-openembedded/meta-networking/conf/include/non-repro-meta-networking.inc b/meta-openembedded/meta-networking/conf/include/non-repro-meta-networking.inc index 45eed5398e..c5313416a7 100755 --- a/meta-openembedded/meta-networking/conf/include/non-repro-meta-networking.inc +++ b/meta-openembedded/meta-networking/conf/include/non-repro-meta-networking.inc @@ -1,34 +1,19 @@ # List of known non-reproducible package of the meta-networking layer # Please keep this list sorted KNOWN_NON_REPRO_META_NETWORKING = " \ - blueman \ - blueman-dbg \ - blueman-src \ - civetweb-dev \ + babeld \ + babeld-dbg \ dhcp-relay-staticdev \ ettercap-src \ - fetchmail \ - fetchmail-dbg \ freediameter \ - freediameter-src \ freeradius \ htpdate-doc \ - keepalived \ - keepalived-dbg \ libbearssl-staticdev \ - libfko3 \ - libfko-client \ - libfko-daemon \ - libfko-dbg \ libmosquitto1 \ libowfat-staticdev \ libruli-staticdev \ - libsamba-util0 \ mosquitto \ - mosquitto-dbg \ ncftp \ - ncftp-dbg \ - ncftp-src \ ndisc6-dbg \ ndisc6-misc \ ndisc6-ndisc6 \ @@ -38,20 +23,9 @@ KNOWN_NON_REPRO_META_NETWORKING = " \ netsniff-ng-doc \ ntpsec-src \ openl2tp \ - openl2tp-dbg \ - ot-br-posix \ - ot-br-posix-dbg \ postfix-cfg \ - proftpd \ - proftpd-dbg \ - proftpd-dev \ - rdist \ - rdist-dbg \ - samba-dbg \ - tayga \ - tayga-dbg \ - wolfssl \ - wolfssl-dbg \ + rp-pppoe \ + udpcast-doc \ + unbound-doc \ znc \ - znc-doc \ " diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-Search-for-cython3.patch b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-Search-for-cython3.patch deleted file mode 100644 index 913566dce9..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-Search-for-cython3.patch +++ /dev/null @@ -1,24 +0,0 @@ -Subject: [PATCH] Search for cython3 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate - -Signed-off-by: Markus Volk <f_l_k@gmx.net> ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/module/meson.build 2022-02-10 08:49:35.000000000 +0100 -+++ b/module/meson.build 2022-03-29 12:58:03.456193737 +0200 -@@ -1,4 +1,4 @@ --cython = find_program('cython', required: true) -+cython = find_program('cython3', required: true) - - blueman_c = custom_target( - 'blueman_c', - --- -2.14.3 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-DO-not-emit-absolute-path-when-S-B.patch b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-DO-not-emit-absolute-path-when-S-B.patch new file mode 100644 index 0000000000..6e48b70243 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-DO-not-emit-absolute-path-when-S-B.patch @@ -0,0 +1,38 @@ +From 4947abc5ede2dc356f011b7c45f6760c9c2ce9f1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 14 Aug 2024 21:26:24 -0700 +Subject: [PATCH] meson: Do not emit absolute path when S != B + +build systems like OE build outside sourcetree in such cases it works +ok but cython resolves the input file to absolute path and that gets +emitted into genetate _blueman.c as module name, renders the build +non-reproducible, wish cython had a better way to handle this but there +is not, therefore tweak the meson build rule to account for specifying +workdir to cython which will search the inputs correctly, and use +meson's build_root to emit the output into build dir. This ensures that +it becomes independent of source or build directories and cython does +not generate the absolute paths into generate C code. + +See cython discussion on [1] + +[1] https://github.com/cython/cython/issues/5949 + +Upstream-Status: Submitted [https://github.com/blueman-project/blueman/pull/2461] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + module/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/module/meson.build b/module/meson.build +index 096ad7c8..fddef547 100644 +--- a/module/meson.build ++++ b/module/meson.build +@@ -4,7 +4,7 @@ blueman_c = custom_target( + 'blueman_c', + output: '_blueman.c', + input: '_blueman.pyx', +- command: [cython, '--output-file', '@OUTPUT@', '@INPUT@']) ++ command: [cython, '-w', meson.source_root(), '--output-file', join_paths(meson.build_root(), '@OUTPUT@'), join_paths(meson.build_root(), '@INPUT@')]) + + sources = [ + blueman_c, diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-add-pythoninstalldir-option.patch b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-add-pythoninstalldir-option.patch deleted file mode 100644 index cc448b4ffd..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-add-pythoninstalldir-option.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 37f24a9bd62f0a8f3e37eaddd33f2f0c9d3aaa0a Mon Sep 17 00:00:00 2001 -From: Chen Qi <Qi.Chen@windriver.com> -Date: Fri, 1 Apr 2022 23:12:17 -0700 -Subject: [PATCH] meson: add pythoninstalldir option - -In case of cross build, using host python to determine the python -site-packages directory for target is not feasible, add a new option -pythoninstalldir to fix the issue. - -Upstream-Status: Submitted [https://github.com/blueman-project/blueman/pull/1699] - -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> ---- - meson.build | 7 ++++++- - meson_options.txt | 1 + - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index e12d0ce6..e84457a5 100644 ---- a/meson.build -+++ b/meson.build -@@ -26,7 +26,12 @@ pkgdatadir = join_paths([prefix, get_option('datadir'), package_name]) - bindir = join_paths([prefix, get_option('bindir')]) - libexecdir = join_paths([prefix, get_option('libexecdir')]) - schemadir = join_paths(['share', 'glib-2.0', 'schemas']) --pythondir = pyinstall.get_install_dir() -+pythoninstalldir = get_option('pythoninstalldir') -+if pythoninstalldir != '' -+ pythondir = join_paths([prefix, pythoninstalldir]) -+else -+ pythondir = join_paths([prefix, python.sysconfig_path('purelib')]) -+endif - - if get_option('policykit') - have_polkit = 'True' -diff --git a/meson_options.txt b/meson_options.txt -index 177d9ab8..3e397d8e 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -2,6 +2,7 @@ option('runtime_deps_check', type: 'boolean', value: true, description: 'Disable - option('dhcp-config-path', type: 'string', value: '/etc/dhcp3/dhcpd.conf', description: 'Set dhcp3 server configuration path') - option('policykit', type: 'boolean', value: true, description: 'Enable policykit support') - option('pulseaudio', type: 'boolean', value: true, description: 'Enable PulseAudio support') -+option('pythoninstalldir', type: 'string', description: 'Path to python site-packages dir relative to ${prefix}') - option('systemdsystemunitdir', type: 'string', description: 'Path to systemd system unit dir relative to ${prefix}') - option('systemduserunitdir', type: 'string', description: 'Path to systemd user unit dir relative to ${prefix}') - option('sendto-plugins', type: 'array', choices: ['Caja', 'Nemo', 'Nautilus'], value: ['Caja', 'Nemo', 'Nautilus'], description: 'Install sendto plugins for various filemanagers') --- -2.34.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch deleted file mode 100644 index 282d821374..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch +++ /dev/null @@ -1,72 +0,0 @@ -Fix fail to enable bluetooth issue - -When launch blueman-manager while bluetooth is disable, it may fails -with error: - - Failed to enable bluetooth - -Because when get bluetooth status right after change its status, the -status may not be updated that plugin applet/KillSwitch.py sets the -bluetooth status via method of another dbus service which doesn't return -immediately. - -Provides a new dbus method for PowerManager which checks whether dbus -method SetBluetoothStatus() has finished. Then it makes sure to get -right bluetooth status. - -Upstream-Status: Inappropriate -Send to upstream but not accepted: -https://github.com/blueman-project/blueman/pull/1121 - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- - blueman/Functions.py | 10 ++++++++++ - blueman/plugins/applet/PowerManager.py | 4 ++++ - 2 files changed, 14 insertions(+) - -diff --git a/blueman/Functions.py b/blueman/Functions.py -index 3917f42..b4d5eae 100644 ---- a/blueman/Functions.py -+++ b/blueman/Functions.py -@@ -80,6 +80,16 @@ def check_bluetooth_status(message: str, exitfunc: Callable[[], Any]) -> None: - return - - applet.SetBluetoothStatus('(b)', True) -+ -+ timeout = time.time() + 10 -+ while applet.GetRequestStatus(): -+ time.sleep(0.1) -+ if time.time() > timeout: -+ # timeout 5s has been set in applet/PowerManager.py -+ # so it should NOT reach timeout here -+ logging.warning('Should NOT reach timeout.') -+ break -+ - if not applet.GetBluetoothStatus(): - print('Failed to enable bluetooth') - exitfunc() -diff --git a/blueman/plugins/applet/PowerManager.py b/blueman/plugins/applet/PowerManager.py -index c2f7bc3..bf6c99f 100644 ---- a/blueman/plugins/applet/PowerManager.py -+++ b/blueman/plugins/applet/PowerManager.py -@@ -63,6 +63,7 @@ class PowerManager(AppletPlugin, StatusIconProvider): - self._add_dbus_signal("BluetoothStatusChanged", "b") - self._add_dbus_method("SetBluetoothStatus", ("b",), "", self.request_power_state) - self._add_dbus_method("GetBluetoothStatus", (), "b", self.get_bluetooth_status) -+ self._add_dbus_method("GetRequestStatus", (), "b", self.get_request_status) - - def on_unload(self) -> None: - self.parent.Plugins.Menu.unregister(self) -@@ -196,6 +197,9 @@ class PowerManager(AppletPlugin, StatusIconProvider): - def get_bluetooth_status(self) -> bool: - return self.current_state - -+ def get_request_status(self): -+ return self.request_in_progress -+ - def on_adapter_property_changed(self, _path: str, key: str, value: Any) -> None: - if key == "Powered": - if value and not self.current_state: --- -2.31.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.3.5.bb b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.4.3.bb index 0374d23f0c..e7f0987e0f 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.3.5.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.4.3.bb @@ -4,20 +4,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "gtk+3 glib-2.0 bluez5 python3-pygobject python3-cython-native" -inherit meson gettext systemd gsettings pkgconfig python3native gtk-icon-cache useradd features_check +inherit meson gettext systemd gsettings pkgconfig python3native gtk-icon-cache features_check python3targetconfig REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -SRC_URI = " \ - git://github.com/blueman-project/blueman.git;protocol=https;branch=2-3-stable \ - file://0001-Search-for-cython3.patch \ - file://0002-fix-fail-to-enable-bluetooth.patch \ - file://0001-meson-add-pythoninstalldir-option.patch \ -" +SRC_URI = "git://github.com/blueman-project/blueman.git;protocol=https;branch=2-4-stable \ + file://0001-meson-DO-not-emit-absolute-path-when-S-B.patch" S = "${WORKDIR}/git" -SRCREV = "c85e7afb8d6547d4c35b7b639124de8e999c3650" +SRCREV = "7bcf919ad6ac0ee9a8c66b18b0ca98af877d4c8f" -EXTRA_OEMESON = "-Druntime_deps_check=false -Dpythoninstalldir=${@noprefix('PYTHON_SITEPACKAGES_DIR', d)}" +EXTRA_OEMESON = "-Druntime_deps_check=false \ + -Dsystemdsystemunitdir=${systemd_system_unitdir} \ + -Dsystemduserunitdir=${systemd_user_unitdir} \ +" SYSTEMD_SERVICE:${PN} = "${BPN}-mechanism.service" SYSTEMD_AUTO_ENABLE:${PN} = "disable" @@ -44,6 +43,7 @@ PACKAGECONFIG[polkit] = "-Dpolicykit=true,-Dpolicykit=false" FILES:${PN} += " \ ${datadir} \ ${systemd_user_unitdir} \ + ${systemd_system_unitdir} \ ${PYTHON_SITEPACKAGES_DIR} \ " @@ -60,29 +60,3 @@ do_install:append() { ${D}${bindir}/blueman-services \ ${D}${bindir}/blueman-tray } - -do_install:append() { - install -d ${D}${datadir}/polkit-1/rules.d - cat >${D}${datadir}/polkit-1/rules.d/51-blueman.rules <<EOF -/* Allow users in wheel group to use blueman feature requiring root without authentication */ -polkit.addRule(function(action, subject) { - if ((action.id == "org.blueman.network.setup" || - action.id == "org.blueman.dhcp.client" || - action.id == "org.blueman.rfkill.setstate" || - action.id == "org.blueman.pppd.pppconnect") && - subject.isInGroup("wheel")) { - - return polkit.Result.YES; - } -}); -EOF -} - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 --shell /bin/nologin polkitd" - -do_install:append() { - # Fix up permissions on polkit rules.d to work with rpm4 constraints - chmod 700 ${D}/${datadir}/polkit-1/rules.d - chown polkitd:root ${D}/${datadir}/polkit-1/rules.d -} diff --git a/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb b/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb index 8cb4c04fa3..a686ef5840 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb @@ -8,12 +8,12 @@ PARALLEL_MAKE = "" DEPENDS = "libpcap libpcre libdnet bison-native libnetfilter-queue" -SRC_URI = "http://fossies.org/linux/misc/daq-${PV}.tar.gz \ +SRC_URI = "https://www.snort.org/downloads/snort/${BPN}-${PV}.tar.gz;downloadfilename=${BPN}-${PV}_snort_org.tar.gz \ file://disable-run-test-program-while-cross-compiling.patch \ file://0001-correct-the-location-of-unistd.h.patch \ file://daq-fix-incompatible-pointer-type-error.patch \ " -SRC_URI[sha256sum] = "bdc4e5a24d1ea492c39ee213a63c55466a2e8114b6a9abed609927ae13a7705e" +SRC_URI[sha256sum] = "d1f6709bc5dbddee3fdf170cdc1e49fb926e2031d4869ecf367a8c47efc87279" # these 2 create undeclared dependency on libdnet and libnetfilter-queue from meta-networking # this error from test-dependencies script: # daq/daq/latest lost dependency on libdnet libmnl libnetfilter-queue libnfnetlink diff --git a/meta-openembedded/meta-networking/recipes-connectivity/daq/libdaq_3.0.14.bb b/meta-openembedded/meta-networking/recipes-connectivity/daq/libdaq_3.0.16.bb index 74964e0741..7834d75552 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/daq/libdaq_3.0.14.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/daq/libdaq_3.0.16.bb @@ -11,7 +11,8 @@ inherit autotools pkgconfig SRC_URI = "git://github.com/snort3/libdaq.git;protocol=https;branch=master \ file://0001-example-Use-lm-for-the-fst-module.patch" -SRCREV = "4e68d7ba6940df9a1503599d7b177029112d6b6a" + +SRCREV = "2ffe084d4d4ccf4ebc5c23ef119aa1ae223ce2ae" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb index 34f8a7e3e5..cc36fbd4f0 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb @@ -41,3 +41,7 @@ FILES:${PN}-client = "${sbindir}/${PN}-client" FILES:${PN}-relay = "${sbindir}/${PN}-relay" FILES:${PN}-requestor = "${sbindir}/${PN}-requestor" FILES:${PN}-server = "${sbindir}/${PN}-server" + +# http://errors.yoctoproject.org/Errors/Details/766880/ +# git/Port-linux/interface.c:118:18: error: assignment to '__caddr_t' {aka 'char *'} from incompatible pointer type 'struct ethtool_value *' [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.3.bb b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.5.bb index 8397380c1d..ec68c1d920 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.3.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.5.bb @@ -39,7 +39,7 @@ SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.2.x;lfs=0 raddbdir = "${sysconfdir}/${MLPREFIX}raddb" -SRCREV = "db3d1924d9a2e8d37c43872932621f69cfdbb099" +SRCREV = "a7acce80f5ba2271d9aeb737a4a91a5bf8317f31" UPSTREAM_CHECK_GITTAGREGEX = "release_(?P<pver>\d+(\_\d+)+)" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.8.bb b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.9.bb index db79241f2a..abb5ad2442 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.8.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.9.bb @@ -23,7 +23,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" SECTION = "libs" S = "${WORKDIR}/git" -SRCREV = "5a764e5555c64337ed17444410269ff21cb617b1" +SRCREV = "5e146adef63b326b04282252639bebc2730939c6" SRC_URI = "git://github.com/Mbed-TLS/mbedtls.git;protocol=https;branch=mbedtls-2.28 \ file://run-ptest \ " diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.1.bb index 7011d54f35..62c3add2a5 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.1.bb @@ -23,12 +23,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" SECTION = "libs" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/Mbed-TLS/mbedtls.git;protocol=https;branch=master \ +SRC_URI = "git://github.com/Mbed-TLS/mbedtls.git;protocol=https;branch=mbedtls-3.6 \ git://github.com/Mbed-TLS/mbedtls-framework.git;protocol=https;branch=main;destsuffix=git/framework;name=framework \ file://run-ptest" -SRCREV = "2ca6c285a0dd3f33982dd57299012dacab1ff206" -SRCREV_framework = "750634d3a51eb9d61b59fd5d801546927c946588" +SRCREV = "71c569d44bf3a8bd53d874c81ee8ac644dd6e9e3" +SRCREV_framework = "94599c0e3b5036e086446a51a3f79640f70f22f6" SRCREV_FORMAT .= "_framework" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" @@ -74,7 +74,8 @@ sysroot_stage_all:append() { do_install_ptest () { install -d ${D}${PTEST_PATH}/tests + install -d ${D}${PTEST_PATH}/framework cp -f ${B}/tests/test_suite_* ${D}${PTEST_PATH}/tests/ find ${D}${PTEST_PATH}/tests/ -type f -name "*.c" -delete - cp -fR ${S}/tests/data_files ${D}${PTEST_PATH}/tests/ + cp -fR ${S}/framework/data_files ${D}${PTEST_PATH}/framework/ } diff --git a/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nng_1.7.3.bb b/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nng_1.7.3.bb index a6556249b7..9ae3b89371 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nng_1.7.3.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nng_1.7.3.bb @@ -5,7 +5,7 @@ SECTION = "libs/networking" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a41e579bb4326c21c774f8e51e41d8a3" -SRC_URI = "git://github.com/nanomsg/nng.git;branch=master;protocol=https" +SRC_URI = "git://github.com/nanomsg/nng.git;branch=main;protocol=https" SRCREV = "85fbe7f9e4642b554d0d97f2e3ff2aa12978691a" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.11.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.12.0.bb index f44526ff98..2d2055ba65 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.11.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.12.0.bb @@ -13,7 +13,7 @@ SRC_URI = "${GNOME_MIRROR}/NetworkManager-openvpn/${@gnome_verdir("${PV}")}/Netw SRC_URI:append:libc-musl = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' file://0001-linker-scripts-Do-not-export-_IO_stdin_used.patch', '', d)}" -SRC_URI[sha256sum] = "2128de06f91b33c13d63cdaa6e178bc1ca57fc770cde3bc7c24891f4d9824501" +SRC_URI[sha256sum] = "903fd4c0aebd2aa7ac70c9d8c2bed8df922655d22d764514403566ae89b7e886" S = "${WORKDIR}/NetworkManager-openvpn-${PV}" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.48.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.48.10.bb index 47287951f5..a9b9233b7e 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.48.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.48.10.bb @@ -44,7 +44,7 @@ SRC_URI = " \ " SRC_URI:append:libc-musl = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' file://0001-linker-scripts-Do-not-export-_IO_stdin_used.patch', '', d)}" -SRC_URI[sha256sum] = "fc80b942de38e329468e6fc1dfb40aad6a78d02ddf6b8ec31f9acc6460b8723f" +SRC_URI[sha256sum] = "5dc188fdffcf2d23c89d34b1e6319a6b20203e12eaec24b30037b7ea8ac8c613" S = "${WORKDIR}/NetworkManager-${PV}" @@ -102,7 +102,7 @@ PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false,polkit" PACKAGECONFIG[bluez5] = "-Dbluez5_dun=true,-Dbluez5_dun=false,bluez5" # consolekit is not picked by shlibs, so add it to RDEPENDS too PACKAGECONFIG[consolekit] = "-Dsession_tracking_consolekit=true,-Dsession_tracking_consolekit=false,consolekit,consolekit" -PACKAGECONFIG[modemmanager] = "-Dmodem_manager=true,-Dmodem_manager=false,modemmanager mobile-broadband-provider-info,modemmanager mobile-broadband-provider-info" +PACKAGECONFIG[modemmanager] = "-Dmodem_manager=true,-Dmodem_manager=false,modemmanager mobile-broadband-provider-info" PACKAGECONFIG[ppp] = "-Dppp=true -Dpppd=${sbindir}/pppd,-Dppp=false,ppp" PACKAGECONFIG[dnsmasq] = "-Ddnsmasq=${bindir}/dnsmasq" PACKAGECONFIG[nss] = "-Dcrypto=nss,,nss" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb index d7be1cd71d..ec930de275 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb @@ -29,11 +29,15 @@ inherit pkgconfig cmake systemd # for (uint8_t i = 0;; i++) CXXFLAGS:append:libc-musl:toolchain-clang = " -Wno-error=sign-compare -Wno-error=unused-but-set-variable" +LDFLAGS:append:riscv32 = " -latomic" + EXTRA_OECMAKE = "-DBUILD_TESTING=OFF \ -DOTBR_DBUS=ON \ -DOTBR_REST=ON \ -DOTBR_WEB=OFF \ -DCMAKE_LIBRARY_PATH=${libdir} \ + -DOT_POSIX_PRODUCT_CONFIG=${sysconfdir}/openthread.conf.example \ + -DOT_POSIX_FACTORY_CONFIG=${sysconfdir}/openthread.conf.example \ -DOTBR_MDNS=avahi \ -DOTBR_BACKBONE_ROUTER=ON \ -DOTBR_BORDER_ROUTING=ON \ @@ -63,3 +67,7 @@ RCONFLICTS:${PN} = "ot-daemon" FILES:${PN} += "${systemd_unitdir}/*" FILES:${PN} += "${datadir}/*" + +# http://errors.yoctoproject.org/Errors/Details/766903/ +# git/third_party/openthread/repo/src/core/border_router/routing_manager.hpp:615:11: error: 'ot::BorderRouter::RoutingManager::DiscoveredPrefixTable' declared with greater visibility than the type of its field 'ot::BorderRouter::RoutingManager::DiscoveredPrefixTable::mEntryTimer' [-Werror=attributes] +CXXFLAGS += "-Wno-error=attributes" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb b/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb index d81cc9a3d1..e6d99431be 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb @@ -38,7 +38,7 @@ DEPENDS = "bison-native" inherit autotools-brokensep -EXTRA_OEMAKE = "BIN_GROUP=root MAN_GROUP=root RDIST_MODE=755 RDISTD_MODE=755 MAN_MODE=644" +EXTRA_OEMAKE = "CPPFLAGS='${CFLAGS}' BIN_GROUP=root MAN_GROUP=root RDIST_MODE=755 RDISTD_MODE=755 MAN_MODE=644" # http://errors.yoctoproject.org/Errors/Details/186972/ COMPATIBLE_HOST:libc-musl = 'null' diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.19.6.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.19.8.bb index 7bdcfd35c0..09d5608df0 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.19.6.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.19.8.bb @@ -31,7 +31,7 @@ SRC_URI:append:libc-musl = " \ file://samba-4.3.9-remove-getpwent_r.patch \ " -SRC_URI[sha256sum] = "653b52095554dbc223c63b96af5cdf9e98c3e048549c5f56143d3b33dce1cef1" +SRC_URI[sha256sum] = "1aeff76c207f383477ce4badebd154691c408d2e15b01b333c85eb775468ddf6" UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.19(\.\d+)+).tar.gz" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Pass-noline-flag-to-flex.patch b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Pass-noline-flag-to-flex.patch index ec7b90cfb4..626f412731 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Pass-noline-flag-to-flex.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Pass-noline-flag-to-flex.patch @@ -8,6 +8,7 @@ could be absolute build paths, since these files end up in dbg packages this can be flagged as a build/packaging warning. Upstream-Status: Pending + Signed-off-by: Khem Raj <raj.khem@gmail.com> --- cmake/configure_options.cmake | 2 +- diff --git a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort3_3.1.84.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort3_3.3.4.0.bb index ee84aa17e7..0f3d0e986f 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort3_3.1.84.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort3_3.3.4.0.bb @@ -10,7 +10,8 @@ DEPENDS = "flex-native hwloc libdaq libdnet libpcap libpcre libtirpc libunwind l SRC_URI = "git://github.com/snort3/snort3.git;protocol=https;branch=master \ file://0001-cmake-Check-for-HP-libunwind.patch \ file://0001-cmake-Pass-noline-flag-to-flex.patch" -SRCREV = "e7312efd840d66a52a2019abe1db7cc89ca0f39a" + +SRCREV = "5598e8dd87829cb1bbb478a7b6d4f6fb8b5dabfe" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/tayga/tayga_0.9.2.bb b/meta-openembedded/meta-networking/recipes-connectivity/tayga/tayga_0.9.2.bb index f6b58559d4..f36435c8ea 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/tayga/tayga_0.9.2.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/tayga/tayga_0.9.2.bb @@ -12,6 +12,8 @@ SRC_URI[sha256sum] = "2b1f7927a9d2dcff9095aff3c271924b052ccfd2faca9588b277431a44 SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} = "tayga.service" +EXTRA_OEMAKE += "CFLAGS='${CFLAGS}'" + do_install:append() { install -m 0644 ${UNPACKDIR}/tayga.conf ${D}${sysconfdir}/tayga.conf install -d ${D}${systemd_unitdir}/system/ @@ -19,3 +21,4 @@ do_install:append() { } inherit autotools systemd + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.7.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.7.2.bb index 47c14dd1a1..009434d96a 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.7.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.7.2.bb @@ -13,10 +13,13 @@ PROVIDES += "cyassl" RPROVIDES:${PN} = "cyassl" SRC_URI = "git://github.com/wolfSSL/wolfssl.git;protocol=https;branch=master" -SRCREV = "8970ff4c34034dbb3594943d11f8c9d4c5512bd5" +SRCREV = "00e42151ca061463ba6a95adb2290f678cbca472" S = "${WORKDIR}/git" inherit autotools +PACKAGECONFIG ?= "reproducible-build" + +PACKAGECONFIG[reproducible-build] = "--enable-reproducible-build,--disable-reproducible-build," BBCLASSEXTEND += "native nativesdk" diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Bug-fix-for-pid_t-not-found-on-musl.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Bug-fix-for-pid_t-not-found-on-musl.patch deleted file mode 100644 index 2a583466e3..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Bug-fix-for-pid_t-not-found-on-musl.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d0d5ac317dab11610a5fc91ca3e7f5ad72ce2236 Mon Sep 17 00:00:00 2001 -From: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> -Date: Tue, 29 Oct 2019 13:19:37 +0800 -Subject: [PATCH] Bug fix for pid_t not found on musl. - -When compiling version 5.1.6 on musl, the following error occurs: -log.h:49:8: error: unknown type name 'pid_t' - -Upstream-Status: Pending - -Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> ---- - lib/defaults.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/defaults.c b/lib/defaults.c -index a6ea116..b3ecfa5 100644 ---- a/lib/defaults.c -+++ b/lib/defaults.c -@@ -21,6 +21,7 @@ - #include <string.h> - #include <sys/utsname.h> - #include <sys/stat.h> -+#include <sys/types.h> - #include <stdarg.h> - - #include "config.h" --- -2.20.1 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch deleted file mode 100644 index 6128f3d0ed..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 987c8f4a718cdd6b764592ba7510090a59623959 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 31 Mar 2017 19:10:57 -0700 -Subject: [PATCH] Define __SWORD_TYPE and _PATH_NSSWITCH_CONF - -if they are not defined as is in musl then define -them here - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- -Upstream-Status: Pending - - include/automount.h | 8 ++++++++ - include/nsswitch.h | 3 +++ - 2 files changed, 11 insertions(+) - -diff --git a/include/automount.h b/include/automount.h -index cc336ad..8bdcf12 100644 ---- a/include/automount.h -+++ b/include/automount.h -@@ -42,6 +42,14 @@ - - #define ENABLE_CORES 1 - -+#ifndef __SWORD_TYPE -+# if __WORDSIZE == 32 /* System word size */ -+# define __SWORD_TYPE int -+# else /* __WORDSIZE == 64 */ -+# define __SWORD_TYPE long int -+# endif -+#endif -+ - /* We MUST have the paths to mount(8) and umount(8) */ - #ifndef HAVE_MOUNT - #error Failed to locate mount(8)! -diff --git a/include/nsswitch.h b/include/nsswitch.h -index d3e4027..7a0c38f 100644 ---- a/include/nsswitch.h -+++ b/include/nsswitch.h -@@ -24,6 +24,9 @@ - #include <netdb.h> - #include "list.h" - -+#ifndef _PATH_NSSWITCH_CONF -+#define _PATH_NSSWITCH_CONF "/etc/nsswitch.conf" -+#endif - #define NSSWITCH_FILE _PATH_NSSWITCH_CONF - - enum nsswitch_status { diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-if-undefined.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-if-undefined.patch deleted file mode 100644 index f16ae5277e..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-if-undefined.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 9fe90ab1e333b2e2bed370ff13ba552eb54c3aaf Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 17 Jul 2021 09:56:28 -0700 -Subject: [PATCH] Define __SWORD_TYPE if undefined - -These fixes are inspired when building autofs on musl - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - daemon/automount.c | 20 ++++++++++++++------ - include/hash.h | 5 +++++ - lib/log.c | 6 +++++- - 3 files changed, 24 insertions(+), 7 deletions(-) - ---- a/daemon/automount.c -+++ b/daemon/automount.c -@@ -1,7 +1,7 @@ - /* ----------------------------------------------------------------------- * - * - * automount.c - Linux automounter daemon -- * -+ * - * Copyright 1997 Transmeta Corporation - All Rights Reserved - * Copyright 1999-2000 Jeremy Fitzhardinge <jeremy@goop.org> - * Copyright 2001-2005 Ian Kent <raven@themaw.net> -@@ -11,7 +11,7 @@ - * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139, - * USA; either version 2 of the License, or (at your option) any later - * version. -- * -+ * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -@@ -40,6 +40,14 @@ - #include <systemd/sd-daemon.h> - #endif - -+#ifndef __SWORD_TYPE -+# if __WORDSIZE == 32 /* System word size */ -+# define __SWORD_TYPE int -+# else /* __WORDSIZE == 64 */ -+# define __SWORD_TYPE long int -+# endif -+#endif -+ - #include "automount.h" - #if defined(LIBXML2_WORKAROUND) || defined(TIRPC_WORKAROUND) - #include <dlfcn.h> -@@ -282,7 +290,7 @@ int rmdir_path(struct autofs_point *ap, - dev, buf, st.st_dev); - return -1; - } -- -+ - /* - * Last element of path may be a symbolic link; all others - * are directories (and the last directory element is -@@ -455,7 +463,7 @@ int count_mounts(struct autofs_point *ap - - counter.count = 0; - counter.dev = dev; -- -+ - if (walk_tree(path, counter_fn, 1, ap, &counter) == -1) - return -1; - -@@ -811,7 +819,7 @@ static char *automount_path_to_fifo(unsi - /* - * An automount path can be made up of subdirectories. So, to - * create the fifo name, we will just replace instances of '/' with -- * '-'. -+ * '-'. - */ - p = fifo_name + strlen(fifodir); - while (*p != '\0') { -@@ -1640,7 +1648,7 @@ static void return_start_status(void *ar - sc->done = 1; - - /* -- * Startup condition mutex must be locked during -+ * Startup condition mutex must be locked during - * the startup process. - */ - status = pthread_cond_signal(&sc->cond); ---- a/include/hash.h -+++ b/include/hash.h -@@ -5,6 +5,11 @@ - - #include <sys/types.h> - #include <stdint.h> -+#include <linux/stddef.h> -+ -+#ifndef __GLIBC__ -+#include <sys/reg.h> -+#endif - - /* - * The "GOLDEN_RATIO_PRIME" is used in ifs/btrfs/brtfs_inode.h and ---- a/lib/log.c -+++ b/lib/log.c -@@ -38,7 +38,11 @@ static char *prepare_attempt_prefix(cons - char buffer[ATTEMPT_ID_SIZE + 1]; - char *prefixed_msg = NULL; - -- attempt_id = pthread_getspecific(key_thread_attempt_id); -+ if (key_thread_attempt_id) { -+ attempt_id = pthread_getspecific(key_thread_attempt_id); -+ } else { -+ attempt_id = 0; -+ } - if (attempt_id) { - int len = sizeof(buffer) + 1 + strlen(msg) + 1; - diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch deleted file mode 100644 index f18f237d98..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d7a34bb388e33d16260b67275cdb58f9c877d324 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Tue, 27 Nov 2018 15:27:47 +0800 -Subject: [PATCH] From 6d24365f0828185fd1bb4d199209ca07eb95c41d Mon Sep 17 - 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 24 Aug 2018 - 06:24:36 +0000 Subject: [PATCH] Do not hardcode path for pkg.m4 - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -update patch to version 5.1.6 -Signed-off-by: Changqing Li <changqing.li@windriver.com> - ---- - configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index 07c2051..e85d718 100644 ---- a/configure.in -+++ b/configure.in -@@ -12,7 +12,7 @@ define([AC_CACHE_SAVE], )dnl - AC_INIT(.autofs-5.1.8) - - # for pkg-config macros --m4_include([/usr/share/aclocal/pkg.m4]) -+m4_include([pkg.m4]) - - # - # autofs installs by default in /usr diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-autofs-5.1.8-add-autofs_strerror_r-helper-for-musl.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-autofs-5.1.8-add-autofs_strerror_r-helper-for-musl.patch deleted file mode 100644 index caf0105118..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-autofs-5.1.8-add-autofs_strerror_r-helper-for-musl.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 88f991b0ebb6fb8fcaad3d0eb8fb51a7439d053e Mon Sep 17 00:00:00 2001 -From: Fabian Groffen <grobian@gentoo.org> -Date: Wed, 2 Feb 2022 09:27:13 +0800 -Subject: [PATCH 1/2] autofs-5.1.8 - add autofs_strerror_r() helper for musl - -If using musl libc the XSI-compliant variant strerror_r() which returns -an integer instead of a pointer so add a helper function to handle this -case. - -Signed-off-by: Fabian Groffen <grobian@gentoo.org> -Signed-off-by: Ian Kent <raven@themaw.net> -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - include/automount.h | 5 +++++ - lib/log.c | 10 ++++++++++ - 2 files changed, 15 insertions(+) - -diff --git a/include/automount.h b/include/automount.h -index 8cd8b3a..f759e59 100644 ---- a/include/automount.h -+++ b/include/automount.h -@@ -51,6 +51,11 @@ - # endif - #endif - -+#ifndef __GLIBC__ -+# define strerror_r(N,B,S) autofs_strerror_r(N,B,S) -+char *autofs_strerror_r(int errnum, char *buf, size_t buflen); /* GNU */ -+#endif -+ - /* We MUST have the paths to mount(8) and umount(8) */ - #ifndef HAVE_MOUNT - #error Failed to locate mount(8)! -diff --git a/lib/log.c b/lib/log.c -index 39b1e3b..b99fa39 100644 ---- a/lib/log.c -+++ b/lib/log.c -@@ -368,3 +368,13 @@ pid_t log_pidinfo(struct autofs_point *ap, pid_t pid, char *label) { - - return ppid; - } -+ -+#ifndef __GLIBC__ -+# undef strerror_r -+char *autofs_strerror_r(int errnum, char *buf, size_t buflen) { -+ int s = strerror_r(errnum, buf, buflen); -+ if (s) -+ return NULL; -+ return buf; -+} -+#endif --- -2.37.3 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch deleted file mode 100644 index 8eec3014a0..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 745e355ac8b595a27e1fcca75bf01d3e244f4a5f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 7 Sep 2017 22:22:31 -0700 -Subject: [PATCH] modules/lookup_multi.c: Replace __S_IEXEC with S_IEXEC - -__S_IEXEC is internal to libc and may not be available on -all libc e.g. musl - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- -Upstream-Status: Pending - - modules/lookup_multi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c -index 3ecda6d..cf109de 100644 ---- a/modules/lookup_multi.c -+++ b/modules/lookup_multi.c -@@ -452,7 +452,7 @@ int lookup_reinit(const char *my_mapfmt, - continue; - } - -- if (st.st_mode & __S_IEXEC) -+ if (st.st_mode & S_IEXEC) - type = src_prog; - else - type = src_file; diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-no-bash.patch index f91c307d34..cd9b14358a 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-no-bash.patch @@ -1,16 +1,18 @@ -From a3007d7ea930823926611081bb873ddd771325cb Mon Sep 17 00:00:00 2001 +From f53458e0b4cca0b0eedcd00b0e90b39d91228085 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 5 Jan 2013 19:53:10 -0800 +Subject: [PATCH] no bash ---- Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- samples/auto.net | 2 +- samples/auto.smb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/auto.net b/samples/auto.net -index 0384f61..61215f6 100755 +index c5b145d..a09d56d 100755 --- a/samples/auto.net +++ b/samples/auto.net @@ -1,4 +1,4 @@ @@ -20,7 +22,7 @@ index 0384f61..61215f6 100755 # This file must be executable to work! chmod 755! diff --git a/samples/auto.smb b/samples/auto.smb -index 6af5d85..d296b81 100755 +index f6d41d3..0d945ee 100755 --- a/samples/auto.smb +++ b/samples/auto.smb @@ -1,4 +1,4 @@ @@ -29,3 +31,6 @@ index 6af5d85..d296b81 100755 # This file must be executable to work! chmod 755! +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch deleted file mode 100644 index d67f6300c8..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 096e33743158e0e8c04d60d01cc66e2945d79777 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Tue, 27 Nov 2018 16:52:35 +0800 -Subject: [PATCH] From 557ca399f4b3a397f20bb147ec6dc4ab9732dd1e Mon Sep 17 - 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 31 Mar 2017 - 19:12:10 -0700 Subject: [PATCH] Replace __S_IEXEC with S_IEXEC - -S_IEXEC is portable - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -update patch to version 5.1.5 -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- -Upstream-Status: Pending - - daemon/lookup.c | 6 +++--- - modules/lookup_multi.c | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - ---- a/daemon/lookup.c -+++ b/daemon/lookup.c -@@ -397,7 +397,7 @@ static int read_file_source_instance(str - return NSS_STATUS_NOTFOUND; - } - -- if (st.st_mode & __S_IEXEC) -+ if (st.st_mode & S_IEXEC) - type = src_prog; - else - type = src_file; -@@ -930,7 +930,7 @@ static int lookup_name_file_source_insta - return NSS_STATUS_NOTFOUND; - } - -- if (st.st_mode & __S_IEXEC) -+ if (st.st_mode & S_IEXEC) - type = src_prog; - else - type = src_file; -@@ -1077,7 +1077,7 @@ static struct map_source *lookup_get_map - if (!S_ISREG(st.st_mode)) - return NULL; - -- if (st.st_mode & __S_IEXEC) -+ if (st.st_mode & S_IEXEC) - type = "program"; - else - type = "file"; ---- a/modules/lookup_multi.c -+++ b/modules/lookup_multi.c -@@ -247,7 +247,7 @@ static struct lookup_mod *nss_open_looku - continue; - } - -- if (st.st_mode & __S_IEXEC) -+ if (st.st_mode & S_IEXEC) - type = src_prog; - else - type = src_file; diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0002-autofs-5.1.8-handle-innetgr-not-present-in-musl.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0002-autofs-5.1.8-handle-innetgr-not-present-in-musl.patch deleted file mode 100644 index 9d0caae312..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0002-autofs-5.1.8-handle-innetgr-not-present-in-musl.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 1c0b0b70a276280f431d72319109a0bbc0267970 Mon Sep 17 00:00:00 2001 -From: Fabian Groffen <grobian@gentoo.org> -Date: Wed, 2 Feb 2022 10:15:22 +0800 -Subject: [PATCH 2/2] autofs-5.1.8 - handle innetgr() not present in musl - -The function innetgr(3) may not be present in musl libc, add a check -for this. - -Originally contributed by Fabian, modified by me. - -Upstream-Status: Backport [https://git.kernel.org/pub/scm/linux/storage/autofs/autofs.git/commit/?id=f60e40af3c038b8955325a11b7294ad38c15c9e8] -Signed-off-by: Fabian Groffen <grobian@gentoo.org> -Signed-off-by: Ian Kent <raven@themaw.net> -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure | 6 ++++++ - configure.in | 2 +- - include/config.h.in | 3 +++ - modules/parse_amd.c | 7 +++++++ - 4 files changed, 17 insertions(+), 1 deletion(-) - ---- a/configure.in -+++ b/configure.in -@@ -169,7 +169,7 @@ AF_CHECK_SSS_LIB(SSS_AUTOFS, libsss_auto - AC_SUBST(HAVE_SSS_AUTOFS) - AC_SUBST(sssldir) - --AC_CHECK_FUNCS(pipe2) -+AC_CHECK_FUNCS(pipe2 innetgr) - - # - # Newer mounts have the -s (sloppy) option to ignore unknown options, ---- a/include/config.h.in -+++ b/include/config.h.in -@@ -30,6 +30,9 @@ - /* Define to 1 if you have the `getservbyname' function. */ - #undef HAVE_GETSERVBYNAME - -+/* Define to 1 if you have the `innetgr' function. */ -+#undef HAVE_INNETGR -+ - /* Define to 1 if you have the <inttypes.h> header file. */ - #undef HAVE_INTTYPES_H - -@@ -45,9 +48,6 @@ - /* Define if you have the Linux /proc filesystem. */ - #undef HAVE_LINUX_PROCFS - --/* Define to 1 if you have the <memory.h> header file. */ --#undef HAVE_MEMORY_H -- - /* define if you have MOUNT */ - #undef HAVE_MOUNT - -@@ -69,6 +69,9 @@ - /* Define to 1 if you have the <stdint.h> header file. */ - #undef HAVE_STDINT_H - -+/* Define to 1 if you have the <stdio.h> header file. */ -+#undef HAVE_STDIO_H -+ - /* Define to 1 if you have the <stdlib.h> header file. */ - #undef HAVE_STDLIB_H - -@@ -141,7 +144,9 @@ - /* define if you have YACC */ - #undef PATH_YACC - --/* Define to 1 if you have the ANSI C header files. */ -+/* Define to 1 if all of the C90 standard headers exist (not just the ones -+ required in a freestanding environment). This macro is provided for -+ backward compatibility; new code need not use it. */ - #undef STDC_HEADERS - - /* Define to 1 to use the libtirpc tsd usage workaround */ ---- a/modules/parse_amd.c -+++ b/modules/parse_amd.c -@@ -424,6 +424,7 @@ static int sel_in_network(struct autofs_ - return ret; - } - -+#ifdef HAVE_INNETGR - static int sel_netgrp(struct autofs_point *ap, - struct selector *s, struct substvar *sv) - { -@@ -488,6 +489,7 @@ out: - - return ret; - } -+#endif - - static int eval_selector(struct autofs_point *ap, - struct amd_entry *this, struct substvar *sv) -@@ -627,7 +629,12 @@ static int eval_selector(struct autofs_p - switch (s->sel->selector) { - case SEL_NETGRP: - case SEL_NETGRPD: -+#ifndef HAVE_INNETGR -+ error(logopt, MODPREFIX -+ "netgroups not available, function innetgr(3) not available"); -+#else - ret = sel_netgrp(ap, s, sv); -+#endif - break; - - default: diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/using-pkg-config-to-detect-libxml-2.0-and-krb5.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0002-using-pkg-config-to-detect-krb5.patch index 41de373fd4..1bf95b8a45 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/using-pkg-config-to-detect-libxml-2.0-and-krb5.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0002-using-pkg-config-to-detect-krb5.patch @@ -1,10 +1,7 @@ -From dd90a690f95569b999b8ac9ab57e834b3421dcbb Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Tue, 27 Nov 2018 15:19:07 +0800 -Subject: [PATCH] From dabcbdae38038a8e4ad2c4286112381c407c5ce7 Mon Sep 17 - 00:00:00 2001 From: Roy Li <rongqing.li@windriver.com> Date: Tue, 19 Aug 2014 - 11:31:35 +0800 Subject: [PATCH] using pkg-config to detect libxml-2.0 and - krb5 +From 796f1b5cfca595ba4e11ca9dab5c2c46c0710d95 Mon Sep 17 00:00:00 2001 +From: Roy Li <rongqing.li@windriver.com> +Date: Tue, 19 Aug 2014 11:31:35 +0800 +Subject: [PATCH] using pkg-config to detect krb5 Upstream-Status: Pending @@ -13,15 +10,17 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com> update patch to 5.1.5 Signed-off-by: Changqing Li <changqing.li@windriver.com> --- - configure.in | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) + configure.ac | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) ---- a/configure.in -+++ b/configure.in -@@ -215,7 +215,14 @@ PKG_CHECK_MODULES([XML], [libxml-2.0], [ +diff --git a/configure.ac b/configure.ac +index 76a38f4..1bb1a52 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -214,7 +214,14 @@ PKG_CHECK_MODULES([XML], [libxml-2.0], [ AC_DEFINE(LIBXML2_WORKAROUND, 1, [Use libxml2 tsd usage workaround]) ], [HAVE_LIBXML=0]) - + -AF_CHECK_KRB5() +PKG_CHECK_MODULES(KRB5, [krb5], [ + HAVE_KRB5=1 @@ -31,6 +30,9 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> + LIBS="$LIBS $KRB5_LIBS" + AC_CHECK_FUNCS([krb5_principal_get_realm]) +], [HAVE_KRB5=0]) - + AC_SEARCH_LIBS([versionsort],[]) if test "$ac_cv_search_versionsort" = "no"; then +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0003-force-STRIP-to-emtpy.patch index 1fc500319e..942f38d8b0 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0003-force-STRIP-to-emtpy.patch @@ -1,23 +1,22 @@ -From 3cbee00fe5725b87abdae80cfa2ee735e4513ca6 Mon Sep 17 00:00:00 2001 +From efacbbe29b7212735046a7d0f2cd61148546ce9e Mon Sep 17 00:00:00 2001 From: Roy Li <rongqing.li@windriver.com> Date: Tue, 19 Aug 2014 11:31:35 +0800 -Subject: [PATCH] [PATCH] force STRIP to emtpy +Subject: [PATCH] force STRIP to emtpy otherwise the generate file will be stripped -Signed-off-by: Roy Li <rongqing.li@windriver.com> - ---- Upstream-Status: Pending +Signed-off-by: Roy Li <rongqing.li@windriver.com> +--- Makefile.rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.rules b/Makefile.rules -index 709dd04..b1f7e50 100644 +index 6ce39e5..a6dcd7b 100644 --- a/Makefile.rules +++ b/Makefile.rules -@@ -31,7 +31,7 @@ LDFLAGS ?= -s +@@ -36,7 +36,7 @@ LDFLAGS ?= -s endif ifdef DONTSTRIP @@ -26,3 +25,6 @@ index 709dd04..b1f7e50 100644 else STRIP ?= strip --strip-debug endif +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/remove-bashism.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0004-autofs.init.in-remove-bashism.patch index 4183069bb1..6065bc71bf 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/remove-bashism.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0004-autofs.init.in-remove-bashism.patch @@ -1,4 +1,4 @@ -From cfacbb917f87b903b50132a5025f86b0cc522e9c Mon Sep 17 00:00:00 2001 +From b5f4a3c2f02244209ac613aeb8ea406bdc39af27 Mon Sep 17 00:00:00 2001 From: Robert Yang <liezhi.yang@windriver.com> Date: Sat, 13 Sep 2014 20:19:28 -0700 Subject: [PATCH] autofs.init.in: remove bashism @@ -9,7 +9,6 @@ Upstream-Status: Pending Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> - --- redhat/autofs.init.in | 12 ++++++------ samples/rc.autofs.in | 10 +++++----- @@ -116,3 +115,6 @@ index 487669f..e96cde1 100644 pid=`pidof $prog` if [ -z $pid ]; then echo $"$prog not running" +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0005-fix-the-YACC-rule-to-fix-a-building-failure.patch index fd736296a5..462644b011 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0005-fix-the-YACC-rule-to-fix-a-building-failure.patch @@ -1,9 +1,7 @@ -From 971d48a00ef82880c34e89778bf430a01360ebd5 Mon Sep 17 00:00:00 2001 +From 40318f4f6109d9810b7cb31518a7879ae7632f58 Mon Sep 17 00:00:00 2001 From: Roy Li <rongqing.li@windriver.com> Date: Mon, 18 May 2015 16:28:36 +0800 -Subject: [PATCH] [PATCH] fix the YACC rule to fix a building failure - -Upstream-Statu: Pending +Subject: [PATCH] fix the YACC rule to fix a building failure The original rule will create the header file twice, one is that the header file as the object file is created, other time is when create the C source file. @@ -16,18 +14,35 @@ This lead to a race when compile amd_tok.o, the header file maybe rewritten. | ^ |../Makefile.rules:64: recipe for target 'amd_tok.o' failed |---------------------- -Signed-off-by: Roy Li <rongqing.li@windriver.com> ---- Upstream-Status: Pending - lib/Makefile | 6 ++++-- +Signed-off-by: Roy Li <rongqing.li@windriver.com> +--- + daemon/Makefile | 3 ++- + lib/Makefile | 3 ++- modules/Makefile | 3 ++- - 2 files changed, 6 insertions(+), 3 deletions(-) + 3 files changed, 6 insertions(+), 3 deletions(-) +diff --git a/daemon/Makefile b/daemon/Makefile +index 3af38e6..2a7ffe9 100644 +--- a/daemon/Makefile ++++ b/daemon/Makefile +@@ -44,7 +44,8 @@ automount: $(OBJS) $(AUTOFS_LIB) + master_tok.c: master_tok.l + $(LEX) -o$@ -Pmaster_ $? + +-master_parse.tab.c master_parse.tab.h: master_parse.y ++master_parse.tab.h: master_parse.tab.c ++master_parse.tab.c: master_parse.y + $(YACC) -v -d -p master_ -b master_parse $? + + master_tok.o: master_tok.c master_parse.tab.h +diff --git a/lib/Makefile b/lib/Makefile +index d18c67b..51445fd 100644 --- a/lib/Makefile +++ b/lib/Makefile -@@ -53,7 +53,8 @@ mount_xdr.o: mount_xdr.c +@@ -35,7 +35,8 @@ libautofs.so: $(OBJS) nss_tok.c: nss_tok.l $(LEX) -o$@ -Pnss_ $? @@ -37,9 +52,11 @@ Upstream-Status: Pending $(YACC) -v -d -p nss_ -b nss_parse $? nss_tok.o: nss_tok.c nss_parse.tab.h +diff --git a/modules/Makefile b/modules/Makefile +index 6908da0..00dd7ce 100644 --- a/modules/Makefile +++ b/modules/Makefile -@@ -103,7 +103,8 @@ amd_tok.c: amd_tok.l +@@ -105,7 +105,8 @@ amd_tok.c: amd_tok.l amd_tok.o: amd_tok.c amd_parse.tab.h @@ -49,30 +66,6 @@ Upstream-Status: Pending $(YACC) -v -d -p amd_ -b amd_parse $? amd_parse.tab.o: amd_parse.tab.c amd_parse.tab.h ---- a/daemon/Makefile -+++ b/daemon/Makefile -@@ -16,7 +16,7 @@ YACCSRC = master_tok.c master_parse.tab. - version := $(shell cat ../.version) - - CFLAGS += -rdynamic $(DAEMON_CFLAGS) -D_GNU_SOURCE -I../include --CFLAGS += -DAUTOFS_LIB_DIR=\"$(autofslibdir)\" -+CFLAGS += -DAUTOFS_LIB_DIR=\"$(autofslibdir)\" - CFLAGS += -DAUTOFS_MAP_DIR=\"$(autofsmapdir)\" - CFLAGS += -DAUTOFS_CONF_DIR=\"$(autofsconfdir)\" - CFLAGS += -DAUTOFS_FIFO_DIR=\"$(autofsfifodir)\" -@@ -44,7 +44,8 @@ automount: $(OBJS) $(AUTOFS_LIB) - master_tok.c: master_tok.l - $(LEX) -o$@ -Pmaster_ $? - --master_parse.tab.c master_parse.tab.h: master_parse.y -+master_parse.tab.h: master_parse.tab.c -+master_parse.tab.c: master_parse.y - $(YACC) -v -d -p master_ -b master_parse $? - - master_tok.o: master_tok.c master_parse.tab.h -@@ -57,5 +58,3 @@ clean: - install: all - install -d -m 755 $(INSTALLROOT)$(sbindir) - install -c automount -m 755 $(INSTALLROOT)$(sbindir) -- -- +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0006-Do-not-hardcode-path-for-pkg.m4.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0006-Do-not-hardcode-path-for-pkg.m4.patch new file mode 100644 index 0000000000..ab99a98cf9 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0006-Do-not-hardcode-path-for-pkg.m4.patch @@ -0,0 +1,31 @@ +From 349cc55c4cb7c7b2f5e7de937e11f3c581028b23 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 24 Aug 2018 06:24:36 +0000 +Subject: [PATCH] Do not hardcode path for pkg.m4 + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +update patch to version 5.1.6 +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 1bb1a52..4cebbd2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -12,7 +12,7 @@ define([AC_CACHE_SAVE], )dnl + AC_INIT(.autofs-5.1.9) + + # for pkg-config macros +-m4_include([/usr/share/aclocal/pkg.m4]) ++m4_include([pkg.m4]) + + # + # autofs installs by default in /usr +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/mount_conflict.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0007-Avoid-conflicts-between-sys-mount.h-and-linux-mount..patch index e2a94bf825..14faa0c753 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/mount_conflict.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0007-Avoid-conflicts-between-sys-mount.h-and-linux-mount..patch @@ -1,4 +1,7 @@ -Avoid conflicts between sys/mount.h and linux/mount.h +From 96e0e3ed49a0e00573fa5907ae80e6d262cb7644 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 9 Sep 2024 23:01:06 +0800 +Subject: [PATCH] Avoid conflicts between sys/mount.h and linux/mount.h linux/fs.h includes linux/mount.h and this include file is unused so do not include it and avoid conflict too with glibc 2.36+ see [1] @@ -8,6 +11,13 @@ do not include it and avoid conflict too with glibc 2.36+ see [1] Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + modules/parse_amd.c | 1 - + modules/parse_sun.c | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/modules/parse_amd.c b/modules/parse_amd.c +index fb6b1b7..d86adf1 100644 --- a/modules/parse_amd.c +++ b/modules/parse_amd.c @@ -27,7 +27,6 @@ @@ -18,6 +28,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #define MODULE_PARSE #include "automount.h" +diff --git a/modules/parse_sun.c b/modules/parse_sun.c +index a5351fd..8509781 100644 --- a/modules/parse_sun.c +++ b/modules/parse_sun.c @@ -30,7 +30,6 @@ @@ -28,3 +40,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #define MODULE_PARSE #include "automount.h" +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-include-libgen.h-for-basename.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0008-include-libgen.h-for-basename.patch index 4c8b4ef779..13254f2c41 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-include-libgen.h-for-basename.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0008-include-libgen.h-for-basename.patch @@ -1,4 +1,4 @@ -From 1651e7a35be8b3e2fa90ca57b073f6944664fa62 Mon Sep 17 00:00:00 2001 +From c754222ce955c893e8e3ad75d8c73835950d1931 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 25 Mar 2024 12:04:03 -0700 Subject: [PATCH] include libgen.h for basename @@ -10,6 +10,7 @@ include libgen.h for providing it. [1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 Upstream-Status: Pending + Signed-off-by: Khem Raj <raj.khem@gmail.com> --- daemon/automount.c | 1 + @@ -18,7 +19,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 3 files changed, 3 insertions(+) diff --git a/daemon/automount.c b/daemon/automount.c -index 3d9461d..61b3478 100644 +index 6cb3b1b..efc2680 100644 --- a/daemon/automount.c +++ b/daemon/automount.c @@ -21,6 +21,7 @@ @@ -30,7 +31,7 @@ index 3d9461d..61b3478 100644 #include <stdio.h> #include <stdlib.h> diff --git a/daemon/master.c b/daemon/master.c -index f99359c..3f56499 100644 +index f2c11e9..1455e40 100644 --- a/daemon/master.c +++ b/daemon/master.c @@ -21,6 +21,7 @@ @@ -42,7 +43,7 @@ index f99359c..3f56499 100644 #include <sys/types.h> #include <sys/stat.h> diff --git a/modules/lookup_file.c b/modules/lookup_file.c -index 6afc558..82b1f28 100644 +index 99f2e21..4914395 100644 --- a/modules/lookup_file.c +++ b/modules/lookup_file.c @@ -15,6 +15,7 @@ @@ -54,5 +55,5 @@ index 6afc558..82b1f28 100644 #include <string.h> #include <time.h> -- -2.44.0 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0009-hash.h-include-sys-reg.h-instead-of-bits-reg.h.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0009-hash.h-include-sys-reg.h-instead-of-bits-reg.h.patch new file mode 100644 index 0000000000..442a3138c2 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0009-hash.h-include-sys-reg.h-instead-of-bits-reg.h.patch @@ -0,0 +1,35 @@ +From 1a08bbed376c0dfa0ce2d12a93b34fb2d5620c05 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Tue, 10 Sep 2024 21:08:09 +0800 +Subject: [PATCH] hash.h: include <sys/reg.h> instead of <bits/reg.h> + +Fix build on musl: +In file included from ../include/automount.h:25, + from parse_subs.c:29: +../include/hash.h:27:2: error: #error Wordsize not 32 or 64 + 27 | #error Wordsize not 32 or 64 + | ^~~~~ + +Upstream-Status: Pending + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + include/hash.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/hash.h b/include/hash.h +index 0f1d7b5..f465ab8 100644 +--- a/include/hash.h ++++ b/include/hash.h +@@ -6,7 +6,7 @@ + #ifdef __GLIBC__ + #include <bits/wordsize.h> + #else +-#include <bits/reg.h> ++#include <sys/reg.h> + #endif + #include <linux/stddef.h> + #include <sys/types.h> +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0010-autofs-5.1.9-Fix-incompatible-function-pointer-types.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0010-autofs-5.1.9-Fix-incompatible-function-pointer-types.patch new file mode 100644 index 0000000000..0e15587340 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0010-autofs-5.1.9-Fix-incompatible-function-pointer-types.patch @@ -0,0 +1,64 @@ +From a6a79230110e998f780796cb1d4c5d3f59f20d1d Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Mon, 18 Dec 2023 13:48:18 +0100 +Subject: [PATCH] autofs-5.1.9 - Fix incompatible function pointer types in + cyrus-sasl module + +Add casts to SASL callbacks to avoid incompatible-pointer-types +errors. Avoids a build failure with stricter compilers. + +Signed-off-by: Florian Weimer <fweimer@redhat.com> +Signed-off-by: Ian Kent <raven@themaw.net> + +Upstream-Status: Backport +[https://git.kernel.org/pub/scm/linux/storage/autofs/autofs.git/commit/?id=b7ff971bb8aa3fc609bb531ddc4c2ce56226383f] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + CHANGELOG | 2 ++ + modules/cyrus-sasl.c | 14 +++++++------- + 2 files changed, 9 insertions(+), 7 deletions(-) + +diff --git a/CHANGELOG b/CHANGELOG +index 3e47daa..fd9d861 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -1,4 +1,6 @@ + ++- Fix incompatible function pointer types in cyrus-sasl module. ++ + 02/11/2023 autofs-5.1.9 + - fix kernel mount status notification. + - fix fedfs build flags. +diff --git a/modules/cyrus-sasl.c b/modules/cyrus-sasl.c +index e742eaf..78b7794 100644 +--- a/modules/cyrus-sasl.c ++++ b/modules/cyrus-sasl.c +@@ -109,17 +109,17 @@ static int getpass_func(sasl_conn_t *, void *, int, sasl_secret_t **); + static int getuser_func(void *, int, const char **, unsigned *); + + static sasl_callback_t callbacks[] = { +- { SASL_CB_USER, &getuser_func, NULL }, +- { SASL_CB_AUTHNAME, &getuser_func, NULL }, +- { SASL_CB_PASS, &getpass_func, NULL }, ++ { SASL_CB_USER, (int(*)(void)) &getuser_func, NULL }, ++ { SASL_CB_AUTHNAME, (int(*)(void)) &getuser_func, NULL }, ++ { SASL_CB_PASS, (int(*)(void)) &getpass_func, NULL }, + { SASL_CB_LIST_END, NULL, NULL }, + }; + + static sasl_callback_t debug_callbacks[] = { +- { SASL_CB_LOG, &sasl_log_func, NULL }, +- { SASL_CB_USER, &getuser_func, NULL }, +- { SASL_CB_AUTHNAME, &getuser_func, NULL }, +- { SASL_CB_PASS, &getpass_func, NULL }, ++ { SASL_CB_LOG, (int(*)(void)) &sasl_log_func, NULL }, ++ { SASL_CB_USER, (int(*)(void)) &getuser_func, NULL }, ++ { SASL_CB_AUTHNAME, (int(*)(void)) &getuser_func, NULL }, ++ { SASL_CB_PASS, (int(*)(void)) &getpass_func, NULL }, + { SASL_CB_LIST_END, NULL, NULL }, + }; + +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch deleted file mode 100644 index 4cfd8edf9f..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch +++ /dev/null @@ -1,25 +0,0 @@ -From df5d45b2d7ad7e7b5f0542a816d08b0409a529a1 Mon Sep 17 00:00:00 2001 -From: Roy Li <rongqing.li@windriver.com> -Date: Tue, 19 Aug 2014 11:31:35 +0800 -Subject: [PATCH] [PATCH] add the needed stdarg.h - -Upstream-Status: Pending - -Signed-off-by: Roy Li <rongqing.li@windriver.com> - ---- - lib/defaults.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/defaults.c b/lib/defaults.c -index 0e48a78..667f35d 100644 ---- a/lib/defaults.c -+++ b/lib/defaults.c -@@ -16,6 +16,7 @@ - - #include <stdlib.h> - #include <stdio.h> -+#include <stdarg.h> - #include <ctype.h> - #include <string.h> - #include <sys/utsname.h> diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-fix-lib-deps.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-fix-lib-deps.patch deleted file mode 100644 index 8e06db6e4a..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-fix-lib-deps.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 080626108c9ab70e2489752ef2a14006d0564b0c Mon Sep 17 00:00:00 2001 -From: Joe MacDonald <joe.macdonald@windriver.com> -Date: Tue, 18 Jun 2013 10:05:21 -0400 -Subject: [PATCH] Fix the dependency issue - -Upstream-Status: Pending - -autofs's lib sources have a dependency on a number of files that are -generated by rpcgen during buildtime - -Signed-off-by: Roy.Li <rongqing.li@windriver.com> -Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com> - ---- - lib/Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/Makefile b/lib/Makefile -index 518b483..4798a4b 100644 ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -81,3 +81,4 @@ install: all - clean: - rm -f $(LIB) $(RPCS) $(OBJS) $(YACCSRC) *.output *~ - -+$(OBJS): $(RPCS) diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/cross.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/cross.patch deleted file mode 100644 index 2a4f4fd0dd..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/cross.patch +++ /dev/null @@ -1,55 +0,0 @@ -From b9b44cd82caceeb638cc6a862b5bb90b93ad6c6a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 5 Jan 2013 19:53:10 -0800 - ---- -Upstream-Status: Pending - - aclocal.m4 | 2 ++ - configure.in | 8 ++++++-- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/aclocal.m4 b/aclocal.m4 -index 2115204..2a9a802 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -7,6 +7,8 @@ dnl -------------------------------------------------------------------------- - AC_DEFUN(AF_PATH_INCLUDE, - [AC_PATH_PROGS($1,$2,$3,$4) - if test -n "$$1"; then -+ AH_TEMPLATE([HAVE_$1], [Have $2]) -+ AH_TEMPLATE([PATH_$1], [Have $2]) - AC_DEFINE(HAVE_$1,1,[define if you have $1]) - AC_DEFINE_UNQUOTED(PATH_$1, "$$1", [define if you have $1]) - HAVE_$1=1 -diff --git a/configure.in b/configure.in -index 25d7c4e..44a1c8b 100644 ---- a/configure.in -+++ b/configure.in -@@ -324,13 +324,15 @@ AC_PROG_CC - cat > pietest.c <<EOF - int main(void) { return 0; } - EOF -+AF_tmp_ldflags="$LDFLAGS" -+AF_tmp_cflags="$CFLAGS" - CFLAGS=-fPIE - LDFLAGS=-pie - DAEMON_CFLAGS= - DAEMON_LDFLAGS= - AC_MSG_CHECKING([whether gcc -fPIE works]) --AC_RUN_IFELSE([AC_LANG_PROGRAM([[]], [[int main(void) {return 0;}]])], -- [gcc_supports_pie=yes], [gcc_supports_pie=no], [gcc_supports_pie=no]) -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[int main(void) {return 0;}]])], -+ [gcc_supports_pie=yes], [gcc_supports_pie=no], [gcc_supports_pie=no]) - AC_MSG_RESULT([$gcc_supports_pie]) - if test $gcc_supports_pie = yes ; then - DAEMON_CFLAGS="-fPIE" -@@ -339,6 +341,8 @@ fi - rm -f pietest.c - AC_SUBST(DAEMON_CFLAGS) - AC_SUBST(DAEMON_LDFLAGS) -+CFLAGS="${AF_tmp_cflags}" -+LDFLAGS="${AF_tmp_ldflags}" - - # - # Enable ability to access value in external env variable diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch deleted file mode 100644 index 414325974d..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch +++ /dev/null @@ -1,47 +0,0 @@ -From c500d9906f163bf716c872d37403b9de02ef0a86 Mon Sep 17 00:00:00 2001 -From: Amy Fong <amy.fong@windriver.com> -Date: Fri, 18 Jan 2013 12:13:32 -0500 -Subject: [PATCH] autofs: fails to compile with openldap disabled - -As of 5.0.6, it appears that changes were introduced so that -if you compile with openldap disabled and openldap headers are not -available, then autofs fails to build. - -Upstream-Status: Pending - -Signed-off-by: Amy Fong <amy.fong@windriver.com> --- - lookup_ldap.h | 4 ++++ - 1 file changed, 4 insertions(+) - ---- - include/lookup_ldap.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/include/lookup_ldap.h b/include/lookup_ldap.h -index 3a7aba7..bfdb0b3 100644 ---- a/include/lookup_ldap.h -+++ b/include/lookup_ldap.h -@@ -1,7 +1,9 @@ - #ifndef LOOKUP_LDAP_H - #define LOOKUP_LDAP_H - -+#ifdef WITH_LDAP - #include <ldap.h> -+#endif - - #ifdef WITH_SASL - #include <openssl/ssl.h> -@@ -117,10 +119,12 @@ struct lookup_context { - - #define LDAP_AUTH_USESIMPLE 0x0008 - -+#ifdef WITH_LDAP - /* lookup_ldap.c */ - LDAP *init_ldap_connection(unsigned logopt, const char *uri, struct lookup_context *ctxt); - int unbind_ldap_connection(unsigned logopt, struct ldap_conn *conn, struct lookup_context *ctxt); - int authtype_requires_creds(const char *authtype); -+#endif - - #ifdef WITH_SASL - /* cyrus-sasl.c */ diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch deleted file mode 100644 index be750ab897..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 602f9ca83c2bdbf511bcb178fcb4b9fc54da955f Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Tue, 27 Nov 2018 15:20:46 +0800 -Subject: [PATCH] From e3ae56cf0bb4063c31295f45d04e3c504f4b6cc7 Mon Sep 17 - 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 24 Apr 2017 - 20:41:25 -0700 Subject: [PATCH] autofs: Upgrade to 5.1.2 release - -Use pkg-config first to look for external libnsl which is now -split out from glibc, if it does not exist then see if its provided -by glibc itself. - --Khem - -Upstream-Status: Pending - -update patch to version 5.1.5 -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index 76ecb40..493b9f1 100644 ---- a/configure.in -+++ b/configure.in -@@ -238,7 +238,7 @@ AC_SUBST(LIBCLOCK_GETTIME) - - PKG_CHECK_MODULES([NSL],[libnsl],, - [ --AC_CHECK_LIB(nsl, yp_match, NSL_LIBS="-lnsl") -+PKG_CHECK_MODULES([NSL], [libnsl], [], [AC_CHECK_LIB([nsl],[yp_match],[LIBNSL="-lnsl"],[LIBNSL=""])]) - AC_SUBST(NSL_LIBS) - NSL_CFLAGS="" - ]) --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.8.bb b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.9.bb index e3f9777380..bc52f40d1c 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.8.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.9.bb @@ -3,55 +3,44 @@ SECTION = "utils" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=ee9324a6f564bb2376b63878ac396798" -DEPENDS += "libtirpc flex-native bison-native e2fsprogs openssl libxml2 util-linux cyrus-sasl libnsl2" +DEPENDS += "libtirpc flex-native bison-native e2fsprogs openssl util-linux libnsl2" CFLAGS += "-I${STAGING_INCDIR}/tirpc" inherit autotools-brokensep systemd update-rc.d pkgconfig SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \ - file://no-bash.patch \ - file://cross.patch \ - file://fix_disable_ldap.patch \ - file://autofs-5.0.7-fix-lib-deps.patch \ - file://add-the-needed-stdarg.h.patch \ - file://using-pkg-config-to-detect-libxml-2.0-and-krb5.patch \ - file://force-STRIP-to-emtpy.patch \ - file://remove-bashism.patch \ - file://fix-the-YACC-rule-to-fix-a-building-failure.patch \ - file://0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch \ - file://0002-Replace-__S_IEXEC-with-S_IEXEC.patch \ - file://pkgconfig-libnsl.patch \ - file://0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch \ - file://0001-Do-not-hardcode-path-for-pkg.m4.patch \ - file://0001-Bug-fix-for-pid_t-not-found-on-musl.patch \ - file://0001-Define-__SWORD_TYPE-if-undefined.patch \ - file://mount_conflict.patch \ - file://0001-autofs-5.1.8-add-autofs_strerror_r-helper-for-musl.patch \ - file://0002-autofs-5.1.8-handle-innetgr-not-present-in-musl.patch \ - file://0001-include-libgen.h-for-basename.patch \ + file://0001-no-bash.patch \ + file://0002-using-pkg-config-to-detect-krb5.patch \ + file://0003-force-STRIP-to-emtpy.patch \ + file://0004-autofs.init.in-remove-bashism.patch \ + file://0005-fix-the-YACC-rule-to-fix-a-building-failure.patch \ + file://0006-Do-not-hardcode-path-for-pkg.m4.patch \ + file://0007-Avoid-conflicts-between-sys-mount.h-and-linux-mount..patch \ + file://0008-include-libgen.h-for-basename.patch \ + file://0009-hash.h-include-sys-reg.h-instead-of-bits-reg.h.patch \ + file://0010-autofs-5.1.9-Fix-incompatible-function-pointer-types.patch \ " -SRC_URI[sha256sum] = "0bd401c56f0eb1ca6251344c3a3d70bface3eccf9c67117cd184422c4cace30c" +SRC_URI[sha256sum] = "46c30b763ef896f4c4a6df6d62aaaef7afc410e0b7f50d52dbfc6cf728cacd4f" UPSTREAM_CHECK_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/" INITSCRIPT_NAME = "autofs" INITSCRIPT_PARAMS = "defaults" -# FIXME: modules/Makefile has crappy rules that don't obey LDFLAGS -#CFLAGS += "${LDFLAGS}" - PACKAGECONFIG[systemd] = "--with-systemd=${systemd_unitdir}/system,--without-systemd,systemd" +PACKAGECONFIG[openldap] = "--with-openldap=yes,--with-openldap=no,libxml2 openldap" +PACKAGECONFIG[sasl] = "--with-sasl=yes,--with-sasl=no,cyrus-sasl krb5" PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" EXTRA_OEMAKE = "DONTSTRIP=1" EXTRA_OECONF += "--disable-mount-locking \ - --enable-ignore-busy --with-openldap=no \ + --enable-ignore-busy \ --with-confdir=${sysconfdir}/default \ --with-fifodir=/run \ --with-flagdir=/run \ - --with-sasl=no --with-libtirpc \ + --with-libtirpc \ --with-mapdir=${sysconfdir} \ --with-path=${STAGING_BINDIR_NATIVE} \ --with-fifodir=${localstatedir}/run \ diff --git a/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool_1.3.bb b/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool_1.3.bb index 7947ffe457..90e7814a0f 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool_1.3.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool_1.3.bb @@ -42,7 +42,7 @@ inherit systemd DEPENDS = "readline ppp ncurses gzip-native rpcsvc-proto-native libtirpc" RDEPENDS:${PN} = "rpcbind" -EXTRA_OEMAKE = "CC='${CC}' AS='${AS}' LD='${LD}' AR='${AR}' NM='${NM}' STRIP='${STRIP}'" +EXTRA_OEMAKE = "CC='${CC} ${CFLAGS}' AS='${AS}' LD='${LD} ${LDFLAGS}' AR='${AR}' NM='${NM}' STRIP='${STRIP}'" EXTRA_OEMAKE += "PPPD_VERSION=${PPPD_VERSION} SYS_LIBDIR=${libdir}" # enable self tests EXTRA_OEMAKE += "IPPOOL_TEST=y" @@ -52,12 +52,7 @@ CPPFLAGS += "${SELECTED_OPTIMIZATION} -I${STAGING_INCDIR}/tirpc" SYSTEMD_SERVICE:${PN} = "ippool.service" do_compile:prepend() { - # fix the CFLAGS= and CPPFLAGS= in main Makefile, to have the extra CFLAGS in env - sed -i -e "s/^CFLAGS=/CFLAGS+=/" ${S}/Makefile - sed -i -e "s/^CPPFLAGS=/CPPFLAGS+=/" ${S}/Makefile - sed -i -e "s:-I/usr/include/pppd:-I=/usr/include/pppd:" ${S}/pppd/Makefile - } diff --git a/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived/0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch b/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived/0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch new file mode 100644 index 0000000000..1f9f8b30b1 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived/0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch @@ -0,0 +1,29 @@ +From 5b1b04356f3efc08ae279cafc6ee86df11f10c9a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 15 Aug 2024 23:13:02 -0700 +Subject: [PATCH] configure.ac: Do not emit compiler flags into object files + +They contain options which have absolute paths in them e.g. --sysroot +therefore do not record them and make build reproducible + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index fae16f1..677b94a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -904,8 +904,7 @@ if test "$enable_hardening" != no; then + "-Wp,-D_FORTIFY_SOURCE=2" \ + "-fexceptions" \ + "-fstack-protector-strong" \ +- "--param=ssp-buffer-size=4" \ +- "-grecord-gcc-switches" ++ "--param=ssp-buffer-size=4" + do + AC_MSG_CHECKING([for $FLAG support]) + CFLAGS="$CFLAGS $FLAG" diff --git a/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb b/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb index 85f4a6aa59..c4d59d3caa 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb @@ -11,6 +11,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "http://www.keepalived.org/software/${BP}.tar.gz \ + file://0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch \ " SRC_URI[sha256sum] = "85882eb62974f395d4c631be990a41a839594a7e62fbfebcb5649a937a7a1bb6" UPSTREAM_CHECK_URI = "https://github.com/acassen/keepalived/releases" @@ -30,6 +31,10 @@ EXTRA_OEMAKE = "initdir=${sysconfdir}/init.d" export EXTRA_CFLAGS = "${CFLAGS}" +do_configure:append() { + sed -i -e 's|${WORKDIR}|<scrubbed>|g' ${B}/lib/config.h +} + do_install:append() { if [ -f ${D}${sysconfdir}/init.d/${BPN} ]; then chmod 0755 ${D}${sysconfdir}/init.d/${BPN} diff --git a/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb b/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb index 15bb00a3af..de111cac05 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb @@ -28,3 +28,7 @@ do_install () { 'SYSCONFDIR=${D}${sysconfdir}' 'mandir=${D}${mandir}' \ install } + +# http://errors.yoctoproject.org/Errors/Details/766888/ +# ncftp/3.2.7/ncftp-3.2.7/config.h:358:28: error: passing argument 2 of 'select' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7c.bb b/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.8b.bb index aa8d5fabd6..33480bff2c 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7c.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.8b.bb @@ -4,8 +4,8 @@ HOMEPAGE = "http://www.proftpd.org" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=fb0d1484d11915fa88a6a7702f1dc184" -SRCREV = "75aa739805a6e05eeb31189934a3d324e7862962" -BRANCH = "1.3.7" +SRCREV = "0a7ea9b0ba9fcdf368374a226370d08f10397d99" +BRANCH = "1.3.8" SRC_URI = "git://github.com/proftpd/proftpd.git;branch=${BRANCH};protocol=https \ file://basic.conf.patch \ @@ -21,7 +21,7 @@ S = "${WORKDIR}/git" inherit autotools-brokensep useradd update-rc.d systemd multilib_script -EXTRA_OECONF += "--enable-largefile" +EXTRA_OECONF += "--enable-largefile INSTALL=install" PACKAGECONFIG ??= "shadow \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \ @@ -70,6 +70,12 @@ do_configure () { install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} oe_runconf + sed -e 's|--sysroot=${STAGING_DIR_HOST}||g' \ + -e 's|${STAGING_DIR_NATIVE}||g' \ + -e 's|-ffile-prefix-map=[^ ]*||g' \ + -e 's|-fdebug-prefix-map=[^ ]*||g' \ + -e 's|-fmacro-prefix-map=[^ ]*||g' \ + -i ${B}/config.h } FTPUSER = "ftp" @@ -116,7 +122,7 @@ do_install () { -e 's|-ffile-prefix-map=[^ ]*||g' \ -e 's|-fdebug-prefix-map=[^ ]*||g' \ -e 's|-fmacro-prefix-map=[^ ]*||g' \ - -i ${D}/${bindir}/prxs + -i ${D}/${bindir}/prxs ${D}${includedir}/proftpd/Make.rules ${D}${includedir}/proftpd/config.h # ftpmail perl script, which reads the proftpd log file and sends # automatic email notifications once an upload finishs, diff --git a/meta-openembedded/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch b/meta-openembedded/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch index e0d002c68c..489850e3bd 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch @@ -37,7 +37,7 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ]) --- a/acinclude/lib-checks.m4 +++ b/acinclude/lib-checks.m4 -@@ -205,7 +205,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_CONST_SSL_ +@@ -205,7 +205,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_CONST_SSL_METHOD],[ [ AC_MSG_RESULT([no]) ], diff --git a/meta-openembedded/meta-networking/recipes-daemons/squid/squid_6.9.bb b/meta-openembedded/meta-networking/recipes-daemons/squid/squid_6.10.bb index f670a776eb..984209ad21 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/squid/squid_6.9.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/squid/squid_6.10.bb @@ -22,7 +22,7 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://squid.nm \ " -SRC_URI[sha256sum] = "1ad72d46e1cb556e9561214f0fb181adb87c7c47927ef69bc8acd68a03f61882" +SRC_URI[sha256sum] = "0b07b187e723f04770dd25beb89aec12030a158696aa8892d87c8b26853408a7" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://errors/COPYRIGHT;md5=d324bc1f9447d1d1588d75b22a678dc4 \ diff --git a/meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.2.0.bb b/meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.2.0.bb index ee006efe28..93d293493c 100644 --- a/meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.2.0.bb +++ b/meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.2.0.bb @@ -37,6 +37,7 @@ SYSTEMD_AUTO_ENABLE = "enable" export EXTRA_OEMAKE = "" CFPROTECTION ?= "-fcf-protection=full" +CFPROTECTION:riscv32 = "" CFPROTECTION:riscv64 = "" CFPROTECTION:arm = "" CFPROTECTION:aarch64 = "" diff --git a/meta-openembedded/meta-networking/recipes-filter/ipset/ipset_7.21.bb b/meta-openembedded/meta-networking/recipes-filter/ipset/ipset_7.22.bb index c7ebdc1c66..5eaf142411 100644 --- a/meta-openembedded/meta-networking/recipes-filter/ipset/ipset_7.21.bb +++ b/meta-openembedded/meta-networking/recipes-filter/ipset/ipset_7.22.bb @@ -11,7 +11,7 @@ DEPENDS = "libtool libmnl" SRC_URI = "http://ftp.netfilter.org/pub/ipset/${BP}.tar.bz2 \ file://0001-ipset-Define-portable-basename-function.patch" -SRC_URI[sha256sum] = "e2c6ce4fcf3acb3893ca5d35c86935f80ad76fc5ccae601185842df760e0bc69" +SRC_URI[sha256sum] = "f6ac5a47c3ef9f4c67fcbdf55e791cbfe38eb0a4aa1baacd12646a140abacdd9" inherit autotools pkgconfig module-base diff --git a/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.6.bb b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.7.bb index 841a7267b8..b465209389 100644 --- a/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.6.bb +++ b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.7.bb @@ -7,7 +7,7 @@ SRC_URI = "git://git.netfilter.org/libnftnl;branch=master \ file://0001-configure.ac-Add-serial-tests.patch \ file://run-ptest \ " -SRCREV = "83dd4dc316b4189d16ead54cd30bfc89e5160cfd" +SRCREV = "116e95aa7b6358c917de8c69f6f173874030b46b" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables/0001-tests-shell-Fix-sets-reset_command_0-for-current-ker.patch b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables/0001-tests-shell-Fix-sets-reset_command_0-for-current-ker.patch deleted file mode 100644 index 164182bb1e..0000000000 --- a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables/0001-tests-shell-Fix-sets-reset_command_0-for-current-ker.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 7a6089a400a573b9a4fd92f29c00a6be7b8ef269 Mon Sep 17 00:00:00 2001 -From: Phil Sutter <phil@nwl.cc> -Date: Thu, 2 Nov 2023 16:02:14 +0100 -Subject: [PATCH] tests: shell: Fix sets/reset_command_0 for current kernels - -Since kernel commit 4c90bba60c26 ("netfilter: nf_tables: do not refresh -timeout when resetting element"), element reset won't touch expiry -anymore. Invert the one check to make sure it remains unaltered, drop -the other testing behaviour for per-element timeouts. - -Signed-off-by: Phil Sutter <phil@nwl.cc> - -Upstream-Status: Backport -[https://git.netfilter.org/nftables/commit/?id=7a6089a400a573b9a4fd92f29c00a6be7b8ef269] - -Signed-off-by: William Lyu <William.Lyu@windriver.com> ---- - tests/shell/testcases/sets/reset_command_0 | 10 ++-------- - 1 file changed, 2 insertions(+), 8 deletions(-) - -diff --git a/tests/shell/testcases/sets/reset_command_0 b/tests/shell/testcases/sets/reset_command_0 -index e663dac8..d38ddb3f 100755 ---- a/tests/shell/testcases/sets/reset_command_0 -+++ b/tests/shell/testcases/sets/reset_command_0 -@@ -44,10 +44,10 @@ elem='element t s { 1.0.0.1 . udp . 53 }' - grep 'elements = ' | drop_seconds | uniq | wc -l) == 1 ]] - echo OK - --echo -n "counters and expiry are reset: " -+echo -n "counters are reset, expiry left alone: " - NEW=$($NFT "get $elem") - grep -q 'counter packets 0 bytes 0' <<< "$NEW" --[[ $(expires_minutes <<< "$NEW") -gt 20 ]] -+[[ $(expires_minutes <<< "$NEW") -lt 20 ]] - echo OK - - echo -n "get map elem matches reset map elem: " -@@ -80,12 +80,6 @@ OUT=$($NFT reset map t m) - $DIFF -u <(echo "$EXP") <(echo "$OUT") - echo OK - --echo -n "reset command respects per-element timeout: " --VAL=$($NFT get element t s '{ 2.0.0.2 . tcp . 22 }' | expires_minutes) --[[ $VAL -lt 15 ]] # custom timeout applies --[[ $VAL -gt 10 ]] # expires was reset --echo OK -- - echo -n "remaining elements are reset: " - OUT=$($NFT list ruleset) - grep -q '2.0.0.2 . tcp . 22 counter packets 0 bytes 0' <<< "$OUT" --- -2.43.0 - diff --git a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables/0001-tests-shell-skip-secmark-tests-if-kernel-does-not-su.patch b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables/0001-tests-shell-skip-secmark-tests-if-kernel-does-not-su.patch deleted file mode 100644 index 2a966ab443..0000000000 --- a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables/0001-tests-shell-skip-secmark-tests-if-kernel-does-not-su.patch +++ /dev/null @@ -1,46 +0,0 @@ -From fff913c1eefbc84eb2d9c52038ef29fe881e9ee9 Mon Sep 17 00:00:00 2001 -From: Pablo Neira Ayuso <pablo@netfilter.org> -Date: Tue, 21 Nov 2023 21:16:38 +0100 -Subject: [PATCH] tests: shell: skip secmark tests if kernel does not support - it - -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> - -Upstream-Status: Backport -[https://git.netfilter.org/nftables/commit/?id=fff913c1eefbc84eb2d9c52038ef29fe881e9ee9] - -Signed-off-by: William Lyu <William.Lyu@windriver.com> ---- - tests/shell/features/secmark.nft | 7 +++++++ - tests/shell/testcases/json/0005secmark_objref_0 | 1 + - 2 files changed, 8 insertions(+) - create mode 100644 tests/shell/features/secmark.nft - -diff --git a/tests/shell/features/secmark.nft b/tests/shell/features/secmark.nft -new file mode 100644 -index 00000000..ccbb572f ---- /dev/null -+++ b/tests/shell/features/secmark.nft -@@ -0,0 +1,7 @@ -+# fb961945457f ("netfilter: nf_tables: add SECMARK support") -+# v4.20-rc1~14^2~125^2~5 -+table inet x { -+ secmark ssh_server { -+ "system_u:object_r:ssh_server_packet_t:s0" -+ } -+} -diff --git a/tests/shell/testcases/json/0005secmark_objref_0 b/tests/shell/testcases/json/0005secmark_objref_0 -index 992d1b00..5c44f093 100755 ---- a/tests/shell/testcases/json/0005secmark_objref_0 -+++ b/tests/shell/testcases/json/0005secmark_objref_0 -@@ -1,6 +1,7 @@ - #!/bin/bash - - # NFT_TEST_REQUIRES(NFT_TEST_HAVE_json) -+# NFT_TEST_REQUIRES(NFT_TEST_HAVE_secmark) - - set -e - --- -2.43.0 - diff --git a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables/run-ptest b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables/run-ptest index 32ddf9f455..55e801f67c 100644 --- a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables/run-ptest +++ b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables/run-ptest @@ -5,14 +5,18 @@ cd ${NFTABLESLIB}/ptest || exit 1 LOG="${NFTABLESLIB}/ptest/nftables_ptest_$(date +%Y%m%d-%H%M%S).log" NFT=nft -tests/shell/run-tests.sh -v | sed -E '/I: \[OK\]/ s/^/PASS: / ; /W: \[(CHK DUMP|VALGRIND|TAINTED|DUMP FAIL|FAILED)\]/ s/^/FAIL: /' | sed "s,\x1B\[[0-9;]*[a-zA-Z],,g" | tee -a "${LOG}" +tests/shell/run-tests.sh -v | sed -E '/I: \[OK\]/ s/^/PASS: / ; /W: \[(CHK DUMP|VALGRIND|TAINTED|DUMP FAIL|FAILED)\]/ s/^/FAIL: / ; /I: \[SKIPPED\]/ s/^/SKIP: /' | sed "s,\x1B\[[0-9;]*[a-zA-Z],,g" | tee -a "${LOG}" passed=$(grep -c PASS: "${LOG}") failed=$(grep -c FAIL: "${LOG}") -all=$((passed + failed)) +skiped=$(grep -c SKIP: "${LOG}") + +all=$((passed + failed + skiped)) ( echo "=== Test Summary ===" echo "TOTAL: ${all}" echo "PASSED: ${passed}" echo "FAILED: ${failed}" + echo "SKIPED: ${skiped}" + echo "====================" ) | tee -a "${LOG}" diff --git a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.0.9.bb b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.1.0.bb index 17f00ffd42..98e7a85a47 100644 --- a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.0.9.bb +++ b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.1.0.bb @@ -12,11 +12,9 @@ DEPENDS = "libmnl libnftnl bison-native \ ${@bb.utils.contains('PACKAGECONFIG', 'mini-gmp', '', 'gmp', d)}" SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.xz \ - file://0001-tests-shell-Fix-sets-reset_command_0-for-current-ker.patch \ - file://0001-tests-shell-skip-secmark-tests-if-kernel-does-not-su.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "a3c304cd9ba061239ee0474f9afb938a9bb99d89b960246f66f0c3a0a85e14cd" +SRC_URI[sha256sum] = "ef3373294886c5b607ee7be82c56a25bc04e75f802f8e8adcd55aac91eb0aa24" inherit autotools manpages pkgconfig ptest @@ -26,16 +24,16 @@ PACKAGECONFIG[json] = "--with-json, --without-json, jansson" PACKAGECONFIG[linenoise] = "--with-cli=linenoise, , linenoise, , , editline readline" PACKAGECONFIG[manpages] = "--enable-man-doc, --disable-man-doc, asciidoc-native" PACKAGECONFIG[mini-gmp] = "--with-mini-gmp, --without-mini-gmp" -PACKAGECONFIG[python] = ",, python3-setuptools-native" +PACKAGECONFIG[python] = "" PACKAGECONFIG[readline] = "--with-cli=readline, , readline, , , editline linenoise" PACKAGECONFIG[xtables] = "--with-xtables, --without-xtables, iptables" EXTRA_OECONF = " \ ${@bb.utils.contains_any('PACKAGECONFIG', 'editline linenoise readline', '', '--without-cli', d)}" -SETUPTOOLS_SETUP_PATH = "${S}/py" +PEP517_SOURCE_PATH = "${S}/py" -inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'python', 'setuptools3', '', d)} +inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python_setuptools_build_meta', '', d)} PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'python', '${PN}-python', '', d)}" FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" @@ -46,21 +44,21 @@ RDEPENDS:${PN}-python = "python3-core python3-json ${PN}" do_configure() { autotools_do_configure if ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then - setuptools3_do_configure + python_pep517_do_configure fi } do_compile() { autotools_do_compile if ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then - setuptools3_do_compile + python_pep517_do_compile fi } do_install() { autotools_do_install if ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then - setuptools3_do_install + python_pep517_do_install fi } diff --git a/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.8.2.bb b/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.8.2.bb index 1517384eca..68dd0702f7 100644 --- a/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.8.2.bb +++ b/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.8.2.bb @@ -29,4 +29,5 @@ do_configure:prepend() { do_install:append() { sed -i -e 's|${DEBUG_PREFIX_MAP}||g; s|--sysroot=${STAGING_DIR_TARGET}||g' ${D}${libdir}/pkgconfig/*.pc + sed -i -e 's|${DEBUG_PREFIX_MAP}||g; s|--sysroot=${STAGING_DIR_TARGET}||g' ${D}${bindir}/znc-buildmod } diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20210914.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20210914.bb index 8def54ece6..c12b8abd5d 100644 --- a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20210914.bb +++ b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20210914.bb @@ -1,7 +1,7 @@ require wireguard.inc SRCREV = "3ba6527130c502144e7388b900138bca6260f4e8" -SRC_URI = "git://git.zx2c4.com/wireguard-tools;branch=master" +SRC_URI = "git://github.com/WireGuard/wireguard-tools.git;branch=master;protocol=https" inherit bash-completion systemd pkgconfig diff --git a/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/0001-bison-flex-Add-flags-for-carrying-user-specified-par.patch b/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/0001-bison-flex-Add-flags-for-carrying-user-specified-par.patch new file mode 100644 index 0000000000..98ba4d5283 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/0001-bison-flex-Add-flags-for-carrying-user-specified-par.patch @@ -0,0 +1,39 @@ +From fa6227d92725af5ae17b8435c0d50d92ff7a575c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 14 Aug 2024 19:32:25 -0700 +Subject: [PATCH] bison/flex: Add flags for carrying user specified parameters + +This helps in passing cmdline to flex and bison e.g. to remove lines +from generated output to avoid absolute paths + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + cmake/Modules/CMakeUserUseBison.cmake | 1 + + cmake/Modules/CMakeUserUseFlex.cmake | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/cmake/Modules/CMakeUserUseBison.cmake b/cmake/Modules/CMakeUserUseBison.cmake +index 9257545..b61bd0e 100644 +--- a/cmake/Modules/CMakeUserUseBison.cmake ++++ b/cmake/Modules/CMakeUserUseBison.cmake +@@ -52,6 +52,7 @@ IF(BISON_EXECUTABLE) + OUTPUT "${OUTFILE}" "${HEADER}" + COMMAND "${BISON_EXECUTABLE}" + ARGS "--name-prefix=${PREFIX}" ++ "${BISON_TARGET_ARG_COMPILE_FLAGS}" + "--defines" + "--output-file=${OUTFILE}" + "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}" +diff --git a/cmake/Modules/CMakeUserUseFlex.cmake b/cmake/Modules/CMakeUserUseFlex.cmake +index 7d0394f..1221dca 100644 +--- a/cmake/Modules/CMakeUserUseFlex.cmake ++++ b/cmake/Modules/CMakeUserUseFlex.cmake +@@ -39,6 +39,7 @@ IF(FLEX_EXECUTABLE) + OUTPUT "${OUTFILE}" + COMMAND "${FLEX_EXECUTABLE}" + ARGS "-P${PREFIX}" ++ "${FLEX_TARGET_ARG_COMPILE_FLAGS}" + "-o${OUTFILE}" + "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}" + DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}") diff --git a/meta-openembedded/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb b/meta-openembedded/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb index c7c329a5d4..cf50a92afb 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb @@ -7,7 +7,7 @@ Accounting needs." HOMEPAGE = "http://www.freediameter.net" -DEPENDS = "flex bison cmake-native libgcrypt gnutls libidn2 lksctp-tools virtual/kernel bison-native" +DEPENDS = "flex-native bison-native cmake-native libgcrypt gnutls libidn2 lksctp-tools virtual/kernel bison-native" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -23,6 +23,7 @@ SRC_URI = "git://github.com/freeDiameter/freeDiameter;protocol=https;branch=mast file://freeDiameter.conf \ file://install_test.patch \ file://0001-tests-use-EXTENSIONS_DIR.patch \ + file://0001-bison-flex-Add-flags-for-carrying-user-specified-par.patch \ " S = "${WORKDIR}/git" @@ -49,6 +50,8 @@ EXTRA_OECMAKE = " \ -DEXTENSIONS_DIR:PATH=${libdir}/${fd_pkgname} \ -DINSTALL_TEST_SUFFIX:PATH=${PTEST_PATH}-tests \ -DCMAKE_SKIP_RPATH:BOOL=ON \ + -DFLEX_TARGET_ARG_COMPILE_FLAGS='--noline' \ + -DBISON_TARGET_ARG_COMPILE_FLAGS='--no-lines' \ " # INSTALL_LIBRARY_SUFFIX is relative to CMAKE_INSTALL_PREFIX # specify it on cmd line will fix the SET bug in CMakeList.txt @@ -107,15 +110,13 @@ EOF # create self cert openssl req -x509 -config ${STAGING_DIR_NATIVE}/etc/ssl/openssl.cnf -newkey rsa:4096 -sha256 -nodes -out ${D}${sysconfdir}/freeDiameter/${FD_PEM} -keyout ${D}${sysconfdir}/freeDiameter/${FD_KEY} -days 3650 -subj '/CN=${FD_HOSTNAME}.${FD_REALM}' openssl dhparam -out ${D}${sysconfdir}/freeDiameter/${FD_DH_PEM} 1024 - - find ${B} \( -name "*.c" -o -name "*.h" \) -exec sed -i -e 's#${UNPACKDIR}##g' {} \; } do_install_ptest() { mv ${D}${PTEST_PATH}-tests/* ${D}${PTEST_PATH}/ rmdir ${D}${PTEST_PATH}-tests install -m 0644 ${B}/tests/CTestTestfile.cmake ${D}${PTEST_PATH}/ - sed -i -e 's#${UNPACKDIR}##g' ${D}${PTEST_PATH}/CTestTestfile.cmake + sed -i -e 's#${WORKDIR}##g' ${D}${PTEST_PATH}/CTestTestfile.cmake sed -i "/^set_tests_properties/d" ${D}${PTEST_PATH}/CTestTestfile.cmake } diff --git a/meta-openembedded/meta-networking/recipes-protocols/frr/frr/0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch b/meta-openembedded/meta-networking/recipes-protocols/frr/frr/0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch deleted file mode 100644 index 8c83d5c8eb..0000000000 --- a/meta-openembedded/meta-networking/recipes-protocols/frr/frr/0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 49aeccbec4bf620bb594999bbd4a9de669a3984c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 15 Mar 2024 14:34:06 -0700 -Subject: [PATCH] zebra: Mimic GNU basename() API for non-glibc library e.g. - musl musl only provides POSIX version of basename and it has also removed - providing it via string.h header [1] which now results in compile errors with - newer compilers e.g. clang-18 - -[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 - -Upstream-Status: Submitted [https://github.com/FRRouting/frr/pull/15561/] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - zebra/zebra_netns_notify.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/zebra/zebra_netns_notify.c b/zebra/zebra_netns_notify.c -index 1bb1292e34..d55df2f62d 100644 ---- a/zebra/zebra_netns_notify.c -+++ b/zebra/zebra_netns_notify.c -@@ -41,6 +41,10 @@ - #define ZEBRA_NS_POLLING_INTERVAL_MSEC 1000 - #define ZEBRA_NS_POLLING_MAX_RETRIES 200 - -+#if !defined(__GLIBC__) -+#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) -+#endif -+ - DEFINE_MTYPE_STATIC(ZEBRA, NETNS_MISC, "ZebraNetNSInfo"); - static struct event *zebra_netns_notify_current; - --- -2.44.0 - diff --git a/meta-openembedded/meta-networking/recipes-protocols/frr/frr_10.0.bb b/meta-openembedded/meta-networking/recipes-protocols/frr/frr_10.1.1.bb index afd2c95a0e..237b52592b 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/frr/frr_10.0.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/frr/frr_10.1.1.bb @@ -10,12 +10,11 @@ LIC_FILES_CHKSUM = "file://doc/licenses/GPL-2.0;md5=b234ee4d69f5fce4486a80fdaf4a file://doc/licenses/LGPL-2.1;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/10.0 \ +SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/10.1 \ file://frr.pam \ - file://0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch \ " -SRCREV = "03a143cd49ed1b190cb38f48a31ef4d71fa01a02" +SRCREV = "dbf8dac1cea2b1235746e2d966a8ded9cffd5dc3" UPSTREAM_CHECK_GITTAGREGEX = "frr-(?P<pver>\d+(\.\d+)+)$" diff --git a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_2200.120.24.bb b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_2200.140.11.bb index 9aeda92a4b..e6ea707197 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_2200.120.24.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_2200.140.11.bb @@ -25,7 +25,7 @@ SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https file://0001-Handle-interface-without-ifa_addr.patch \ file://0001-Fix-SIGSEGV-during-DumpStateLog.patch \ " -SRCREV = "51a7148a21362285f8013648c4bfa91247ff598a" +SRCREV = "12e84b9089e577e0c0a9f48c4b922d7349fcc5a4" # We install a stub Makefile in the top directory so that the various checks # in base.bbclass pass their tests for a Makefile, this ensures (that amongst diff --git a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.4.bb b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.4.bb index 75b3d9e8c6..989ec54132 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.4.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.4.bb @@ -73,6 +73,7 @@ CACHED_CONFIGUREVARS = " \ lt_cv_shlibpath_overrides_runpath=yes \ ac_cv_path_UNAMEPROG=${base_bindir}/uname \ ac_cv_path_PSPROG=${base_bindir}/ps \ + ac_cv_ps_flags="-e" \ ac_cv_file__etc_printcap=no \ NETSNMP_CONFIGURE_OPTIONS= \ " diff --git a/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow_git.bb b/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow_git.bb index aad044a043..0061565f90 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow_git.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow_git.bb @@ -67,3 +67,8 @@ do_install:append() { } FILES:${PN} += "${nonarch_libdir}/tmpfiles.d" + +# http://errors.yoctoproject.org/Errors/Details/766898/ +# lib/flow.c:213:48: error: initialization of 'const struct arp_eth_header *' from incompatible pointer type 'struct arp_header *' [-Wincompatible-pointer-types] +# lib/backtrace.c:126:32: error: passing argument 1 of 'backtrace' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb b/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb index 4c18c6aff9..3769d5cab0 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb @@ -25,3 +25,4 @@ PACKAGECONFIG[inet6] = "--enable-inet6,--disable-inet6," EXTRA_OECONF += "--disable-debug" CVE_VERSION = "0.9.5.0" +CVE_STATUS[CVE-2019-20503] = "cpe-incorrect: The current version (0.9.5.0) is not affected by the CVE which affects versions at least earlier than 0.9.4.0" diff --git a/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Update-to-C-17-560.patch b/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Update-to-C-17-560.patch new file mode 100644 index 0000000000..c69a395f10 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Update-to-C-17-560.patch @@ -0,0 +1,969 @@ +From 7acb528db20c08d90f72fa317b8e1ccf4d270cdc Mon Sep 17 00:00:00 2001 +From: Matthew Russell <matthew.g.russell@gmail.com> +Date: Wed, 10 Apr 2024 06:23:27 -0400 +Subject: [PATCH 1/2] Update to C++17 (#560) + +* Upgrading to C++17 + +* Code Quality: Address compiler warnings + +- Fixing narrowing issues +- Removing useless copies +- Removing unused lines +- unused-lambda-capture +- Removes unused variables +- Fix some casts (modernize c-style, or simply remove useless casts) +- Explicitly deleting unused endpoint_impl copy and move constructors +- Removing redundant std::bind +- Improving const correctness +- Moving thread init to constructor body +- Moved check_routing_credentials_ inside vsomeip security section where it's used +- Using =default destructor instead of empty destructor + +Thread init: +Moving the initialization of these threads into the constructor body to +ensure that they do not start with an incomplete "this". As they +capture this, it is possible that if the new thread begins before the +object is fully constructed, the new thread might operate on +uninitialized members of "this". + +* Attempting to fix syntax error on MSVC + +* Adjusting PR to conform to Covesa style + +* Using curly brace initialization + +* Using static_cast to narrow its_device.size() to a socklen_t + +* Avoided double integer promotion + +Upstream-Status: Backport [https://github.com/COVESA/vsomeip/pull/560] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Android.bp | 2 +- + CMakeLists.txt | 11 ++- + examples/hello_world/hello_world_service.hpp | 12 +-- + .../configuration/include/internal.hpp.in | 6 +- + .../include/internal_android.hpp | 10 +-- + .../configuration/src/configuration_impl.cpp | 13 ++-- + .../endpoints/include/endpoint_impl.hpp | 3 + + .../local_server_endpoint_impl_receive_op.hpp | 4 +- + .../local_uds_client_endpoint_impl.hpp | 2 +- + .../local_uds_server_endpoint_impl.hpp | 2 +- + .../udp_server_endpoint_impl_receive_op.hpp | 2 +- + .../endpoints/src/endpoint_manager_base.cpp | 2 +- + .../src/local_uds_client_endpoint_impl.cpp | 5 -- + .../src/local_uds_server_endpoint_impl.cpp | 6 -- + .../src/tcp_client_endpoint_impl.cpp | 2 +- + .../src/tcp_server_endpoint_impl.cpp | 14 ++-- + .../src/udp_client_endpoint_impl.cpp | 2 +- + .../src/udp_server_endpoint_impl.cpp | 4 +- + .../message/include/message_base_impl.hpp | 2 - + implementation/message/src/deserializer.cpp | 4 +- + .../plugin/src/plugin_manager_impl.cpp | 2 +- + .../routing/src/routing_manager_base.cpp | 10 +-- + .../runtime/include/application_impl.hpp | 4 +- + .../runtime/src/application_impl.cpp | 7 +- + implementation/security/src/policy.cpp | 4 +- + implementation/security/src/security.cpp | 1 + + .../src/service_discovery_impl.cpp | 34 +++++---- + interface/vsomeip/constants.hpp | 74 +++++++++---------- + .../application_tests/application_test.cpp | 1 + + tools/vsomeip_ctrl.cpp | 9 ++- + 30 files changed, 129 insertions(+), 125 deletions(-) + +diff --git a/Android.bp b/Android.bp +index c6caa4de..f314f22b 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -30,9 +30,9 @@ libvsomeip_sd_srcs = [ + + cc_defaults { + name: "vsomeip_defaults", ++ cpp_std: "c++17", + + cppflags: [ +- "-std=c++14", + "-fexceptions", + "-Wno-non-virtual-dtor", + "-Wno-unused-const-variable", +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ab399a69..3d947055 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -64,6 +64,8 @@ if(NOT CMAKE_BUILD_TYPE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo") + endif() + ++set(CMAKE_CXX_STANDARD 17) ++ + # OS + if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") + set(DL_LIBRARY "dl") +@@ -248,13 +250,13 @@ if (MSVC) + # add_definitions(-DVSOMEIP_DLL_COMPILATION) now it is controlled per target + SET(BOOST_WINDOWS_VERSION "0x600" CACHE STRING "Set the same Version as the Version with which Boost was built, otherwise there will be errors. (normaly 0x600 is for Windows 7 and 0x501 is for Windows XP)") + # Disable warning C4250 since it warns that the compiler is correctly following the C++ Standard. It's a "We-Are-Doing-Things-By-The-Book" notice, not a real warning. +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS -D_WIN32_WINNT=${BOOST_WINDOWS_VERSION} -DWIN32 -DBOOST_ASIO_DISABLE_IOCP /EHsc /std:c++14 /wd4250") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS -D_WIN32_WINNT=${BOOST_WINDOWS_VERSION} -DWIN32 -DBOOST_ASIO_DISABLE_IOCP /EHsc /wd4250") + set(USE_RT "") + link_directories(${Boost_LIBRARY_DIR_DEBUG}) + elseif(${CMAKE_SYSTEM_NAME} MATCHES "QNX") + set(USE_RT "") + else() +- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OS_CXX_FLAGS} -g ${OPTIMIZE} -std=c++14 ${NO_DEPRECATED} ${EXPORTSYMBOLS}") ++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OS_CXX_FLAGS} -g ${OPTIMIZE} ${NO_DEPRECATED} ${EXPORTSYMBOLS}") + set(USE_RT "rt") + endif() + +@@ -268,6 +270,7 @@ list(SORT ${VSOMEIP_NAME}-cfg_SRC) + if (VSOMEIP_ENABLE_MULTIPLE_ROUTING_MANAGERS EQUAL 0) + add_library(${VSOMEIP_NAME}-cfg SHARED ${${VSOMEIP_NAME}-cfg_SRC}) + set_target_properties (${VSOMEIP_NAME}-cfg PROPERTIES VERSION ${VSOMEIP_VERSION} SOVERSION ${VSOMEIP_MAJOR_VERSION}) ++ target_compile_features(${VSOMEIP_NAME}-cfg PRIVATE cxx_std_17) + if (MSVC) + set_target_properties(${VSOMEIP_NAME}-cfg PROPERTIES COMPILE_DEFINITIONS "VSOMEIP_DLL_COMPILATION_PLUGIN") + endif() +@@ -302,6 +305,7 @@ list(SORT ${VSOMEIP_NAME}_SRC) + + add_library(${VSOMEIP_NAME} SHARED ${${VSOMEIP_NAME}_SRC}) + set_target_properties (${VSOMEIP_NAME} PROPERTIES VERSION ${VSOMEIP_VERSION} SOVERSION ${VSOMEIP_MAJOR_VERSION}) ++target_compile_features(${VSOMEIP_NAME} PRIVATE cxx_std_17) + if (MSVC) + set_target_properties(${VSOMEIP_NAME} PROPERTIES COMPILE_DEFINITIONS "VSOMEIP_DLL_COMPILATION") + else () +@@ -331,6 +335,7 @@ file(GLOB ${VSOMEIP_NAME}-sd_SRC + list(SORT ${VSOMEIP_NAME}-sd_SRC) + + add_library(${VSOMEIP_NAME}-sd SHARED ${${VSOMEIP_NAME}-sd_SRC}) ++target_compile_features(${VSOMEIP_NAME}-sd PRIVATE cxx_std_17) + set_target_properties (${VSOMEIP_NAME}-sd PROPERTIES VERSION ${VSOMEIP_VERSION} SOVERSION ${VSOMEIP_MAJOR_VERSION}) + if (MSVC) + set_target_properties(${VSOMEIP_NAME}-sd PROPERTIES COMPILE_DEFINITIONS "VSOMEIP_DLL_COMPILATION_PLUGIN") +@@ -348,6 +353,7 @@ file(GLOB_RECURSE ${VSOMEIP_NAME}-e2e_SRC + list(SORT ${VSOMEIP_NAME}-e2e_SRC) + + add_library(${VSOMEIP_NAME}-e2e SHARED ${${VSOMEIP_NAME}-e2e_SRC}) ++target_compile_features(${VSOMEIP_NAME}-e2e PRIVATE cxx_std_17) + set_target_properties (${VSOMEIP_NAME}-e2e PROPERTIES VERSION ${VSOMEIP_VERSION} SOVERSION ${VSOMEIP_MAJOR_VERSION}) + if (MSVC) + set_target_properties(${VSOMEIP_NAME}-e2e PROPERTIES COMPILE_DEFINITIONS "VSOMEIP_DLL_COMPILATION_PLUGIN") +@@ -375,6 +381,7 @@ file(GLOB_RECURSE ${VSOMEIP_COMPAT_NAME}_SRC + list(SORT ${VSOMEIP_COMPAT_NAME}_SRC) + + add_library(${VSOMEIP_COMPAT_NAME} SHARED ${${VSOMEIP_COMPAT_NAME}_SRC}) ++target_compile_features(${VSOMEIP_COMPAT_NAME} PRIVATE cxx_std_17) + set_target_properties (${VSOMEIP_COMPAT_NAME} PROPERTIES VERSION ${VSOMEIP_COMPAT_VERSION} SOVERSION ${VSOMEIP_COMPAT_MAJOR_VERSION}) + if (MSVC) + set_target_properties(${VSOMEIP_COMPAT_NAME} PROPERTIES COMPILE_DEFINITIONS "VSOMEIP_DLL_COMPILATION_PLUGIN") +diff --git a/examples/hello_world/hello_world_service.hpp b/examples/hello_world/hello_world_service.hpp +index 7ac3b1e7..b04cacea 100644 +--- a/examples/hello_world/hello_world_service.hpp ++++ b/examples/hello_world/hello_world_service.hpp +@@ -11,12 +11,12 @@ + #if defined ANDROID || defined __ANDROID__ + #include "android/log.h" + #define LOG_TAG "hello_world_service" +-#define LOG_INF(...) fprintf(stdout, __VA_ARGS__), fprintf(stdout, "\n"), (void)__android_log_print(ANDROID_LOG_INFO, LOG_TAG, ##__VA_ARGS__) +-#define LOG_ERR(...) fprintf(stderr, __VA_ARGS__), fprintf(stderr, "\n"), (void)__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, ##__VA_ARGS__) ++#define LOG_INF(...) std::fprintf(stdout, __VA_ARGS__), std::fprintf(stdout, "\n"), (void)__android_log_print(ANDROID_LOG_INFO, LOG_TAG, ##__VA_ARGS__) ++#define LOG_ERR(...) std::fprintf(stderr, __VA_ARGS__), std::fprintf(stderr, "\n"), (void)__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, ##__VA_ARGS__) + #else + #include <cstdio> +-#define LOG_INF(...) fprintf(stdout, __VA_ARGS__), fprintf(stdout, "\n") +-#define LOG_ERR(...) fprintf(stderr, __VA_ARGS__), fprintf(stderr, "\n") ++#define LOG_INF(...) std::fprintf(stdout, __VA_ARGS__), std::fprintf(stdout, "\n") ++#define LOG_ERR(...) std::fprintf(stderr, __VA_ARGS__), std::fprintf(stderr, "\n") + #endif + + static vsomeip::service_t service_id = 0x1111; +@@ -32,9 +32,9 @@ public: + hello_world_service() : + rtm_(vsomeip::runtime::get()), + app_(rtm_->create_application()), +- stop_(false), +- stop_thread_(std::bind(&hello_world_service::stop, this)) ++ stop_(false) + { ++ stop_thread_ = std::thread{&hello_world_service::stop, this}; + } + + ~hello_world_service() +diff --git a/implementation/configuration/include/internal.hpp.in b/implementation/configuration/include/internal.hpp.in +index 72c8d503..eff4efad 100644 +--- a/implementation/configuration/include/internal.hpp.in ++++ b/implementation/configuration/include/internal.hpp.in +@@ -141,14 +141,14 @@ typedef enum { + IS_SUBSCRIBING + } subscription_state_e; + +-const std::uint32_t MESSAGE_SIZE_UNLIMITED = (std::numeric_limits<std::uint32_t>::max)(); ++inline constexpr std::uint32_t MESSAGE_SIZE_UNLIMITED = (std::numeric_limits<std::uint32_t>::max)(); + +-const std::uint32_t QUEUE_SIZE_UNLIMITED = (std::numeric_limits<std::uint32_t>::max)(); ++inline constexpr std::uint32_t QUEUE_SIZE_UNLIMITED = (std::numeric_limits<std::uint32_t>::max)(); + + #define VSOMEIP_DEFAULT_NPDU_DEBOUNCING_NANO 2 * 1000 * 1000 + #define VSOMEIP_DEFAULT_NPDU_MAXIMUM_RETENTION_NANO 5 * 1000 * 1000 + +-const std::uint32_t MAX_RECONNECTS_UNLIMITED = (std::numeric_limits<std::uint32_t>::max)(); ++inline constexpr std::uint32_t MAX_RECONNECTS_UNLIMITED = (std::numeric_limits<std::uint32_t>::max)(); + + const std::uint32_t ANY_UID = 0xFFFFFFFF; + const std::uint32_t ANY_GID = 0xFFFFFFFF; +diff --git a/implementation/configuration/include/internal_android.hpp b/implementation/configuration/include/internal_android.hpp +index f5425722..8757a85a 100644 +--- a/implementation/configuration/include/internal_android.hpp ++++ b/implementation/configuration/include/internal_android.hpp +@@ -128,17 +128,17 @@ typedef enum { + IS_SUBSCRIBING + } subscription_state_e; + +-const std::uint32_t MESSAGE_SIZE_UNLIMITED = std::numeric_limits<std::uint32_t>::max(); ++inline constexpr std::uint32_t MESSAGE_SIZE_UNLIMITED = std::numeric_limits<std::uint32_t>::max(); + +-const std::uint32_t QUEUE_SIZE_UNLIMITED = std::numeric_limits<std::uint32_t>::max(); ++inline constexpr std::uint32_t QUEUE_SIZE_UNLIMITED = std::numeric_limits<std::uint32_t>::max(); + + #define VSOMEIP_DEFAULT_NPDU_DEBOUNCING_NANO 2 * 1000 * 1000 + #define VSOMEIP_DEFAULT_NPDU_MAXIMUM_RETENTION_NANO 5 * 1000 * 1000 + +-const std::uint32_t MAX_RECONNECTS_UNLIMITED = std::numeric_limits<std::uint32_t>::max(); ++inline constexpr std::uint32_t MAX_RECONNECTS_UNLIMITED = std::numeric_limits<std::uint32_t>::max(); + +-const std::uint32_t ANY_UID = 0xFFFFFFFF; +-const std::uint32_t ANY_GID = 0xFFFFFFFF; ++inline constexpr std::uint32_t ANY_UID = 0xFFFFFFFF; ++inline constexpr std::uint32_t ANY_GID = 0xFFFFFFFF; + + enum class port_type_e { + PT_OPTIONAL, +diff --git a/implementation/configuration/src/configuration_impl.cpp b/implementation/configuration/src/configuration_impl.cpp +index ca1bd1dc..380b2906 100644 +--- a/implementation/configuration/src/configuration_impl.cpp ++++ b/implementation/configuration/src/configuration_impl.cpp +@@ -333,7 +333,7 @@ bool configuration_impl::load(const std::string &_name) { + + // Tell, if reading of configuration file(s) failed. + // (This may file if the logger configuration is incomplete/missing). +- for (auto f : its_failed) ++ for (const auto& f : its_failed) + VSOMEIP_WARNING << "Reading of configuration file \"" + << f << "\" failed. Configuration may be incomplete."; + +@@ -342,7 +342,7 @@ bool configuration_impl::load(const std::string &_name) { + + std::chrono::steady_clock::time_point end = std::chrono::steady_clock::now(); + +- for (auto i : its_input) { ++ for (const auto& i : its_input) { + if (utility::is_file(i)) + VSOMEIP_INFO << "Using configuration file: \"" << i << "\"."; + +@@ -561,7 +561,7 @@ bool configuration_impl::load_data(const std::vector<configuration_element> &_el + + if (is_logging_loaded_) { + logger::logger_impl::init(shared_from_this()); +- for (auto w : its_warnings) ++ for (const auto& w : its_warnings) + VSOMEIP_WARNING << w; + } + } +@@ -3255,7 +3255,7 @@ void configuration_impl::trim(std::string &_s) { + std::find_if( + _s.begin(), + _s.end(), +- [](unsigned char ch) { return !std::isspace(ch); } ++ [](const auto ch) { return !std::isspace(ch); } + ) + ); + +@@ -3263,8 +3263,9 @@ void configuration_impl::trim(std::string &_s) { + std::find_if( + _s.rbegin(), + _s.rend(), +- [](unsigned char ch) { return !std::isspace(ch); }).base(), +- _s.end() ++ [](const auto ch) { return !std::isspace(ch); } ++ ).base(), ++ _s.end() + ); + } + +diff --git a/implementation/endpoints/include/endpoint_impl.hpp b/implementation/endpoints/include/endpoint_impl.hpp +index 9d2b303c..685eba4e 100644 +--- a/implementation/endpoints/include/endpoint_impl.hpp ++++ b/implementation/endpoints/include/endpoint_impl.hpp +@@ -34,6 +34,9 @@ public: + std::uint32_t _max_message_size, + configuration::endpoint_queue_limit_t _queue_limit, + const std::shared_ptr<configuration>& _configuration); ++ endpoint_impl(endpoint_impl<Protocol> const&) = delete; ++ endpoint_impl(endpoint_impl<Protocol> const&&) = delete; ++ + virtual ~endpoint_impl(); + + void enable_magic_cookies(); +diff --git a/implementation/endpoints/include/local_server_endpoint_impl_receive_op.hpp b/implementation/endpoints/include/local_server_endpoint_impl_receive_op.hpp +index 53f4769a..b1d8991d 100644 +--- a/implementation/endpoints/include/local_server_endpoint_impl_receive_op.hpp ++++ b/implementation/endpoints/include/local_server_endpoint_impl_receive_op.hpp +@@ -25,8 +25,8 @@ struct storage : + { + socket_type_t &socket_; + receive_handler_t handler_; +- byte_t *buffer_; +- std::size_t length_; ++ byte_t *buffer_ = nullptr; ++ size_t length_; + uid_t uid_; + gid_t gid_; + size_t bytes_; +diff --git a/implementation/endpoints/include/local_uds_client_endpoint_impl.hpp b/implementation/endpoints/include/local_uds_client_endpoint_impl.hpp +index d7eede3f..e1e1aaa2 100644 +--- a/implementation/endpoints/include/local_uds_client_endpoint_impl.hpp ++++ b/implementation/endpoints/include/local_uds_client_endpoint_impl.hpp +@@ -25,7 +25,7 @@ public: + const endpoint_type& _remote, + boost::asio::io_context &_io, + const std::shared_ptr<configuration>& _configuration); +- virtual ~local_uds_client_endpoint_impl(); ++ virtual ~local_uds_client_endpoint_impl() = default; + + void start(); + void stop(); +diff --git a/implementation/endpoints/include/local_uds_server_endpoint_impl.hpp b/implementation/endpoints/include/local_uds_server_endpoint_impl.hpp +index 1e78822d..a4ed2eb5 100644 +--- a/implementation/endpoints/include/local_uds_server_endpoint_impl.hpp ++++ b/implementation/endpoints/include/local_uds_server_endpoint_impl.hpp +@@ -50,7 +50,7 @@ public: + const std::shared_ptr<configuration>& _configuration, + bool _is_routing_endpoint); + +- virtual ~local_uds_server_endpoint_impl(); ++ virtual ~local_uds_server_endpoint_impl() = default; + + void start(); + void stop(); +diff --git a/implementation/endpoints/include/udp_server_endpoint_impl_receive_op.hpp b/implementation/endpoints/include/udp_server_endpoint_impl_receive_op.hpp +index 1e4f0fe0..35638cd7 100644 +--- a/implementation/endpoints/include/udp_server_endpoint_impl_receive_op.hpp ++++ b/implementation/endpoints/include/udp_server_endpoint_impl_receive_op.hpp +@@ -35,7 +35,7 @@ struct storage : + socket_type_t &socket_; + endpoint_type_t &sender_; + receive_handler_t handler_; +- byte_t *buffer_; ++ byte_t *buffer_ = nullptr; + size_t length_; + std::uint8_t multicast_id_; + bool is_v4_; +diff --git a/implementation/endpoints/src/endpoint_manager_base.cpp b/implementation/endpoints/src/endpoint_manager_base.cpp +index 9dff9785..4e484454 100644 +--- a/implementation/endpoints/src/endpoint_manager_base.cpp ++++ b/implementation/endpoints/src/endpoint_manager_base.cpp +@@ -38,7 +38,7 @@ std::shared_ptr<endpoint> endpoint_manager_base::create_local(client_t _client) + return create_local_unlocked(_client); + } + +-void endpoint_manager_base::remove_local(client_t _client) { ++void endpoint_manager_base::remove_local(const client_t _client) { + std::shared_ptr<endpoint> its_endpoint(find_local(_client)); + if (its_endpoint) { + its_endpoint->register_error_handler(nullptr); +diff --git a/implementation/endpoints/src/local_uds_client_endpoint_impl.cpp b/implementation/endpoints/src/local_uds_client_endpoint_impl.cpp +index 0b7e261c..56c621db 100644 +--- a/implementation/endpoints/src/local_uds_client_endpoint_impl.cpp ++++ b/implementation/endpoints/src/local_uds_client_endpoint_impl.cpp +@@ -40,12 +40,7 @@ local_uds_client_endpoint_impl::local_uds_client_endpoint_impl( + is_supporting_magic_cookies_ = false; + } + +-local_uds_client_endpoint_impl::~local_uds_client_endpoint_impl() { +- +-} +- + bool local_uds_client_endpoint_impl::is_local() const { +- + return true; + } + +diff --git a/implementation/endpoints/src/local_uds_server_endpoint_impl.cpp b/implementation/endpoints/src/local_uds_server_endpoint_impl.cpp +index 948fe925..33876c56 100644 +--- a/implementation/endpoints/src/local_uds_server_endpoint_impl.cpp ++++ b/implementation/endpoints/src/local_uds_server_endpoint_impl.cpp +@@ -104,17 +104,11 @@ local_uds_server_endpoint_impl::local_uds_server_endpoint_impl( + #endif + } + +-local_uds_server_endpoint_impl::~local_uds_server_endpoint_impl() { +- +-} +- + bool local_uds_server_endpoint_impl::is_local() const { +- + return true; + } + + void local_uds_server_endpoint_impl::start() { +- + std::lock_guard<std::mutex> its_lock(acceptor_mutex_); + if (acceptor_.is_open()) { + connection::ptr new_connection = connection::create( +diff --git a/implementation/endpoints/src/tcp_client_endpoint_impl.cpp b/implementation/endpoints/src/tcp_client_endpoint_impl.cpp +index f42d93d4..e6755157 100644 +--- a/implementation/endpoints/src/tcp_client_endpoint_impl.cpp ++++ b/implementation/endpoints/src/tcp_client_endpoint_impl.cpp +@@ -178,7 +178,7 @@ void tcp_client_endpoint_impl::connect() { + std::string its_device(configuration_->get_device()); + if (its_device != "") { + if (setsockopt(socket_->native_handle(), +- SOL_SOCKET, SO_BINDTODEVICE, its_device.c_str(), (socklen_t)its_device.size()) == -1) { ++ SOL_SOCKET, SO_BINDTODEVICE, its_device.c_str(), static_cast<socklen_t>(its_device.size())) == -1) { + VSOMEIP_WARNING << "TCP Client: Could not bind to device \"" << its_device << "\""; + } + } +diff --git a/implementation/endpoints/src/tcp_server_endpoint_impl.cpp b/implementation/endpoints/src/tcp_server_endpoint_impl.cpp +index f83252ae..5aef72be 100644 +--- a/implementation/endpoints/src/tcp_server_endpoint_impl.cpp ++++ b/implementation/endpoints/src/tcp_server_endpoint_impl.cpp +@@ -55,7 +55,7 @@ tcp_server_endpoint_impl::tcp_server_endpoint_impl( + std::string its_device(configuration_->get_device()); + if (its_device != "") { + if (setsockopt(acceptor_.native_handle(), +- SOL_SOCKET, SO_BINDTODEVICE, its_device.c_str(), (socklen_t)its_device.size()) == -1) { ++ SOL_SOCKET, SO_BINDTODEVICE, its_device.c_str(), static_cast<socklen_t>(its_device.size())) == -1) { + VSOMEIP_WARNING << "TCP Server: Could not bind to device \"" << its_device << "\""; + } + } +@@ -295,8 +295,8 @@ void tcp_server_endpoint_impl::accept_cbk(const connection::ptr& _connection, + auto its_ep = std::dynamic_pointer_cast<tcp_server_endpoint_impl>( + shared_from_this()); + its_timer->async_wait([its_timer, its_ep] +- (const boost::system::error_code& _error) { +- if (!_error) { ++ (const boost::system::error_code& _error_inner) { ++ if (!_error_inner) { + its_ep->start(); + } + }); +@@ -853,12 +853,12 @@ void tcp_server_endpoint_impl::connection::handle_recv_buffer_exception( + << std::setfill('0') << std::hex; + + for (std::size_t i = 0; i < recv_buffer_size_ && i < 16; i++) { +- its_message << std::setw(2) << (int) (recv_buffer_[i]) << " "; ++ its_message << std::setw(2) << static_cast<int>(recv_buffer_[i]) << " "; + } + + its_message << " Last 16 Bytes captured: "; + for (int i = 15; recv_buffer_size_ > 15 && i >= 0; i--) { +- its_message << std::setw(2) << (int) (recv_buffer_[static_cast<size_t>(i)]) << " "; ++ its_message << std::setw(2) << static_cast<int>(recv_buffer_[static_cast<size_t>(i)]) << " "; + } + VSOMEIP_ERROR << its_message.str(); + recv_buffer_.clear(); +@@ -954,7 +954,7 @@ void tcp_server_endpoint_impl::print_status() { + std::lock_guard<std::mutex> its_lock(mutex_); + connections_t its_connections; + { +- std::lock_guard<std::mutex> its_lock(connections_mutex_); ++ std::lock_guard<std::mutex> its_lock_inner(connections_mutex_); + its_connections = connections_; + } + +@@ -1027,7 +1027,7 @@ void tcp_server_endpoint_impl::connection::wait_until_sent(const boost::system:: + } + } + { +- std::lock_guard<std::mutex> its_lock(its_server->connections_mutex_); ++ std::lock_guard<std::mutex> its_lock_inner(its_server->connections_mutex_); + stop(); + } + its_server->remove_connection(this); +diff --git a/implementation/endpoints/src/udp_client_endpoint_impl.cpp b/implementation/endpoints/src/udp_client_endpoint_impl.cpp +index d6952228..f52b2354 100644 +--- a/implementation/endpoints/src/udp_client_endpoint_impl.cpp ++++ b/implementation/endpoints/src/udp_client_endpoint_impl.cpp +@@ -67,7 +67,7 @@ void udp_client_endpoint_impl::connect() { + << get_address_port_remote(); + } + socket_->set_option(boost::asio::socket_base::receive_buffer_size( +- udp_receive_buffer_size_), its_error); ++ static_cast<int>(udp_receive_buffer_size_)), its_error); + if (its_error) { + VSOMEIP_WARNING << "udp_client_endpoint_impl::connect: couldn't set " + << "SO_RCVBUF: " << its_error.message() +diff --git a/implementation/endpoints/src/udp_server_endpoint_impl.cpp b/implementation/endpoints/src/udp_server_endpoint_impl.cpp +index 48e35c5d..587fb94c 100644 +--- a/implementation/endpoints/src/udp_server_endpoint_impl.cpp ++++ b/implementation/endpoints/src/udp_server_endpoint_impl.cpp +@@ -72,7 +72,7 @@ udp_server_endpoint_impl::udp_server_endpoint_impl( + std::string its_device(configuration_->get_device()); + if (its_device != "") { + if (setsockopt(unicast_socket_.native_handle(), +- SOL_SOCKET, SO_BINDTODEVICE, its_device.c_str(), (socklen_t)its_device.size()) == -1) { ++ SOL_SOCKET, SO_BINDTODEVICE, its_device.c_str(), static_cast<socklen_t>(its_device.size())) == -1) { + VSOMEIP_WARNING << "UDP Server: Could not bind to device \"" << its_device << "\""; + } + } +@@ -108,7 +108,7 @@ udp_server_endpoint_impl::udp_server_endpoint_impl( + const int its_udp_recv_buffer_size = + configuration_->get_udp_receive_buffer_size(); + unicast_socket_.set_option(boost::asio::socket_base::receive_buffer_size( +- its_udp_recv_buffer_size), ec); ++ static_cast<int>(its_udp_recv_buffer_size)), ec); + + if (ec) { + VSOMEIP_WARNING << "udp_server_endpoint_impl: couldn't set " +diff --git a/implementation/message/include/message_base_impl.hpp b/implementation/message/include/message_base_impl.hpp +index acad2e89..2c953e98 100644 +--- a/implementation/message/include/message_base_impl.hpp ++++ b/implementation/message/include/message_base_impl.hpp +@@ -6,8 +6,6 @@ + #ifndef VSOMEIP_V3_MESSAGE_BASE_IMPL_HPP + #define VSOMEIP_V3_MESSAGE_BASE_IMPL_HPP + +-#include <boost/thread.hpp> +- + #include <vsomeip/export.hpp> + #include <vsomeip/message.hpp> + +diff --git a/implementation/message/src/deserializer.cpp b/implementation/message/src/deserializer.cpp +index 3c4eddfa..bfa723d3 100644 +--- a/implementation/message/src/deserializer.cpp ++++ b/implementation/message/src/deserializer.cpp +@@ -115,8 +115,8 @@ bool deserializer::deserialize(std::string &_target, std::size_t _length) { + if (_length > remaining_ || _length > _target.capacity()) { + return false; + } +- _target.assign(position_, position_ + long(_length)); +- position_ += long(_length); ++ _target.assign(position_, position_ + static_cast<std::vector<byte_t>::difference_type>(_length)); ++ position_ += static_cast<std::vector<byte_t>::difference_type>(_length); + remaining_ -= _length; + + return true; +diff --git a/implementation/plugin/src/plugin_manager_impl.cpp b/implementation/plugin/src/plugin_manager_impl.cpp +index bea96d01..23b7b892 100644 +--- a/implementation/plugin/src/plugin_manager_impl.cpp ++++ b/implementation/plugin/src/plugin_manager_impl.cpp +@@ -164,7 +164,7 @@ bool plugin_manager_impl::unload_plugin(plugin_type_e _type) { + } + } else { + VSOMEIP_ERROR << "plugin_manager_impl::unload_plugin didn't find plugin" +- << " type:" << (int)_type; ++ << " type:" << static_cast<int>(_type); + return false; + } + return plugins_.erase(_type); +diff --git a/implementation/routing/src/routing_manager_base.cpp b/implementation/routing/src/routing_manager_base.cpp +index dde6b260..047e6566 100644 +--- a/implementation/routing/src/routing_manager_base.cpp ++++ b/implementation/routing/src/routing_manager_base.cpp +@@ -1184,8 +1184,8 @@ void routing_manager_base::remove_local(client_t _client, + std::lock_guard<std::mutex> its_lock(local_services_mutex_); + // Finally remove all services that are implemented by the client. + std::set<std::pair<service_t, instance_t>> its_services; +- for (auto& s : local_services_) { +- for (auto& i : s.second) { ++ for (const auto& s : local_services_) { ++ for (const auto& i : s.second) { + if (std::get<2>(i.second) == _client) { + its_services.insert({ s.first, i.first }); + host_->on_availability(s.first, i.first, availability_state_e::AS_UNAVAILABLE, +@@ -1202,9 +1202,9 @@ void routing_manager_base::remove_local(client_t _client, + + // remove disconnected client from offer service history + std::set<std::tuple<service_t, instance_t, client_t>> its_clients; +- for (auto& s : local_services_history_) { +- for (auto& i : s.second) { +- for (auto& c : i.second) { ++ for (const auto& s : local_services_history_) { ++ for (const auto& i : s.second) { ++ for (const auto& c : i.second) { + if (c == _client) { + its_clients.insert(std::make_tuple(s.first, i.first, c)); + } +diff --git a/implementation/runtime/include/application_impl.hpp b/implementation/runtime/include/application_impl.hpp +index 67187a87..c647b531 100644 +--- a/implementation/runtime/include/application_impl.hpp ++++ b/implementation/runtime/include/application_impl.hpp +@@ -309,7 +309,7 @@ private: + std::shared_ptr<sync_handler> get_next_handler(); + void reschedule_availability_handler(const std::shared_ptr<sync_handler> &_handler); + bool has_active_dispatcher(); +- bool is_active_dispatcher(const std::thread::id &_id); ++ bool is_active_dispatcher(const std::thread::id &_id) const; + void remove_elapsed_dispatchers(); + + void shutdown(); +@@ -436,7 +436,7 @@ private: + // Dispatcher threads that are running + std::set<std::thread::id> running_dispatchers_; + // Mutex to protect access to dispatchers_ & elapsed_dispatchers_ +- std::mutex dispatcher_mutex_; ++ mutable std::mutex dispatcher_mutex_; + + // Condition to wakeup the dispatcher thread + mutable std::condition_variable dispatcher_condition_; +diff --git a/implementation/runtime/src/application_impl.cpp b/implementation/runtime/src/application_impl.cpp +index aba906b7..db880b42 100644 +--- a/implementation/runtime/src/application_impl.cpp ++++ b/implementation/runtime/src/application_impl.cpp +@@ -426,7 +426,8 @@ void application_impl::start() { + std::lock_guard<std::mutex> its_lock(dispatcher_mutex_); + is_dispatching_ = true; + auto its_main_dispatcher = std::make_shared<std::thread>( +- std::bind(&application_impl::main_dispatch, shared_from_this())); ++ &application_impl::main_dispatch, shared_from_this() ++ ); + dispatchers_[its_main_dispatcher->get_id()] = its_main_dispatcher; + } + +@@ -1792,7 +1793,7 @@ void application_impl::main_dispatch() { + } + } else { + std::shared_ptr<sync_handler> its_handler; +- while (is_dispatching_ && is_active_dispatcher(its_id) ++ while (is_dispatching_ && is_active_dispatcher(its_id) + && (its_handler = get_next_handler())) { + its_lock.unlock(); + invoke_handler(its_handler); +@@ -2048,7 +2049,7 @@ bool application_impl::has_active_dispatcher() { + return false; + } + +-bool application_impl::is_active_dispatcher(const std::thread::id &_id) { ++bool application_impl::is_active_dispatcher(const std::thread::id &_id) const { + while (is_dispatching_) { + if (dispatcher_mutex_.try_lock()) { + for (const auto &d : dispatchers_) { +diff --git a/implementation/security/src/policy.cpp b/implementation/security/src/policy.cpp +index 36341223..da0bbd86 100644 +--- a/implementation/security/src/policy.cpp ++++ b/implementation/security/src/policy.cpp +@@ -175,7 +175,7 @@ policy::deserialize_ids(const byte_t * &_data, uint32_t &_size, + if (its_result == false) + return false; + +- for (const auto i : its_instances) ++ for (const auto& i : its_instances) + its_ids += std::make_pair(i, its_methods); + + its_array_length -= (its_current_size - _size); +@@ -379,7 +379,7 @@ policy::serialize_interval_set( + uint32_t its_interval_set_size(0); + serialize_u32(its_interval_set_size, _data); + +- for (const auto i : _intervals) ++ for (const auto& i : _intervals) + serialize_interval(i, _data); + + its_interval_set_size = static_cast<uint32_t>(_data.size() +diff --git a/implementation/security/src/security.cpp b/implementation/security/src/security.cpp +index a3b6ab3f..19ff73da 100644 +--- a/implementation/security/src/security.cpp ++++ b/implementation/security/src/security.cpp +@@ -14,6 +14,7 @@ + #include "../../plugin/include/plugin_manager.hpp" + + #include <array> ++#include <iomanip> + #include <tuple> + + #ifndef _WIN32 +diff --git a/implementation/service_discovery/src/service_discovery_impl.cpp b/implementation/service_discovery/src/service_discovery_impl.cpp +index de6e8467..c3880457 100644 +--- a/implementation/service_discovery/src/service_discovery_impl.cpp ++++ b/implementation/service_discovery/src/service_discovery_impl.cpp +@@ -5,8 +5,10 @@ + + #include <vsomeip/constants.hpp> + +-#include <random> ++#include <chrono> ++#include <iomanip> + #include <forward_list> ++#include <random> + #include <thread> + + #include <vsomeip/internal/logger.hpp> +@@ -869,7 +871,7 @@ service_discovery_impl::create_eventgroup_entry( + << std::setw(4) << _service << "." + << std::setw(4) << _instance << "." + << std::setw(4) << _eventgroup << "] " +- << (uint16_t) _reliability_type; ++ << static_cast<uint16_t>(_reliability_type); + return its_data; + } + std::shared_ptr<eventgroupentry_impl> its_entry, its_other; +@@ -1074,7 +1076,7 @@ service_discovery_impl::insert_subscription_ack( + // Selective + if (_clients.size() > 1 || (*(_clients.begin())) != 0) { + auto its_selective_option = std::make_shared<selective_option_impl>(); +- (void)its_selective_option->set_clients(_clients); ++ static_cast<void>(its_selective_option->set_clients(_clients)); + + its_data.options_.push_back(its_selective_option); + } +@@ -1136,7 +1138,7 @@ service_discovery_impl::on_message( + static bool must_start_last_msg_received_timer(true); + boost::system::error_code ec; + +- std::lock_guard<std::mutex> its_lock(last_msg_received_timer_mutex_); ++ std::lock_guard<std::mutex> its_lock_inner(last_msg_received_timer_mutex_); + if (0 < last_msg_received_timer_.cancel(ec) || must_start_last_msg_received_timer) { + must_start_last_msg_received_timer = false; + last_msg_received_timer_.expires_from_now( +@@ -1272,7 +1274,7 @@ service_discovery_impl::on_message( + } + + { +- std::unique_lock<std::recursive_mutex> its_lock(its_acknowledgement->get_lock()); ++ std::unique_lock<std::recursive_mutex> its_lock_inner(its_acknowledgement->get_lock()); + its_acknowledgement->complete(); + // TODO: Check the following logic... + if (its_acknowledgement->has_subscription()) { +@@ -1543,7 +1545,7 @@ service_discovery_impl::process_offerservice_serviceentry( + << std::setw(4) << _instance << "." + << std::setw(4) << eg << "]" + << " using reliability type: " +- << std::setw(4) << (uint16_t) offer_type; ++ << std::setw(4) << static_cast<uint16_t>(offer_type); + its_info->set_reliability(offer_type); + } + } +@@ -1947,7 +1949,7 @@ service_discovery_impl::process_eventgroupentry( + << ": SOME/IP length field in SubscribeEventGroup message header: [" + << std::dec << _entry->get_owning_message()->get_someip_length() + << "] bytes, is shorter than length of deserialized message: [" +- << (uint32_t) _entry->get_owning_message()->get_length() << "] bytes. " ++ << static_cast<uint32_t>(_entry->get_owning_message()->get_length()) << "] bytes. " + << its_sender.to_string(ec) << " session: " + << std::hex << std::setw(4) << std::setfill('0') << its_session; + return; +@@ -2238,7 +2240,7 @@ service_discovery_impl::process_eventgroupentry( + boost::system::error_code ec; + VSOMEIP_WARNING << __func__ + << ": Unsupported eventgroup option [" +- << std::hex << (int)its_option->get_type() << "] " ++ << std::hex << static_cast<int>(its_option->get_type()) << "] " + << its_sender.to_string(ec) << " session: " + << std::hex << std::setw(4) << std::setfill('0') << its_session; + if (its_ttl > 0) { +@@ -2332,7 +2334,7 @@ service_discovery_impl::handle_eventgroup_subscription( + << std::setw(4) << _instance << "." + << std::setw(4) << _eventgroup << "]" + << " not valid: Event configuration (" +- << (std::uint32_t)_info->get_reliability() ++ << static_cast<std::uint32_t>(_info->get_reliability()) + << ") does not match the provided endpoint options: " + << _first_address.to_string(ec) << ":" << std::dec << _first_port << " " + << _second_address.to_string(ec) << ":" << _second_port; +@@ -2355,14 +2357,14 @@ service_discovery_impl::handle_eventgroup_subscription( + boost::system::error_code ec; + // TODO: Add session id + VSOMEIP_ERROR << __func__ +- << ": Requested major version:[" << (uint32_t) _major ++ << ": Requested major version:[" << static_cast<uint32_t>(_major) + << "] in subscription to service: [" + << std::hex << std::setfill('0') + << std::setw(4) << _service << "." + << std::setw(4) << _instance << "." + << std::setw(4) << _eventgroup << "]" + << " does not match with services major version:[" +- << (uint32_t) _info->get_major() << "] subscriber: " ++ << static_cast<uint32_t>(_info->get_major()) << "] subscriber: " + << _first_address.to_string(ec) << ":" << std::dec << _first_port; + if (_ttl > 0) { + insert_subscription_ack(_acknowledgement, its_info, 0, nullptr, _clients); +@@ -3107,8 +3109,8 @@ service_discovery_impl::move_offers_into_main_phase( + const auto its_timer = repetition_phase_timers_.find(_timer); + if (its_timer != repetition_phase_timers_.end()) { + for (const auto& its_service : its_timer->second) { +- for (const auto& instance : its_service.second) { +- instance.second->set_is_in_mainphase(true); ++ for (const auto& its_instance : its_service.second) { ++ its_instance.second->set_is_in_mainphase(true); + } + } + repetition_phase_timers_.erase(_timer); +@@ -3125,7 +3127,7 @@ service_discovery_impl::stop_offer_service( + bool stop_offer_required(false); + // Delete from initial phase offers + { +- std::lock_guard<std::mutex> its_lock(collected_offers_mutex_); ++ std::lock_guard<std::mutex> its_lock_inner(collected_offers_mutex_); + if (collected_offers_.size()) { + auto its_service_it = collected_offers_.find(its_service); + if (its_service_it != collected_offers_.end()) { +@@ -3147,7 +3149,7 @@ service_discovery_impl::stop_offer_service( + + // Delete from repetition phase offers + { +- std::lock_guard<std::mutex> its_lock(repetition_phase_timers_mutex_); ++ std::lock_guard<std::mutex> its_lock_inner(repetition_phase_timers_mutex_); + for (auto rpt = repetition_phase_timers_.begin(); + rpt != repetition_phase_timers_.end();) { + auto its_service_it = rpt->second.find(its_service); +@@ -3866,7 +3868,7 @@ reliability_type_e service_discovery_impl::get_eventgroup_reliability( + << std::setw(4) << _instance << "." + << std::setw(4) << _eventgroup << "]" + << " using reliability type: " +- << std::setw(4) << (uint16_t) its_reliability; ++ << std::setw(4) << static_cast<uint16_t>(its_reliability); + its_info->set_reliability(its_reliability); + } + } else { +diff --git a/interface/vsomeip/constants.hpp b/interface/vsomeip/constants.hpp +index 2b040c5e..2519b57f 100644 +--- a/interface/vsomeip/constants.hpp ++++ b/interface/vsomeip/constants.hpp +@@ -13,54 +13,54 @@ + + namespace vsomeip_v3 { + +-const major_version_t DEFAULT_MAJOR = 0x00; +-const minor_version_t DEFAULT_MINOR = 0x00000000; +-const ttl_t DEFAULT_TTL = 0xFFFFFF; // "until next reboot" ++inline constexpr major_version_t DEFAULT_MAJOR = 0x00; ++inline constexpr minor_version_t DEFAULT_MINOR = 0x00000000; ++inline constexpr ttl_t DEFAULT_TTL = 0xFFFFFF; // "until next reboot" + + const std::string DEFAULT_MULTICAST = "224.0.0.0"; +-const uint16_t DEFAULT_PORT = 30500; +-const uint16_t ILLEGAL_PORT = 0xFFFF; +-const uint16_t ANY_PORT = 0; +- +-const uint16_t NO_TRACE_FILTER_EXPRESSION = 0x0000; +- +-const service_t ANY_SERVICE = 0xFFFF; +-const instance_t ANY_INSTANCE = 0xFFFF; +-const eventgroup_t ANY_EVENTGROUP = 0xFFFF; +-const method_t ANY_METHOD = 0xFFFF; +-const major_version_t ANY_MAJOR = 0xFF; +-const minor_version_t ANY_MINOR = 0xFFFFFFFF; +- +-const eventgroup_t DEFAULT_EVENTGROUP = 0x0001; +- +-const client_t ILLEGAL_CLIENT = 0x0000; +-const method_t INVALID_METHOD = 0x0000; +- +-const byte_t MAGIC_COOKIE_CLIENT_MESSAGE = 0x00; +-const byte_t MAGIC_COOKIE_SERVICE_MESSAGE = 0x80; +-const length_t MAGIC_COOKIE_SIZE = 0x00000008; +-const request_t MAGIC_COOKIE_REQUEST = 0xDEADBEEF; +-const client_t MAGIC_COOKIE_CLIENT = 0xDEAD; +-const protocol_version_t MAGIC_COOKIE_PROTOCOL_VERSION = 0x01; +-const interface_version_t MAGIC_COOKIE_INTERFACE_VERSION = 0x01; +-const message_type_e MAGIC_COOKIE_CLIENT_MESSAGE_TYPE = ++inline constexpr uint16_t DEFAULT_PORT = 30500; ++inline constexpr uint16_t ILLEGAL_PORT = 0xFFFF; ++inline constexpr uint16_t ANY_PORT = 0; ++ ++inline constexpr uint16_t NO_TRACE_FILTER_EXPRESSION = 0x0000; ++ ++inline constexpr service_t ANY_SERVICE = 0xFFFF; ++inline constexpr instance_t ANY_INSTANCE = 0xFFFF; ++inline constexpr eventgroup_t ANY_EVENTGROUP = 0xFFFF; ++inline constexpr method_t ANY_METHOD = 0xFFFF; ++inline constexpr major_version_t ANY_MAJOR = 0xFF; ++inline constexpr minor_version_t ANY_MINOR = 0xFFFFFFFF; ++ ++inline constexpr eventgroup_t DEFAULT_EVENTGROUP = 0x0001; ++ ++inline constexpr client_t ILLEGAL_CLIENT = 0x0000; ++inline constexpr method_t INVALID_METHOD = 0x0000; ++ ++inline constexpr byte_t MAGIC_COOKIE_CLIENT_MESSAGE = 0x00; ++inline constexpr byte_t MAGIC_COOKIE_SERVICE_MESSAGE = 0x80; ++inline constexpr length_t MAGIC_COOKIE_SIZE = 0x00000008; ++inline constexpr request_t MAGIC_COOKIE_REQUEST = 0xDEADBEEF; ++inline constexpr client_t MAGIC_COOKIE_CLIENT = 0xDEAD; ++inline constexpr protocol_version_t MAGIC_COOKIE_PROTOCOL_VERSION = 0x01; ++inline constexpr interface_version_t MAGIC_COOKIE_INTERFACE_VERSION = 0x01; ++inline constexpr message_type_e MAGIC_COOKIE_CLIENT_MESSAGE_TYPE = + message_type_e::MT_REQUEST_NO_RETURN; +-const message_type_e MAGIC_COOKIE_SERVICE_MESSAGE_TYPE = ++inline constexpr message_type_e MAGIC_COOKIE_SERVICE_MESSAGE_TYPE = + message_type_e::MT_NOTIFICATION; +-const return_code_e MAGIC_COOKIE_RETURN_CODE = return_code_e::E_OK; ++inline constexpr return_code_e MAGIC_COOKIE_RETURN_CODE = return_code_e::E_OK; + +-const byte_t CLIENT_COOKIE[] = { 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, ++inline constexpr byte_t CLIENT_COOKIE[] = { 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, + 0xDE, 0xAD, 0xBE, 0xEF, 0x01, 0x01, 0x01, 0x00 }; + +-const byte_t SERVICE_COOKIE[] = { 0xFF, 0xFF, 0x80, 0x00, 0x00, 0x00, 0x00, ++inline constexpr byte_t SERVICE_COOKIE[] = { 0xFF, 0xFF, 0x80, 0x00, 0x00, 0x00, 0x00, + 0x08, 0xDE, 0xAD, 0xBE, 0xEF, 0x01, 0x01, 0x02, 0x00 }; + +-const event_t ANY_EVENT = 0xFFFF; +-const client_t ANY_CLIENT = 0xFFFF; ++inline constexpr event_t ANY_EVENT = 0xFFFF; ++inline constexpr client_t ANY_CLIENT = 0xFFFF; + +-const int VSOMEIP_ALL = -1; ++inline constexpr int VSOMEIP_ALL = -1; + +-const pending_security_update_id_t DEFAULT_SECURITY_UPDATE_ID = 0x0; ++inline constexpr pending_security_update_id_t DEFAULT_SECURITY_UPDATE_ID = 0x0; + + } // namespace vsomeip_v3 + +diff --git a/test/network_tests/application_tests/application_test.cpp b/test/network_tests/application_tests/application_test.cpp +index a4a1923d..c70b6cd5 100644 +--- a/test/network_tests/application_tests/application_test.cpp ++++ b/test/network_tests/application_tests/application_test.cpp +@@ -3,6 +3,7 @@ + // License, v. 2.0. If a copy of the MPL was not distributed with this + // file, You can obtain one at http://mozilla.org/MPL/2.0/. + ++#include <atomic> + #include <thread> + #include <mutex> + #include <condition_variable> +diff --git a/tools/vsomeip_ctrl.cpp b/tools/vsomeip_ctrl.cpp +index 74510427..3e74a832 100644 +--- a/tools/vsomeip_ctrl.cpp ++++ b/tools/vsomeip_ctrl.cpp +@@ -29,7 +29,6 @@ public: + instance_(_instance), + app_(vsomeip::runtime::get()->create_application("vsomeip_ctrl")), + wait_service_available_(true), +- send_thread_(std::bind(&vsomeip_sender::send, this)), + service_id_(0x0), + method_id_(0x0), + length_(0), +@@ -39,6 +38,8 @@ public: + return_code_(vsomeip::return_code_e::E_UNKNOWN), + wait_for_answer_(true) + { ++ send_thread_ = std::thread{&vsomeip_sender::send, this}; ++ + if (user_message_.size() < VSOMEIP_PAYLOAD_POS) { + VSOMEIP_ERROR << "Provided message is to short, min. length " + "is 16 Bytes, exiting."; +@@ -117,11 +118,11 @@ public: + << std::setw(4) << _response->get_instance() << "]:"; + VSOMEIP_INFO << "########## begin message"; + VSOMEIP_INFO << std::hex << std::setw(4) << std::setfill('0') +- << _response->get_service() ++ << _response->get_service() + << std::hex << std::setw(4) << std::setfill('0') + << _response->get_method() + << " # service id / instance id"; +- VSOMEIP_INFO << std::hex << std::setw(8) << std::setfill('0') ++ VSOMEIP_INFO << std::hex << std::setw(8) << std::setfill('0') + << _response->get_length() << " # length"; + VSOMEIP_INFO << std::hex << std::setw(4) << std::setfill('0') + << _response->get_client() +@@ -243,7 +244,7 @@ private: + } + + if (use_tcp_ && user_message_.size() > VSOMEIP_MAX_TCP_MESSAGE_SIZE) { +- VSOMEIP_WARNING << "Max allowed message size for TCP is " ++ VSOMEIP_WARNING << "Max allowed message size for TCP is " + << std::dec << VSOMEIP_MAX_TCP_MESSAGE_SIZE + << ". Provided message size is: " << user_message_.size(); + } diff --git a/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-network_tests-Include-iomanip-system-header.patch b/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-network_tests-Include-iomanip-system-header.patch new file mode 100644 index 0000000000..b15c8029ec --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-network_tests-Include-iomanip-system-header.patch @@ -0,0 +1,324 @@ +From 9b806483d804ab335f7161fdd6248ae3e7ae3bde Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 9 Aug 2024 13:50:05 -0700 +Subject: [PATCH 2/2] network_tests: Include iomanip system header + +Latest gcc-14/clang-18 needs this header for setfill and setw + +Upstream-Status: Submitted [https://github.com/COVESA/vsomeip/pull/751] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + .../network_tests/big_payload_tests/big_payload_test_service.hpp | 1 + + test/network_tests/cpu_load_tests/cpu_load_test_service.cpp | 1 + + test/network_tests/e2e_tests/e2e_profile_04_test_client.hpp | 1 + + test/network_tests/e2e_tests/e2e_profile_04_test_service.hpp | 1 + + test/network_tests/e2e_tests/e2e_profile_07_test_client.hpp | 1 + + test/network_tests/e2e_tests/e2e_profile_07_test_service.hpp | 1 + + test/network_tests/e2e_tests/e2e_test_client.hpp | 1 + + test/network_tests/e2e_tests/e2e_test_service.hpp | 1 + + test/network_tests/event_tests/event_test_service.cpp | 1 + + .../header_factory_tests/header_factory_test_client.hpp | 1 + + .../header_factory_tests/header_factory_test_service.hpp | 1 + + test/network_tests/npdu_tests/npdu_test_client.hpp | 1 + + test/network_tests/npdu_tests/npdu_test_service.hpp | 1 + + test/network_tests/payload_tests/payload_test_client.hpp | 1 + + test/network_tests/payload_tests/payload_test_service.hpp | 1 + + .../restart_routing_tests/restart_routing_test_client.hpp | 1 + + .../restart_routing_tests/restart_routing_test_service.hpp | 1 + + .../routing_tests/external_local_routing_test_service.hpp | 1 + + test/network_tests/routing_tests/local_routing_test_client.hpp | 1 + + test/network_tests/routing_tests/local_routing_test_service.hpp | 1 + + .../second_address_tests/second_address_test_service.cpp | 1 + + test/network_tests/security_tests/security_test_client.hpp | 1 + + test/network_tests/security_tests/security_test_service.hpp | 1 + + .../suspend_resume_tests/suspend_resume_test_service.cpp | 1 + + 24 files changed, 24 insertions(+) + +diff --git a/test/network_tests/big_payload_tests/big_payload_test_service.hpp b/test/network_tests/big_payload_tests/big_payload_test_service.hpp +index 44af28a9..101b6758 100644 +--- a/test/network_tests/big_payload_tests/big_payload_test_service.hpp ++++ b/test/network_tests/big_payload_tests/big_payload_test_service.hpp +@@ -14,6 +14,7 @@ + #include <condition_variable> + #include <functional> + #include <queue> ++#include <iomanip> + + #include "big_payload_test_globals.hpp" + #include <vsomeip/internal/logger.hpp> +diff --git a/test/network_tests/cpu_load_tests/cpu_load_test_service.cpp b/test/network_tests/cpu_load_tests/cpu_load_test_service.cpp +index 3d935e39..a98f3edf 100644 +--- a/test/network_tests/cpu_load_tests/cpu_load_test_service.cpp ++++ b/test/network_tests/cpu_load_tests/cpu_load_test_service.cpp +@@ -13,6 +13,7 @@ + #include <functional> + #include <numeric> + #include <cmath> // for isfinite ++#include <iomanip> + + #include "cpu_load_test_globals.hpp" + #include <vsomeip/internal/logger.hpp> +diff --git a/test/network_tests/e2e_tests/e2e_profile_04_test_client.hpp b/test/network_tests/e2e_tests/e2e_profile_04_test_client.hpp +index ad002913..82d5e7e2 100644 +--- a/test/network_tests/e2e_tests/e2e_profile_04_test_client.hpp ++++ b/test/network_tests/e2e_tests/e2e_profile_04_test_client.hpp +@@ -14,6 +14,7 @@ + #include <mutex> + #include <condition_variable> + #include <atomic> ++#include <iomanip> + + class e2e_profile_04_test_client { + public: +diff --git a/test/network_tests/e2e_tests/e2e_profile_04_test_service.hpp b/test/network_tests/e2e_tests/e2e_profile_04_test_service.hpp +index 25617917..17852b85 100644 +--- a/test/network_tests/e2e_tests/e2e_profile_04_test_service.hpp ++++ b/test/network_tests/e2e_tests/e2e_profile_04_test_service.hpp +@@ -17,6 +17,7 @@ + #include <condition_variable> + #include <mutex> + #include <thread> ++#include <iomanip> + + class e2e_profile_04_test_service { + public: +diff --git a/test/network_tests/e2e_tests/e2e_profile_07_test_client.hpp b/test/network_tests/e2e_tests/e2e_profile_07_test_client.hpp +index 9b10a589..30d889b5 100644 +--- a/test/network_tests/e2e_tests/e2e_profile_07_test_client.hpp ++++ b/test/network_tests/e2e_tests/e2e_profile_07_test_client.hpp +@@ -14,6 +14,7 @@ + #include <mutex> + #include <condition_variable> + #include <atomic> ++#include <iomanip> + + class e2e_profile_07_test_client { + public: +diff --git a/test/network_tests/e2e_tests/e2e_profile_07_test_service.hpp b/test/network_tests/e2e_tests/e2e_profile_07_test_service.hpp +index ad6488a5..ea1cc05c 100644 +--- a/test/network_tests/e2e_tests/e2e_profile_07_test_service.hpp ++++ b/test/network_tests/e2e_tests/e2e_profile_07_test_service.hpp +@@ -17,6 +17,7 @@ + #include <condition_variable> + #include <mutex> + #include <thread> ++#include <iomanip> + + class e2e_profile_07_test_service { + public: +diff --git a/test/network_tests/e2e_tests/e2e_test_client.hpp b/test/network_tests/e2e_tests/e2e_test_client.hpp +index 10f49784..c253f101 100644 +--- a/test/network_tests/e2e_tests/e2e_test_client.hpp ++++ b/test/network_tests/e2e_tests/e2e_test_client.hpp +@@ -18,6 +18,7 @@ + #include <mutex> + #include <condition_variable> + #include <atomic> ++#include <iomanip> + + class e2e_test_client { + public: +diff --git a/test/network_tests/e2e_tests/e2e_test_service.hpp b/test/network_tests/e2e_tests/e2e_test_service.hpp +index 7fd1c5a9..e839aacb 100644 +--- a/test/network_tests/e2e_tests/e2e_test_service.hpp ++++ b/test/network_tests/e2e_tests/e2e_test_service.hpp +@@ -16,6 +16,7 @@ + #include <thread> + #include <mutex> + #include <condition_variable> ++#include <iomanip> + + class e2e_test_service { + public: +diff --git a/test/network_tests/event_tests/event_test_service.cpp b/test/network_tests/event_tests/event_test_service.cpp +index 3728a827..d1f117e2 100644 +--- a/test/network_tests/event_tests/event_test_service.cpp ++++ b/test/network_tests/event_tests/event_test_service.cpp +@@ -10,6 +10,7 @@ + #include <thread> + #include <map> + #include <atomic> ++#include <iomanip> + + #include <gtest/gtest.h> + +diff --git a/test/network_tests/header_factory_tests/header_factory_test_client.hpp b/test/network_tests/header_factory_tests/header_factory_test_client.hpp +index 79461b69..b72bbdca 100644 +--- a/test/network_tests/header_factory_tests/header_factory_test_client.hpp ++++ b/test/network_tests/header_factory_tests/header_factory_test_client.hpp +@@ -14,6 +14,7 @@ + #include <mutex> + #include <condition_variable> + #include <functional> ++#include <iomanip> + + #include "../someip_test_globals.hpp" + #include <common/vsomeip_app_utilities.hpp> +diff --git a/test/network_tests/header_factory_tests/header_factory_test_service.hpp b/test/network_tests/header_factory_tests/header_factory_test_service.hpp +index 7879946a..a553adde 100644 +--- a/test/network_tests/header_factory_tests/header_factory_test_service.hpp ++++ b/test/network_tests/header_factory_tests/header_factory_test_service.hpp +@@ -13,6 +13,7 @@ + #include <mutex> + #include <condition_variable> + #include <functional> ++#include <iomanip> + + #include "../someip_test_globals.hpp" + #include <common/vsomeip_app_utilities.hpp> +diff --git a/test/network_tests/npdu_tests/npdu_test_client.hpp b/test/network_tests/npdu_tests/npdu_test_client.hpp +index 2f469d40..7f615f14 100644 +--- a/test/network_tests/npdu_tests/npdu_test_client.hpp ++++ b/test/network_tests/npdu_tests/npdu_test_client.hpp +@@ -15,6 +15,7 @@ + #include <condition_variable> + #include <functional> + #include <map> ++#include <iomanip> + + #include "../npdu_tests/npdu_test_globals.hpp" + #include "../someip_test_globals.hpp" +diff --git a/test/network_tests/npdu_tests/npdu_test_service.hpp b/test/network_tests/npdu_tests/npdu_test_service.hpp +index bef06806..1caae785 100644 +--- a/test/network_tests/npdu_tests/npdu_test_service.hpp ++++ b/test/network_tests/npdu_tests/npdu_test_service.hpp +@@ -15,6 +15,7 @@ + #include <functional> + #include <chrono> + #include <deque> ++#include <iomanip> + + class npdu_test_service + { +diff --git a/test/network_tests/payload_tests/payload_test_client.hpp b/test/network_tests/payload_tests/payload_test_client.hpp +index 1bab6ba6..1754320c 100644 +--- a/test/network_tests/payload_tests/payload_test_client.hpp ++++ b/test/network_tests/payload_tests/payload_test_client.hpp +@@ -15,6 +15,7 @@ + #include <mutex> + #include <condition_variable> + #include <functional> ++#include <iomanip> + + #include "../someip_test_globals.hpp" + #include <common/vsomeip_app_utilities.hpp> +diff --git a/test/network_tests/payload_tests/payload_test_service.hpp b/test/network_tests/payload_tests/payload_test_service.hpp +index 7d3c01d5..06dbb684 100644 +--- a/test/network_tests/payload_tests/payload_test_service.hpp ++++ b/test/network_tests/payload_tests/payload_test_service.hpp +@@ -13,6 +13,7 @@ + #include <mutex> + #include <condition_variable> + #include <functional> ++#include <iomanip> + + #include "../someip_test_globals.hpp" + #include <common/vsomeip_app_utilities.hpp> +diff --git a/test/network_tests/restart_routing_tests/restart_routing_test_client.hpp b/test/network_tests/restart_routing_tests/restart_routing_test_client.hpp +index 8a7c9e70..6a758318 100644 +--- a/test/network_tests/restart_routing_tests/restart_routing_test_client.hpp ++++ b/test/network_tests/restart_routing_tests/restart_routing_test_client.hpp +@@ -19,6 +19,7 @@ + #include <condition_variable> + #include <atomic> + #include <future> ++#include <iomanip> + + class routing_restart_test_client { + public: +diff --git a/test/network_tests/restart_routing_tests/restart_routing_test_service.hpp b/test/network_tests/restart_routing_tests/restart_routing_test_service.hpp +index 7660b8fc..1fe4d86c 100644 +--- a/test/network_tests/restart_routing_tests/restart_routing_test_service.hpp ++++ b/test/network_tests/restart_routing_tests/restart_routing_test_service.hpp +@@ -16,6 +16,7 @@ + #include <thread> + #include <mutex> + #include <condition_variable> ++#include <iomanip> + + class routing_restart_test_service { + public: +diff --git a/test/network_tests/routing_tests/external_local_routing_test_service.hpp b/test/network_tests/routing_tests/external_local_routing_test_service.hpp +index 2499bc84..b1e2dfd8 100644 +--- a/test/network_tests/routing_tests/external_local_routing_test_service.hpp ++++ b/test/network_tests/routing_tests/external_local_routing_test_service.hpp +@@ -13,6 +13,7 @@ + #include <mutex> + #include <condition_variable> + #include <functional> ++#include <iomanip> + + #include "../someip_test_globals.hpp" + #include <common/vsomeip_app_utilities.hpp> +diff --git a/test/network_tests/routing_tests/local_routing_test_client.hpp b/test/network_tests/routing_tests/local_routing_test_client.hpp +index 09af0bf0..69ee6bfc 100644 +--- a/test/network_tests/routing_tests/local_routing_test_client.hpp ++++ b/test/network_tests/routing_tests/local_routing_test_client.hpp +@@ -14,6 +14,7 @@ + #include <mutex> + #include <condition_variable> + #include <functional> ++#include <iomanip> + + #include "../someip_test_globals.hpp" + #include <common/vsomeip_app_utilities.hpp> +diff --git a/test/network_tests/routing_tests/local_routing_test_service.hpp b/test/network_tests/routing_tests/local_routing_test_service.hpp +index 109dade4..932423d8 100644 +--- a/test/network_tests/routing_tests/local_routing_test_service.hpp ++++ b/test/network_tests/routing_tests/local_routing_test_service.hpp +@@ -13,6 +13,7 @@ + #include <mutex> + #include <condition_variable> + #include <functional> ++#include <iomanip> + + #include "../someip_test_globals.hpp" + #include <common/vsomeip_app_utilities.hpp> +diff --git a/test/network_tests/second_address_tests/second_address_test_service.cpp b/test/network_tests/second_address_tests/second_address_test_service.cpp +index fc9d0a28..3ffa493f 100644 +--- a/test/network_tests/second_address_tests/second_address_test_service.cpp ++++ b/test/network_tests/second_address_tests/second_address_test_service.cpp +@@ -9,6 +9,7 @@ + #include <sstream> + #include <thread> + #include <map> ++#include <iomanip> + + #include <gtest/gtest.h> + #include <vsomeip/vsomeip.hpp> +diff --git a/test/network_tests/security_tests/security_test_client.hpp b/test/network_tests/security_tests/security_test_client.hpp +index ab3d98b8..bd331138 100644 +--- a/test/network_tests/security_tests/security_test_client.hpp ++++ b/test/network_tests/security_tests/security_test_client.hpp +@@ -18,6 +18,7 @@ + #include <mutex> + #include <condition_variable> + #include <atomic> ++#include <iomanip> + + class security_test_client { + public: +diff --git a/test/network_tests/security_tests/security_test_service.hpp b/test/network_tests/security_tests/security_test_service.hpp +index 87fb94fd..1f227072 100644 +--- a/test/network_tests/security_tests/security_test_service.hpp ++++ b/test/network_tests/security_tests/security_test_service.hpp +@@ -16,6 +16,7 @@ + #include <thread> + #include <mutex> + #include <condition_variable> ++#include <iomanip> + + class security_test_service { + public: +diff --git a/test/network_tests/suspend_resume_tests/suspend_resume_test_service.cpp b/test/network_tests/suspend_resume_tests/suspend_resume_test_service.cpp +index 6f099ce7..dc9df239 100644 +--- a/test/network_tests/suspend_resume_tests/suspend_resume_test_service.cpp ++++ b/test/network_tests/suspend_resume_tests/suspend_resume_test_service.cpp +@@ -7,6 +7,7 @@ + #include <mutex> + #include <thread> + #include <atomic> ++#include <iomanip> + + #include <gtest/gtest.h> + diff --git a/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip_3.4.10.bb b/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip_3.4.10.bb index 4c38970205..36fa196a5f 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip_3.4.10.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip_3.4.10.bb @@ -13,6 +13,8 @@ SRC_URI = "git://github.com/GENIVI/${BPN}.git;branch=master;protocol=https;name= file://0003-Do-not-build-external-gtest.patch \ file://0004-Do-not-specify-PIE-flag-explicitly.patch \ file://0005-test-common-CMakeLists.txt-add-missing-link-with-dlt.patch \ + file://0001-Update-to-C-17-560.patch \ + file://0002-network_tests-Include-iomanip-system-header.patch \ " SRCREV = "02c199dff8aba814beebe3ca417fd991058fe90c" diff --git a/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp/0002-fix-invalid-conversion-from-int-to-CURLoption.patch b/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp/0002-fix-invalid-conversion-from-int-to-CURLoption.patch new file mode 100644 index 0000000000..1712a53462 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp/0002-fix-invalid-conversion-from-int-to-CURLoption.patch @@ -0,0 +1,36 @@ +From ebe9144fdfdc8154661b93322cec4a1c43aa75ff Mon Sep 17 00:00:00 2001 +From: alperak <alperyasinak1@gmail.com> +Date: Tue, 1 Oct 2024 19:45:38 +0300 +Subject: [PATCH] Fix invalid conversion from int to CURLoption + +Options.hpp:281:74: error: invalid conversion from 'int' to 'CURLoption' [-fpermissive] + 281 | typedef curlpp::OptionTrait<curl_closepolicy, CURLOPT_CLOSEPOLICY> ClosePolicy; + | ^ + | | + | int + +Fix invalid conversion by adding explicit cast to CURLoption + +Upstream-Status: Pending + +Signed-off-by: alperak <alperyasinak1@gmail.com> +--- + include/curlpp/Options.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/curlpp/Options.hpp b/include/curlpp/Options.hpp +index c705c9d..7c9a501 100644 +--- a/include/curlpp/Options.hpp ++++ b/include/curlpp/Options.hpp +@@ -278,7 +278,7 @@ namespace options + typedef curlpp::OptionTrait<long, CURLOPT_LOW_SPEED_LIMIT> LowSpeedLimit; + typedef curlpp::OptionTrait<long, CURLOPT_LOW_SPEED_TIME> LowSpeedTime; + typedef curlpp::OptionTrait<long, CURLOPT_MAXCONNECTS> MaxConnects; +- typedef curlpp::OptionTrait<curl_closepolicy, CURLOPT_CLOSEPOLICY> ClosePolicy; ++ typedef curlpp::OptionTrait<curl_closepolicy, (CURLoption)CURLOPT_CLOSEPOLICY> ClosePolicy; + typedef curlpp::OptionTrait<bool, CURLOPT_FRESH_CONNECT> FreshConnect; + typedef curlpp::OptionTrait<bool, CURLOPT_FORBID_REUSE> ForbidReuse; + typedef curlpp::OptionTrait<long, CURLOPT_CONNECTTIMEOUT> ConnectTimeout; +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb b/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb index 131f1873a2..cacdc9773b 100644 --- a/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb @@ -8,7 +8,8 @@ DEPENDS = "curl" DEPENDS:class-native = "curl-native" SRC_URI = "git://github.com/jpbarrette/curlpp.git;branch=master;protocol=https \ - file://0001-curlpp-config.in-Remove-references-to-absolute-build.patch" + file://0001-curlpp-config.in-Remove-references-to-absolute-build.patch \ + file://0002-fix-invalid-conversion-from-int-to-CURLoption.patch" SRCREV = "592552a165cc569dac7674cb7fc9de3dc829906f" diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb index be74759d5e..ba783d03ff 100644 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb +++ b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb @@ -12,7 +12,6 @@ DEPENDS += "gettext-native" #at least versions 2.69 and prior are moved to the archive folder on the server SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getVar('PV').split('.')[1]) > 69]}dnsmasq-${PV}.tar.gz \ file://init \ - file://dnsmasq.conf \ file://dnsmasq-resolvconf.service \ file://dnsmasq-noresolvconf.service \ file://dnsmasq-resolved.conf \ @@ -25,8 +24,13 @@ INITSCRIPT_NAME = "dnsmasq" INITSCRIPT_PARAMS = "defaults" # dnsmasq defaults -PACKAGECONFIG ?= "auth dhcp dhcp6 dumpfile inotify ipset loop script tftp" +PACKAGECONFIG ?= "\ + auth dhcp dumpfile inotify ipset loop script tftp \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'dhcp6', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'rtc', '', 'broken-rtc', d)} \ +" +# see src/config.h PACKAGECONFIG[auth] = "-DHAVE_AUTH,-DNO_AUTH" PACKAGECONFIG[broken-rtc] = "-DHAVE_BROKEN_RTC," PACKAGECONFIG[conntrack] = "-DHAVE_CONNTRACK,,libnetfilter-conntrack" @@ -81,7 +85,7 @@ do_install () { "MANDIR=${D}${mandir}" \ install-i18n install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d ${D}${sysconfdir}/dnsmasq.d - install -m 644 ${UNPACKDIR}/dnsmasq.conf ${D}${sysconfdir}/ + install -m 644 ${S}/dnsmasq.conf.example ${D}${sysconfdir}/dnsmasq.conf install -m 755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq install -d ${D}${systemd_unitdir}/system diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf b/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf deleted file mode 100755 index 2897b90300..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf +++ /dev/null @@ -1,298 +0,0 @@ -# Configuration file for dnsmasq. -# -# Format is one option per line, legal options are the same -# as the long options legal on the command line. See -# "/usr/bin/dnsmasq --help" or "man 8 dnsmasq" for details. - -# Listen on this specific port instead of the standard DNS port -# (53). Setting this to zero completely disables DNS function, -# leaving only DHCP and/or TFTP. -#port=5353 - -# Change these lines if you want dnsmasq to serve MX records. -# Only one of mx-host and mx-target need be set, the other defaults -# to the name of the host running dnsmasq. -#mx-host= -#mx-target= -#selfmx -#localmx - -# The following two options make you a better netizen, since they -# tell dnsmasq to filter out queries which the public DNS cannot -# answer, and which load the servers (especially the root servers) -# uneccessarily. If you have a dial-on-demand link they also stop -# these requests from bringing up the link uneccessarily. - -# Never forward plain names (with a dot or domain part) -domain-needed -# Never forward addresses in the non-routed address spaces. -bogus-priv - - -# Uncomment this to filter useless windows-originated DNS requests -# which can trigger dial-on-demand links needlessly. -# Note that (amongst other things) this blocks all SRV requests, -# so don't use it if you use eg Kerberos. -#filterwin2k - -# Change this line if you want dns to get its upstream servers from -# somewhere other that /etc/resolv.conf -#resolv-file= - -# By default, dnsmasq will send queries to any of the upstream -# servers it knows about and tries to favour servers to are known -# to be up. Uncommenting this forces dnsmasq to try each query -# with each server strictly in the order they appear in -# /etc/resolv.conf -#strict-order - -# If you don't want dnsmasq to read /etc/resolv.conf or any other -# file, getting its servers for this file instead (see below), then -# uncomment this -#no-resolv - -# If you don't want dnsmasq to poll /etc/resolv.conf or other resolv -# files for changes and re-read them then uncomment this. -#no-poll - -# Add other name servers here, with domain specs if they are for -# non-public domains. -#server=/localnet/192.168.0.1 - -# Add local-only domains here, queries in these domains are answered -# from /etc/hosts or DHCP only. -#local=/localnet/ - -# Add domains which you want to force to an IP address here. -# The example below send any host in doubleclick.net to a local -# webserver. -#address=/doubleclick.net/127.0.0.1 - -# You no longer (as of version 1.7) need to set these to enable -# dnsmasq to read /etc/ppp/resolv.conf since dnsmasq now uses the -# "dip" group to achieve this. -#user= -#group= - -# If you want dnsmasq to listen for requests only on specified interfaces -# (and the loopback) give the name of the interface (eg eth0) here. -# Repeat the line for more than one interface. -#interface= -# Or you can specify which interface _not_ to listen on -#except-interface= -# Or which to listen on by address (remember to include 127.0.0.1 if -# you use this.) -#listen-address=127.0.0.1 - -# On systems which support it, dnsmasq binds the wildcard address, -# even when it is listening on only some interfaces. It then discards -# requests that it shouldn't reply to. This has the advantage of -# working even when interfaces come and go and change address. If you -# want dnsmasq to really bind only the interfaces it is listening on, -# uncomment this option. About the only time you may need this is when -# running another nameserver on the same machine. -#bind-interfaces - -# If you don't want dnsmasq to read /etc/hosts, uncomment the -# following line. -#no-hosts -# or if you want it to read another file, as well as /etc/hosts, use -# this. -#addn-hosts=/etc/banner_add_hosts - -# Set this (and domain: see below) if you want to have a domain -# automatically added to simple names in a hosts-file. -#expand-hosts - -# Set the domain for dnsmasq. this is optional, but if it is set, it -# does the following things. -# 1) Allows DHCP hosts to have fully qualified domain names, as long -# as the domain part matches this setting. -# 2) Sets the "domain" DHCP option thereby potentially setting the -# domain of all systems configured by DHCP -# 3) Provides the domain part for "expand-hosts" -#domain=thekelleys.org.uk - -# Uncomment this to enable the integrated DHCP server, you need -# to supply the range of addresses available for lease and optionally -# a lease time. If you have more than one network, you will need to -# repeat this for each network on which you want to supply DHCP -# service. -#dhcp-range=192.168.0.50,192.168.0.150,12h -#dhcp-range=10.0.0.10,10.0.0.200,2h - -# This is an example of a DHCP range where the netmask is given. This -# is needed for networks we reach the dnsmasq DHCP server via a relay -# agent. If you don't know what a DHCP relay agent is, you probably -# don't need to worry about this. -#dhcp-range=192.168.0.50,192.168.0.150,255.255.255.0,12h - -# This is an example of a DHCP range with a network-id, so that -# some DHCP options may be set only for this network. -#dhcp-range=red,192.168.0.50,192.168.0.150 - -# Supply parameters for specified hosts using DHCP. There are lots -# of valid alternatives, so we will give examples of each. Note that -# IP addresses DO NOT have to be in the range given above, they just -# need to be on the same network. The order of the parameters in these -# do not matter, it's permissble to give name,adddress and MAC in any order - -# Always allocate the host with ethernet address 11:22:33:44:55:66 -# The IP address 192.168.0.60 -#dhcp-host=11:22:33:44:55:66,192.168.0.60 - -# Always set the name of the host with hardware address -# 11:22:33:44:55:66 to be "fred" -#dhcp-host=11:22:33:44:55:66,fred - -# Always give the host with ethernet address 11:22:33:44:55:66 -# the name fred and IP address 192.168.0.60 and lease time 45 minutes -#dhcp-host=11:22:33:44:55:66,fred,192.168.0.60,45m - -# Give the machine which says it's name is "bert" IP address -# 192.168.0.70 and an infinite lease -#dhcp-host=bert,192.168.0.70,infinite - -# Always give the host with client identifier 01:02:02:04 -# the IP address 192.168.0.60 -#dhcp-host=id:01:02:02:04,192.168.0.60 - -# Always give the host with client identifier "marjorie" -# the IP address 192.168.0.60 -#dhcp-host=id:marjorie,192.168.0.60 - -# Enable the address given for "judge" in /etc/hosts -# to be given to a machine presenting the name "judge" when -# it asks for a DHCP lease. -#dhcp-host=judge - -# Never offer DHCP service to a machine whose ethernet -# address is 11:22:33:44:55:66 -#dhcp-host=11:22:33:44:55:66,ignore - -# Ignore any client-id presented by the machine with ethernet -# address 11:22:33:44:55:66. This is useful to prevent a machine -# being treated differently when running under different OS's or -# between PXE boot and OS boot. -#dhcp-host=11:22:33:44:55:66,id:* - -# Send extra options which are tagged as "red" to -# the machine with ethernet address 11:22:33:44:55:66 -#dhcp-host=11:22:33:44:55:66,net:red - -# Send extra options which are tagged as "red" to any machine whose -# DHCP vendorclass string includes the substring "Linux" -#dhcp-vendorclass=red,Linux - -# Send extra options which are tagged as "red" to any machine one -# of whose DHCP userclass strings includes the substring "accounts" -#dhcp-userclass=red,accounts - -# If this line is uncommented, dnsmasq will read /etc/ethers and act -# on the ethernet-address/IP pairs found there just as if they had -# been given as --dhcp-host options. Useful if you keep -# MAC-address/host mappings there for other purposes. -#read-ethers - -# Send options to hosts which ask for a DHCP lease. -# See RFC 2132 for details of available options. -# Note that all the common settings, such as netmask and -# broadcast address, DNS server and default route, are given -# sane defaults by dnsmasq. You very likely will not need any -# any dhcp-options. If you use Windows clients and Samba, there -# are some options which are recommended, they are detailed at the -# end of this section. -# For reference, the common options are: -# subnet mask - 1 -# default router - 3 -# DNS server - 6 -# broadcast address - 28 - -# Set the NTP time server addresses to 192.168.0.4 and 10.10.0.5 -#dhcp-option=42,192.168.0.4,10.10.0.5 - -# Set the NTP time server address to be the same machine as -# is running dnsmasq -#dhcp-option=42,0.0.0.0 - -# Set the NIS domain name to "welly" -#dhcp-option=40,welly - -# Set the default time-to-live to 50 -#dhcp-option=23,50 - -# Set the "all subnets are local" flag -#dhcp-option=27,1 - -# Send the etherboot magic flag and then etherboot options (a string). -#dhcp-option=128,e4:45:74:68:00:00 -#dhcp-option=129,NIC=eepro100 - -# Specify an option which will only be sent to the "red" network -# (see dhcp-range for the declaration of the "red" network) -#dhcp-option=red,42,192.168.1.1 - -# The following DHCP options set up dnsmasq in the same way as is specified -# for the ISC dhcpcd in -# http://www.samba.org/samba/ftp/docs/textdocs/DHCP-Server-Configuration.txt -# adapted for a typical dnsmasq installation where the host running -# dnsmasq is also the host running samba. -# you may want to uncomment them if you use Windows clients and Samba. -#dhcp-option=19,0 # option ip-forwarding off -#dhcp-option=44,0.0.0.0 # set netbios-over-TCP/IP nameserver(s) aka WINS server(s) -#dhcp-option=45,0.0.0.0 # netbios datagram distribution server -#dhcp-option=46,8 # netbios node type -#dhcp-option=47 # empty netbios scope. - - -# Set the boot filename and tftpd server name and address -# for BOOTP. You will only need this is you want to -# boot machines over the network. -#dhcp-boot=/var/ftpd/pxelinux.0,boothost,192.168.0.3 - -# Set the limit on DHCP leases, the default is 150 -#dhcp-lease-max=150 - -# The DHCP server needs somewhere on disk to keep its lease database. -# This defaults to a sane location, but if you want to change it, use -# the line below. -#dhcp-leasefile=/var/lib/misc/dnsmasq.leases - -# Set the cachesize here. -#cache-size=150 - -# If you want to disable negative caching, uncomment this. -#no-negcache - -# Normally responses which come form /etc/hosts and the DHCP lease -# file have Time-To-Live set as zero, which conventionally means -# do not cache further. If you are happy to trade lower load on the -# server for potentially stale date, you can set a time-to-live (in -# seconds) here. -#local-ttl= - -# If you want dnsmasq to detect attempts by Verisign to send queries -# to unregistered .com and .net hosts to its sitefinder service and -# have dnsmasq instead return the correct NXDOMAIN response, uncomment -# this line. You can add similar lines to do the same for other -# registries which have implemented wildcard A records. -#bogus-nxdomain=64.94.110.11 - -# If you want to fix up DNS results from upstream servers, use the -# alias option. This only works for IPv4. -# This alias makes a result of 1.2.3.4 appear as 5.6.7.8 -#alias=1.2.3.4,5.6.7.8 -# and this maps 1.2.3.x to 5.6.7.x -#alias=1.2.3.0,5.6.7.0,255.255.255.0 - -# For debugging purposes, log each DNS query as it passes through -# dnsmasq. -#log-queries - -# Include a another lot of configuration options. -#conf-file=/etc/dnsmasq.more.conf - - - - - diff --git a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb index 2f887e6018..4e76d24526 100644 --- a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb +++ b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb @@ -50,7 +50,8 @@ SYSTEMD_AUTO_ENABLE = "disable" do_install:append () { rm -rf ${D}${libdir}/dovecot/dovecot-config install -d 755 ${D}/etc/dovecot - touch 644 ${D}/etc/dovecot/dovecot.conf + touch ${D}/etc/dovecot/dovecot.conf + chmod 644 ${D}/etc/dovecot/dovecot.conf if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then install -m 0644 ${UNPACKDIR}/dovecot.service ${D}${systemd_unitdir}/system sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/dovecot.service diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch deleted file mode 100644 index b98e1e70c7..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 61991db099f66348dddbc3408e7ee8c05bda85cb Mon Sep 17 00:00:00 2001 -From: Yoann Congal <yoann.congal@smile.fr> -Date: Sat, 2 Mar 2024 16:23:07 +0100 -Subject: [PATCH] configure.ac: Add an option to disable host udev version - checks - -In cross-compilation environment, the build host might have an outdated -udev or no udev at all. But the user may still want to build with the -enabled udev rule (for its udev-enabled target). - -This patch adds a "--disable-udevchecks" option the disable build host -udev version check at configure-time and unconditionally install the -enabled udev rule. Without this new option, the behavior stays the same -(checks enabled). - -Signed-off-by: Yoann Congal <yoann.congal@smile.fr> -Upstream-Status: Backport [https://github.com/LINBIT/drbd-utils/commit/f2b5a7335ae52109dfb95a9d99ae20519c43d59a] ---- - configure.ac | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f1d69ea3..4c56d33b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -71,6 +71,11 @@ AC_ARG_WITH([udev], - [AS_HELP_STRING([--with-udev], - [Enable udev integration])], - [WITH_UDEV=$withval]) -+AC_ARG_ENABLE([udevchecks], -+ [AS_HELP_STRING([--disable-udevchecks], -+ [Disable host udev version checks])], -+ [], -+ [enable_udevchecks=yes]) - AC_ARG_WITH([xen], - [AS_HELP_STRING([--with-xen], - [Enable Xen integration])], -@@ -315,7 +320,7 @@ if test -z $GIT; then - AC_MSG_WARN(Cannot update buildtag without git. You may safely ignore this warning when building from a tarball.) - fi - --if test $UDEVADM = false && test $UDEVINFO = false; then -+if test "x$enable_udevchecks" != "xno" && test $UDEVADM = false && test $UDEVINFO = false; then - if test "$WITH_UDEV" = "yes"; then - AC_MSG_WARN([udev support enabled, but neither udevadm nor udevinfo found on this system.]) - fi -@@ -423,7 +428,7 @@ else - test -z $INITDIR && INITDIR="$sysconfdir/init.d" - - dnl Our udev rules file is known to work only with udev >= 85 -- if test "$WITH_UDEV" = "yes"; then -+ if test "x$enable_udevchecks" != "xno" && test "$WITH_UDEV" = "yes"; then - udev_version=$( set -- $($UDEVADM version); echo $1 ) - if test -z "$udev_version"; then - udev_version=$( set -- $($UDEVINFO -V); echo $3 ) diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch index 27f0a9b54a..ef0229d5bb 100644 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch @@ -1,4 +1,4 @@ -From 264ae7b062ac52a5545a8a562b51001f7ce7369d Mon Sep 17 00:00:00 2001 +From 9109f15f5b8ae142823194b9ef50c392615fe38d Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Thu, 21 Apr 2022 17:22:35 +0800 Subject: [PATCH] drbd-utils: support usermerge @@ -16,15 +16,14 @@ Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> scripts/drbd.service | 6 +++--- scripts/drbd@.service | 6 +++--- scripts/ocf.ra@.service | 4 ++-- - user/v83/Makefile.in | 14 +++++++------- user/v84/Makefile.in | 14 +++++++------- - 10 files changed, 32 insertions(+), 32 deletions(-) + 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/configure.ac b/configure.ac -index f1d69ea3..3289ac7d 100644 +index d3ec5ff1..910232b1 100644 --- a/configure.ac +++ b/configure.ac -@@ -183,7 +183,7 @@ AC_ARG_WITH(tmpfilesdir, +@@ -178,7 +178,7 @@ AC_ARG_WITH(tmpfilesdir, AC_SUBST(tmpfilesdir) # set default early @@ -34,10 +33,10 @@ index f1d69ea3..3289ac7d 100644 test x"$with_udev" = xyes ; then if test x"$PKG_CONFIG" != x; then diff --git a/scripts/Makefile.in b/scripts/Makefile.in -index aca15a22..a1cd2ffe 100644 +index 15a26f37..ff028310 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in -@@ -91,11 +91,11 @@ ifeq ($(subst both,systemd,$(initscripttype)),systemd) +@@ -90,11 +90,11 @@ ifeq ($(subst both,systemd,$(initscripttype)),systemd) install -d $(DESTDIR)$(systemdunitdir) install -m 644 $(SYSTEMD_UNITS) $(DESTDIR)$(systemdunitdir)/ install -m 644 $(SYSTEMD_TEMPLATES) $(DESTDIR)$(systemdunitdir)/ @@ -137,37 +136,6 @@ index 9c2268a6..1666c482 100644 -ExecStopPost=/lib/drbd/scripts/ocf.ra.wrapper.sh stop %n +ExecStart=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh start-and-monitor %n +ExecStopPost=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh stop %n -diff --git a/user/v83/Makefile.in b/user/v83/Makefile.in -index 08cfe574..4c4971b6 100644 ---- a/user/v83/Makefile.in -+++ b/user/v83/Makefile.in -@@ -96,19 +96,19 @@ install: - ifeq ($(WITH_83_SUPPORT),yes) - install -d $(DESTDIR)$(localstatedir)/lib/drbd - install -d $(DESTDIR)$(localstatedir)/lock -- install -d $(DESTDIR)/lib/drbd/ -+ install -d $(DESTDIR)/${nonarch_libdir}/drbd/ - if getent group haclient > /dev/null 2> /dev/null ; then \ -- install -g haclient -m 4750 drbdsetup-83 $(DESTDIR)/lib/drbd/ ; \ -- install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ; \ -+ install -g haclient -m 4750 drbdsetup-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ -+ install -m 755 drbdadm-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ - else \ -- install -m 755 drbdsetup-83 $(DESTDIR)/lib/drbd/ ; \ -- install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ; \ -+ install -m 755 drbdsetup-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ -+ install -m 755 drbdadm-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ - fi - endif - - uninstall: -- rm -f $(DESTDIR)/lib/drbd/drbdsetup-83 -- rm -f $(DESTDIR)/lib/drbd/drbdadm-83 -+ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdsetup-83 -+ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdadm-83 - - .PHONY: install uninstall clean distclean - ../../configure: diff --git a/user/v84/Makefile.in b/user/v84/Makefile.in index 0fcefc5f..81f7d5ec 100644 --- a/user/v84/Makefile.in @@ -199,3 +167,6 @@ index 0fcefc5f..81f7d5ec 100644 spell: for f in drbdadm_adjust.c drbdadm_main.c drbdadm_parser.c drbdadm_usage_cnt.c drbdsetup.c drbdtool_common.c; do \ +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.27.0.bb b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.28.0.bb index 63f0fd18c1..af0afc2a91 100644 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.27.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.28.0.bb @@ -11,9 +11,8 @@ SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=master;prot git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers;branch=master;protocol=https \ file://0001-drbdmon-add-LDFLAGS-when-linking.patch \ ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \ - file://0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch \ " -SRCREV_drbd-utils = "fdd9a4d603a9dc99d110d8bd0e288d7c0b6f586e" +SRCREV_drbd-utils = "ba2ce9037989b6141222c7901d1219cf852949f1" SRCREV_drbd-headers = "0349f00825b4198d4ec3248f43884114a187676a" SRCREV_FORMAT = "drbd-utils_drbd-headers" diff --git a/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb b/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb index 6cde94b202..cc23d5a34e 100644 --- a/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb +++ b/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb @@ -16,13 +16,10 @@ SRC_URI[sha256sum] = "a6cb4ea863ac61d242ffb2db564a39123761578d3e40d71ce7b6f2905b inherit autotools gettext pkgconfig python3-dir python3native -EXTRA_OECONF = "--with-ssl=${STAGING_DIR_HOST}${prefix}" - -INSANE_SKIP:${PN} = "already-stripped" +EXTRA_OECONF = "--with-ssl=${STAGING_DIR_HOST}${prefix} --disable-rpath " do_install:append() { sed -i 's,${RECIPE_SYSROOT_NATIVE},,g' ${D}${bindir}/fetchmailconf - sed -i 's,${RECIPE_SYSROOT},,g' ${D}${bindir}/fetchmail } PACKAGES =+ "fetchmail-python" diff --git a/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop/0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch b/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop/0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch deleted file mode 100644 index e696ac4ead..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop/0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5aea816f27a71e6c88ad50e7326fa6584eeb7ad9 Mon Sep 17 00:00:00 2001 -From: Francois Marier <francois@debian.org> -Date: Fri, 24 Jul 2020 21:22:47 -0700 -Subject: [PATCH] Fix compilation with GCC's -fno-common flag (fixes #305) - -Upstream-Status: Submitted [https://github.com/mrash/fwknop/pull/319] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - client/log_msg.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/client/log_msg.h b/client/log_msg.h -index cc17716..3dda161 100644 ---- a/client/log_msg.h -+++ b/client/log_msg.h -@@ -38,7 +38,7 @@ enum - LOG_VERBOSITY_INFO, /*!< Constant to define a INFO message */ - LOG_VERBOSITY_DEBUG, /*!< Constant to define a DEBUG message */ - LOG_LAST_VERBOSITY --} log_level_t; -+}; - - #define LOG_DEFAULT_VERBOSITY LOG_VERBOSITY_NORMAL /*!< Default verbosity to use */ - --- -2.28.0 - diff --git a/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop/0001-configure.ac-Fix-missing-comma-in-AS_IF.patch b/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop/0001-configure.ac-Fix-missing-comma-in-AS_IF.patch deleted file mode 100644 index f3e1707408..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop/0001-configure.ac-Fix-missing-comma-in-AS_IF.patch +++ /dev/null @@ -1,29 +0,0 @@ -From fee4cb0ae2d1fcd012cb7f501c3db0d8ec910798 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 2 Apr 2023 10:01:51 -0700 -Subject: [PATCH] configure.ac: Fix missing comma in AS_IF - -this is flagged with autconf 2.72 - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 47a069e..9cdfd3f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -744,7 +744,7 @@ dnl - IPFW_EXE="" - IPTABLES_EXE="" - FIREWALLD_EXE="" -- ] -+ ], - ] - ] - ] --- -2.40.0 - diff --git a/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb b/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb index a1f56cdf16..7cc044d996 100644 --- a/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb +++ b/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb @@ -1,20 +1,20 @@ SUMMARY = "fwknop - Single Packet Authorization" HOMEPAGE = "http://www.cipherdyne.org/fwknop/" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - " +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + inherit autotools-brokensep pkgconfig SRC_URI = "http://www.cipherdyne.org/${BPN}/download/${BPN}-${PV}.tar.bz2 \ - file://0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch \ file://0001-Use-pkg-config-to-find-gpgme.patch \ - file://0001-configure.ac-Fix-missing-comma-in-AS_IF.patch \ " -SRC_URI[sha256sum] = "f6c09bec97ed8e474a98ae14f9f53e1bcdda33393f20667b6af3fb6bb894ca77" +SRC_URI[sha256sum] = "a4ec7c22dd90dd684f9f7b96d3a901c4131ec8c7a3b9db26d0428513f6774c64" DEPENDS = "libpcap gpgme" -EXTRA_OECONF = " --with-iptables=${sbindir}/iptables" +EXTRA_OECONF = "--with-iptables=${sbindir}/iptables \ + --with-gpg=${bindir}/gpg \ + --with-wget=${base_bindir}/wget" do_configure:prepend () { install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/config diff --git a/meta-openembedded/meta-networking/recipes-support/libconfuse/libconfuse_3.3.bb b/meta-openembedded/meta-networking/recipes-support/libconfuse/libconfuse_3.3.bb deleted file mode 100644 index b8d0536eb3..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/libconfuse/libconfuse_3.3.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "libConfuse is a configuration file parser library" -LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://LICENSE;md5=42fa47330d4051cd219f7d99d023de3a" - -SRCREV = "a42aebf13db33afd575da6e63f55163d371f776d" -SRC_URI = "git://github.com/libconfuse/libconfuse.git;branch=master;protocol=https" - -inherit autotools-brokensep pkgconfig gettext - -S = "${WORKDIR}/git" - -do_configure:prepend(){ - (cd ${S} && ${S}/autogen.sh) -} diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.8.0.bb b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.8.1.bb index bdd87993d7..29ff2cf6f2 100644 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.8.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.8.1.bb @@ -34,7 +34,7 @@ LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9ada file://man/ldb.3.xml;beginline=261;endline=262;md5=137f9fd61040c1505d1aa1019663fd08 \ file://tools/ldbdump.c;endline=19;md5=a7d4fc5d1f75676b49df491575a86a42" -SRC_URI[sha256sum] = "358dca10fcd27207ac857a0d7f435a46dbc6cd1f7c10dbb840c1931bf1965f08" +SRC_URI[sha256sum] = "b68ce6eb0ccd2870fa3c8c334f2028b5d16606fd41308696c17b71959f7bf59f" inherit pkgconfig waf-samba ptest diff --git a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.10.bb b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.12.bb index bd3f9f63a9..a96527a3e6 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.10.bb +++ b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.12.bb @@ -15,7 +15,7 @@ SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \ file://run-ptest \ " -SRC_URI[sha256sum] = "02338e33c16c21c9e29571cef523e76b2b708636254f6f30c6cf195d48c62daf" +SRC_URI[sha256sum] = "6ce4b27498812d09237ece65a0d6dfac0941610e709848ecb822aa241084cd7a" PACKAGECONFIG ??= "\ ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ diff --git a/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb b/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb index 86b9112ba2..391e0e4ab6 100644 --- a/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb @@ -32,3 +32,7 @@ inherit autotools pkgconfig EXTRA_OEMAKE += "ROOTPREFIX=${root_prefix}" FILES:${PN} += "${nonarch_base_libdir}/firmware" + +# http://errors.yoctoproject.org/Errors/Details/766901/ +# linux-atm-2.5.2/src/led/conn.c:414:57: error: passing argument 3 of 'accept' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.20.bb index 0243f2a1db..a5f9c5543f 100644 --- a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb +++ b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.20.bb @@ -8,10 +8,7 @@ LIC_FILES_CHKSUM = " \ file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e \ " -SRCREV = "05b50d379ff0037de4957bb2a1befcce88b70225" - -PV .= "+git" -LK_REL = "1.0.19" +SRCREV = "311fcdeb5cb41612d4be66b16f0f2ad6675a6af8" SRC_URI = " \ git://github.com/sctp/lksctp-tools.git;branch=master;protocol=https \ @@ -34,19 +31,14 @@ do_install_ptest () { done } -SOLIBVERSION="${LK_REL}" -SOLIBMAJORVERSION="1" - PACKAGES =+ "${PN}-withsctp ${PN}-utils" FILES:${PN} = " \ - ${libdir}/libsctp.so.${SOLIBVERSION} \ - ${libdir}/libsctp.so.${SOLIBMAJORVERSION} \ + ${libdir}/libsctp.so.* \ " FILES:${PN}-withsctp = " \ - ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBVERSION} \ - ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBMAJORVERSION} \ + ${libdir}/lksctp-tools/libwithsctp.so.* \ " FILES:${PN}-dev += " \ diff --git a/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6/0001-Remove-use-of-variables-indicating-buildtime-informa.patch b/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6/0001-Remove-use-of-variables-indicating-buildtime-informa.patch new file mode 100644 index 0000000000..7bfb17bf08 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6/0001-Remove-use-of-variables-indicating-buildtime-informa.patch @@ -0,0 +1,85 @@ +From 7b3e78cf0348ea737609a2ace07c7c55aae36bcb Mon Sep 17 00:00:00 2001 +From: Santiago Vila <sanvila@debian.org> +Date: Wed, 9 Oct 2024 22:05:09 -0700 +Subject: [PATCH] Remove use of variables indicating buildtime information + +We should not really care about the build date or the build host + +Sourced From: https://salsa.debian.org/debian/ndisc6/-/blob/master/debian/patches/reproducible-build.patch?ref_type=heads + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + rdnss/rdnssd.c | 2 -- + src/addrinfo.c | 2 -- + src/ndisc.c | 2 -- + src/tcpspray.c | 2 -- + src/traceroute.c | 2 -- + 5 files changed, 10 deletions(-) + +diff --git a/rdnss/rdnssd.c b/rdnss/rdnssd.c +index b87edb2..7201525 100644 +--- a/rdnss/rdnssd.c ++++ b/rdnss/rdnssd.c +@@ -741,8 +741,6 @@ version (void) + { + printf (_("rdnssd: IPv6 Recursive DNS Server discovery Daemon %s (%s)\n"), + VERSION, "$Rev$"); +- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME); +- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION); + puts (_("Written by Pierre Ynard and Remi Denis-Courmont\n")); + + printf (_("Copyright (C) %u-%u Pierre Ynard, Remi Denis-Courmont\n"), +diff --git a/src/addrinfo.c b/src/addrinfo.c +index cd73722..6316abd 100644 +--- a/src/addrinfo.c ++++ b/src/addrinfo.c +@@ -148,8 +148,6 @@ static int quick_usage (const char *path) + static int version (void) + { + printf (_("addrinfo %s (%s)\n"), VERSION, "$Rev$"); +- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME); +- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION); + puts (_("Written by Remi Denis-Courmont\n")); + + printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2002, 2007); +diff --git a/src/ndisc.c b/src/ndisc.c +index b190b18..6e222a0 100644 +--- a/src/ndisc.c ++++ b/src/ndisc.c +@@ -920,9 +920,7 @@ version (void) + { + printf (_( + "ndisc6: IPv6 Neighbor/Router Discovery userland tool %s (%s)\n"), VERSION, "$Rev$"); +- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME); + +- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION); + puts (_("Written by Remi Denis-Courmont\n")); + + printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2004, 2007); +diff --git a/src/tcpspray.c b/src/tcpspray.c +index 39d8939..6347795 100644 +--- a/src/tcpspray.c ++++ b/src/tcpspray.c +@@ -302,8 +302,6 @@ version (void) + { + printf (_( + "tcpspray6: TCP/IP bandwidth tester %s (%s)\n"), VERSION, "$Rev$"); +- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME); +- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION); + puts (_("Written by Remi Denis-Courmont\n")); + + printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2005, 2007); +diff --git a/src/traceroute.c b/src/traceroute.c +index 489bc55..604b6af 100644 +--- a/src/traceroute.c ++++ b/src/traceroute.c +@@ -1251,8 +1251,6 @@ version (void) + { + printf (_( + "traceroute6: TCP & UDP IPv6 traceroute tool %s (%s)\n"), VERSION, "$Rev$"); +- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME); +- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION); + puts (_("Written by Remi Denis-Courmont\n")); + + printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2005, 2007); diff --git a/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb b/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb index a827e7f42a..21579d64c1 100644 --- a/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb +++ b/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SRCREV = "92e5d1cf6547fe40316b2a6ca2f7b8195ae0cbe5" SRC_URI = "git://git.remlab.net/git/ndisc6.git;protocol=http;branch=master \ file://0001-autogen-Do-not-symlink-gettext.h-from-build-host.patch \ + file://0001-Remove-use-of-variables-indicating-buildtime-informa.patch \ " S = "${WORKDIR}/git" @@ -27,6 +28,10 @@ do_configure:prepend() { ${S}/autogen.sh } +do_configure:append() { + sed -i -e 's|${WORKDIR}|<scrubbed>|g' ${B}/config.h +} + do_install:append () { rm -rf ${D}${localstatedir} # Enable SUID bit for applications that need it diff --git a/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpd b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpd index d1b9c49076..a0c43ed5e5 100755 --- a/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpd +++ b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpd @@ -72,7 +72,7 @@ case "$1" in startdaemon ;; status) - status /usr/sbin/ntpd; + status ntpd; exit $? ;; *) diff --git a/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.3.5.bb b/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.4.5.bb index 7e3fe5601f..217829193f 100644 --- a/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.3.5.bb +++ b/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.4.5.bb @@ -25,7 +25,7 @@ LICENSE:modules/freebsd/vmxnet = "GPL-2.0-only" LICENSE:modules/linux = "GPL-2.0-only" LICENSE:modules/solaris = "CDDL-1.0" -SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stable-12.3.x \ +SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stable-12.4.x \ file://tools.conf \ file://vmtoolsd.service \ file://vmtoolsd.init \ @@ -50,7 +50,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P<pver>\d+(\.\d+)+)" SRC_URI:append:libc-musl = " file://0001-Add-resolv_compat.h-for-musl-builds.patch;patchdir=.. \ " -SRCREV = "1b362b9eb449fb5de3809aaea4a636ece30ee5b7" +SRCREV = "9b94132f54fbed0b86dce04ff4402d1d8fd059c3" S = "${WORKDIR}/git/open-vm-tools" @@ -64,7 +64,7 @@ inherit autotools pkgconfig systemd update-rc.d SYSTEMD_SERVICE:${PN} = "vmtoolsd.service" EXTRA_OECONF = "--without-icu --disable-multimon --disable-docs \ - --disable-tests --without-gtkmm --without-xerces --without-pam \ + --disable-tests --without-gtkmm --without-pam \ --disable-vgauth --disable-deploypkg --disable-containerinfo \ --without-root-privileges --without-kernel-modules --with-tirpc \ --with-udev-rules-dir=${nonarch_base_libdir}/udev/rules.d" diff --git a/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.35.bb b/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.36.bb index c7c7573677..74c5ef220d 100644 --- a/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.35.bb +++ b/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.36.bb @@ -34,7 +34,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \ S = "${WORKDIR}/OpenIPMI-${PV}" -SRC_URI[sha256sum] = "b059114f6299d73f04ff6e76a0857a0ab81aa362dee99644d256b223872437ad" +SRC_URI[sha256sum] = "a0403148fa5f7bed930c958a4d1c558047e273763a408b3a0368edc137cc55d9" inherit autotools-brokensep pkgconfig perlnative update-rc.d systemd cpan-base python3targetconfig diff --git a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch index 03b454d625..e1253db1ec 100644 --- a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch +++ b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch @@ -1,4 +1,4 @@ -From ea179d83b0aa62719d90748cd1fb260f40055f15 Mon Sep 17 00:00:00 2001 +From 9cc13bdcb71cd16d2873637c491e07c01de9a3ea Mon Sep 17 00:00:00 2001 From: Yi Zhao <yi.zhao@windriver.com> Date: Mon, 13 Jun 2022 22:44:28 +0800 Subject: [PATCH] configure.ac: eliminate build path from openvpn --version @@ -31,10 +31,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 2f5f6bc..eddcbc5 100644 +index df16c43..623ca65 100644 --- a/configure.ac +++ b/configure.ac -@@ -1377,7 +1377,7 @@ if test "${enable_async_push}" = "yes"; then +@@ -1463,7 +1463,7 @@ if test "${enable_async_push}" = "yes"; then esac fi @@ -43,6 +43,3 @@ index 2f5f6bc..eddcbc5 100644 AC_DEFINE_UNQUOTED([CONFIGURE_DEFINES], ["`echo ${CONFIGURE_DEFINES}`"], [Configuration settings]) TAP_WIN_COMPONENT_ID="PRODUCT_TAP_WIN_COMPONENT_ID" --- -2.25.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.6.10.bb b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.6.12.bb index ba53d40f47..d81b8ce449 100644 --- a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.6.10.bb +++ b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.6.12.bb @@ -14,7 +14,7 @@ SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \ UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads" -SRC_URI[sha256sum] = "1993bbb7b9edb430626eaa24573f881fd3df642f427fcb824b1aed1fca1bcc9b" +SRC_URI[sha256sum] = "1c610fddeb686e34f1367c347e027e418e07523a10f4d8ce4a2c2af2f61a1929" CVE_STATUS[CVE-2020-27569] = "not-applicable-config: Applies only Aviatrix OpenVPN client, not openvpn" diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-overloadable-function-attribute-with-c.patch b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-overloadable-function-attribute-with-c.patch new file mode 100644 index 0000000000..092f4431bf --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-overloadable-function-attribute-with-c.patch @@ -0,0 +1,38 @@ +From c7de6834f0cd92b7341ab17a5c6996f3fbd40140 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 21 Jun 2024 22:16:47 -0700 +Subject: [PATCH] librdmacm: Use overloadable function attribute with clang + + This is to fix build warnings seen with upcoming clang19 and + glibc 2.40, since glibc 2.40 has improved fortyfying this + function with clang, it ends up with build errors like below + +librdmacm/preload.c:796:9: error: at most one overload for a given name may lack the 'overloadable' attribute +| 796 | ssize_t recvfrom(int socket, void *buf, size_t len, int flags, +| | ^ +| /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/rdma-core/51.0/recipe-sysroot/usr/include/sys/socket.h:163:16: note: previous unmarked overload of function is here +| 163 | extern ssize_t recvfrom (int __fd, void *__restrict __buf, size_t __n, +| | ^ + +Upstream-Status: Submitted [https://github.com/linux-rdma/rdma-core/pull/1475] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + librdmacm/preload.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +--- a/librdmacm/preload.c ++++ b/librdmacm/preload.c +@@ -792,8 +792,11 @@ ssize_t recv(int socket, void *buf, size + return (fd_fork_get(socket, &fd) == fd_rsocket) ? + rrecv(fd, buf, len, flags) : real.recv(fd, buf, len, flags); + } +- +-ssize_t recvfrom(int socket, void *buf, size_t len, int flags, ++ssize_t ++#if defined(__clang__) && defined(__GLIBC__) ++__attribute__((overloadable)) ++#endif ++recvfrom(int socket, void *buf, size_t len, int flags, + struct sockaddr *src_addr, socklen_t *addrlen) + { + int fd; diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb index 7c26a8c436..0c204c109f 100644 --- a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb @@ -8,6 +8,7 @@ RDEPENDS:${PN} = "bash perl" SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=https \ file://0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch \ file://0001-include-libgen.h-for-basename.patch \ + file://0001-librdmacm-Use-overloadable-function-attribute-with-c.patch \ " SRCREV = "6cd09097ad2eebde9a7fa3d3bb09a2cea6e3c2d6" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/sngrep/sngrep_1.8.1.bb b/meta-openembedded/meta-networking/recipes-support/sngrep/sngrep_1.8.2.bb index 50248078a2..518ca9e277 100644 --- a/meta-openembedded/meta-networking/recipes-support/sngrep/sngrep_1.8.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/sngrep/sngrep_1.8.2.bb @@ -16,7 +16,7 @@ DEPENDS = "\ " SRC_URI = "git://github.com/irontec/sngrep.git;protocol=https;branch=master" -SRCREV = "373abb90804ba71f980c7120e62f90d3a5c81213" +SRCREV = "dad1033640f249fa4994f976cf6ee96826c15702" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb b/meta-openembedded/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb index 0531ffe640..2d63119750 100644 --- a/meta-openembedded/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb @@ -15,3 +15,7 @@ CFLAGS += "-D_GNU_SOURCE " do_install() { oe_runmake 'DESTDIR=${D}' 'PREFIX=${prefix}' install } + +# http://errors.yoctoproject.org/Errors/Details/766895/ +# ssmping.c:55:51: error: passing argument 3 of 'getsockname' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch index 82d3551019..8c4ca55fbb 100644 --- a/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch +++ b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch @@ -1,4 +1,4 @@ -From 7ff4eba20b5c4fc7365e5ee0dfb775ed29bdd5ce Mon Sep 17 00:00:00 2001 +From c815368a3e41dd3f639eb8fd82d21bc0bab55d1e Mon Sep 17 00:00:00 2001 From: Kai Kang <kai.kang@windriver.com> Date: Wed, 1 Nov 2017 09:23:41 -0400 Subject: [PATCH] stunnel: fix compile error when openssl disable des support @@ -17,10 +17,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com> 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/common.h b/src/common.h -index 2b4869f..180d31a 100644 +index f112cf9..8d4be01 100644 --- a/src/common.h +++ b/src/common.h -@@ -492,7 +492,9 @@ extern char *sys_errlist[]; +@@ -496,7 +496,9 @@ extern char *sys_errlist[]; #ifndef OPENSSL_NO_MD4 #include <openssl/md4.h> #endif /* !defined(OPENSSL_NO_MD4) */ @@ -31,19 +31,19 @@ index 2b4869f..180d31a 100644 #include <openssl/dh.h> #if OPENSSL_VERSION_NUMBER<0x10100000L diff --git a/src/protocol.c b/src/protocol.c -index cfe6d3b..3936aea 100644 +index c8c65ea..b071b06 100644 --- a/src/protocol.c +++ b/src/protocol.c -@@ -81,7 +81,7 @@ NOEXPORT void ldap_client_middle(CLI *); - +@@ -82,7 +82,7 @@ NOEXPORT void ldap_client_middle(CLI *); NOEXPORT void connect_server_early(CLI *); + NOEXPORT const char *connect_client_init(SERVICE_OPTIONS *); NOEXPORT void connect_client_middle(CLI *); -#ifndef OPENSSL_NO_MD4 +#if !defined(OPENSSL_NO_MD4) && !defined(OPENSSL_NO_DES) NOEXPORT void ntlm(CLI *); NOEXPORT char *ntlm1(void); NOEXPORT char *ntlm3(char *, char *, char *, char *); -@@ -1331,7 +1331,7 @@ NOEXPORT void connect_client_middle(CLI *c) { +@@ -1334,7 +1334,7 @@ NOEXPORT void connect_client_middle(CLI *c) { fd_printf(c, c->remote_fd.fd, "Host: %s", c->opt->protocol_host); if(c->opt->protocol_username && c->opt->protocol_password) { if(!strcasecmp(c->opt->protocol_authentication, "ntlm")) { @@ -52,7 +52,7 @@ index cfe6d3b..3936aea 100644 ntlm(c); #else s_log(LOG_ERR, "NTLM authentication is not available"); -@@ -1374,7 +1374,7 @@ NOEXPORT void connect_client_middle(CLI *c) { +@@ -1377,7 +1377,7 @@ NOEXPORT void connect_client_middle(CLI *c) { str_free(line); } @@ -61,6 +61,3 @@ index cfe6d3b..3936aea 100644 /* * NTLM code is based on the following documentation: --- -2.34.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.72.bb b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.73.bb index 6d21027a16..e13b7871ca 100644 --- a/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.72.bb +++ b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.73.bb @@ -11,7 +11,7 @@ SRC_URI = "https://stunnel.org/archive/5.x/${BP}.tar.gz \ file://fix-openssl-no-des.patch \ " -SRC_URI[sha256sum] = "3d532941281ae353319735144e4adb9ae489a10b7e309c58a48157f08f42e949" +SRC_URI[sha256sum] = "bc917c3bcd943a4d632360c067977a31e85e385f5f4845f69749bce88183cb38" inherit autotools bash-completion pkgconfig diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest index 2bfb2267da..2bfb2267da 100755..100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.4.bb b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.5.bb index 803a9bb5f5..32b869f241 100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.4.bb +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.5.bb @@ -21,12 +21,12 @@ RDEPENDS:${PN}-ptest += " make perl \ " SRC_URI = " \ - http://www.tcpdump.org/release/${BP}.tar.gz \ + http://www.tcpdump.org/release/${BP}.tar.xz \ file://add-ptest.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "0232231bb2f29d6bf2426e70a08a7e0c63a0d59a9b44863b7f5e2357a6e49fea" +SRC_URI[sha256sum] = "d76395ab82d659d526291b013eee200201380930793531515abfc6e77b4f2ee5" UPSTREAM_CHECK_REGEX = "tcpdump-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice_1.7.bb b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice_1.8.bb index 93197dc3bc..3d61160bb0 100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice_1.7.bb +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice_1.8.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://tcpslice.c;endline=20;md5=99519e2e5234d1662a4ce16baa6 SRC_URI = "http://www.tcpdump.org/release/${BP}.tar.gz \ " -SRC_URI[sha256sum] = "e513f0710c4ab45ec627e5df6f7b80d12e488146e1bd500c92247e20ca608903" +SRC_URI[sha256sum] = "082967d6bf793499d3d655cea2149e07c0da97287f1877a6eab88d17cb703d0d" UPSTREAM_CHECK_REGEX = "tcpslice-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-do-not-run-conftest-in-case-of-cross-co.patch b/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-do-not-run-conftest-in-case-of-cross-co.patch deleted file mode 100644 index 08cb3b88fa..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-do-not-run-conftest-in-case-of-cross-co.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 42f7bbc1ce4913fe2c0bc76293c5445d31690f5d Mon Sep 17 00:00:00 2001 -From: Chen Qi <Qi.Chen@windriver.com> -Date: Thu, 7 Mar 2024 21:02:07 -0800 -Subject: [PATCH] configure.ac: do not run conftest in case of cross - compilation - -It'll give us nothing but error like below: - - ./conftest: cannot execute binary file: Exec format error - ... - ./configure: line 23950: test: -eq: unary operator expected - -The version check only has effect on Apple systems. We'd better -avoid error like above when cross compilation. - -Also, in case of cross compilation, instead of having the above -Exec format error and resulting in unaligned_cv_fail to yes, set -it directly to yes. - -Upstream-Status: Submitted [https://github.com/appneta/tcpreplay/pull/849] - -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 387219de..15201601 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -928,7 +928,7 @@ cat >conftest.c <<EOF - EOF - ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LPCAPLIB \ - conftest.c $LIBS >/dev/null 2>&1 --if test -x conftest ; then -+if test -x conftest -a "$cross_compiling" != "yes"; then - full_libpcap_version=$(LD_LIBRARY_PATH="$LPCAP_LD_LIBRARY_PATH" ./conftest) - libpcap_version=$(echo "$full_libpcap_version" | ${CUT} -d' ' -f3) - pcap_version_ok=yes -@@ -1709,7 +1709,7 @@ case "$host_os" in - EOF - ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS \ - conftest.c $LIBS >/dev/null 2>&1 -- if test ! -x conftest ; then -+ if test ! -x conftest -o "$cross_compiling" = "yes" ; then - dnl failed to compile for some reason - unaligned_cv_fail=yes - else --- -2.42.0 - diff --git a/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch b/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch deleted file mode 100644 index 709d2cccbc..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 5f8c78362b3b1e06f5adff2d4b140509c4799894 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Sun, 3 Sep 2023 12:31:59 +0200 -Subject: [PATCH] configure.ac: unify search dirs for pcap and add lib32 - -* add lib32 because when building lib32-tcpreplay it's - impossible to set --with-libpcap so that it would find - both include files as well as the library in lib32 directory - -* maybe it would be beneficial to split --with-libpcap - into --with-libpcap-includedir --with-libpcap-libdir as this - already searches in the --with-libpcap value with and - without any "lib" prefix, but include files always expect - "include" dir there - -* most of this code was added in: - https://github.com/appneta/tcpreplay/commit/202b8e82f9fd3c84ce5804577caeb36a33baabe7#diff-49473dca262eeab3b4a43002adb08b4db31020d190caaad1594b47f1d5daa810R570 - -* then search for - ${host_cpu} lib/${host_cpu} (without -${host_os} suffix) - and ${build_arch}-${host_os} lib/${build_arch}-${host_os} - was added, but only for search of dynamic library in: - https://github.com/appneta/tcpreplay/commit/c3d5236563985a99f8bb02c3f1bd6950e3929047 - -* ${build_arch}-${host_os} lib/${build_arch}-${host_os} - was later replaced with: - lib/${MULTIARCH} ${MULTIARCH} - and it was added to static library search as well - - but for dynamic library it was searching in reversed order: - ${MULTIARCH} lib/${MULTIARCH} - https://github.com/appneta/tcpreplay/commit/ed9e3a818bde04813144014561e62f018c9eb85f - - I don't think this reversed order was intentional, just unify all 4 cases - to use the same directories in the same order - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> -Upstream-Status: Submitted [https://github.com/appneta/tcpreplay/pull/819] ---- - configure.ac | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 387219de..26ba31a5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -671,7 +671,7 @@ AC_ARG_WITH(libpcap, - LPCAPINCDIR=${testdir} - if test $dynamic_link = yes; then - for ext in .dylib .so .tbd ; do -- for dir in . lib lib64 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do -+ for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do - sharefile=$(ls ${testdir}/$dir/libpcap${ext}* 2> /dev/null | sort | head -n1) - if test -n "${sharefile}"; then - LPCAP_LD_LIBRARY_PATH="$(dirname ${sharefile})" -@@ -690,7 +690,7 @@ AC_ARG_WITH(libpcap, - dnl If dynamic library not found, try static - dnl - for ext in ${libext} .a .A.tbd ; do -- for dir in . lib lib64 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do -+ for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do - staticfile=$(ls ${testdir}/$dir/libpcap${ext} 2> /dev/null | sort | head -n1) - if test -n "${staticfile}"; then - LPCAPLIB="${staticfile}" -@@ -771,7 +771,7 @@ AC_ARG_WITH(libpcap, - LPCAPINCDIR="${testdir}/include" - if test $dynamic_link = yes; then - for ext in .dylib .so .tbd; do -- for dir in . lib lib64 ${host_cpu} lib/${host_cpu} ${host_cpu}-${host_os} lib/${host_cpu}-${host_os} ${MULTIARCH} lib/${MULTIARCH}; do -+ for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do - sharefile=$(ls "${testdir}/$dir/libpcap${ext}" 2> /dev/null | sort | head -n1) - if test -n "${sharefile}"; then - LPCAPLIB="-L$(dirname ${sharefile}) -lpcap" -@@ -790,7 +790,7 @@ AC_ARG_WITH(libpcap, - dnl If dynamic library not found, try static - dnl - for ext in ${libext} .a .A.tbd ; do -- for dir in . lib lib64 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do -+ for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do - staticfile=$(ls "${testdir}/$dir/libpcap${ext}" 2> /dev/null | sort | head -n1) - if test -n "${staticfile}"; then - LPCAPLIB="${staticfile}" diff --git a/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.4.bb b/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.5.1.bb index 26de40a65a..f01bbb95a5 100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.4.bb +++ b/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.5.1.bb @@ -9,11 +9,9 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=10f0474a2f0e5dccfca20f69d6598ad8" SRC_URI = "https://github.com/appneta/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ file://0001-libopts.m4-set-POSIX_SHELL-to-bin-sh.patch \ - file://0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch \ - file://0001-configure.ac-do-not-run-conftest-in-case-of-cross-co.patch \ " -SRC_URI[sha256sum] = "44f18fb6d3470ecaf77a51b901a119dae16da5be4d4140ffbb2785e37ad6d4bf" +SRC_URI[sha256sum] = "2de79bfd67ec92ca9ae2ffb50456dd1d53ff40f3fa71b422c65e8062013c9e85" UPSTREAM_CHECK_URI = "https://github.com/appneta/tcpreplay/releases" diff --git a/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.5.bb b/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.6.bb index 862cba91e9..b72c375400 100644 --- a/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.5.bb +++ b/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.6.bb @@ -17,7 +17,7 @@ UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/traceroute/files/tracerou SRC_URI = "${SOURCEFORGE_MIRROR}/traceroute/traceroute/${BP}/${BP}.tar.gz \ " -SRC_URI[sha256sum] = "9c6c260d96eaab51e3ce461b0a84fe87123ebc6dd6c9a59fab803f95b35a859e" +SRC_URI[sha256sum] = "9ccef9cdb9d7a98ff7fbf93f79ebd0e48881664b525c4b232a0fcec7dcb9db5e" EXTRA_OEMAKE = "VPATH=${STAGING_LIBDIR}" LTOEXTRA += "-flto-partition=none" diff --git a/meta-openembedded/meta-networking/recipes-support/unbound/unbound/run-ptest b/meta-openembedded/meta-networking/recipes-support/unbound/unbound/run-ptest new file mode 100644 index 0000000000..433a687c65 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/unbound/unbound/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +cd tests || exit 1 +retVal=0 +./unittest +./testbound -s +for x in ./testdata/*.rpl; do + output="$(./testbound -p $x -o -vvvvv 2>&1)" + if test $? -eq 0; then + echo "$x :Pass" + else + echo "$output" + echo "$x :Fail" + retVal=1 + fi +done +exit $retVal diff --git a/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.20.0.bb b/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.21.0.bb index fe0111f595..8c042dc5f4 100644 --- a/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.20.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.21.0.bb @@ -9,10 +9,12 @@ SECTION = "net" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=5308494bc0590c0cb036afd781d78f06" -SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=https;branch=branch-1.20.0" -SRCREV = "b9525c5fd47ba481a29b90109017d2253beb105d" +SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=https;branch=master \ + file://run-ptest \ + " +SRCREV = "79e4c578518886a32475cfbb0de383ff3a905033" -inherit autotools pkgconfig systemd update-rc.d +inherit autotools pkgconfig systemd update-rc.d ptest DEPENDS = "openssl libtool-native bison-native expat" RDEPENDS:${PN} = "bash openssl-bin daemonize" @@ -32,6 +34,10 @@ do_configure:append() { sed -i -e 's#${RECIPE_SYSROOT}##g' ${B}/config.h } +do_compile:append() { + oe_runmake tests +} + do_install:append() { install -d ${D}${systemd_unitdir}/system install -m 0644 ${B}/contrib/unbound.service ${D}${systemd_unitdir}/system @@ -40,6 +46,19 @@ do_install:append() { install -m 0755 ${S}/contrib/unbound.init_yocto ${D}${sysconfdir}/init.d/unbound } +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + install -d ${D}${PTEST_PATH}/tests/testdata + + install -m 0544 ${B}/unittest ${D}${PTEST_PATH}/tests/ + install -m 0544 ${B}/testbound ${D}${PTEST_PATH}/tests/ + install -m 0664 ${S}/testdata/test_signatures* ${D}${PTEST_PATH}/tests/ + install -m 0664 ${S}/testdata/test_sigs* ${D}${PTEST_PATH}/tests/ + install -m 0664 ${S}/testdata/test_ds* ${D}${PTEST_PATH}/tests/ + install -m 0664 ${S}/testdata/test_nsec3_hash* ${D}${PTEST_PATH}/tests/ + install -m 0644 ${S}/testdata/*.rpl ${D}/${PTEST_PATH}/tests/testdata/ +} + SYSTEMD_SERVICE:${PN} = "${BPN}.service" INITSCRIPT_NAME = "unbound" diff --git a/meta-openembedded/meta-networking/recipes-support/wavemon/wavemon_0.9.5.bb b/meta-openembedded/meta-networking/recipes-support/wavemon/wavemon_0.9.6.bb index 9da43cf9f4..c3de38a6f8 100644 --- a/meta-openembedded/meta-networking/recipes-support/wavemon/wavemon_0.9.5.bb +++ b/meta-openembedded/meta-networking/recipes-support/wavemon/wavemon_0.9.6.bb @@ -14,7 +14,7 @@ PACKAGECONFIG[cap] = "--with-libcap,--without-libcap,libcap" DEPENDS = "libnl ncurses" SRC_URI = "git://github.com/uoaerg/wavemon;branch=master;protocol=https" -SRCREV = "a7c2f190e010db508ead31fa952478e2a1c13d64" +SRCREV = "8ba6604027c0aa5131070e3fafdcda323d58a7ad" # Needs some help to find libnl3 headers. # Reorder -pthread flag on the command line. diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_4.2.5.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb index 7cbe3e6324..3fa293d0cd 100644 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_4.2.5.bb +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb @@ -17,7 +17,7 @@ SRC_URI = "https://1.eu.dl.wireshark.org/src/wireshark-${PV}.tar.xz \ UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" -SRC_URI[sha256sum] = "55e793ab87a9a73aac44336235c92cb76c52180c469b362ed3a54f26fbb1261f" +SRC_URI[sha256sum] = "2c5de08e19081bd666a2ce3f052c023274d06acaabc5d667a3c3051a9c618f86" PE = "1" @@ -42,7 +42,7 @@ PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF" PACKAGECONFIG[sbc] = "-DENABLE_SBC=ON,-DENABLE_SBC=OFF, sbc" PACKAGECONFIG[libssh] = "-DENABLE_LIBSSH=ON,-DENABLE_LIBSSH=OFF, libssh2" PACKAGECONFIG[lz4] = "-DENABLE_LZ4=ON,-DENABLE_LZ4=OFF, lz4" -PACKAGECONFIG[zstd] = "-DENABLE_STTD=ON,-DENABLE_ZSTD=OFF, zstd" +PACKAGECONFIG[zstd] = "-DENABLE_ZSTD=ON,-DENABLE_ZSTD=OFF, zstd" PACKAGECONFIG[nghttp2] = "-DENABLE_NGHTTP2=ON,-DENABLE_NGHTTP2=OFF, nghttp2" # these next two options require addional layers |