diff options
Diffstat (limited to 'meta-networking')
43 files changed, 356 insertions, 716 deletions
diff --git a/meta-networking/conf/layer.conf b/meta-networking/conf/layer.conf index 58126a575f..18256167a3 100644 --- a/meta-networking/conf/layer.conf +++ b/meta-networking/conf/layer.conf | |||
| @@ -15,7 +15,7 @@ LAYERVERSION_networking-layer = "1" | |||
| 15 | 15 | ||
| 16 | LAYERDEPENDS_networking-layer = "core meta-python openembedded-layer" | 16 | LAYERDEPENDS_networking-layer = "core meta-python openembedded-layer" |
| 17 | 17 | ||
| 18 | LAYERSERIES_COMPAT_networking-layer = "walnascar whinlatter" | 18 | LAYERSERIES_COMPAT_networking-layer = "whinlatter wrynose" |
| 19 | 19 | ||
| 20 | LICENSE_PATH += "${LAYERDIR}/licenses" | 20 | LICENSE_PATH += "${LAYERDIR}/licenses" |
| 21 | 21 | ||
diff --git a/meta-networking/recipes-connectivity/daq/libdaq_3.0.23.bb b/meta-networking/recipes-connectivity/daq/libdaq_3.0.25.bb index 8e1d707174..b999f385a6 100644 --- a/meta-networking/recipes-connectivity/daq/libdaq_3.0.23.bb +++ b/meta-networking/recipes-connectivity/daq/libdaq_3.0.25.bb | |||
| @@ -12,7 +12,7 @@ inherit autotools pkgconfig | |||
| 12 | SRC_URI = "git://github.com/snort3/libdaq.git;protocol=https;branch=master;tag=v${PV} \ | 12 | SRC_URI = "git://github.com/snort3/libdaq.git;protocol=https;branch=master;tag=v${PV} \ |
| 13 | file://0001-example-Use-lm-for-the-fst-module.patch" | 13 | file://0001-example-Use-lm-for-the-fst-module.patch" |
| 14 | 14 | ||
| 15 | SRCREV = "f14981a2f83a57c86d125ad926b9c7788737f52d" | 15 | SRCREV = "7baba902b3fee7a81be663bfb71418402411c24a" |
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | FILES:${PN} += "${libdir}/daq/*.so" | 18 | FILES:${PN} += "${libdir}/daq/*.so" |
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-meson-fix-cross-compilation-issues.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-meson-fix-cross-compilation-issues.patch new file mode 100644 index 0000000000..617c614958 --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-meson-fix-cross-compilation-issues.patch | |||
| @@ -0,0 +1,69 @@ | |||
| 1 | From 49cc7ebaf3ed86b693ac80c76a28ba0db7406374 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Andrej Kozemcak <andrej.kozemcak@siemens.com> | ||
| 3 | Date: Mon, 9 Mar 2026 15:50:26 +0100 | ||
| 4 | Subject: [PATCH] meson: fix cross-compilation issues | ||
| 5 | |||
| 6 | Strip newline from GI_TYPELIB_PATH and LD_LIBRARY_PATH | ||
| 7 | run_command().stdout() returns the raw shell output including a trailing | ||
| 8 | newline. When the value is used to build a colon-separated path, the newline | ||
| 9 | gets embedded at the end of the last path component, making the directory | ||
| 10 | invalid and causing GObject Introspection to fail with: | ||
| 11 | |||
| 12 | ImportError: Typelib file for namespace 'Gio', version '2.0' not found | ||
| 13 | |||
| 14 | Use .strip() to remove leading/trailing whitespace from both env variable | ||
| 15 | reads. | ||
| 16 | |||
| 17 | Fix jansson SONAME detection for cross-compilation | ||
| 18 | When cross-compiling, jansson's pkg-config 'libdir' variable returns a | ||
| 19 | path relative to the sysroot (e.g., /usr/lib) without the actual sysroot | ||
| 20 | prefix. The host readelf binary cannot find the library at that path. | ||
| 21 | |||
| 22 | Fix this by using meson.get_external_property('sys_root', '') to obtain | ||
| 23 | the sysroot path set by the cross-compilation environment and prepend it | ||
| 24 | to the library path before calling readelf. | ||
| 25 | |||
| 26 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2380] | ||
| 27 | Signed-off-by: Andrej Kozemcak <andrej.kozemcak@siemens.com> | ||
| 28 | --- | ||
| 29 | meson.build | 3 ++- | ||
| 30 | src/libnm-client-impl/meson.build | 4 ++-- | ||
| 31 | 2 files changed, 4 insertions(+), 3 deletions(-) | ||
| 32 | |||
| 33 | diff --git a/meson.build b/meson.build | ||
| 34 | index 8b0334240d..75f6871dd2 100644 | ||
| 35 | --- a/meson.build | ||
| 36 | +++ b/meson.build | ||
| 37 | @@ -296,7 +296,8 @@ config_h.set10('WITH_JANSSON', jansson_dep.found()) | ||
| 38 | jansson_msg = 'no' | ||
| 39 | if jansson_dep.found() | ||
| 40 | jansson_libdir = jansson_dep.get_variable(pkgconfig: 'libdir') | ||
| 41 | - res = run_command(find_program('eu-readelf', 'readelf'), '-d', join_paths(jansson_libdir, 'libjansson.so'), check: false) | ||
| 42 | + jansson_sysroot = meson.is_cross_build() ? meson.get_external_property('sys_root', '') : '' | ||
| 43 | + res = run_command(find_program('eu-readelf', 'readelf'), '-d', jansson_sysroot + join_paths(jansson_libdir, 'libjansson.so'), check: false) | ||
| 44 | jansson_soname = '' | ||
| 45 | foreach line: res.stdout().split('\n') | ||
| 46 | if line.strip().contains('SONAME') | ||
| 47 | diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build | ||
| 48 | index 3352ebfee0..329078ab46 100644 | ||
| 49 | --- a/src/libnm-client-impl/meson.build | ||
| 50 | +++ b/src/libnm-client-impl/meson.build | ||
| 51 | @@ -167,13 +167,13 @@ if enable_introspection | ||
| 52 | install: true, | ||
| 53 | ) | ||
| 54 | |||
| 55 | - gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH', check: false).stdout() | ||
| 56 | + gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH', check: false).stdout().strip() | ||
| 57 | if gi_typelib_path != '' | ||
| 58 | gi_typelib_path = ':' + gi_typelib_path | ||
| 59 | endif | ||
| 60 | gi_typelib_path = meson.current_build_dir() + gi_typelib_path | ||
| 61 | |||
| 62 | - ld_library_path = run_command('printenv', 'LD_LIBRARY_PATH', check: false).stdout() | ||
| 63 | + ld_library_path = run_command('printenv', 'LD_LIBRARY_PATH', check: false).stdout().strip() | ||
| 64 | if ld_library_path != '' | ||
| 65 | ld_library_path = ':' + ld_library_path | ||
| 66 | endif | ||
| 67 | -- | ||
| 68 | 2.47.3 | ||
| 69 | |||
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.52.2.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.56.0.bb index cafc6ce3f2..de163fe00e 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.52.2.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.56.0.bb | |||
| @@ -38,14 +38,15 @@ DEPENDS:append:class-target = " bash-completion" | |||
| 38 | inherit meson gettext update-rc.d systemd gobject-introspection update-alternatives upstream-version-is-even pkgconfig | 38 | inherit meson gettext update-rc.d systemd gobject-introspection update-alternatives upstream-version-is-even pkgconfig |
| 39 | 39 | ||
| 40 | SRC_URI = " \ | 40 | SRC_URI = " \ |
| 41 | git://github.com/NetworkManager/NetworkManager.git;protocol=https;branch=nm-1-52;tag=${PV} \ | 41 | git://github.com/NetworkManager/NetworkManager.git;protocol=https;branch=nm-1-56;tag=${PV} \ |
| 42 | file://${BPN}.initd \ | 42 | file://${BPN}.initd \ |
| 43 | file://enable-dhcpcd.conf \ | 43 | file://enable-dhcpcd.conf \ |
| 44 | file://enable-iwd.conf \ | 44 | file://enable-iwd.conf \ |
| 45 | file://0002-meson-fix-cross-compilation-issues.patch \ | ||
| 45 | " | 46 | " |
| 46 | 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)}" | 47 | 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)}" |
| 47 | 48 | ||
| 48 | SRCREV = "57a409441bef013f636ac8e72836c19ecb27c1b9" | 49 | SRCREV = "56b51b98fbb8627c4c09a483702e18fd8aee7ce1" |
| 49 | 50 | ||
| 50 | 51 | ||
| 51 | # ['auto', 'symlink', 'file', 'netconfig', 'resolvconf'] | 52 | # ['auto', 'symlink', 'file', 'netconfig', 'resolvconf'] |
| @@ -68,6 +69,7 @@ EXTRA_OEMESON = "\ | |||
| 68 | -Dconfig_dhcp_default=${NETWORKMANAGER_DHCP_DEFAULT} \ | 69 | -Dconfig_dhcp_default=${NETWORKMANAGER_DHCP_DEFAULT} \ |
| 69 | -Diptables=${sbindir}/iptables \ | 70 | -Diptables=${sbindir}/iptables \ |
| 70 | -Dnft=${sbindir}/nft \ | 71 | -Dnft=${sbindir}/nft \ |
| 72 | -Dman=false \ | ||
| 71 | " | 73 | " |
| 72 | 74 | ||
| 73 | # stolen from https://github.com/void-linux/void-packages/blob/master/srcpkgs/NetworkManager/template | 75 | # stolen from https://github.com/void-linux/void-packages/blob/master/srcpkgs/NetworkManager/template |
| @@ -80,7 +82,7 @@ CFLAGS:append:libc-musl = " \ | |||
| 80 | # networkmanager-1.52.0/src/nmcli/agent.c:88:29: error: incompatible function pointer types assigning to 'rl_hook_func_t *' (aka 'int (*)(void)') from 'int (const char *, int)' [-Wincompatible-function-pointer-types] | 82 | # networkmanager-1.52.0/src/nmcli/agent.c:88:29: error: incompatible function pointer types assigning to 'rl_hook_func_t *' (aka 'int (*)(void)') from 'int (const char *, int)' [-Wincompatible-function-pointer-types] |
| 81 | # 88 | rl_startup_hook = set_deftext; | 83 | # 88 | rl_startup_hook = set_deftext; |
| 82 | # | ^ ~~~~~~~~~~~ | 84 | # | ^ ~~~~~~~~~~~ |
| 83 | 85 | ||
| 84 | CFLAGS:append:toolchain-clang = " -Wno-error=incompatible-function-pointer-types" | 86 | CFLAGS:append:toolchain-clang = " -Wno-error=incompatible-function-pointer-types" |
| 85 | 87 | ||
| 86 | PACKAGECONFIG ??= "readline nss ifupdown dnsmasq nmcli \ | 88 | PACKAGECONFIG ??= "readline nss ifupdown dnsmasq nmcli \ |
| @@ -111,13 +113,13 @@ PACKAGECONFIG[crypto-null] = "-Dcrypto=null" | |||
| 111 | PACKAGECONFIG[wifi] = "-Dwext=true -Dwifi=true,-Dwext=false -Dwifi=false" | 113 | PACKAGECONFIG[wifi] = "-Dwext=true -Dwifi=true,-Dwext=false -Dwifi=false" |
| 112 | PACKAGECONFIG[iwd] = "-Diwd=true,-Diwd=false" | 114 | PACKAGECONFIG[iwd] = "-Diwd=true,-Diwd=false" |
| 113 | PACKAGECONFIG[ifupdown] = "-Difupdown=true,-Difupdown=false" | 115 | PACKAGECONFIG[ifupdown] = "-Difupdown=true,-Difupdown=false" |
| 114 | PACKAGECONFIG[cloud-setup] = "-Dnm_cloud_setup=true,-Dnm_cloud_setup=false" | 116 | PACKAGECONFIG[cloud-setup] = "-Dnm_cloud_setup=true,-Dnm_cloud_setup=false,jansson" |
| 115 | PACKAGECONFIG[nmcli] = "-Dnmcli=true,-Dnmcli=false" | 117 | PACKAGECONFIG[nmcli] = "-Dnmcli=true,-Dnmcli=false" |
| 116 | PACKAGECONFIG[nmtui] = "-Dnmtui=true,-Dnmtui=false,libnewt" | 118 | PACKAGECONFIG[nmtui] = "-Dnmtui=true,-Dnmtui=false,libnewt" |
| 117 | PACKAGECONFIG[readline] = "-Dreadline=libreadline,,readline" | 119 | PACKAGECONFIG[readline] = "-Dreadline=libreadline,,readline" |
| 118 | PACKAGECONFIG[libedit] = "-Dreadline=libedit,,libedit" | 120 | PACKAGECONFIG[libedit] = "-Dreadline=libedit,,libedit" |
| 119 | PACKAGECONFIG[ovs] = "-Dovs=true,-Dovs=false,jansson" | 121 | PACKAGECONFIG[ovs] = "-Dovs=true,-Dovs=false,jansson" |
| 120 | PACKAGECONFIG[audit] = "-Dlibaudit=yes,-Dlibaudit=no" | 122 | PACKAGECONFIG[audit] = "-Dlibaudit=yes,-Dlibaudit=no,audit" |
| 121 | PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux" | 123 | PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux" |
| 122 | PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false" | 124 | PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false" |
| 123 | PACKAGECONFIG[dhcpcd] = "-Ddhcpcd=${base_sbindir}/dhcpcd,-Ddhcpcd=no,,dhcpcd" | 125 | PACKAGECONFIG[dhcpcd] = "-Ddhcpcd=${base_sbindir}/dhcpcd,-Ddhcpcd=no,,dhcpcd" |
| @@ -127,6 +129,7 @@ PACKAGECONFIG[adsl] = ",," | |||
| 127 | PACKAGECONFIG[wwan] = ",," | 129 | PACKAGECONFIG[wwan] = ",," |
| 128 | # The following PACKAGECONFIG is used to determine whether NM is managing /etc/resolv.conf itself or not | 130 | # The following PACKAGECONFIG is used to determine whether NM is managing /etc/resolv.conf itself or not |
| 129 | PACKAGECONFIG[man-resolv-conf] = ",," | 131 | PACKAGECONFIG[man-resolv-conf] = ",," |
| 132 | PACKAGECONFIG[nbft] = "-Dnbft=true,-Dnbft=false" | ||
| 130 | 133 | ||
| 131 | 134 | ||
| 132 | PACKAGES =+ " \ | 135 | PACKAGES =+ " \ |
diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-build-with-fno-common.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-build-with-fno-common.patch deleted file mode 100644 index b581c571bb..0000000000 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-build-with-fno-common.patch +++ /dev/null | |||
| @@ -1,311 +0,0 @@ | |||
| 1 | From 9a46462f08535e946d97fd40c79229a7ee8b7336 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Mon, 17 Aug 2020 00:00:00 -0700 | ||
| 4 | Subject: [PATCH] Fix build with -fno-common | ||
| 5 | |||
| 6 | Mark the declarations with extern where needed in header files | ||
| 7 | |||
| 8 | Upstream-Status: Pending | ||
| 9 | |||
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 11 | --- | ||
| 12 | src/ckpt/agent/cpa_cb.h | 2 +- | ||
| 13 | src/ckpt/ckptd/cpd_init.h | 2 +- | ||
| 14 | src/evt/agent/eda.h | 2 +- | ||
| 15 | src/evt/evtd/eds.h | 2 +- | ||
| 16 | src/evt/evtd/eds_amf.c | 2 ++ | ||
| 17 | src/evt/evtd/eds_amf.h | 2 +- | ||
| 18 | src/evt/evtd/eds_cb.h | 2 +- | ||
| 19 | src/imm/immd/immd.h | 2 +- | ||
| 20 | src/lck/lckd/gld_dl_api.h | 4 ++-- | ||
| 21 | src/lck/lcknd/glnd_cb.h | 4 ++-- | ||
| 22 | src/mds/mds_core.h | 34 +++++++++++++++++++--------------- | ||
| 23 | src/mds/mds_dt_tcp.c | 2 ++ | ||
| 24 | src/mds/mds_dt_tcp.h | 2 +- | ||
| 25 | src/mds/mds_main.c | 2 +- | ||
| 26 | src/msg/msgnd/mqnd_db.h | 2 +- | ||
| 27 | 15 files changed, 37 insertions(+), 29 deletions(-) | ||
| 28 | |||
| 29 | diff --git a/src/ckpt/agent/cpa_cb.h b/src/ckpt/agent/cpa_cb.h | ||
| 30 | index ac48c6c..d633583 100644 | ||
| 31 | --- a/src/ckpt/agent/cpa_cb.h | ||
| 32 | +++ b/src/ckpt/agent/cpa_cb.h | ||
| 33 | @@ -119,7 +119,7 @@ typedef struct cpa_cb { | ||
| 34 | |||
| 35 | } CPA_CB; | ||
| 36 | |||
| 37 | -uint32_t gl_cpa_hdl; | ||
| 38 | +extern uint32_t gl_cpa_hdl; | ||
| 39 | |||
| 40 | typedef struct cpa_prcess_evt_sync { | ||
| 41 | NCS_QELEM qelem; | ||
| 42 | diff --git a/src/ckpt/ckptd/cpd_init.h b/src/ckpt/ckptd/cpd_init.h | ||
| 43 | index 0c02642..cf3466b 100644 | ||
| 44 | --- a/src/ckpt/ckptd/cpd_init.h | ||
| 45 | +++ b/src/ckpt/ckptd/cpd_init.h | ||
| 46 | @@ -33,7 +33,7 @@ | ||
| 47 | #include <saAmf.h> | ||
| 48 | #include "cpd_cb.h" | ||
| 49 | |||
| 50 | -uint32_t gl_cpd_cb_hdl; | ||
| 51 | +extern uint32_t gl_cpd_cb_hdl; | ||
| 52 | |||
| 53 | /* Macro to get the component name for the component type */ | ||
| 54 | #define m_CPD_TASKNAME "CPD" | ||
| 55 | diff --git a/src/evt/agent/eda.h b/src/evt/agent/eda.h | ||
| 56 | index 4d1991c..138c910 100644 | ||
| 57 | --- a/src/evt/agent/eda.h | ||
| 58 | +++ b/src/evt/agent/eda.h | ||
| 59 | @@ -39,7 +39,7 @@ | ||
| 60 | #include "base/logtrace.h" | ||
| 61 | |||
| 62 | /* EDA CB global handle declaration */ | ||
| 63 | -uint32_t gl_eda_hdl; | ||
| 64 | +extern uint32_t gl_eda_hdl; | ||
| 65 | |||
| 66 | /* EDA Default MDS timeout value */ | ||
| 67 | #define EDA_MDS_DEF_TIMEOUT 100 | ||
| 68 | diff --git a/src/evt/evtd/eds.h b/src/evt/evtd/eds.h | ||
| 69 | index bc9c429..3545d77 100644 | ||
| 70 | --- a/src/evt/evtd/eds.h | ||
| 71 | +++ b/src/evt/evtd/eds.h | ||
| 72 | @@ -72,6 +72,6 @@ | ||
| 73 | #include "base/daemon.h" | ||
| 74 | |||
| 75 | /* EDS CB global handle declaration */ | ||
| 76 | -uint32_t gl_eds_hdl; | ||
| 77 | +extern uint32_t gl_eds_hdl; | ||
| 78 | |||
| 79 | #endif // EVT_EVTD_EDS_H_ | ||
| 80 | diff --git a/src/evt/evtd/eds_amf.c b/src/evt/evtd/eds_amf.c | ||
| 81 | index 97b71a5..adebf0c 100644 | ||
| 82 | --- a/src/evt/evtd/eds_amf.c | ||
| 83 | +++ b/src/evt/evtd/eds_amf.c | ||
| 84 | @@ -30,6 +30,8 @@ stuff. | ||
| 85 | #include "eds.h" | ||
| 86 | #include "eds_dl_api.h" | ||
| 87 | |||
| 88 | +struct next_HAState nextStateInfo; | ||
| 89 | + | ||
| 90 | /* HA AMF statemachine & State handler definitions */ | ||
| 91 | |||
| 92 | /**************************************************************************** | ||
| 93 | diff --git a/src/evt/evtd/eds_amf.h b/src/evt/evtd/eds_amf.h | ||
| 94 | index e9aeaa6..f9803b4 100644 | ||
| 95 | --- a/src/evt/evtd/eds_amf.h | ||
| 96 | +++ b/src/evt/evtd/eds_amf.h | ||
| 97 | @@ -49,7 +49,7 @@ uint32_t eds_quiesced_state_handler(EDS_CB *cb, SaInvocationT invocation); | ||
| 98 | struct next_HAState { | ||
| 99 | uint8_t nextState1; | ||
| 100 | uint8_t nextState2; | ||
| 101 | -} nextStateInfo; /* AMF HA state can transit to a maximum of the two defined | ||
| 102 | +}; /* AMF HA state can transit to a maximum of the two defined | ||
| 103 | states */ | ||
| 104 | |||
| 105 | #define VALIDATE_STATE(curr, next) \ | ||
| 106 | diff --git a/src/evt/evtd/eds_cb.h b/src/evt/evtd/eds_cb.h | ||
| 107 | index c127ead..19c48cd 100644 | ||
| 108 | --- a/src/evt/evtd/eds_cb.h | ||
| 109 | +++ b/src/evt/evtd/eds_cb.h | ||
| 110 | @@ -40,7 +40,7 @@ | ||
| 111 | #include "base/ncssysf_tmr.h" | ||
| 112 | |||
| 113 | /* global variables */ | ||
| 114 | -uint32_t gl_eds_hdl; | ||
| 115 | +extern uint32_t gl_eds_hdl; | ||
| 116 | |||
| 117 | struct eda_reg_list_tag; | ||
| 118 | |||
| 119 | diff --git a/src/imm/immd/immd.h b/src/imm/immd/immd.h | ||
| 120 | index 7dc1da6..bab3945 100644 | ||
| 121 | --- a/src/imm/immd/immd.h | ||
| 122 | +++ b/src/imm/immd/immd.h | ||
| 123 | @@ -42,7 +42,7 @@ | ||
| 124 | #include "immd_sbedu.h" | ||
| 125 | #include "base/ncs_mda_pvt.h" | ||
| 126 | |||
| 127 | -IMMD_CB *immd_cb; | ||
| 128 | +extern IMMD_CB *immd_cb; | ||
| 129 | |||
| 130 | extern uint32_t initialize_for_assignment(IMMD_CB *cb, SaAmfHAStateT ha_state); | ||
| 131 | |||
| 132 | diff --git a/src/lck/lckd/gld_dl_api.h b/src/lck/lckd/gld_dl_api.h | ||
| 133 | index 6476a71..3a67fd1 100644 | ||
| 134 | --- a/src/lck/lckd/gld_dl_api.h | ||
| 135 | +++ b/src/lck/lckd/gld_dl_api.h | ||
| 136 | @@ -33,7 +33,7 @@ | ||
| 137 | #include "base/ncsgl_defs.h" | ||
| 138 | #include "base/ncs_lib.h" | ||
| 139 | |||
| 140 | -uint32_t gl_gld_hdl; | ||
| 141 | -uint32_t gld_lib_req(NCS_LIB_REQ_INFO *req_info); | ||
| 142 | +extern uint32_t gl_gld_hdl; | ||
| 143 | +extern uint32_t gld_lib_req(NCS_LIB_REQ_INFO *req_info); | ||
| 144 | |||
| 145 | #endif // LCK_LCKD_GLD_DL_API_H_ | ||
| 146 | diff --git a/src/lck/lcknd/glnd_cb.h b/src/lck/lcknd/glnd_cb.h | ||
| 147 | index 3b82f60..77a1f88 100644 | ||
| 148 | --- a/src/lck/lcknd/glnd_cb.h | ||
| 149 | +++ b/src/lck/lcknd/glnd_cb.h | ||
| 150 | @@ -28,8 +28,8 @@ extern "C" { | ||
| 151 | #endif | ||
| 152 | |||
| 153 | /* global variables */ | ||
| 154 | -uint32_t gl_glnd_hdl; | ||
| 155 | -NCSCONTEXT gl_glnd_task_hdl; | ||
| 156 | +extern uint32_t gl_glnd_hdl; | ||
| 157 | +extern NCSCONTEXT gl_glnd_task_hdl; | ||
| 158 | |||
| 159 | /* macros for the global varibales */ | ||
| 160 | #define m_GLND_RETRIEVE_GLND_CB_HDL gl_glnd_hdl | ||
| 161 | diff --git a/src/mds/mds_core.h b/src/mds/mds_core.h | ||
| 162 | index dad62cd..ed69d3a 100644 | ||
| 163 | --- a/src/mds/mds_core.h | ||
| 164 | +++ b/src/mds/mds_core.h | ||
| 165 | @@ -26,6 +26,10 @@ | ||
| 166 | #ifndef MDS_MDS_CORE_H_ | ||
| 167 | #define MDS_MDS_CORE_H_ | ||
| 168 | |||
| 169 | +#ifndef EXTERN | ||
| 170 | +#define EXTERN extern | ||
| 171 | +#endif | ||
| 172 | + | ||
| 173 | #include <pthread.h> | ||
| 174 | #include "base/ncsgl_defs.h" | ||
| 175 | #include "mds/mds_papi.h" | ||
| 176 | @@ -600,65 +604,65 @@ extern "C" { | ||
| 177 | /* ******************************************** */ | ||
| 178 | |||
| 179 | /* Initialization of MDTM Module */ | ||
| 180 | -uint32_t (*mds_mdtm_init)(NODE_ID node_id, uint32_t *mds_tipc_ref); | ||
| 181 | +EXTERN uint32_t (*mds_mdtm_init)(NODE_ID node_id, uint32_t *mds_tipc_ref); | ||
| 182 | |||
| 183 | /* Destroying the MDTM Module*/ | ||
| 184 | -uint32_t (*mds_mdtm_destroy)(void); | ||
| 185 | +EXTERN uint32_t (*mds_mdtm_destroy)(void); | ||
| 186 | |||
| 187 | -uint32_t (*mds_mdtm_send)(MDTM_SEND_REQ *req); | ||
| 188 | +EXTERN uint32_t (*mds_mdtm_send)(MDTM_SEND_REQ *req); | ||
| 189 | |||
| 190 | /* SVC Install */ | ||
| 191 | -uint32_t (*mds_mdtm_svc_install)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, | ||
| 192 | +EXTERN uint32_t (*mds_mdtm_svc_install)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, | ||
| 193 | NCSMDS_SCOPE_TYPE install_scope, | ||
| 194 | V_DEST_RL role, MDS_VDEST_ID vdest_id, | ||
| 195 | NCS_VDEST_TYPE vdest_policy, | ||
| 196 | MDS_SVC_PVT_SUB_PART_VER mds_svc_pvt_ver); | ||
| 197 | |||
| 198 | /* SVC Uninstall */ | ||
| 199 | -uint32_t (*mds_mdtm_svc_uninstall)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, | ||
| 200 | +EXTERN uint32_t (*mds_mdtm_svc_uninstall)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, | ||
| 201 | NCSMDS_SCOPE_TYPE install_scope, | ||
| 202 | V_DEST_RL role, MDS_VDEST_ID vdest_id, | ||
| 203 | NCS_VDEST_TYPE vdest_policy, | ||
| 204 | MDS_SVC_PVT_SUB_PART_VER mds_svc_pvt_ver); | ||
| 205 | |||
| 206 | /* SVC Subscribe */ | ||
| 207 | -uint32_t (*mds_mdtm_svc_subscribe)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, | ||
| 208 | +EXTERN uint32_t (*mds_mdtm_svc_subscribe)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, | ||
| 209 | NCSMDS_SCOPE_TYPE subscribe_scope, | ||
| 210 | MDS_SVC_HDL local_svc_hdl, | ||
| 211 | MDS_SUBTN_REF_VAL *subtn_ref_val); | ||
| 212 | |||
| 213 | /* added svc_hdl */ | ||
| 214 | /* SVC Unsubscribe */ | ||
| 215 | -uint32_t (*mds_mdtm_svc_unsubscribe)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, | ||
| 216 | +EXTERN uint32_t (*mds_mdtm_svc_unsubscribe)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, | ||
| 217 | NCSMDS_SCOPE_TYPE subscribe_scope, | ||
| 218 | MDS_SUBTN_REF_VAL subtn_ref_val); | ||
| 219 | |||
| 220 | /* VDEST Install */ | ||
| 221 | -uint32_t (*mds_mdtm_vdest_install)(MDS_VDEST_ID vdest_id); | ||
| 222 | +EXTERN uint32_t (*mds_mdtm_vdest_install)(MDS_VDEST_ID vdest_id); | ||
| 223 | |||
| 224 | /* VDEST Uninstall */ | ||
| 225 | -uint32_t (*mds_mdtm_vdest_uninstall)(MDS_VDEST_ID vdest_id); | ||
| 226 | +EXTERN uint32_t (*mds_mdtm_vdest_uninstall)(MDS_VDEST_ID vdest_id); | ||
| 227 | |||
| 228 | /* VDEST Subscribe */ | ||
| 229 | -uint32_t (*mds_mdtm_vdest_subscribe)(MDS_VDEST_ID vdest_id, | ||
| 230 | +EXTERN uint32_t (*mds_mdtm_vdest_subscribe)(MDS_VDEST_ID vdest_id, | ||
| 231 | MDS_SUBTN_REF_VAL *subtn_ref_val); | ||
| 232 | |||
| 233 | /* VDEST Unsubscribe */ | ||
| 234 | -uint32_t (*mds_mdtm_vdest_unsubscribe)(MDS_VDEST_ID vdest_id, | ||
| 235 | +EXTERN uint32_t (*mds_mdtm_vdest_unsubscribe)(MDS_VDEST_ID vdest_id, | ||
| 236 | MDS_SUBTN_REF_VAL subtn_ref_val); | ||
| 237 | |||
| 238 | /* Tx Register (For incrementing the use count) */ | ||
| 239 | -uint32_t (*mds_mdtm_tx_hdl_register)(MDS_DEST adest); | ||
| 240 | +EXTERN uint32_t (*mds_mdtm_tx_hdl_register)(MDS_DEST adest); | ||
| 241 | |||
| 242 | /* Tx Unregister (For decrementing the use count) */ | ||
| 243 | -uint32_t (*mds_mdtm_tx_hdl_unregister)(MDS_DEST adest); | ||
| 244 | +EXTERN uint32_t (*mds_mdtm_tx_hdl_unregister)(MDS_DEST adest); | ||
| 245 | |||
| 246 | /* Node subscription */ | ||
| 247 | -uint32_t (*mds_mdtm_node_subscribe)(MDS_SVC_HDL svc_hdl, | ||
| 248 | +EXTERN uint32_t (*mds_mdtm_node_subscribe)(MDS_SVC_HDL svc_hdl, | ||
| 249 | MDS_SUBTN_REF_VAL *subtn_ref_val); | ||
| 250 | |||
| 251 | /* Node unsubscription */ | ||
| 252 | -uint32_t (*mds_mdtm_node_unsubscribe)(MDS_SUBTN_REF_VAL subtn_ref_val); | ||
| 253 | +EXTERN uint32_t (*mds_mdtm_node_unsubscribe)(MDS_SUBTN_REF_VAL subtn_ref_val); | ||
| 254 | |||
| 255 | #ifdef __cplusplus | ||
| 256 | } | ||
| 257 | diff --git a/src/mds/mds_dt_tcp.c b/src/mds/mds_dt_tcp.c | ||
| 258 | index 4a37246..e73cef4 100644 | ||
| 259 | --- a/src/mds/mds_dt_tcp.c | ||
| 260 | +++ b/src/mds/mds_dt_tcp.c | ||
| 261 | @@ -70,6 +70,8 @@ NCS_PATRICIA_TREE mdtm_reassembly_list; | ||
| 262 | |||
| 263 | /* Get the pid of the process */ | ||
| 264 | pid_t mdtm_pid; | ||
| 265 | + | ||
| 266 | +MDTM_TCP_CB *tcp_cb; | ||
| 267 | |||
| 268 | static void mds_mdtm_enc_init(MDS_MDTM_DTM_MSG *init, uint8_t *buff); | ||
| 269 | static uint32_t mdtm_create_rcv_task(void); | ||
| 270 | diff --git a/src/mds/mds_dt_tcp.h b/src/mds/mds_dt_tcp.h | ||
| 271 | index 1065464..350d534 100644 | ||
| 272 | --- a/src/mds/mds_dt_tcp.h | ||
| 273 | +++ b/src/mds/mds_dt_tcp.h | ||
| 274 | @@ -50,7 +50,7 @@ typedef struct mdtm_tcp_cb { | ||
| 275 | |||
| 276 | } MDTM_TCP_CB; | ||
| 277 | |||
| 278 | -MDTM_TCP_CB *tcp_cb; | ||
| 279 | +extern MDTM_TCP_CB *tcp_cb; | ||
| 280 | |||
| 281 | typedef enum mds_mdtm_dtm_msg_types { | ||
| 282 | MDS_MDTM_DTM_PID_TYPE = 1, | ||
| 283 | diff --git a/src/mds/mds_main.c b/src/mds/mds_main.c | ||
| 284 | index 0bcb2f9..5671ed3 100644 | ||
| 285 | --- a/src/mds/mds_main.c | ||
| 286 | +++ b/src/mds/mds_main.c | ||
| 287 | @@ -20,7 +20,7 @@ | ||
| 288 | #endif | ||
| 289 | |||
| 290 | #include "osaf/configmake.h" | ||
| 291 | - | ||
| 292 | +#define EXTERN | ||
| 293 | /***************************************************************************** | ||
| 294 | .............................................................................. | ||
| 295 | |||
| 296 | diff --git a/src/msg/msgnd/mqnd_db.h b/src/msg/msgnd/mqnd_db.h | ||
| 297 | index b78024e..fee43e5 100644 | ||
| 298 | --- a/src/msg/msgnd/mqnd_db.h | ||
| 299 | +++ b/src/msg/msgnd/mqnd_db.h | ||
| 300 | @@ -33,7 +33,7 @@ | ||
| 301 | #include <saClm.h> | ||
| 302 | #include <saImmOi.h> | ||
| 303 | /* Decleration for global variable */ | ||
| 304 | -uint32_t gl_mqnd_cb_hdl; | ||
| 305 | +extern uint32_t gl_mqnd_cb_hdl; | ||
| 306 | |||
| 307 | /* Macros for reading global database */ | ||
| 308 | #define m_MQND_STORE_HDL(hdl) (gl_mqnd_cb_hdl = (hdl)) | ||
| 309 | -- | ||
| 310 | 2.28.0 | ||
| 311 | |||
diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-To-fix-Werror-discarded-qualifiers-error.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-To-fix-Werror-discarded-qualifiers-error.patch new file mode 100644 index 0000000000..d27c783cde --- /dev/null +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-To-fix-Werror-discarded-qualifiers-error.patch | |||
| @@ -0,0 +1,81 @@ | |||
| 1 | From ac79c1da91f51b10059a266bf4db068a01963b01 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Liu Yiding <liuyd.fnst@fujitsu.com> | ||
| 3 | Date: Wed, 18 Mar 2026 03:35:16 +0000 | ||
| 4 | Subject: [PATCH] To fix [-Werror=discarded-qualifiers] error to build with glibc 2.43 | ||
| 5 | |||
| 6 | | ../sources/opensaf-5.22.01/src/osaf/immutil/immutil.c:339:12: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers] | ||
| 7 | | 339 | cp = strstr(buffer, key); | ||
| 8 | |||
| 9 | Upstream-Status: Pending | ||
| 10 | |||
| 11 | Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> | ||
| 12 | --- | ||
| 13 | src/amf/common/util.c | 8 ++++---- | ||
| 14 | src/ckpt/ckptd/cpd_imm.c | 4 ++-- | ||
| 15 | src/osaf/immutil/immutil.c | 2 +- | ||
| 16 | 3 files changed, 7 insertions(+), 7 deletions(-) | ||
| 17 | |||
| 18 | diff --git a/src/amf/common/util.c b/src/amf/common/util.c | ||
| 19 | index d17b766..56c1a50 100644 | ||
| 20 | --- a/src/amf/common/util.c | ||
| 21 | +++ b/src/amf/common/util.c | ||
| 22 | @@ -252,8 +252,8 @@ void avsv_sanamet_init_from_association_dn(const SaNameT *haystack, SaNameT *dn, | ||
| 23 | const char *needle, | ||
| 24 | const char *parent) | ||
| 25 | { | ||
| 26 | - char *p; | ||
| 27 | - char *pp; | ||
| 28 | + const char *p; | ||
| 29 | + const char *pp; | ||
| 30 | int i = 0; | ||
| 31 | |||
| 32 | osaf_extended_name_clear(dn); | ||
| 33 | @@ -270,8 +270,8 @@ void avsv_sanamet_init_from_association_dn(const SaNameT *haystack, SaNameT *dn, | ||
| 34 | |||
| 35 | /* copy the value upto parent but skip escape chars */ | ||
| 36 | int size = 0; | ||
| 37 | - char *p1 = p; | ||
| 38 | - char *pp1 = pp; | ||
| 39 | + const char *p1 = p; | ||
| 40 | + const char *pp1 = pp; | ||
| 41 | while (p != pp) { | ||
| 42 | if (*p != '\\') | ||
| 43 | size++; | ||
| 44 | diff --git a/src/ckpt/ckptd/cpd_imm.c b/src/ckpt/ckptd/cpd_imm.c | ||
| 45 | index e2dee0c..7c25d02 100644 | ||
| 46 | --- a/src/ckpt/ckptd/cpd_imm.c | ||
| 47 | +++ b/src/ckpt/ckptd/cpd_imm.c | ||
| 48 | @@ -117,7 +117,7 @@ cpd_saImmOiRtAttrUpdateCallback(SaImmOiHandleT immOiHandle, | ||
| 49 | /* Extract ckpt_name and node_name */ | ||
| 50 | if (strncmp(object_name, "safReplica=", 11) == 0) { | ||
| 51 | /* Extract ckpt_name */ | ||
| 52 | - char *p_char = strchr(object_name, ','); | ||
| 53 | + const char *p_char = strchr(object_name, ','); | ||
| 54 | if (p_char) { | ||
| 55 | p_char++; /* escaping first ',' of the associated class | ||
| 56 | DN name */ | ||
| 57 | @@ -657,7 +657,7 @@ SaAisErrorT create_runtime_ckpt_object(CPD_CKPT_INFO_NODE *ckpt_node, | ||
| 58 | SaNameT parentName; | ||
| 59 | SaAisErrorT rc = SA_AIS_OK; | ||
| 60 | char *dndup = strdup(ckpt_node->ckpt_name); | ||
| 61 | - char *parent_name = strchr(ckpt_node->ckpt_name, ','); | ||
| 62 | + const char *parent_name = strchr(ckpt_node->ckpt_name, ','); | ||
| 63 | char *rdnstr; | ||
| 64 | const SaImmAttrValuesT_2 *attrValues[7]; | ||
| 65 | SaImmAttrValueT dn[1], create_time[1], creat_flags[1], max_sections[1], | ||
| 66 | diff --git a/src/osaf/immutil/immutil.c b/src/osaf/immutil/immutil.c | ||
| 67 | index 1ca1fbb..d3a5b63 100644 | ||
| 68 | --- a/src/osaf/immutil/immutil.c | ||
| 69 | +++ b/src/osaf/immutil/immutil.c | ||
| 70 | @@ -336,7 +336,7 @@ char const *immutil_getStringValue(char const *key, SaNameT const *name) | ||
| 71 | klen = strlen(key); | ||
| 72 | assert(klen > 1 || key[klen - 1] == '='); | ||
| 73 | |||
| 74 | - cp = strstr(buffer, key); | ||
| 75 | + cp = (char*)strstr(buffer, key); | ||
| 76 | while (cp != NULL) { | ||
| 77 | if (cp == buffer || cp[-1] == ',') { | ||
| 78 | char *value = cp + klen; | ||
| 79 | -- | ||
| 80 | 2.43.0 | ||
| 81 | |||
diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-include-cstdint-for-uintXX_t-types.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-include-cstdint-for-uintXX_t-types.patch deleted file mode 100644 index e36d4e0cdc..0000000000 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0001-include-cstdint-for-uintXX_t-types.patch +++ /dev/null | |||
| @@ -1,43 +0,0 @@ | |||
| 1 | From 225891675b80beaa9d74ce56809e52c4451df72c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Wed, 25 Jan 2023 21:46:22 -0800 | ||
| 4 | Subject: [PATCH 1/2] include cstdint for uintXX_t types | ||
| 5 | |||
| 6 | GCC-13 needs it [1] | ||
| 7 | |||
| 8 | [1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html | ||
| 9 | |||
| 10 | Upstream-Status: Pending | ||
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 12 | --- | ||
| 13 | src/imm/immnd/ImmModel.h | 1 + | ||
| 14 | src/osaf/consensus/consensus_env.h | 1 + | ||
| 15 | 2 files changed, 2 insertions(+) | ||
| 16 | |||
| 17 | diff --git a/src/imm/immnd/ImmModel.h b/src/imm/immnd/ImmModel.h | ||
| 18 | index 44da470..0660431 100644 | ||
| 19 | --- a/src/imm/immnd/ImmModel.h | ||
| 20 | +++ b/src/imm/immnd/ImmModel.h | ||
| 21 | @@ -22,6 +22,7 @@ | ||
| 22 | #include <saImmOm.h> | ||
| 23 | #include <cstdarg> | ||
| 24 | #include <sys/types.h> | ||
| 25 | +#include <cstdint> | ||
| 26 | #include <string> | ||
| 27 | #include <vector> | ||
| 28 | #include <map> | ||
| 29 | diff --git a/src/osaf/consensus/consensus_env.h b/src/osaf/consensus/consensus_env.h | ||
| 30 | index df4f93a..89ccf46 100644 | ||
| 31 | --- a/src/osaf/consensus/consensus_env.h | ||
| 32 | +++ b/src/osaf/consensus/consensus_env.h | ||
| 33 | @@ -15,6 +15,7 @@ | ||
| 34 | #ifndef OSAF_CONSENSUS_CONSENSUS_ENV_H_ | ||
| 35 | #define OSAF_CONSENSUS_CONSENSUS_ENV_H_ | ||
| 36 | |||
| 37 | +#include <cstdint> | ||
| 38 | #include <string> | ||
| 39 | #include "base/mutex.h" | ||
| 40 | |||
| 41 | -- | ||
| 42 | 2.39.1 | ||
| 43 | |||
diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-include-missing-array-header.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-include-missing-array-header.patch deleted file mode 100644 index e735d432a7..0000000000 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0001-include-missing-array-header.patch +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | From 6168d43ddd353b92ad8bcd5c49dc68f18caa8a00 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Tue, 12 Apr 2022 17:07:49 -0700 | ||
| 4 | Subject: [PATCH 1/2] include missing <array> header | ||
| 5 | |||
| 6 | Fixes | ||
| 7 | src/osaf/consensus/key_value.cc:25:30: error: aggregate 'std::array<char, 128> buffer' has incomplete type and cannot be defined | ||
| 8 | 25 | std::array<char, buf_size> buffer; | ||
| 9 | | ^~~~~~ | ||
| 10 | |||
| 11 | Upstream-Status: Pending | ||
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 13 | --- | ||
| 14 | src/osaf/consensus/key_value.cc | 2 +- | ||
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 16 | |||
| 17 | diff --git a/src/osaf/consensus/key_value.cc b/src/osaf/consensus/key_value.cc | ||
| 18 | index 692dd3f..6e16cbf 100644 | ||
| 19 | --- a/src/osaf/consensus/key_value.cc | ||
| 20 | +++ b/src/osaf/consensus/key_value.cc | ||
| 21 | @@ -18,7 +18,7 @@ | ||
| 22 | #include "base/getenv.h" | ||
| 23 | #include "base/logtrace.h" | ||
| 24 | #include "osaf/consensus/consensus.h" | ||
| 25 | - | ||
| 26 | +#include <array> | ||
| 27 | int KeyValue::Execute(const std::string& command, std::string& output) { | ||
| 28 | TRACE_ENTER(); | ||
| 29 | constexpr size_t buf_size = 128; | ||
| 30 | -- | ||
| 31 | 2.35.1 | ||
| 32 | |||
diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-Werror-enum-int-mismatch-with-gcc13.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-Werror-enum-int-mismatch-with-gcc13.patch deleted file mode 100644 index a6aa2c3d07..0000000000 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-Werror-enum-int-mismatch-with-gcc13.patch +++ /dev/null | |||
| @@ -1,61 +0,0 @@ | |||
| 1 | From 5e5686de677c884d5d785254412ced3c9d2d1b08 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Wed, 25 Jan 2023 21:47:45 -0800 | ||
| 4 | Subject: [PATCH 2/2] Fix -Werror=enum-int-mismatch with gcc13 | ||
| 5 | |||
| 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 7 | --- | ||
| 8 | Upstream-Status: Pending | ||
| 9 | |||
| 10 | src/evt/agent/eda_hdl.h | 5 +++-- | ||
| 11 | src/evt/evtd/eds_mds.h | 3 +-- | ||
| 12 | src/smf/smfnd/smfnd.h | 8 ++++---- | ||
| 13 | 3 files changed, 8 insertions(+), 8 deletions(-) | ||
| 14 | |||
| 15 | --- a/src/evt/agent/eda_hdl.h | ||
| 16 | +++ b/src/evt/agent/eda_hdl.h | ||
| 17 | @@ -31,6 +31,7 @@ | ||
| 18 | #define EVT_AGENT_EDA_HDL_H_ | ||
| 19 | |||
| 20 | #include "evt/agent/eda.h" | ||
| 21 | +#include "ais/include/saAis.h" | ||
| 22 | |||
| 23 | uint32_t eda_hdl_cbk_dispatch(EDA_CB *, EDA_CLIENT_HDL_REC *, SaDispatchFlagsT); | ||
| 24 | |||
| 25 | @@ -68,11 +69,11 @@ EDA_CHANNEL_HDL_REC *eda_find_chan_hdl_r | ||
| 26 | |||
| 27 | void eda_msg_destroy(EDSV_MSG *msg); | ||
| 28 | |||
| 29 | -uint32_t eda_extract_pattern_from_event( | ||
| 30 | +SaAisErrorT eda_extract_pattern_from_event( | ||
| 31 | SaEvtEventPatternArrayT *from_pattern_array, | ||
| 32 | SaEvtEventPatternArrayT **to_pattern_array); | ||
| 33 | |||
| 34 | -uint32_t eda_allocate_and_extract_pattern_from_event( | ||
| 35 | +SaAisErrorT eda_allocate_and_extract_pattern_from_event( | ||
| 36 | SaEvtEventPatternArrayT *from_pattern_array, | ||
| 37 | SaEvtEventPatternArrayT **to_pattern_array); | ||
| 38 | |||
| 39 | --- a/src/evt/evtd/eds_mds.h | ||
| 40 | +++ b/src/evt/evtd/eds_mds.h | ||
| 41 | @@ -49,8 +49,7 @@ uint32_t eds_mds_msg_send(EDS_CB *cb, ED | ||
| 42 | MDS_SEND_PRIORITY_TYPE prio); | ||
| 43 | |||
| 44 | uint32_t eds_mds_ack_send(EDS_CB *cb, EDSV_MSG *msg, MDS_DEST dest, | ||
| 45 | - SaTimeT timeout, MDS_SEND_PRIORITY_TYPE prio); | ||
| 46 | - | ||
| 47 | + SaTimeT timeout, uint32_t prio); | ||
| 48 | uint32_t eds_dec_subscribe_msg(NCS_UBAID *uba, long msg_hdl, uint8_t ckpt_flag); | ||
| 49 | |||
| 50 | uint32_t eds_dec_publish_msg(NCS_UBAID *uba, long msg_hdl, uint8_t ckpt_flag); | ||
| 51 | --- a/src/smf/smfnd/smfnd.h | ||
| 52 | +++ b/src/smf/smfnd/smfnd.h | ||
| 53 | @@ -76,7 +76,7 @@ extern "C" { | ||
| 54 | #endif | ||
| 55 | |||
| 56 | /* smfnd_amf.c */ | ||
| 57 | -extern uint32_t smfnd_amf_init(smfnd_cb_t *cb); | ||
| 58 | +extern SaAisErrorT smfnd_amf_init(smfnd_cb_t *cb); | ||
| 59 | |||
| 60 | /* smfnd_mds.c */ | ||
| 61 | extern uint32_t smfnd_mds_init(smfnd_cb_t *cb); | ||
diff --git a/meta-networking/recipes-daemons/opensaf/opensaf_5.22.01.bb b/meta-networking/recipes-daemons/opensaf/opensaf_5.26.02.bb index 3dd950c720..eede11515b 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf_5.22.01.bb +++ b/meta-networking/recipes-daemons/opensaf/opensaf_5.26.02.bb | |||
| @@ -26,14 +26,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ | |||
| 26 | file://0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch \ | 26 | file://0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch \ |
| 27 | file://0001-create_empty_library-Use-CC-variable-intead-of-hardc.patch \ | 27 | file://0001-create_empty_library-Use-CC-variable-intead-of-hardc.patch \ |
| 28 | file://0001-immom_python-convert-to-python3.patch \ | 28 | file://0001-immom_python-convert-to-python3.patch \ |
| 29 | file://0001-Fix-build-with-fno-common.patch \ | ||
| 30 | file://0001-Use-correct-printf-format-for-__fsblkcnt_t.patch \ | 29 | file://0001-Use-correct-printf-format-for-__fsblkcnt_t.patch \ |
| 31 | file://0001-include-missing-array-header.patch \ | ||
| 32 | file://0002-configure-Disable-selected-warnings.patch \ | 30 | file://0002-configure-Disable-selected-warnings.patch \ |
| 33 | file://0001-include-cstdint-for-uintXX_t-types.patch \ | 31 | file://0001-To-fix-Werror-discarded-qualifiers-error.patch \ |
| 34 | file://0002-Fix-Werror-enum-int-mismatch-with-gcc13.patch \ | ||
| 35 | " | 32 | " |
| 36 | SRC_URI[sha256sum] = "f008d53c83087ce2014c6089bc4ef08e14c1b4091298b943f4ceade1aa6bf61e" | 33 | SRC_URI[sha256sum] = "c51603bc486ce6db271a7023a75963bfc6f277f4d4486df2fe004a51c81cfdee" |
| 37 | 34 | ||
| 38 | UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/opensaf/files/releases" | 35 | UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/opensaf/files/releases" |
| 39 | 36 | ||
diff --git a/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch b/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch index 3aa08f84da..39392e1cc7 100644 --- a/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch +++ b/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch | |||
| @@ -12,31 +12,9 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com> | |||
| 12 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | 12 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> |
| 13 | 13 | ||
| 14 | --- | 14 | --- |
| 15 | acinclude/krb5.m4 | 10 +++++++++- | ||
| 16 | acinclude/lib-checks.m4 | 8 ++++++-- | 15 | acinclude/lib-checks.m4 | 8 ++++++-- |
| 17 | 2 files changed, 15 insertions(+), 3 deletions(-) | 16 | 2 files changed, 15 insertions(+), 3 deletions(-) |
| 18 | 17 | ||
| 19 | diff --git a/acinclude/krb5.m4 b/acinclude/krb5.m4 | ||
| 20 | index e0286fa..b3e4bc7 100644 | ||
| 21 | --- a/acinclude/krb5.m4 | ||
| 22 | +++ b/acinclude/krb5.m4 | ||
| 23 | @@ -98,7 +98,15 @@ main(void) | ||
| 24 | krb5_init_context(&context); | ||
| 25 | return 0; | ||
| 26 | } | ||
| 27 | -]])], [ squid_cv_broken_heimdal_krb5_h=yes ], [ squid_cv_broken_heimdal_krb5_h=no ]) | ||
| 28 | +]])], [ squid_cv_broken_heimdal_krb5_h=yes ], [ squid_cv_broken_heimdal_krb5_h=no ], | ||
| 29 | +[ | ||
| 30 | + dnl Can't test in cross compiled env - so assume good | ||
| 31 | + squid_cv_broken_heimdal_krb5_h=no | ||
| 32 | +]) | ||
| 33 | + ], | ||
| 34 | + [ | ||
| 35 | + dnl Can't test in cross compiled env - so assume good | ||
| 36 | + squid_cv_broken_heimdal_krb5_h=no | ||
| 37 | ]) | ||
| 38 | SQUID_STATE_ROLLBACK(squid_krb5_heimdal_test) | ||
| 39 | ]) | ||
| 40 | diff --git a/acinclude/lib-checks.m4 b/acinclude/lib-checks.m4 | 18 | diff --git a/acinclude/lib-checks.m4 b/acinclude/lib-checks.m4 |
| 41 | index 9793b9a..4f2dc83 100644 | 19 | index 9793b9a..4f2dc83 100644 |
| 42 | --- a/acinclude/lib-checks.m4 | 20 | --- a/acinclude/lib-checks.m4 |
diff --git a/meta-networking/recipes-daemons/squid/squid_7.3.bb b/meta-networking/recipes-daemons/squid/squid_7.5.bb index 8d1d84c04e..3364c1f746 100644 --- a/meta-networking/recipes-daemons/squid/squid_7.3.bb +++ b/meta-networking/recipes-daemons/squid/squid_7.5.bb | |||
| @@ -22,14 +22,14 @@ SRC_URI = "https://github.com/squid-cache/${BPN}/releases/download/SQUID_${PV_U} | |||
| 22 | file://squid.nm \ | 22 | file://squid.nm \ |
| 23 | " | 23 | " |
| 24 | 24 | ||
| 25 | SRC_URI[sha256sum] = "dadc2a9a3926ce1b3babeaa7a7d7b21cbb089025876daa3f5c19e7eb6391ddcd" | 25 | SRC_URI[sha256sum] = "f6058907db0150d2f5d228482b5a9e5678920cf368ae0ccbcecceb2ff4c35106" |
| 26 | 26 | ||
| 27 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 27 | LIC_FILES_CHKSUM = "file://COPYING;md5=570a9b3749dd0463a1778803b12a6dce \ |
| 28 | file://errors/COPYRIGHT;md5=c2a0e15750d3a9743af9109fecc05622 \ | 28 | file://errors/COPYRIGHT;md5=41d117978dbffedc893e8eeca12537d0 \ |
| 29 | " | 29 | " |
| 30 | 30 | ||
| 31 | UPSTREAM_CHECK_URI = "https://github.com/squid-cache/${BPN}/releases/" | 31 | UPSTREAM_CHECK_URI = "https://github.com/squid-cache/${BPN}/releases/" |
| 32 | UPSTREAM_CHECK_REGEX = "v?(?P<pver>\d+(\.\d+)+)" | 32 | UPSTREAM_CHECK_REGEX = "SQUID_(?P<pver>\d+(_\d+)+)" |
| 33 | 33 | ||
| 34 | DEPENDS = "libtool" | 34 | DEPENDS = "libtool" |
| 35 | 35 | ||
diff --git a/meta-networking/recipes-extended/kronosnet/kronosnet_1.31.bb b/meta-networking/recipes-extended/kronosnet/kronosnet_1.33.bb index d95bb81278..fa802d02bd 100644 --- a/meta-networking/recipes-extended/kronosnet/kronosnet_1.31.bb +++ b/meta-networking/recipes-extended/kronosnet/kronosnet_1.33.bb | |||
| @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING.applications;md5=751419260aa954499f7abaabaa88 | |||
| 11 | SECTION = "libs" | 11 | SECTION = "libs" |
| 12 | DEPENDS = "doxygen-native libqb-native libxml2-native bzip2 libqb libxml2 libnl lksctp-tools lz4 lzo openssl nss xz zlib zstd" | 12 | DEPENDS = "doxygen-native libqb-native libxml2-native bzip2 libqb libxml2 libnl lksctp-tools lz4 lzo openssl nss xz zlib zstd" |
| 13 | 13 | ||
| 14 | SRCREV = "da73f2a1e0ffe2aee15d4f705edf90ee8445e2d4" | 14 | SRCREV = "176bc1064a8e85f95eda2cb1e53b1ce5d471d857" |
| 15 | SRC_URI = "git://github.com/kronosnet/kronosnet;protocol=https;branch=stable1;tag=v${PV}" | 15 | SRC_URI = "git://github.com/kronosnet/kronosnet;protocol=https;branch=stable1;tag=v${PV}" |
| 16 | 16 | ||
| 17 | BB_GIT_SHALLOW_EXTRA_REFS = "refs/tags/v${PV}" | 17 | BB_GIT_SHALLOW_EXTRA_REFS = "refs/tags/v${PV}" |
diff --git a/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.8.bb b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.9.bb index 524718d56c..798939863d 100644 --- a/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.8.bb +++ b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.9.bb | |||
| @@ -13,7 +13,7 @@ SRC_URI = "http://www.netfilter.org/projects/conntrack-tools/files/conntrack-too | |||
| 13 | file://init \ | 13 | file://init \ |
| 14 | file://conntrackd.service \ | 14 | file://conntrackd.service \ |
| 15 | " | 15 | " |
| 16 | SRC_URI[sha256sum] = "067677f4c5f6564819e78ed3a9d4a8980935ea9273f3abb22a420ea30ab5ded6" | 16 | SRC_URI[sha256sum] = "c15afe488a8d408c9d6d61e97dbd19f3c591942f62c13df6453a961ca4231cae" |
| 17 | 17 | ||
| 18 | inherit autotools update-rc.d pkgconfig systemd | 18 | inherit autotools update-rc.d pkgconfig systemd |
| 19 | 19 | ||
diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.1.0.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.1.1.bb index 08d3ab691c..e397034504 100644 --- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.1.0.bb +++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.1.1.bb | |||
| @@ -9,7 +9,7 @@ DEPENDS = "libnfnetlink libmnl" | |||
| 9 | SRC_URI = "https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-${PV}.tar.xz \ | 9 | SRC_URI = "https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-${PV}.tar.xz \ |
| 10 | " | 10 | " |
| 11 | 11 | ||
| 12 | SRC_URI[sha256sum] = "67edcb4eb826c2f8dc98af08dabff68f3b3d0fe6fb7d9d0ac1ee7ecce0fe694e" | 12 | SRC_URI[sha256sum] = "769d3eaf57fa4fbdb05dd12873b6cb9a5be7844d8937e222b647381d44284820" |
| 13 | 13 | ||
| 14 | S = "${UNPACKDIR}/libnetfilter_conntrack-${PV}" | 14 | S = "${UNPACKDIR}/libnetfilter_conntrack-${PV}" |
| 15 | 15 | ||
diff --git a/meta-networking/recipes-filter/nftables/nftables_1.1.6.bb b/meta-networking/recipes-filter/nftables/nftables_1.1.6.bb index 505dfc12d0..d27e60a18d 100644 --- a/meta-networking/recipes-filter/nftables/nftables_1.1.6.bb +++ b/meta-networking/recipes-filter/nftables/nftables_1.1.6.bb | |||
| @@ -16,7 +16,7 @@ SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.xz \ | |||
| 16 | " | 16 | " |
| 17 | SRC_URI[sha256sum] = "372931bda8556b310636a2f9020adc710f9bab66f47efe0ce90bff800ac2530c" | 17 | SRC_URI[sha256sum] = "372931bda8556b310636a2f9020adc710f9bab66f47efe0ce90bff800ac2530c" |
| 18 | 18 | ||
| 19 | inherit autotools manpages pkgconfig ptest | 19 | inherit autotools manpages pkgconfig ptest python3native |
| 20 | 20 | ||
| 21 | PACKAGECONFIG ?= "python readline json" | 21 | PACKAGECONFIG ?= "python readline json" |
| 22 | PACKAGECONFIG[editline] = "--with-cli=editline, , libedit, , , linenoise readline" | 22 | PACKAGECONFIG[editline] = "--with-cli=editline, , libedit, , , linenoise readline" |
diff --git a/meta-networking/recipes-irc/weechat/weechat_4.8.1.bb b/meta-networking/recipes-irc/weechat/weechat_4.8.2.bb index 7642a88f71..458a8a317d 100644 --- a/meta-networking/recipes-irc/weechat/weechat_4.8.1.bb +++ b/meta-networking/recipes-irc/weechat/weechat_4.8.2.bb | |||
| @@ -8,7 +8,7 @@ DEPENDS = "zlib libgcrypt gnutls curl aspell zstd cjson gettext-native" | |||
| 8 | 8 | ||
| 9 | SRC_URI = "https://weechat.org/files/src/weechat-${PV}.tar.xz" | 9 | SRC_URI = "https://weechat.org/files/src/weechat-${PV}.tar.xz" |
| 10 | 10 | ||
| 11 | SRC_URI[sha256sum] = "e7ac1fbcc71458ed647aada8747990905cb5bfb93fd8ccccbc2a969673a4285a" | 11 | SRC_URI[sha256sum] = "7e2f619d4dcd28d9d86864763581a1b453499f8dd0652af863b54045a8964d6c" |
| 12 | 12 | ||
| 13 | inherit cmake pkgconfig | 13 | inherit cmake pkgconfig |
| 14 | 14 | ||
diff --git a/meta-networking/recipes-protocols/nghttp3/nghttp3_1.15.0.bb b/meta-networking/recipes-protocols/nghttp3/nghttp3_1.15.0.bb new file mode 100644 index 0000000000..2539939bb1 --- /dev/null +++ b/meta-networking/recipes-protocols/nghttp3/nghttp3_1.15.0.bb | |||
| @@ -0,0 +1,24 @@ | |||
| 1 | SUMMARY = "HTTP/3 library written in C" | ||
| 2 | HOMEPAGE = "https://nghttp2.org/nghttp3" | ||
| 3 | BUGTRACKER = "https://github.com/ngtcp2/nghttp3/issues" | ||
| 4 | LICENSE = "MIT" | ||
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=2005b8c7595329cc8ab211085467600a" | ||
| 6 | |||
| 7 | SRC_URI = "git://github.com/ngtcp2/nghttp3;protocol=https;branch=main;tag=v${PV};name=nghttp3 \ | ||
| 8 | git://github.com/ngtcp2/munit;protocol=https;branch=main;name=munit;subdir=${S}/tests/munit \ | ||
| 9 | git://github.com/ngtcp2/sfparse;protocol=https;branch=main;name=sfparse;subdir=${S}/lib/sfparse \ | ||
| 10 | " | ||
| 11 | |||
| 12 | SRCREV_nghttp3 = "d326f4c1eb3f6a780d77793b30e16756c498f913" | ||
| 13 | SRCREV_munit = "11e8e3466b2d6a8bdfd4b05a3d1ee7805c5d3442" | ||
| 14 | SRCREV_sfparse = "ff7f230e7df2844afef7dc49631cda03a30455f3" | ||
| 15 | |||
| 16 | SRCREV_FORMAT = "nghttp3" | ||
| 17 | |||
| 18 | inherit cmake | ||
| 19 | |||
| 20 | PACKAGECONFIG ?= "shared" | ||
| 21 | |||
| 22 | PACKAGECONFIG[static] = "-DENABLE_STATIC=ON, -DENABLE_STATIC=OFF" | ||
| 23 | PACKAGECONFIG[shared] = "-DENABLE_SHARED=ON, -DENABLE_SHARED=OFF" | ||
| 24 | PACKAGECONFIG[build-lib-only] = "-DENABLE_LIB_ONLY=ON, -DENABLE_LIB_ONLY=OFF" | ||
diff --git a/meta-networking/recipes-protocols/ngtcp2/ngtcp2_1.21.0.bb b/meta-networking/recipes-protocols/ngtcp2/ngtcp2_1.21.0.bb new file mode 100644 index 0000000000..f71de5aa07 --- /dev/null +++ b/meta-networking/recipes-protocols/ngtcp2/ngtcp2_1.21.0.bb | |||
| @@ -0,0 +1,20 @@ | |||
| 1 | SUMMARY = "ngtcp2 project is an effort to implement IETF QUIC protocol" | ||
| 2 | HOMEPAGE = "https://nghttp2.org/ngtcp2" | ||
| 3 | BUGTRACKER = "https://github.com/ngtcp2/ngtcp2/issues" | ||
| 4 | LICENSE = "MIT" | ||
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=de0966c8ff4f62661a3da92967a75434" | ||
| 6 | |||
| 7 | SRC_URI = "gitsm://github.com/ngtcp2/ngtcp2;protocol=https;branch=main;tag=v${PV};name=ngtcp2" | ||
| 8 | SRCREV = "9e32add590fc74707b62f61aa5e0aa5c6f8a2c60" | ||
| 9 | |||
| 10 | DEPENDS = "brotli libev nghttp3" | ||
| 11 | |||
| 12 | inherit cmake | ||
| 13 | |||
| 14 | PACKAGECONFIG ?= "shared gnutls" | ||
| 15 | |||
| 16 | PACKAGECONFIG[static] = "-DENABLE_STATIC_LIB=ON, -DENABLE_STATIC_LIB=OFF" | ||
| 17 | PACKAGECONFIG[shared] = "-DENABLE_SHARED_LIB=ON, -DENABLE_SHARED_LIB=OFF" | ||
| 18 | PACKAGECONFIG[build-lib-only] = "-DENABLE_LIB_ONLY=ON, -DENABLE_LIB_ONLY=OFF" | ||
| 19 | PACKAGECONFIG[openssl] = "-DENABLE_OPENSSL=ON, -DENABLE_OPENSSL=OFF, openssl" | ||
| 20 | PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON, -DENABLE_GNUTLS=OFF, gnutls" | ||
diff --git a/meta-networking/recipes-protocols/nopoll/nopoll_0.4.7.b429.bb b/meta-networking/recipes-protocols/nopoll/nopoll_0.4.9.b462.bb index b4f8605136..dbe8407443 100644 --- a/meta-networking/recipes-protocols/nopoll/nopoll_0.4.7.b429.bb +++ b/meta-networking/recipes-protocols/nopoll/nopoll_0.4.9.b462.bb | |||
| @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f0504124678c1b3158146e0630229298 \ | |||
| 13 | DEPENDS = "openssl" | 13 | DEPENDS = "openssl" |
| 14 | SRC_URI = "http://www.aspl.es/nopoll/downloads/nopoll-${PV}.tar.gz \ | 14 | SRC_URI = "http://www.aspl.es/nopoll/downloads/nopoll-${PV}.tar.gz \ |
| 15 | " | 15 | " |
| 16 | SRC_URI[sha256sum] = "d5c020fec25e3fa486c308249833d06bed0d76bde9a72fd5d73cfb057c320366" | 16 | SRC_URI[sha256sum] = "80bfa3e0228e88e290dd23eb94d9bb1f4d726fb117c11cfb048cbdd1d71d379a" |
| 17 | 17 | ||
| 18 | inherit autotools pkgconfig | 18 | inherit autotools pkgconfig |
| 19 | 19 | ||
diff --git a/meta-networking/recipes-support/arptables/arptables_git.bb b/meta-networking/recipes-support/arptables/arptables_git.bb index be2cfb0816..201e9e16b4 100644 --- a/meta-networking/recipes-support/arptables/arptables_git.bb +++ b/meta-networking/recipes-support/arptables/arptables_git.bb | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | SUMMARY = "Administration tool for arp packet filtering" | 1 | SUMMARY = "Administration tool for arp packet filtering" |
| 2 | SECTION = "net" | 2 | SECTION = "net" |
| 3 | LICENSE = "GPL-2.0-only" | 3 | LICENSE = "GPL-2.0-only" |
| 4 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=53b4a999993871a28ab1488fdbd2e73e" |
| 5 | SRCREV = "efae8949e31f8b2eb6290f377a28384cecaf105a" | 5 | SRCREV = "efae8949e31f8b2eb6290f377a28384cecaf105a" |
| 6 | PV = "0.0.5+git" | 6 | PV = "0.0.5+git" |
| 7 | 7 | ||
| @@ -11,8 +11,6 @@ SRC_URI = " \ | |||
| 11 | file://arptables-arpt-get-target-fix.patch \ | 11 | file://arptables-arpt-get-target-fix.patch \ |
| 12 | file://arptables.service \ | 12 | file://arptables.service \ |
| 13 | " | 13 | " |
| 14 | SRC_URI[arptables.md5sum] = "1d4ab05761f063b0751645d8f2b8f8e5" | ||
| 15 | SRC_URI[arptables.sha256sum] = "e529fd465c67d69ad335299a043516e6b38cdcd337a5ed21718413e96073f928" | ||
| 16 | 14 | ||
| 17 | SYSTEMD_SERVICE:${PN} = "arptables.service" | 15 | SYSTEMD_SERVICE:${PN} = "arptables.service" |
| 18 | 16 | ||
diff --git a/meta-networking/recipes-support/curlpp/curlpp/0002-fix-invalid-conversion-from-int-to-CURLoption.patch b/meta-networking/recipes-support/curlpp/curlpp/0002-fix-invalid-conversion-from-int-to-CURLoption.patch deleted file mode 100644 index 1712a53462..0000000000 --- a/meta-networking/recipes-support/curlpp/curlpp/0002-fix-invalid-conversion-from-int-to-CURLoption.patch +++ /dev/null | |||
| @@ -1,36 +0,0 @@ | |||
| 1 | From ebe9144fdfdc8154661b93322cec4a1c43aa75ff Mon Sep 17 00:00:00 2001 | ||
| 2 | From: alperak <alperyasinak1@gmail.com> | ||
| 3 | Date: Tue, 1 Oct 2024 19:45:38 +0300 | ||
| 4 | Subject: [PATCH] Fix invalid conversion from int to CURLoption | ||
| 5 | |||
| 6 | Options.hpp:281:74: error: invalid conversion from 'int' to 'CURLoption' [-fpermissive] | ||
| 7 | 281 | typedef curlpp::OptionTrait<curl_closepolicy, CURLOPT_CLOSEPOLICY> ClosePolicy; | ||
| 8 | | ^ | ||
| 9 | | | | ||
| 10 | | int | ||
| 11 | |||
| 12 | Fix invalid conversion by adding explicit cast to CURLoption | ||
| 13 | |||
| 14 | Upstream-Status: Pending | ||
| 15 | |||
| 16 | Signed-off-by: alperak <alperyasinak1@gmail.com> | ||
| 17 | --- | ||
| 18 | include/curlpp/Options.hpp | 2 +- | ||
| 19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 20 | |||
| 21 | diff --git a/include/curlpp/Options.hpp b/include/curlpp/Options.hpp | ||
| 22 | index c705c9d..7c9a501 100644 | ||
| 23 | --- a/include/curlpp/Options.hpp | ||
| 24 | +++ b/include/curlpp/Options.hpp | ||
| 25 | @@ -278,7 +278,7 @@ namespace options | ||
| 26 | typedef curlpp::OptionTrait<long, CURLOPT_LOW_SPEED_LIMIT> LowSpeedLimit; | ||
| 27 | typedef curlpp::OptionTrait<long, CURLOPT_LOW_SPEED_TIME> LowSpeedTime; | ||
| 28 | typedef curlpp::OptionTrait<long, CURLOPT_MAXCONNECTS> MaxConnects; | ||
| 29 | - typedef curlpp::OptionTrait<curl_closepolicy, CURLOPT_CLOSEPOLICY> ClosePolicy; | ||
| 30 | + typedef curlpp::OptionTrait<curl_closepolicy, (CURLoption)CURLOPT_CLOSEPOLICY> ClosePolicy; | ||
| 31 | typedef curlpp::OptionTrait<bool, CURLOPT_FRESH_CONNECT> FreshConnect; | ||
| 32 | typedef curlpp::OptionTrait<bool, CURLOPT_FORBID_REUSE> ForbidReuse; | ||
| 33 | typedef curlpp::OptionTrait<long, CURLOPT_CONNECTTIMEOUT> ConnectTimeout; | ||
| 34 | -- | ||
| 35 | 2.25.1 | ||
| 36 | |||
diff --git a/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb b/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb index 25ea1fdefb..2f9f406b86 100644 --- a/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb +++ b/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb | |||
| @@ -9,10 +9,11 @@ DEPENDS:class-native = "curl-native" | |||
| 9 | 9 | ||
| 10 | SRC_URI = "git://github.com/jpbarrette/curlpp.git;branch=master;protocol=https \ | 10 | SRC_URI = "git://github.com/jpbarrette/curlpp.git;branch=master;protocol=https \ |
| 11 | file://0001-curlpp-config.in-Remove-references-to-absolute-build.patch \ | 11 | file://0001-curlpp-config.in-Remove-references-to-absolute-build.patch \ |
| 12 | file://0002-fix-invalid-conversion-from-int-to-CURLoption.patch" | 12 | " |
| 13 | 13 | ||
| 14 | SRCREV = "592552a165cc569dac7674cb7fc9de3dc829906f" | 14 | SRCREV = "ec1b66e699557cd9d608d322c013a1ebda16bd08" |
| 15 | 15 | ||
| 16 | PV .= "+git" | ||
| 16 | 17 | ||
| 17 | inherit cmake pkgconfig binconfig | 18 | inherit cmake pkgconfig binconfig |
| 18 | 19 | ||
| @@ -23,4 +24,6 @@ do_install:append() { | |||
| 23 | -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \ | 24 | -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \ |
| 24 | -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \ | 25 | -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \ |
| 25 | -i ${D}${libdir}/pkgconfig/*.pc | 26 | -i ${D}${libdir}/pkgconfig/*.pc |
| 27 | |||
| 28 | sed -i 's@${RECIPE_SYSROOT}@${CMAKE_SYSROOT}@' ${D}${libdir}/cmake/curlpp/curlppTargets.cmake | ||
| 26 | } | 29 | } |
diff --git a/meta-networking/recipes-support/dropwatch/dropwatch_1.5.4.bb b/meta-networking/recipes-support/dropwatch/dropwatch_1.5.5.bb index badeed8e82..03eaef24fd 100644 --- a/meta-networking/recipes-support/dropwatch/dropwatch_1.5.4.bb +++ b/meta-networking/recipes-support/dropwatch/dropwatch_1.5.5.bb | |||
| @@ -8,10 +8,10 @@ SECTION = "net/misc" | |||
| 8 | LICENSE = "GPL-2.0-or-later" | 8 | LICENSE = "GPL-2.0-or-later" |
| 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" |
| 10 | 10 | ||
| 11 | SRC_URI = "git://github.com/nhorman/dropwatch.git;protocol=https;nobranch=1 \ | 11 | SRC_URI = "git://github.com/nhorman/dropwatch.git;protocol=https;branch=master;tag=v${PV} \ |
| 12 | file://0001-fix-bug-build-with-sysroot-head-file-instead-of-loca.patch \ | 12 | file://0001-fix-bug-build-with-sysroot-head-file-instead-of-loca.patch \ |
| 13 | " | 13 | " |
| 14 | SRCREV = "1e7e487a019a7c02f1f429c4d3a4647fa3787a13" | 14 | SRCREV = "10ec0adb9758b86a647b2972932aaa98a7d002a5" |
| 15 | 15 | ||
| 16 | 16 | ||
| 17 | DEPENDS = "binutils libnl libpcap readline" | 17 | DEPENDS = "binutils libnl libpcap readline" |
diff --git a/meta-networking/recipes-support/ettercap/ettercap/CVE-2026-3606.patch b/meta-networking/recipes-support/ettercap/ettercap/CVE-2026-3606.patch new file mode 100644 index 0000000000..e1b19ea05b --- /dev/null +++ b/meta-networking/recipes-support/ettercap/ettercap/CVE-2026-3606.patch | |||
| @@ -0,0 +1,48 @@ | |||
| 1 | From a7347f49b928f47fc37805c9f3a70a9487d45a65 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Koeppe <alexander@koeppe.rocks> | ||
| 3 | Date: Sun, 8 Mar 2026 17:57:39 +0100 | ||
| 4 | Subject: [PATCH] Fix heap-out-of-bounds read issue in etterfilter | ||
| 5 | (CVE-2026-3606) | ||
| 6 | |||
| 7 | CVE: CVE-2026-3603 | ||
| 8 | Upstream-Status: Backport [https://github.com/Ettercap/ettercap/commit/41c312d4be6f6067968a275bf66b2abd2a0ba385] | ||
| 9 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 10 | --- | ||
| 11 | include/ec.h | 6 ++++++ | ||
| 12 | utils/etterfilter/ef_output.c | 4 ++-- | ||
| 13 | 2 files changed, 8 insertions(+), 2 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/include/ec.h b/include/ec.h | ||
| 16 | index d69de613..80c7eaba 100644 | ||
| 17 | --- a/include/ec.h | ||
| 18 | +++ b/include/ec.h | ||
| 19 | @@ -94,6 +94,12 @@ | ||
| 20 | ON_ERROR(x, NULL, "virtual memory exhausted"); \ | ||
| 21 | } while(0) | ||
| 22 | |||
| 23 | +#define SAFE_RECALLOC(x, s) do { \ | ||
| 24 | + x = realloc(x, s); \ | ||
| 25 | + ON_ERROR(x, NULL, "virtual memory exhausted"); \ | ||
| 26 | + memset(x, 0, s); \ | ||
| 27 | +} while(0) | ||
| 28 | + | ||
| 29 | #define SAFE_STRDUP(x, s) do{ \ | ||
| 30 | x = strdup(s); \ | ||
| 31 | ON_ERROR(x, NULL, "virtual memory exhausted"); \ | ||
| 32 | diff --git a/utils/etterfilter/ef_output.c b/utils/etterfilter/ef_output.c | ||
| 33 | index 2530e599..2f49177e 100644 | ||
| 34 | --- a/utils/etterfilter/ef_output.c | ||
| 35 | +++ b/utils/etterfilter/ef_output.c | ||
| 36 | @@ -150,10 +150,10 @@ static size_t create_data_segment(u_char** data, struct filter_header *fh, struc | ||
| 37 | static size_t add_data_segment(u_char **data, size_t base, u_char **string, size_t slen) | ||
| 38 | { | ||
| 39 | /* make room for the new string */ | ||
| 40 | - SAFE_REALLOC(*data, base + slen + 1); | ||
| 41 | + SAFE_RECALLOC(*data, base + slen + 1); | ||
| 42 | |||
| 43 | /* copy the string, NULL separated */ | ||
| 44 | - memcpy(*data + base, *string, slen + 1); | ||
| 45 | + memcpy(*data + base, *string, slen); | ||
| 46 | |||
| 47 | /* | ||
| 48 | * change the pointer to the new string location | ||
diff --git a/meta-networking/recipes-support/ettercap/ettercap_0.8.4.bb b/meta-networking/recipes-support/ettercap/ettercap_0.8.4.bb index 3784d12b85..6fac3a0b84 100644 --- a/meta-networking/recipes-support/ettercap/ettercap_0.8.4.bb +++ b/meta-networking/recipes-support/ettercap/ettercap_0.8.4.bb | |||
| @@ -21,7 +21,9 @@ DEPENDS += "ethtool \ | |||
| 21 | 21 | ||
| 22 | RDEPENDS:${PN} += "bash ethtool libgcc" | 22 | RDEPENDS:${PN} += "bash ethtool libgcc" |
| 23 | 23 | ||
| 24 | SRC_URI = "gitsm://github.com/Ettercap/ettercap;branch=master;protocol=https;tag=v${PV}" | 24 | SRC_URI = "gitsm://github.com/Ettercap/ettercap;branch=master;protocol=https;tag=v${PV} \ |
| 25 | file://CVE-2026-3606.patch \ | ||
| 26 | " | ||
| 25 | 27 | ||
| 26 | SRCREV = "41da65f4026a9e4cea928e61941b976d9279f508" | 28 | SRCREV = "41da65f4026a9e4cea928e61941b976d9279f508" |
| 27 | 29 | ||
diff --git a/meta-networking/recipes-support/libcpr/libcpr_1.13.0.bb b/meta-networking/recipes-support/libcpr/libcpr_1.14.2.bb index 04dda31770..bdbd244e33 100644 --- a/meta-networking/recipes-support/libcpr/libcpr_1.13.0.bb +++ b/meta-networking/recipes-support/libcpr/libcpr_1.14.2.bb | |||
| @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=08beaae5deae1c43c065592da8f38095" | |||
| 8 | 8 | ||
| 9 | DEPENDS = "curl openssl" | 9 | DEPENDS = "curl openssl" |
| 10 | 10 | ||
| 11 | SRC_URI = "git://github.com/libcpr/cpr.git;protocol=https;branch=master;tag=${PV}" | 11 | SRC_URI = "git://github.com/libcpr/cpr.git;protocol=https;nobranch=1;tag=${PV}" |
| 12 | SRCREV = "516cb3e5f4e38bede088f69fcf122c6089e38f00" | 12 | SRCREV = "f091b2c061b307ee89b164c39976fc9202a1c79d" |
| 13 | 13 | ||
| 14 | 14 | ||
| 15 | inherit cmake | 15 | inherit cmake |
diff --git a/meta-networking/recipes-support/memcached/memcached_1.6.40.bb b/meta-networking/recipes-support/memcached/memcached_1.6.41.bb index fedc693cca..9d759069ba 100644 --- a/meta-networking/recipes-support/memcached/memcached_1.6.40.bb +++ b/meta-networking/recipes-support/memcached/memcached_1.6.41.bb | |||
| @@ -22,7 +22,7 @@ RDEPENDS:${PN} += "perl perl-module-posix perl-module-autoloader \ | |||
| 22 | SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \ | 22 | SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \ |
| 23 | file://memcached-add-hugetlbfs-check.patch \ | 23 | file://memcached-add-hugetlbfs-check.patch \ |
| 24 | " | 24 | " |
| 25 | SRC_URI[sha256sum] = "a3d360e9da2221a49bf9aae4e6880f2d44da6b2a2fae39b1911b9ca76488fbfd" | 25 | SRC_URI[sha256sum] = "e097073c156eeff9e12655b054f446d57374cfba5c132dcdbe7fac64e728286a" |
| 26 | 26 | ||
| 27 | CVE_STATUS[CVE-2022-26635] = "disputed: this is a problem of applications using php-memcached inproperly" | 27 | CVE_STATUS[CVE-2022-26635] = "disputed: this is a problem of applications using php-memcached inproperly" |
| 28 | 28 | ||
diff --git a/meta-networking/recipes-support/nbdkit/nbdkit_1.47.3.bb b/meta-networking/recipes-support/nbdkit/nbdkit_1.47.5.bb index e1da2d3288..5ec440fc18 100644 --- a/meta-networking/recipes-support/nbdkit/nbdkit_1.47.3.bb +++ b/meta-networking/recipes-support/nbdkit/nbdkit_1.47.5.bb | |||
| @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=26250adec854bc317493f6fb98efe049" | |||
| 12 | SRC_URI = "git://gitlab.com/nbdkit/nbdkit.git;protocol=https;branch=master;tag=v${PV} \ | 12 | SRC_URI = "git://gitlab.com/nbdkit/nbdkit.git;protocol=https;branch=master;tag=v${PV} \ |
| 13 | file://0002-plugins-Avoid-absolute-buildpaths-in-binaries.patch \ | 13 | file://0002-plugins-Avoid-absolute-buildpaths-in-binaries.patch \ |
| 14 | " | 14 | " |
| 15 | SRCREV = "49a3178b52509a8a8fd0e5a1c49846bba24e3eac" | 15 | SRCREV = "131372494a384a2ee21b97ec9375b7a55636a417" |
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | DEPENDS = "curl xz e2fsprogs zlib" | 18 | DEPENDS = "curl xz e2fsprogs zlib" |
diff --git a/meta-networking/recipes-support/ntp/ntp/0001-include-fix-build-failure-with-glibc-2.43-_Generic-m.patch b/meta-networking/recipes-support/ntp/ntp/0001-include-fix-build-failure-with-glibc-2.43-_Generic-m.patch new file mode 100644 index 0000000000..89797b3aa8 --- /dev/null +++ b/meta-networking/recipes-support/ntp/ntp/0001-include-fix-build-failure-with-glibc-2.43-_Generic-m.patch | |||
| @@ -0,0 +1,41 @@ | |||
| 1 | From c7d76559dada2a6c0c9c18e8343a69b1eabc031e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Peter Marko <peter.marko@siemens.com> | ||
| 3 | Date: Fri, 13 Mar 2026 13:20:20 +0100 | ||
| 4 | Subject: [PATCH] include: fix build failure with glibc 2.38+ _Generic memchr | ||
| 5 | macro | ||
| 6 | |||
| 7 | Newer glibc defines memchr as a _Generic macro in <string.h>. | ||
| 8 | When sntp's config.h lacks a HAVE_MEMCHR definition, the #ifndef guard | ||
| 9 | in l_stdlib.h passes and the extern declaration of memchr is emitted. | ||
| 10 | The preprocessor expands the memchr token into _Generic(...), producing: | ||
| 11 | |||
| 12 | l_stdlib.h:225:14: error: expected identifier or '(' before '_Generic' | ||
| 13 | |||
| 14 | Guard the fallback declarations of memchr and strnlen with an additional | ||
| 15 | !defined(memchr) / !defined(strnlen) check so they are skipped when the | ||
| 16 | symbols are already provided as macros by the C library headers. | ||
| 17 | |||
| 18 | Upstream-Status: Pending | ||
| 19 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
| 20 | --- | ||
| 21 | include/l_stdlib.h | 4 ++-- | ||
| 22 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 23 | |||
| 24 | diff --git a/include/l_stdlib.h b/include/l_stdlib.h | ||
| 25 | index fbf57c5..195dc41 100644 | ||
| 26 | --- a/include/l_stdlib.h | ||
| 27 | +++ b/include/l_stdlib.h | ||
| 28 | @@ -221,11 +221,11 @@ extern int errno; | ||
| 29 | extern int h_errno; | ||
| 30 | #endif | ||
| 31 | |||
| 32 | -#ifndef HAVE_MEMCHR | ||
| 33 | +#if !defined(HAVE_MEMCHR) && !defined(memchr) | ||
| 34 | extern void *memchr(const void *s, int c, size_t n); | ||
| 35 | #endif | ||
| 36 | |||
| 37 | -#ifndef HAVE_STRNLEN | ||
| 38 | +#if !defined(HAVE_STRNLEN) && !defined(strnlen) | ||
| 39 | extern size_t strnlen(const char *s, size_t n); | ||
| 40 | #endif | ||
| 41 | |||
diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb b/meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb index a5a6048f8a..e59725e3e9 100644 --- a/meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb +++ b/meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb | |||
| @@ -16,6 +16,7 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g | |||
| 16 | file://0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch \ | 16 | file://0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch \ |
| 17 | file://0001-test-Fix-build-with-new-compiler-defaults-to-fno-com.patch \ | 17 | file://0001-test-Fix-build-with-new-compiler-defaults-to-fno-com.patch \ |
| 18 | file://0001-sntp-Fix-types-in-check-for-pthread_detach.patch \ | 18 | file://0001-sntp-Fix-types-in-check-for-pthread_detach.patch \ |
| 19 | file://0001-include-fix-build-failure-with-glibc-2.43-_Generic-m.patch \ | ||
| 19 | file://ntpd \ | 20 | file://ntpd \ |
| 20 | file://ntp.conf \ | 21 | file://ntp.conf \ |
| 21 | file://ntpd.service \ | 22 | file://ntpd.service \ |
diff --git a/meta-networking/recipes-support/ntpsec/ntpsec_1.2.2a.bb b/meta-networking/recipes-support/ntpsec/ntpsec_1.2.4.bb index 872d1ce4f7..9704e2d15e 100644 --- a/meta-networking/recipes-support/ntpsec/ntpsec_1.2.2a.bb +++ b/meta-networking/recipes-support/ntpsec/ntpsec_1.2.4.bb | |||
| @@ -2,12 +2,12 @@ SUMMARY = "The Network Time Protocol suite, refactored" | |||
| 2 | HOMEPAGE = "https://www.ntpsec.org/" | 2 | HOMEPAGE = "https://www.ntpsec.org/" |
| 3 | 3 | ||
| 4 | LICENSE = "CC-BY-4.0 & BSD-2-Clause & NTP & BSD-3-Clause & MIT" | 4 | LICENSE = "CC-BY-4.0 & BSD-2-Clause & NTP & BSD-3-Clause & MIT" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSES/BSD-2;md5=653830da7b770a32f6f50f6107e0b186 \ | 5 | LIC_FILES_CHKSUM = "file://LICENSES/BSD-2-Clause.txt;md5=653830da7b770a32f6f50f6107e0b186 \ |
| 6 | file://LICENSES/BSD-3;md5=55e9dcf6a625a2dcfcda4ef6a647fbfd \ | 6 | file://LICENSES/BSD-3-Clause.txt;md5=55e9dcf6a625a2dcfcda4ef6a647fbfd \ |
| 7 | file://LICENSES/CC-BY-4.0;md5=2ab724713fdaf49e4523c4503bfd068d \ | 7 | file://LICENSES/CC-BY-4.0.txt;md5=2ab724713fdaf49e4523c4503bfd068d \ |
| 8 | file://LICENSES/MIT;md5=5a9dfc801af3eb49df2055c9b07918b2 \ | 8 | file://LICENSES/MIT.txt;md5=5a9dfc801af3eb49df2055c9b07918b2 \ |
| 9 | file://LICENSES/NTP;md5=cb56b7747f86157c78ca81f224806694" | 9 | file://LICENSES/NTP.txt;md5=cb56b7747f86157c78ca81f224806694" |
| 10 | 10 | ||
| 11 | DEPENDS += "bison-native \ | 11 | DEPENDS += "bison-native \ |
| 12 | openssl \ | 12 | openssl \ |
| 13 | python3" | 13 | python3" |
| @@ -17,7 +17,7 @@ SRC_URI = "https://ftp.ntpsec.org/pub/releases/ntpsec-${PV}.tar.gz \ | |||
| 17 | file://0001-wscript-Add-BISONFLAGS-support.patch \ | 17 | file://0001-wscript-Add-BISONFLAGS-support.patch \ |
| 18 | " | 18 | " |
| 19 | 19 | ||
| 20 | SRC_URI[sha256sum] = "e0ce93af222a0a9860e6f5a51aadba9bb5ca601d80b2aea118a62f0a3226950e" | 20 | SRC_URI[sha256sum] = "443e54a6149d1b0bf08677d17b18fced9028b101fc2ffd2c81e0834f87eebc7d" |
| 21 | 21 | ||
| 22 | UPSTREAM_CHECK_URI = "ftp://ftp.ntpsec.org/pub/releases/" | 22 | UPSTREAM_CHECK_URI = "ftp://ftp.ntpsec.org/pub/releases/" |
| 23 | 23 | ||
| @@ -63,7 +63,6 @@ EXTRA_OECONF = "--cross-compiler='${CC}' \ | |||
| 63 | --pyshebang=${bindir}/python3 \ | 63 | --pyshebang=${bindir}/python3 \ |
| 64 | --pythondir=${PYTHON_SITEPACKAGES_DIR} \ | 64 | --pythondir=${PYTHON_SITEPACKAGES_DIR} \ |
| 65 | --pythonarchdir=${PYTHON_SITEPACKAGES_DIR} \ | 65 | --pythonarchdir=${PYTHON_SITEPACKAGES_DIR} \ |
| 66 | --enable-debug-gdb \ | ||
| 67 | --enable-early-droproot" | 66 | --enable-early-droproot" |
| 68 | 67 | ||
| 69 | EXTRA_OEWAF_BUILD ?= "-v" | 68 | EXTRA_OEWAF_BUILD ?= "-v" |
| @@ -89,6 +88,11 @@ do_install:append() { | |||
| 89 | else | 88 | else |
| 90 | install -D -m 0644 ${T}/volatiles.ntpsec ${D}${sysconfdir}/default/volatiles/99_${BPN} | 89 | install -D -m 0644 ${T}/volatiles.ntpsec ${D}${sysconfdir}/default/volatiles/99_${BPN} |
| 91 | fi | 90 | fi |
| 91 | |||
| 92 | if [ -d ${D}/usr/lib64 ]; then | ||
| 93 | mv ${D}/usr/lib64/* ${D}${libdir}/ | ||
| 94 | rmdir ${D}/usr/lib64 | ||
| 95 | fi | ||
| 92 | } | 96 | } |
| 93 | 97 | ||
| 94 | PACKAGE_BEFORE_PN = "${PN}-python ${PN}-utils ${PN}-viz" | 98 | PACKAGE_BEFORE_PN = "${PN}-python ${PN}-utils ${PN}-viz" |
diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch index e181ee2872..d6c641d90b 100644 --- a/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch +++ b/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch | |||
| @@ -17,8 +17,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt | |||
| 17 | index 98985e7ee..001efb800 100644 | 17 | index 98985e7ee..001efb800 100644 |
| 18 | --- a/CMakeLists.txt | 18 | --- a/CMakeLists.txt |
| 19 | +++ b/CMakeLists.txt | 19 | +++ b/CMakeLists.txt |
| 20 | @@ -237,7 +237,10 @@ else() | 20 | @@ -256,7 +256,10 @@ else() |
| 21 | endif() | 21 | message(WARNING "pyverbs build requested but python development files not found") |
| 22 | endif() | 22 | endif() |
| 23 | 23 | ||
| 24 | -find_program(SYSTEMCTL_BIN systemctl HINTS "/usr/bin" "/bin") | 24 | -find_program(SYSTEMCTL_BIN systemctl HINTS "/usr/bin" "/bin") |
diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-include-libgen.h-for-basename.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-include-libgen.h-for-basename.patch deleted file mode 100644 index a093e47048..0000000000 --- a/meta-networking/recipes-support/rdma-core/rdma-core/0001-include-libgen.h-for-basename.patch +++ /dev/null | |||
| @@ -1,58 +0,0 @@ | |||
| 1 | From ae6adc4c748e67919fdf8ae1d44c619ee104c271 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Mon, 25 Mar 2024 11:37:41 -0700 | ||
| 4 | Subject: [PATCH] include libgen.h for basename | ||
| 5 | |||
| 6 | basename prototype has been removed from string.h from latest musl [1] | ||
| 7 | compilers e.g. clang-18 flags the absense of prototype as error. therefore | ||
| 8 | include libgen.h for providing it. | ||
| 9 | |||
| 10 | [1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 | ||
| 11 | |||
| 12 | Upstream-Status: Submitted [https://github.com/linux-rdma/rdma-core/pull/1443] | ||
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 14 | --- | ||
| 15 | kernel-boot/rdma_rename.c | 1 + | ||
| 16 | librdmacm/examples/rping.c | 1 + | ||
| 17 | providers/mlx5/mlx5_vfio.c | 1 + | ||
| 18 | 3 files changed, 3 insertions(+) | ||
| 19 | |||
| 20 | diff --git a/kernel-boot/rdma_rename.c b/kernel-boot/rdma_rename.c | ||
| 21 | index 4af9e4a39..5193ac411 100644 | ||
| 22 | --- a/kernel-boot/rdma_rename.c | ||
| 23 | +++ b/kernel-boot/rdma_rename.c | ||
| 24 | @@ -2,6 +2,7 @@ | ||
| 25 | /* Copyright (c) 2019, Mellanox Technologies. All rights reserved. See COPYING file */ | ||
| 26 | |||
| 27 | #define _GNU_SOURCE | ||
| 28 | +#include <libgen.h> | ||
| 29 | #include <stdio.h> | ||
| 30 | #include <stdlib.h> | ||
| 31 | #include <string.h> | ||
| 32 | diff --git a/librdmacm/examples/rping.c b/librdmacm/examples/rping.c | ||
| 33 | index cc16ad910..0f1321458 100644 | ||
| 34 | --- a/librdmacm/examples/rping.c | ||
| 35 | +++ b/librdmacm/examples/rping.c | ||
| 36 | @@ -33,6 +33,7 @@ | ||
| 37 | #define _GNU_SOURCE | ||
| 38 | #include <endian.h> | ||
| 39 | #include <getopt.h> | ||
| 40 | +#include <libgen.h> | ||
| 41 | #include <stdlib.h> | ||
| 42 | #include <string.h> | ||
| 43 | #include <stdio.h> | ||
| 44 | diff --git a/providers/mlx5/mlx5_vfio.c b/providers/mlx5/mlx5_vfio.c | ||
| 45 | index cd0c41462..4d064b1fc 100644 | ||
| 46 | --- a/providers/mlx5/mlx5_vfio.c | ||
| 47 | +++ b/providers/mlx5/mlx5_vfio.c | ||
| 48 | @@ -6,6 +6,7 @@ | ||
| 49 | #define _GNU_SOURCE | ||
| 50 | #include <config.h> | ||
| 51 | |||
| 52 | +#include <libgen.h> | ||
| 53 | #include <stdio.h> | ||
| 54 | #include <stdlib.h> | ||
| 55 | #include <unistd.h> | ||
| 56 | -- | ||
| 57 | 2.44.0 | ||
| 58 | |||
diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-overloadable-function-attribute-with-c.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-overloadable-function-attribute-with-c.patch deleted file mode 100644 index 092f4431bf..0000000000 --- a/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-overloadable-function-attribute-with-c.patch +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 1 | From c7de6834f0cd92b7341ab17a5c6996f3fbd40140 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Fri, 21 Jun 2024 22:16:47 -0700 | ||
| 4 | Subject: [PATCH] librdmacm: Use overloadable function attribute with clang | ||
| 5 | |||
| 6 | This is to fix build warnings seen with upcoming clang19 and | ||
| 7 | glibc 2.40, since glibc 2.40 has improved fortyfying this | ||
| 8 | function with clang, it ends up with build errors like below | ||
| 9 | |||
| 10 | librdmacm/preload.c:796:9: error: at most one overload for a given name may lack the 'overloadable' attribute | ||
| 11 | | 796 | ssize_t recvfrom(int socket, void *buf, size_t len, int flags, | ||
| 12 | | | ^ | ||
| 13 | | /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 | ||
| 14 | | 163 | extern ssize_t recvfrom (int __fd, void *__restrict __buf, size_t __n, | ||
| 15 | | | ^ | ||
| 16 | |||
| 17 | Upstream-Status: Submitted [https://github.com/linux-rdma/rdma-core/pull/1475] | ||
| 18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 19 | --- | ||
| 20 | librdmacm/preload.c | 7 +++++-- | ||
| 21 | 1 file changed, 5 insertions(+), 2 deletions(-) | ||
| 22 | |||
| 23 | --- a/librdmacm/preload.c | ||
| 24 | +++ b/librdmacm/preload.c | ||
| 25 | @@ -792,8 +792,11 @@ ssize_t recv(int socket, void *buf, size | ||
| 26 | return (fd_fork_get(socket, &fd) == fd_rsocket) ? | ||
| 27 | rrecv(fd, buf, len, flags) : real.recv(fd, buf, len, flags); | ||
| 28 | } | ||
| 29 | - | ||
| 30 | -ssize_t recvfrom(int socket, void *buf, size_t len, int flags, | ||
| 31 | +ssize_t | ||
| 32 | +#if defined(__clang__) && defined(__GLIBC__) | ||
| 33 | +__attribute__((overloadable)) | ||
| 34 | +#endif | ||
| 35 | +recvfrom(int socket, void *buf, size_t len, int flags, | ||
| 36 | struct sockaddr *src_addr, socklen_t *addrlen) | ||
| 37 | { | ||
| 38 | int fd; | ||
diff --git a/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb b/meta-networking/recipes-support/rdma-core/rdma-core_62.0.bb index 2555c43a85..5a8640ad02 100644 --- a/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb +++ b/meta-networking/recipes-support/rdma-core/rdma-core_62.0.bb | |||
| @@ -5,12 +5,10 @@ SECTION = "libs" | |||
| 5 | DEPENDS = "libnl" | 5 | DEPENDS = "libnl" |
| 6 | RDEPENDS:${PN} = "bash perl" | 6 | RDEPENDS:${PN} = "bash perl" |
| 7 | 7 | ||
| 8 | SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=https \ | 8 | SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=https;tag=v${PV} \ |
| 9 | file://0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch \ | 9 | file://0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch \ |
| 10 | file://0001-include-libgen.h-for-basename.patch \ | ||
| 11 | file://0001-librdmacm-Use-overloadable-function-attribute-with-c.patch \ | ||
| 12 | " | 10 | " |
| 13 | SRCREV = "6cd09097ad2eebde9a7fa3d3bb09a2cea6e3c2d6" | 11 | SRCREV = "31af04ec84378724cb6256814d4ffde359a7123b" |
| 14 | 12 | ||
| 15 | #Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md | 13 | #Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md |
| 16 | LICENSE = "BSD-2-Clause | GPL-2.0-only" | 14 | LICENSE = "BSD-2-Clause | GPL-2.0-only" |
diff --git a/meta-networking/recipes-support/spice/spice-gtk_0.42.bb b/meta-networking/recipes-support/spice/spice-gtk_0.42.bb index 3588d674f7..127738a429 100644 --- a/meta-networking/recipes-support/spice/spice-gtk_0.42.bb +++ b/meta-networking/recipes-support/spice/spice-gtk_0.42.bb | |||
| @@ -22,7 +22,6 @@ DEPENDS = " \ | |||
| 22 | cyrus-sasl \ | 22 | cyrus-sasl \ |
| 23 | gstreamer1.0 \ | 23 | gstreamer1.0 \ |
| 24 | gstreamer1.0-plugins-base \ | 24 | gstreamer1.0-plugins-base \ |
| 25 | gstreamer1.0-vaapi \ | ||
| 26 | gtk+3 \ | 25 | gtk+3 \ |
| 27 | jpeg \ | 26 | jpeg \ |
| 28 | json-glib \ | 27 | json-glib \ |
| @@ -30,6 +29,7 @@ DEPENDS = " \ | |||
| 30 | libepoxy \ | 29 | libepoxy \ |
| 31 | libopus \ | 30 | libopus \ |
| 32 | libusb1 \ | 31 | libusb1 \ |
| 32 | libva \ | ||
| 33 | lz4 \ | 33 | lz4 \ |
| 34 | pixman \ | 34 | pixman \ |
| 35 | python3-pyparsing-native \ | 35 | python3-pyparsing-native \ |
diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch b/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch deleted file mode 100644 index faefd1d4ea..0000000000 --- a/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch +++ /dev/null | |||
| @@ -1,61 +0,0 @@ | |||
| 1 | From b71eb384522b5ce4629dee6e8be257fb4880fef3 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Benjamin Gaignard <benjamin.gaignard@linaro.org> | ||
| 3 | Date: Thu, 20 Apr 2017 14:25:18 +0200 | ||
| 4 | |||
| 5 | --- | ||
| 6 | Upstream-Status: Pending | ||
| 7 | |||
| 8 | Makefile.am | 1 - | ||
| 9 | configure.ac | 17 ----------------- | ||
| 10 | 2 files changed, 18 deletions(-) | ||
| 11 | |||
| 12 | diff --git a/Makefile.am b/Makefile.am | ||
| 13 | index 4a3ead6..a12cb98 100644 | ||
| 14 | --- a/Makefile.am | ||
| 15 | +++ b/Makefile.am | ||
| 16 | @@ -2,7 +2,6 @@ SUBDIRS = \ | ||
| 17 | src \ | ||
| 18 | data \ | ||
| 19 | etc \ | ||
| 20 | - docs \ | ||
| 21 | m4macros \ | ||
| 22 | tests \ | ||
| 23 | scripts | ||
| 24 | diff --git a/configure.ac b/configure.ac | ||
| 25 | index 3849383..9f3a633 100644 | ||
| 26 | --- a/configure.ac | ||
| 27 | +++ b/configure.ac | ||
| 28 | @@ -179,18 +179,6 @@ AC_SUBST(CPPFLAGS) | ||
| 29 | AC_SUBST(LIBS) | ||
| 30 | AC_SUBST(ADDITIONAL_OBJECTS) | ||
| 31 | |||
| 32 | -if test x"$manpage_support_enabled" = x"yes"; then | ||
| 33 | -AC_PATH_PROG(POD2MAN, pod2man, no) | ||
| 34 | - | ||
| 35 | -if test "x$POD2MAN" = "xno" && \ | ||
| 36 | - ! test -e docs/man5/tinyproxy.conf.5 -a -e docs/man8/tinyproxy.8 ; then | ||
| 37 | -AC_MSG_ERROR([ | ||
| 38 | - manpage generation requested, but neither pod2man | ||
| 39 | - nor pre-generated manpages found. | ||
| 40 | - Use --disable-manpage-support if you want to compile anyway.]) | ||
| 41 | -fi | ||
| 42 | -fi #manpage_support_enabled | ||
| 43 | - | ||
| 44 | AM_CONDITIONAL(HAVE_POD2MAN, test "x$POD2MAN" != "x" -a "x$POD2MAN" != "xno") | ||
| 45 | |||
| 46 | AC_PATH_PROG(GPERF, gperf, no) | ||
| 47 | @@ -216,11 +204,6 @@ src/Makefile | ||
| 48 | data/Makefile | ||
| 49 | data/templates/Makefile | ||
| 50 | etc/Makefile | ||
| 51 | -docs/Makefile | ||
| 52 | -docs/man5/Makefile | ||
| 53 | -docs/man5/tinyproxy.conf.txt | ||
| 54 | -docs/man8/Makefile | ||
| 55 | -docs/man8/tinyproxy.txt | ||
| 56 | m4macros/Makefile | ||
| 57 | tests/Makefile | ||
| 58 | tests/scripts/Makefile | ||
| 59 | -- | ||
| 60 | 2.25.1 | ||
| 61 | |||
diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.2.bb b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.2.bb index 222cc8d7c6..8558291c18 100644 --- a/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.2.bb +++ b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.2.bb | |||
| @@ -4,7 +4,6 @@ LICENSE = "GPL-2.0-only" | |||
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" |
| 5 | 5 | ||
| 6 | SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.gz \ | 6 | SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.gz \ |
| 7 | file://disable-documentation.patch \ | ||
| 8 | file://tinyproxy.service \ | 7 | file://tinyproxy.service \ |
| 9 | file://tinyproxy.conf \ | 8 | file://tinyproxy.conf \ |
| 10 | file://run-ptest \ | 9 | file://run-ptest \ |
| @@ -21,6 +20,7 @@ EXTRA_OECONF += " \ | |||
| 21 | --enable-reverse \ | 20 | --enable-reverse \ |
| 22 | --enable-upstream \ | 21 | --enable-upstream \ |
| 23 | --enable-xtinyproxy \ | 22 | --enable-xtinyproxy \ |
| 23 | --enable-manpage_support=no \ | ||
| 24 | " | 24 | " |
| 25 | 25 | ||
| 26 | inherit autotools systemd useradd ptest | 26 | inherit autotools systemd useradd ptest |
diff --git a/meta-networking/recipes-support/tnftp/tnftp_20260211.bb b/meta-networking/recipes-support/tnftp/tnftp_20260211.bb index 90bff9a71b..70123eaa86 100644 --- a/meta-networking/recipes-support/tnftp/tnftp_20260211.bb +++ b/meta-networking/recipes-support/tnftp/tnftp_20260211.bb | |||
| @@ -8,6 +8,7 @@ IPv6 support, modification time preservation, paging of local and \ | |||
| 8 | remote files, passive mode support (with fallback to active mode), \ | 8 | remote files, passive mode support (with fallback to active mode), \ |
| 9 | SOCKS support, TIS FWTK gate-ftp server support, and transfer rate \ | 9 | SOCKS support, TIS FWTK gate-ftp server support, and transfer rate \ |
| 10 | throttling." | 10 | throttling." |
| 11 | HOMEPAGE = "https://en.wikipedia.org/wiki/Tnftp" | ||
| 11 | 12 | ||
| 12 | SECTION = "net" | 13 | SECTION = "net" |
| 13 | LICENSE = "BSD-2-Clause" | 14 | LICENSE = "BSD-2-Clause" |
diff --git a/meta-networking/recipes-support/tunctl/tunctl/makefile-add-ldflags.patch b/meta-networking/recipes-support/tunctl/tunctl/makefile-add-ldflags.patch index c96f538d2d..a556f6eebb 100644 --- a/meta-networking/recipes-support/tunctl/tunctl/makefile-add-ldflags.patch +++ b/meta-networking/recipes-support/tunctl/tunctl/makefile-add-ldflags.patch | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | Add LDFLAGS variable to Makefile, make sure the extra linker flags can be passed. | 1 | Add LDFLAGS variable to Makefile, make sure the extra linker flags can be passed. |
| 2 | 2 | ||
| 3 | Upstream-Status: Pending | 3 | Upstream-Status: Inactive-Upstream [last change: 2013-03-22] |
| 4 | 4 | ||
| 5 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | 5 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
| 6 | 6 | ||
diff --git a/meta-networking/recipes-support/udpcast/udpcast/0001-include-stddef.h-for-ptrdiff_t.patch b/meta-networking/recipes-support/udpcast/udpcast/0001-include-stddef.h-for-ptrdiff_t.patch index 3255a3fad0..244c6f5922 100644 --- a/meta-networking/recipes-support/udpcast/udpcast/0001-include-stddef.h-for-ptrdiff_t.patch +++ b/meta-networking/recipes-support/udpcast/udpcast/0001-include-stddef.h-for-ptrdiff_t.patch | |||
| @@ -5,7 +5,7 @@ Subject: [PATCH 1/1] include stddef.h for ptrdiff_t | |||
| 5 | 5 | ||
| 6 | This fixes compilation with musl. | 6 | This fixes compilation with musl. |
| 7 | 7 | ||
| 8 | Upstream-Status: Pending | 8 | Upstream-Status: Submitted [https://udpcast.linux.lu/mailman3/hyperkitty/list/udpcast@udpcast.linux.lu/thread/2WTDPJNR6WGDO3PGCEC2J7RSJWETDCXW/] |
| 9 | 9 | ||
| 10 | Signed-off-by: Enguerrand de Ribaucourt <enguerrand.de-ribaucourt@savoirfairelinux.com> | 10 | Signed-off-by: Enguerrand de Ribaucourt <enguerrand.de-ribaucourt@savoirfairelinux.com> |
| 11 | --- | 11 | --- |
diff --git a/meta-networking/recipes-support/wireshark/wireshark_4.6.3.bb b/meta-networking/recipes-support/wireshark/wireshark_4.6.4.bb index baf3af925d..7ecad4eda8 100644 --- a/meta-networking/recipes-support/wireshark/wireshark_4.6.3.bb +++ b/meta-networking/recipes-support/wireshark/wireshark_4.6.4.bb | |||
| @@ -4,7 +4,19 @@ SECTION = "net" | |||
| 4 | LICENSE = "GPL-2.0-only" | 4 | LICENSE = "GPL-2.0-only" |
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=570a9b3749dd0463a1778803b12a6dce" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=570a9b3749dd0463a1778803b12a6dce" |
| 6 | 6 | ||
| 7 | DEPENDS = "pcre2 expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native c-ares speexdsp virtual/libiconv" | 7 | DEPENDS = "\ |
| 8 | bison-native \ | ||
| 9 | c-ares \ | ||
| 10 | expat \ | ||
| 11 | glib-2.0 \ | ||
| 12 | glib-2.0-native \ | ||
| 13 | libgcrypt libgpg-error \ | ||
| 14 | libxml2 \ | ||
| 15 | pcre2 \ | ||
| 16 | speexdsp \ | ||
| 17 | virtual/libiconv \ | ||
| 18 | xxhash \ | ||
| 19 | " | ||
| 8 | 20 | ||
| 9 | DEPENDS:append:class-target = " wireshark-native chrpath-replacement-native " | 21 | DEPENDS:append:class-target = " wireshark-native chrpath-replacement-native " |
| 10 | 22 | ||
| @@ -19,7 +31,7 @@ SRC_URI:append:class-native = " file://0001-don-t-look-for-iconv.h-for-native-bu | |||
| 19 | 31 | ||
| 20 | UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src/all-versions" | 32 | UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src/all-versions" |
| 21 | 33 | ||
| 22 | SRC_URI[sha256sum] = "9fa6a745df8540899dc9d433e4634d6755371ff87bd722ce04c7d7b0132d9af3" | 34 | SRC_URI[sha256sum] = "fbeab3d85c6c8a5763c8d9b7fe20b5c69ca9f9e7f2b824bedc73135bdca332e2" |
| 23 | 35 | ||
| 24 | PE = "1" | 36 | PE = "1" |
| 25 | 37 | ||
