summaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-support
diff options
context:
space:
mode:
Diffstat (limited to 'meta-networking/recipes-support')
-rw-r--r--meta-networking/recipes-support/arptables/arptables_git.bb1
-rw-r--r--meta-networking/recipes-support/bmon/bmon_4.0.bb1
-rw-r--r--meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.1.bb3
-rw-r--r--meta-networking/recipes-support/celt051/celt051_git.bb1
-rw-r--r--meta-networking/recipes-support/chrony/chrony_4.6.1.bb (renamed from meta-networking/recipes-support/chrony/chrony_4.5.bb)9
-rw-r--r--meta-networking/recipes-support/cifs/cifs-utils_7.0.bb1
-rw-r--r--meta-networking/recipes-support/curlpp/curlpp/0002-fix-invalid-conversion-from-int-to-CURLoption.patch36
-rw-r--r--meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb4
-rw-r--r--meta-networking/recipes-support/dnsmasq/dnsmasq_2.91.bb (renamed from meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb)12
-rwxr-xr-xmeta-networking/recipes-support/dnsmasq/files/dnsmasq.conf298
-rw-r--r--meta-networking/recipes-support/dovecot/dovecot/1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830.patch24
-rw-r--r--meta-networking/recipes-support/dovecot/dovecot_2.3.21.1.bb (renamed from meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb)6
-rw-r--r--meta-networking/recipes-support/drbd/drbd-utils/0001-Fix-build-with-gcc-15.patch34
-rw-r--r--meta-networking/recipes-support/drbd/drbd-utils/0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch55
-rw-r--r--meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch190
-rw-r--r--meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch17
-rw-r--r--meta-networking/recipes-support/drbd/drbd-utils_9.30.0.bb (renamed from meta-networking/recipes-support/drbd/drbd-utils_9.27.0.bb)9
-rw-r--r--meta-networking/recipes-support/dropwatch/dropwatch_1.5.4.bb1
-rw-r--r--meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb1
-rw-r--r--meta-networking/recipes-support/fetchmail/fetchmail_6.5.2.bb (renamed from meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb)9
-rw-r--r--meta-networking/recipes-support/fping/fping_5.3.bb (renamed from meta-networking/recipes-support/fping/fping_5.2.bb)4
-rw-r--r--meta-networking/recipes-support/fwknop/fwknop/0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch27
-rw-r--r--meta-networking/recipes-support/fwknop/fwknop/0001-configure.ac-Fix-missing-comma-in-AS_IF.patch29
-rw-r--r--meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb (renamed from meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb)12
-rw-r--r--meta-networking/recipes-support/geoip/geoip-perl_1.51.bb1
-rw-r--r--meta-networking/recipes-support/geoip/geoip_1.6.12.bb9
-rw-r--r--meta-networking/recipes-support/http-parser/http-parser_2.9.4.bb1
-rw-r--r--meta-networking/recipes-support/ifenslave/ifenslave_2.14.bb6
-rw-r--r--meta-networking/recipes-support/iftop/iftop/0001-cfgfile-fix-build-with-gcc-15.patch46
-rw-r--r--meta-networking/recipes-support/iftop/iftop_1.0pre4.bb1
-rw-r--r--meta-networking/recipes-support/ipcalc/ipcalc_1.0.3.bb1
-rw-r--r--meta-networking/recipes-support/libconfuse/libconfuse_3.3.bb14
-rw-r--r--meta-networking/recipes-support/libcpr/libcpr_1.12.0.bb (renamed from meta-networking/recipes-support/libcpr/libcpr_1.10.5.bb)5
-rw-r--r--meta-networking/recipes-support/libesmtp/libesmtp_1.1.0.bb1
-rw-r--r--meta-networking/recipes-support/libldb/libldb_2.8.1.bb6
-rw-r--r--meta-networking/recipes-support/libmemcached/libmemcached.inc17
-rw-r--r--meta-networking/recipes-support/libmemcached/libmemcached_1.0.18.bb21
-rw-r--r--meta-networking/recipes-support/libmemcached/libmemcached_1.0.7.bb4
-rw-r--r--meta-networking/recipes-support/libtalloc/libtalloc_2.4.3.bb (renamed from meta-networking/recipes-support/libtalloc/libtalloc_2.4.2.bb)8
-rw-r--r--meta-networking/recipes-support/libtdb/libtdb_1.4.13.bb (renamed from meta-networking/recipes-support/libtdb/libtdb_1.4.10.bb)8
-rw-r--r--meta-networking/recipes-support/libtevent/libtevent/0002-Fix-pyext_PATTERN-for-cross-compilation.patch9
-rw-r--r--meta-networking/recipes-support/libtevent/libtevent_0.17.0.bb (renamed from meta-networking/recipes-support/libtevent/libtevent_0.16.1.bb)8
-rw-r--r--meta-networking/recipes-support/linux-atm/linux-atm/0001-Fix-implicit-declaration-error.patch44
-rw-r--r--meta-networking/recipes-support/linux-atm/linux-atm/0002-Fix-build-with-gcc-15.patch91
-rw-r--r--meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb2
-rw-r--r--meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.21.bb (renamed from meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb)15
-rw-r--r--meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb1
-rw-r--r--meta-networking/recipes-support/mctp/mctp/0001-mctp-bench-Adjust-headers.patch38
-rw-r--r--meta-networking/recipes-support/mctp/mctp_2.1.bb (renamed from meta-networking/recipes-support/mctp/mctp_1.1.bb)10
-rw-r--r--meta-networking/recipes-support/mdio-tools/mdio-netlink_1.3.1.bb3
-rw-r--r--meta-networking/recipes-support/mdio-tools/mdio-tools.inc2
-rw-r--r--meta-networking/recipes-support/mdio-tools/mdio-tools_1.3.1.bb3
-rw-r--r--meta-networking/recipes-support/memcached/memcached/0001-Fix-function-protypes.patch110
-rw-r--r--meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch13
-rw-r--r--meta-networking/recipes-support/memcached/memcached_1.6.38.bb (renamed from meta-networking/recipes-support/memcached/memcached_1.6.17.bb)7
-rw-r--r--meta-networking/recipes-support/mtr/mtr_0.95.bb1
-rw-r--r--meta-networking/recipes-support/nbdkit/nbdkit/0002-plugins-Avoid-absolute-buildpaths-in-binaries.patch38
-rw-r--r--meta-networking/recipes-support/nbdkit/nbdkit_1.33.11.bb1
-rw-r--r--meta-networking/recipes-support/nbdkit/nbdkit_1.43.11.bb33
-rw-r--r--meta-networking/recipes-support/ncp/libowfat/0001-fix-incompatible-type-error-with-gcc-15.patch100
-rw-r--r--meta-networking/recipes-support/ncp/libowfat_0.32.bb1
-rw-r--r--meta-networking/recipes-support/ndisc6/ndisc6/0001-Remove-use-of-variables-indicating-buildtime-informa.patch85
-rw-r--r--meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb6
-rw-r--r--meta-networking/recipes-support/netcat/netcat-openbsd/0001-fix-netcat-openbsd-ftbfs-with-GCC-15.patch51
-rw-r--r--meta-networking/recipes-support/netcat/netcat-openbsd_1.195.bb1
-rw-r--r--meta-networking/recipes-support/netcf/netcf_0.2.8.bb3
-rw-r--r--meta-networking/recipes-support/netperf/files/0001-Fix-too-many-arguments-error-occurring-in-gcc-15.patch168
-rw-r--r--meta-networking/recipes-support/netperf/files/0001-Makefile.am-add-ACLOCAL_AMFLAGS.patch41
-rw-r--r--meta-networking/recipes-support/netperf/netperf_git.bb13
-rw-r--r--meta-networking/recipes-support/netsniff-ng/netsniff-ng_0.6.8.bb1
-rw-r--r--meta-networking/recipes-support/nis/yp-tools_4.2.3.bb1
-rw-r--r--meta-networking/recipes-support/ntimed/ntimed_git.bb1
-rw-r--r--meta-networking/recipes-support/ntopng/ndpi_4.2.bb3
-rw-r--r--meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb1
-rwxr-xr-xmeta-networking/recipes-support/ntp/ntp/ntpd2
-rw-r--r--meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb7
-rw-r--r--meta-networking/recipes-support/nuttcp/nuttcp_8.2.2.bb3
-rw-r--r--meta-networking/recipes-support/open-isns/open-isns_0.102.bb1
-rw-r--r--meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-build-when-compiling-with-std-c23.patch26
-rw-r--r--meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.5.0.bb (renamed from meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.3.5.bb)9
-rw-r--r--meta-networking/recipes-support/openipmi/openipmi_2.0.36.bb (renamed from meta-networking/recipes-support/openipmi/openipmi_2.0.35.bb)4
-rw-r--r--meta-networking/recipes-support/openvpn/openvpn/0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch9
-rw-r--r--meta-networking/recipes-support/openvpn/openvpn/run-ptest5
-rw-r--r--meta-networking/recipes-support/openvpn/openvpn_2.6.14.bb (renamed from meta-networking/recipes-support/openvpn/openvpn_2.6.10.bb)50
-rw-r--r--meta-networking/recipes-support/pgpool2/pgpool2_4.5.3.bb (renamed from meta-networking/recipes-support/pgpool2/pgpool2_4.5.1.bb)10
-rw-r--r--meta-networking/recipes-support/phytool/phytool.bb1
-rw-r--r--meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-overloadable-function-attribute-with-c.patch6
-rw-r--r--meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb1
-rw-r--r--meta-networking/recipes-support/smcroute/smcroute_2.5.7.bb1
-rw-r--r--meta-networking/recipes-support/sngrep/sngrep_1.8.2.bb (renamed from meta-networking/recipes-support/sngrep/sngrep_1.8.1.bb)3
-rw-r--r--meta-networking/recipes-support/spice/libcacard_2.8.1.bb1
-rw-r--r--meta-networking/recipes-support/spice/spice-gtk_0.42.bb3
-rw-r--r--meta-networking/recipes-support/spice/spice-guest-vdagent_0.22.1.bb1
-rw-r--r--meta-networking/recipes-support/spice/spice-protocol_0.14.4.bb1
-rw-r--r--meta-networking/recipes-support/spice/spice_git.bb5
-rw-r--r--meta-networking/recipes-support/spice/usbredir_0.14.0.bb1
-rw-r--r--meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb7
-rw-r--r--meta-networking/recipes-support/ssmtp/ssmtp/0001-Fix-incompatible-pointer-types-error-with-gcc-15.patch47
-rw-r--r--meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb1
-rw-r--r--meta-networking/recipes-support/strongswan/strongswan/0001-pki-Fix-signature-of-help-to-match-that-of-a-callbac.patch25
-rw-r--r--meta-networking/recipes-support/strongswan/strongswan/0002-callback-job-Replace-return_false-in-constructors-wi.patch90
-rw-r--r--meta-networking/recipes-support/strongswan/strongswan/0003-Cast-uses-of-return_-nop-and-enumerator_create_empty.patch118
-rw-r--r--meta-networking/recipes-support/strongswan/strongswan_6.0.1.bb (renamed from meta-networking/recipes-support/strongswan/strongswan_5.9.14.bb)32
-rw-r--r--meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch19
-rw-r--r--meta-networking/recipes-support/stunnel/stunnel_5.75.bb (renamed from meta-networking/recipes-support/stunnel/stunnel_5.72.bb)4
-rw-r--r--[-rwxr-xr-x]meta-networking/recipes-support/tcpdump/tcpdump/run-ptest0
-rw-r--r--meta-networking/recipes-support/tcpdump/tcpdump_4.99.5.bb (renamed from meta-networking/recipes-support/tcpdump/tcpdump_4.99.4.bb)6
-rw-r--r--meta-networking/recipes-support/tcpdump/tcpslice_1.8.bb (renamed from meta-networking/recipes-support/tcpdump/tcpslice_1.7.bb)2
-rw-r--r--meta-networking/recipes-support/tcpreplay/tcpreplay/0001-Fix-linker-error-for-TX_RING.patch71
-rw-r--r--meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-do-not-run-conftest-in-case-of-cross-co.patch51
-rw-r--r--meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch82
-rw-r--r--meta-networking/recipes-support/tcpreplay/tcpreplay/0002-fix-incompatible-type-assignment-in-txring.c.patch31
-rw-r--r--meta-networking/recipes-support/tcpreplay/tcpreplay_4.5.1.bb (renamed from meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.4.bb)6
-rw-r--r--meta-networking/recipes-support/traceroute/traceroute_2.1.6.bb (renamed from meta-networking/recipes-support/traceroute/traceroute_2.1.5.bb)2
-rw-r--r--meta-networking/recipes-support/udpcast/udpcast/0001-include-stddef.h-for-ptrdiff_t.patch8
-rw-r--r--meta-networking/recipes-support/udpcast/udpcast_20250223.bb (renamed from meta-networking/recipes-support/udpcast/udpcast_20230924.bb)4
-rw-r--r--meta-networking/recipes-support/unbound/unbound/0001-fix-build-with-gcc-15-Wbuiltin-declaration-mismatch-.patch44
-rw-r--r--meta-networking/recipes-support/unbound/unbound/run-ptest17
-rw-r--r--meta-networking/recipes-support/unbound/unbound_1.22.0.bb (renamed from meta-networking/recipes-support/unbound/unbound_1.20.0.bb)35
-rw-r--r--meta-networking/recipes-support/wavemon/wavemon_0.9.6.bb (renamed from meta-networking/recipes-support/wavemon/wavemon_0.9.5.bb)3
-rw-r--r--meta-networking/recipes-support/wireshark/wireshark_4.2.12.bb (renamed from meta-networking/recipes-support/wireshark/wireshark_4.2.5.bb)14
-rw-r--r--meta-networking/recipes-support/wpan-tools/wpan-tools_0.10.bb (renamed from meta-networking/recipes-support/wpan-tools/wpan-tools_0.9.bb)5
122 files changed, 1615 insertions, 1097 deletions
diff --git a/meta-networking/recipes-support/arptables/arptables_git.bb b/meta-networking/recipes-support/arptables/arptables_git.bb
index f9dd66f605..be2cfb0816 100644
--- a/meta-networking/recipes-support/arptables/arptables_git.bb
+++ b/meta-networking/recipes-support/arptables/arptables_git.bb
@@ -14,7 +14,6 @@ SRC_URI = " \
14SRC_URI[arptables.md5sum] = "1d4ab05761f063b0751645d8f2b8f8e5" 14SRC_URI[arptables.md5sum] = "1d4ab05761f063b0751645d8f2b8f8e5"
15SRC_URI[arptables.sha256sum] = "e529fd465c67d69ad335299a043516e6b38cdcd337a5ed21718413e96073f928" 15SRC_URI[arptables.sha256sum] = "e529fd465c67d69ad335299a043516e6b38cdcd337a5ed21718413e96073f928"
16 16
17S = "${WORKDIR}/git"
18SYSTEMD_SERVICE:${PN} = "arptables.service" 17SYSTEMD_SERVICE:${PN} = "arptables.service"
19 18
20inherit systemd 19inherit systemd
diff --git a/meta-networking/recipes-support/bmon/bmon_4.0.bb b/meta-networking/recipes-support/bmon/bmon_4.0.bb
index c974d54fe8..f47069471a 100644
--- a/meta-networking/recipes-support/bmon/bmon_4.0.bb
+++ b/meta-networking/recipes-support/bmon/bmon_4.0.bb
@@ -9,4 +9,3 @@ SRC_URI = "git://github.com/tgraf/bmon.git;branch=master;protocol=https"
9 9
10inherit autotools pkgconfig 10inherit autotools pkgconfig
11 11
12S = "${WORKDIR}/git"
diff --git a/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.1.bb b/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.1.bb
index cf0fc1c33d..59e3dbae5f 100644
--- a/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.1.bb
+++ b/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.1.bb
@@ -15,9 +15,8 @@ SRC_URI = "\
15 file://0004-cleanup-includes.patch \ 15 file://0004-cleanup-includes.patch \
16" 16"
17 17
18S = "${WORKDIR}/git"
19 18
20DEPENDS = "sysfsutils" 19CVE_PRODUCT = "kernel:bridge-utils"
21 20
22inherit autotools-brokensep update-alternatives 21inherit autotools-brokensep update-alternatives
23 22
diff --git a/meta-networking/recipes-support/celt051/celt051_git.bb b/meta-networking/recipes-support/celt051/celt051_git.bb
index 4842a0fbdf..a9a664c196 100644
--- a/meta-networking/recipes-support/celt051/celt051_git.bb
+++ b/meta-networking/recipes-support/celt051/celt051_git.bb
@@ -21,7 +21,6 @@ SRC_URI = "git://gitlab.xiph.org/xiph/celt.git;branch=compat-v0.5.1;protocol=htt
21 file://0001-tests-Include-entcode.c-into-test-sources-to-provide.patch \ 21 file://0001-tests-Include-entcode.c-into-test-sources-to-provide.patch \
22 " 22 "
23 23
24S = "${WORKDIR}/git"
25 24
26inherit pkgconfig autotools-brokensep 25inherit pkgconfig autotools-brokensep
27 26
diff --git a/meta-networking/recipes-support/chrony/chrony_4.5.bb b/meta-networking/recipes-support/chrony/chrony_4.6.1.bb
index 0681a34393..5ac3e6d37e 100644
--- a/meta-networking/recipes-support/chrony/chrony_4.5.bb
+++ b/meta-networking/recipes-support/chrony/chrony_4.6.1.bb
@@ -30,7 +30,7 @@ SECTION = "net"
30LICENSE = "GPL-2.0-only" 30LICENSE = "GPL-2.0-only"
31LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 31LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
32 32
33SRC_URI = "https://download.tuxfamily.org/chrony/chrony-${PV}.tar.gz \ 33SRC_URI = "https://chrony-project.org/releases/chrony-${PV}.tar.gz \
34 file://chrony.conf \ 34 file://chrony.conf \
35 file://chronyd \ 35 file://chronyd \
36 file://arm_eabi.patch \ 36 file://arm_eabi.patch \
@@ -39,7 +39,7 @@ SRC_URI = "https://download.tuxfamily.org/chrony/chrony-${PV}.tar.gz \
39SRC_URI:append:libc-musl = " \ 39SRC_URI:append:libc-musl = " \
40 file://0001-Fix-compilation-with-musl.patch \ 40 file://0001-Fix-compilation-with-musl.patch \
41" 41"
42SRC_URI[sha256sum] = "19fe1d9f4664d445a69a96c71e8fdb60bcd8df24c73d1386e02287f7366ad422" 42SRC_URI[sha256sum] = "571ff73fbf0ae3097f0604eca2e00b1d8bb2e91affe1a3494785ff21d6199c5c"
43 43
44DEPENDS = "pps-tools" 44DEPENDS = "pps-tools"
45 45
@@ -48,9 +48,9 @@ DEPENDS = "pps-tools"
48inherit update-rc.d systemd pkgconfig 48inherit update-rc.d systemd pkgconfig
49 49
50# Add chronyd user if privdrop packageconfig is selected 50# Add chronyd user if privdrop packageconfig is selected
51inherit ${@bb.utils.contains('PACKAGECONFIG', 'privdrop', 'useradd', '', d)} 51inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'privdrop', 'useradd', '', d)}
52USERADD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '${PN}', '', d)}" 52USERADD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '${PN}', '', d)}"
53USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '--system -d / -M --shell /bin/nologin chronyd;', '', d)}" 53USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '--system -d / -M --shell /sbin/nologin chronyd;', '', d)}"
54 54
55# Configuration options: 55# Configuration options:
56# - Security-related: 56# - Security-related:
@@ -67,6 +67,7 @@ PACKAGECONFIG[sechash] = "--without-tomcrypt,--disable-sechash,nss"
67PACKAGECONFIG[privdrop] = ",--disable-privdrop,libcap" 67PACKAGECONFIG[privdrop] = ",--disable-privdrop,libcap"
68PACKAGECONFIG[scfilter] = "--enable-scfilter,--without-seccomp,libseccomp" 68PACKAGECONFIG[scfilter] = "--enable-scfilter,--without-seccomp,libseccomp"
69PACKAGECONFIG[ipv6] = ",--disable-ipv6," 69PACKAGECONFIG[ipv6] = ",--disable-ipv6,"
70PACKAGECONFIG[nts] = ",--disable-nts,gnutls"
70 71
71# --disable-static isn't supported by chrony's configure script. 72# --disable-static isn't supported by chrony's configure script.
72DISABLE_STATIC = "" 73DISABLE_STATIC = ""
diff --git a/meta-networking/recipes-support/cifs/cifs-utils_7.0.bb b/meta-networking/recipes-support/cifs/cifs-utils_7.0.bb
index c78bbae7b8..e2918503be 100644
--- a/meta-networking/recipes-support/cifs/cifs-utils_7.0.bb
+++ b/meta-networking/recipes-support/cifs/cifs-utils_7.0.bb
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
7SRCREV = "316522036133d44ed02cd39ed2748e2b59c85b30" 7SRCREV = "316522036133d44ed02cd39ed2748e2b59c85b30"
8SRC_URI = "git://git.samba.org/cifs-utils.git;branch=master" 8SRC_URI = "git://git.samba.org/cifs-utils.git;branch=master"
9 9
10S = "${WORKDIR}/git"
11DEPENDS += "libtalloc" 10DEPENDS += "libtalloc"
12 11
13PACKAGECONFIG ??= "" 12PACKAGECONFIG ??= ""
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
new file mode 100644
index 0000000000..1712a53462
--- /dev/null
+++ b/meta-networking/recipes-support/curlpp/curlpp/0002-fix-invalid-conversion-from-int-to-CURLoption.patch
@@ -0,0 +1,36 @@
1From ebe9144fdfdc8154661b93322cec4a1c43aa75ff Mon Sep 17 00:00:00 2001
2From: alperak <alperyasinak1@gmail.com>
3Date: Tue, 1 Oct 2024 19:45:38 +0300
4Subject: [PATCH] Fix invalid conversion from int to CURLoption
5
6Options.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
12Fix invalid conversion by adding explicit cast to CURLoption
13
14Upstream-Status: Pending
15
16Signed-off-by: alperak <alperyasinak1@gmail.com>
17---
18 include/curlpp/Options.hpp | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21diff --git a/include/curlpp/Options.hpp b/include/curlpp/Options.hpp
22index 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--
352.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 131f1873a2..25ea1fdefb 100644
--- a/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb
+++ b/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb
@@ -8,11 +8,11 @@ DEPENDS = "curl"
8DEPENDS:class-native = "curl-native" 8DEPENDS:class-native = "curl-native"
9 9
10SRC_URI = "git://github.com/jpbarrette/curlpp.git;branch=master;protocol=https \ 10SRC_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
13SRCREV = "592552a165cc569dac7674cb7fc9de3dc829906f" 14SRCREV = "592552a165cc569dac7674cb7fc9de3dc829906f"
14 15
15S = "${WORKDIR}/git"
16 16
17inherit cmake pkgconfig binconfig 17inherit cmake pkgconfig binconfig
18 18
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.91.bb
index be74759d5e..25f2d4c09a 100644
--- a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb
+++ b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.91.bb
@@ -12,12 +12,11 @@ DEPENDS += "gettext-native"
12#at least versions 2.69 and prior are moved to the archive folder on the server 12#at least versions 2.69 and prior are moved to the archive folder on the server
13SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getVar('PV').split('.')[1]) > 69]}dnsmasq-${PV}.tar.gz \ 13SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getVar('PV').split('.')[1]) > 69]}dnsmasq-${PV}.tar.gz \
14 file://init \ 14 file://init \
15 file://dnsmasq.conf \
16 file://dnsmasq-resolvconf.service \ 15 file://dnsmasq-resolvconf.service \
17 file://dnsmasq-noresolvconf.service \ 16 file://dnsmasq-noresolvconf.service \
18 file://dnsmasq-resolved.conf \ 17 file://dnsmasq-resolved.conf \
19" 18"
20SRC_URI[sha256sum] = "8f6666b542403b5ee7ccce66ea73a4a51cf19dd49392aaccd37231a2c51b303b" 19SRC_URI[sha256sum] = "2d26a048df452b3cfa7ba05efbbcdb19b12fe7a0388761eb5d00938624bd76c8"
21 20
22inherit pkgconfig update-rc.d systemd 21inherit pkgconfig update-rc.d systemd
23 22
@@ -25,8 +24,13 @@ INITSCRIPT_NAME = "dnsmasq"
25INITSCRIPT_PARAMS = "defaults" 24INITSCRIPT_PARAMS = "defaults"
26 25
27# dnsmasq defaults 26# dnsmasq defaults
28PACKAGECONFIG ?= "auth dhcp dhcp6 dumpfile inotify ipset loop script tftp" 27PACKAGECONFIG ?= "\
28 auth dhcp dumpfile inotify ipset loop script tftp \
29 ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'dhcp6', '', d)} \
30 ${@bb.utils.contains('MACHINE_FEATURES', 'rtc', '', 'broken-rtc', d)} \
31"
29 32
33# see src/config.h
30PACKAGECONFIG[auth] = "-DHAVE_AUTH,-DNO_AUTH" 34PACKAGECONFIG[auth] = "-DHAVE_AUTH,-DNO_AUTH"
31PACKAGECONFIG[broken-rtc] = "-DHAVE_BROKEN_RTC," 35PACKAGECONFIG[broken-rtc] = "-DHAVE_BROKEN_RTC,"
32PACKAGECONFIG[conntrack] = "-DHAVE_CONNTRACK,,libnetfilter-conntrack" 36PACKAGECONFIG[conntrack] = "-DHAVE_CONNTRACK,,libnetfilter-conntrack"
@@ -81,7 +85,7 @@ do_install () {
81 "MANDIR=${D}${mandir}" \ 85 "MANDIR=${D}${mandir}" \
82 install-i18n 86 install-i18n
83 install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d ${D}${sysconfdir}/dnsmasq.d 87 install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d ${D}${sysconfdir}/dnsmasq.d
84 install -m 644 ${UNPACKDIR}/dnsmasq.conf ${D}${sysconfdir}/ 88 install -m 644 ${S}/dnsmasq.conf.example ${D}${sysconfdir}/dnsmasq.conf
85 install -m 755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq 89 install -m 755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq
86 90
87 install -d ${D}${systemd_unitdir}/system 91 install -d ${D}${systemd_unitdir}/system
diff --git a/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf b/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf
deleted file mode 100755
index 2897b90300..0000000000
--- a/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf
+++ /dev/null
@@ -1,298 +0,0 @@
1# Configuration file for dnsmasq.
2#
3# Format is one option per line, legal options are the same
4# as the long options legal on the command line. See
5# "/usr/bin/dnsmasq --help" or "man 8 dnsmasq" for details.
6
7# Listen on this specific port instead of the standard DNS port
8# (53). Setting this to zero completely disables DNS function,
9# leaving only DHCP and/or TFTP.
10#port=5353
11
12# Change these lines if you want dnsmasq to serve MX records.
13# Only one of mx-host and mx-target need be set, the other defaults
14# to the name of the host running dnsmasq.
15#mx-host=
16#mx-target=
17#selfmx
18#localmx
19
20# The following two options make you a better netizen, since they
21# tell dnsmasq to filter out queries which the public DNS cannot
22# answer, and which load the servers (especially the root servers)
23# uneccessarily. If you have a dial-on-demand link they also stop
24# these requests from bringing up the link uneccessarily.
25
26# Never forward plain names (with a dot or domain part)
27domain-needed
28# Never forward addresses in the non-routed address spaces.
29bogus-priv
30
31
32# Uncomment this to filter useless windows-originated DNS requests
33# which can trigger dial-on-demand links needlessly.
34# Note that (amongst other things) this blocks all SRV requests,
35# so don't use it if you use eg Kerberos.
36#filterwin2k
37
38# Change this line if you want dns to get its upstream servers from
39# somewhere other that /etc/resolv.conf
40#resolv-file=
41
42# By default, dnsmasq will send queries to any of the upstream
43# servers it knows about and tries to favour servers to are known
44# to be up. Uncommenting this forces dnsmasq to try each query
45# with each server strictly in the order they appear in
46# /etc/resolv.conf
47#strict-order
48
49# If you don't want dnsmasq to read /etc/resolv.conf or any other
50# file, getting its servers for this file instead (see below), then
51# uncomment this
52#no-resolv
53
54# If you don't want dnsmasq to poll /etc/resolv.conf or other resolv
55# files for changes and re-read them then uncomment this.
56#no-poll
57
58# Add other name servers here, with domain specs if they are for
59# non-public domains.
60#server=/localnet/192.168.0.1
61
62# Add local-only domains here, queries in these domains are answered
63# from /etc/hosts or DHCP only.
64#local=/localnet/
65
66# Add domains which you want to force to an IP address here.
67# The example below send any host in doubleclick.net to a local
68# webserver.
69#address=/doubleclick.net/127.0.0.1
70
71# You no longer (as of version 1.7) need to set these to enable
72# dnsmasq to read /etc/ppp/resolv.conf since dnsmasq now uses the
73# "dip" group to achieve this.
74#user=
75#group=
76
77# If you want dnsmasq to listen for requests only on specified interfaces
78# (and the loopback) give the name of the interface (eg eth0) here.
79# Repeat the line for more than one interface.
80#interface=
81# Or you can specify which interface _not_ to listen on
82#except-interface=
83# Or which to listen on by address (remember to include 127.0.0.1 if
84# you use this.)
85#listen-address=127.0.0.1
86
87# On systems which support it, dnsmasq binds the wildcard address,
88# even when it is listening on only some interfaces. It then discards
89# requests that it shouldn't reply to. This has the advantage of
90# working even when interfaces come and go and change address. If you
91# want dnsmasq to really bind only the interfaces it is listening on,
92# uncomment this option. About the only time you may need this is when
93# running another nameserver on the same machine.
94#bind-interfaces
95
96# If you don't want dnsmasq to read /etc/hosts, uncomment the
97# following line.
98#no-hosts
99# or if you want it to read another file, as well as /etc/hosts, use
100# this.
101#addn-hosts=/etc/banner_add_hosts
102
103# Set this (and domain: see below) if you want to have a domain
104# automatically added to simple names in a hosts-file.
105#expand-hosts
106
107# Set the domain for dnsmasq. this is optional, but if it is set, it
108# does the following things.
109# 1) Allows DHCP hosts to have fully qualified domain names, as long
110# as the domain part matches this setting.
111# 2) Sets the "domain" DHCP option thereby potentially setting the
112# domain of all systems configured by DHCP
113# 3) Provides the domain part for "expand-hosts"
114#domain=thekelleys.org.uk
115
116# Uncomment this to enable the integrated DHCP server, you need
117# to supply the range of addresses available for lease and optionally
118# a lease time. If you have more than one network, you will need to
119# repeat this for each network on which you want to supply DHCP
120# service.
121#dhcp-range=192.168.0.50,192.168.0.150,12h
122#dhcp-range=10.0.0.10,10.0.0.200,2h
123
124# This is an example of a DHCP range where the netmask is given. This
125# is needed for networks we reach the dnsmasq DHCP server via a relay
126# agent. If you don't know what a DHCP relay agent is, you probably
127# don't need to worry about this.
128#dhcp-range=192.168.0.50,192.168.0.150,255.255.255.0,12h
129
130# This is an example of a DHCP range with a network-id, so that
131# some DHCP options may be set only for this network.
132#dhcp-range=red,192.168.0.50,192.168.0.150
133
134# Supply parameters for specified hosts using DHCP. There are lots
135# of valid alternatives, so we will give examples of each. Note that
136# IP addresses DO NOT have to be in the range given above, they just
137# need to be on the same network. The order of the parameters in these
138# do not matter, it's permissble to give name,adddress and MAC in any order
139
140# Always allocate the host with ethernet address 11:22:33:44:55:66
141# The IP address 192.168.0.60
142#dhcp-host=11:22:33:44:55:66,192.168.0.60
143
144# Always set the name of the host with hardware address
145# 11:22:33:44:55:66 to be "fred"
146#dhcp-host=11:22:33:44:55:66,fred
147
148# Always give the host with ethernet address 11:22:33:44:55:66
149# the name fred and IP address 192.168.0.60 and lease time 45 minutes
150#dhcp-host=11:22:33:44:55:66,fred,192.168.0.60,45m
151
152# Give the machine which says it's name is "bert" IP address
153# 192.168.0.70 and an infinite lease
154#dhcp-host=bert,192.168.0.70,infinite
155
156# Always give the host with client identifier 01:02:02:04
157# the IP address 192.168.0.60
158#dhcp-host=id:01:02:02:04,192.168.0.60
159
160# Always give the host with client identifier "marjorie"
161# the IP address 192.168.0.60
162#dhcp-host=id:marjorie,192.168.0.60
163
164# Enable the address given for "judge" in /etc/hosts
165# to be given to a machine presenting the name "judge" when
166# it asks for a DHCP lease.
167#dhcp-host=judge
168
169# Never offer DHCP service to a machine whose ethernet
170# address is 11:22:33:44:55:66
171#dhcp-host=11:22:33:44:55:66,ignore
172
173# Ignore any client-id presented by the machine with ethernet
174# address 11:22:33:44:55:66. This is useful to prevent a machine
175# being treated differently when running under different OS's or
176# between PXE boot and OS boot.
177#dhcp-host=11:22:33:44:55:66,id:*
178
179# Send extra options which are tagged as "red" to
180# the machine with ethernet address 11:22:33:44:55:66
181#dhcp-host=11:22:33:44:55:66,net:red
182
183# Send extra options which are tagged as "red" to any machine whose
184# DHCP vendorclass string includes the substring "Linux"
185#dhcp-vendorclass=red,Linux
186
187# Send extra options which are tagged as "red" to any machine one
188# of whose DHCP userclass strings includes the substring "accounts"
189#dhcp-userclass=red,accounts
190
191# If this line is uncommented, dnsmasq will read /etc/ethers and act
192# on the ethernet-address/IP pairs found there just as if they had
193# been given as --dhcp-host options. Useful if you keep
194# MAC-address/host mappings there for other purposes.
195#read-ethers
196
197# Send options to hosts which ask for a DHCP lease.
198# See RFC 2132 for details of available options.
199# Note that all the common settings, such as netmask and
200# broadcast address, DNS server and default route, are given
201# sane defaults by dnsmasq. You very likely will not need any
202# any dhcp-options. If you use Windows clients and Samba, there
203# are some options which are recommended, they are detailed at the
204# end of this section.
205# For reference, the common options are:
206# subnet mask - 1
207# default router - 3
208# DNS server - 6
209# broadcast address - 28
210
211# Set the NTP time server addresses to 192.168.0.4 and 10.10.0.5
212#dhcp-option=42,192.168.0.4,10.10.0.5
213
214# Set the NTP time server address to be the same machine as
215# is running dnsmasq
216#dhcp-option=42,0.0.0.0
217
218# Set the NIS domain name to "welly"
219#dhcp-option=40,welly
220
221# Set the default time-to-live to 50
222#dhcp-option=23,50
223
224# Set the "all subnets are local" flag
225#dhcp-option=27,1
226
227# Send the etherboot magic flag and then etherboot options (a string).
228#dhcp-option=128,e4:45:74:68:00:00
229#dhcp-option=129,NIC=eepro100
230
231# Specify an option which will only be sent to the "red" network
232# (see dhcp-range for the declaration of the "red" network)
233#dhcp-option=red,42,192.168.1.1
234
235# The following DHCP options set up dnsmasq in the same way as is specified
236# for the ISC dhcpcd in
237# http://www.samba.org/samba/ftp/docs/textdocs/DHCP-Server-Configuration.txt
238# adapted for a typical dnsmasq installation where the host running
239# dnsmasq is also the host running samba.
240# you may want to uncomment them if you use Windows clients and Samba.
241#dhcp-option=19,0 # option ip-forwarding off
242#dhcp-option=44,0.0.0.0 # set netbios-over-TCP/IP nameserver(s) aka WINS server(s)
243#dhcp-option=45,0.0.0.0 # netbios datagram distribution server
244#dhcp-option=46,8 # netbios node type
245#dhcp-option=47 # empty netbios scope.
246
247
248# Set the boot filename and tftpd server name and address
249# for BOOTP. You will only need this is you want to
250# boot machines over the network.
251#dhcp-boot=/var/ftpd/pxelinux.0,boothost,192.168.0.3
252
253# Set the limit on DHCP leases, the default is 150
254#dhcp-lease-max=150
255
256# The DHCP server needs somewhere on disk to keep its lease database.
257# This defaults to a sane location, but if you want to change it, use
258# the line below.
259#dhcp-leasefile=/var/lib/misc/dnsmasq.leases
260
261# Set the cachesize here.
262#cache-size=150
263
264# If you want to disable negative caching, uncomment this.
265#no-negcache
266
267# Normally responses which come form /etc/hosts and the DHCP lease
268# file have Time-To-Live set as zero, which conventionally means
269# do not cache further. If you are happy to trade lower load on the
270# server for potentially stale date, you can set a time-to-live (in
271# seconds) here.
272#local-ttl=
273
274# If you want dnsmasq to detect attempts by Verisign to send queries
275# to unregistered .com and .net hosts to its sitefinder service and
276# have dnsmasq instead return the correct NXDOMAIN response, uncomment
277# this line. You can add similar lines to do the same for other
278# registries which have implemented wildcard A records.
279#bogus-nxdomain=64.94.110.11
280
281# If you want to fix up DNS results from upstream servers, use the
282# alias option. This only works for IPv4.
283# This alias makes a result of 1.2.3.4 appear as 5.6.7.8
284#alias=1.2.3.4,5.6.7.8
285# and this maps 1.2.3.x to 5.6.7.x
286#alias=1.2.3.0,5.6.7.0,255.255.255.0
287
288# For debugging purposes, log each DNS query as it passes through
289# dnsmasq.
290#log-queries
291
292# Include a another lot of configuration options.
293#conf-file=/etc/dnsmasq.more.conf
294
295
296
297
298
diff --git a/meta-networking/recipes-support/dovecot/dovecot/1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830.patch b/meta-networking/recipes-support/dovecot/dovecot/1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830.patch
new file mode 100644
index 0000000000..0765d963c1
--- /dev/null
+++ b/meta-networking/recipes-support/dovecot/dovecot/1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830.patch
@@ -0,0 +1,24 @@
1From 1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830 Mon Sep 17 00:00:00 2001
2From: fundawang <fundawang@yeah.net>
3Date: Sun, 27 Oct 2024 22:11:21 +0800
4Subject: [PATCH] configure: Explicitly check for icu-uc
5
6Ensure we link against libicu-uc when it's split in v76.
7
8Upstream-Status: Backport [https://github.com/dovecot/core/commit/1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830]
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 m4/want_icu.m4 | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14--- a/m4/want_icu.m4
15+++ b/m4/want_icu.m4
16@@ -1,7 +1,7 @@
17 AC_DEFUN([DOVECOT_WANT_ICU], [
18 if test "$want_icu" != "no"; then
19 if test "$PKG_CONFIG" != "" && $PKG_CONFIG --exists icu-i18n 2>/dev/null; then
20- PKG_CHECK_MODULES(LIBICU, icu-i18n)
21+ PKG_CHECK_MODULES(LIBICU, [icu-i18n icu-uc])
22 have_icu=yes
23 AC_DEFINE(HAVE_LIBICU,, [Define if you want ICU normalization support for FTS])
24 elif test "$want_icu" = "yes"; then
diff --git a/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb b/meta-networking/recipes-support/dovecot/dovecot_2.3.21.1.bb
index 2f887e6018..3177cdb1d7 100644
--- a/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb
+++ b/meta-networking/recipes-support/dovecot/dovecot_2.3.21.1.bb
@@ -11,8 +11,9 @@ SRC_URI = "http://dovecot.org/releases/2.3/dovecot-${PV}.tar.gz \
11 file://dovecot.socket \ 11 file://dovecot.socket \
12 file://0001-not-check-pandoc.patch \ 12 file://0001-not-check-pandoc.patch \
13 file://0001-m4-Check-for-libunwind-instead-of-libunwind-generic.patch \ 13 file://0001-m4-Check-for-libunwind-instead-of-libunwind-generic.patch \
14 file://1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830.patch \
14 " 15 "
15SRC_URI[sha256sum] = "05b11093a71c237c2ef309ad587510721cc93bbee6828251549fc1586c36502d" 16SRC_URI[sha256sum] = "2d90a178c4297611088bf7daae5492a3bc3d5ab6328c3a032eb425d2c249097e"
16 17
17DEPENDS = "openssl xz zlib bzip2 libcap icu libtirpc bison-native" 18DEPENDS = "openssl xz zlib bzip2 libcap icu libtirpc bison-native"
18CFLAGS += "-I${STAGING_INCDIR}/tirpc" 19CFLAGS += "-I${STAGING_INCDIR}/tirpc"
@@ -50,7 +51,8 @@ SYSTEMD_AUTO_ENABLE = "disable"
50do_install:append () { 51do_install:append () {
51 rm -rf ${D}${libdir}/dovecot/dovecot-config 52 rm -rf ${D}${libdir}/dovecot/dovecot-config
52 install -d 755 ${D}/etc/dovecot 53 install -d 755 ${D}/etc/dovecot
53 touch 644 ${D}/etc/dovecot/dovecot.conf 54 touch ${D}/etc/dovecot/dovecot.conf
55 chmod 644 ${D}/etc/dovecot/dovecot.conf
54 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then 56 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then
55 install -m 0644 ${UNPACKDIR}/dovecot.service ${D}${systemd_unitdir}/system 57 install -m 0644 ${UNPACKDIR}/dovecot.service ${D}${systemd_unitdir}/system
56 sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/dovecot.service 58 sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/dovecot.service
diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-Fix-build-with-gcc-15.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-Fix-build-with-gcc-15.patch
new file mode 100644
index 0000000000..00105fb844
--- /dev/null
+++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-Fix-build-with-gcc-15.patch
@@ -0,0 +1,34 @@
1From b42265af87d9efcc9aac91b3a3da3df5c5c66e29 Mon Sep 17 00:00:00 2001
2From: Nguyen Dat Tho <tho3.nguyen@lge.com>
3Date: Wed, 9 Apr 2025 17:33:25 +0900
4Subject: [PATCH] Fix build with gcc-15
5
6To fix the following error:
7In file included from string_matching.cpp:1:
8./string_matching.h:10:18: error: 'uint16_t' does not name a type
9 10 | extern const uint16_t PATTERN_LIMIT;
10 | ^~~~~~~~
11./string_matching.h:7:1: note: 'uint16_t' is defined in header '<cstdint>'; this is probably fixable by adding '#include <cstdint>'
12
13Upstream-Status: Submitted [https://github.com/LINBIT/drbd-utils/pull/50]
14
15Signed-off-by: Nguyen Dat Tho <tho3.nguyen@lge.com>
16---
17 user/drbdmon/string_matching.h | 1 +
18 1 file changed, 1 insertion(+)
19
20diff --git a/user/drbdmon/string_matching.h b/user/drbdmon/string_matching.h
21index 9b3918fe..b783ba48 100644
22--- a/user/drbdmon/string_matching.h
23+++ b/user/drbdmon/string_matching.h
24@@ -4,6 +4,7 @@
25 #include <string>
26 #include <memory>
27 #include <stdexcept>
28+#include <cstdint>
29
30 namespace string_matching
31 {
32--
332.34.1
34
diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch b/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-networking/recipes-support/drbd/drbd-utils/0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1From 61991db099f66348dddbc3408e7ee8c05bda85cb Mon Sep 17 00:00:00 2001
2From: Yoann Congal <yoann.congal@smile.fr>
3Date: Sat, 2 Mar 2024 16:23:07 +0100
4Subject: [PATCH] configure.ac: Add an option to disable host udev version
5 checks
6
7In cross-compilation environment, the build host might have an outdated
8udev or no udev at all. But the user may still want to build with the
9enabled udev rule (for its udev-enabled target).
10
11This patch adds a "--disable-udevchecks" option the disable build host
12udev version check at configure-time and unconditionally install the
13enabled udev rule. Without this new option, the behavior stays the same
14(checks enabled).
15
16Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
17Upstream-Status: Backport [https://github.com/LINBIT/drbd-utils/commit/f2b5a7335ae52109dfb95a9d99ae20519c43d59a]
18---
19 configure.ac | 9 +++++++--
20 1 file changed, 7 insertions(+), 2 deletions(-)
21
22diff --git a/configure.ac b/configure.ac
23index f1d69ea3..4c56d33b 100644
24--- a/configure.ac
25+++ b/configure.ac
26@@ -71,6 +71,11 @@ AC_ARG_WITH([udev],
27 [AS_HELP_STRING([--with-udev],
28 [Enable udev integration])],
29 [WITH_UDEV=$withval])
30+AC_ARG_ENABLE([udevchecks],
31+ [AS_HELP_STRING([--disable-udevchecks],
32+ [Disable host udev version checks])],
33+ [],
34+ [enable_udevchecks=yes])
35 AC_ARG_WITH([xen],
36 [AS_HELP_STRING([--with-xen],
37 [Enable Xen integration])],
38@@ -315,7 +320,7 @@ if test -z $GIT; then
39 AC_MSG_WARN(Cannot update buildtag without git. You may safely ignore this warning when building from a tarball.)
40 fi
41
42-if test $UDEVADM = false && test $UDEVINFO = false; then
43+if test "x$enable_udevchecks" != "xno" && test $UDEVADM = false && test $UDEVINFO = false; then
44 if test "$WITH_UDEV" = "yes"; then
45 AC_MSG_WARN([udev support enabled, but neither udevadm nor udevinfo found on this system.])
46 fi
47@@ -423,7 +428,7 @@ else
48 test -z $INITDIR && INITDIR="$sysconfdir/init.d"
49
50 dnl Our udev rules file is known to work only with udev >= 85
51- if test "$WITH_UDEV" = "yes"; then
52+ if test "x$enable_udevchecks" != "xno" && test "$WITH_UDEV" = "yes"; then
53 udev_version=$( set -- $($UDEVADM version); echo $1 )
54 if test -z "$udev_version"; then
55 udev_version=$( set -- $($UDEVINFO -V); echo $3 )
diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch
index 27f0a9b54a..93cb8e185e 100644
--- a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch
+++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch
@@ -1,30 +1,21 @@
1From 264ae7b062ac52a5545a8a562b51001f7ce7369d Mon Sep 17 00:00:00 2001 1From a019fbe36ab965e754b818fe1bdb0cea0e3ffb60 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Thu, 21 Apr 2022 17:22:35 +0800 3Date: Thu, 21 Apr 2022 17:22:35 +0800
4Subject: [PATCH] drbd-utils: support usermerge 4Subject: [PATCH] drbd-utils: support usrmerge
5 5
6Upstream-Status: Inappropriate [oe-specific] 6Upstream-Status: Inappropriate [oe-specific]
7 7
8Signed-off-by: Changqing Li <changqing.li@windriver.com> 8Signed-off-by: Changqing Li <changqing.li@windriver.com>
9Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> 9Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
10--- 10---
11 configure.ac | 2 +- 11 configure.ac | 2 +-
12 scripts/Makefile.in | 10 +++++----- 12 1 file changed, 1 insertion(+), 1 deletion(-)
13 scripts/drbd-demote-or-escalate@.service | 2 +-
14 scripts/drbd-promote@.service | 4 ++--
15 scripts/drbd-wait-promotable@.service | 2 +-
16 scripts/drbd.service | 6 +++---
17 scripts/drbd@.service | 6 +++---
18 scripts/ocf.ra@.service | 4 ++--
19 user/v83/Makefile.in | 14 +++++++-------
20 user/v84/Makefile.in | 14 +++++++-------
21 10 files changed, 32 insertions(+), 32 deletions(-)
22 13
23diff --git a/configure.ac b/configure.ac 14diff --git a/configure.ac b/configure.ac
24index f1d69ea3..3289ac7d 100644 15index 37148597..52015fb2 100644
25--- a/configure.ac 16--- a/configure.ac
26+++ b/configure.ac 17+++ b/configure.ac
27@@ -183,7 +183,7 @@ AC_ARG_WITH(tmpfilesdir, 18@@ -217,7 +217,7 @@ AC_ARG_WITH(tmpfilesdir,
28 AC_SUBST(tmpfilesdir) 19 AC_SUBST(tmpfilesdir)
29 20
30 # set default early 21 # set default early
@@ -33,169 +24,6 @@ index f1d69ea3..3289ac7d 100644
33 if test x"$with_udev" = x || \ 24 if test x"$with_udev" = x || \
34 test x"$with_udev" = xyes ; then 25 test x"$with_udev" = xyes ; then
35 if test x"$PKG_CONFIG" != x; then 26 if test x"$PKG_CONFIG" != x; then
36diff --git a/scripts/Makefile.in b/scripts/Makefile.in 27--
37index aca15a22..a1cd2ffe 100644 282.25.1
38--- a/scripts/Makefile.in 29
39+++ b/scripts/Makefile.in
40@@ -91,11 +91,11 @@ ifeq ($(subst both,systemd,$(initscripttype)),systemd)
41 install -d $(DESTDIR)$(systemdunitdir)
42 install -m 644 $(SYSTEMD_UNITS) $(DESTDIR)$(systemdunitdir)/
43 install -m 644 $(SYSTEMD_TEMPLATES) $(DESTDIR)$(systemdunitdir)/
44- install -d $(DESTDIR)/lib/drbd/scripts
45- install -m 755 drbd $(DESTDIR)/lib/drbd/scripts
46- install -m 755 drbd-service-shim.sh $(DESTDIR)/lib/drbd/scripts
47- install -m 755 drbd-wait-promotable.sh $(DESTDIR)/lib/drbd/scripts
48- install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/lib/drbd/scripts
49+ install -d $(DESTDIR)/${nonarch_libdir}/drbd/scripts
50+ install -m 755 drbd $(DESTDIR)/${nonarch_libdir}/drbd/scripts
51+ install -m 755 drbd-service-shim.sh $(DESTDIR)/${nonarch_libdir}/drbd/scripts
52+ install -m 755 drbd-wait-promotable.sh $(DESTDIR)/${nonarch_libdir}/drbd/scripts
53+ install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/${nonarch_libdir}/drbd/scripts
54 install -d $(DESTDIR)$(tmpfilesdir)/
55 install -m 444 drbd.tmpfiles.conf $(DESTDIR)$(tmpfilesdir)/drbd.conf
56 endif
57diff --git a/scripts/drbd-demote-or-escalate@.service b/scripts/drbd-demote-or-escalate@.service
58index 20932238..8b5ce4a2 100644
59--- a/scripts/drbd-demote-or-escalate@.service
60+++ b/scripts/drbd-demote-or-escalate@.service
61@@ -28,5 +28,5 @@ TimeoutSec=60
62 # "Type=forking" would be an option to have it retry a number of times,
63 # and then only escalate to FailureAction if that did not help.
64 Type=oneshot
65-ExecStart=/lib/drbd/scripts/drbd-service-shim.sh secondary-or-escalate %I
66+ExecStart=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh secondary-or-escalate %I
67 ExecStopPost=-/bin/journalctl --sync
68diff --git a/scripts/drbd-promote@.service b/scripts/drbd-promote@.service
69index 71345d9b..678e0703 100644
70--- a/scripts/drbd-promote@.service
71+++ b/scripts/drbd-promote@.service
72@@ -24,5 +24,5 @@ RemainAfterExit=yes
73 # (ab)using systemd features
74 # if we cannot configure and promote, that's a condition, not a failure
75 # See the comment above wrt. FailureAction vs OnFailure
76-ExecCondition=/lib/drbd/scripts/drbd-service-shim.sh primary %I
77-ExecStop=/lib/drbd/scripts/drbd-service-shim.sh secondary %I
78+ExecCondition=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh primary %I
79+ExecStop=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh secondary %I
80diff --git a/scripts/drbd-wait-promotable@.service b/scripts/drbd-wait-promotable@.service
81index 81c3789f..3416abc6 100644
82--- a/scripts/drbd-wait-promotable@.service
83+++ b/scripts/drbd-wait-promotable@.service
84@@ -10,7 +10,7 @@ Type=oneshot
85
86 # on first start, wait for access to "good data"
87 # let systemd handle timeouts
88-ExecStart=/lib/drbd/scripts/drbd-wait-promotable.sh %I
89+ExecStart=@nonarch_libdir@/drbd/scripts/drbd-wait-promotable.sh %I
90 RemainAfterExit=yes
91
92 [Install]
93diff --git a/scripts/drbd.service b/scripts/drbd.service
94index 96c599e7..c81e95a6 100644
95--- a/scripts/drbd.service
96+++ b/scripts/drbd.service
97@@ -12,11 +12,11 @@ RemainAfterExit=yes
98 # A check for INIT_VERSION already exists, just set it to something.
99 Environment=INIT_VERSION=systemd
100
101-ExecStart=/lib/drbd/scripts/drbd start
102-ExecStop=/lib/drbd/scripts/drbd stop
103+ExecStart=@nonarch_libdir@/drbd/scripts/drbd start
104+ExecStop=@nonarch_libdir@/drbd/scripts/drbd stop
105
106 # Re-adjust everything on reload
107-ExecReload=/lib/drbd/scripts/drbd reload
108+ExecReload=@nonarch_libdir@/drbd/scripts/drbd reload
109
110 [Install]
111 WantedBy=multi-user.target
112diff --git a/scripts/drbd@.service b/scripts/drbd@.service
113index 0fad10be..556f3857 100644
114--- a/scripts/drbd@.service
115+++ b/scripts/drbd@.service
116@@ -35,8 +35,8 @@ RemainAfterExit=yes
117
118 # depends... do we want this as ExecCondition or as ExecStart
119 # failed start is "failed", failed condition is just "not startable yet"
120-ExecStart=/lib/drbd/scripts/drbd-service-shim.sh adjust %I
121-ExecReload=/lib/drbd/scripts/drbd-service-shim.sh adjust %I
122+ExecStart=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh adjust %I
123+ExecReload=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh adjust %I
124
125 # can only succeed, if you first stop all depending services
126-ExecStopPost=/lib/drbd/scripts/drbd-service-shim.sh down %I
127+ExecStopPost=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh down %I
128diff --git a/scripts/ocf.ra@.service b/scripts/ocf.ra@.service
129index 9c2268a6..1666c482 100644
130--- a/scripts/ocf.ra@.service
131+++ b/scripts/ocf.ra@.service
132@@ -22,5 +22,5 @@ Environment=monitor_inverval=30
133 # Only the first argument is used by the wrapper,
134 # the %n is just to identify which is which in the process list.
135 # All parameterization is done via Environment= in per instance override.conf
136-ExecStart=/lib/drbd/scripts/ocf.ra.wrapper.sh start-and-monitor %n
137-ExecStopPost=/lib/drbd/scripts/ocf.ra.wrapper.sh stop %n
138+ExecStart=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh start-and-monitor %n
139+ExecStopPost=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh stop %n
140diff --git a/user/v83/Makefile.in b/user/v83/Makefile.in
141index 08cfe574..4c4971b6 100644
142--- a/user/v83/Makefile.in
143+++ b/user/v83/Makefile.in
144@@ -96,19 +96,19 @@ install:
145 ifeq ($(WITH_83_SUPPORT),yes)
146 install -d $(DESTDIR)$(localstatedir)/lib/drbd
147 install -d $(DESTDIR)$(localstatedir)/lock
148- install -d $(DESTDIR)/lib/drbd/
149+ install -d $(DESTDIR)/${nonarch_libdir}/drbd/
150 if getent group haclient > /dev/null 2> /dev/null ; then \
151- install -g haclient -m 4750 drbdsetup-83 $(DESTDIR)/lib/drbd/ ; \
152- install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ; \
153+ install -g haclient -m 4750 drbdsetup-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \
154+ install -m 755 drbdadm-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \
155 else \
156- install -m 755 drbdsetup-83 $(DESTDIR)/lib/drbd/ ; \
157- install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ; \
158+ install -m 755 drbdsetup-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \
159+ install -m 755 drbdadm-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \
160 fi
161 endif
162
163 uninstall:
164- rm -f $(DESTDIR)/lib/drbd/drbdsetup-83
165- rm -f $(DESTDIR)/lib/drbd/drbdadm-83
166+ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdsetup-83
167+ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdadm-83
168
169 .PHONY: install uninstall clean distclean
170 ../../configure:
171diff --git a/user/v84/Makefile.in b/user/v84/Makefile.in
172index 0fcefc5f..81f7d5ec 100644
173--- a/user/v84/Makefile.in
174+++ b/user/v84/Makefile.in
175@@ -110,19 +110,19 @@ ifeq ($(WITH_84_SUPPORT),yes)
176 install -d $(DESTDIR)$(localstatedir)/lib/drbd
177 install -d $(DESTDIR)$(localstatedir)/run/drbd
178 install -d $(DESTDIR)$(localstatedir)/lock
179- install -d $(DESTDIR)/lib/drbd/
180+ install -d $(DESTDIR)/${nonarch_libdir}/drbd/
181 if getent group haclient > /dev/null 2> /dev/null ; then \
182- install -g haclient -m 4750 drbdsetup-84 $(DESTDIR)/lib/drbd/ ; \
183- install -m 755 drbdadm-84 $(DESTDIR)/lib/drbd/ ; \
184+ install -g haclient -m 4750 drbdsetup-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \
185+ install -m 755 drbdadm-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \
186 else \
187- install -m 755 drbdsetup-84 $(DESTDIR)/lib/drbd/ ; \
188- install -m 755 drbdadm-84 $(DESTDIR)/lib/drbd/ ; \
189+ install -m 755 drbdsetup-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \
190+ install -m 755 drbdadm-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \
191 fi
192 endif
193
194 uninstall:
195- rm -f $(DESTDIR)/lib/drbd/drbdsetup-84
196- rm -f $(DESTDIR)/lib/drbd/drbdadm-84
197+ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdsetup-84
198+ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdadm-84
199
200 spell:
201 for f in drbdadm_adjust.c drbdadm_main.c drbdadm_parser.c drbdadm_usage_cnt.c drbdsetup.c drbdtool_common.c; do \
diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch
index c7766067a1..ac2626c1c8 100644
--- a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch
+++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch
@@ -1,4 +1,4 @@
1From bb044160faf4ae7615ddfdb17641dd88c33cde57 Mon Sep 17 00:00:00 2001 1From 26ed5003847a14a16d0c1d4030aa1a361c0289fb Mon Sep 17 00:00:00 2001
2From: Sakib Sajal <sakib.sajal@windriver.com> 2From: Sakib Sajal <sakib.sajal@windriver.com>
3Date: Thu, 31 Mar 2022 15:09:58 -0400 3Date: Thu, 31 Mar 2022 15:09:58 -0400
4Subject: [PATCH] drbdmon: add LDFLAGS when linking 4Subject: [PATCH] drbdmon: add LDFLAGS when linking
@@ -7,11 +7,11 @@ Upstream-Status: Pending
7 7
8Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> 8Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
9--- 9---
10 user/drbdmon/Makefile.in | 4 ++-- 10 user/drbdmon/Makefile.in | 6 +++---
11 1 file changed, 2 insertions(+), 2 deletions(-) 11 1 file changed, 3 insertions(+), 3 deletions(-)
12 12
13diff --git a/user/drbdmon/Makefile.in b/user/drbdmon/Makefile.in 13diff --git a/user/drbdmon/Makefile.in b/user/drbdmon/Makefile.in
14index 7bd8987e..115a81b8 100644 14index 9c5427e9..0101a60b 100644
15--- a/user/drbdmon/Makefile.in 15--- a/user/drbdmon/Makefile.in
16+++ b/user/drbdmon/Makefile.in 16+++ b/user/drbdmon/Makefile.in
17@@ -1,6 +1,6 @@ 17@@ -1,6 +1,6 @@
@@ -22,12 +22,19 @@ index 7bd8987e..115a81b8 100644
22 CXX = @CXX@ 22 CXX = @CXX@
23 LIBS = @LIBS@ 23 LIBS = @LIBS@
24 24
25@@ -72,7 +72,7 @@ $(dsaext-obj): $(basename $(dsaext-obj)).cpp $(basename $(dsaext-obj)).h 25@@ -76,10 +76,10 @@ $(dsaext-obj): $(basename $(dsaext-obj)).cpp $(basename $(dsaext-obj)).h
26 $(integerparse-obj): $(basename $(integerparse-obj)).cpp $(basename $(integerparse-obj)).h 26 $(integerparse-obj): $(basename $(integerparse-obj)).cpp $(basename $(integerparse-obj)).h
27 27
28 drbdmon: $(ls-obj) 28 drbdmon: $(ls-obj)
29- $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $^ $(LIBS) 29- $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $^ $(LIBS)
30+ $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) 30+ $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS)
31 31
32 drbd-events-log-supplier: $(supplier-obj)
33- $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $^
34+ $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^
35
32 # do not try to rebuild Makefile itself 36 # do not try to rebuild Makefile itself
33 Makefile: ; 37 Makefile: ;
38--
392.25.1
40
diff --git a/meta-networking/recipes-support/drbd/drbd-utils_9.27.0.bb b/meta-networking/recipes-support/drbd/drbd-utils_9.30.0.bb
index 63f0fd18c1..4c520e8c78 100644
--- a/meta-networking/recipes-support/drbd/drbd-utils_9.27.0.bb
+++ b/meta-networking/recipes-support/drbd/drbd-utils_9.30.0.bb
@@ -8,17 +8,16 @@ LICENSE = "GPL-2.0-or-later"
8LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" 8LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018"
9 9
10SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=master;protocol=https \ 10SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=master;protocol=https \
11 git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers;branch=master;protocol=https \ 11 git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/drbd-headers;branch=master;protocol=https \
12 file://0001-drbdmon-add-LDFLAGS-when-linking.patch \ 12 file://0001-drbdmon-add-LDFLAGS-when-linking.patch \
13 ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \ 13 ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \
14 file://0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch \ 14 file://0001-Fix-build-with-gcc-15.patch \
15 " 15 "
16SRCREV_drbd-utils = "fdd9a4d603a9dc99d110d8bd0e288d7c0b6f586e" 16SRCREV_drbd-utils = "36ea199f38b543b2da92219109c2832e122e5bf9"
17SRCREV_drbd-headers = "0349f00825b4198d4ec3248f43884114a187676a" 17SRCREV_drbd-headers = "94f4472513f351efba5788f783feba6ac6efe9fc"
18 18
19SRCREV_FORMAT = "drbd-utils_drbd-headers" 19SRCREV_FORMAT = "drbd-utils_drbd-headers"
20 20
21S = "${WORKDIR}/git"
22 21
23UPSTREAM_CHECK_URI = "https://github.com/LINBIT/drbd-utils/releases" 22UPSTREAM_CHECK_URI = "https://github.com/LINBIT/drbd-utils/releases"
24 23
diff --git a/meta-networking/recipes-support/dropwatch/dropwatch_1.5.4.bb b/meta-networking/recipes-support/dropwatch/dropwatch_1.5.4.bb
index baa9398a18..badeed8e82 100644
--- a/meta-networking/recipes-support/dropwatch/dropwatch_1.5.4.bb
+++ b/meta-networking/recipes-support/dropwatch/dropwatch_1.5.4.bb
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/nhorman/dropwatch.git;protocol=https;nobranch=1 \
13" 13"
14SRCREV = "1e7e487a019a7c02f1f429c4d3a4647fa3787a13" 14SRCREV = "1e7e487a019a7c02f1f429c4d3a4647fa3787a13"
15 15
16S = "${WORKDIR}/git"
17 16
18DEPENDS = "binutils libnl libpcap readline" 17DEPENDS = "binutils libnl libpcap readline"
19 18
diff --git a/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb b/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb
index 723d7c8f78..d5dc10a889 100644
--- a/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb
+++ b/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb
@@ -25,7 +25,6 @@ SRC_URI = "gitsm://github.com/Ettercap/ettercap;branch=master;protocol=https \
25 25
26SRCREV = "7281fbddb7da7478beb1d21e3cb105fff3778b31" 26SRCREV = "7281fbddb7da7478beb1d21e3cb105fff3778b31"
27 27
28S = "${WORKDIR}/git"
29 28
30EXTRA_OECMAKE = " \ 29EXTRA_OECMAKE = " \
31 -DCMAKE_SKIP_RPATH=TRUE \ 30 -DCMAKE_SKIP_RPATH=TRUE \
diff --git a/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb b/meta-networking/recipes-support/fetchmail/fetchmail_6.5.2.bb
index 6cde94b202..c1def016e9 100644
--- a/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb
+++ b/meta-networking/recipes-support/fetchmail/fetchmail_6.5.2.bb
@@ -6,23 +6,20 @@ connections). It supports every remote-mail protocol now in use on the Internet:
6RPOP, APOP, KPOP, all flavors of IMAP, ETRN, and ODMR. It can even support IPv6 and IPSEC." 6RPOP, APOP, KPOP, all flavors of IMAP, ETRN, and ODMR. It can even support IPv6 and IPSEC."
7SECTION = "mail" 7SECTION = "mail"
8LICENSE = "GPL-2.0-only & MIT" 8LICENSE = "GPL-2.0-only & MIT"
9LIC_FILES_CHKSUM = "file://COPYING;md5=ee6b9f41d9324434dd11bd8a38f1b044" 9LIC_FILES_CHKSUM = "file://COPYING;md5=46d2874dd6a0c8961d80c805f106a35f"
10 10
11DEPENDS = "openssl" 11DEPENDS = "openssl"
12 12
13SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz \ 13SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz \
14 " 14 "
15SRC_URI[sha256sum] = "a6cb4ea863ac61d242ffb2db564a39123761578d3e40d71ce7b6f2905be609d9" 15SRC_URI[sha256sum] = "8fd0477408620ae382c1d0ef83d8946a95e5be0c2e582dd4ebe55cba513a45fe"
16 16
17inherit autotools gettext pkgconfig python3-dir python3native 17inherit autotools gettext pkgconfig python3-dir python3native
18 18
19EXTRA_OECONF = "--with-ssl=${STAGING_DIR_HOST}${prefix}" 19EXTRA_OECONF = "--with-ssl=${STAGING_DIR_HOST}${prefix} --disable-rpath "
20
21INSANE_SKIP:${PN} = "already-stripped"
22 20
23do_install:append() { 21do_install:append() {
24 sed -i 's,${RECIPE_SYSROOT_NATIVE},,g' ${D}${bindir}/fetchmailconf 22 sed -i 's,${RECIPE_SYSROOT_NATIVE},,g' ${D}${bindir}/fetchmailconf
25 sed -i 's,${RECIPE_SYSROOT},,g' ${D}${bindir}/fetchmail
26} 23}
27 24
28PACKAGES =+ "fetchmail-python" 25PACKAGES =+ "fetchmail-python"
diff --git a/meta-networking/recipes-support/fping/fping_5.2.bb b/meta-networking/recipes-support/fping/fping_5.3.bb
index f75b6441b2..5f3ec67cfc 100644
--- a/meta-networking/recipes-support/fping/fping_5.2.bb
+++ b/meta-networking/recipes-support/fping/fping_5.3.bb
@@ -15,9 +15,9 @@ NO_GENERIC_LICENSE[fping] = "COPYING"
15LIC_FILES_CHKSUM = "file://COPYING;md5=c6170fbadddfcd74f011515291d96901" 15LIC_FILES_CHKSUM = "file://COPYING;md5=c6170fbadddfcd74f011515291d96901"
16 16
17SRC_URI = "http://www.fping.org/dist/fping-${PV}.tar.gz" 17SRC_URI = "http://www.fping.org/dist/fping-${PV}.tar.gz"
18SRC_URI[sha256sum] = "a7692d10d73fb0bb76e1f7459aa7f19bbcdbfc5adbedef02f468974b18b0e42f" 18SRC_URI[sha256sum] = "d57bd0141aea082e3adfc198bfc3db5dfd12a7014c7c2655e97f61cd54901d0e"
19 19
20S = "${WORKDIR}/fping-${PV}" 20S = "${UNPACKDIR}/fping-${PV}"
21 21
22inherit autotools 22inherit autotools
23 23
diff --git a/meta-networking/recipes-support/fwknop/fwknop/0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch b/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-networking/recipes-support/fwknop/fwknop/0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 5aea816f27a71e6c88ad50e7326fa6584eeb7ad9 Mon Sep 17 00:00:00 2001
2From: Francois Marier <francois@debian.org>
3Date: Fri, 24 Jul 2020 21:22:47 -0700
4Subject: [PATCH] Fix compilation with GCC's -fno-common flag (fixes #305)
5
6Upstream-Status: Submitted [https://github.com/mrash/fwknop/pull/319]
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8---
9 client/log_msg.h | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/client/log_msg.h b/client/log_msg.h
13index cc17716..3dda161 100644
14--- a/client/log_msg.h
15+++ b/client/log_msg.h
16@@ -38,7 +38,7 @@ enum
17 LOG_VERBOSITY_INFO, /*!< Constant to define a INFO message */
18 LOG_VERBOSITY_DEBUG, /*!< Constant to define a DEBUG message */
19 LOG_LAST_VERBOSITY
20-} log_level_t;
21+};
22
23 #define LOG_DEFAULT_VERBOSITY LOG_VERBOSITY_NORMAL /*!< Default verbosity to use */
24
25--
262.28.0
27
diff --git a/meta-networking/recipes-support/fwknop/fwknop/0001-configure.ac-Fix-missing-comma-in-AS_IF.patch b/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-networking/recipes-support/fwknop/fwknop/0001-configure.ac-Fix-missing-comma-in-AS_IF.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From fee4cb0ae2d1fcd012cb7f501c3db0d8ec910798 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 2 Apr 2023 10:01:51 -0700
4Subject: [PATCH] configure.ac: Fix missing comma in AS_IF
5
6this is flagged with autconf 2.72
7
8Upstream-Status: Pending
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 configure.ac | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/configure.ac b/configure.ac
15index 47a069e..9cdfd3f 100644
16--- a/configure.ac
17+++ b/configure.ac
18@@ -744,7 +744,7 @@ dnl
19 IPFW_EXE=""
20 IPTABLES_EXE=""
21 FIREWALLD_EXE=""
22- ]
23+ ],
24 ]
25 ]
26 ]
27--
282.40.0
29
diff --git a/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb b/meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb
index a1f56cdf16..7cc044d996 100644
--- a/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb
+++ b/meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb
@@ -1,20 +1,20 @@
1SUMMARY = "fwknop - Single Packet Authorization" 1SUMMARY = "fwknop - Single Packet Authorization"
2HOMEPAGE = "http://www.cipherdyne.org/fwknop/" 2HOMEPAGE = "http://www.cipherdyne.org/fwknop/"
3LICENSE = "GPL-2.0-only" 3LICENSE = "GPL-2.0-only"
4LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ 4LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
5 " 5
6inherit autotools-brokensep pkgconfig 6inherit autotools-brokensep pkgconfig
7 7
8SRC_URI = "http://www.cipherdyne.org/${BPN}/download/${BPN}-${PV}.tar.bz2 \ 8SRC_URI = "http://www.cipherdyne.org/${BPN}/download/${BPN}-${PV}.tar.bz2 \
9 file://0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch \
10 file://0001-Use-pkg-config-to-find-gpgme.patch \ 9 file://0001-Use-pkg-config-to-find-gpgme.patch \
11 file://0001-configure.ac-Fix-missing-comma-in-AS_IF.patch \
12 " 10 "
13SRC_URI[sha256sum] = "f6c09bec97ed8e474a98ae14f9f53e1bcdda33393f20667b6af3fb6bb894ca77" 11SRC_URI[sha256sum] = "a4ec7c22dd90dd684f9f7b96d3a901c4131ec8c7a3b9db26d0428513f6774c64"
14 12
15DEPENDS = "libpcap gpgme" 13DEPENDS = "libpcap gpgme"
16 14
17EXTRA_OECONF = " --with-iptables=${sbindir}/iptables" 15EXTRA_OECONF = "--with-iptables=${sbindir}/iptables \
16 --with-gpg=${bindir}/gpg \
17 --with-wget=${base_bindir}/wget"
18 18
19do_configure:prepend () { 19do_configure:prepend () {
20 install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/config 20 install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/config
diff --git a/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb b/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb
index 8e23b66c48..9c2535b95b 100644
--- a/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb
+++ b/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb
@@ -9,7 +9,6 @@ SECTION = "libdevel"
9LICENSE = "Artistic-1.0 | GPL-1.0-or-later" 9LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
10LIC_FILES_CHKSUM = "file://LICENSE;md5=e4f3ea6e9b28af88dc0321190a1f8250" 10LIC_FILES_CHKSUM = "file://LICENSE;md5=e4f3ea6e9b28af88dc0321190a1f8250"
11 11
12S = "${WORKDIR}/git"
13SRCREV = "4cdfdc38eca237c19c22a8b90490446ce6d970fa" 12SRCREV = "4cdfdc38eca237c19c22a8b90490446ce6d970fa"
14SRC_URI = "git://github.com/maxmind/geoip-api-perl.git;branch=main;protocol=https \ 13SRC_URI = "git://github.com/maxmind/geoip-api-perl.git;branch=main;protocol=https \
15 file://run-ptest \ 14 file://run-ptest \
diff --git a/meta-networking/recipes-support/geoip/geoip_1.6.12.bb b/meta-networking/recipes-support/geoip/geoip_1.6.12.bb
index b247823cd4..7482dba64a 100644
--- a/meta-networking/recipes-support/geoip/geoip_1.6.12.bb
+++ b/meta-networking/recipes-support/geoip/geoip_1.6.12.bb
@@ -11,10 +11,10 @@ SECTION = "libdevel"
11GEOIP_DATABASE_VERSION = "20181205" 11GEOIP_DATABASE_VERSION = "20181205"
12 12
13SRC_URI = "git://github.com/maxmind/geoip-api-c.git;branch=main;protocol=https \ 13SRC_URI = "git://github.com/maxmind/geoip-api-c.git;branch=main;protocol=https \
14 http://sources.openembedded.org/GeoIP.dat.${GEOIP_DATABASE_VERSION}.gz;apply=no;name=GeoIP-dat; \ 14 https://downloads.yoctoproject.org/mirror/sources/GeoIP.dat.${GEOIP_DATABASE_VERSION}.gz;apply=no;name=GeoIP-dat; \
15 http://sources.openembedded.org/GeoIPv6.dat.${GEOIP_DATABASE_VERSION}.gz;apply=no;name=GeoIPv6-dat; \ 15 https://downloads.yoctoproject.org/mirror/sources/GeoIPv6.dat.${GEOIP_DATABASE_VERSION}.gz;apply=no;name=GeoIPv6-dat; \
16 http://sources.openembedded.org/GeoLiteCity.dat.${GEOIP_DATABASE_VERSION}.gz;apply=no;name=GeoLiteCity-dat; \ 16 https://downloads.yoctoproject.org/mirror/sources/GeoLiteCity.dat.${GEOIP_DATABASE_VERSION}.gz;apply=no;name=GeoLiteCity-dat; \
17 http://sources.openembedded.org/GeoLiteCityv6.dat.${GEOIP_DATABASE_VERSION}.gz;apply=no;name=GeoLiteCityv6-dat; \ 17 https://downloads.yoctoproject.org/mirror/sources/GeoLiteCityv6.dat.${GEOIP_DATABASE_VERSION}.gz;apply=no;name=GeoLiteCityv6-dat; \
18 file://run-ptest \ 18 file://run-ptest \
19" 19"
20SRCREV = "4b526e7331ca1d692b74a0509ddcc725622ed31a" 20SRCREV = "4b526e7331ca1d692b74a0509ddcc725622ed31a"
@@ -36,7 +36,6 @@ LICENSE = "LGPL-2.1-only"
36LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad \ 36LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad \
37 file://LICENSE;md5=0388276749a542b0d611601fa7c1dcc8 " 37 file://LICENSE;md5=0388276749a542b0d611601fa7c1dcc8 "
38 38
39S = "${WORKDIR}/git"
40 39
41inherit autotools 40inherit autotools
42 41
diff --git a/meta-networking/recipes-support/http-parser/http-parser_2.9.4.bb b/meta-networking/recipes-support/http-parser/http-parser_2.9.4.bb
index 528289b7fd..7def915db5 100644
--- a/meta-networking/recipes-support/http-parser/http-parser_2.9.4.bb
+++ b/meta-networking/recipes-support/http-parser/http-parser_2.9.4.bb
@@ -14,7 +14,6 @@ LIC_FILES_CHKSUM = "file://LICENSE-MIT;md5=9bfa835d048c194ab30487af8d7b3778"
14SRC_URI = "git://github.com/nodejs/http-parser.git;branch=master;protocol=https" 14SRC_URI = "git://github.com/nodejs/http-parser.git;branch=master;protocol=https"
15SRCREV = "2343fd6b5214b2ded2cdcf76de2bf60903bb90cd" 15SRCREV = "2343fd6b5214b2ded2cdcf76de2bf60903bb90cd"
16 16
17S = "${WORKDIR}/git"
18 17
19EXTRA_OEMAKE = "PLATFORM=linux" 18EXTRA_OEMAKE = "PLATFORM=linux"
20 19
diff --git a/meta-networking/recipes-support/ifenslave/ifenslave_2.14.bb b/meta-networking/recipes-support/ifenslave/ifenslave_2.14.bb
index 02a5520a97..bc0975ecc1 100644
--- a/meta-networking/recipes-support/ifenslave/ifenslave_2.14.bb
+++ b/meta-networking/recipes-support/ifenslave/ifenslave_2.14.bb
@@ -5,18 +5,12 @@ SECTION = "net"
5LICENSE = "GPL-3.0-only" 5LICENSE = "GPL-3.0-only"
6LIC_FILES_CHKSUM = "file://debian/copyright;md5=acc89812938cf9ad6b1debc37cea0253" 6LIC_FILES_CHKSUM = "file://debian/copyright;md5=acc89812938cf9ad6b1debc37cea0253"
7 7
8inherit manpages
9MAN_PKG = "${PN}"
10
11SRCREV = "62e60904afbe58fda0c7104fdad1c4f618266ba6" 8SRCREV = "62e60904afbe58fda0c7104fdad1c4f618266ba6"
12SRC_URI = "git://salsa.debian.org/debian/ifenslave.git;protocol=https;branch=main" 9SRC_URI = "git://salsa.debian.org/debian/ifenslave.git;protocol=https;branch=main"
13 10
14S = "${WORKDIR}/git"
15 11
16do_install() { 12do_install() {
17 install -m 0755 -D ${S}/debian/ifenslave.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/ifenslave 13 install -m 0755 -D ${S}/debian/ifenslave.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/ifenslave
18 install -m 0755 -D ${S}/debian/ifenslave.if-post-down ${D}${sysconfdir}/network/if-post-down.d/ifenslave 14 install -m 0755 -D ${S}/debian/ifenslave.if-post-down ${D}${sysconfdir}/network/if-post-down.d/ifenslave
19 install -m 0755 -D ${S}/debian/ifenslave.if-up ${D}${sysconfdir}/network/if-up.d/ifenslave 15 install -m 0755 -D ${S}/debian/ifenslave.if-up ${D}${sysconfdir}/network/if-up.d/ifenslave
20} 16}
21
22FILES:${PN}-doc:remove = "${mandir}"
diff --git a/meta-networking/recipes-support/iftop/iftop/0001-cfgfile-fix-build-with-gcc-15.patch b/meta-networking/recipes-support/iftop/iftop/0001-cfgfile-fix-build-with-gcc-15.patch
new file mode 100644
index 0000000000..73540e18c6
--- /dev/null
+++ b/meta-networking/recipes-support/iftop/iftop/0001-cfgfile-fix-build-with-gcc-15.patch
@@ -0,0 +1,46 @@
1From e579fbe1f73dc89e2bf81a5b6c949f8ae24f93b2 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <martin.jansa@gmail.com>
3Date: Fri, 21 Mar 2025 09:31:05 +0000
4Subject: [PATCH] cfgfile: fix build with gcc-15
5
6* fix read_config declaration to match
7
8cfgfile.c:247:5: error: conflicting types for 'read_config'; have 'int(char *, int)'
9 247 | int read_config(char *file, int whinge_on_error) {
10 | ^~~~~~~~~~~
11In file included from cfgfile.c:16:
12cfgfile.h:16:5: note: previous declaration of 'read_config' with type 'int(void)'
13 16 | int read_config();
14 | ^~~~~~~~~~~
15make[2]: *** [Makefile:566: cfgfile.o] Error 1
16make[2]: *** Waiting for unfinished jobs....
17iftop.c: In function 'main':
18iftop.c:803:5: error: too many arguments to function 'read_config'; expected 0, have 2
19 803 | read_config(options.config_file, options.config_file_specified);
20 | ^~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
21In file included from iftop.c:50:
22cfgfile.h:16:5: note: declared here
23 16 | int read_config();
24 | ^~~~~~~~~~~
25
26Upstream-Status: Pending [last pre release was over 10 years ago and https://code.blinkace.com/pdw/iftop has last commit from 4 years ago]
27
28Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
29---
30
31 cfgfile.h | 2 +-
32 1 file changed, 1 insertion(+), 1 deletion(-)
33
34diff --git a/cfgfile.h b/cfgfile.h
35index 11ba475..a331b75 100644
36--- a/cfgfile.h
37+++ b/cfgfile.h
38@@ -13,7 +13,7 @@ typedef struct {
39 int value;
40 } config_enumeration_type;
41
42-int read_config();
43+int read_config(char *file, int whinge_on_error);
44
45 char *config_get_string(const char *directive);
46 int config_get_bool(const char *directive);
diff --git a/meta-networking/recipes-support/iftop/iftop_1.0pre4.bb b/meta-networking/recipes-support/iftop/iftop_1.0pre4.bb
index 517d781281..4d9fea58e0 100644
--- a/meta-networking/recipes-support/iftop/iftop_1.0pre4.bb
+++ b/meta-networking/recipes-support/iftop/iftop_1.0pre4.bb
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=76498170798db0f4f0fb685a225f702f"
8 8
9SRC_URI = "http://www.ex-parrot.com/pdw/iftop/download/iftop-${PV}.tar.gz \ 9SRC_URI = "http://www.ex-parrot.com/pdw/iftop/download/iftop-${PV}.tar.gz \
10 file://iftop-1.0-gcc10.patch \ 10 file://iftop-1.0-gcc10.patch \
11 file://0001-cfgfile-fix-build-with-gcc-15.patch \
11 " 12 "
12SRC_URI[md5sum] = "7e6decb4958e8a4890cccac335239f24" 13SRC_URI[md5sum] = "7e6decb4958e8a4890cccac335239f24"
13SRC_URI[sha256sum] = "f733eeea371a7577f8fe353d86dd88d16f5b2a2e702bd96f5ffb2c197d9b4f97" 14SRC_URI[sha256sum] = "f733eeea371a7577f8fe353d86dd88d16f5b2a2e702bd96f5ffb2c197d9b4f97"
diff --git a/meta-networking/recipes-support/ipcalc/ipcalc_1.0.3.bb b/meta-networking/recipes-support/ipcalc/ipcalc_1.0.3.bb
index 055c6e1432..18970751c3 100644
--- a/meta-networking/recipes-support/ipcalc/ipcalc_1.0.3.bb
+++ b/meta-networking/recipes-support/ipcalc/ipcalc_1.0.3.bb
@@ -9,6 +9,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
9SRC_URI = "git://gitlab.com/ipcalc/ipcalc.git;protocol=https;branch=master" 9SRC_URI = "git://gitlab.com/ipcalc/ipcalc.git;protocol=https;branch=master"
10SRCREV = "c341e55be386649c0a5347eefeae410753c4e753" 10SRCREV = "c341e55be386649c0a5347eefeae410753c4e753"
11 11
12S = "${WORKDIR}/git"
13 12
14inherit meson 13inherit meson
diff --git a/meta-networking/recipes-support/libconfuse/libconfuse_3.3.bb b/meta-networking/recipes-support/libconfuse/libconfuse_3.3.bb
deleted file mode 100644
index b8d0536eb3..0000000000
--- a/meta-networking/recipes-support/libconfuse/libconfuse_3.3.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1DESCRIPTION = "libConfuse is a configuration file parser library"
2LICENSE = "ISC"
3LIC_FILES_CHKSUM = "file://LICENSE;md5=42fa47330d4051cd219f7d99d023de3a"
4
5SRCREV = "a42aebf13db33afd575da6e63f55163d371f776d"
6SRC_URI = "git://github.com/libconfuse/libconfuse.git;branch=master;protocol=https"
7
8inherit autotools-brokensep pkgconfig gettext
9
10S = "${WORKDIR}/git"
11
12do_configure:prepend(){
13 (cd ${S} && ${S}/autogen.sh)
14}
diff --git a/meta-networking/recipes-support/libcpr/libcpr_1.10.5.bb b/meta-networking/recipes-support/libcpr/libcpr_1.12.0.bb
index 93fdb78eba..58da899081 100644
--- a/meta-networking/recipes-support/libcpr/libcpr_1.10.5.bb
+++ b/meta-networking/recipes-support/libcpr/libcpr_1.12.0.bb
@@ -8,10 +8,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=08beaae5deae1c43c065592da8f38095"
8 8
9DEPENDS = "curl openssl" 9DEPENDS = "curl openssl"
10 10
11SRC_URI = "git://github.com/libcpr/cpr.git;protocol=https;branch=1.10.x" 11SRC_URI = "git://github.com/libcpr/cpr.git;protocol=https;branch=master"
12SRCREV = "3b15fa82ea74739b574d705fea44959b58142eb8" 12SRCREV = "da40186618909b1a7363d4e4495aa899c6e0eb75"
13 13
14S = "${WORKDIR}/git"
15 14
16inherit cmake 15inherit cmake
17 16
diff --git a/meta-networking/recipes-support/libesmtp/libesmtp_1.1.0.bb b/meta-networking/recipes-support/libesmtp/libesmtp_1.1.0.bb
index 3d0764a3b9..50f83221c0 100644
--- a/meta-networking/recipes-support/libesmtp/libesmtp_1.1.0.bb
+++ b/meta-networking/recipes-support/libesmtp/libesmtp_1.1.0.bb
@@ -12,7 +12,6 @@ SRC_URI = "git://github.com/libesmtp/libESMTP.git;branch=master;protocol=https \
12 file://0001-Add-build-option-for-NTLM-support.patch" 12 file://0001-Add-build-option-for-NTLM-support.patch"
13SRCREV = "1d0af244310a66943ab400be56b15a9087f181eb" 13SRCREV = "1d0af244310a66943ab400be56b15a9087f181eb"
14 14
15S = "${WORKDIR}/git"
16 15
17LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742 \ 16LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742 \
18 file://COPYING.GPL;md5=393a5ca445f6965873eca0259a17f833" 17 file://COPYING.GPL;md5=393a5ca445f6965873eca0259a17f833"
diff --git a/meta-networking/recipes-support/libldb/libldb_2.8.1.bb b/meta-networking/recipes-support/libldb/libldb_2.8.1.bb
index 29ff2cf6f2..dbb27e6ba6 100644
--- a/meta-networking/recipes-support/libldb/libldb_2.8.1.bb
+++ b/meta-networking/recipes-support/libldb/libldb_2.8.1.bb
@@ -6,7 +6,7 @@ LICENSE = "LGPL-3.0-or-later & LGPL-2.1-or-later & GPL-3.0-or-later"
6DEPENDS += "libtdb libtalloc libtevent popt cmocka" 6DEPENDS += "libtdb libtalloc libtevent popt cmocka"
7RDEPENDS:pyldb += "python3" 7RDEPENDS:pyldb += "python3"
8 8
9export PYTHONHASHSEED="1" 9export PYTHONHASHSEED = "1"
10export PYTHONARCHDIR = "${PYTHON_SITEPACKAGES_DIR}" 10export PYTHONARCHDIR = "${PYTHON_SITEPACKAGES_DIR}"
11 11
12SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \ 12SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \
@@ -38,11 +38,11 @@ SRC_URI[sha256sum] = "b68ce6eb0ccd2870fa3c8c334f2028b5d16606fd41308696c17b71959f
38 38
39inherit pkgconfig waf-samba ptest 39inherit pkgconfig waf-samba ptest
40 40
41S = "${WORKDIR}/ldb-${PV}" 41S = "${UNPACKDIR}/ldb-${PV}"
42 42
43# Cross_compile cannot use preforked process, since fork process earlier than point subproces.popen 43# Cross_compile cannot use preforked process, since fork process earlier than point subproces.popen
44# to cross Popen 44# to cross Popen
45export WAF_NO_PREFORK="yes" 45export WAF_NO_PREFORK = "yes"
46 46
47EXTRA_OECONF += "--disable-rpath \ 47EXTRA_OECONF += "--disable-rpath \
48 --disable-rpath-install \ 48 --disable-rpath-install \
diff --git a/meta-networking/recipes-support/libmemcached/libmemcached.inc b/meta-networking/recipes-support/libmemcached/libmemcached.inc
deleted file mode 100644
index 319ab29ce7..0000000000
--- a/meta-networking/recipes-support/libmemcached/libmemcached.inc
+++ /dev/null
@@ -1,17 +0,0 @@
1DESCRIPTION = "open source C/C++ client library and tools for the memcached server"
2DEPENDS = "libevent util-linux"
3SECTION = "libdevel"
4LICENSE = "BSD-3-Clause"
5LIC_FILES_CHKSUM = "file://COPYING;md5=865490941c91ba790f0ea78dec93bd60"
6
7SRC_URI = "http://launchpad.net/libmemcached/1.0/${PV}/+download/libmemcached-${PV}.tar.gz"
8
9UPSTREAM_CHECK_URI = "https://launchpad.net/libmemcached"
10
11TARGET_LDFLAGS += "-luuid"
12TARGET_CFLAGS += "-D__USE_GNU -D_GNU_SOURCE"
13
14PACKAGECONFIG ??= ""
15PACKAGECONFIG[sasl] = "--enable-sasl,--disable-sasl,cyrus-sasl"
16
17inherit autotools gettext pkgconfig
diff --git a/meta-networking/recipes-support/libmemcached/libmemcached_1.0.18.bb b/meta-networking/recipes-support/libmemcached/libmemcached_1.0.18.bb
index 56778c0483..561308b33d 100644
--- a/meta-networking/recipes-support/libmemcached/libmemcached_1.0.18.bb
+++ b/meta-networking/recipes-support/libmemcached/libmemcached_1.0.18.bb
@@ -1,6 +1,11 @@
1require libmemcached.inc 1DESCRIPTION = "open source C/C++ client library and tools for the memcached server"
2DEPENDS = "libevent util-linux"
3SECTION = "libdevel"
4LICENSE = "BSD-3-Clause"
5LIC_FILES_CHKSUM = "file://COPYING;md5=865490941c91ba790f0ea78dec93bd60"
2 6
3SRC_URI += "\ 7SRC_URI = "\
8 http://launchpad.net/libmemcached/1.0/${PV}/+download/libmemcached-${PV}.tar.gz \
4 file://crosscompile.patch \ 9 file://crosscompile.patch \
5 file://0001-configure.ac-Do-not-configure-build-aux.patch \ 10 file://0001-configure.ac-Do-not-configure-build-aux.patch \
6 file://0001-Fix-comparison-types.patch \ 11 file://0001-Fix-comparison-types.patch \
@@ -8,3 +13,15 @@ SRC_URI += "\
8 " 13 "
9SRC_URI[md5sum] = "b3958716b4e53ddc5992e6c49d97e819" 14SRC_URI[md5sum] = "b3958716b4e53ddc5992e6c49d97e819"
10SRC_URI[sha256sum] = "e22c0bb032fde08f53de9ffbc5a128233041d9f33b5de022c0978a2149885f82" 15SRC_URI[sha256sum] = "e22c0bb032fde08f53de9ffbc5a128233041d9f33b5de022c0978a2149885f82"
16
17UPSTREAM_CHECK_URI = "https://launchpad.net/libmemcached"
18
19CVE_STATUS[CVE-2023-27478] = "fixed-version: this problem was not yet introduced in 1.0.18"
20
21TARGET_LDFLAGS += "-luuid"
22TARGET_CFLAGS += "-D__USE_GNU -D_GNU_SOURCE"
23
24PACKAGECONFIG ??= ""
25PACKAGECONFIG[sasl] = "--enable-sasl,--disable-sasl,cyrus-sasl"
26
27inherit autotools gettext pkgconfig
diff --git a/meta-networking/recipes-support/libmemcached/libmemcached_1.0.7.bb b/meta-networking/recipes-support/libmemcached/libmemcached_1.0.7.bb
deleted file mode 100644
index cdf8415ff7..0000000000
--- a/meta-networking/recipes-support/libmemcached/libmemcached_1.0.7.bb
+++ /dev/null
@@ -1,4 +0,0 @@
1require libmemcached.inc
2
3SRC_URI[md5sum] = "d59a462a92d296f76bff2d9bc72b2516"
4SRC_URI[sha256sum] = "3efa86c9733eaad55d7119cb16769424e2aa6c22b3392e8f973946fce6678d81"
diff --git a/meta-networking/recipes-support/libtalloc/libtalloc_2.4.2.bb b/meta-networking/recipes-support/libtalloc/libtalloc_2.4.3.bb
index b617f097cf..ff36a61d15 100644
--- a/meta-networking/recipes-support/libtalloc/libtalloc_2.4.2.bb
+++ b/meta-networking/recipes-support/libtalloc/libtalloc_2.4.3.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://talloc.h;beginline=3;endline=27;md5=a301712782cad6dd6
6 file://pytalloc.h;beginline=1;endline=18;md5=21ab13bd853679d7d47a1739cb3b7db6 \ 6 file://pytalloc.h;beginline=1;endline=18;md5=21ab13bd853679d7d47a1739cb3b7db6 \
7 " 7 "
8 8
9export PYTHONHASHSEED="1" 9export PYTHONHASHSEED = "1"
10export PYTHONARCHDIR = "${PYTHON_SITEPACKAGES_DIR}" 10export PYTHONARCHDIR = "${PYTHON_SITEPACKAGES_DIR}"
11 11
12SRC_URI = "https://www.samba.org/ftp/talloc/talloc-${PV}.tar.gz \ 12SRC_URI = "https://www.samba.org/ftp/talloc/talloc-${PV}.tar.gz \
@@ -14,7 +14,7 @@ SRC_URI = "https://www.samba.org/ftp/talloc/talloc-${PV}.tar.gz \
14 file://0002-Fix-pyext_PATTERN-for-cross-compilation.patch \ 14 file://0002-Fix-pyext_PATTERN-for-cross-compilation.patch \
15 file://run-ptest \ 15 file://run-ptest \
16" 16"
17SRC_URI[sha256sum] = "85ecf9e465e20f98f9950a52e9a411e14320bc555fa257d87697b7e7a9b1d8a6" 17SRC_URI[sha256sum] = "dc46c40b9f46bb34dd97fe41f548b0e8b247b77a918576733c528e83abd854dd"
18 18
19inherit waf-samba pkgconfig ptest 19inherit waf-samba pkgconfig ptest
20 20
@@ -30,11 +30,11 @@ PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind"
30 30
31SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'attr', '', 'file://avoid-attr-unless-wanted.patch', d)}" 31SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'attr', '', 'file://avoid-attr-unless-wanted.patch', d)}"
32 32
33S = "${WORKDIR}/talloc-${PV}" 33S = "${UNPACKDIR}/talloc-${PV}"
34 34
35# Cross_compile cannot use preforked process, since fork process earlier than point subproces.popen 35# Cross_compile cannot use preforked process, since fork process earlier than point subproces.popen
36# to cross Popen 36# to cross Popen
37export WAF_NO_PREFORK="yes" 37export WAF_NO_PREFORK = "yes"
38 38
39EXTRA_OECONF += "--disable-rpath \ 39EXTRA_OECONF += "--disable-rpath \
40 --disable-rpath-install \ 40 --disable-rpath-install \
diff --git a/meta-networking/recipes-support/libtdb/libtdb_1.4.10.bb b/meta-networking/recipes-support/libtdb/libtdb_1.4.13.bb
index bd3f9f63a9..7221130fe6 100644
--- a/meta-networking/recipes-support/libtdb/libtdb_1.4.10.bb
+++ b/meta-networking/recipes-support/libtdb/libtdb_1.4.13.bb
@@ -6,7 +6,7 @@ LICENSE = "LGPL-3.0-or-later & GPL-3.0-or-later"
6LIC_FILES_CHKSUM = "file://tools/tdbdump.c;endline=18;md5=b59cd45aa8624578126a8c98f48018c4 \ 6LIC_FILES_CHKSUM = "file://tools/tdbdump.c;endline=18;md5=b59cd45aa8624578126a8c98f48018c4 \
7 file://include/tdb.h;endline=27;md5=f5bb544641d3081821bcc1dd58310be6" 7 file://include/tdb.h;endline=27;md5=f5bb544641d3081821bcc1dd58310be6"
8 8
9export PYTHONHASHSEED="1" 9export PYTHONHASHSEED = "1"
10export PYTHONARCHDIR = "${PYTHON_SITEPACKAGES_DIR}" 10export PYTHONARCHDIR = "${PYTHON_SITEPACKAGES_DIR}"
11 11
12SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \ 12SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \
@@ -15,7 +15,7 @@ SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \
15 file://run-ptest \ 15 file://run-ptest \
16" 16"
17 17
18SRC_URI[sha256sum] = "02338e33c16c21c9e29571cef523e76b2b708636254f6f30c6cf195d48c62daf" 18SRC_URI[sha256sum] = "5ee276e7644d713e19e4b6adc00b440afb5851ff21e65821ffaed89e15a5e167"
19 19
20PACKAGECONFIG ??= "\ 20PACKAGECONFIG ??= "\
21 ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ 21 ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \
@@ -28,13 +28,13 @@ PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd"
28PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" 28PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap"
29PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" 29PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind"
30 30
31S = "${WORKDIR}/tdb-${PV}" 31S = "${UNPACKDIR}/tdb-${PV}"
32 32
33inherit waf-samba pkgconfig ptest 33inherit waf-samba pkgconfig ptest
34 34
35# Cross_compile cannot use preforked process, since fork process earlier than point subproces.popen 35# Cross_compile cannot use preforked process, since fork process earlier than point subproces.popen
36# to cross Popen 36# to cross Popen
37export WAF_NO_PREFORK="yes" 37export WAF_NO_PREFORK = "yes"
38 38
39EXTRA_OECONF += "--disable-rpath \ 39EXTRA_OECONF += "--disable-rpath \
40 --disable-rpath-install \ 40 --disable-rpath-install \
diff --git a/meta-networking/recipes-support/libtevent/libtevent/0002-Fix-pyext_PATTERN-for-cross-compilation.patch b/meta-networking/recipes-support/libtevent/libtevent/0002-Fix-pyext_PATTERN-for-cross-compilation.patch
index f1b8f8e9b1..a3301db077 100644
--- a/meta-networking/recipes-support/libtevent/libtevent/0002-Fix-pyext_PATTERN-for-cross-compilation.patch
+++ b/meta-networking/recipes-support/libtevent/libtevent/0002-Fix-pyext_PATTERN-for-cross-compilation.patch
@@ -1,4 +1,4 @@
1From 2bb7bf2d945d4ea0dafe3858adc6b8faae18b1e8 Mon Sep 17 00:00:00 2001 1From f8b5f542c782b235051ed39239dd32c93eb2c69c Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com> 2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Wed, 24 Nov 2021 13:33:35 +0800 3Date: Wed, 24 Nov 2021 13:33:35 +0800
4Subject: [PATCH] Fix pyext_PATTERN for cross compilation 4Subject: [PATCH] Fix pyext_PATTERN for cross compilation
@@ -25,10 +25,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
25 1 file changed, 1 insertion(+), 1 deletion(-) 25 1 file changed, 1 insertion(+), 1 deletion(-)
26 26
27diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py 27diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py
28index b2dd1a9..2bd3545 100644 28index 8646454..4eb8725 100644
29--- a/third_party/waf/waflib/Tools/python.py 29--- a/third_party/waf/waflib/Tools/python.py
30+++ b/third_party/waf/waflib/Tools/python.py 30+++ b/third_party/waf/waflib/Tools/python.py
31@@ -339,7 +339,7 @@ def check_python_headers(conf, features='pyembed pyext'): 31@@ -351,7 +351,7 @@ def check_python_headers(conf, features='pyembed pyext'):
32 x = 'MACOSX_DEPLOYMENT_TARGET' 32 x = 'MACOSX_DEPLOYMENT_TARGET'
33 if dct[x]: 33 if dct[x]:
34 env[x] = conf.environ[x] = str(dct[x]) 34 env[x] = conf.environ[x] = str(dct[x])
@@ -37,6 +37,3 @@ index b2dd1a9..2bd3545 100644
37 37
38 38
39 # Try to get pythonX.Y-config 39 # Try to get pythonX.Y-config
40--
412.25.1
42
diff --git a/meta-networking/recipes-support/libtevent/libtevent_0.16.1.bb b/meta-networking/recipes-support/libtevent/libtevent_0.17.0.bb
index 0a37d7977d..7ee044d146 100644
--- a/meta-networking/recipes-support/libtevent/libtevent_0.16.1.bb
+++ b/meta-networking/recipes-support/libtevent/libtevent_0.17.0.bb
@@ -6,7 +6,7 @@ LICENSE = "LGPL-3.0-or-later"
6DEPENDS += "libtalloc libtirpc cmocka" 6DEPENDS += "libtalloc libtirpc cmocka"
7RDEPENDS:python3-tevent = "python3" 7RDEPENDS:python3-tevent = "python3"
8 8
9export PYTHONHASHSEED="1" 9export PYTHONHASHSEED = "1"
10export PYTHONARCHDIR = "${PYTHON_SITEPACKAGES_DIR}" 10export PYTHONARCHDIR = "${PYTHON_SITEPACKAGES_DIR}"
11 11
12SRC_URI = "https://samba.org/ftp/tevent/tevent-${PV}.tar.gz \ 12SRC_URI = "https://samba.org/ftp/tevent/tevent-${PV}.tar.gz \
@@ -17,7 +17,7 @@ SRC_URI = "https://samba.org/ftp/tevent/tevent-${PV}.tar.gz \
17 17
18LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=47386b7c539bf2706b7ce52dc9341681" 18LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=47386b7c539bf2706b7ce52dc9341681"
19 19
20SRC_URI[sha256sum] = "362971e0f32dc1905f6fe4736319c4b8348c22dc85aa6c3f690a28efe548029e" 20SRC_URI[sha256sum] = "7702fb373b69da2960b86134b6a9ec6fa0b949a01756fec00a4a6a43575c8361"
21 21
22inherit pkgconfig ptest waf-samba 22inherit pkgconfig ptest waf-samba
23 23
@@ -33,11 +33,11 @@ PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind"
33 33
34SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'attr', '', 'file://avoid-attr-unless-wanted.patch', d)}" 34SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'attr', '', 'file://avoid-attr-unless-wanted.patch', d)}"
35 35
36S = "${WORKDIR}/tevent-${PV}" 36S = "${UNPACKDIR}/tevent-${PV}"
37 37
38# Cross_compile cannot use preforked process, since fork process earlier than point subproces.popen 38# Cross_compile cannot use preforked process, since fork process earlier than point subproces.popen
39# to cross Popen 39# to cross Popen
40export WAF_NO_PREFORK="yes" 40export WAF_NO_PREFORK = "yes"
41 41
42EXTRA_OECONF += "--disable-rpath \ 42EXTRA_OECONF += "--disable-rpath \
43 --disable-rpath-install \ 43 --disable-rpath-install \
diff --git a/meta-networking/recipes-support/linux-atm/linux-atm/0001-Fix-implicit-declaration-error.patch b/meta-networking/recipes-support/linux-atm/linux-atm/0001-Fix-implicit-declaration-error.patch
new file mode 100644
index 0000000000..1c5f79c9d8
--- /dev/null
+++ b/meta-networking/recipes-support/linux-atm/linux-atm/0001-Fix-implicit-declaration-error.patch
@@ -0,0 +1,44 @@
1From 1435d613ee632bd7a2aa15180acf06ff3723da41 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <martin.jansa@gmail.com>
3Date: Sat, 26 Apr 2025 13:03:35 +0200
4Subject: [PATCH] Fix implicit-declaration error
5
6* taken from:
7 https://github.com/sbwml/package_network_utils_linux-atm/blob/main/patches/900-fix-implicit-declaration-error.patch
8
9* fixes:
10 http://errors.yoctoproject.org/Errors/Details/766901/
11 linux-atm-2.5.2/src/led/conn.c:414:57: error: passing argument 3 of 'accept' from incompatible pointer type [-Wincompatible-pointer-types]
12
13Upstream-Status: Inappropriate [Upstream is dead]
14Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
15---
16 src/led/conn.c | 2 +-
17 src/maint/hediag.c | 1 +
18 2 files changed, 2 insertions(+), 1 deletion(-)
19
20diff --git a/src/led/conn.c b/src/led/conn.c
21index 99da5e4..89639e1 100644
22--- a/src/led/conn.c
23+++ b/src/led/conn.c
24@@ -405,7 +405,7 @@ Conn_t *accept_conn(Conn_t *conn)
25 {
26 Conn_t *new;
27 struct sockaddr_atmsvc addr;
28- size_t len;
29+ socklen_t len;
30 int fd;
31 char buff[MAX_ATM_ADDR_LEN+1];
32
33diff --git a/src/maint/hediag.c b/src/maint/hediag.c
34index a4f792f..3b1b7fb 100644
35--- a/src/maint/hediag.c
36+++ b/src/maint/hediag.c
37@@ -9,6 +9,7 @@
38 #include <linux/atmdev.h>
39 #include <linux/sonet.h>
40 #include <linux/atm_he.h>
41+#include <string.h>
42
43 struct reg_table {
44 unsigned addr;
diff --git a/meta-networking/recipes-support/linux-atm/linux-atm/0002-Fix-build-with-gcc-15.patch b/meta-networking/recipes-support/linux-atm/linux-atm/0002-Fix-build-with-gcc-15.patch
new file mode 100644
index 0000000000..1cbd6a5831
--- /dev/null
+++ b/meta-networking/recipes-support/linux-atm/linux-atm/0002-Fix-build-with-gcc-15.patch
@@ -0,0 +1,91 @@
1From 2a9d42b2b190d533cf126a93bcad842cea825bbe Mon Sep 17 00:00:00 2001
2From: Martin Jansa <martin.jansa@gmail.com>
3Date: Sat, 26 Apr 2025 13:04:56 +0200
4Subject: [PATCH] Fix build with gcc-15
5
6* taken from:
7 https://github.com/sbwml/package_network_utils_linux-atm/blob/1d1c3f884daf9ee4bce077f3db9d990617683669/patches/901-linux-atm-dont-use-bool-keyword.patch
8
9* fixes:
10 http://errors.yoctoproject.org/Errors/Details/852979/
11
12In file included from load_lex.l:11:
13../../../linux-atm-2.5.2/src/lane/load_lex.h:27:10: error: two or more data types in declaration specifiers
14 27 | Bool_t bool;
15 | ^~~~
16../../../linux-atm-2.5.2/src/lane/load_lex.h:27:14: warning: declaration does not declare anything
17 27 | Bool_t bool;
18 | ^
19In file included from ../../../linux-atm-2.5.2/src/lane/load.c:29:
20../../../linux-atm-2.5.2/src/lane/load_lex.h:27:10: error: two or more data types in declaration specifiers
21 27 | Bool_t bool;
22 | ^~~~
23../../../linux-atm-2.5.2/src/lane/load_lex.h:27:14: warning: declaration does not declare anything
24 27 | Bool_t bool;
25 | ^
26load_lex.l: In function 'yylex':
27load_lex.l:47:11: error: expected identifier before 'bool'
28load_lex.l:51:11: error: expected identifier before 'bool'
29../../../linux-atm-2.5.2/src/lane/load.c: In function 'load_vars':
30../../../linux-atm-2.5.2/src/lane/load.c:501:29: error: expected identifier before 'bool'
31 501 | g_return.bool==BL_TRUE?"True":"False");
32 | ^~~~
33../../../linux-atm-2.5.2/src/lane/load.c:502:51: error: expected identifier before 'bool'
34 502 | set_var_bool(curr_unit, varname, g_return.bool);
35 | ^~~~
36make[3]: *** [Makefile:513: load.o] Error 1
37
38Upstream-Status: Inappropriate [Upstream is dead]
39Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
40---
41 src/lane/load.c | 4 ++--
42 src/lane/load_lex.h | 2 +-
43 src/lane/load_lex.l | 4 ++--
44 3 files changed, 5 insertions(+), 5 deletions(-)
45
46diff --git a/src/lane/load.c b/src/lane/load.c
47index 39d4672..1cc2202 100644
48--- a/src/lane/load.c
49+++ b/src/lane/load.c
50@@ -498,8 +498,8 @@ load_vars(const char *file)
51 break;
52 case BOOLEAN:
53 Debug_unit(&load_unit, "Variable is boolean: %s",
54- g_return.bool==BL_TRUE?"True":"False");
55- set_var_bool(curr_unit, varname, g_return.bool);
56+ g_return.b==BL_TRUE?"True":"False");
57+ set_var_bool(curr_unit, varname, g_return.b);
58 break;
59 case INTEGER:
60 Debug_unit(&load_unit, "Variable is integer: %d", g_return.intti);
61diff --git a/src/lane/load_lex.h b/src/lane/load_lex.h
62index 2384e70..72b8f9b 100644
63--- a/src/lane/load_lex.h
64+++ b/src/lane/load_lex.h
65@@ -24,7 +24,7 @@
66 #define END 0
67
68 typedef struct {
69- Bool_t bool;
70+ Bool_t b;
71 int intti;
72 AtmAddr_t *atmaddress;
73 LaneDestination_t *destaddr;
74diff --git a/src/lane/load_lex.l b/src/lane/load_lex.l
75index c184795..1d412e3 100644
76--- a/src/lane/load_lex.l
77+++ b/src/lane/load_lex.l
78@@ -44,11 +44,11 @@ H [0-9a-fA-F]
79 return ATMADDRESS;
80 }
81 True |
82-true {g_return.bool = BL_TRUE;
83+true {g_return.b = BL_TRUE;
84 return BOOLEAN;
85 }
86 False |
87-false {g_return.bool = BL_FALSE;
88+false {g_return.b = BL_FALSE;
89 return BOOLEAN;
90 }
91 \#.* {}
diff --git a/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb b/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb
index 86b9112ba2..3d679d7dc7 100644
--- a/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb
+++ b/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb
@@ -16,6 +16,8 @@ SRC_URI = "http://nchc.dl.sourceforge.net/project/${BPN}/${BPN}/${PV}/${BPN}-${P
16 file://0001-make-Add-PREFIX-knob.patch \ 16 file://0001-make-Add-PREFIX-knob.patch \
17 file://0001-include-string-h-from-memcpy-and-strcpy-function-pro.patch \ 17 file://0001-include-string-h-from-memcpy-and-strcpy-function-pro.patch \
18 file://0001-configure-Check-for-symbol-from-libresolv-instead-of.patch \ 18 file://0001-configure-Check-for-symbol-from-libresolv-instead-of.patch \
19 file://0001-Fix-implicit-declaration-error.patch \
20 file://0002-Fix-build-with-gcc-15.patch \
19 " 21 "
20 22
21SRC_URI:append:libc-musl = " file://musl-no-on_exit.patch" 23SRC_URI:append:libc-musl = " file://musl-no-on_exit.patch"
diff --git a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.21.bb
index 0243f2a1db..407194792f 100644
--- a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb
+++ b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.21.bb
@@ -8,10 +8,7 @@ LIC_FILES_CHKSUM = " \
8 file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e \ 8 file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e \
9" 9"
10 10
11SRCREV = "05b50d379ff0037de4957bb2a1befcce88b70225" 11SRCREV = "37d5f1225573b91d706a5e547d081f79963a9deb"
12
13PV .= "+git"
14LK_REL = "1.0.19"
15 12
16SRC_URI = " \ 13SRC_URI = " \
17 git://github.com/sctp/lksctp-tools.git;branch=master;protocol=https \ 14 git://github.com/sctp/lksctp-tools.git;branch=master;protocol=https \
@@ -20,7 +17,6 @@ SRC_URI = " \
20 file://v6test.sh \ 17 file://v6test.sh \
21" 18"
22 19
23S = "${WORKDIR}/git"
24 20
25BBCLASSEXTEND = "native" 21BBCLASSEXTEND = "native"
26 22
@@ -34,19 +30,14 @@ do_install_ptest () {
34 done 30 done
35} 31}
36 32
37SOLIBVERSION="${LK_REL}"
38SOLIBMAJORVERSION="1"
39
40PACKAGES =+ "${PN}-withsctp ${PN}-utils" 33PACKAGES =+ "${PN}-withsctp ${PN}-utils"
41 34
42FILES:${PN} = " \ 35FILES:${PN} = " \
43 ${libdir}/libsctp.so.${SOLIBVERSION} \ 36 ${libdir}/libsctp.so.* \
44 ${libdir}/libsctp.so.${SOLIBMAJORVERSION} \
45" 37"
46 38
47FILES:${PN}-withsctp = " \ 39FILES:${PN}-withsctp = " \
48 ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBVERSION} \ 40 ${libdir}/lksctp-tools/libwithsctp.so.* \
49 ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBMAJORVERSION} \
50" 41"
51 42
52FILES:${PN}-dev += " \ 43FILES:${PN}-dev += " \
diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb b/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb
index f0b7e9184e..b442fb9f56 100644
--- a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb
+++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb
@@ -19,7 +19,6 @@ SRC_URI = "git://github.com/linux-wpan/lowpan-tools;branch=master;protocol=https
19 " 19 "
20SRCREV = "1c2d8674cc6f4b1166a066e8822e295c105ae7a2" 20SRCREV = "1c2d8674cc6f4b1166a066e8822e295c105ae7a2"
21 21
22S = "${WORKDIR}/git"
23 22
24inherit autotools python3-dir pkgconfig 23inherit autotools python3-dir pkgconfig
25 24
diff --git a/meta-networking/recipes-support/mctp/mctp/0001-mctp-bench-Adjust-headers.patch b/meta-networking/recipes-support/mctp/mctp/0001-mctp-bench-Adjust-headers.patch
new file mode 100644
index 0000000000..4ff9b09299
--- /dev/null
+++ b/meta-networking/recipes-support/mctp/mctp/0001-mctp-bench-Adjust-headers.patch
@@ -0,0 +1,38 @@
1From 166b2251a156a03a80318533440178ac0b913945 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 17 Feb 2025 21:29:41 -0800
4Subject: [PATCH] mctp-bench: Adjust headers
5
6bits/time.h is not be included directly, instead use time.h
7since poll.h is included there is no need to include sys/poll.h
8
9Fixes
10../git/src/mctp-bench.c:2:10: fatal error: 'bits/time.h' file not found
11 2 | #include <bits/time.h>
12 | ^~~~~~~~~~~~~
13
14Upstream-Status: Submitted [https://github.com/CodeConstruct/mctp/pull/65]
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16---
17 src/mctp-bench.c | 3 +--
18 1 file changed, 1 insertion(+), 2 deletions(-)
19
20diff --git a/src/mctp-bench.c b/src/mctp-bench.c
21index eeb6fcf..60b3bb0 100644
22--- a/src/mctp-bench.c
23+++ b/src/mctp-bench.c
24@@ -1,5 +1,5 @@
25 #define _XOPEN_SOURCE 700
26-#include <bits/time.h>
27+#include <time.h>
28 #include <err.h>
29 #include <errno.h>
30 #include <poll.h>
31@@ -9,7 +9,6 @@
32 #include <stdlib.h>
33 #include <string.h>
34 #include <sys/ioctl.h>
35-#include <sys/poll.h>
36 #include <sys/socket.h>
37 #include <time.h>
38 #include <unistd.h>
diff --git a/meta-networking/recipes-support/mctp/mctp_1.1.bb b/meta-networking/recipes-support/mctp/mctp_2.1.bb
index bf3961be42..04fecf7aca 100644
--- a/meta-networking/recipes-support/mctp/mctp_1.1.bb
+++ b/meta-networking/recipes-support/mctp/mctp_2.1.bb
@@ -5,14 +5,18 @@ LICENSE = "GPL-2.0-only"
5 5
6LIC_FILES_CHKSUM = "file://LICENSE;md5=4cc91856b08b094b4f406a29dc61db21" 6LIC_FILES_CHKSUM = "file://LICENSE;md5=4cc91856b08b094b4f406a29dc61db21"
7 7
8SRCREV = "a591ad885aa28f113cb45870b2fd5bce48378d6f" 8SRCREV = "dd944cf5b5a8b834f3685bcb2017190258dbcd0b"
9 9
10SRC_URI = "git://github.com/CodeConstruct/mctp;branch=main;protocol=https" 10SRC_URI = "git://github.com/CodeConstruct/mctp;branch=main;protocol=https \
11 file://0001-mctp-bench-Adjust-headers.patch"
11 12
12S = "${WORKDIR}/git"
13 13
14inherit meson pkgconfig systemd 14inherit meson pkgconfig systemd
15 15
16EXTRA_OEMESON = " \
17 -Dtests=false \
18"
19
16PACKAGECONFIG ??= " \ 20PACKAGECONFIG ??= " \
17 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ 21 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
18" 22"
diff --git a/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.3.1.bb b/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.3.1.bb
index 3867b89052..52e7e53c32 100644
--- a/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.3.1.bb
+++ b/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.3.1.bb
@@ -3,12 +3,11 @@ require mdio-tools.inc
3DEPENDS += "virtual/kernel libmnl" 3DEPENDS += "virtual/kernel libmnl"
4# This module requires Linux 5.6 higher 4# This module requires Linux 5.6 higher
5 5
6S = "${WORKDIR}/git"
7 6
8inherit module 7inherit module
9 8
10EXTRA_OEMAKE = "-C kernel/ KDIR=${STAGING_KERNEL_DIR}" 9EXTRA_OEMAKE = "-C kernel/ KDIR=${STAGING_KERNEL_DIR}"
11MODULES_MODULE_SYMVERS_LOCATION="kernel" 10MODULES_MODULE_SYMVERS_LOCATION = "kernel"
12MODULES_INSTALL_TARGET = "install" 11MODULES_INSTALL_TARGET = "install"
13 12
14RPROVIDES:${PN} += "kernel-module-mdio-netlink" 13RPROVIDES:${PN} += "kernel-module-mdio-netlink"
diff --git a/meta-networking/recipes-support/mdio-tools/mdio-tools.inc b/meta-networking/recipes-support/mdio-tools/mdio-tools.inc
index b99ce82810..fc8161eb1f 100644
--- a/meta-networking/recipes-support/mdio-tools/mdio-tools.inc
+++ b/meta-networking/recipes-support/mdio-tools/mdio-tools.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "A low-level debug tool for communicating with devices attached to
2SECTION = "networking" 2SECTION = "networking"
3HOMEPAGE = "https://github.com/wkz/mdio-tools" 3HOMEPAGE = "https://github.com/wkz/mdio-tools"
4LICENSE = "GPL-2.0-or-later" 4LICENSE = "GPL-2.0-or-later"
5LIC_FILES_CHKSUM = "file://${WORKDIR}/git/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 5LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
6 6
7SRC_URI = "git://github.com/wkz/mdio-tools.git;protocol=https;branch=master" 7SRC_URI = "git://github.com/wkz/mdio-tools.git;protocol=https;branch=master"
8SRCREV = "f74eaf38dbda441df4fcaeb21ca4465957953a2f" 8SRCREV = "f74eaf38dbda441df4fcaeb21ca4465957953a2f"
diff --git a/meta-networking/recipes-support/mdio-tools/mdio-tools_1.3.1.bb b/meta-networking/recipes-support/mdio-tools/mdio-tools_1.3.1.bb
index 0c64889bc3..2c8f9b8c37 100644
--- a/meta-networking/recipes-support/mdio-tools/mdio-tools_1.3.1.bb
+++ b/meta-networking/recipes-support/mdio-tools/mdio-tools_1.3.1.bb
@@ -2,8 +2,7 @@ require mdio-tools.inc
2 2
3DEPENDS += "virtual/kernel libmnl" 3DEPENDS += "virtual/kernel libmnl"
4 4
5S = "${WORKDIR}/git"
6 5
7inherit pkgconfig autotools 6inherit pkgconfig autotools
8 7
9RDEPENDS:${PN} = "kernel-module-mdio-netlink" 8RRECOMMENDS:${PN} = "kernel-module-mdio-netlink"
diff --git a/meta-networking/recipes-support/memcached/memcached/0001-Fix-function-protypes.patch b/meta-networking/recipes-support/memcached/memcached/0001-Fix-function-protypes.patch
deleted file mode 100644
index 15ef54f80e..0000000000
--- a/meta-networking/recipes-support/memcached/memcached/0001-Fix-function-protypes.patch
+++ /dev/null
@@ -1,110 +0,0 @@
1From 6021d3d60e64d9174f41515d2d962df9b5d7645e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 29 Aug 2022 17:15:28 -0700
4Subject: [PATCH] Fix function protypes
5
6clang-15+ has started diagnosing them as errors
7
8thread.c:925:18: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
9| void STATS_UNLOCK() {
10| ^
11| void
12
13Upstream-Status: Submitted [https://github.com/memcached/memcached/pull/928]
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 assoc.c | 4 ++--
17 memcached.c | 4 ++--
18 slabs.c | 2 +-
19 testapp.c | 2 +-
20 thread.c | 4 ++--
21 5 files changed, 8 insertions(+), 8 deletions(-)
22
23diff --git a/assoc.c b/assoc.c
24index bc68695..01063a9 100644
25--- a/assoc.c
26+++ b/assoc.c
27@@ -261,7 +261,7 @@ static void *assoc_maintenance_thread(void *arg) {
28
29 static pthread_t maintenance_tid;
30
31-int start_assoc_maintenance_thread() {
32+int start_assoc_maintenance_thread(void) {
33 int ret;
34 char *env = getenv("MEMCACHED_HASH_BULK_MOVE");
35 if (env != NULL) {
36@@ -279,7 +279,7 @@ int start_assoc_maintenance_thread() {
37 return 0;
38 }
39
40-void stop_assoc_maintenance_thread() {
41+void stop_assoc_maintenance_thread(void) {
42 mutex_lock(&maintenance_lock);
43 do_run_maintenance_thread = 0;
44 pthread_cond_signal(&maintenance_cond);
45diff --git a/memcached.c b/memcached.c
46index 7871fe8..4d3b54a 100644
47--- a/memcached.c
48+++ b/memcached.c
49@@ -84,7 +84,7 @@ static int try_read_command_udp(conn *c);
50 static enum try_read_result try_read_network(conn *c);
51 static enum try_read_result try_read_udp(conn *c);
52
53-static int start_conn_timeout_thread();
54+static int start_conn_timeout_thread(void);
55
56 /* stats */
57 static void stats_init(void);
58@@ -374,7 +374,7 @@ static void *conn_timeout_thread(void *arg) {
59 return NULL;
60 }
61
62-static int start_conn_timeout_thread() {
63+static int start_conn_timeout_thread(void) {
64 int ret;
65
66 if (settings.idle_timeout == 0)
67diff --git a/slabs.c b/slabs.c
68index 3c78d8a..0dadd35 100644
69--- a/slabs.c
70+++ b/slabs.c
71@@ -638,7 +638,7 @@ static void *memory_allocate(size_t size) {
72 }
73
74 /* Must only be used if all pages are item_size_max */
75-static void memory_release() {
76+static void memory_release(void) {
77 void *p = NULL;
78 if (mem_base != NULL)
79 return;
80diff --git a/testapp.c b/testapp.c
81index 5face54..387a847 100644
82--- a/testapp.c
83+++ b/testapp.c
84@@ -80,7 +80,7 @@ static struct conn *con = NULL;
85 static bool allow_closed_read = false;
86 static bool enable_ssl = false;
87
88-static void close_conn() {
89+static void close_conn(void) {
90 if (con == NULL) return;
91 #ifdef TLS
92 if (con->ssl) {
93diff --git a/thread.c b/thread.c
94index d5ed052..f5efdc3 100644
95--- a/thread.c
96+++ b/thread.c
97@@ -918,11 +918,11 @@ enum store_item_type store_item(item *item, int comm, conn* c) {
98
99 /******************************* GLOBAL STATS ******************************/
100
101-void STATS_LOCK() {
102+void STATS_LOCK(void) {
103 pthread_mutex_lock(&stats_lock);
104 }
105
106-void STATS_UNLOCK() {
107+void STATS_UNLOCK(void) {
108 pthread_mutex_unlock(&stats_lock);
109 }
110
diff --git a/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch b/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch
index 45428ed234..26281e73ef 100644
--- a/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch
+++ b/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch
@@ -1,4 +1,7 @@
1memcached: add knob to detect whether hugetlbfs are checked 1From dfa90817a08f206f7e2dbba44d913968ae7f7d94 Mon Sep 17 00:00:00 2001
2From: Chong Lu <Chong.Lu@windriver.com>
3Date: Tue, 19 Aug 2014 17:38:32 +0800
4Subject: [PATCH] memcached: add knob to detect whether hugetlbfs are checked
2 5
3Add knob to detect whether hugetlbfs are checked or not. 6Add knob to detect whether hugetlbfs are checked or not.
4 7
@@ -6,12 +9,14 @@ Upstream-Status: Pending
6 9
7Signed-off-by: Chong Lu <Chong.Lu@windriver.com> 10Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
8--- 11---
9 configure.ac | 7 ++++++- 12 configure.ac | 6 +++++-
10 1 file changed, 6 insertions(+), 1 deletion(-) 13 1 file changed, 5 insertions(+), 1 deletion(-)
11 14
15diff --git a/configure.ac b/configure.ac
16index 6f2ef97..bd7dd96 100644
12--- a/configure.ac 17--- a/configure.ac
13+++ b/configure.ac 18+++ b/configure.ac
14@@ -488,8 +488,12 @@ if test "x$enable_static" = "xyes"; then 19@@ -559,8 +559,12 @@ if test "x$enable_static" = "xyes"; then
15 fi 20 fi
16 21
17 dnl ---------------------------------------------------------------------------- 22 dnl ----------------------------------------------------------------------------
diff --git a/meta-networking/recipes-support/memcached/memcached_1.6.17.bb b/meta-networking/recipes-support/memcached/memcached_1.6.38.bb
index 270ad5486d..9799b55a09 100644
--- a/meta-networking/recipes-support/memcached/memcached_1.6.17.bb
+++ b/meta-networking/recipes-support/memcached/memcached_1.6.38.bb
@@ -21,9 +21,12 @@ RDEPENDS:${PN} += "perl perl-module-posix perl-module-autoloader \
21 21
22SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \ 22SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \
23 file://memcached-add-hugetlbfs-check.patch \ 23 file://memcached-add-hugetlbfs-check.patch \
24 file://0001-Fix-function-protypes.patch \
25 " 24 "
26SRC_URI[sha256sum] = "2055e373613d8fc21529aff9f0adce3e23b9ce01ba0478d30e7941d9f2bd1224" 25SRC_URI[sha256sum] = "334d792294e37738796b5b03375c47bb6db283b1152e2ea4ccb720152dd17c66"
26
27CVE_STATUS[CVE-2022-26635] = "disputed: this is a problem of applications using php-memcached inproperly"
28
29UPSTREAM_CHECK_URI = "${HOMEPAGE}"
27 30
28# set the same COMPATIBLE_HOST as libhugetlbfs 31# set the same COMPATIBLE_HOST as libhugetlbfs
29COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|aarch64|arm).*-linux*" 32COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|aarch64|arm).*-linux*"
diff --git a/meta-networking/recipes-support/mtr/mtr_0.95.bb b/meta-networking/recipes-support/mtr/mtr_0.95.bb
index 92f9c4bfc0..ac8b48e4e5 100644
--- a/meta-networking/recipes-support/mtr/mtr_0.95.bb
+++ b/meta-networking/recipes-support/mtr/mtr_0.95.bb
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
11SRCREV = "852e5617fbf331cf292723702161f0ac9afe257c" 11SRCREV = "852e5617fbf331cf292723702161f0ac9afe257c"
12SRC_URI = "git://github.com/traviscross/mtr;branch=master;protocol=https" 12SRC_URI = "git://github.com/traviscross/mtr;branch=master;protocol=https"
13 13
14S = "${WORKDIR}/git"
15 14
16inherit autotools pkgconfig 15inherit autotools pkgconfig
17 16
diff --git a/meta-networking/recipes-support/nbdkit/nbdkit/0002-plugins-Avoid-absolute-buildpaths-in-binaries.patch b/meta-networking/recipes-support/nbdkit/nbdkit/0002-plugins-Avoid-absolute-buildpaths-in-binaries.patch
new file mode 100644
index 0000000000..2f7ffd3d20
--- /dev/null
+++ b/meta-networking/recipes-support/nbdkit/nbdkit/0002-plugins-Avoid-absolute-buildpaths-in-binaries.patch
@@ -0,0 +1,38 @@
1From 1ccbd8fdbd2e367a702e48c8703b2f010d067b23 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 22 May 2023 18:16:24 -0700
4Subject: [PATCH] plugins: Avoid absolute buildpaths in binaries
5
6plugins seems to add CC to the plugins shared objects via compiler
7cmdline which ends up in real code. Therefore scrub buildpaths from CC
8and CFLAGS before passing them to plugin's build.
9
10Upstream-Status: Submitted [https://gitlab.com/nbdkit/nbdkit/-/merge_requests/30]
11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 plugins/cc/Makefile.am | 7 +++++--
15 1 file changed, 5 insertions(+), 2 deletions(-)
16
17diff --git a/plugins/cc/Makefile.am b/plugins/cc/Makefile.am
18index df8b5d15..80586a17 100644
19--- a/plugins/cc/Makefile.am
20+++ b/plugins/cc/Makefile.am
21@@ -44,9 +44,12 @@ nbdkit_cc_plugin_la_SOURCES = \
22 $(top_srcdir)/include/nbdkit-plugin.h \
23 $(NULL)
24
25+workdir := $(shell dirname $(abs_top_builddir))
26+cc_no_sysroot := $(shell echo \"$(CC)\"|sed -e 's#$(workdir)#<WORKDIR>#g')
27+cflags_no_sysroot := $(shell echo \"$(CFLAGS)\"|sed -e 's#$(workdir)#<WORKDIR>#g')
28 nbdkit_cc_plugin_la_CPPFLAGS = \
29- -DCC="\"$(CC_PLUGIN_CC)\"" \
30- -DCFLAGS="\"$(CC_PLUGIN_CFLAGS)\"" \
31+ -DCC=\"$(cc_no_sysroot)\" \
32+ -DCFLAGS=\"$(cflags_no_sysroot)\" \
33 -I$(top_srcdir)/include \
34 -I$(top_builddir)/include \
35 -I$(top_srcdir)/common/include \
36--
372.40.1
38
diff --git a/meta-networking/recipes-support/nbdkit/nbdkit_1.33.11.bb b/meta-networking/recipes-support/nbdkit/nbdkit_1.33.11.bb
index cdf2677f13..1c9db1e956 100644
--- a/meta-networking/recipes-support/nbdkit/nbdkit_1.33.11.bb
+++ b/meta-networking/recipes-support/nbdkit/nbdkit_1.33.11.bb
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/libguestfs/nbdkit.git;protocol=https;branch=master \
13 file://0001-plugins-Avoid-absolute-buildpaths-in-binaries.patch" 13 file://0001-plugins-Avoid-absolute-buildpaths-in-binaries.patch"
14SRCREV = "6c02c6a469d62a047f230b0ccf03f72328312d2b" 14SRCREV = "6c02c6a469d62a047f230b0ccf03f72328312d2b"
15 15
16S = "${WORKDIR}/git"
17 16
18DEPENDS = "curl xz e2fsprogs zlib" 17DEPENDS = "curl xz e2fsprogs zlib"
19 18
diff --git a/meta-networking/recipes-support/nbdkit/nbdkit_1.43.11.bb b/meta-networking/recipes-support/nbdkit/nbdkit_1.43.11.bb
new file mode 100644
index 0000000000..9e7bdc9966
--- /dev/null
+++ b/meta-networking/recipes-support/nbdkit/nbdkit_1.43.11.bb
@@ -0,0 +1,33 @@
1SUMMARY = "nbdkit is a toolkit for creating NBD servers."
2DESCRIPTION = "NBD — Network Block Device — is a protocol \
3for accessing Block Devices (hard disks and disk-like things) \
4over a Network. \
5\
6nbdkit is a toolkit for creating NBD servers."
7
8HOMEPAGE = "https://gitlab.com/nbdkit/nbdkit"
9LICENSE = "BSD-3-Clause"
10LIC_FILES_CHKSUM = "file://LICENSE;md5=26250adec854bc317493f6fb98efe049"
11
12SRC_URI = "git://gitlab.com/nbdkit/nbdkit.git;protocol=https;branch=master;tag=v${PV} \
13 file://0002-plugins-Avoid-absolute-buildpaths-in-binaries.patch \
14 "
15SRCREV = "2d0f232b590f4001881dd0819f55af72b88c4b2f"
16
17
18DEPENDS = "curl xz e2fsprogs zlib"
19
20# autotools-brokensep is needed as nbdkit does not support build in external directory
21inherit pkgconfig python3native perlnative bash-completion autotools-brokensep
22
23# Those are required to build standalone
24EXTRA_OECONF = " --without-libvirt --without-libguestfs --disable-perl"
25
26# Disable some extended support (not desired for small embedded systems)
27#EXTRA_OECONF += " --disable-python"
28#EXTRA_OECONF += " --disable-ocaml"
29#EXTRA_OECONF += " --disable-rust"
30#EXTRA_OECONF += " --disable-ruby"
31#EXTRA_OECONF += " --disable-tcl"
32#EXTRA_OECONF += " --disable-lua"
33#EXTRA_OECONF += " --disable-vddk"
diff --git a/meta-networking/recipes-support/ncp/libowfat/0001-fix-incompatible-type-error-with-gcc-15.patch b/meta-networking/recipes-support/ncp/libowfat/0001-fix-incompatible-type-error-with-gcc-15.patch
new file mode 100644
index 0000000000..6f5f3e712e
--- /dev/null
+++ b/meta-networking/recipes-support/ncp/libowfat/0001-fix-incompatible-type-error-with-gcc-15.patch
@@ -0,0 +1,100 @@
1From 397d00cfd672f3782196e927d0a878ab1d800112 Mon Sep 17 00:00:00 2001
2From: "mark.yang" <mark.yang@lge.com>
3Date: Fri, 18 Apr 2025 17:30:48 +0900
4Subject: [PATCH] fix incompatible type error with gcc 15
5
6 * fix following errors:
7 ./select.h:13:12: error: conflicting types for 'select'; have 'int(void)'
8 13 | extern int select();
9 | ^~~~~~
10 In file included from TOPDIR/tmp/work/core2-64-oe-linux/libowfat/0.32/recipe-sysroot/usr/include/sys/types.h:179,
11 from ./select.h:6:
12 ./buffer.h:40:65: error: initialization of 'ssize_t (*)(void)' {aka 'long int (*)(void)'} from incompatible pointer type 'ssize_t (*)(int, char *, size_t)' {aka 'long int (*)(int, char *, long unsigned int)'} [-Wincompatible-pointer-types]
13 40 | #define BUFFER_INIT(op,fd,buf,len) { (char*)(buf), 0, 0, (len), (op), NULL, NULL, (fd) }
14 | ^
15Upstream-Status: Submitted [felix-libowfat@fefe.de]
16Signed-off-by: mark.yang <mark.yang@lge.com>
17---
18 buffer.h | 2 +-
19 buffer/buffer_frombuf.c | 2 +-
20 buffer/buffer_stubborn.c | 2 +-
21 buffer/buffer_stubborn2.c | 2 +-
22 buffer/buffer_tosa.c | 2 +-
23 select.h2 | 2 --
24 6 files changed, 5 insertions(+), 7 deletions(-)
25
26diff --git a/buffer.h b/buffer.h
27index 54bed5c..eaf7acb 100644
28--- a/buffer.h
29+++ b/buffer.h
30@@ -24,7 +24,7 @@ typedef struct buffer {
31 int fd; /* passed as first argument to op */
32 } buffer;
33
34-#define BUFFER_INIT(op,fd,buf,len) { (buf), 0, 0, (len), (op), NULL, NULL, (fd) }
35+#define BUFFER_INIT(op,fd,buf,len) { (buf), 0, 0, (len), (void*)(op), NULL, NULL, (fd) }
36 #define BUFFER_INIT_FREE(op,fd,buf,len) { (buf), 0, 0, (len), (op), NULL, buffer_free, (fd) }
37 #define BUFFER_INIT_READ(op,fd,buf,len) BUFFER_INIT(op,fd,buf,len) /*obsolete*/
38 #define BUFFER_INSIZE 8192
39diff --git a/buffer/buffer_frombuf.c b/buffer/buffer_frombuf.c
40index 0c9d931..2aa27ca 100644
41--- a/buffer/buffer_frombuf.c
42+++ b/buffer/buffer_frombuf.c
43@@ -14,6 +14,6 @@ void buffer_frombuf(buffer* b,const char* x,size_t l) {
44 b->n=l;
45 b->a=l;
46 b->fd=0;
47- b->op=dummyreadwrite;
48+ b->op=(void*)dummyreadwrite;
49 b->deinit=0;
50 }
51diff --git a/buffer/buffer_stubborn.c b/buffer/buffer_stubborn.c
52index 2e00418..8079000 100644
53--- a/buffer/buffer_stubborn.c
54+++ b/buffer/buffer_stubborn.c
55@@ -1,7 +1,7 @@
56 #include <errno.h>
57 #include "buffer.h"
58
59-int buffer_stubborn(ssize_t (*op)(),int fd,const char* buf, size_t len,void* cookie) {
60+int buffer_stubborn(ssize_t (*op)(int,char*,size_t,void*),int fd,const char* buf, size_t len,void* cookie) {
61 ssize_t w;
62 errno=0;
63 while (len) {
64diff --git a/buffer/buffer_stubborn2.c b/buffer/buffer_stubborn2.c
65index b9146e2..b47a245 100644
66--- a/buffer/buffer_stubborn2.c
67+++ b/buffer/buffer_stubborn2.c
68@@ -1,7 +1,7 @@
69 #include <errno.h>
70 #include "buffer.h"
71
72-ssize_t buffer_stubborn_read(ssize_t (*op)(),int fd,const char* buf, size_t len,void* cookie) {
73+ssize_t buffer_stubborn_read(ssize_t (*op)(int,char*,size_t,void*),int fd,const char* buf, size_t len,void* cookie) {
74 ssize_t w;
75 for (;;) {
76 if ((w=op(fd,buf,len,cookie))<0)
77diff --git a/buffer/buffer_tosa.c b/buffer/buffer_tosa.c
78index a10be4f..99111a9 100644
79--- a/buffer/buffer_tosa.c
80+++ b/buffer/buffer_tosa.c
81@@ -21,7 +21,7 @@ int buffer_tosa(buffer* b,stralloc* sa) {
82 b->n=0;
83 b->a=1024;
84 b->fd=0;
85- b->op=strallocwrite;
86+ b->op=(void*)strallocwrite;
87 b->cookie=sa;
88 b->deinit=0;
89 return 0;
90diff --git a/select.h2 b/select.h2
91index 961c380..2a22543 100644
92--- a/select.h2
93+++ b/select.h2
94@@ -10,6 +10,4 @@
95 /* braindead BSD uses bzero in FD_ZERO but doesn't #include string.h */
96 #include <string.h>
97
98-extern int select();
99-
100 #endif
diff --git a/meta-networking/recipes-support/ncp/libowfat_0.32.bb b/meta-networking/recipes-support/ncp/libowfat_0.32.bb
index 94f36f904a..cc67d9aefa 100644
--- a/meta-networking/recipes-support/ncp/libowfat_0.32.bb
+++ b/meta-networking/recipes-support/ncp/libowfat_0.32.bb
@@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
9SRC_URI = "https://www.fefe.de/${BPN}/${BP}.tar.xz \ 9SRC_URI = "https://www.fefe.de/${BPN}/${BP}.tar.xz \
10 file://0001-Depend-on-haveuint128.h-for-umult64.c.patch \ 10 file://0001-Depend-on-haveuint128.h-for-umult64.c.patch \
11 file://0001-replace-__pure__-with-compiler-attribute-pure.patch \ 11 file://0001-replace-__pure__-with-compiler-attribute-pure.patch \
12 file://0001-fix-incompatible-type-error-with-gcc-15.patch \
12 " 13 "
13SRC_URI[md5sum] = "ee015ccf45cb2bc61c942642038c2bdc" 14SRC_URI[md5sum] = "ee015ccf45cb2bc61c942642038c2bdc"
14SRC_URI[sha256sum] = "f4b9b3d9922dc25bc93adedf9e9ff8ddbebaf623f14c8e7a5f2301bfef7998c1" 15SRC_URI[sha256sum] = "f4b9b3d9922dc25bc93adedf9e9ff8ddbebaf623f14c8e7a5f2301bfef7998c1"
diff --git a/meta-networking/recipes-support/ndisc6/ndisc6/0001-Remove-use-of-variables-indicating-buildtime-informa.patch b/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-networking/recipes-support/ndisc6/ndisc6/0001-Remove-use-of-variables-indicating-buildtime-informa.patch
@@ -0,0 +1,85 @@
1From 7b3e78cf0348ea737609a2ace07c7c55aae36bcb Mon Sep 17 00:00:00 2001
2From: Santiago Vila <sanvila@debian.org>
3Date: Wed, 9 Oct 2024 22:05:09 -0700
4Subject: [PATCH] Remove use of variables indicating buildtime information
5
6We should not really care about the build date or the build host
7
8Sourced From: https://salsa.debian.org/debian/ndisc6/-/blob/master/debian/patches/reproducible-build.patch?ref_type=heads
9
10Upstream-Status: Pending
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 rdnss/rdnssd.c | 2 --
14 src/addrinfo.c | 2 --
15 src/ndisc.c | 2 --
16 src/tcpspray.c | 2 --
17 src/traceroute.c | 2 --
18 5 files changed, 10 deletions(-)
19
20diff --git a/rdnss/rdnssd.c b/rdnss/rdnssd.c
21index b87edb2..7201525 100644
22--- a/rdnss/rdnssd.c
23+++ b/rdnss/rdnssd.c
24@@ -741,8 +741,6 @@ version (void)
25 {
26 printf (_("rdnssd: IPv6 Recursive DNS Server discovery Daemon %s (%s)\n"),
27 VERSION, "$Rev$");
28- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME);
29- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION);
30 puts (_("Written by Pierre Ynard and Remi Denis-Courmont\n"));
31
32 printf (_("Copyright (C) %u-%u Pierre Ynard, Remi Denis-Courmont\n"),
33diff --git a/src/addrinfo.c b/src/addrinfo.c
34index cd73722..6316abd 100644
35--- a/src/addrinfo.c
36+++ b/src/addrinfo.c
37@@ -148,8 +148,6 @@ static int quick_usage (const char *path)
38 static int version (void)
39 {
40 printf (_("addrinfo %s (%s)\n"), VERSION, "$Rev$");
41- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME);
42- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION);
43 puts (_("Written by Remi Denis-Courmont\n"));
44
45 printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2002, 2007);
46diff --git a/src/ndisc.c b/src/ndisc.c
47index b190b18..6e222a0 100644
48--- a/src/ndisc.c
49+++ b/src/ndisc.c
50@@ -920,9 +920,7 @@ version (void)
51 {
52 printf (_(
53 "ndisc6: IPv6 Neighbor/Router Discovery userland tool %s (%s)\n"), VERSION, "$Rev$");
54- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME);
55
56- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION);
57 puts (_("Written by Remi Denis-Courmont\n"));
58
59 printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2004, 2007);
60diff --git a/src/tcpspray.c b/src/tcpspray.c
61index 39d8939..6347795 100644
62--- a/src/tcpspray.c
63+++ b/src/tcpspray.c
64@@ -302,8 +302,6 @@ version (void)
65 {
66 printf (_(
67 "tcpspray6: TCP/IP bandwidth tester %s (%s)\n"), VERSION, "$Rev$");
68- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME);
69- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION);
70 puts (_("Written by Remi Denis-Courmont\n"));
71
72 printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2005, 2007);
73diff --git a/src/traceroute.c b/src/traceroute.c
74index 489bc55..604b6af 100644
75--- a/src/traceroute.c
76+++ b/src/traceroute.c
77@@ -1251,8 +1251,6 @@ version (void)
78 {
79 printf (_(
80 "traceroute6: TCP & UDP IPv6 traceroute tool %s (%s)\n"), VERSION, "$Rev$");
81- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME);
82- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION);
83 puts (_("Written by Remi Denis-Courmont\n"));
84
85 printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2005, 2007);
diff --git a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb b/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb
index a827e7f42a..6931c64d4a 100644
--- a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb
+++ b/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb
@@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
8SRCREV = "92e5d1cf6547fe40316b2a6ca2f7b8195ae0cbe5" 8SRCREV = "92e5d1cf6547fe40316b2a6ca2f7b8195ae0cbe5"
9SRC_URI = "git://git.remlab.net/git/ndisc6.git;protocol=http;branch=master \ 9SRC_URI = "git://git.remlab.net/git/ndisc6.git;protocol=http;branch=master \
10 file://0001-autogen-Do-not-symlink-gettext.h-from-build-host.patch \ 10 file://0001-autogen-Do-not-symlink-gettext.h-from-build-host.patch \
11 file://0001-Remove-use-of-variables-indicating-buildtime-informa.patch \
11 " 12 "
12 13
13S = "${WORKDIR}/git"
14 14
15DEPENDS = "coreutils-native" 15DEPENDS = "coreutils-native"
16 16
@@ -27,6 +27,10 @@ do_configure:prepend() {
27 ${S}/autogen.sh 27 ${S}/autogen.sh
28} 28}
29 29
30do_configure:append() {
31 sed -i -e 's|${WORKDIR}|<scrubbed>|g' ${B}/config.h
32}
33
30do_install:append () { 34do_install:append () {
31 rm -rf ${D}${localstatedir} 35 rm -rf ${D}${localstatedir}
32 # Enable SUID bit for applications that need it 36 # Enable SUID bit for applications that need it
diff --git a/meta-networking/recipes-support/netcat/netcat-openbsd/0001-fix-netcat-openbsd-ftbfs-with-GCC-15.patch b/meta-networking/recipes-support/netcat/netcat-openbsd/0001-fix-netcat-openbsd-ftbfs-with-GCC-15.patch
new file mode 100644
index 0000000000..c1757d39ad
--- /dev/null
+++ b/meta-networking/recipes-support/netcat/netcat-openbsd/0001-fix-netcat-openbsd-ftbfs-with-GCC-15.patch
@@ -0,0 +1,51 @@
1From 4ca437b129252635e89694446945e69912300ceb Mon Sep 17 00:00:00 2001
2From: "mark.yang" <mark.yang@lge.com>
3Date: Wed, 16 Apr 2025 20:35:46 +0900
4Subject: [PATCH] fix netcat-openbsd: ftbfs with GCC-15
5
6* fix build failure with GCC-15
7netcat.c:1443:41: error: passing argument 2 of 'signal' from incompatible pointer type [-Wincompatible-pointer-types]
8 1443 | signal(SIGALRM, quit);
9 | ^~~~
10 | |
11 | void (*)(void)
12In file included from netcat.c:100:
13TOPDIR/tmp/work/core2-64-oe-linux/netcat-openbsd/1.195/recipe-sysroot/usr/include/signal.h:88:57: note: expected '__sighandler_t' {aka 'void (*)(int)'} but argument is of type 'void (*)(void)'
14 88 | extern __sighandler_t signal (int __sig, __sighandler_t __handler)
15 | ~~~~~~~~~~~~~~~^~~~~~~~~
16netcat.c:241:13: note: 'quit' declared here
17 241 | static void quit();
18 | ^~~~
19TOPDIR/tmp/work/core2-64-oe-linux/netcat-openbsd/1.195/recipe-sysroot/usr/include/signal.h:72:16: note: '__sighandler_t' declared here
20 72 | typedef void (*__sighandler_t) (int);
21 | ^~~~~~~~~~~~~~
22make: *** [Makefile:17: netcat.o] Error 1
23
24Upstream-Status: Submitted [https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1097448]
25Signed-off-by: mark.yang <mark.yang@lge.com>
26---
27 netcat.c | 4 ++--
28 1 file changed, 2 insertions(+), 2 deletions(-)
29
30diff --git a/netcat.c b/netcat.c
31index d70598a..b8ba959 100644
32--- a/netcat.c
33+++ b/netcat.c
34@@ -238,7 +238,7 @@ char *proto_name(int uflag, int dccpflag);
35 static int connect_with_timeout(int fd, const struct sockaddr *sa,
36 socklen_t salen, int ctimeout);
37
38-static void quit();
39+static void quit(int sig);
40
41 int b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize);
42 int b64_pton(char const *src, u_char *target, size_t targsize);
43@@ -2235,7 +2235,7 @@ usage(int ret)
44 * quit()
45 * handler for a "-q" timeout (exit 0 instead of 1)
46 */
47-static void quit()
48+static void quit(__attribute__((unused)) int sig)
49 {
50 exit(0);
51 }
diff --git a/meta-networking/recipes-support/netcat/netcat-openbsd_1.195.bb b/meta-networking/recipes-support/netcat/netcat-openbsd_1.195.bb
index 20ad43a4d5..99ae90aa91 100644
--- a/meta-networking/recipes-support/netcat/netcat-openbsd_1.195.bb
+++ b/meta-networking/recipes-support/netcat/netcat-openbsd_1.195.bb
@@ -10,6 +10,7 @@ do_patch[depends] = "quilt-native:do_populate_sysroot"
10SRC_URI = "http://snapshot.debian.org/archive/debian/20181022T085404Z/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz;name=netcat \ 10SRC_URI = "http://snapshot.debian.org/archive/debian/20181022T085404Z/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz;name=netcat \
11 http://snapshot.debian.org/archive/debian/20181022T085404Z/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-1.debian.tar.xz;name=netcat-patch;subdir=${BP} \ 11 http://snapshot.debian.org/archive/debian/20181022T085404Z/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-1.debian.tar.xz;name=netcat-patch;subdir=${BP} \
12 file://0001-bundle-own-base64-encode-decode-functions.patch \ 12 file://0001-bundle-own-base64-encode-decode-functions.patch \
13 file://0001-fix-netcat-openbsd-ftbfs-with-GCC-15.patch \
13 " 14 "
14 15
15SRC_URI[netcat.md5sum] = "219d5e49c45658e229a3bda63063a986" 16SRC_URI[netcat.md5sum] = "219d5e49c45658e229a3bda63063a986"
diff --git a/meta-networking/recipes-support/netcf/netcf_0.2.8.bb b/meta-networking/recipes-support/netcf/netcf_0.2.8.bb
index c68974f9f0..4170e9fab0 100644
--- a/meta-networking/recipes-support/netcf/netcf_0.2.8.bb
+++ b/meta-networking/recipes-support/netcf/netcf_0.2.8.bb
@@ -18,7 +18,6 @@ DEPENDS += "augeas libnl libxslt libxml2"
18 18
19do_configure[depends] += "${MLPREFIX}gnulib:do_populate_sysroot" 19do_configure[depends] += "${MLPREFIX}gnulib:do_populate_sysroot"
20 20
21S = "${WORKDIR}/git"
22 21
23inherit gettext autotools perlnative pkgconfig systemd 22inherit gettext autotools perlnative pkgconfig systemd
24 23
@@ -27,8 +26,6 @@ EXTRA_OECONF:append:class-target = " --with-driver=redhat"
27PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" 26PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
28PACKAGECONFIG[systemd] = "--with-sysinit=systemd,--with-sysinit=initscripts," 27PACKAGECONFIG[systemd] = "--with-sysinit=systemd,--with-sysinit=initscripts,"
29 28
30EXTRA_AUTORECONF += "-I ${S}/gnulib/m4"
31
32do_configure:prepend() { 29do_configure:prepend() {
33 currdir=`pwd` 30 currdir=`pwd`
34 cd ${S} 31 cd ${S}
diff --git a/meta-networking/recipes-support/netperf/files/0001-Fix-too-many-arguments-error-occurring-in-gcc-15.patch b/meta-networking/recipes-support/netperf/files/0001-Fix-too-many-arguments-error-occurring-in-gcc-15.patch
new file mode 100644
index 0000000000..51313d8055
--- /dev/null
+++ b/meta-networking/recipes-support/netperf/files/0001-Fix-too-many-arguments-error-occurring-in-gcc-15.patch
@@ -0,0 +1,168 @@
1From fd4f2099efd378a3e00809b485ae22ebf20ab0f7 Mon Sep 17 00:00:00 2001
2From: "mark.yang" <mark.yang@lge.com>
3Date: Wed, 16 Apr 2025 20:02:36 +0900
4Subject: [PATCH] Fix too many arguments error occurring in gcc-15
5
6* See more details in http://errors.yoctoproject.org/Errors/Details/851803/
7../../git/src/nettest_bsd.c:4497:19: error: too many arguments to function 'alloc_sendfile_buf_ring'; expected 0, have 4
8 4497 | send_ring = alloc_sendfile_buf_ring(send_width,
9 | ^~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
10In file included from ../../git/src/nettest_bsd.c:175:
11../../git/src/netlib.h:690:26: note: declared here
12 690 | extern struct ring_elt *alloc_sendfile_buf_ring();
13 | ^~~~~~~~~~~~~~~~~~~~~~~
14In file included from ../../git/src/nettest_omni.c:184:
15../../git/src/hist.h:135:6: error: conflicting types for 'HIST_purge'; have 'void(struct histogram_struct *)'
16 135 | void HIST_purge(HIST h);
17 | ^~~~~~~~~~
18In file included from ../../git/src/nettest_omni.c:166:
19../../git/src/netlib.h:651:17: note: previous declaration of 'HIST_purge' with type 'void(void)'
20 651 | extern void HIST_purge();
21 | ^~~~~~~~~~
22../../git/src/nettest_bsd.c: In function 'recv_tcp_stream':
23../../git/src/nettest_bsd.c:5197:15: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
24 5197 | recv_ring = allocate_buffer_ring(recv_width,
25 | ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
26../../git/src/netlib.h:679:26: note: declared here
27 679 | extern struct ring_elt *allocate_buffer_ring();
28 | ^~~~~~~~~~~~~~~~~~~~
29../../git/src/nettest_bsd.c: In function 'recv_tcp_maerts':
30../../git/src/nettest_bsd.c:5617:15: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
31 5617 | send_ring = allocate_buffer_ring(send_width,
32 | ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
33../../git/src/netlib.h:679:26: note: declared here
34 679 | extern struct ring_elt *allocate_buffer_ring();
35 | ^~~~~~~~~~~~~~~~~~~~
36../../git/src/nettest_bsd.c: In function 'recv_udp_stream':
37../../git/src/nettest_bsd.c:7345:15: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
38 7345 | recv_ring = allocate_buffer_ring(recv_width,
39 | ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
40../../git/src/netlib.h:679:26: note: declared here
41 679 | extern struct ring_elt *allocate_buffer_ring();
42 | ^~~~~~~~~~~~~~~~~~~~
43../../git/src/nettest_bsd.c: In function 'recv_udp_rr':
44../../git/src/nettest_bsd.c:8360:15: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
45 8360 | recv_ring = allocate_buffer_ring(recv_width,
46 | ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
47../../git/src/netlib.h:679:26: note: declared here
48 679 | extern struct ring_elt *allocate_buffer_ring();
49 | ^~~~~~~~~~~~~~~~~~~~
50../../git/src/nettest_bsd.c:8365:15: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
51 8365 | send_ring = allocate_buffer_ring(send_width,
52 | ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
53../../git/src/netlib.h:679:26: note: declared here
54 679 | extern struct ring_elt *allocate_buffer_ring();
55 | ^~~~~~~~~~~~~~~~~~~~
56../../git/src/nettest_bsd.c: In function 'recv_tcp_rr':
57../../git/src/nettest_bsd.c:8677:15: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
58 8677 | send_ring = allocate_buffer_ring(send_width,
59 | ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
60../../git/src/netlib.h:679:26: note: declared here
61 679 | extern struct ring_elt *allocate_buffer_ring();
62 | ^~~~~~~~~~~~~~~~~~~~
63../../git/src/nettest_bsd.c:8682:15: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
64 8682 | recv_ring = allocate_buffer_ring(recv_width,
65 | ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
66../../git/src/netlib.h:679:26: note: declared here
67 679 | extern struct ring_elt *allocate_buffer_ring();
68 | ^~~~~~~~~~~~~~~~~~~~
69../../git/src/nettest_omni.c: In function 'send_omni_inner':
70../../git/src/nettest_omni.c:4044:21: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
71 4044 | send_ring = allocate_buffer_ring(send_width,
72 | ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
73../../git/src/netlib.h:679:26: note: declared here
74 679 | extern struct ring_elt *allocate_buffer_ring();
75 | ^~~~~~~~~~~~~~~~~~~~
76../../git/src/nettest_omni.c:4086:21: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
77 4086 | recv_ring = allocate_buffer_ring(recv_width,
78 | ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
79../../git/src/netlib.h:679:26: note: declared here
80 679 | extern struct ring_elt *allocate_buffer_ring();
81 | ^~~~~~~~~~~~~~~~~~~~
82../../git/src/nettest_omni.c:5050:5: error: too many arguments to function 'HIST_get_stats'; expected 0, have 5
83 5050 | HIST_get_stats(time_hist,
84 | ^~~~~~~~~~~~~~ ~~~~~~~~~
85../../git/src/netlib.h:650:17: note: declared here
86 650 | extern void HIST_get_stats();
87 | ^~~~~~~~~~~~~~
88../../git/src/nettest_omni.c:5055:19: error: too many arguments to function 'HIST_get_percentile'; expected 0, have 2
89 5055 | p50_latency = HIST_get_percentile(time_hist, 0.50);
90 | ^~~~~~~~~~~~~~~~~~~ ~~~~~~~~~
91../../git/src/netlib.h:649:17: note: declared here
92 649 | extern int HIST_get_percentile();
93 | ^~~~~~~~~~~~~~~~~~~
94../../git/src/nettest_omni.c:5056:19: error: too many arguments to function 'HIST_get_percentile'; expected 0, have 2
95 5056 | p90_latency = HIST_get_percentile(time_hist, 0.90);
96 | ^~~~~~~~~~~~~~~~~~~ ~~~~~~~~~
97../../git/src/netlib.h:649:17: note: declared here
98 649 | extern int HIST_get_percentile();
99 | ^~~~~~~~~~~~~~~~~~~
100../../git/src/nettest_omni.c:5057:19: error: too many arguments to function 'HIST_get_percentile'; expected 0, have 2
101 5057 | p99_latency = HIST_get_percentile(time_hist, 0.99);
102 | ^~~~~~~~~~~~~~~~~~~ ~~~~~~~~~
103../../git/src/netlib.h:649:17: note: declared here
104 649 | extern int HIST_get_percentile();
105 | ^~~~~~~~~~~~~~~~~~~
106../../git/src/nettest_omni.c: In function 'recv_omni':
107../../git/src/nettest_omni.c:5354:17: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
108 5354 | send_ring = allocate_buffer_ring(send_width,
109 | ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
110../../git/src/netlib.h:679:26: note: declared here
111 679 | extern struct ring_elt *allocate_buffer_ring();
112 | ^~~~~~~~~~~~~~~~~~~~
113../../git/src/nettest_omni.c:5396:17: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
114 5396 | recv_ring = allocate_buffer_ring(recv_width,
115 | ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
116../../git/src/netlib.h:679:26: note: declared here
117 679 | extern struct ring_elt *allocate_buffer_ring();
118 | ^~~~~~~~~~~~~~~~~~~~
119
120Upstream-Status: Submitted [https://github.com/HewlettPackard/netperf/pull/86]
121Signed-off-by: mark.yang <mark.yang@lge.com>
122---
123 src/netlib.h | 11 ++++++-----
124 1 file changed, 6 insertions(+), 5 deletions(-)
125
126diff --git a/src/netlib.h b/src/netlib.h
127index b1f4199..8e1f6fe 100644
128--- a/src/netlib.h
129+++ b/src/netlib.h
130@@ -564,6 +564,7 @@ extern void demo_interval_final();
131 #endif
132 #endif
133
134+#include "hist.h"
135 extern void netlib_init();
136 extern int netlib_get_page_size();
137 extern void install_signal_catchers();
138@@ -646,9 +647,9 @@ extern char *find_interface_slot(char *interface_name);
139 extern void find_interface_ids(char *interface_name, int *vendor, int *device, int *sub_vend, int *sub_dev);
140 extern void find_driver_info(char *ifname, char *driver, char *version, char *firmware, char *bus, int len);
141 extern void find_system_info(char **system_model, char **cpu_model, int *cpu_frequency);
142-extern int HIST_get_percentile();
143-extern void HIST_get_stats();
144-extern void HIST_purge();
145+extern int HIST_get_percentile(HIST h, const double percentile);
146+extern void HIST_get_stats(HIST h, int *min, int *max, double *mean, double *stddev);
147+extern void HIST_purge(HIST h);
148 extern void find_security_info(int *enabled, int *type, char **specific);
149 extern void demo_first_timestamp();
150 extern void demo_reset();
151@@ -676,7 +677,7 @@ extern void catcher(int, siginfo_t *,void *);
152 #else
153 extern void catcher(int);
154 #endif /* __hpux */
155-extern struct ring_elt *allocate_buffer_ring();
156+extern struct ring_elt *allocate_buffer_ring(int recv_width, int recv_size, int local_recv_align, int local_recv_offset);
157 extern void access_buffer(char *buffer_ptr,
158 int length,
159 int dirty_count,
160@@ -687,7 +688,7 @@ extern struct ring_elt *allocate_exs_buffer_ring();
161 #endif /* HAVE_ICSC_EXS */
162
163 #ifdef HAVE_SENDFILE
164-extern struct ring_elt *alloc_sendfile_buf_ring();
165+extern struct ring_elt *alloc_sendfile_buf_ring(int send_width, int send_size, int local_send_align, int local_send_offset);
166 extern int netperf_sendfile(SOCKET send_socket, struct ring_elt *send_ring);
167 #endif /* HAVE_SENDFILE */
168
diff --git a/meta-networking/recipes-support/netperf/files/0001-Makefile.am-add-ACLOCAL_AMFLAGS.patch b/meta-networking/recipes-support/netperf/files/0001-Makefile.am-add-ACLOCAL_AMFLAGS.patch
new file mode 100644
index 0000000000..6aba8a4f79
--- /dev/null
+++ b/meta-networking/recipes-support/netperf/files/0001-Makefile.am-add-ACLOCAL_AMFLAGS.patch
@@ -0,0 +1,41 @@
1From 333e92a2d804420748447e043c6a04affc600e20 Mon Sep 17 00:00:00 2001
2From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
3Date: Thu, 27 Feb 2025 21:09:04 +0200
4Subject: [PATCH] Makefile.am: add ACLOCAL_AMFLAGS
5
6Add ACLOCAL_AMFLAGS, a standard way to tell aclocal where to find
7necessary macros.
8
9Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
10Upstream-Status: Submitted [https://github.com/HewlettPackard/netperf/pull/84]
11---
12 Makefile.am | 1 +
13 autogen.sh | 2 +-
14 2 files changed, 2 insertions(+), 1 deletion(-)
15
16diff --git a/Makefile.am b/Makefile.am
17index 2cb9c24f2eec..dc266e34c997 100644
18--- a/Makefile.am
19+++ b/Makefile.am
20@@ -19,6 +19,7 @@
21 # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
22 # USE OR OTHER DEALINGS IN THE SOFTWARE.
23
24+ACLOCAL_AMFLAGS = -I src/missing/m4
25 AUTOMAKE_OPTIONS = dist-bzip2 dist-zip
26 SUBDIRS = src doc
27 EXTRA_DIST = README.* Release_Notes inet_ntop.c autogen.sh m4
28diff --git a/autogen.sh b/autogen.sh
29index bc8389c24171..1156f42edae6 100755
30--- a/autogen.sh
31+++ b/autogen.sh
32@@ -1,5 +1,5 @@
33 #! /bin/sh
34
35-aclocal -I src/missing/m4 \
36+aclocal \
37 && automake --add-missing \
38 && autoconf && autoheader
39--
402.39.5
41
diff --git a/meta-networking/recipes-support/netperf/netperf_git.bb b/meta-networking/recipes-support/netperf/netperf_git.bb
index 579a04b86f..4043da5621 100644
--- a/meta-networking/recipes-support/netperf/netperf_git.bb
+++ b/meta-networking/recipes-support/netperf/netperf_git.bb
@@ -15,11 +15,12 @@ SRC_URI = "git://github.com/HewlettPackard/netperf.git;branch=master;protocol=ht
15 file://0001-netlib.c-Move-including-sched.h-out-og-function.patch \ 15 file://0001-netlib.c-Move-including-sched.h-out-og-function.patch \
16 file://0001-nettest_omni-Remove-duplicate-variable-definitions.patch \ 16 file://0001-nettest_omni-Remove-duplicate-variable-definitions.patch \
17 file://netserver_permissions.patch \ 17 file://netserver_permissions.patch \
18 file://0001-Makefile.am-add-ACLOCAL_AMFLAGS.patch \
19 file://0001-Fix-too-many-arguments-error-occurring-in-gcc-15.patch \
18 " 20 "
19 21
20SRCREV = "3bc455b23f901dae377ca0a558e1e32aa56b31c4" 22SRCREV = "3bc455b23f901dae377ca0a558e1e32aa56b31c4"
21 23
22S = "${WORKDIR}/git"
23 24
24inherit update-rc.d autotools texinfo systemd 25inherit update-rc.d autotools texinfo systemd
25 26
@@ -35,12 +36,6 @@ PACKAGECONFIG[sctp] = "--enable-sctp,--disable-sctp,lksctp-tools,"
35PACKAGECONFIG[intervals] = "--enable-intervals,--disable-intervals,," 36PACKAGECONFIG[intervals] = "--enable-intervals,--disable-intervals,,"
36PACKAGECONFIG[histogram] = "--enable-histogram,--disable-histogram,," 37PACKAGECONFIG[histogram] = "--enable-histogram,--disable-histogram,,"
37 38
38# autotools.bbclass attends to include m4 files with path depth <= 2 by
39# "find ${S} -maxdepth 2 -name \*.m4", so move m4 files from m4/m4.
40do_configure:prepend() {
41 test -d ${S}/m4/m4 && mv -f ${S}/m4/m4 ${S}/m4-files
42}
43
44do_install() { 39do_install() {
45 sed -e 's#/usr/sbin/#${sbindir}/#g' -i ${UNPACKDIR}/init 40 sed -e 's#/usr/sbin/#${sbindir}/#g' -i ${UNPACKDIR}/init
46 install -d ${D}${sbindir} ${D}${bindir} ${D}${sysconfdir}/init.d ${D}${systemd_system_unitdir} 41 install -d ${D}${sbindir} ${D}${bindir} ${D}${sysconfdir}/init.d ${D}${systemd_system_unitdir}
@@ -69,6 +64,6 @@ do_install() {
69 64
70RRECOMMENDS:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'sctp', 'kernel-module-sctp', '', d)}" 65RRECOMMENDS:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'sctp', 'kernel-module-sctp', '', d)}"
71 66
72INITSCRIPT_NAME="netperf" 67INITSCRIPT_NAME = "netperf"
73INITSCRIPT_PARAMS="defaults" 68INITSCRIPT_PARAMS = "defaults"
74SYSTEMD_SERVICE:${PN} = "netserver.service" 69SYSTEMD_SERVICE:${PN} = "netserver.service"
diff --git a/meta-networking/recipes-support/netsniff-ng/netsniff-ng_0.6.8.bb b/meta-networking/recipes-support/netsniff-ng/netsniff-ng_0.6.8.bb
index 341eab015c..58ace6263d 100644
--- a/meta-networking/recipes-support/netsniff-ng/netsniff-ng_0.6.8.bb
+++ b/meta-networking/recipes-support/netsniff-ng/netsniff-ng_0.6.8.bb
@@ -10,7 +10,6 @@ SRC_URI = " \
10 file://0001-Cmds-automatically-create-folder.patch \ 10 file://0001-Cmds-automatically-create-folder.patch \
11 " 11 "
12 12
13S = "${WORKDIR}/git"
14 13
15inherit pkgconfig 14inherit pkgconfig
16 15
diff --git a/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb b/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb
index 9b2c186873..54fd68ed43 100644
--- a/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb
+++ b/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb
@@ -18,7 +18,6 @@ SRC_URI = "git://github.com/thkukuk/yp-tools;branch=master;protocol=https \
18 file://domainname.service \ 18 file://domainname.service \
19 " 19 "
20 20
21S = "${WORKDIR}/git"
22 21
23DEPENDS = "libtirpc libnsl2 virtual/crypt" 22DEPENDS = "libtirpc libnsl2 virtual/crypt"
24 23
diff --git a/meta-networking/recipes-support/ntimed/ntimed_git.bb b/meta-networking/recipes-support/ntimed/ntimed_git.bb
index 955c03f42d..36fba5f57b 100644
--- a/meta-networking/recipes-support/ntimed/ntimed_git.bb
+++ b/meta-networking/recipes-support/ntimed/ntimed_git.bb
@@ -14,7 +14,6 @@ SRC_URI = "git://github.com/bsdphk/Ntimed;branch=master;protocol=https \
14PV = "0.0+git" 14PV = "0.0+git"
15SRCREV = "db0abbb4c80f2ecef6bc5d9639bca5bea28532a2" 15SRCREV = "db0abbb4c80f2ecef6bc5d9639bca5bea28532a2"
16 16
17S = "${WORKDIR}/git"
18 17
19# use adjtimex on musl 18# use adjtimex on musl
20CFLAGS:append:libc-musl = " -Dntp_adjtime=adjtimex" 19CFLAGS:append:libc-musl = " -Dntp_adjtime=adjtimex"
diff --git a/meta-networking/recipes-support/ntopng/ndpi_4.2.bb b/meta-networking/recipes-support/ntopng/ndpi_4.2.bb
index 13c3398c2b..f0175167a4 100644
--- a/meta-networking/recipes-support/ntopng/ndpi_4.2.bb
+++ b/meta-networking/recipes-support/ntopng/ndpi_4.2.bb
@@ -5,7 +5,7 @@ inspection. Based on OpenDPI it includes ntop extensions"
5SECTION = "libdevel" 5SECTION = "libdevel"
6DEPENDS = "libpcap json-c" 6DEPENDS = "libpcap json-c"
7RDEPENDS:${PN} += " libpcap" 7RDEPENDS:${PN} += " libpcap"
8LICENSE = "GPL-3.0-only" 8LICENSE = "LGPL-3.0-only"
9LIC_FILES_CHKSUM = "file://COPYING;md5=b52f2d57d10c4f7ee67a7eb9615d5d24" 9LIC_FILES_CHKSUM = "file://COPYING;md5=b52f2d57d10c4f7ee67a7eb9615d5d24"
10 10
11SRCREV = "8b5c6af71b562549f8416b31803daae223e09f46" 11SRCREV = "8b5c6af71b562549f8416b31803daae223e09f46"
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/ntop/nDPI.git;branch=4.2-stable;protocol=https \
13 file://0001-autogen.sh-not-generate-configure.patch \ 13 file://0001-autogen.sh-not-generate-configure.patch \
14 " 14 "
15 15
16S = "${WORKDIR}/git"
17 16
18inherit autotools-brokensep pkgconfig 17inherit autotools-brokensep pkgconfig
19 18
diff --git a/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb b/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb
index 9bb93910f8..014706893a 100644
--- a/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb
+++ b/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb
@@ -23,7 +23,6 @@ SRC_URI = "git://github.com/ntop/ntopng.git;protocol=https;branch=5.2-stable \
23 file://ntopng.service \ 23 file://ntopng.service \
24 " 24 "
25 25
26S = "${WORKDIR}/git"
27 26
28# don't use the lua under thirdparty as it supports cross compiling badly 27# don't use the lua under thirdparty as it supports cross compiling badly
29export LUA_LIB = "${STAGING_LIBDIR}/liblua.a" 28export LUA_LIB = "${STAGING_LIBDIR}/liblua.a"
diff --git a/meta-networking/recipes-support/ntp/ntp/ntpd b/meta-networking/recipes-support/ntp/ntp/ntpd
index d1b9c49076..a0c43ed5e5 100755
--- a/meta-networking/recipes-support/ntp/ntp/ntpd
+++ b/meta-networking/recipes-support/ntp/ntp/ntpd
@@ -72,7 +72,7 @@ case "$1" in
72 startdaemon 72 startdaemon
73 ;; 73 ;;
74 status) 74 status)
75 status /usr/sbin/ntpd; 75 status ntpd;
76 exit $? 76 exit $?
77 ;; 77 ;;
78 *) 78 *)
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 302cf9915f..33d19a696a 100644
--- a/meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb
+++ b/meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb
@@ -26,6 +26,8 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g
26 26
27SRC_URI[sha256sum] = "cf84c5f3fb1a295284942624d823fffa634144e096cfc4f9969ac98ef5f468e5" 27SRC_URI[sha256sum] = "cf84c5f3fb1a295284942624d823fffa634144e096cfc4f9969ac98ef5f468e5"
28 28
29UPSTREAM_CHECK_REGEX = "ntp-(?P<pver>(\d+(\.\d+)+)(p\d+)?)\.tar"
30
29CVE_STATUS[CVE-2016-9312] = "not-applicable-platform: Issue only applies on Windows" 31CVE_STATUS[CVE-2016-9312] = "not-applicable-platform: Issue only applies on Windows"
30CVE_STATUS[CVE-2019-11331] = "upstream-wontfix: inherent to RFC 5905 and cannot be fixed without breaking compatibility" 32CVE_STATUS[CVE-2019-11331] = "upstream-wontfix: inherent to RFC 5905 and cannot be fixed without breaking compatibility"
31CVE_STATUS_GROUPS += "CVE_STATUS_NTP" 33CVE_STATUS_GROUPS += "CVE_STATUS_NTP"
@@ -55,6 +57,11 @@ CVE_STATUS_NTP = " \
55 57
56inherit autotools update-rc.d useradd systemd pkgconfig 58inherit autotools update-rc.d useradd systemd pkgconfig
57 59
60# For some reason this recipe reconfigures the nested configure.ac files in
61# do_compile because libtool.m4 is newer than aclocal.m4, and that then
62# doesn't know about the site configuration.
63do_compile[prefuncs] += "autotools_sitefiles"
64
58# The ac_cv_header_readline_history is to stop ntpdc depending on either 65# The ac_cv_header_readline_history is to stop ntpdc depending on either
59# readline or curses 66# readline or curses
60EXTRA_OECONF += "--with-net-snmp-config=no \ 67EXTRA_OECONF += "--with-net-snmp-config=no \
diff --git a/meta-networking/recipes-support/nuttcp/nuttcp_8.2.2.bb b/meta-networking/recipes-support/nuttcp/nuttcp_8.2.2.bb
index b02f775a55..17fc818e8a 100644
--- a/meta-networking/recipes-support/nuttcp/nuttcp_8.2.2.bb
+++ b/meta-networking/recipes-support/nuttcp/nuttcp_8.2.2.bb
@@ -18,8 +18,7 @@ SRC_URI = "http://nuttcp.net/${BPN}/beta/${BP}.c \
18SRC_URI[md5sum] = "d3c92c4d2f261221193c3726c1b9a42f" 18SRC_URI[md5sum] = "d3c92c4d2f261221193c3726c1b9a42f"
19SRC_URI[sha256sum] = "8c5595bcd27c2fd66831be74c390df078cfb1870aa427f2511ac2586d236c8a1" 19SRC_URI[sha256sum] = "8c5595bcd27c2fd66831be74c390df078cfb1870aa427f2511ac2586d236c8a1"
20 20
21S = "${WORKDIR}/sources" 21S = "${UNPACKDIR}"
22UNPACKDIR = "${S}"
23 22
24do_compile () { 23do_compile () {
25 ${CC} ${CFLAGS} ${LDFLAGS} -o nuttcp nuttcp-${PV}.c 24 ${CC} ${CFLAGS} ${LDFLAGS} -o nuttcp nuttcp-${PV}.c
diff --git a/meta-networking/recipes-support/open-isns/open-isns_0.102.bb b/meta-networking/recipes-support/open-isns/open-isns_0.102.bb
index 24c520901d..5c38f6b5dc 100644
--- a/meta-networking/recipes-support/open-isns/open-isns_0.102.bb
+++ b/meta-networking/recipes-support/open-isns/open-isns_0.102.bb
@@ -19,7 +19,6 @@ SRC_URI = "git://github.com/open-iscsi/open-isns;branch=master;protocol=https \
19 19
20SRCREV = "c0e6d9fedc5a7041260de477fe1a8455fa074113" 20SRCREV = "c0e6d9fedc5a7041260de477fe1a8455fa074113"
21 21
22S = "${WORKDIR}/git"
23 22
24inherit systemd autotools-brokensep update-rc.d 23inherit systemd autotools-brokensep update-rc.d
25 24
diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-build-when-compiling-with-std-c23.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-build-when-compiling-with-std-c23.patch
new file mode 100644
index 0000000000..aad1b10b52
--- /dev/null
+++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-build-when-compiling-with-std-c23.patch
@@ -0,0 +1,26 @@
1From 2a79621f58bf1c4bc0166ccc044fcf343fb66b44 Mon Sep 17 00:00:00 2001
2From: Rudi Heitbaum <rudi@heitbaum.com>
3Date: Wed, 20 Nov 2024 10:40:03 +1100
4Subject: [PATCH] Fix build when compiling with -std=c23
5
6Fixes the build when using gcc 15
7
8Upstream-Status: Submitted [https://github.com/vmware/open-vm-tools/pull/751]
9Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
10---
11 open-vm-tools/lib/lock/ul.c | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/open-vm-tools/lib/lock/ul.c b/open-vm-tools/lib/lock/ul.c
15index d376a98af..fc9fdb714 100644
16--- a/open-vm-tools/lib/lock/ul.c
17+++ b/open-vm-tools/lib/lock/ul.c
18@@ -29,7 +29,7 @@
19 static Bool mxInPanic = FALSE; // track when involved in a panic
20 static Bool mxUserCollectLockingTree = FALSE;
21
22-Bool (*MXUserTryAcquireForceFail)() = NULL;
23+Bool (*MXUserTryAcquireForceFail)(const char *) = NULL;
24
25 static MX_Rank (*MXUserMxCheckRank)(void) = NULL;
26 static void (*MXUserMxLockLister)(void) = NULL;
diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.3.5.bb b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.5.0.bb
index 7e3fe5601f..fa26a759dc 100644
--- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.3.5.bb
+++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.5.0.bb
@@ -25,7 +25,7 @@ LICENSE:modules/freebsd/vmxnet = "GPL-2.0-only"
25LICENSE:modules/linux = "GPL-2.0-only" 25LICENSE:modules/linux = "GPL-2.0-only"
26LICENSE:modules/solaris = "CDDL-1.0" 26LICENSE:modules/solaris = "CDDL-1.0"
27 27
28SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stable-12.3.x \ 28SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stable-12.5.x \
29 file://tools.conf \ 29 file://tools.conf \
30 file://vmtoolsd.service \ 30 file://vmtoolsd.service \
31 file://vmtoolsd.init \ 31 file://vmtoolsd.init \
@@ -43,6 +43,7 @@ SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stabl
43 file://0012-hgfsServerLinux-Consider-64bit-time_t-possibility.patch;patchdir=.. \ 43 file://0012-hgfsServerLinux-Consider-64bit-time_t-possibility.patch;patchdir=.. \
44 file://0013-open-vm-tools-Correct-include-path-for-poll.h.patch;patchdir=.. \ 44 file://0013-open-vm-tools-Correct-include-path-for-poll.h.patch;patchdir=.. \
45 file://0014-timeSync-Portable-way-to-print-64bit-time_t.patch;patchdir=.. \ 45 file://0014-timeSync-Portable-way-to-print-64bit-time_t.patch;patchdir=.. \
46 file://0001-Fix-build-when-compiling-with-std-c23.patch;patchdir=.. \
46 " 47 "
47 48
48UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P<pver>\d+(\.\d+)+)" 49UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P<pver>\d+(\.\d+)+)"
@@ -50,9 +51,9 @@ UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P<pver>\d+(\.\d+)+)"
50SRC_URI:append:libc-musl = " file://0001-Add-resolv_compat.h-for-musl-builds.patch;patchdir=.. \ 51SRC_URI:append:libc-musl = " file://0001-Add-resolv_compat.h-for-musl-builds.patch;patchdir=.. \
51" 52"
52 53
53SRCREV = "1b362b9eb449fb5de3809aaea4a636ece30ee5b7" 54SRCREV = "f2ca37ef3510543172657b82493d1eceefa9a134"
54 55
55S = "${WORKDIR}/git/open-vm-tools" 56S = "${UNPACKDIR}/${BP}/open-vm-tools"
56 57
57DEPENDS = "glib-2.0 glib-2.0-native util-linux libdnet procps libtirpc" 58DEPENDS = "glib-2.0 glib-2.0-native util-linux libdnet procps libtirpc"
58 59
@@ -64,7 +65,7 @@ inherit autotools pkgconfig systemd update-rc.d
64SYSTEMD_SERVICE:${PN} = "vmtoolsd.service" 65SYSTEMD_SERVICE:${PN} = "vmtoolsd.service"
65 66
66EXTRA_OECONF = "--without-icu --disable-multimon --disable-docs \ 67EXTRA_OECONF = "--without-icu --disable-multimon --disable-docs \
67 --disable-tests --without-gtkmm --without-xerces --without-pam \ 68 --disable-tests --without-gtkmm --without-pam \
68 --disable-vgauth --disable-deploypkg --disable-containerinfo \ 69 --disable-vgauth --disable-deploypkg --disable-containerinfo \
69 --without-root-privileges --without-kernel-modules --with-tirpc \ 70 --without-root-privileges --without-kernel-modules --with-tirpc \
70 --with-udev-rules-dir=${nonarch_base_libdir}/udev/rules.d" 71 --with-udev-rules-dir=${nonarch_base_libdir}/udev/rules.d"
diff --git a/meta-networking/recipes-support/openipmi/openipmi_2.0.35.bb b/meta-networking/recipes-support/openipmi/openipmi_2.0.36.bb
index c7c7573677..86b24c1795 100644
--- a/meta-networking/recipes-support/openipmi/openipmi_2.0.35.bb
+++ b/meta-networking/recipes-support/openipmi/openipmi_2.0.36.bb
@@ -32,9 +32,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \
32 file://ipmi.service \ 32 file://ipmi.service \
33 " 33 "
34 34
35S = "${WORKDIR}/OpenIPMI-${PV}" 35S = "${UNPACKDIR}/OpenIPMI-${PV}"
36 36
37SRC_URI[sha256sum] = "b059114f6299d73f04ff6e76a0857a0ab81aa362dee99644d256b223872437ad" 37SRC_URI[sha256sum] = "a0403148fa5f7bed930c958a4d1c558047e273763a408b3a0368edc137cc55d9"
38 38
39inherit autotools-brokensep pkgconfig perlnative update-rc.d systemd cpan-base python3targetconfig 39inherit autotools-brokensep pkgconfig perlnative update-rc.d systemd cpan-base python3targetconfig
40 40
diff --git a/meta-networking/recipes-support/openvpn/openvpn/0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch b/meta-networking/recipes-support/openvpn/openvpn/0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch
index 03b454d625..e1253db1ec 100644
--- a/meta-networking/recipes-support/openvpn/openvpn/0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch
+++ b/meta-networking/recipes-support/openvpn/openvpn/0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch
@@ -1,4 +1,4 @@
1From ea179d83b0aa62719d90748cd1fb260f40055f15 Mon Sep 17 00:00:00 2001 1From 9cc13bdcb71cd16d2873637c491e07c01de9a3ea Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com> 2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Mon, 13 Jun 2022 22:44:28 +0800 3Date: Mon, 13 Jun 2022 22:44:28 +0800
4Subject: [PATCH] configure.ac: eliminate build path from openvpn --version 4Subject: [PATCH] configure.ac: eliminate build path from openvpn --version
@@ -31,10 +31,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
31 1 file changed, 1 insertion(+), 1 deletion(-) 31 1 file changed, 1 insertion(+), 1 deletion(-)
32 32
33diff --git a/configure.ac b/configure.ac 33diff --git a/configure.ac b/configure.ac
34index 2f5f6bc..eddcbc5 100644 34index df16c43..623ca65 100644
35--- a/configure.ac 35--- a/configure.ac
36+++ b/configure.ac 36+++ b/configure.ac
37@@ -1377,7 +1377,7 @@ if test "${enable_async_push}" = "yes"; then 37@@ -1463,7 +1463,7 @@ if test "${enable_async_push}" = "yes"; then
38 esac 38 esac
39 fi 39 fi
40 40
@@ -43,6 +43,3 @@ index 2f5f6bc..eddcbc5 100644
43 AC_DEFINE_UNQUOTED([CONFIGURE_DEFINES], ["`echo ${CONFIGURE_DEFINES}`"], [Configuration settings]) 43 AC_DEFINE_UNQUOTED([CONFIGURE_DEFINES], ["`echo ${CONFIGURE_DEFINES}`"], [Configuration settings])
44 44
45 TAP_WIN_COMPONENT_ID="PRODUCT_TAP_WIN_COMPONENT_ID" 45 TAP_WIN_COMPONENT_ID="PRODUCT_TAP_WIN_COMPONENT_ID"
46--
472.25.1
48
diff --git a/meta-networking/recipes-support/openvpn/openvpn/run-ptest b/meta-networking/recipes-support/openvpn/openvpn/run-ptest
new file mode 100644
index 0000000000..5b187d9086
--- /dev/null
+++ b/meta-networking/recipes-support/openvpn/openvpn/run-ptest
@@ -0,0 +1,5 @@
1#!/bin/sh
2for x in `find ./ -name Makefile`;
3do
4 make -C `dirname ${x}` -k runtest-TESTS
5done
diff --git a/meta-networking/recipes-support/openvpn/openvpn_2.6.10.bb b/meta-networking/recipes-support/openvpn/openvpn_2.6.14.bb
index ba53d40f47..67ea09fad5 100644
--- a/meta-networking/recipes-support/openvpn/openvpn_2.6.10.bb
+++ b/meta-networking/recipes-support/openvpn/openvpn_2.6.14.bb
@@ -3,18 +3,19 @@ HOMEPAGE = "https://openvpn.net/"
3SECTION = "net" 3SECTION = "net"
4LICENSE = "GPL-2.0-only" 4LICENSE = "GPL-2.0-only"
5LIC_FILES_CHKSUM = "file://COPYING;md5=89196bacc47ed37a5b242a535661a049" 5LIC_FILES_CHKSUM = "file://COPYING;md5=89196bacc47ed37a5b242a535661a049"
6DEPENDS = "lzo lz4 openssl iproute2 libcap-ng ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 6DEPENDS = "lzo lz4 openssl iproute2 libcap-ng ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} ${@bb.utils.contains('PTEST_ENABLED', '1', 'cmocka', '', d)} "
7 7
8inherit autotools systemd update-rc.d pkgconfig 8inherit autotools systemd update-rc.d pkgconfig ptest
9 9
10SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \ 10SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \
11 file://0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch \ 11 file://0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch \
12 file://openvpn \ 12 file://openvpn \
13 file://run-ptest \
13 " 14 "
14 15
15UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads" 16UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads"
16 17
17SRC_URI[sha256sum] = "1993bbb7b9edb430626eaa24573f881fd3df642f427fcb824b1aed1fca1bcc9b" 18SRC_URI[sha256sum] = "9eb6a6618352f9e7b771a9d38ae1631b5edfeed6d40233e243e602ddf2195e7a"
18 19
19CVE_STATUS[CVE-2020-27569] = "not-applicable-config: Applies only Aviatrix OpenVPN client, not openvpn" 20CVE_STATUS[CVE-2020-27569] = "not-applicable-config: Applies only Aviatrix OpenVPN client, not openvpn"
20 21
@@ -42,6 +43,8 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
42PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" 43PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
43PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" 44PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
44 45
46RDEPENDS:${PN}-ptest:append = " make bash"
47
45do_install:append() { 48do_install:append() {
46 install -d ${D}/${sysconfdir}/init.d 49 install -d ${D}/${sysconfdir}/init.d
47 install -m 755 ${UNPACKDIR}/openvpn ${D}/${sysconfdir}/init.d 50 install -m 755 ${UNPACKDIR}/openvpn ${D}/${sysconfdir}/init.d
@@ -63,6 +66,47 @@ do_install:append() {
63 install -d -m 710 ${D}/${localstatedir}/lib/openvpn 66 install -d -m 710 ${D}/${localstatedir}/lib/openvpn
64} 67}
65 68
69do_compile_ptest () {
70 for x in `find ${B}/tests/unit_tests -name Makefile -exec grep -l buildtest-TESTS {} \;`; do
71 dir=`dirname ${x}`
72 case $dir in
73 *example*)
74 echo "Skipping directory: $dir"
75 ;;
76 *)
77 oe_runmake -C ${dir} buildtest-TESTS
78 ;;
79 esac
80 done
81}
82
83do_install_ptest() {
84 for x in $(find ${B}/tests/unit_tests -name Makefile -exec grep -l buildtest-TESTS {} \;); do
85 dir=$(dirname ${x})
86
87 if [[ "$dir" == *example* ]]; then
88 continue
89 fi
90
91 target_dir="${D}/${PTEST_PATH}/unit_tests/$(basename ${dir})"
92 mkdir -p ${target_dir}
93 cp -f ${dir}/Makefile ${target_dir}/
94 sed -i "s/^Makefile:/MM:/g" ${target_dir}/Makefile
95 sed -i 's/^#TESTS = $(am__EXEEXT_4)/TESTS = $(am__EXEEXT_4)/' ${target_dir}/Makefile
96
97 for testfile in $(find ${dir} -name "*testdriver"); do
98 cp -rf ${testfile} ${target_dir}/
99 done
100 done
101 sed -i 's|find ./|find ${PTEST_PATH}|g' ${D}${PTEST_PATH}/run-ptest
102 sed -i 's|${top_builddir}/src/openvpn|${sbindir}|g' ${S}/tests/t_lpback.sh
103 cp -f ${S}/tests/t_lpback.sh ${D}/${PTEST_PATH}
104 cp -f ${B}/tests/Makefile ${D}/${PTEST_PATH}
105 sed -i "s/^Makefile:/MM:/g" ${D}/${PTEST_PATH}/Makefile
106 sed -i "s/^test_scripts = t_client.sh t_lpback.sh t_cltsrv.sh/test_scripts = t_lpback.sh/g" ${D}/${PTEST_PATH}/Makefile
107
108}
109
66PACKAGES =+ " ${PN}-sample " 110PACKAGES =+ " ${PN}-sample "
67 111
68RRECOMMENDS:${PN} = "kernel-module-tun" 112RRECOMMENDS:${PN} = "kernel-module-tun"
diff --git a/meta-networking/recipes-support/pgpool2/pgpool2_4.5.1.bb b/meta-networking/recipes-support/pgpool2/pgpool2_4.5.3.bb
index ddcad46beb..bdd715aacf 100644
--- a/meta-networking/recipes-support/pgpool2/pgpool2_4.5.1.bb
+++ b/meta-networking/recipes-support/pgpool2/pgpool2_4.5.3.bb
@@ -10,15 +10,15 @@ HOMEPAGE = "http://pgpool.net"
10LICENSE = "BSD-2-Clause" 10LICENSE = "BSD-2-Clause"
11LIC_FILES_CHKSUM = "file://COPYING;md5=e4b38de086d73e0521de0bbdbaa4a1a9" 11LIC_FILES_CHKSUM = "file://COPYING;md5=e4b38de086d73e0521de0bbdbaa4a1a9"
12 12
13SRC_URI = "http://www.pgpool.net/mediawiki/images/pgpool-II-${PV}.tar.gz \ 13SRC_URI = "https://www.pgpool.net/mediawiki/images/pgpool-II-${PV}.tar.gz \
14 file://0001-Fix-build-error-when-build-this-file.patch \ 14 file://0001-Fix-build-error-when-build-this-file.patch \
15 file://define_SIGNAL_ARGS.patch \ 15 file://define_SIGNAL_ARGS.patch \
16 file://pgpool.sysconfig \ 16 file://pgpool.sysconfig \
17 file://pgpool.service \ 17 file://pgpool.service \
18 " 18 "
19SRC_URI[sha256sum] = "8e14b0558a15dae8767c8e1acee3f2f6c7c08ebfffda66a359367eaaa56c3936" 19SRC_URI[sha256sum] = "25ed340d7b7dc00c20e4ba763d3f9c07ba891b150d9d48af313a1351cafdd778"
20 20
21S = "${WORKDIR}/pgpool-II-${PV}" 21S = "${UNPACKDIR}/pgpool-II-${PV}"
22 22
23inherit autotools-brokensep systemd 23inherit autotools-brokensep systemd
24 24
@@ -48,3 +48,7 @@ do_install:append() {
48 install -D -m 0644 ${S}/src/sample/pool_hba.conf.sample ${D}${sysconfdir}/pgpool-II/pool_hba.conf 48 install -D -m 0644 ${S}/src/sample/pool_hba.conf.sample ${D}${sysconfdir}/pgpool-II/pool_hba.conf
49 install -Dm 0644 ${UNPACKDIR}/pgpool.service ${D}${systemd_system_unitdir}/pgpool.service 49 install -Dm 0644 ${UNPACKDIR}/pgpool.service ${D}${systemd_system_unitdir}/pgpool.service
50} 50}
51
52# Avoid build failure with gcc-15:
53# http://errors.yoctoproject.org/Errors/Details/853019/
54CFLAGS += "-std=gnu17"
diff --git a/meta-networking/recipes-support/phytool/phytool.bb b/meta-networking/recipes-support/phytool/phytool.bb
index b918e50c68..6471f46c28 100644
--- a/meta-networking/recipes-support/phytool/phytool.bb
+++ b/meta-networking/recipes-support/phytool/phytool.bb
@@ -6,7 +6,6 @@ PV = "2+git"
6SRCREV = "8882328c08ba2efb13c049812098f1d0cb8adf0c" 6SRCREV = "8882328c08ba2efb13c049812098f1d0cb8adf0c"
7SRC_URI = "git://github.com/wkz/phytool.git;branch=master;protocol=https" 7SRC_URI = "git://github.com/wkz/phytool.git;branch=master;protocol=https"
8 8
9S = "${WORKDIR}/git"
10 9
11# The Makefile has "$PREFIX/bin" hardcoded into it, hence not using $bindir here 10# The Makefile has "$PREFIX/bin" hardcoded into it, hence not using $bindir here
12do_install() { 11do_install() {
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
index 9cd240189e..092f4431bf 100644
--- 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
@@ -20,18 +20,16 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
20 librdmacm/preload.c | 7 +++++-- 20 librdmacm/preload.c | 7 +++++--
21 1 file changed, 5 insertions(+), 2 deletions(-) 21 1 file changed, 5 insertions(+), 2 deletions(-)
22 22
23diff --git a/librdmacm/preload.c b/librdmacm/preload.c
24index d46beb1bb..e09b2aa85 100644
25--- a/librdmacm/preload.c 23--- a/librdmacm/preload.c
26+++ b/librdmacm/preload.c 24+++ b/librdmacm/preload.c
27@@ -792,8 +792,11 @@ ssize_t recv(int socket, void *buf, size_t len, int flags) 25@@ -792,8 +792,11 @@ ssize_t recv(int socket, void *buf, size
28 return (fd_fork_get(socket, &fd) == fd_rsocket) ? 26 return (fd_fork_get(socket, &fd) == fd_rsocket) ?
29 rrecv(fd, buf, len, flags) : real.recv(fd, buf, len, flags); 27 rrecv(fd, buf, len, flags) : real.recv(fd, buf, len, flags);
30 } 28 }
31- 29-
32-ssize_t recvfrom(int socket, void *buf, size_t len, int flags, 30-ssize_t recvfrom(int socket, void *buf, size_t len, int flags,
33+ssize_t 31+ssize_t
34+#ifdef __clang__ 32+#if defined(__clang__) && defined(__GLIBC__)
35+__attribute__((overloadable)) 33+__attribute__((overloadable))
36+#endif 34+#endif
37+recvfrom(int socket, void *buf, size_t len, int flags, 35+recvfrom(int socket, void *buf, size_t len, int flags,
diff --git a/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb b/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb
index 0c204c109f..2555c43a85 100644
--- a/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb
+++ b/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=http
11 file://0001-librdmacm-Use-overloadable-function-attribute-with-c.patch \ 11 file://0001-librdmacm-Use-overloadable-function-attribute-with-c.patch \
12" 12"
13SRCREV = "6cd09097ad2eebde9a7fa3d3bb09a2cea6e3c2d6" 13SRCREV = "6cd09097ad2eebde9a7fa3d3bb09a2cea6e3c2d6"
14S = "${WORKDIR}/git"
15 14
16#Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md 15#Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md
17LICENSE = "BSD-2-Clause | GPL-2.0-only" 16LICENSE = "BSD-2-Clause | GPL-2.0-only"
diff --git a/meta-networking/recipes-support/smcroute/smcroute_2.5.7.bb b/meta-networking/recipes-support/smcroute/smcroute_2.5.7.bb
index 950f6a2e21..bb12d7a907 100644
--- a/meta-networking/recipes-support/smcroute/smcroute_2.5.7.bb
+++ b/meta-networking/recipes-support/smcroute/smcroute_2.5.7.bb
@@ -8,6 +8,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
8SRCREV = "b315d06ddb0dad16a52fe91e5831b4030ce37010" 8SRCREV = "b315d06ddb0dad16a52fe91e5831b4030ce37010"
9SRC_URI = "git://github.com/troglobit/smcroute.git;branch=master;protocol=https" 9SRC_URI = "git://github.com/troglobit/smcroute.git;branch=master;protocol=https"
10 10
11S = "${WORKDIR}/git"
12 11
13inherit autotools pkgconfig 12inherit autotools pkgconfig
diff --git a/meta-networking/recipes-support/sngrep/sngrep_1.8.1.bb b/meta-networking/recipes-support/sngrep/sngrep_1.8.2.bb
index 50248078a2..12fe3ececa 100644
--- a/meta-networking/recipes-support/sngrep/sngrep_1.8.1.bb
+++ b/meta-networking/recipes-support/sngrep/sngrep_1.8.2.bb
@@ -16,9 +16,8 @@ DEPENDS = "\
16" 16"
17 17
18SRC_URI = "git://github.com/irontec/sngrep.git;protocol=https;branch=master" 18SRC_URI = "git://github.com/irontec/sngrep.git;protocol=https;branch=master"
19SRCREV = "373abb90804ba71f980c7120e62f90d3a5c81213" 19SRCREV = "dad1033640f249fa4994f976cf6ee96826c15702"
20 20
21S = "${WORKDIR}/git"
22 21
23inherit cmake pkgconfig 22inherit cmake pkgconfig
24 23
diff --git a/meta-networking/recipes-support/spice/libcacard_2.8.1.bb b/meta-networking/recipes-support/spice/libcacard_2.8.1.bb
index 65f2f80ace..1a2d9dc9c4 100644
--- a/meta-networking/recipes-support/spice/libcacard_2.8.1.bb
+++ b/meta-networking/recipes-support/spice/libcacard_2.8.1.bb
@@ -8,7 +8,6 @@ SRCREV = "7b07684ea6698d4885ff2062350ad8798a04de42"
8 8
9SRC_URI = "git://gitlab.freedesktop.org/spice/libcacard.git;protocol=https;branch=master" 9SRC_URI = "git://gitlab.freedesktop.org/spice/libcacard.git;protocol=https;branch=master"
10 10
11S = "${WORKDIR}/git"
12 11
13inherit meson pkgconfig 12inherit meson pkgconfig
14 13
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 c8a3f7f532..3588d674f7 100644
--- a/meta-networking/recipes-support/spice/spice-gtk_0.42.bb
+++ b/meta-networking/recipes-support/spice/spice-gtk_0.42.bb
@@ -12,7 +12,8 @@ SRCREV = "f04479c16f0969fb394ebe74b6eff74e560a42f0"
12 12
13SRC_URI = "gitsm://gitlab.freedesktop.org/spice/spice-gtk.git;protocol=https;branch=master" 13SRC_URI = "gitsm://gitlab.freedesktop.org/spice/spice-gtk.git;protocol=https;branch=master"
14 14
15S = "${WORKDIR}/git" 15CVE_STATUS[CVE-2012-4425] = "fixed-version: fixed since 0.15.3"
16
16 17
17DEPENDS = " \ 18DEPENDS = " \
18 ${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)} \ 19 ${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)} \
diff --git a/meta-networking/recipes-support/spice/spice-guest-vdagent_0.22.1.bb b/meta-networking/recipes-support/spice/spice-guest-vdagent_0.22.1.bb
index 3af973eed1..b13dd5d148 100644
--- a/meta-networking/recipes-support/spice/spice-guest-vdagent_0.22.1.bb
+++ b/meta-networking/recipes-support/spice/spice-guest-vdagent_0.22.1.bb
@@ -7,7 +7,6 @@ SRCREV = "aa08162f036840d3e33502dc0a836b03b9cec97c"
7 7
8SRC_URI = "git://gitlab.freedesktop.org/spice/linux/vd_agent.git;protocol=https;branch=master" 8SRC_URI = "git://gitlab.freedesktop.org/spice/linux/vd_agent.git;protocol=https;branch=master"
9 9
10S = "${WORKDIR}/git"
11 10
12ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" 11ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
13REQUIRED_DISTRO_FEATURES = "opengl x11" 12REQUIRED_DISTRO_FEATURES = "opengl x11"
diff --git a/meta-networking/recipes-support/spice/spice-protocol_0.14.4.bb b/meta-networking/recipes-support/spice/spice-protocol_0.14.4.bb
index 3c8458baac..7f08eebee7 100644
--- a/meta-networking/recipes-support/spice/spice-protocol_0.14.4.bb
+++ b/meta-networking/recipes-support/spice/spice-protocol_0.14.4.bb
@@ -12,7 +12,6 @@ SRCREV = "6f453a775d87087c6ba59fc180c1a1e466631a47"
12 12
13SRC_URI = "git://gitlab.freedesktop.org/spice/spice-protocol.git;protocol=https;branch=master" 13SRC_URI = "git://gitlab.freedesktop.org/spice/spice-protocol.git;protocol=https;branch=master"
14 14
15S = "${WORKDIR}/git"
16 15
17inherit meson pkgconfig 16inherit meson pkgconfig
18 17
diff --git a/meta-networking/recipes-support/spice/spice_git.bb b/meta-networking/recipes-support/spice/spice_git.bb
index 419316a26e..c9418a1765 100644
--- a/meta-networking/recipes-support/spice/spice_git.bb
+++ b/meta-networking/recipes-support/spice/spice_git.bb
@@ -19,8 +19,9 @@ SRCREV = "0c2c1413a8b387ea597a95b6c867470a7c56c8ab"
19 19
20SRC_URI = "gitsm://gitlab.freedesktop.org/spice/spice;branch=master;protocol=https" 20SRC_URI = "gitsm://gitlab.freedesktop.org/spice/spice;branch=master;protocol=https"
21 21
22S = "${WORKDIR}/git"
23 22
23CVE_STATUS[CVE-2016-0749] = "fixed-version: patched since 0.13.2"
24CVE_STATUS[CVE-2016-2150] = "fixed-version: patched since 0.13.2"
24CVE_STATUS[CVE-2018-10893] = "fixed-version: patched already, caused by inaccurate CPE in the NVD database." 25CVE_STATUS[CVE-2018-10893] = "fixed-version: patched already, caused by inaccurate CPE in the NVD database."
25 26
26inherit meson gettext python3native python3-dir pkgconfig 27inherit meson gettext python3native python3-dir pkgconfig
@@ -28,7 +29,7 @@ inherit meson gettext python3native python3-dir pkgconfig
28DEPENDS = "spice-protocol jpeg pixman alsa-lib glib-2.0 gdk-pixbuf lz4 orc python3-pyparsing-native python3-six-native glib-2.0-native zlib" 29DEPENDS = "spice-protocol jpeg pixman alsa-lib glib-2.0 gdk-pixbuf lz4 orc python3-pyparsing-native python3-six-native glib-2.0-native zlib"
29DEPENDS:append:class-nativesdk = " nativesdk-openssl" 30DEPENDS:append:class-nativesdk = " nativesdk-openssl"
30 31
31export PYTHON="${STAGING_BINDIR_NATIVE}/python3-native/python3" 32export PYTHON = "${STAGING_BINDIR_NATIVE}/python3-native/python3"
32 33
33do_configure:prepend() { 34do_configure:prepend() {
34 echo ${PV} > ${S}/.tarball-version 35 echo ${PV} > ${S}/.tarball-version
diff --git a/meta-networking/recipes-support/spice/usbredir_0.14.0.bb b/meta-networking/recipes-support/spice/usbredir_0.14.0.bb
index 82f48ccdb8..81c7fdf0c8 100644
--- a/meta-networking/recipes-support/spice/usbredir_0.14.0.bb
+++ b/meta-networking/recipes-support/spice/usbredir_0.14.0.bb
@@ -11,7 +11,6 @@ SRCREV = "2d373432e604960c1dcc14fb97098febe4d64025"
11 11
12SRC_URI = "git://gitlab.freedesktop.org/spice/usbredir;branch=main;protocol=https" 12SRC_URI = "git://gitlab.freedesktop.org/spice/usbredir;branch=main;protocol=https"
13 13
14S = "${WORKDIR}/git"
15 14
16inherit meson pkgconfig 15inherit meson pkgconfig
17 16
diff --git a/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb b/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb
index 0531ffe640..9b1413df2e 100644
--- a/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb
+++ b/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb
@@ -4,10 +4,9 @@ SECTION = "net"
4LICENSE = "ISC" 4LICENSE = "ISC"
5LIC_FILES_CHKSUM = "file://asmping.c;beginline=2;endline=11;md5=1ca8d1a1ca931e5cfe604ebf20a78b71" 5LIC_FILES_CHKSUM = "file://asmping.c;beginline=2;endline=11;md5=1ca8d1a1ca931e5cfe604ebf20a78b71"
6 6
7SRC_URI = "http://www.venaas.no/multicast/ssmping/${BP}.tar.gz \ 7SRC_URI = "${DEBIAN_MIRROR}/main/s/${BPN}/${BPN}_${PV}.orig.tar.gz;downloadfilename=${BP}.tar.gz \
8 file://0001-Makefile-tweak-install-dir.patch \ 8 file://0001-Makefile-tweak-install-dir.patch \
9" 9"
10SRC_URI[md5sum] = "ad8e3d13f6d72918f73be7e7975d7fad"
11SRC_URI[sha256sum] = "22103a37eaa28489169a0927bc01e0596c3485fc4d29fc8456c07fd2c70fca6d" 10SRC_URI[sha256sum] = "22103a37eaa28489169a0927bc01e0596c3485fc4d29fc8456c07fd2c70fca6d"
12 11
13CFLAGS += "-D_GNU_SOURCE " 12CFLAGS += "-D_GNU_SOURCE "
@@ -15,3 +14,7 @@ CFLAGS += "-D_GNU_SOURCE "
15do_install() { 14do_install() {
16 oe_runmake 'DESTDIR=${D}' 'PREFIX=${prefix}' install 15 oe_runmake 'DESTDIR=${D}' 'PREFIX=${prefix}' install
17} 16}
17
18# http://errors.yoctoproject.org/Errors/Details/766895/
19# ssmping.c:55:51: error: passing argument 3 of 'getsockname' from incompatible pointer type [-Wincompatible-pointer-types]
20CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-networking/recipes-support/ssmtp/ssmtp/0001-Fix-incompatible-pointer-types-error-with-gcc-15.patch b/meta-networking/recipes-support/ssmtp/ssmtp/0001-Fix-incompatible-pointer-types-error-with-gcc-15.patch
new file mode 100644
index 0000000000..920c1cd2c5
--- /dev/null
+++ b/meta-networking/recipes-support/ssmtp/ssmtp/0001-Fix-incompatible-pointer-types-error-with-gcc-15.patch
@@ -0,0 +1,47 @@
1From 7d3db0f63b9fa4a0deca486eccbe60c3cfa00750 Mon Sep 17 00:00:00 2001
2From: "mark.yang" <mark.yang@lge.com>
3Date: Wed, 16 Apr 2025 18:28:24 +0900
4Subject: [PATCH] Fix incompatible-pointer-types error with gcc 15
5
6../ssmtp-2.64/ssmtp.c:1454:31: error: passing argument 2 of 'signal' from incompatible pointer type [-Wincompatible-pointer-types]
7 1454 | (void)signal(SIGALRM, (void(*)())handler); /* Catch SIGALRM */
8 | ^~~~~~~~~~~~~~~~~~
9 | |
10 | void (*)(void)
11In file included from TOPDIR/tmp/work/core2-64-oe-linux/ssmtp/2.64/recipe-sysroot/usr/include/sys/param.h:28,
12 from ../ssmtp-2.64/ssmtp.c:18:
13TOPDIR/tmp/work/core2-64-oe-linux/ssmtp/2.64/recipe-sysroot/usr/include/signal.h:88:57: note: expected '__sighandler_t' {aka 'void (*)(int)'} but argument is of type 'void (*)(void)'
14 88 | extern __sighandler_t signal (int __sig, __sighandler_t __handler)
15 | ~~~~~~~~~~~~~~~^~~~~~~~~
16../ssmtp-2.64/ssmtp.c:1393:6: note: 'handler' declared here
17 1393 | void handler(void)
18 | ^~~~~~~
19
20Upstream-Status: Inactive-Upstream [This package has been orphaned https://bugs.debian.org/925056]
21Signed-off-by: mark.yang <mark.yang@lge.com>
22---
23 ssmtp.c | 4 ++--
24 1 file changed, 2 insertions(+), 2 deletions(-)
25
26diff --git a/ssmtp.c b/ssmtp.c
27index 4dedaf8..a938d14 100644
28--- a/ssmtp.c
29+++ b/ssmtp.c
30@@ -1390,7 +1390,7 @@ handler() -- A "normal" non-portable version of an alarm handler
31 like a socket. So we longjump instead, which is erronious on
32 a small number of machines and ill-defined in the language
33 */
34-void handler(void)
35+void handler(__attribute__((unused)) int sig)
36 {
37 extern jmp_buf TimeoutJmpBuf;
38
39@@ -1451,7 +1451,7 @@ int ssmtp(char *argv[])
40 from = from_format(uad, override_from);
41
42 /* Now to the delivery of the message */
43- (void)signal(SIGALRM, (void(*)())handler); /* Catch SIGALRM */
44+ (void)signal(SIGALRM, handler); /* Catch SIGALRM */
45 (void)alarm((unsigned) MAXWAIT); /* Set initial timer */
46 if(setjmp(TimeoutJmpBuf) != 0) {
47 /* Then the timer has gone off and we bail out */
diff --git a/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb b/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb
index 499a79d1ed..8dc2d76477 100644
--- a/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb
+++ b/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb
@@ -9,6 +9,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/s/${BPN}/${BPN}_${PV}.orig.tar.bz2 \
9 file://use-DESTDIR.patch \ 9 file://use-DESTDIR.patch \
10 file://0001-ssmtp-Correct-the-null-pointer-assignment-to-char-po.patch \ 10 file://0001-ssmtp-Correct-the-null-pointer-assignment-to-char-po.patch \
11 file://0001-include-libgen.h-for-basename.patch \ 11 file://0001-include-libgen.h-for-basename.patch \
12 file://0001-Fix-incompatible-pointer-types-error-with-gcc-15.patch \
12 " 13 "
13 14
14SRC_URI[md5sum] = "65b4e0df4934a6cd08c506cabcbe584f" 15SRC_URI[md5sum] = "65b4e0df4934a6cd08c506cabcbe584f"
diff --git a/meta-networking/recipes-support/strongswan/strongswan/0001-pki-Fix-signature-of-help-to-match-that-of-a-callbac.patch b/meta-networking/recipes-support/strongswan/strongswan/0001-pki-Fix-signature-of-help-to-match-that-of-a-callbac.patch
new file mode 100644
index 0000000000..92c848f095
--- /dev/null
+++ b/meta-networking/recipes-support/strongswan/strongswan/0001-pki-Fix-signature-of-help-to-match-that-of-a-callbac.patch
@@ -0,0 +1,25 @@
1From a7b5de569082398a14b7e571498e55d005903aaf Mon Sep 17 00:00:00 2001
2From: Tobias Brunner <tobias@strongswan.org>
3Date: Fri, 21 Feb 2025 17:18:35 +0100
4Subject: [PATCH] pki: Fix signature of help() to match that of a callback in
5 command_t
6
7Upstream-Status: Backport [a7b5de5 pki: Fix signature of help() to match that of a callback in command_t]
8Signed-off-by: mark.yang <mark.yang@lge.com>
9---
10 src/pki/command.c | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/src/pki/command.c b/src/pki/command.c
14index accec5fe5..6e6bf041e 100644
15--- a/src/pki/command.c
16+++ b/src/pki/command.c
17@@ -265,7 +265,7 @@ int command_usage(char *error)
18 /**
19 * Show usage information
20 */
21-static int help(int c, char *v[])
22+static int help()
23 {
24 return command_usage(NULL);
25 }
diff --git a/meta-networking/recipes-support/strongswan/strongswan/0002-callback-job-Replace-return_false-in-constructors-wi.patch b/meta-networking/recipes-support/strongswan/strongswan/0002-callback-job-Replace-return_false-in-constructors-wi.patch
new file mode 100644
index 0000000000..09451206ca
--- /dev/null
+++ b/meta-networking/recipes-support/strongswan/strongswan/0002-callback-job-Replace-return_false-in-constructors-wi.patch
@@ -0,0 +1,90 @@
1From d5d2568ff0e88d364dadf50b67bf17050763cf98 Mon Sep 17 00:00:00 2001
2From: Tobias Brunner <tobias@strongswan.org>
3Date: Fri, 21 Feb 2025 16:45:57 +0100
4Subject: [PATCH] callback-job: Replace return_false() in constructors with
5 dedicated function
6
7Besides being clearer, this fixes issues with GCC 15. The latter uses
8C23 by default, which changes the meaning of function declarations
9without parameters such as
10
11 bool return false();
12
13Instead of "this function takes an unknown number of arguments", this
14now equals (void), that is, "this function takes no arguments". So we
15run into incompatible pointer type warnings all over when using such
16functions. They could be cast to (void*) but this seems the cleaner
17solution for this use case.
18
19Upstream-Status: Backport [d5d2568 callback-job: Replace return_false() in constructors with dedicated function]
20Signed-off-by: mark.yang <mark.yang@lge.com>
21---
22 src/libstrongswan/processing/jobs/callback_job.c | 10 +++++++++-
23 src/libstrongswan/processing/jobs/callback_job.h | 11 ++++++++++-
24 src/libstrongswan/processing/scheduler.c | 3 ++-
25 3 files changed, 21 insertions(+), 3 deletions(-)
26
27diff --git a/src/libstrongswan/processing/jobs/callback_job.c b/src/libstrongswan/processing/jobs/callback_job.c
28index cb2a0aba5..3ab40b947 100644
29--- a/src/libstrongswan/processing/jobs/callback_job.c
30+++ b/src/libstrongswan/processing/jobs/callback_job.c
31@@ -1,5 +1,5 @@
32 /*
33- * Copyright (C) 2009-2012 Tobias Brunner
34+ * Copyright (C) 2009-2025 Tobias Brunner
35 * Copyright (C) 2007-2011 Martin Willi
36 *
37 * Copyright (C) secunet Security Networks AG
38@@ -131,3 +131,11 @@ callback_job_t *callback_job_create(callback_job_cb_t cb, void *data,
39 return callback_job_create_with_prio(cb, data, cleanup, cancel,
40 JOB_PRIO_MEDIUM);
41 }
42+
43+/*
44+ * Described in header
45+ */
46+bool callback_job_cancel_thread(void *data)
47+{
48+ return FALSE;
49+}
50diff --git a/src/libstrongswan/processing/jobs/callback_job.h b/src/libstrongswan/processing/jobs/callback_job.h
51index 0f1ae212d..fda868879 100644
52--- a/src/libstrongswan/processing/jobs/callback_job.h
53+++ b/src/libstrongswan/processing/jobs/callback_job.h
54@@ -1,5 +1,5 @@
55 /*
56- * Copyright (C) 2012 Tobias Brunner
57+ * Copyright (C) 2012-2025 Tobias Brunner
58 * Copyright (C) 2007-2011 Martin Willi
59 *
60 * Copyright (C) secunet Security Networks AG
61@@ -62,6 +62,15 @@ typedef void (*callback_job_cleanup_t)(void *data);
62 */
63 typedef bool (*callback_job_cancel_t)(void *data);
64
65+/**
66+ * Default implementation of callback_job_cancel_t that simply returns FALSE
67+ * to force cancellation of the thread by the processor.
68+ *
69+ * @param data ignored argument
70+ * @return always returns FALSE
71+ */
72+bool callback_job_cancel_thread(void *data);
73+
74 /**
75 * Class representing an callback Job.
76 *
77diff --git a/src/libstrongswan/processing/scheduler.c b/src/libstrongswan/processing/scheduler.c
78index c5e5dd83e..76d98ddff 100644
79--- a/src/libstrongswan/processing/scheduler.c
80+++ b/src/libstrongswan/processing/scheduler.c
81@@ -329,7 +329,8 @@ scheduler_t * scheduler_create()
82 this->heap = (event_t**)calloc(this->heap_size + 1, sizeof(event_t*));
83
84 job = callback_job_create_with_prio((callback_job_cb_t)schedule, this,
85- NULL, return_false, JOB_PRIO_CRITICAL);
86+ NULL, callback_job_cancel_thread,
87+ JOB_PRIO_CRITICAL);
88 lib->processor->queue_job(lib->processor, (job_t*)job);
89
90 return &this->public;
diff --git a/meta-networking/recipes-support/strongswan/strongswan/0003-Cast-uses-of-return_-nop-and-enumerator_create_empty.patch b/meta-networking/recipes-support/strongswan/strongswan/0003-Cast-uses-of-return_-nop-and-enumerator_create_empty.patch
new file mode 100644
index 0000000000..6c2a77105a
--- /dev/null
+++ b/meta-networking/recipes-support/strongswan/strongswan/0003-Cast-uses-of-return_-nop-and-enumerator_create_empty.patch
@@ -0,0 +1,118 @@
1From 11978ddd39e800b5f35f721d726e8a4cb7e4ec0f Mon Sep 17 00:00:00 2001
2From: Tobias Brunner <tobias@strongswan.org>
3Date: Fri, 21 Feb 2025 17:00:44 +0100
4Subject: [PATCH] Cast uses of return_*(), nop() and enumerator_create_empty()
5
6As described in the previous commit, GCC 15 uses C23 by default and that
7changes the meaning of such argument-less function declarations. So
8whenever we assign such a function to a pointer that expects a function
9with arguments it causes an incompatible pointer type warning. We
10could define dedicated functions/callbacks whenever necessary, but this
11seems like the simpler approach for now (especially since most uses of
12these functions have already been cast).
13
14Upstream-Status: Backport [11978dd Cast uses of return_*(), nop() and enumerator_create_empty()]
15Signed-off-by: mark.yang <mark.yang@lge.com>
16---
17 src/charon-nm/nm/nm_handler.c | 2 +-
18 src/libcharon/encoding/payloads/encrypted_payload.c | 2 +-
19 src/libcharon/plugins/android_dns/android_dns_handler.c | 2 +-
20 src/libcharon/plugins/ha/ha_attribute.c | 2 +-
21 src/libcharon/plugins/updown/updown_handler.c | 2 +-
22 src/libstrongswan/utils/identification.c | 6 +++---
23 6 files changed, 8 insertions(+), 8 deletions(-)
24
25diff --git a/src/charon-nm/nm/nm_handler.c b/src/charon-nm/nm/nm_handler.c
26index d7331ad72..39d0190ac 100644
27--- a/src/charon-nm/nm/nm_handler.c
28+++ b/src/charon-nm/nm/nm_handler.c
29@@ -195,7 +195,7 @@ nm_handler_t *nm_handler_create()
30 .public = {
31 .handler = {
32 .handle = _handle,
33- .release = nop,
34+ .release = (void*)nop,
35 .create_attribute_enumerator = _create_attribute_enumerator,
36 },
37 .create_enumerator = _create_enumerator,
38diff --git a/src/libcharon/encoding/payloads/encrypted_payload.c b/src/libcharon/encoding/payloads/encrypted_payload.c
39index 676d00b7a..4821c6108 100644
40--- a/src/libcharon/encoding/payloads/encrypted_payload.c
41+++ b/src/libcharon/encoding/payloads/encrypted_payload.c
42@@ -1023,7 +1023,7 @@ encrypted_fragment_payload_t *encrypted_fragment_payload_create()
43 .get_length = _frag_get_length,
44 .add_payload = _frag_add_payload,
45 .remove_payload = (void*)return_null,
46- .generate_payloads = nop,
47+ .generate_payloads = (void*)nop,
48 .set_transform = _frag_set_transform,
49 .get_transform = _frag_get_transform,
50 .encrypt = _frag_encrypt,
51diff --git a/src/libcharon/plugins/android_dns/android_dns_handler.c b/src/libcharon/plugins/android_dns/android_dns_handler.c
52index 78f4f702a..14d2ff99a 100644
53--- a/src/libcharon/plugins/android_dns/android_dns_handler.c
54+++ b/src/libcharon/plugins/android_dns/android_dns_handler.c
55@@ -191,7 +191,7 @@ METHOD(enumerator_t, enumerate_dns, bool,
56 VA_ARGS_VGET(args, type, data);
57 *type = INTERNAL_IP4_DNS;
58 *data = chunk_empty;
59- this->venumerate = return_false;
60+ this->venumerate = (void*)return_false;
61 return TRUE;
62 }
63
64diff --git a/src/libcharon/plugins/ha/ha_attribute.c b/src/libcharon/plugins/ha/ha_attribute.c
65index b865a4b82..103d1a937 100644
66--- a/src/libcharon/plugins/ha/ha_attribute.c
67+++ b/src/libcharon/plugins/ha/ha_attribute.c
68@@ -381,7 +381,7 @@ ha_attribute_t *ha_attribute_create(ha_kernel_t *kernel, ha_segments_t *segments
69 .provider = {
70 .acquire_address = _acquire_address,
71 .release_address = _release_address,
72- .create_attribute_enumerator = enumerator_create_empty,
73+ .create_attribute_enumerator = (void*)enumerator_create_empty,
74 },
75 .reserve = _reserve,
76 .destroy = _destroy,
77diff --git a/src/libcharon/plugins/updown/updown_handler.c b/src/libcharon/plugins/updown/updown_handler.c
78index 36eb15615..3707e1e65 100644
79--- a/src/libcharon/plugins/updown/updown_handler.c
80+++ b/src/libcharon/plugins/updown/updown_handler.c
81@@ -220,7 +220,7 @@ updown_handler_t *updown_handler_create()
82 .handler = {
83 .handle = _handle,
84 .release = _release,
85- .create_attribute_enumerator = enumerator_create_empty,
86+ .create_attribute_enumerator = (void*)enumerator_create_empty,
87 },
88 .create_dns_enumerator = _create_dns_enumerator,
89 .destroy = _destroy,
90diff --git a/src/libstrongswan/utils/identification.c b/src/libstrongswan/utils/identification.c
91index d31955b38..58a05052d 100644
92--- a/src/libstrongswan/utils/identification.c
93+++ b/src/libstrongswan/utils/identification.c
94@@ -1625,7 +1625,7 @@ static private_identification_t *identification_create(id_type_t type)
95 this->public.hash = _hash_binary;
96 this->public.equals = _equals_binary;
97 this->public.matches = _matches_any;
98- this->public.contains_wildcards = return_true;
99+ this->public.contains_wildcards = (void*)return_true;
100 break;
101 case ID_FQDN:
102 case ID_RFC822_ADDR:
103@@ -1660,13 +1660,13 @@ static private_identification_t *identification_create(id_type_t type)
104 this->public.hash = _hash_binary;
105 this->public.equals = _equals_binary;
106 this->public.matches = _matches_range;
107- this->public.contains_wildcards = return_false;
108+ this->public.contains_wildcards = (void*)return_false;
109 break;
110 default:
111 this->public.hash = _hash_binary;
112 this->public.equals = _equals_binary;
113 this->public.matches = _matches_binary;
114- this->public.contains_wildcards = return_false;
115+ this->public.contains_wildcards = (void*)return_false;
116 break;
117 }
118 return this;
diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.9.14.bb b/meta-networking/recipes-support/strongswan/strongswan_6.0.1.bb
index 2e2da8274b..771470f695 100644
--- a/meta-networking/recipes-support/strongswan/strongswan_5.9.14.bb
+++ b/meta-networking/recipes-support/strongswan/strongswan_6.0.1.bb
@@ -8,10 +8,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
8DEPENDS = "flex-native flex bison-native" 8DEPENDS = "flex-native flex bison-native"
9DEPENDS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', ' tpm2-tss', '', d)}" 9DEPENDS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', ' tpm2-tss', '', d)}"
10 10
11SRC_URI = "https://download.strongswan.org/strongswan-${PV}.tar.bz2 \ 11SRC_URI = " \
12 " 12 https://download.strongswan.org/strongswan-${PV}.tar.bz2 \
13 file://0001-pki-Fix-signature-of-help-to-match-that-of-a-callbac.patch \
14 file://0002-callback-job-Replace-return_false-in-constructors-wi.patch \
15 file://0003-Cast-uses-of-return_-nop-and-enumerator_create_empty.patch \
16 "
13 17
14SRC_URI[sha256sum] = "728027ddda4cb34c67c4cec97d3ddb8c274edfbabdaeecf7e74693b54fc33678" 18SRC_URI[sha256sum] = "212368cbc674fed31f3292210303fff06da8b90acad2d1387375ed855e6879c4"
15 19
16UPSTREAM_CHECK_REGEX = "strongswan-(?P<pver>\d+(\.\d+)+)\.tar" 20UPSTREAM_CHECK_REGEX = "strongswan-(?P<pver>\d+(\.\d+)+)\.tar"
17 21
@@ -22,24 +26,33 @@ EXTRA_OECONF = " \
22 26
23EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" 27EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
24 28
25PACKAGECONFIG ?= "curl gmp openssl sqlite3 swanctl curve25519\ 29PACKAGECONFIG ?= "curl openssl sqlite3 swanctl \
26 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-charon', 'charon', d)} \ 30 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-charon', 'charon', d)} \
27 ${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', 'tpm2', '', d)} \ 31 ${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', 'tpm2', '', d)} \
28 ${@bb.utils.contains('DISTRO_FEATURES', 'ima', 'tnc-imc imc-hcd imc-os imc-scanner imc-attestation', '', d)} \ 32 ${@bb.utils.contains('DISTRO_FEATURES', 'ima', 'tnc-imc imc-hcd imc-os imc-scanner imc-attestation', '', d)} \
29 ${@bb.utils.contains('DISTRO_FEATURES', 'ima', 'tnc-imv imv-hcd imv-os imv-scanner imv-attestation', '', d)} \ 33 ${@bb.utils.contains('DISTRO_FEATURES', 'ima', 'tnc-imv imv-hcd imv-os imv-scanner imv-attestation', '', d)} \
30" 34"
31 35
36PACKAGECONFIG[aes] = "--enable-aes,--disable-aes,,${PN}-plugin-aes"
32PACKAGECONFIG[aesni] = "--enable-aesni,--disable-aesni,,${PN}-plugin-aesni" 37PACKAGECONFIG[aesni] = "--enable-aesni,--disable-aesni,,${PN}-plugin-aesni"
33PACKAGECONFIG[bfd] = "--enable-bfd-backtraces,--disable-bfd-backtraces,binutils" 38PACKAGECONFIG[bfd] = "--enable-bfd-backtraces,--disable-bfd-backtraces,binutils"
34PACKAGECONFIG[charon] = "--enable-charon,--disable-charon," 39PACKAGECONFIG[charon] = "--enable-charon,--disable-charon,"
35PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl,${PN}-plugin-curl" 40PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl,${PN}-plugin-curl"
41PACKAGECONFIG[des] = "--enable-des,--disable-des,,${PN}-plugin-des"
36PACKAGECONFIG[eap-identity] = "--enable-eap-identity,--disable-eap-identity,,${PN}-plugin-eap-identity" 42PACKAGECONFIG[eap-identity] = "--enable-eap-identity,--disable-eap-identity,,${PN}-plugin-eap-identity"
37PACKAGECONFIG[eap-mschapv2] = "--enable-eap-mschapv2,--disable-eap-mschapv2,,${PN}-plugin-eap-mschapv2" 43PACKAGECONFIG[eap-mschapv2] = "--enable-eap-mschapv2,--disable-eap-mschapv2,,${PN}-plugin-eap-mschapv2"
44PACKAGECONFIG[fips-prf] = "--enable-fips-prf,--disable-fips-prf,,${PN}-plugin-fips-prf"
38PACKAGECONFIG[gmp] = "--enable-gmp,--disable-gmp,gmp,${PN}-plugin-gmp" 45PACKAGECONFIG[gmp] = "--enable-gmp,--disable-gmp,gmp,${PN}-plugin-gmp"
46PACKAGECONFIG[hmac] = "--enable-hmac,--disable-hmac,,${PN}-plugin-hmac"
39PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap,${PN}-plugin-ldap" 47PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap,${PN}-plugin-ldap"
48PACKAGECONFIG[md5] = "--enable-md5,--disable-md5,,${PN}-plugin-md5"
40PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5,${PN}-plugin-mysql" 49PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5,${PN}-plugin-mysql"
41PACKAGECONFIG[nm] = "--enable-nm,--disable-nm,networkmanager,${PN}-nm" 50PACKAGECONFIG[nm] = "--enable-nm,--disable-nm,networkmanager,${PN}-nm"
42PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl,${PN}-plugin-openssl" 51PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl,${PN}-plugin-openssl"
52PACKAGECONFIG[pkcs12] = "--enable-pkcs12,--disable-pkcs12,,${PN}-plugin-pkcs12"
53PACKAGECONFIG[rc2] = "--enable-rc2,--disable-rc2,,${PN}-plugin-rc2"
54PACKAGECONFIG[sha1] = "--enable-sha1,--disable-sha1,,${PN}-plugin-sha1"
55PACKAGECONFIG[sha2] = "--enable-sha2,--disable-sha2,,${PN}-plugin-sha2"
43PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4,${PN}-plugin-soup" 56PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4,${PN}-plugin-soup"
44PACKAGECONFIG[sqlite3] = "--enable-sqlite,--disable-sqlite,sqlite3,${PN}-plugin-sqlite" 57PACKAGECONFIG[sqlite3] = "--enable-sqlite,--disable-sqlite,sqlite3,${PN}-plugin-sqlite"
45PACKAGECONFIG[stroke] = "--enable-stroke,--disable-stroke,,${PN}-plugin-stroke" 58PACKAGECONFIG[stroke] = "--enable-stroke,--disable-stroke,,${PN}-plugin-stroke"
@@ -144,34 +157,23 @@ PACKAGESPLITFUNCS:prepend = "split_strongswan_plugins "
144# Install some default plugins based on default strongSwan ./configure options 157# Install some default plugins based on default strongSwan ./configure options
145# See https://wiki.strongswan.org/projects/strongswan/wiki/Pluginlist 158# See https://wiki.strongswan.org/projects/strongswan/wiki/Pluginlist
146RDEPENDS:${PN} += "\ 159RDEPENDS:${PN} += "\
147 ${PN}-plugin-aes \
148 ${PN}-plugin-attr \ 160 ${PN}-plugin-attr \
149 ${PN}-plugin-cmac \ 161 ${PN}-plugin-cmac \
150 ${PN}-plugin-constraints \ 162 ${PN}-plugin-constraints \
151 ${PN}-plugin-des \
152 ${PN}-plugin-dnskey \ 163 ${PN}-plugin-dnskey \
153 ${PN}-plugin-drbg \ 164 ${PN}-plugin-drbg \
154 ${PN}-plugin-fips-prf \
155 ${PN}-plugin-gcm \
156 ${PN}-plugin-hmac \
157 ${PN}-plugin-kdf \ 165 ${PN}-plugin-kdf \
158 ${PN}-plugin-kernel-netlink \ 166 ${PN}-plugin-kernel-netlink \
159 ${PN}-plugin-md5 \
160 ${PN}-plugin-mgf1 \
161 ${PN}-plugin-nonce \ 167 ${PN}-plugin-nonce \
162 ${PN}-plugin-pem \ 168 ${PN}-plugin-pem \
163 ${PN}-plugin-pgp \ 169 ${PN}-plugin-pgp \
164 ${PN}-plugin-pkcs1 \ 170 ${PN}-plugin-pkcs1 \
165 ${PN}-plugin-pkcs7 \ 171 ${PN}-plugin-pkcs7 \
166 ${PN}-plugin-pkcs8 \ 172 ${PN}-plugin-pkcs8 \
167 ${PN}-plugin-pkcs12 \
168 ${PN}-plugin-pubkey \ 173 ${PN}-plugin-pubkey \
169 ${PN}-plugin-random \ 174 ${PN}-plugin-random \
170 ${PN}-plugin-rc2 \
171 ${PN}-plugin-resolve \ 175 ${PN}-plugin-resolve \
172 ${PN}-plugin-revocation \ 176 ${PN}-plugin-revocation \
173 ${PN}-plugin-sha1 \
174 ${PN}-plugin-sha2 \
175 ${PN}-plugin-socket-default \ 177 ${PN}-plugin-socket-default \
176 ${PN}-plugin-sshkey \ 178 ${PN}-plugin-sshkey \
177 ${PN}-plugin-updown \ 179 ${PN}-plugin-updown \
diff --git a/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch b/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch
index 82d3551019..3520bf429e 100644
--- a/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch
+++ b/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch
@@ -1,4 +1,4 @@
1From 7ff4eba20b5c4fc7365e5ee0dfb775ed29bdd5ce Mon Sep 17 00:00:00 2001 1From e08b9760d319d0334f2aad02d32d791c8ebd8564 Mon Sep 17 00:00:00 2001
2From: Kai Kang <kai.kang@windriver.com> 2From: Kai Kang <kai.kang@windriver.com>
3Date: Wed, 1 Nov 2017 09:23:41 -0400 3Date: Wed, 1 Nov 2017 09:23:41 -0400
4Subject: [PATCH] stunnel: fix compile error when openssl disable des support 4Subject: [PATCH] stunnel: fix compile error when openssl disable des support
@@ -17,10 +17,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
17 2 files changed, 5 insertions(+), 3 deletions(-) 17 2 files changed, 5 insertions(+), 3 deletions(-)
18 18
19diff --git a/src/common.h b/src/common.h 19diff --git a/src/common.h b/src/common.h
20index 2b4869f..180d31a 100644 20index c2229d0..5eaee8c 100644
21--- a/src/common.h 21--- a/src/common.h
22+++ b/src/common.h 22+++ b/src/common.h
23@@ -492,7 +492,9 @@ extern char *sys_errlist[]; 23@@ -497,7 +497,9 @@ extern char *sys_errlist[];
24 #ifndef OPENSSL_NO_MD4 24 #ifndef OPENSSL_NO_MD4
25 #include <openssl/md4.h> 25 #include <openssl/md4.h>
26 #endif /* !defined(OPENSSL_NO_MD4) */ 26 #endif /* !defined(OPENSSL_NO_MD4) */
@@ -31,19 +31,19 @@ index 2b4869f..180d31a 100644
31 #include <openssl/dh.h> 31 #include <openssl/dh.h>
32 #if OPENSSL_VERSION_NUMBER<0x10100000L 32 #if OPENSSL_VERSION_NUMBER<0x10100000L
33diff --git a/src/protocol.c b/src/protocol.c 33diff --git a/src/protocol.c b/src/protocol.c
34index cfe6d3b..3936aea 100644 34index c390a6f..7aca745 100644
35--- a/src/protocol.c 35--- a/src/protocol.c
36+++ b/src/protocol.c 36+++ b/src/protocol.c
37@@ -81,7 +81,7 @@ NOEXPORT void ldap_client_middle(CLI *); 37@@ -82,7 +82,7 @@ NOEXPORT void ldap_client_middle(CLI *);
38
39 NOEXPORT void connect_server_early(CLI *); 38 NOEXPORT void connect_server_early(CLI *);
39 NOEXPORT const char *connect_client_init(SERVICE_OPTIONS *);
40 NOEXPORT void connect_client_middle(CLI *); 40 NOEXPORT void connect_client_middle(CLI *);
41-#ifndef OPENSSL_NO_MD4 41-#ifndef OPENSSL_NO_MD4
42+#if !defined(OPENSSL_NO_MD4) && !defined(OPENSSL_NO_DES) 42+#if !defined(OPENSSL_NO_MD4) && !defined(OPENSSL_NO_DES)
43 NOEXPORT void ntlm(CLI *); 43 NOEXPORT void ntlm(CLI *);
44 NOEXPORT char *ntlm1(void); 44 NOEXPORT char *ntlm1(void);
45 NOEXPORT char *ntlm3(char *, char *, char *, char *); 45 NOEXPORT char *ntlm3(char *, char *, char *, char *);
46@@ -1331,7 +1331,7 @@ NOEXPORT void connect_client_middle(CLI *c) { 46@@ -1391,7 +1391,7 @@ NOEXPORT void connect_client_middle(CLI *c) {
47 fd_printf(c, c->remote_fd.fd, "Host: %s", c->opt->protocol_host); 47 fd_printf(c, c->remote_fd.fd, "Host: %s", c->opt->protocol_host);
48 if(c->opt->protocol_username && c->opt->protocol_password) { 48 if(c->opt->protocol_username && c->opt->protocol_password) {
49 if(!strcasecmp(c->opt->protocol_authentication, "ntlm")) { 49 if(!strcasecmp(c->opt->protocol_authentication, "ntlm")) {
@@ -52,7 +52,7 @@ index cfe6d3b..3936aea 100644
52 ntlm(c); 52 ntlm(c);
53 #else 53 #else
54 s_log(LOG_ERR, "NTLM authentication is not available"); 54 s_log(LOG_ERR, "NTLM authentication is not available");
55@@ -1374,7 +1374,7 @@ NOEXPORT void connect_client_middle(CLI *c) { 55@@ -1434,7 +1434,7 @@ NOEXPORT void connect_client_middle(CLI *c) {
56 str_free(line); 56 str_free(line);
57 } 57 }
58 58
@@ -61,6 +61,3 @@ index cfe6d3b..3936aea 100644
61 61
62 /* 62 /*
63 * NTLM code is based on the following documentation: 63 * NTLM code is based on the following documentation:
64--
652.34.1
66
diff --git a/meta-networking/recipes-support/stunnel/stunnel_5.72.bb b/meta-networking/recipes-support/stunnel/stunnel_5.75.bb
index 6d21027a16..e13872abcd 100644
--- a/meta-networking/recipes-support/stunnel/stunnel_5.72.bb
+++ b/meta-networking/recipes-support/stunnel/stunnel_5.75.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "SSL encryption wrapper between remote client and local (inetd-sta
3HOMEPAGE = "https://www.stunnel.org/" 3HOMEPAGE = "https://www.stunnel.org/"
4SECTION = "net" 4SECTION = "net"
5LICENSE = "GPL-2.0-or-later" 5LICENSE = "GPL-2.0-or-later"
6LIC_FILES_CHKSUM = "file://COPYING.md;md5=906ac034adaee9d093318e51b53453ca" 6LIC_FILES_CHKSUM = "file://COPYING.md;md5=1e4388407e163ad0cde171362f9a7b94"
7 7
8DEPENDS = "autoconf-archive libnsl2 openssl" 8DEPENDS = "autoconf-archive libnsl2 openssl"
9 9
@@ -11,7 +11,7 @@ SRC_URI = "https://stunnel.org/archive/5.x/${BP}.tar.gz \
11 file://fix-openssl-no-des.patch \ 11 file://fix-openssl-no-des.patch \
12" 12"
13 13
14SRC_URI[sha256sum] = "3d532941281ae353319735144e4adb9ae489a10b7e309c58a48157f08f42e949" 14SRC_URI[sha256sum] = "0c1ef0ed85240974dccb94fe74fb92d6383474c7c0d10e8796d1f781a3ba5683"
15 15
16inherit autotools bash-completion pkgconfig 16inherit autotools bash-completion pkgconfig
17 17
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest b/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest
index 2bfb2267da..2bfb2267da 100755..100644
--- a/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest
+++ b/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump_4.99.4.bb b/meta-networking/recipes-support/tcpdump/tcpdump_4.99.5.bb
index 803a9bb5f5..144a12560b 100644
--- a/meta-networking/recipes-support/tcpdump/tcpdump_4.99.4.bb
+++ b/meta-networking/recipes-support/tcpdump/tcpdump_4.99.5.bb
@@ -21,15 +21,17 @@ RDEPENDS:${PN}-ptest += " make perl \
21" 21"
22 22
23SRC_URI = " \ 23SRC_URI = " \
24 http://www.tcpdump.org/release/${BP}.tar.gz \ 24 http://www.tcpdump.org/release/${BP}.tar.xz \
25 file://add-ptest.patch \ 25 file://add-ptest.patch \
26 file://run-ptest \ 26 file://run-ptest \
27" 27"
28 28
29SRC_URI[sha256sum] = "0232231bb2f29d6bf2426e70a08a7e0c63a0d59a9b44863b7f5e2357a6e49fea" 29SRC_URI[sha256sum] = "d76395ab82d659d526291b013eee200201380930793531515abfc6e77b4f2ee5"
30 30
31UPSTREAM_CHECK_REGEX = "tcpdump-(?P<pver>\d+(\.\d+)+)\.tar" 31UPSTREAM_CHECK_REGEX = "tcpdump-(?P<pver>\d+(\.\d+)+)\.tar"
32 32
33CVE_PRODUCT = "tcpdump:tcpdump"
34
33inherit autotools-brokensep pkgconfig ptest 35inherit autotools-brokensep pkgconfig ptest
34 36
35PACKAGECONFIG ?= "openssl" 37PACKAGECONFIG ?= "openssl"
diff --git a/meta-networking/recipes-support/tcpdump/tcpslice_1.7.bb b/meta-networking/recipes-support/tcpdump/tcpslice_1.8.bb
index 93197dc3bc..3d61160bb0 100644
--- a/meta-networking/recipes-support/tcpdump/tcpslice_1.7.bb
+++ b/meta-networking/recipes-support/tcpdump/tcpslice_1.8.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://tcpslice.c;endline=20;md5=99519e2e5234d1662a4ce16baa6
8 8
9SRC_URI = "http://www.tcpdump.org/release/${BP}.tar.gz \ 9SRC_URI = "http://www.tcpdump.org/release/${BP}.tar.gz \
10 " 10 "
11SRC_URI[sha256sum] = "e513f0710c4ab45ec627e5df6f7b80d12e488146e1bd500c92247e20ca608903" 11SRC_URI[sha256sum] = "082967d6bf793499d3d655cea2149e07c0da97287f1877a6eab88d17cb703d0d"
12 12
13UPSTREAM_CHECK_REGEX = "tcpslice-(?P<pver>\d+(\.\d+)+)\.tar" 13UPSTREAM_CHECK_REGEX = "tcpslice-(?P<pver>\d+(\.\d+)+)\.tar"
14 14
diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-Fix-linker-error-for-TX_RING.patch b/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-Fix-linker-error-for-TX_RING.patch
new file mode 100644
index 0000000000..d8f0ab270c
--- /dev/null
+++ b/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-Fix-linker-error-for-TX_RING.patch
@@ -0,0 +1,71 @@
1From 36e038d9e4047ae42a148f671f18971cc6a68558 Mon Sep 17 00:00:00 2001
2From: "mark.yang" <mark.yang@lge.com>
3Date: Thu, 10 Apr 2025 18:30:52 +0900
4Subject: [PATCH] Fix linker error for TX_RING
5
6Found similar issue in gcc 15 build environment.
7- See more details at: http://errors.yoctoproject.org/Errors/Details/851800/
8```
9TOPDIR/tmp/work/core2-64-oe-linux/tcpreplay/4.5.1/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/15.0.1/ld: ./common/libcommon.a(sendpacket.o): in function `sendpacket':
10/usr/src/debug/tcpreplay/4.5.1/src/common/sendpacket.c:328:(.text+0x1be): undefined reference to `txring_put'
11TOPDIR/tmp/work/core2-64-oe-linux/tcpreplay/4.5.1/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/15.0.1/ld: ./common/libcommon.a(sendpacket.o): in function `sendpacket_open_pf':
12/usr/src/debug/tcpreplay/4.5.1/src/common/sendpacket.c:1088:(.text+0x7ea): undefined reference to `txring_init'
13TOPDIR/tmp/work/core2-64-oe-linux/tcpreplay/4.5.1/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/15.0.1/ld: ./common/libcommon.a(sendpacket.o): in function `sendpacket':
14/usr/src/debug/tcpreplay/4.5.1/src/common/sendpacket.c:328:(.text+0x1be): undefined reference to `txring_put'
15TOPDIR/tmp/work/core2-64-oe-linux/tcpreplay/4.5.1/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/15.0.1/ld: ./common/libcommon.a(sendpacket.o): in function `sendpacket_open_pf':
16/usr/src/debug/tcpreplay/4.5.1/src/common/sendpacket.c:1088:(.text+0x7ea): undefined reference to `txring_init'
17TOPDIR/tmp/work/core2-64-oe-linux/tcpreplay/4.5.1/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/15.0.1/ld: ./common/libcommon.a(sendpacket.o): in function `sendpacket':
18/usr/src/debug/tcpreplay/4.5.1/src/common/sendpacket.c:328:(.text+0x1be): undefined reference to `txring_put'
19TOPDIR/tmp/work/core2-64-oe-linux/tcpreplay/4.5.1/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/15.0.1/ld: ./common/libcommon.a(sendpacket.o): in function `sendpacket_open_pf':
20/usr/src/debug/tcpreplay/4.5.1/src/common/sendpacket.c:1088:(.text+0x7ea): undefined reference to `txring_init'
21```
22- The result of "nm -u txring.o" shows no symbols exist.
23
24- The config.h has HAVE_TX_RING defined but txring.c is not aware of it.
25 txring.c and txring.h include config.h at the beginning.
26
27- This resulted in a successful build in my build environment.
28
29It may
30Fixes #731
31Fixes #904
32
33Upstream-Status: Submitted [https://github.com/appneta/tcpreplay/pull/924]
34Signed-off-by: mark.yang <mark.yang@lge.com>
35---
36 src/common/txring.c | 3 +++
37 src/common/txring.h | 4 ++--
38 2 files changed, 5 insertions(+), 2 deletions(-)
39
40diff --git a/src/common/txring.c b/src/common/txring.c
41index d5768d75..f522893d 100644
42--- a/src/common/txring.c
43+++ b/src/common/txring.c
44@@ -31,6 +31,9 @@
45 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
46 */
47
48+#include "defines.h"
49+#include "config.h"
50+
51 #ifdef HAVE_TX_RING
52
53 #include "txring.h"
54diff --git a/src/common/txring.h b/src/common/txring.h
55index 309da84c..3f14cac0 100644
56--- a/src/common/txring.h
57+++ b/src/common/txring.h
58@@ -33,11 +33,11 @@
59
60 #pragma once
61
62-#ifdef HAVE_TX_RING
63-
64 #include "defines.h"
65 #include "config.h"
66
67+#ifdef HAVE_TX_RING
68+
69 #if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1
70 #include <net/ethernet.h> /* the L2 protocols */
71 #include <netpacket/packet.h>
diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-do-not-run-conftest-in-case-of-cross-co.patch b/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-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-do-not-run-conftest-in-case-of-cross-co.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1From 42f7bbc1ce4913fe2c0bc76293c5445d31690f5d Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Thu, 7 Mar 2024 21:02:07 -0800
4Subject: [PATCH] configure.ac: do not run conftest in case of cross
5 compilation
6
7It'll give us nothing but error like below:
8
9 ./conftest: cannot execute binary file: Exec format error
10 ...
11 ./configure: line 23950: test: -eq: unary operator expected
12
13The version check only has effect on Apple systems. We'd better
14avoid error like above when cross compilation.
15
16Also, in case of cross compilation, instead of having the above
17Exec format error and resulting in unaligned_cv_fail to yes, set
18it directly to yes.
19
20Upstream-Status: Submitted [https://github.com/appneta/tcpreplay/pull/849]
21
22Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
23---
24 configure.ac | 4 ++--
25 1 file changed, 2 insertions(+), 2 deletions(-)
26
27diff --git a/configure.ac b/configure.ac
28index 387219de..15201601 100644
29--- a/configure.ac
30+++ b/configure.ac
31@@ -928,7 +928,7 @@ cat >conftest.c <<EOF
32 EOF
33 ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LPCAPLIB \
34 conftest.c $LIBS >/dev/null 2>&1
35-if test -x conftest ; then
36+if test -x conftest -a "$cross_compiling" != "yes"; then
37 full_libpcap_version=$(LD_LIBRARY_PATH="$LPCAP_LD_LIBRARY_PATH" ./conftest)
38 libpcap_version=$(echo "$full_libpcap_version" | ${CUT} -d' ' -f3)
39 pcap_version_ok=yes
40@@ -1709,7 +1709,7 @@ case "$host_os" in
41 EOF
42 ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS \
43 conftest.c $LIBS >/dev/null 2>&1
44- if test ! -x conftest ; then
45+ if test ! -x conftest -o "$cross_compiling" = "yes" ; then
46 dnl failed to compile for some reason
47 unaligned_cv_fail=yes
48 else
49--
502.42.0
51
diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch b/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-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch
+++ /dev/null
@@ -1,82 +0,0 @@
1From 5f8c78362b3b1e06f5adff2d4b140509c4799894 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sun, 3 Sep 2023 12:31:59 +0200
4Subject: [PATCH] configure.ac: unify search dirs for pcap and add lib32
5
6* add lib32 because when building lib32-tcpreplay it's
7 impossible to set --with-libpcap so that it would find
8 both include files as well as the library in lib32 directory
9
10* maybe it would be beneficial to split --with-libpcap
11 into --with-libpcap-includedir --with-libpcap-libdir as this
12 already searches in the --with-libpcap value with and
13 without any "lib" prefix, but include files always expect
14 "include" dir there
15
16* most of this code was added in:
17 https://github.com/appneta/tcpreplay/commit/202b8e82f9fd3c84ce5804577caeb36a33baabe7#diff-49473dca262eeab3b4a43002adb08b4db31020d190caaad1594b47f1d5daa810R570
18
19* then search for
20 ${host_cpu} lib/${host_cpu} (without -${host_os} suffix)
21 and ${build_arch}-${host_os} lib/${build_arch}-${host_os}
22 was added, but only for search of dynamic library in:
23 https://github.com/appneta/tcpreplay/commit/c3d5236563985a99f8bb02c3f1bd6950e3929047
24
25* ${build_arch}-${host_os} lib/${build_arch}-${host_os}
26 was later replaced with:
27 lib/${MULTIARCH} ${MULTIARCH}
28 and it was added to static library search as well
29
30 but for dynamic library it was searching in reversed order:
31 ${MULTIARCH} lib/${MULTIARCH}
32 https://github.com/appneta/tcpreplay/commit/ed9e3a818bde04813144014561e62f018c9eb85f
33
34 I don't think this reversed order was intentional, just unify all 4 cases
35 to use the same directories in the same order
36
37Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
38Upstream-Status: Submitted [https://github.com/appneta/tcpreplay/pull/819]
39---
40 configure.ac | 8 ++++----
41 1 file changed, 4 insertions(+), 4 deletions(-)
42
43diff --git a/configure.ac b/configure.ac
44index 387219de..26ba31a5 100644
45--- a/configure.ac
46+++ b/configure.ac
47@@ -671,7 +671,7 @@ AC_ARG_WITH(libpcap,
48 LPCAPINCDIR=${testdir}
49 if test $dynamic_link = yes; then
50 for ext in .dylib .so .tbd ; do
51- for dir in . lib lib64 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do
52+ for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do
53 sharefile=$(ls ${testdir}/$dir/libpcap${ext}* 2> /dev/null | sort | head -n1)
54 if test -n "${sharefile}"; then
55 LPCAP_LD_LIBRARY_PATH="$(dirname ${sharefile})"
56@@ -690,7 +690,7 @@ AC_ARG_WITH(libpcap,
57 dnl If dynamic library not found, try static
58 dnl
59 for ext in ${libext} .a .A.tbd ; do
60- for dir in . lib lib64 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do
61+ for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do
62 staticfile=$(ls ${testdir}/$dir/libpcap${ext} 2> /dev/null | sort | head -n1)
63 if test -n "${staticfile}"; then
64 LPCAPLIB="${staticfile}"
65@@ -771,7 +771,7 @@ AC_ARG_WITH(libpcap,
66 LPCAPINCDIR="${testdir}/include"
67 if test $dynamic_link = yes; then
68 for ext in .dylib .so .tbd; do
69- for dir in . lib lib64 ${host_cpu} lib/${host_cpu} ${host_cpu}-${host_os} lib/${host_cpu}-${host_os} ${MULTIARCH} lib/${MULTIARCH}; do
70+ for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do
71 sharefile=$(ls "${testdir}/$dir/libpcap${ext}" 2> /dev/null | sort | head -n1)
72 if test -n "${sharefile}"; then
73 LPCAPLIB="-L$(dirname ${sharefile}) -lpcap"
74@@ -790,7 +790,7 @@ AC_ARG_WITH(libpcap,
75 dnl If dynamic library not found, try static
76 dnl
77 for ext in ${libext} .a .A.tbd ; do
78- for dir in . lib lib64 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do
79+ for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do
80 staticfile=$(ls "${testdir}/$dir/libpcap${ext}" 2> /dev/null | sort | head -n1)
81 if test -n "${staticfile}"; then
82 LPCAPLIB="${staticfile}"
diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay/0002-fix-incompatible-type-assignment-in-txring.c.patch b/meta-networking/recipes-support/tcpreplay/tcpreplay/0002-fix-incompatible-type-assignment-in-txring.c.patch
new file mode 100644
index 0000000000..906c30e147
--- /dev/null
+++ b/meta-networking/recipes-support/tcpreplay/tcpreplay/0002-fix-incompatible-type-assignment-in-txring.c.patch
@@ -0,0 +1,31 @@
1From 5615e8f7bbf83f03acacd6d6ba9ff8dc6fdc91df Mon Sep 17 00:00:00 2001
2From: "mark.yang" <mark.yang@lge.com>
3Date: Thu, 10 Apr 2025 18:49:51 +0900
4Subject: [PATCH] fix incompatible type assignment in txring.c
5
6* There is an incompatible type assignment error in txring.c.
7 txring.c:200:12: error: incompatible types when assigning to type 'txring_t' {aka 'struct txring_s'} from type 'txring_t *' {aka 'struct txring_s *'}
8 200 | *txp = (txring_t *)safe_malloc(sizeof(txring_t));
9 | ^
10
11 txp is allocated as txring_t *, so I fixed it.
12
13Upstream-Status: Submitted [https://github.com/appneta/tcpreplay/pull/924]
14Signed-off-by: mark.yang <mark.yang@lge.com>
15---
16 src/common/txring.c | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/src/common/txring.c b/src/common/txring.c
20index f522893d..b062dac2 100644
21--- a/src/common/txring.c
22+++ b/src/common/txring.c
23@@ -197,7 +197,7 @@ txring_init(int fd, unsigned int mtu)
24 txring_t *txp;
25
26 /* allocate memory for structure and fill it with different stuff*/
27- *txp = (txring_t *)safe_malloc(sizeof(txring_t));
28+ txp = (txring_t *)safe_malloc(sizeof(txring_t));
29 txp->treq = (struct tpacket_req *)safe_malloc(sizeof(struct tpacket_req));
30
31 txring_mkreq(txp->treq, mtu);
diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.4.bb b/meta-networking/recipes-support/tcpreplay/tcpreplay_4.5.1.bb
index 26de40a65a..46e06a928e 100644
--- a/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.4.bb
+++ b/meta-networking/recipes-support/tcpreplay/tcpreplay_4.5.1.bb
@@ -9,11 +9,11 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=10f0474a2f0e5dccfca20f69d6598ad8"
9 9
10SRC_URI = "https://github.com/appneta/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ 10SRC_URI = "https://github.com/appneta/${BPN}/releases/download/v${PV}/${BP}.tar.gz \
11 file://0001-libopts.m4-set-POSIX_SHELL-to-bin-sh.patch \ 11 file://0001-libopts.m4-set-POSIX_SHELL-to-bin-sh.patch \
12 file://0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch \ 12 file://0001-Fix-linker-error-for-TX_RING.patch \
13 file://0001-configure.ac-do-not-run-conftest-in-case-of-cross-co.patch \ 13 file://0002-fix-incompatible-type-assignment-in-txring.c.patch \
14" 14"
15 15
16SRC_URI[sha256sum] = "44f18fb6d3470ecaf77a51b901a119dae16da5be4d4140ffbb2785e37ad6d4bf" 16SRC_URI[sha256sum] = "2de79bfd67ec92ca9ae2ffb50456dd1d53ff40f3fa71b422c65e8062013c9e85"
17 17
18UPSTREAM_CHECK_URI = "https://github.com/appneta/tcpreplay/releases" 18UPSTREAM_CHECK_URI = "https://github.com/appneta/tcpreplay/releases"
19 19
diff --git a/meta-networking/recipes-support/traceroute/traceroute_2.1.5.bb b/meta-networking/recipes-support/traceroute/traceroute_2.1.6.bb
index 862cba91e9..b72c375400 100644
--- a/meta-networking/recipes-support/traceroute/traceroute_2.1.5.bb
+++ b/meta-networking/recipes-support/traceroute/traceroute_2.1.6.bb
@@ -17,7 +17,7 @@ UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/traceroute/files/tracerou
17 17
18SRC_URI = "${SOURCEFORGE_MIRROR}/traceroute/traceroute/${BP}/${BP}.tar.gz \ 18SRC_URI = "${SOURCEFORGE_MIRROR}/traceroute/traceroute/${BP}/${BP}.tar.gz \
19" 19"
20SRC_URI[sha256sum] = "9c6c260d96eaab51e3ce461b0a84fe87123ebc6dd6c9a59fab803f95b35a859e" 20SRC_URI[sha256sum] = "9ccef9cdb9d7a98ff7fbf93f79ebd0e48881664b525c4b232a0fcec7dcb9db5e"
21 21
22EXTRA_OEMAKE = "VPATH=${STAGING_LIBDIR}" 22EXTRA_OEMAKE = "VPATH=${STAGING_LIBDIR}"
23LTOEXTRA += "-flto-partition=none" 23LTOEXTRA += "-flto-partition=none"
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 e3d65db734..3255a3fad0 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
@@ -13,15 +13,17 @@ Signed-off-by: Enguerrand de Ribaucourt <enguerrand.de-ribaucourt@savoirfairelin
13 1 file changed, 1 insertion(+) 13 1 file changed, 1 insertion(+)
14 14
15diff --git a/receivedata.c b/receivedata.c 15diff --git a/receivedata.c b/receivedata.c
16index 9a68f67..0aa797f 100644 16index a5ed7e8..b3b2640 100644
17--- a/receivedata.c 17--- a/receivedata.c
18+++ b/receivedata.c 18+++ b/receivedata.c
19@@ -1,4 +1,5 @@ 19@@ -1,6 +1,7 @@
20 #include "config.h"
21
20 #include <assert.h> 22 #include <assert.h>
21+#include <stddef.h> 23+#include <stddef.h>
22 #include <sys/types.h> 24 #include <sys/types.h>
23 #include <unistd.h> 25 #include <unistd.h>
24 #include <stdlib.h> 26 #include <stdlib.h>
25-- 27--
262.34.1 282.43.0
27 29
diff --git a/meta-networking/recipes-support/udpcast/udpcast_20230924.bb b/meta-networking/recipes-support/udpcast/udpcast_20250223.bb
index f93f9850a8..b3861ce7c5 100644
--- a/meta-networking/recipes-support/udpcast/udpcast_20230924.bb
+++ b/meta-networking/recipes-support/udpcast/udpcast_20250223.bb
@@ -13,10 +13,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e3cf524a29c8476be354bb329d36ff80"
13SRC_URI = "http://www.udpcast.linux.lu/download/${BP}.tar.gz \ 13SRC_URI = "http://www.udpcast.linux.lu/download/${BP}.tar.gz \
14 file://0001-include-stddef.h-for-ptrdiff_t.patch \ 14 file://0001-include-stddef.h-for-ptrdiff_t.patch \
15 " 15 "
16SRC_URI[sha256sum] = "17b5cd8b1e54f7e2e53357ac02ee86e4198bf704096987a03a3b5c402a0ecea1" 16SRC_URI[sha256sum] = "cefd7554c877e1bc76987d2b96b23f7699a2e5340c254454f61b6e0dae370aa7"
17 17
18# Installation of rateGovernor.h fails without brokensep 18# Installation of rateGovernor.h fails without brokensep
19inherit autotools-brokensep manpages 19inherit autotools-brokensep manpages
20 20
21PACKAGECONFIG[manpages] = ""
22
21# pod2man required to build manpages 23# pod2man required to build manpages
22DEPENDS += "perl-native" 24DEPENDS += "perl-native"
diff --git a/meta-networking/recipes-support/unbound/unbound/0001-fix-build-with-gcc-15-Wbuiltin-declaration-mismatch-.patch b/meta-networking/recipes-support/unbound/unbound/0001-fix-build-with-gcc-15-Wbuiltin-declaration-mismatch-.patch
new file mode 100644
index 0000000000..70a41f7e37
--- /dev/null
+++ b/meta-networking/recipes-support/unbound/unbound/0001-fix-build-with-gcc-15-Wbuiltin-declaration-mismatch-.patch
@@ -0,0 +1,44 @@
1From 1c58ce07919c36e6a11eead67bd6d14cc22acaec Mon Sep 17 00:00:00 2001
2From: "mark.yang" <mark.yang@lge.com>
3Date: Wed, 2 Apr 2025 15:25:42 +0900
4Subject: [PATCH] fix build with gcc-15 -Wbuiltin-declaration-mismatch error
5
6See more details: http://errors.yoctoproject.org/Errors/Details/850313
7../git/compat/malloc.c:9:7: warning: conflicting types for built-in function 'malloc'; expected 'void *(long unsigned int)' [-Wbuiltin-declaration-mismatch]
8 9 | void *malloc ();
9 | ^~~~~~
10../git/compat/malloc.c:5:1: note: 'malloc' is declared in header '<stdlib.h>'
11 4 | #include "config.h"
12 +++ |+#include <stdlib.h>
13 5 | #undef malloc
14../git/compat/malloc.c: In function 'rpl_malloc_unbound':
15../git/compat/malloc.c:23:10: error: too many arguments to function 'malloc'; expected 0, have 1
16 23 | return malloc (n);
17 | ^~~~~~ ~
18../git/compat/malloc.c:9:7: note: declared here
19 9 | void *malloc ();
20 | ^~~~~~
21
22* Seeing that there is '#undef malloc', it appears they don't want to
23 use the malloc from stdlib.h.
24 Therefore, we need to correctly define the parameters for malloc.
25
26Upstream-Status: Submitted [https://github.com/NLnetLabs/unbound/pull/1262]
27Signed-off-by: mark.yang <mark.yang@lge.com>
28---
29 compat/malloc.c | 2 +-
30 1 file changed, 1 insertion(+), 1 deletion(-)
31
32diff --git a/compat/malloc.c b/compat/malloc.c
33index d8097b13e..af9dcf134 100644
34--- a/compat/malloc.c
35+++ b/compat/malloc.c
36@@ -6,7 +6,7 @@
37 #include <sys/types.h>
38
39 #ifndef USE_WINSOCK
40-void *malloc ();
41+void *malloc (size_t n);
42 #else
43 /* provide a prototype */
44 void *malloc (size_t n);
diff --git a/meta-networking/recipes-support/unbound/unbound/run-ptest b/meta-networking/recipes-support/unbound/unbound/run-ptest
new file mode 100644
index 0000000000..433a687c65
--- /dev/null
+++ b/meta-networking/recipes-support/unbound/unbound/run-ptest
@@ -0,0 +1,17 @@
1#!/bin/sh
2
3cd tests || exit 1
4retVal=0
5./unittest
6./testbound -s
7for x in ./testdata/*.rpl; do
8 output="$(./testbound -p $x -o -vvvvv 2>&1)"
9 if test $? -eq 0; then
10 echo "$x :Pass"
11 else
12 echo "$output"
13 echo "$x :Fail"
14 retVal=1
15 fi
16done
17exit $retVal
diff --git a/meta-networking/recipes-support/unbound/unbound_1.20.0.bb b/meta-networking/recipes-support/unbound/unbound_1.22.0.bb
index fe0111f595..c35148b77e 100644
--- a/meta-networking/recipes-support/unbound/unbound_1.20.0.bb
+++ b/meta-networking/recipes-support/unbound/unbound_1.22.0.bb
@@ -9,18 +9,26 @@ SECTION = "net"
9LICENSE = "BSD-3-Clause" 9LICENSE = "BSD-3-Clause"
10LIC_FILES_CHKSUM = "file://LICENSE;md5=5308494bc0590c0cb036afd781d78f06" 10LIC_FILES_CHKSUM = "file://LICENSE;md5=5308494bc0590c0cb036afd781d78f06"
11 11
12SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=https;branch=branch-1.20.0" 12SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=https;branch=master \
13SRCREV = "b9525c5fd47ba481a29b90109017d2253beb105d" 13 file://run-ptest \
14 file://0001-fix-build-with-gcc-15-Wbuiltin-declaration-mismatch-.patch \
15 "
14 16
15inherit autotools pkgconfig systemd update-rc.d 17# 17 commits after 1.22.0 tag:
18# https://github.com/NLnetLabs/unbound/compare/release-1.22.0...7985d17b57d25be262de56c29a43ae4b61c1b896
19# to include fix for occasional build failure:
20# https://github.com/NLnetLabs/unbound/commit/46cfbf313d812a6e50614a691e162b171dc91d7b
21PV .= "+git"
22SRCREV = "7985d17b57d25be262de56c29a43ae4b61c1b896"
23
24inherit autotools pkgconfig systemd update-rc.d ptest
16 25
17DEPENDS = "openssl libtool-native bison-native expat" 26DEPENDS = "openssl libtool-native bison-native expat"
18RDEPENDS:${PN} = "bash openssl-bin daemonize" 27RDEPENDS:${PN} = "bash openssl-bin daemonize"
19 28
20S = "${WORKDIR}/git"
21 29
22EXTRA_OECONF = "--with-libexpat=${STAGING_EXECPREFIXDIR} \ 30EXTRA_OECONF = "--with-libexpat=${STAGING_EXECPREFIXDIR} \
23 --with-ssl=${STAGING_EXECPREFIXDIR} \ 31 --disable-rpath --with-ssl=${STAGING_EXECPREFIXDIR} \
24 --enable-largefile" 32 --enable-largefile"
25 33
26PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" 34PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
@@ -32,6 +40,10 @@ do_configure:append() {
32 sed -i -e 's#${RECIPE_SYSROOT}##g' ${B}/config.h 40 sed -i -e 's#${RECIPE_SYSROOT}##g' ${B}/config.h
33} 41}
34 42
43do_compile:append() {
44 oe_runmake tests
45}
46
35do_install:append() { 47do_install:append() {
36 install -d ${D}${systemd_unitdir}/system 48 install -d ${D}${systemd_unitdir}/system
37 install -m 0644 ${B}/contrib/unbound.service ${D}${systemd_unitdir}/system 49 install -m 0644 ${B}/contrib/unbound.service ${D}${systemd_unitdir}/system
@@ -40,6 +52,19 @@ do_install:append() {
40 install -m 0755 ${S}/contrib/unbound.init_yocto ${D}${sysconfdir}/init.d/unbound 52 install -m 0755 ${S}/contrib/unbound.init_yocto ${D}${sysconfdir}/init.d/unbound
41} 53}
42 54
55do_install_ptest() {
56 install -d ${D}${PTEST_PATH}/tests
57 install -d ${D}${PTEST_PATH}/tests/testdata
58
59 install -m 0544 ${B}/unittest ${D}${PTEST_PATH}/tests/
60 install -m 0544 ${B}/testbound ${D}${PTEST_PATH}/tests/
61 install -m 0664 ${S}/testdata/test_signatures* ${D}${PTEST_PATH}/tests/
62 install -m 0664 ${S}/testdata/test_sigs* ${D}${PTEST_PATH}/tests/
63 install -m 0664 ${S}/testdata/test_ds* ${D}${PTEST_PATH}/tests/
64 install -m 0664 ${S}/testdata/test_nsec3_hash* ${D}${PTEST_PATH}/tests/
65 install -m 0644 ${S}/testdata/*.rpl ${D}/${PTEST_PATH}/tests/testdata/
66}
67
43SYSTEMD_SERVICE:${PN} = "${BPN}.service" 68SYSTEMD_SERVICE:${PN} = "${BPN}.service"
44 69
45INITSCRIPT_NAME = "unbound" 70INITSCRIPT_NAME = "unbound"
diff --git a/meta-networking/recipes-support/wavemon/wavemon_0.9.5.bb b/meta-networking/recipes-support/wavemon/wavemon_0.9.6.bb
index 9da43cf9f4..4857c0af4f 100644
--- a/meta-networking/recipes-support/wavemon/wavemon_0.9.5.bb
+++ b/meta-networking/recipes-support/wavemon/wavemon_0.9.6.bb
@@ -14,7 +14,7 @@ PACKAGECONFIG[cap] = "--with-libcap,--without-libcap,libcap"
14DEPENDS = "libnl ncurses" 14DEPENDS = "libnl ncurses"
15 15
16SRC_URI = "git://github.com/uoaerg/wavemon;branch=master;protocol=https" 16SRC_URI = "git://github.com/uoaerg/wavemon;branch=master;protocol=https"
17SRCREV = "a7c2f190e010db508ead31fa952478e2a1c13d64" 17SRCREV = "8ba6604027c0aa5131070e3fafdcda323d58a7ad"
18 18
19# Needs some help to find libnl3 headers. 19# Needs some help to find libnl3 headers.
20# Reorder -pthread flag on the command line. 20# Reorder -pthread flag on the command line.
@@ -22,7 +22,6 @@ EXTRA_OEMAKE = "\
22 CC='${CC}' CFLAGS='${CFLAGS} -pthread -I${STAGING_INCDIR}/libnl3' \ 22 CC='${CC}' CFLAGS='${CFLAGS} -pthread -I${STAGING_INCDIR}/libnl3' \
23" 23"
24 24
25S = "${WORKDIR}/git"
26 25
27# wavemon does not support using out-of-tree builds 26# wavemon does not support using out-of-tree builds
28inherit autotools-brokensep pkgconfig 27inherit autotools-brokensep pkgconfig
diff --git a/meta-networking/recipes-support/wireshark/wireshark_4.2.5.bb b/meta-networking/recipes-support/wireshark/wireshark_4.2.12.bb
index 7cbe3e6324..dc987e08ac 100644
--- a/meta-networking/recipes-support/wireshark/wireshark_4.2.5.bb
+++ b/meta-networking/recipes-support/wireshark/wireshark_4.2.12.bb
@@ -2,22 +2,22 @@ DESCRIPTION = "wireshark - a popular network protocol analyzer"
2HOMEPAGE = "http://www.wireshark.org" 2HOMEPAGE = "http://www.wireshark.org"
3SECTION = "net" 3SECTION = "net"
4LICENSE = "GPL-2.0-only" 4LICENSE = "GPL-2.0-only"
5LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 5LIC_FILES_CHKSUM = "file://COPYING;md5=570a9b3749dd0463a1778803b12a6dce"
6 6
7DEPENDS = "pcre2 expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native c-ares speexdsp" 7DEPENDS = "pcre2 expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native c-ares speexdsp"
8 8
9DEPENDS:append:class-target = " wireshark-native chrpath-replacement-native " 9DEPENDS:append:class-target = " wireshark-native chrpath-replacement-native "
10 10
11SRC_URI = "https://1.eu.dl.wireshark.org/src/wireshark-${PV}.tar.xz \ 11SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz \
12 file://0001-wireshark-src-improve-reproducibility.patch \ 12 file://0001-wireshark-src-improve-reproducibility.patch \
13 file://0002-flex-Remove-line-directives.patch \ 13 file://0002-flex-Remove-line-directives.patch \
14 file://0004-lemon-Remove-line-directives.patch \ 14 file://0004-lemon-Remove-line-directives.patch \
15 file://0001-UseLemon.cmake-do-not-use-lemon-data-from-the-host.patch \ 15 file://0001-UseLemon.cmake-do-not-use-lemon-data-from-the-host.patch \
16 " 16 "
17 17
18UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" 18UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src/all-versions"
19 19
20SRC_URI[sha256sum] = "55e793ab87a9a73aac44336235c92cb76c52180c469b362ed3a54f26fbb1261f" 20SRC_URI[sha256sum] = "6ed51da5f6638aba609be8d1d64a7a85312749a49261146c391fea391a3e5f06"
21 21
22PE = "1" 22PE = "1"
23 23
@@ -42,13 +42,13 @@ PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF"
42PACKAGECONFIG[sbc] = "-DENABLE_SBC=ON,-DENABLE_SBC=OFF, sbc" 42PACKAGECONFIG[sbc] = "-DENABLE_SBC=ON,-DENABLE_SBC=OFF, sbc"
43PACKAGECONFIG[libssh] = "-DENABLE_LIBSSH=ON,-DENABLE_LIBSSH=OFF, libssh2" 43PACKAGECONFIG[libssh] = "-DENABLE_LIBSSH=ON,-DENABLE_LIBSSH=OFF, libssh2"
44PACKAGECONFIG[lz4] = "-DENABLE_LZ4=ON,-DENABLE_LZ4=OFF, lz4" 44PACKAGECONFIG[lz4] = "-DENABLE_LZ4=ON,-DENABLE_LZ4=OFF, lz4"
45PACKAGECONFIG[zstd] = "-DENABLE_STTD=ON,-DENABLE_ZSTD=OFF, zstd" 45PACKAGECONFIG[zstd] = "-DENABLE_ZSTD=ON,-DENABLE_ZSTD=OFF, zstd"
46PACKAGECONFIG[nghttp2] = "-DENABLE_NGHTTP2=ON,-DENABLE_NGHTTP2=OFF, nghttp2" 46PACKAGECONFIG[nghttp2] = "-DENABLE_NGHTTP2=ON,-DENABLE_NGHTTP2=OFF, nghttp2"
47 47
48# these next two options require addional layers 48# these next two options require addional layers
49PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON -DBUILD_wireshark=ON, -DENABLE_QT5=OFF -DBUILD_wireshark=OFF, qttools-native qtmultimedia qtsvg" 49PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON -DBUILD_wireshark=ON -DUSE_qt6=OFF, -DENABLE_QT5=OFF -DBUILD_wireshark=OFF, qttools-native qtmultimedia qtsvg"
50 50
51inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} 51inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)}
52 52
53EXTRA_OECMAKE += "-DENABLE_NETLINK=ON \ 53EXTRA_OECMAKE += "-DENABLE_NETLINK=ON \
54 -DBUILD_mmdbresolve=OFF \ 54 -DBUILD_mmdbresolve=OFF \
diff --git a/meta-networking/recipes-support/wpan-tools/wpan-tools_0.9.bb b/meta-networking/recipes-support/wpan-tools/wpan-tools_0.10.bb
index 6b83cbd522..2f5ebe53ae 100644
--- a/meta-networking/recipes-support/wpan-tools/wpan-tools_0.9.bb
+++ b/meta-networking/recipes-support/wpan-tools/wpan-tools_0.10.bb
@@ -4,13 +4,12 @@ DESCRIPTION = "This is a set of utils to manage the Linux WPAN stack via \
4netlink interface. This requires recent kernel with nl802154 interface." 4netlink interface. This requires recent kernel with nl802154 interface."
5 5
6LICENSE = "ISC" 6LICENSE = "ISC"
7LIC_FILES_CHKSUM = "file://COPYING;md5=4cfd939b1d7e6aba9fcefb7f6e2fd45d" 7LIC_FILES_CHKSUM = "file://COPYING;md5=f008711099e40902ad091ed6396f33ea"
8 8
9DEPENDS = "libnl" 9DEPENDS = "libnl"
10 10
11SRC_URI = "git://github.com/linux-wpan/wpan-tools;branch=master;protocol=https" 11SRC_URI = "git://github.com/linux-wpan/wpan-tools;branch=master;protocol=https"
12SRCREV = "a316ca2caa746d60817400e5bf646c2820f09273" 12SRCREV = "91b0f038aef2f62cb6a222d190b887fdfd6bc164"
13 13
14S = "${WORKDIR}/git"
15 14
16inherit autotools pkgconfig 15inherit autotools pkgconfig