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/dnsmasq/dnsmasq_2.90.bb10
-rwxr-xr-xmeta-networking/recipes-support/dnsmasq/files/dnsmasq.conf298
-rw-r--r--meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb3
-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.patch47
-rw-r--r--meta-networking/recipes-support/drbd/drbd-utils_9.28.0.bb (renamed from meta-networking/recipes-support/drbd/drbd-utils_9.27.0.bb)3
-rw-r--r--meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb2
-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/libconfuse/libconfuse_3.3.bb14
-rw-r--r--meta-networking/recipes-support/libldb/libldb_2.8.1.bb (renamed from meta-networking/recipes-support/libldb/libldb_2.8.0.bb)2
-rw-r--r--meta-networking/recipes-support/libtdb/libtdb_1.4.12.bb (renamed from meta-networking/recipes-support/libtdb/libtdb_1.4.10.bb)2
-rw-r--r--meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb4
-rw-r--r--meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.20.bb (renamed from meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb)14
-rw-r--r--meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb4
-rw-r--r--meta-networking/recipes-support/ntopng/files/0001-Follow-rrd-post-1.8-change.patch32
-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.bb (renamed from meta-networking/recipes-support/ntp/ntp_4.2.8p17.bb)4
-rw-r--r--meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.4.5.bb (renamed from meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.3.5.bb)6
-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)2
-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_2.6.12.bb (renamed from meta-networking/recipes-support/openvpn/openvpn_2.6.10.bb)2
-rw-r--r--meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-overloadable-function-attribute-with-c.patch38
-rw-r--r--meta-networking/recipes-support/rdma-core/rdma-core_51.0.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)2
-rw-r--r--meta-networking/recipes-support/spice/usbredir_0.14.0.bb (renamed from meta-networking/recipes-support/spice/usbredir_0.13.0.bb)2
-rw-r--r--meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb4
-rw-r--r--meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch19
-rw-r--r--meta-networking/recipes-support/stunnel/stunnel_5.73.bb (renamed from meta-networking/recipes-support/stunnel/stunnel_5.72.bb)2
-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)4
-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-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_4.5.1.bb (renamed from meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.4.bb)4
-rw-r--r--meta-networking/recipes-support/tnftp/tnftp/0001-Add-casts-to-appease-conversions-between-wchar_t-and.patch77
-rw-r--r--meta-networking/recipes-support/tnftp/tnftp/0002-Add-casts-to-appease-conversions-between-wchar_t-and.patch29
-rw-r--r--meta-networking/recipes-support/tnftp/tnftp_20230507.bb2
-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.patch27
-rw-r--r--meta-networking/recipes-support/udpcast/udpcast_20230924.bb22
-rw-r--r--meta-networking/recipes-support/unbound/unbound/run-ptest17
-rw-r--r--meta-networking/recipes-support/unbound/unbound_1.21.0.bb (renamed from meta-networking/recipes-support/unbound/unbound_1.20.0.bb)25
-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)2
-rw-r--r--meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb (renamed from meta-networking/recipes-support/wireshark/wireshark_4.2.4.bb)2
47 files changed, 340 insertions, 660 deletions
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb
index be74759d5..ba783d03f 100644
--- a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb
+++ b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb
@@ -12,7 +12,6 @@ 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 \
@@ -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 2897b9030..000000000
--- 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_2.3.21.bb b/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb
index 2f887e601..4e76d2452 100644
--- a/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb
+++ b/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb
@@ -50,7 +50,8 @@ SYSTEMD_AUTO_ENABLE = "disable"
50do_install:append () { 50do_install:append () {
51 rm -rf ${D}${libdir}/dovecot/dovecot-config 51 rm -rf ${D}${libdir}/dovecot/dovecot-config
52 install -d 755 ${D}/etc/dovecot 52 install -d 755 ${D}/etc/dovecot
53 touch 644 ${D}/etc/dovecot/dovecot.conf 53 touch ${D}/etc/dovecot/dovecot.conf
54 chmod 644 ${D}/etc/dovecot/dovecot.conf
54 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then 55 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then
55 install -m 0644 ${UNPACKDIR}/dovecot.service ${D}${systemd_unitdir}/system 56 install -m 0644 ${UNPACKDIR}/dovecot.service ${D}${systemd_unitdir}/system
56 sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/dovecot.service 57 sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/dovecot.service
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 b98e1e70c..000000000
--- 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 27f0a9b54..ef0229d5b 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,4 +1,4 @@
1From 264ae7b062ac52a5545a8a562b51001f7ce7369d Mon Sep 17 00:00:00 2001 1From 9109f15f5b8ae142823194b9ef50c392615fe38d 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 usermerge
@@ -16,15 +16,14 @@ Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
16 scripts/drbd.service | 6 +++--- 16 scripts/drbd.service | 6 +++---
17 scripts/drbd@.service | 6 +++--- 17 scripts/drbd@.service | 6 +++---
18 scripts/ocf.ra@.service | 4 ++-- 18 scripts/ocf.ra@.service | 4 ++--
19 user/v83/Makefile.in | 14 +++++++-------
20 user/v84/Makefile.in | 14 +++++++------- 19 user/v84/Makefile.in | 14 +++++++-------
21 10 files changed, 32 insertions(+), 32 deletions(-) 20 9 files changed, 25 insertions(+), 25 deletions(-)
22 21
23diff --git a/configure.ac b/configure.ac 22diff --git a/configure.ac b/configure.ac
24index f1d69ea3..3289ac7d 100644 23index d3ec5ff1..910232b1 100644
25--- a/configure.ac 24--- a/configure.ac
26+++ b/configure.ac 25+++ b/configure.ac
27@@ -183,7 +183,7 @@ AC_ARG_WITH(tmpfilesdir, 26@@ -178,7 +178,7 @@ AC_ARG_WITH(tmpfilesdir,
28 AC_SUBST(tmpfilesdir) 27 AC_SUBST(tmpfilesdir)
29 28
30 # set default early 29 # set default early
@@ -34,10 +33,10 @@ index f1d69ea3..3289ac7d 100644
34 test x"$with_udev" = xyes ; then 33 test x"$with_udev" = xyes ; then
35 if test x"$PKG_CONFIG" != x; then 34 if test x"$PKG_CONFIG" != x; then
36diff --git a/scripts/Makefile.in b/scripts/Makefile.in 35diff --git a/scripts/Makefile.in b/scripts/Makefile.in
37index aca15a22..a1cd2ffe 100644 36index 15a26f37..ff028310 100644
38--- a/scripts/Makefile.in 37--- a/scripts/Makefile.in
39+++ b/scripts/Makefile.in 38+++ b/scripts/Makefile.in
40@@ -91,11 +91,11 @@ ifeq ($(subst both,systemd,$(initscripttype)),systemd) 39@@ -90,11 +90,11 @@ ifeq ($(subst both,systemd,$(initscripttype)),systemd)
41 install -d $(DESTDIR)$(systemdunitdir) 40 install -d $(DESTDIR)$(systemdunitdir)
42 install -m 644 $(SYSTEMD_UNITS) $(DESTDIR)$(systemdunitdir)/ 41 install -m 644 $(SYSTEMD_UNITS) $(DESTDIR)$(systemdunitdir)/
43 install -m 644 $(SYSTEMD_TEMPLATES) $(DESTDIR)$(systemdunitdir)/ 42 install -m 644 $(SYSTEMD_TEMPLATES) $(DESTDIR)$(systemdunitdir)/
@@ -137,37 +136,6 @@ index 9c2268a6..1666c482 100644
137-ExecStopPost=/lib/drbd/scripts/ocf.ra.wrapper.sh stop %n 136-ExecStopPost=/lib/drbd/scripts/ocf.ra.wrapper.sh stop %n
138+ExecStart=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh start-and-monitor %n 137+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 138+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 139diff --git a/user/v84/Makefile.in b/user/v84/Makefile.in
172index 0fcefc5f..81f7d5ec 100644 140index 0fcefc5f..81f7d5ec 100644
173--- a/user/v84/Makefile.in 141--- a/user/v84/Makefile.in
@@ -199,3 +167,6 @@ index 0fcefc5f..81f7d5ec 100644
199 167
200 spell: 168 spell:
201 for f in drbdadm_adjust.c drbdadm_main.c drbdadm_parser.c drbdadm_usage_cnt.c drbdsetup.c drbdtool_common.c; do \ 169 for f in drbdadm_adjust.c drbdadm_main.c drbdadm_parser.c drbdadm_usage_cnt.c drbdsetup.c drbdtool_common.c; do \
170--
1712.25.1
172
diff --git a/meta-networking/recipes-support/drbd/drbd-utils_9.27.0.bb b/meta-networking/recipes-support/drbd/drbd-utils_9.28.0.bb
index 63f0fd18c..af0afc2a9 100644
--- a/meta-networking/recipes-support/drbd/drbd-utils_9.27.0.bb
+++ b/meta-networking/recipes-support/drbd/drbd-utils_9.28.0.bb
@@ -11,9 +11,8 @@ SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=master;prot
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=git/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 \
15 " 14 "
16SRCREV_drbd-utils = "fdd9a4d603a9dc99d110d8bd0e288d7c0b6f586e" 15SRCREV_drbd-utils = "ba2ce9037989b6141222c7901d1219cf852949f1"
17SRCREV_drbd-headers = "0349f00825b4198d4ec3248f43884114a187676a" 16SRCREV_drbd-headers = "0349f00825b4198d4ec3248f43884114a187676a"
18 17
19SRCREV_FORMAT = "drbd-utils_drbd-headers" 18SRCREV_FORMAT = "drbd-utils_drbd-headers"
diff --git a/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb b/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb
index 587a47949..cc23d5a34 100644
--- a/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb
+++ b/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb
@@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "a6cb4ea863ac61d242ffb2db564a39123761578d3e40d71ce7b6f2905b
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 20
21do_install:append() { 21do_install:append() {
22 sed -i 's,${RECIPE_SYSROOT_NATIVE},,g' ${D}${bindir}/fetchmailconf 22 sed -i 's,${RECIPE_SYSROOT_NATIVE},,g' ${D}${bindir}/fetchmailconf
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 e696ac4ea..000000000
--- 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 f3e170740..000000000
--- 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 a1f56cdf1..7cc044d99 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/libconfuse/libconfuse_3.3.bb b/meta-networking/recipes-support/libconfuse/libconfuse_3.3.bb
deleted file mode 100644
index b8d0536eb..000000000
--- 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/libldb/libldb_2.8.0.bb b/meta-networking/recipes-support/libldb/libldb_2.8.1.bb
index bdd87993d..29ff2cf6f 100644
--- a/meta-networking/recipes-support/libldb/libldb_2.8.0.bb
+++ b/meta-networking/recipes-support/libldb/libldb_2.8.1.bb
@@ -34,7 +34,7 @@ LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9ada
34 file://man/ldb.3.xml;beginline=261;endline=262;md5=137f9fd61040c1505d1aa1019663fd08 \ 34 file://man/ldb.3.xml;beginline=261;endline=262;md5=137f9fd61040c1505d1aa1019663fd08 \
35 file://tools/ldbdump.c;endline=19;md5=a7d4fc5d1f75676b49df491575a86a42" 35 file://tools/ldbdump.c;endline=19;md5=a7d4fc5d1f75676b49df491575a86a42"
36 36
37SRC_URI[sha256sum] = "358dca10fcd27207ac857a0d7f435a46dbc6cd1f7c10dbb840c1931bf1965f08" 37SRC_URI[sha256sum] = "b68ce6eb0ccd2870fa3c8c334f2028b5d16606fd41308696c17b71959f7bf59f"
38 38
39inherit pkgconfig waf-samba ptest 39inherit pkgconfig waf-samba ptest
40 40
diff --git a/meta-networking/recipes-support/libtdb/libtdb_1.4.10.bb b/meta-networking/recipes-support/libtdb/libtdb_1.4.12.bb
index bd3f9f63a..a96527a3e 100644
--- a/meta-networking/recipes-support/libtdb/libtdb_1.4.10.bb
+++ b/meta-networking/recipes-support/libtdb/libtdb_1.4.12.bb
@@ -15,7 +15,7 @@ SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \
15 file://run-ptest \ 15 file://run-ptest \
16" 16"
17 17
18SRC_URI[sha256sum] = "02338e33c16c21c9e29571cef523e76b2b708636254f6f30c6cf195d48c62daf" 18SRC_URI[sha256sum] = "6ce4b27498812d09237ece65a0d6dfac0941610e709848ecb822aa241084cd7a"
19 19
20PACKAGECONFIG ??= "\ 20PACKAGECONFIG ??= "\
21 ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ 21 ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \
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 86b9112ba..391e0e4ab 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
@@ -32,3 +32,7 @@ inherit autotools pkgconfig
32EXTRA_OEMAKE += "ROOTPREFIX=${root_prefix}" 32EXTRA_OEMAKE += "ROOTPREFIX=${root_prefix}"
33 33
34FILES:${PN} += "${nonarch_base_libdir}/firmware" 34FILES:${PN} += "${nonarch_base_libdir}/firmware"
35
36# http://errors.yoctoproject.org/Errors/Details/766901/
37# linux-atm-2.5.2/src/led/conn.c:414:57: error: passing argument 3 of 'accept' from incompatible pointer type [-Wincompatible-pointer-types]
38CFLAGS += "-Wno-error=incompatible-pointer-types"
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.20.bb
index 0243f2a1d..a5f9c5543 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.20.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 = "311fcdeb5cb41612d4be66b16f0f2ad6675a6af8"
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 \
@@ -34,19 +31,14 @@ do_install_ptest () {
34 done 31 done
35} 32}
36 33
37SOLIBVERSION="${LK_REL}"
38SOLIBMAJORVERSION="1"
39
40PACKAGES =+ "${PN}-withsctp ${PN}-utils" 34PACKAGES =+ "${PN}-withsctp ${PN}-utils"
41 35
42FILES:${PN} = " \ 36FILES:${PN} = " \
43 ${libdir}/libsctp.so.${SOLIBVERSION} \ 37 ${libdir}/libsctp.so.* \
44 ${libdir}/libsctp.so.${SOLIBMAJORVERSION} \
45" 38"
46 39
47FILES:${PN}-withsctp = " \ 40FILES:${PN}-withsctp = " \
48 ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBVERSION} \ 41 ${libdir}/lksctp-tools/libwithsctp.so.* \
49 ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBMAJORVERSION} \
50" 42"
51 43
52FILES:${PN}-dev += " \ 44FILES:${PN}-dev += " \
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 a827e7f42..fb00b8351 100644
--- a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb
+++ b/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb
@@ -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/ntopng/files/0001-Follow-rrd-post-1.8-change.patch b/meta-networking/recipes-support/ntopng/files/0001-Follow-rrd-post-1.8-change.patch
new file mode 100644
index 000000000..eefd4e1ab
--- /dev/null
+++ b/meta-networking/recipes-support/ntopng/files/0001-Follow-rrd-post-1.8-change.patch
@@ -0,0 +1,32 @@
1From a3bd9efe78f9c381f19b99c8ceb7f52b4c2a52b8 Mon Sep 17 00:00:00 2001
2From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
3Date: Wed, 5 Jun 2024 09:40:17 +0300
4Subject: [PATCH] Follow rrd post-1.8 change
5
6Git version of rrdtool has changed rrd_tune argument from char pointer
7to const char pointer. GCC 14 is more strict regarding the pointer
8constantness checks and errors out in such a case. Update rrd_tune
9invokation.
10
11Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
12Upstream-Status: Pending [CLA is not signed on our side]
13---
14 src/LuaEngineNtop.cpp | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/src/LuaEngineNtop.cpp b/src/LuaEngineNtop.cpp
18index bd2de79e3021..dd00f1608f78 100644
19--- a/src/LuaEngineNtop.cpp
20+++ b/src/LuaEngineNtop.cpp
21@@ -5427,7 +5427,7 @@ static int ntop_rrd_tune(lua_State* vm) {
22 filename = argv[1];
23
24 reset_rrd_state();
25- status = rrd_tune(argc, (char**)argv);
26+ status = rrd_tune(argc, (const char**)argv);
27
28 if(status != 0) {
29 char *err = rrd_get_error();
30--
312.39.2
32
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 a9ace9b41..9bb93910f 100644
--- a/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb
+++ b/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb
@@ -19,6 +19,7 @@ SRC_URI = "git://github.com/ntop/ntopng.git;protocol=https;branch=5.2-stable \
19 file://0001-autogen.sh-generate-configure.ac-only.patch \ 19 file://0001-autogen.sh-generate-configure.ac-only.patch \
20 file://0001-configure.ac.in-not-check-clang-on-host.patch \ 20 file://0001-configure.ac.in-not-check-clang-on-host.patch \
21 file://0001-configure.ac.in-Allow-dynamic-linking-against-ndpi-3.patch \ 21 file://0001-configure.ac.in-Allow-dynamic-linking-against-ndpi-3.patch \
22 file://0001-Follow-rrd-post-1.8-change.patch \
22 file://ntopng.service \ 23 file://ntopng.service \
23 " 24 "
24 25
diff --git a/meta-networking/recipes-support/ntp/ntp/ntpd b/meta-networking/recipes-support/ntp/ntp/ntpd
index d1b9c4907..a0c43ed5e 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.8p17.bb b/meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb
index 5fa8db9ee..302cf9915 100644
--- a/meta-networking/recipes-support/ntp/ntp_4.2.8p17.bb
+++ b/meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb
@@ -6,7 +6,7 @@ or satellite receiver or modem."
6HOMEPAGE = "http://support.ntp.org" 6HOMEPAGE = "http://support.ntp.org"
7SECTION = "net" 7SECTION = "net"
8LICENSE = "NTP" 8LICENSE = "NTP"
9LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3a8ffebbcad335abf2c39fec38671eec" 9LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=2311915f6d5142b06395231b0ffeaf29"
10 10
11DEPENDS = "libevent" 11DEPENDS = "libevent"
12 12
@@ -24,7 +24,7 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g
24 file://ntpd.list \ 24 file://ntpd.list \
25" 25"
26 26
27SRC_URI[sha256sum] = "103dd272e6a66c5b8df07dce5e9a02555fcd6f1397bdfb782237328e89d3a866" 27SRC_URI[sha256sum] = "cf84c5f3fb1a295284942624d823fffa634144e096cfc4f9969ac98ef5f468e5"
28 28
29CVE_STATUS[CVE-2016-9312] = "not-applicable-platform: Issue only applies on Windows" 29CVE_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" 30CVE_STATUS[CVE-2019-11331] = "upstream-wontfix: inherent to RFC 5905 and cannot be fixed without breaking compatibility"
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.4.5.bb
index 7e3fe5601..217829193 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.4.5.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.4.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 \
@@ -50,7 +50,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P<pver>\d+(\.\d+)+)"
50SRC_URI:append:libc-musl = " file://0001-Add-resolv_compat.h-for-musl-builds.patch;patchdir=.. \ 50SRC_URI:append:libc-musl = " file://0001-Add-resolv_compat.h-for-musl-builds.patch;patchdir=.. \
51" 51"
52 52
53SRCREV = "1b362b9eb449fb5de3809aaea4a636ece30ee5b7" 53SRCREV = "9b94132f54fbed0b86dce04ff4402d1d8fd059c3"
54 54
55S = "${WORKDIR}/git/open-vm-tools" 55S = "${WORKDIR}/git/open-vm-tools"
56 56
@@ -64,7 +64,7 @@ inherit autotools pkgconfig systemd update-rc.d
64SYSTEMD_SERVICE:${PN} = "vmtoolsd.service" 64SYSTEMD_SERVICE:${PN} = "vmtoolsd.service"
65 65
66EXTRA_OECONF = "--without-icu --disable-multimon --disable-docs \ 66EXTRA_OECONF = "--without-icu --disable-multimon --disable-docs \
67 --disable-tests --without-gtkmm --without-xerces --without-pam \ 67 --disable-tests --without-gtkmm --without-pam \
68 --disable-vgauth --disable-deploypkg --disable-containerinfo \ 68 --disable-vgauth --disable-deploypkg --disable-containerinfo \
69 --without-root-privileges --without-kernel-modules --with-tirpc \ 69 --without-root-privileges --without-kernel-modules --with-tirpc \
70 --with-udev-rules-dir=${nonarch_base_libdir}/udev/rules.d" 70 --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 c7c757367..74c5ef220 100644
--- a/meta-networking/recipes-support/openipmi/openipmi_2.0.35.bb
+++ b/meta-networking/recipes-support/openipmi/openipmi_2.0.36.bb
@@ -34,7 +34,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \
34 34
35S = "${WORKDIR}/OpenIPMI-${PV}" 35S = "${WORKDIR}/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 03b454d62..e1253db1e 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_2.6.10.bb b/meta-networking/recipes-support/openvpn/openvpn_2.6.12.bb
index ba53d40f4..d81b8ce44 100644
--- a/meta-networking/recipes-support/openvpn/openvpn_2.6.10.bb
+++ b/meta-networking/recipes-support/openvpn/openvpn_2.6.12.bb
@@ -14,7 +14,7 @@ SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \
14 14
15UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads" 15UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads"
16 16
17SRC_URI[sha256sum] = "1993bbb7b9edb430626eaa24573f881fd3df642f427fcb824b1aed1fca1bcc9b" 17SRC_URI[sha256sum] = "1c610fddeb686e34f1367c347e027e418e07523a10f4d8ce4a2c2af2f61a1929"
18 18
19CVE_STATUS[CVE-2020-27569] = "not-applicable-config: Applies only Aviatrix OpenVPN client, not openvpn" 19CVE_STATUS[CVE-2020-27569] = "not-applicable-config: Applies only Aviatrix OpenVPN client, not openvpn"
20 20
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
new file mode 100644
index 000000000..092f4431b
--- /dev/null
+++ b/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-overloadable-function-attribute-with-c.patch
@@ -0,0 +1,38 @@
1From c7de6834f0cd92b7341ab17a5c6996f3fbd40140 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 21 Jun 2024 22:16:47 -0700
4Subject: [PATCH] librdmacm: Use overloadable function attribute with clang
5
6 This is to fix build warnings seen with upcoming clang19 and
7 glibc 2.40, since glibc 2.40 has improved fortyfying this
8 function with clang, it ends up with build errors like below
9
10librdmacm/preload.c:796:9: error: at most one overload for a given name may lack the 'overloadable' attribute
11| 796 | ssize_t recvfrom(int socket, void *buf, size_t len, int flags,
12| | ^
13| /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/rdma-core/51.0/recipe-sysroot/usr/include/sys/socket.h:163:16: note: previous unmarked overload of function is here
14| 163 | extern ssize_t recvfrom (int __fd, void *__restrict __buf, size_t __n,
15| | ^
16
17Upstream-Status: Submitted [https://github.com/linux-rdma/rdma-core/pull/1475]
18Signed-off-by: Khem Raj <raj.khem@gmail.com>
19---
20 librdmacm/preload.c | 7 +++++--
21 1 file changed, 5 insertions(+), 2 deletions(-)
22
23--- a/librdmacm/preload.c
24+++ b/librdmacm/preload.c
25@@ -792,8 +792,11 @@ ssize_t recv(int socket, void *buf, size
26 return (fd_fork_get(socket, &fd) == fd_rsocket) ?
27 rrecv(fd, buf, len, flags) : real.recv(fd, buf, len, flags);
28 }
29-
30-ssize_t recvfrom(int socket, void *buf, size_t len, int flags,
31+ssize_t
32+#if defined(__clang__) && defined(__GLIBC__)
33+__attribute__((overloadable))
34+#endif
35+recvfrom(int socket, void *buf, size_t len, int flags,
36 struct sockaddr *src_addr, socklen_t *addrlen)
37 {
38 int fd;
diff --git a/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb b/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb
index 7c26a8c43..0c204c109 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
@@ -8,6 +8,7 @@ RDEPENDS:${PN} = "bash perl"
8SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=https \ 8SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=https \
9 file://0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch \ 9 file://0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch \
10 file://0001-include-libgen.h-for-basename.patch \ 10 file://0001-include-libgen.h-for-basename.patch \
11 file://0001-librdmacm-Use-overloadable-function-attribute-with-c.patch \
11" 12"
12SRCREV = "6cd09097ad2eebde9a7fa3d3bb09a2cea6e3c2d6" 13SRCREV = "6cd09097ad2eebde9a7fa3d3bb09a2cea6e3c2d6"
13S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
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 50248078a..518ca9e27 100644
--- a/meta-networking/recipes-support/sngrep/sngrep_1.8.1.bb
+++ b/meta-networking/recipes-support/sngrep/sngrep_1.8.2.bb
@@ -16,7 +16,7 @@ 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" 21S = "${WORKDIR}/git"
22 22
diff --git a/meta-networking/recipes-support/spice/usbredir_0.13.0.bb b/meta-networking/recipes-support/spice/usbredir_0.14.0.bb
index 3a73f9b18..82f48ccdb 100644
--- a/meta-networking/recipes-support/spice/usbredir_0.13.0.bb
+++ b/meta-networking/recipes-support/spice/usbredir_0.14.0.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
7 7
8DEPENDS = "libusb1 glib-2.0" 8DEPENDS = "libusb1 glib-2.0"
9 9
10SRCREV = "5fc0e1c43194d948545941d408f4c10d084eb6ed" 10SRCREV = "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
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 0531ffe64..2d6311975 100644
--- a/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb
+++ b/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb
@@ -15,3 +15,7 @@ CFLAGS += "-D_GNU_SOURCE "
15do_install() { 15do_install() {
16 oe_runmake 'DESTDIR=${D}' 'PREFIX=${prefix}' install 16 oe_runmake 'DESTDIR=${D}' 'PREFIX=${prefix}' install
17} 17}
18
19# http://errors.yoctoproject.org/Errors/Details/766895/
20# ssmping.c:55:51: error: passing argument 3 of 'getsockname' from incompatible pointer type [-Wincompatible-pointer-types]
21CFLAGS += "-Wno-error=incompatible-pointer-types"
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 82d355101..8c4ca55fb 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 c815368a3e41dd3f639eb8fd82d21bc0bab55d1e 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 f112cf9..8d4be01 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@@ -496,7 +496,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 c8c65ea..b071b06 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@@ -1334,7 +1334,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@@ -1377,7 +1377,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.73.bb
index 6d21027a1..e13b7871c 100644
--- a/meta-networking/recipes-support/stunnel/stunnel_5.72.bb
+++ b/meta-networking/recipes-support/stunnel/stunnel_5.73.bb
@@ -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] = "bc917c3bcd943a4d632360c067977a31e85e385f5f4845f69749bce88183cb38"
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 2bfb2267d..2bfb2267d 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 803a9bb5f..32b869f24 100644
--- a/meta-networking/recipes-support/tcpdump/tcpdump_4.99.4.bb
+++ b/meta-networking/recipes-support/tcpdump/tcpdump_4.99.5.bb
@@ -21,12 +21,12 @@ 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
diff --git a/meta-networking/recipes-support/tcpdump/tcpslice_1.7.bb b/meta-networking/recipes-support/tcpdump/tcpslice_1.8.bb
index 93197dc3b..3d61160bb 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-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 08cb3b88f..000000000
--- 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 709d2cccb..000000000
--- 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_4.4.4.bb b/meta-networking/recipes-support/tcpreplay/tcpreplay_4.5.1.bb
index 26de40a65..f01bbb95a 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,9 @@ 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 \
13 file://0001-configure.ac-do-not-run-conftest-in-case-of-cross-co.patch \
14" 12"
15 13
16SRC_URI[sha256sum] = "44f18fb6d3470ecaf77a51b901a119dae16da5be4d4140ffbb2785e37ad6d4bf" 14SRC_URI[sha256sum] = "2de79bfd67ec92ca9ae2ffb50456dd1d53ff40f3fa71b422c65e8062013c9e85"
17 15
18UPSTREAM_CHECK_URI = "https://github.com/appneta/tcpreplay/releases" 16UPSTREAM_CHECK_URI = "https://github.com/appneta/tcpreplay/releases"
19 17
diff --git a/meta-networking/recipes-support/tnftp/tnftp/0001-Add-casts-to-appease-conversions-between-wchar_t-and.patch b/meta-networking/recipes-support/tnftp/tnftp/0001-Add-casts-to-appease-conversions-between-wchar_t-and.patch
new file mode 100644
index 000000000..bbd6c7843
--- /dev/null
+++ b/meta-networking/recipes-support/tnftp/tnftp/0001-Add-casts-to-appease-conversions-between-wchar_t-and.patch
@@ -0,0 +1,77 @@
1From 46477eb182af51b5da8299b295a6d61e566e3693 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Fri, 14 Jun 2024 06:27:19 +0000
4Subject: [PATCH] Add casts to appease conversions between wchar_t and wint_t
5
6Upstream-Status: Backport [http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libedit/refresh.c.diff?r1=1.57&r2=1.58&only_with_tag=MAIN&f=h]
7
8Signed-off-by: Changqing Li <changqing.li@windriver.com>
9---
10 libedit/refresh.c | 16 +++++++++-------
11 1 file changed, 9 insertions(+), 7 deletions(-)
12
13diff --git a/libedit/refresh.c b/libedit/refresh.c
14index 093f993..a6d4574 100644
15--- a/libedit/refresh.c
16+++ b/libedit/refresh.c
17@@ -111,7 +111,7 @@ re_nextline(EditLine *el)
18 */
19 if (el->el_refresh.r_cursor.v + 1 >= el->el_terminal.t_size.v) {
20 int i, lins = el->el_terminal.t_size.v;
21- wchar_t *firstline = el->el_vdisplay[0];
22+ wint_t *firstline = el->el_vdisplay[0];
23
24 for(i = 1; i < lins; i++)
25 el->el_vdisplay[i - 1] = el->el_vdisplay[i];
26@@ -340,7 +340,8 @@ re_refresh(EditLine *el)
27 ELRE_DEBUG(1, (__F, "updating %d lines.\r\n", el->el_refresh.r_newcv));
28 for (i = 0; i <= el->el_refresh.r_newcv; i++) {
29 /* NOTE THAT re_update_line MAY CHANGE el_display[i] */
30- re_update_line(el, el->el_display[i], el->el_vdisplay[i], i);
31+ re_update_line(el, (wchar_t *)el->el_display[i],
32+ (wchar_t *)el->el_vdisplay[i], i);
33
34 /*
35 * Copy the new line to be the current one, and pad out with
36@@ -349,8 +350,9 @@ re_refresh(EditLine *el)
37 * end of the screen line, it won't be a NUL or some old
38 * leftover stuff.
39 */
40- re__copy_and_pad(el->el_display[i], el->el_vdisplay[i],
41- (size_t) el->el_terminal.t_size.h);
42+ re__copy_and_pad((wchar_t *)el->el_display[i],
43+ (wchar_t *)el->el_vdisplay[i],
44+ (size_t) el->el_terminal.t_size.h);
45 }
46 ELRE_DEBUG(1, (__F,
47 "\r\nel->el_refresh.r_cursor.v=%d,el->el_refresh.r_oldcv=%d i=%d\r\n",
48@@ -361,7 +363,7 @@ re_refresh(EditLine *el)
49 terminal_move_to_line(el, i);
50 terminal_move_to_char(el, 0);
51 /* This wcslen should be safe even with MB_FILL_CHARs */
52- terminal_clear_EOL(el, (int) wcslen(el->el_display[i]));
53+ terminal_clear_EOL(el, (int) wcslen((const wchar_t *)el->el_display[i]));
54 #ifdef DEBUG_REFRESH
55 terminal_overwrite(el, L"C\b", 2);
56 #endif /* DEBUG_REFRESH */
57@@ -1097,7 +1099,7 @@ re_refresh_cursor(EditLine *el)
58 static void
59 re_fastputc(EditLine *el, wint_t c)
60 {
61- wchar_t *lastline;
62+ wint_t *lastline;
63 int w;
64
65 w = wcwidth(c);
66@@ -1132,7 +1134,7 @@ re_fastputc(EditLine *el, wint_t c)
67 el->el_cursor.v++;
68 lastline = el->el_display[++el->el_refresh.r_oldcv];
69 }
70- re__copy_and_pad(lastline, L"", (size_t)el->el_terminal.t_size.h);
71+ re__copy_and_pad((wchar_t *)lastline, L"", (size_t)el->el_terminal.t_size.h);
72
73 if (EL_HAS_AUTO_MARGINS) {
74 if (EL_HAS_MAGIC_MARGINS) {
75--
762.35.5
77
diff --git a/meta-networking/recipes-support/tnftp/tnftp/0002-Add-casts-to-appease-conversions-between-wchar_t-and.patch b/meta-networking/recipes-support/tnftp/tnftp/0002-Add-casts-to-appease-conversions-between-wchar_t-and.patch
new file mode 100644
index 000000000..c041d0a9d
--- /dev/null
+++ b/meta-networking/recipes-support/tnftp/tnftp/0002-Add-casts-to-appease-conversions-between-wchar_t-and.patch
@@ -0,0 +1,29 @@
1From 5c8334f86d139de987c716a0d5acc0f40d8d3b7d Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Fri, 14 Jun 2024 06:38:37 +0000
4Subject: [PATCH] Add casts to appease conversions between wchar_t and wint_t
5
6Upstream-Status: Backport [http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libedit/terminal.c.diff?r1=1.43&r2=1.44&only_with_tag=MAIN&f=h]
7
8Signed-off-by: Changqing Li <changqing.li@windriver.com>
9---
10 libedit/terminal.c | 3 ++-
11 1 file changed, 2 insertions(+), 1 deletion(-)
12
13diff --git a/libedit/terminal.c b/libedit/terminal.c
14index 19cee48..13f7bcd 100644
15--- a/libedit/terminal.c
16+++ b/libedit/terminal.c
17@@ -594,7 +594,8 @@ mc_again:
18 * NOTE THAT terminal_overwrite() WILL CHANGE
19 * el->el_cursor.h!!!
20 */
21- terminal_overwrite(el, &el->el_display[
22+ terminal_overwrite(el,
23+ (wchar_t *)&el->el_display[
24 el->el_cursor.v][el->el_cursor.h],
25 (size_t)(where - el->el_cursor.h));
26
27--
282.35.5
29
diff --git a/meta-networking/recipes-support/tnftp/tnftp_20230507.bb b/meta-networking/recipes-support/tnftp/tnftp_20230507.bb
index bdd9759f2..4ab694fbb 100644
--- a/meta-networking/recipes-support/tnftp/tnftp_20230507.bb
+++ b/meta-networking/recipes-support/tnftp/tnftp_20230507.bb
@@ -16,6 +16,8 @@ DEPENDS = "ncurses"
16 16
17SRC_URI = "https://ftp.netbsd.org/pub/NetBSD/misc/tnftp/${BPN}-${PV}.tar.gz \ 17SRC_URI = "https://ftp.netbsd.org/pub/NetBSD/misc/tnftp/${BPN}-${PV}.tar.gz \
18 file://0001-libedit-Include-missing-header-stdc-predef.h.patch \ 18 file://0001-libedit-Include-missing-header-stdc-predef.h.patch \
19 file://0001-Add-casts-to-appease-conversions-between-wchar_t-and.patch \
20 file://0002-Add-casts-to-appease-conversions-between-wchar_t-and.patch \
19" 21"
20 22
21inherit autotools update-alternatives pkgconfig 23inherit autotools update-alternatives pkgconfig
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 862cba91e..b72c37540 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
new file mode 100644
index 000000000..e3d65db73
--- /dev/null
+++ b/meta-networking/recipes-support/udpcast/udpcast/0001-include-stddef.h-for-ptrdiff_t.patch
@@ -0,0 +1,27 @@
1From 5203821a936b1927c401034fe323686ad9eafb04 Mon Sep 17 00:00:00 2001
2From: Enguerrand de Ribaucourt <enguerrand.de-ribaucourt@savoirfairelinux.com>
3Date: Thu, 6 Jun 2024 15:57:12 +0200
4Subject: [PATCH 1/1] include stddef.h for ptrdiff_t
5
6This fixes compilation with musl.
7
8Upstream-Status: Pending
9
10Signed-off-by: Enguerrand de Ribaucourt <enguerrand.de-ribaucourt@savoirfairelinux.com>
11---
12 receivedata.c | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/receivedata.c b/receivedata.c
16index 9a68f67..0aa797f 100644
17--- a/receivedata.c
18+++ b/receivedata.c
19@@ -1,4 +1,5 @@
20 #include <assert.h>
21+#include <stddef.h>
22 #include <sys/types.h>
23 #include <unistd.h>
24 #include <stdlib.h>
25--
262.34.1
27
diff --git a/meta-networking/recipes-support/udpcast/udpcast_20230924.bb b/meta-networking/recipes-support/udpcast/udpcast_20230924.bb
new file mode 100644
index 000000000..f93f9850a
--- /dev/null
+++ b/meta-networking/recipes-support/udpcast/udpcast_20230924.bb
@@ -0,0 +1,22 @@
1SUMMARY = "UDP broadcast file distribution and installation"
2DESCRIPTION = "UDPcast is a file transfer tool that can send data \
3simultaneously to many destinations on a LAN. This can for instance be \
4used to install entire classrooms of PC's at once. The advantage of UDPcast \
5over using other methods (nfs, ftp, whatever) is that UDPcast uses UDP's \
6multicast abilities: it won't take longer to install 15 machines than it would \
7to install just 2."
8HOMEPAGE = "http://www.udpcast.linux.lu/"
9SECTION = "console/network"
10LICENSE = "GPL-2.0-or-later & BSD-2-Clause"
11LIC_FILES_CHKSUM = "file://COPYING;md5=e3cf524a29c8476be354bb329d36ff80"
12
13SRC_URI = "http://www.udpcast.linux.lu/download/${BP}.tar.gz \
14 file://0001-include-stddef.h-for-ptrdiff_t.patch \
15 "
16SRC_URI[sha256sum] = "17b5cd8b1e54f7e2e53357ac02ee86e4198bf704096987a03a3b5c402a0ecea1"
17
18# Installation of rateGovernor.h fails without brokensep
19inherit autotools-brokensep manpages
20
21# pod2man required to build manpages
22DEPENDS += "perl-native"
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 000000000..433a687c6
--- /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.21.0.bb
index fe0111f59..8c042dc5f 100644
--- a/meta-networking/recipes-support/unbound/unbound_1.20.0.bb
+++ b/meta-networking/recipes-support/unbound/unbound_1.21.0.bb
@@ -9,10 +9,12 @@ 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 "
15SRCREV = "79e4c578518886a32475cfbb0de383ff3a905033"
14 16
15inherit autotools pkgconfig systemd update-rc.d 17inherit autotools pkgconfig systemd update-rc.d ptest
16 18
17DEPENDS = "openssl libtool-native bison-native expat" 19DEPENDS = "openssl libtool-native bison-native expat"
18RDEPENDS:${PN} = "bash openssl-bin daemonize" 20RDEPENDS:${PN} = "bash openssl-bin daemonize"
@@ -32,6 +34,10 @@ do_configure:append() {
32 sed -i -e 's#${RECIPE_SYSROOT}##g' ${B}/config.h 34 sed -i -e 's#${RECIPE_SYSROOT}##g' ${B}/config.h
33} 35}
34 36
37do_compile:append() {
38 oe_runmake tests
39}
40
35do_install:append() { 41do_install:append() {
36 install -d ${D}${systemd_unitdir}/system 42 install -d ${D}${systemd_unitdir}/system
37 install -m 0644 ${B}/contrib/unbound.service ${D}${systemd_unitdir}/system 43 install -m 0644 ${B}/contrib/unbound.service ${D}${systemd_unitdir}/system
@@ -40,6 +46,19 @@ do_install:append() {
40 install -m 0755 ${S}/contrib/unbound.init_yocto ${D}${sysconfdir}/init.d/unbound 46 install -m 0755 ${S}/contrib/unbound.init_yocto ${D}${sysconfdir}/init.d/unbound
41} 47}
42 48
49do_install_ptest() {
50 install -d ${D}${PTEST_PATH}/tests
51 install -d ${D}${PTEST_PATH}/tests/testdata
52
53 install -m 0544 ${B}/unittest ${D}${PTEST_PATH}/tests/
54 install -m 0544 ${B}/testbound ${D}${PTEST_PATH}/tests/
55 install -m 0664 ${S}/testdata/test_signatures* ${D}${PTEST_PATH}/tests/
56 install -m 0664 ${S}/testdata/test_sigs* ${D}${PTEST_PATH}/tests/
57 install -m 0664 ${S}/testdata/test_ds* ${D}${PTEST_PATH}/tests/
58 install -m 0664 ${S}/testdata/test_nsec3_hash* ${D}${PTEST_PATH}/tests/
59 install -m 0644 ${S}/testdata/*.rpl ${D}/${PTEST_PATH}/tests/testdata/
60}
61
43SYSTEMD_SERVICE:${PN} = "${BPN}.service" 62SYSTEMD_SERVICE:${PN} = "${BPN}.service"
44 63
45INITSCRIPT_NAME = "unbound" 64INITSCRIPT_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 9da43cf9f..c3de38a6f 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.
diff --git a/meta-networking/recipes-support/wireshark/wireshark_4.2.4.bb b/meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb
index 95db2efc4..b80710683 100644
--- a/meta-networking/recipes-support/wireshark/wireshark_4.2.4.bb
+++ b/meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb
@@ -17,7 +17,7 @@ SRC_URI = "https://1.eu.dl.wireshark.org/src/wireshark-${PV}.tar.xz \
17 17
18UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" 18UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src"
19 19
20SRC_URI[sha256sum] = "46bd0f4474337144b30816fb2d8f14e72a26d0391f24fe0b7b619acdcdad8c0c" 20SRC_URI[sha256sum] = "2c5de08e19081bd666a2ce3f052c023274d06acaabc5d667a3c3051a9c618f86"
21 21
22PE = "1" 22PE = "1"
23 23
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-09-28 10:55:41 +0000