diff options
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-support')
41 files changed, 272 insertions, 662 deletions
diff --git a/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp/0002-fix-invalid-conversion-from-int-to-CURLoption.patch b/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp/0002-fix-invalid-conversion-from-int-to-CURLoption.patch new file mode 100644 index 0000000000..1712a53462 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp/0002-fix-invalid-conversion-from-int-to-CURLoption.patch @@ -0,0 +1,36 @@ +From ebe9144fdfdc8154661b93322cec4a1c43aa75ff Mon Sep 17 00:00:00 2001 +From: alperak <alperyasinak1@gmail.com> +Date: Tue, 1 Oct 2024 19:45:38 +0300 +Subject: [PATCH] Fix invalid conversion from int to CURLoption + +Options.hpp:281:74: error: invalid conversion from 'int' to 'CURLoption' [-fpermissive] + 281 | typedef curlpp::OptionTrait<curl_closepolicy, CURLOPT_CLOSEPOLICY> ClosePolicy; + | ^ + | | + | int + +Fix invalid conversion by adding explicit cast to CURLoption + +Upstream-Status: Pending + +Signed-off-by: alperak <alperyasinak1@gmail.com> +--- + include/curlpp/Options.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/curlpp/Options.hpp b/include/curlpp/Options.hpp +index c705c9d..7c9a501 100644 +--- a/include/curlpp/Options.hpp ++++ b/include/curlpp/Options.hpp +@@ -278,7 +278,7 @@ namespace options + typedef curlpp::OptionTrait<long, CURLOPT_LOW_SPEED_LIMIT> LowSpeedLimit; + typedef curlpp::OptionTrait<long, CURLOPT_LOW_SPEED_TIME> LowSpeedTime; + typedef curlpp::OptionTrait<long, CURLOPT_MAXCONNECTS> MaxConnects; +- typedef curlpp::OptionTrait<curl_closepolicy, CURLOPT_CLOSEPOLICY> ClosePolicy; ++ typedef curlpp::OptionTrait<curl_closepolicy, (CURLoption)CURLOPT_CLOSEPOLICY> ClosePolicy; + typedef curlpp::OptionTrait<bool, CURLOPT_FRESH_CONNECT> FreshConnect; + typedef curlpp::OptionTrait<bool, CURLOPT_FORBID_REUSE> ForbidReuse; + typedef curlpp::OptionTrait<long, CURLOPT_CONNECTTIMEOUT> ConnectTimeout; +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb b/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb index 131f1873a2..cacdc9773b 100644 --- a/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb @@ -8,7 +8,8 @@ DEPENDS = "curl" DEPENDS:class-native = "curl-native" SRC_URI = "git://github.com/jpbarrette/curlpp.git;branch=master;protocol=https \ - file://0001-curlpp-config.in-Remove-references-to-absolute-build.patch" + file://0001-curlpp-config.in-Remove-references-to-absolute-build.patch \ + file://0002-fix-invalid-conversion-from-int-to-CURLoption.patch" SRCREV = "592552a165cc569dac7674cb7fc9de3dc829906f" diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb index be74759d5e..ba783d03ff 100644 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb +++ b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb @@ -12,7 +12,6 @@ DEPENDS += "gettext-native" #at least versions 2.69 and prior are moved to the archive folder on the server SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getVar('PV').split('.')[1]) > 69]}dnsmasq-${PV}.tar.gz \ file://init \ - file://dnsmasq.conf \ file://dnsmasq-resolvconf.service \ file://dnsmasq-noresolvconf.service \ file://dnsmasq-resolved.conf \ @@ -25,8 +24,13 @@ INITSCRIPT_NAME = "dnsmasq" INITSCRIPT_PARAMS = "defaults" # dnsmasq defaults -PACKAGECONFIG ?= "auth dhcp dhcp6 dumpfile inotify ipset loop script tftp" +PACKAGECONFIG ?= "\ + auth dhcp dumpfile inotify ipset loop script tftp \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'dhcp6', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'rtc', '', 'broken-rtc', d)} \ +" +# see src/config.h PACKAGECONFIG[auth] = "-DHAVE_AUTH,-DNO_AUTH" PACKAGECONFIG[broken-rtc] = "-DHAVE_BROKEN_RTC," PACKAGECONFIG[conntrack] = "-DHAVE_CONNTRACK,,libnetfilter-conntrack" @@ -81,7 +85,7 @@ do_install () { "MANDIR=${D}${mandir}" \ install-i18n install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d ${D}${sysconfdir}/dnsmasq.d - install -m 644 ${UNPACKDIR}/dnsmasq.conf ${D}${sysconfdir}/ + install -m 644 ${S}/dnsmasq.conf.example ${D}${sysconfdir}/dnsmasq.conf install -m 755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq install -d ${D}${systemd_unitdir}/system diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf b/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf deleted file mode 100755 index 2897b90300..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf +++ /dev/null @@ -1,298 +0,0 @@ -# Configuration file for dnsmasq. -# -# Format is one option per line, legal options are the same -# as the long options legal on the command line. See -# "/usr/bin/dnsmasq --help" or "man 8 dnsmasq" for details. - -# Listen on this specific port instead of the standard DNS port -# (53). Setting this to zero completely disables DNS function, -# leaving only DHCP and/or TFTP. -#port=5353 - -# Change these lines if you want dnsmasq to serve MX records. -# Only one of mx-host and mx-target need be set, the other defaults -# to the name of the host running dnsmasq. -#mx-host= -#mx-target= -#selfmx -#localmx - -# The following two options make you a better netizen, since they -# tell dnsmasq to filter out queries which the public DNS cannot -# answer, and which load the servers (especially the root servers) -# uneccessarily. If you have a dial-on-demand link they also stop -# these requests from bringing up the link uneccessarily. - -# Never forward plain names (with a dot or domain part) -domain-needed -# Never forward addresses in the non-routed address spaces. -bogus-priv - - -# Uncomment this to filter useless windows-originated DNS requests -# which can trigger dial-on-demand links needlessly. -# Note that (amongst other things) this blocks all SRV requests, -# so don't use it if you use eg Kerberos. -#filterwin2k - -# Change this line if you want dns to get its upstream servers from -# somewhere other that /etc/resolv.conf -#resolv-file= - -# By default, dnsmasq will send queries to any of the upstream -# servers it knows about and tries to favour servers to are known -# to be up. Uncommenting this forces dnsmasq to try each query -# with each server strictly in the order they appear in -# /etc/resolv.conf -#strict-order - -# If you don't want dnsmasq to read /etc/resolv.conf or any other -# file, getting its servers for this file instead (see below), then -# uncomment this -#no-resolv - -# If you don't want dnsmasq to poll /etc/resolv.conf or other resolv -# files for changes and re-read them then uncomment this. -#no-poll - -# Add other name servers here, with domain specs if they are for -# non-public domains. -#server=/localnet/192.168.0.1 - -# Add local-only domains here, queries in these domains are answered -# from /etc/hosts or DHCP only. -#local=/localnet/ - -# Add domains which you want to force to an IP address here. -# The example below send any host in doubleclick.net to a local -# webserver. -#address=/doubleclick.net/127.0.0.1 - -# You no longer (as of version 1.7) need to set these to enable -# dnsmasq to read /etc/ppp/resolv.conf since dnsmasq now uses the -# "dip" group to achieve this. -#user= -#group= - -# If you want dnsmasq to listen for requests only on specified interfaces -# (and the loopback) give the name of the interface (eg eth0) here. -# Repeat the line for more than one interface. -#interface= -# Or you can specify which interface _not_ to listen on -#except-interface= -# Or which to listen on by address (remember to include 127.0.0.1 if -# you use this.) -#listen-address=127.0.0.1 - -# On systems which support it, dnsmasq binds the wildcard address, -# even when it is listening on only some interfaces. It then discards -# requests that it shouldn't reply to. This has the advantage of -# working even when interfaces come and go and change address. If you -# want dnsmasq to really bind only the interfaces it is listening on, -# uncomment this option. About the only time you may need this is when -# running another nameserver on the same machine. -#bind-interfaces - -# If you don't want dnsmasq to read /etc/hosts, uncomment the -# following line. -#no-hosts -# or if you want it to read another file, as well as /etc/hosts, use -# this. -#addn-hosts=/etc/banner_add_hosts - -# Set this (and domain: see below) if you want to have a domain -# automatically added to simple names in a hosts-file. -#expand-hosts - -# Set the domain for dnsmasq. this is optional, but if it is set, it -# does the following things. -# 1) Allows DHCP hosts to have fully qualified domain names, as long -# as the domain part matches this setting. -# 2) Sets the "domain" DHCP option thereby potentially setting the -# domain of all systems configured by DHCP -# 3) Provides the domain part for "expand-hosts" -#domain=thekelleys.org.uk - -# Uncomment this to enable the integrated DHCP server, you need -# to supply the range of addresses available for lease and optionally -# a lease time. If you have more than one network, you will need to -# repeat this for each network on which you want to supply DHCP -# service. -#dhcp-range=192.168.0.50,192.168.0.150,12h -#dhcp-range=10.0.0.10,10.0.0.200,2h - -# This is an example of a DHCP range where the netmask is given. This -# is needed for networks we reach the dnsmasq DHCP server via a relay -# agent. If you don't know what a DHCP relay agent is, you probably -# don't need to worry about this. -#dhcp-range=192.168.0.50,192.168.0.150,255.255.255.0,12h - -# This is an example of a DHCP range with a network-id, so that -# some DHCP options may be set only for this network. -#dhcp-range=red,192.168.0.50,192.168.0.150 - -# Supply parameters for specified hosts using DHCP. There are lots -# of valid alternatives, so we will give examples of each. Note that -# IP addresses DO NOT have to be in the range given above, they just -# need to be on the same network. The order of the parameters in these -# do not matter, it's permissble to give name,adddress and MAC in any order - -# Always allocate the host with ethernet address 11:22:33:44:55:66 -# The IP address 192.168.0.60 -#dhcp-host=11:22:33:44:55:66,192.168.0.60 - -# Always set the name of the host with hardware address -# 11:22:33:44:55:66 to be "fred" -#dhcp-host=11:22:33:44:55:66,fred - -# Always give the host with ethernet address 11:22:33:44:55:66 -# the name fred and IP address 192.168.0.60 and lease time 45 minutes -#dhcp-host=11:22:33:44:55:66,fred,192.168.0.60,45m - -# Give the machine which says it's name is "bert" IP address -# 192.168.0.70 and an infinite lease -#dhcp-host=bert,192.168.0.70,infinite - -# Always give the host with client identifier 01:02:02:04 -# the IP address 192.168.0.60 -#dhcp-host=id:01:02:02:04,192.168.0.60 - -# Always give the host with client identifier "marjorie" -# the IP address 192.168.0.60 -#dhcp-host=id:marjorie,192.168.0.60 - -# Enable the address given for "judge" in /etc/hosts -# to be given to a machine presenting the name "judge" when -# it asks for a DHCP lease. -#dhcp-host=judge - -# Never offer DHCP service to a machine whose ethernet -# address is 11:22:33:44:55:66 -#dhcp-host=11:22:33:44:55:66,ignore - -# Ignore any client-id presented by the machine with ethernet -# address 11:22:33:44:55:66. This is useful to prevent a machine -# being treated differently when running under different OS's or -# between PXE boot and OS boot. -#dhcp-host=11:22:33:44:55:66,id:* - -# Send extra options which are tagged as "red" to -# the machine with ethernet address 11:22:33:44:55:66 -#dhcp-host=11:22:33:44:55:66,net:red - -# Send extra options which are tagged as "red" to any machine whose -# DHCP vendorclass string includes the substring "Linux" -#dhcp-vendorclass=red,Linux - -# Send extra options which are tagged as "red" to any machine one -# of whose DHCP userclass strings includes the substring "accounts" -#dhcp-userclass=red,accounts - -# If this line is uncommented, dnsmasq will read /etc/ethers and act -# on the ethernet-address/IP pairs found there just as if they had -# been given as --dhcp-host options. Useful if you keep -# MAC-address/host mappings there for other purposes. -#read-ethers - -# Send options to hosts which ask for a DHCP lease. -# See RFC 2132 for details of available options. -# Note that all the common settings, such as netmask and -# broadcast address, DNS server and default route, are given -# sane defaults by dnsmasq. You very likely will not need any -# any dhcp-options. If you use Windows clients and Samba, there -# are some options which are recommended, they are detailed at the -# end of this section. -# For reference, the common options are: -# subnet mask - 1 -# default router - 3 -# DNS server - 6 -# broadcast address - 28 - -# Set the NTP time server addresses to 192.168.0.4 and 10.10.0.5 -#dhcp-option=42,192.168.0.4,10.10.0.5 - -# Set the NTP time server address to be the same machine as -# is running dnsmasq -#dhcp-option=42,0.0.0.0 - -# Set the NIS domain name to "welly" -#dhcp-option=40,welly - -# Set the default time-to-live to 50 -#dhcp-option=23,50 - -# Set the "all subnets are local" flag -#dhcp-option=27,1 - -# Send the etherboot magic flag and then etherboot options (a string). -#dhcp-option=128,e4:45:74:68:00:00 -#dhcp-option=129,NIC=eepro100 - -# Specify an option which will only be sent to the "red" network -# (see dhcp-range for the declaration of the "red" network) -#dhcp-option=red,42,192.168.1.1 - -# The following DHCP options set up dnsmasq in the same way as is specified -# for the ISC dhcpcd in -# http://www.samba.org/samba/ftp/docs/textdocs/DHCP-Server-Configuration.txt -# adapted for a typical dnsmasq installation where the host running -# dnsmasq is also the host running samba. -# you may want to uncomment them if you use Windows clients and Samba. -#dhcp-option=19,0 # option ip-forwarding off -#dhcp-option=44,0.0.0.0 # set netbios-over-TCP/IP nameserver(s) aka WINS server(s) -#dhcp-option=45,0.0.0.0 # netbios datagram distribution server -#dhcp-option=46,8 # netbios node type -#dhcp-option=47 # empty netbios scope. - - -# Set the boot filename and tftpd server name and address -# for BOOTP. You will only need this is you want to -# boot machines over the network. -#dhcp-boot=/var/ftpd/pxelinux.0,boothost,192.168.0.3 - -# Set the limit on DHCP leases, the default is 150 -#dhcp-lease-max=150 - -# The DHCP server needs somewhere on disk to keep its lease database. -# This defaults to a sane location, but if you want to change it, use -# the line below. -#dhcp-leasefile=/var/lib/misc/dnsmasq.leases - -# Set the cachesize here. -#cache-size=150 - -# If you want to disable negative caching, uncomment this. -#no-negcache - -# Normally responses which come form /etc/hosts and the DHCP lease -# file have Time-To-Live set as zero, which conventionally means -# do not cache further. If you are happy to trade lower load on the -# server for potentially stale date, you can set a time-to-live (in -# seconds) here. -#local-ttl= - -# If you want dnsmasq to detect attempts by Verisign to send queries -# to unregistered .com and .net hosts to its sitefinder service and -# have dnsmasq instead return the correct NXDOMAIN response, uncomment -# this line. You can add similar lines to do the same for other -# registries which have implemented wildcard A records. -#bogus-nxdomain=64.94.110.11 - -# If you want to fix up DNS results from upstream servers, use the -# alias option. This only works for IPv4. -# This alias makes a result of 1.2.3.4 appear as 5.6.7.8 -#alias=1.2.3.4,5.6.7.8 -# and this maps 1.2.3.x to 5.6.7.x -#alias=1.2.3.0,5.6.7.0,255.255.255.0 - -# For debugging purposes, log each DNS query as it passes through -# dnsmasq. -#log-queries - -# Include a another lot of configuration options. -#conf-file=/etc/dnsmasq.more.conf - - - - - diff --git a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb index 2f887e6018..4e76d24526 100644 --- a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb +++ b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb @@ -50,7 +50,8 @@ SYSTEMD_AUTO_ENABLE = "disable" do_install:append () { rm -rf ${D}${libdir}/dovecot/dovecot-config install -d 755 ${D}/etc/dovecot - touch 644 ${D}/etc/dovecot/dovecot.conf + touch ${D}/etc/dovecot/dovecot.conf + chmod 644 ${D}/etc/dovecot/dovecot.conf if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then install -m 0644 ${UNPACKDIR}/dovecot.service ${D}${systemd_unitdir}/system sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/dovecot.service diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch deleted file mode 100644 index b98e1e70c7..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 61991db099f66348dddbc3408e7ee8c05bda85cb Mon Sep 17 00:00:00 2001 -From: Yoann Congal <yoann.congal@smile.fr> -Date: Sat, 2 Mar 2024 16:23:07 +0100 -Subject: [PATCH] configure.ac: Add an option to disable host udev version - checks - -In cross-compilation environment, the build host might have an outdated -udev or no udev at all. But the user may still want to build with the -enabled udev rule (for its udev-enabled target). - -This patch adds a "--disable-udevchecks" option the disable build host -udev version check at configure-time and unconditionally install the -enabled udev rule. Without this new option, the behavior stays the same -(checks enabled). - -Signed-off-by: Yoann Congal <yoann.congal@smile.fr> -Upstream-Status: Backport [https://github.com/LINBIT/drbd-utils/commit/f2b5a7335ae52109dfb95a9d99ae20519c43d59a] ---- - configure.ac | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f1d69ea3..4c56d33b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -71,6 +71,11 @@ AC_ARG_WITH([udev], - [AS_HELP_STRING([--with-udev], - [Enable udev integration])], - [WITH_UDEV=$withval]) -+AC_ARG_ENABLE([udevchecks], -+ [AS_HELP_STRING([--disable-udevchecks], -+ [Disable host udev version checks])], -+ [], -+ [enable_udevchecks=yes]) - AC_ARG_WITH([xen], - [AS_HELP_STRING([--with-xen], - [Enable Xen integration])], -@@ -315,7 +320,7 @@ if test -z $GIT; then - AC_MSG_WARN(Cannot update buildtag without git. You may safely ignore this warning when building from a tarball.) - fi - --if test $UDEVADM = false && test $UDEVINFO = false; then -+if test "x$enable_udevchecks" != "xno" && test $UDEVADM = false && test $UDEVINFO = false; then - if test "$WITH_UDEV" = "yes"; then - AC_MSG_WARN([udev support enabled, but neither udevadm nor udevinfo found on this system.]) - fi -@@ -423,7 +428,7 @@ else - test -z $INITDIR && INITDIR="$sysconfdir/init.d" - - dnl Our udev rules file is known to work only with udev >= 85 -- if test "$WITH_UDEV" = "yes"; then -+ if test "x$enable_udevchecks" != "xno" && test "$WITH_UDEV" = "yes"; then - udev_version=$( set -- $($UDEVADM version); echo $1 ) - if test -z "$udev_version"; then - udev_version=$( set -- $($UDEVINFO -V); echo $3 ) diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch index 27f0a9b54a..ef0229d5bb 100644 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch @@ -1,4 +1,4 @@ -From 264ae7b062ac52a5545a8a562b51001f7ce7369d Mon Sep 17 00:00:00 2001 +From 9109f15f5b8ae142823194b9ef50c392615fe38d Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Thu, 21 Apr 2022 17:22:35 +0800 Subject: [PATCH] drbd-utils: support usermerge @@ -16,15 +16,14 @@ Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> scripts/drbd.service | 6 +++--- scripts/drbd@.service | 6 +++--- scripts/ocf.ra@.service | 4 ++-- - user/v83/Makefile.in | 14 +++++++------- user/v84/Makefile.in | 14 +++++++------- - 10 files changed, 32 insertions(+), 32 deletions(-) + 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/configure.ac b/configure.ac -index f1d69ea3..3289ac7d 100644 +index d3ec5ff1..910232b1 100644 --- a/configure.ac +++ b/configure.ac -@@ -183,7 +183,7 @@ AC_ARG_WITH(tmpfilesdir, +@@ -178,7 +178,7 @@ AC_ARG_WITH(tmpfilesdir, AC_SUBST(tmpfilesdir) # set default early @@ -34,10 +33,10 @@ index f1d69ea3..3289ac7d 100644 test x"$with_udev" = xyes ; then if test x"$PKG_CONFIG" != x; then diff --git a/scripts/Makefile.in b/scripts/Makefile.in -index aca15a22..a1cd2ffe 100644 +index 15a26f37..ff028310 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in -@@ -91,11 +91,11 @@ ifeq ($(subst both,systemd,$(initscripttype)),systemd) +@@ -90,11 +90,11 @@ ifeq ($(subst both,systemd,$(initscripttype)),systemd) install -d $(DESTDIR)$(systemdunitdir) install -m 644 $(SYSTEMD_UNITS) $(DESTDIR)$(systemdunitdir)/ install -m 644 $(SYSTEMD_TEMPLATES) $(DESTDIR)$(systemdunitdir)/ @@ -137,37 +136,6 @@ index 9c2268a6..1666c482 100644 -ExecStopPost=/lib/drbd/scripts/ocf.ra.wrapper.sh stop %n +ExecStart=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh start-and-monitor %n +ExecStopPost=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh stop %n -diff --git a/user/v83/Makefile.in b/user/v83/Makefile.in -index 08cfe574..4c4971b6 100644 ---- a/user/v83/Makefile.in -+++ b/user/v83/Makefile.in -@@ -96,19 +96,19 @@ install: - ifeq ($(WITH_83_SUPPORT),yes) - install -d $(DESTDIR)$(localstatedir)/lib/drbd - install -d $(DESTDIR)$(localstatedir)/lock -- install -d $(DESTDIR)/lib/drbd/ -+ install -d $(DESTDIR)/${nonarch_libdir}/drbd/ - if getent group haclient > /dev/null 2> /dev/null ; then \ -- install -g haclient -m 4750 drbdsetup-83 $(DESTDIR)/lib/drbd/ ; \ -- install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ; \ -+ install -g haclient -m 4750 drbdsetup-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ -+ install -m 755 drbdadm-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ - else \ -- install -m 755 drbdsetup-83 $(DESTDIR)/lib/drbd/ ; \ -- install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ; \ -+ install -m 755 drbdsetup-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ -+ install -m 755 drbdadm-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ - fi - endif - - uninstall: -- rm -f $(DESTDIR)/lib/drbd/drbdsetup-83 -- rm -f $(DESTDIR)/lib/drbd/drbdadm-83 -+ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdsetup-83 -+ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdadm-83 - - .PHONY: install uninstall clean distclean - ../../configure: diff --git a/user/v84/Makefile.in b/user/v84/Makefile.in index 0fcefc5f..81f7d5ec 100644 --- a/user/v84/Makefile.in @@ -199,3 +167,6 @@ index 0fcefc5f..81f7d5ec 100644 spell: for f in drbdadm_adjust.c drbdadm_main.c drbdadm_parser.c drbdadm_usage_cnt.c drbdsetup.c drbdtool_common.c; do \ +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.27.0.bb b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.28.0.bb index 63f0fd18c1..af0afc2a91 100644 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.27.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.28.0.bb @@ -11,9 +11,8 @@ SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=master;prot git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers;branch=master;protocol=https \ file://0001-drbdmon-add-LDFLAGS-when-linking.patch \ ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \ - file://0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch \ " -SRCREV_drbd-utils = "fdd9a4d603a9dc99d110d8bd0e288d7c0b6f586e" +SRCREV_drbd-utils = "ba2ce9037989b6141222c7901d1219cf852949f1" SRCREV_drbd-headers = "0349f00825b4198d4ec3248f43884114a187676a" SRCREV_FORMAT = "drbd-utils_drbd-headers" diff --git a/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb b/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb index 6cde94b202..cc23d5a34e 100644 --- a/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb +++ b/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb @@ -16,13 +16,10 @@ SRC_URI[sha256sum] = "a6cb4ea863ac61d242ffb2db564a39123761578d3e40d71ce7b6f2905b inherit autotools gettext pkgconfig python3-dir python3native -EXTRA_OECONF = "--with-ssl=${STAGING_DIR_HOST}${prefix}" - -INSANE_SKIP:${PN} = "already-stripped" +EXTRA_OECONF = "--with-ssl=${STAGING_DIR_HOST}${prefix} --disable-rpath " do_install:append() { sed -i 's,${RECIPE_SYSROOT_NATIVE},,g' ${D}${bindir}/fetchmailconf - sed -i 's,${RECIPE_SYSROOT},,g' ${D}${bindir}/fetchmail } PACKAGES =+ "fetchmail-python" diff --git a/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop/0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch b/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop/0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch deleted file mode 100644 index e696ac4ead..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop/0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5aea816f27a71e6c88ad50e7326fa6584eeb7ad9 Mon Sep 17 00:00:00 2001 -From: Francois Marier <francois@debian.org> -Date: Fri, 24 Jul 2020 21:22:47 -0700 -Subject: [PATCH] Fix compilation with GCC's -fno-common flag (fixes #305) - -Upstream-Status: Submitted [https://github.com/mrash/fwknop/pull/319] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - client/log_msg.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/client/log_msg.h b/client/log_msg.h -index cc17716..3dda161 100644 ---- a/client/log_msg.h -+++ b/client/log_msg.h -@@ -38,7 +38,7 @@ enum - LOG_VERBOSITY_INFO, /*!< Constant to define a INFO message */ - LOG_VERBOSITY_DEBUG, /*!< Constant to define a DEBUG message */ - LOG_LAST_VERBOSITY --} log_level_t; -+}; - - #define LOG_DEFAULT_VERBOSITY LOG_VERBOSITY_NORMAL /*!< Default verbosity to use */ - --- -2.28.0 - diff --git a/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop/0001-configure.ac-Fix-missing-comma-in-AS_IF.patch b/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop/0001-configure.ac-Fix-missing-comma-in-AS_IF.patch deleted file mode 100644 index f3e1707408..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop/0001-configure.ac-Fix-missing-comma-in-AS_IF.patch +++ /dev/null @@ -1,29 +0,0 @@ -From fee4cb0ae2d1fcd012cb7f501c3db0d8ec910798 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 2 Apr 2023 10:01:51 -0700 -Subject: [PATCH] configure.ac: Fix missing comma in AS_IF - -this is flagged with autconf 2.72 - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 47a069e..9cdfd3f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -744,7 +744,7 @@ dnl - IPFW_EXE="" - IPTABLES_EXE="" - FIREWALLD_EXE="" -- ] -+ ], - ] - ] - ] --- -2.40.0 - diff --git a/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb b/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb index a1f56cdf16..7cc044d996 100644 --- a/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb +++ b/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb @@ -1,20 +1,20 @@ SUMMARY = "fwknop - Single Packet Authorization" HOMEPAGE = "http://www.cipherdyne.org/fwknop/" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - " +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + inherit autotools-brokensep pkgconfig SRC_URI = "http://www.cipherdyne.org/${BPN}/download/${BPN}-${PV}.tar.bz2 \ - file://0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch \ file://0001-Use-pkg-config-to-find-gpgme.patch \ - file://0001-configure.ac-Fix-missing-comma-in-AS_IF.patch \ " -SRC_URI[sha256sum] = "f6c09bec97ed8e474a98ae14f9f53e1bcdda33393f20667b6af3fb6bb894ca77" +SRC_URI[sha256sum] = "a4ec7c22dd90dd684f9f7b96d3a901c4131ec8c7a3b9db26d0428513f6774c64" DEPENDS = "libpcap gpgme" -EXTRA_OECONF = " --with-iptables=${sbindir}/iptables" +EXTRA_OECONF = "--with-iptables=${sbindir}/iptables \ + --with-gpg=${bindir}/gpg \ + --with-wget=${base_bindir}/wget" do_configure:prepend () { install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/config diff --git a/meta-openembedded/meta-networking/recipes-support/libconfuse/libconfuse_3.3.bb b/meta-openembedded/meta-networking/recipes-support/libconfuse/libconfuse_3.3.bb deleted file mode 100644 index b8d0536eb3..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/libconfuse/libconfuse_3.3.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "libConfuse is a configuration file parser library" -LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://LICENSE;md5=42fa47330d4051cd219f7d99d023de3a" - -SRCREV = "a42aebf13db33afd575da6e63f55163d371f776d" -SRC_URI = "git://github.com/libconfuse/libconfuse.git;branch=master;protocol=https" - -inherit autotools-brokensep pkgconfig gettext - -S = "${WORKDIR}/git" - -do_configure:prepend(){ - (cd ${S} && ${S}/autogen.sh) -} diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.8.0.bb b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.8.1.bb index bdd87993d7..29ff2cf6f2 100644 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.8.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.8.1.bb @@ -34,7 +34,7 @@ LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9ada file://man/ldb.3.xml;beginline=261;endline=262;md5=137f9fd61040c1505d1aa1019663fd08 \ file://tools/ldbdump.c;endline=19;md5=a7d4fc5d1f75676b49df491575a86a42" -SRC_URI[sha256sum] = "358dca10fcd27207ac857a0d7f435a46dbc6cd1f7c10dbb840c1931bf1965f08" +SRC_URI[sha256sum] = "b68ce6eb0ccd2870fa3c8c334f2028b5d16606fd41308696c17b71959f7bf59f" inherit pkgconfig waf-samba ptest diff --git a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.10.bb b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.12.bb index bd3f9f63a9..a96527a3e6 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.10.bb +++ b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.12.bb @@ -15,7 +15,7 @@ SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \ file://run-ptest \ " -SRC_URI[sha256sum] = "02338e33c16c21c9e29571cef523e76b2b708636254f6f30c6cf195d48c62daf" +SRC_URI[sha256sum] = "6ce4b27498812d09237ece65a0d6dfac0941610e709848ecb822aa241084cd7a" PACKAGECONFIG ??= "\ ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ diff --git a/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb b/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb index 86b9112ba2..391e0e4ab6 100644 --- a/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb @@ -32,3 +32,7 @@ inherit autotools pkgconfig EXTRA_OEMAKE += "ROOTPREFIX=${root_prefix}" FILES:${PN} += "${nonarch_base_libdir}/firmware" + +# http://errors.yoctoproject.org/Errors/Details/766901/ +# linux-atm-2.5.2/src/led/conn.c:414:57: error: passing argument 3 of 'accept' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.20.bb index 0243f2a1db..a5f9c5543f 100644 --- a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb +++ b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.20.bb @@ -8,10 +8,7 @@ LIC_FILES_CHKSUM = " \ file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e \ " -SRCREV = "05b50d379ff0037de4957bb2a1befcce88b70225" - -PV .= "+git" -LK_REL = "1.0.19" +SRCREV = "311fcdeb5cb41612d4be66b16f0f2ad6675a6af8" SRC_URI = " \ git://github.com/sctp/lksctp-tools.git;branch=master;protocol=https \ @@ -34,19 +31,14 @@ do_install_ptest () { done } -SOLIBVERSION="${LK_REL}" -SOLIBMAJORVERSION="1" - PACKAGES =+ "${PN}-withsctp ${PN}-utils" FILES:${PN} = " \ - ${libdir}/libsctp.so.${SOLIBVERSION} \ - ${libdir}/libsctp.so.${SOLIBMAJORVERSION} \ + ${libdir}/libsctp.so.* \ " FILES:${PN}-withsctp = " \ - ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBVERSION} \ - ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBMAJORVERSION} \ + ${libdir}/lksctp-tools/libwithsctp.so.* \ " FILES:${PN}-dev += " \ diff --git a/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6/0001-Remove-use-of-variables-indicating-buildtime-informa.patch b/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6/0001-Remove-use-of-variables-indicating-buildtime-informa.patch new file mode 100644 index 0000000000..7bfb17bf08 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6/0001-Remove-use-of-variables-indicating-buildtime-informa.patch @@ -0,0 +1,85 @@ +From 7b3e78cf0348ea737609a2ace07c7c55aae36bcb Mon Sep 17 00:00:00 2001 +From: Santiago Vila <sanvila@debian.org> +Date: Wed, 9 Oct 2024 22:05:09 -0700 +Subject: [PATCH] Remove use of variables indicating buildtime information + +We should not really care about the build date or the build host + +Sourced From: https://salsa.debian.org/debian/ndisc6/-/blob/master/debian/patches/reproducible-build.patch?ref_type=heads + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + rdnss/rdnssd.c | 2 -- + src/addrinfo.c | 2 -- + src/ndisc.c | 2 -- + src/tcpspray.c | 2 -- + src/traceroute.c | 2 -- + 5 files changed, 10 deletions(-) + +diff --git a/rdnss/rdnssd.c b/rdnss/rdnssd.c +index b87edb2..7201525 100644 +--- a/rdnss/rdnssd.c ++++ b/rdnss/rdnssd.c +@@ -741,8 +741,6 @@ version (void) + { + printf (_("rdnssd: IPv6 Recursive DNS Server discovery Daemon %s (%s)\n"), + VERSION, "$Rev$"); +- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME); +- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION); + puts (_("Written by Pierre Ynard and Remi Denis-Courmont\n")); + + printf (_("Copyright (C) %u-%u Pierre Ynard, Remi Denis-Courmont\n"), +diff --git a/src/addrinfo.c b/src/addrinfo.c +index cd73722..6316abd 100644 +--- a/src/addrinfo.c ++++ b/src/addrinfo.c +@@ -148,8 +148,6 @@ static int quick_usage (const char *path) + static int version (void) + { + printf (_("addrinfo %s (%s)\n"), VERSION, "$Rev$"); +- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME); +- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION); + puts (_("Written by Remi Denis-Courmont\n")); + + printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2002, 2007); +diff --git a/src/ndisc.c b/src/ndisc.c +index b190b18..6e222a0 100644 +--- a/src/ndisc.c ++++ b/src/ndisc.c +@@ -920,9 +920,7 @@ version (void) + { + printf (_( + "ndisc6: IPv6 Neighbor/Router Discovery userland tool %s (%s)\n"), VERSION, "$Rev$"); +- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME); + +- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION); + puts (_("Written by Remi Denis-Courmont\n")); + + printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2004, 2007); +diff --git a/src/tcpspray.c b/src/tcpspray.c +index 39d8939..6347795 100644 +--- a/src/tcpspray.c ++++ b/src/tcpspray.c +@@ -302,8 +302,6 @@ version (void) + { + printf (_( + "tcpspray6: TCP/IP bandwidth tester %s (%s)\n"), VERSION, "$Rev$"); +- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME); +- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION); + puts (_("Written by Remi Denis-Courmont\n")); + + printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2005, 2007); +diff --git a/src/traceroute.c b/src/traceroute.c +index 489bc55..604b6af 100644 +--- a/src/traceroute.c ++++ b/src/traceroute.c +@@ -1251,8 +1251,6 @@ version (void) + { + printf (_( + "traceroute6: TCP & UDP IPv6 traceroute tool %s (%s)\n"), VERSION, "$Rev$"); +- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME); +- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION); + puts (_("Written by Remi Denis-Courmont\n")); + + printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2005, 2007); diff --git a/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb b/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb index a827e7f42a..21579d64c1 100644 --- a/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb +++ b/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SRCREV = "92e5d1cf6547fe40316b2a6ca2f7b8195ae0cbe5" SRC_URI = "git://git.remlab.net/git/ndisc6.git;protocol=http;branch=master \ file://0001-autogen-Do-not-symlink-gettext.h-from-build-host.patch \ + file://0001-Remove-use-of-variables-indicating-buildtime-informa.patch \ " S = "${WORKDIR}/git" @@ -27,6 +28,10 @@ do_configure:prepend() { ${S}/autogen.sh } +do_configure:append() { + sed -i -e 's|${WORKDIR}|<scrubbed>|g' ${B}/config.h +} + do_install:append () { rm -rf ${D}${localstatedir} # Enable SUID bit for applications that need it diff --git a/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpd b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpd index d1b9c49076..a0c43ed5e5 100755 --- a/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpd +++ b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpd @@ -72,7 +72,7 @@ case "$1" in startdaemon ;; status) - status /usr/sbin/ntpd; + status ntpd; exit $? ;; *) diff --git a/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.3.5.bb b/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.4.5.bb index 7e3fe5601f..217829193f 100644 --- a/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.3.5.bb +++ b/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.4.5.bb @@ -25,7 +25,7 @@ LICENSE:modules/freebsd/vmxnet = "GPL-2.0-only" LICENSE:modules/linux = "GPL-2.0-only" LICENSE:modules/solaris = "CDDL-1.0" -SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stable-12.3.x \ +SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stable-12.4.x \ file://tools.conf \ file://vmtoolsd.service \ file://vmtoolsd.init \ @@ -50,7 +50,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P<pver>\d+(\.\d+)+)" SRC_URI:append:libc-musl = " file://0001-Add-resolv_compat.h-for-musl-builds.patch;patchdir=.. \ " -SRCREV = "1b362b9eb449fb5de3809aaea4a636ece30ee5b7" +SRCREV = "9b94132f54fbed0b86dce04ff4402d1d8fd059c3" S = "${WORKDIR}/git/open-vm-tools" @@ -64,7 +64,7 @@ inherit autotools pkgconfig systemd update-rc.d SYSTEMD_SERVICE:${PN} = "vmtoolsd.service" EXTRA_OECONF = "--without-icu --disable-multimon --disable-docs \ - --disable-tests --without-gtkmm --without-xerces --without-pam \ + --disable-tests --without-gtkmm --without-pam \ --disable-vgauth --disable-deploypkg --disable-containerinfo \ --without-root-privileges --without-kernel-modules --with-tirpc \ --with-udev-rules-dir=${nonarch_base_libdir}/udev/rules.d" diff --git a/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.35.bb b/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.36.bb index c7c7573677..74c5ef220d 100644 --- a/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.35.bb +++ b/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.36.bb @@ -34,7 +34,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \ S = "${WORKDIR}/OpenIPMI-${PV}" -SRC_URI[sha256sum] = "b059114f6299d73f04ff6e76a0857a0ab81aa362dee99644d256b223872437ad" +SRC_URI[sha256sum] = "a0403148fa5f7bed930c958a4d1c558047e273763a408b3a0368edc137cc55d9" inherit autotools-brokensep pkgconfig perlnative update-rc.d systemd cpan-base python3targetconfig diff --git a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch index 03b454d625..e1253db1ec 100644 --- a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch +++ b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch @@ -1,4 +1,4 @@ -From ea179d83b0aa62719d90748cd1fb260f40055f15 Mon Sep 17 00:00:00 2001 +From 9cc13bdcb71cd16d2873637c491e07c01de9a3ea Mon Sep 17 00:00:00 2001 From: Yi Zhao <yi.zhao@windriver.com> Date: Mon, 13 Jun 2022 22:44:28 +0800 Subject: [PATCH] configure.ac: eliminate build path from openvpn --version @@ -31,10 +31,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 2f5f6bc..eddcbc5 100644 +index df16c43..623ca65 100644 --- a/configure.ac +++ b/configure.ac -@@ -1377,7 +1377,7 @@ if test "${enable_async_push}" = "yes"; then +@@ -1463,7 +1463,7 @@ if test "${enable_async_push}" = "yes"; then esac fi @@ -43,6 +43,3 @@ index 2f5f6bc..eddcbc5 100644 AC_DEFINE_UNQUOTED([CONFIGURE_DEFINES], ["`echo ${CONFIGURE_DEFINES}`"], [Configuration settings]) TAP_WIN_COMPONENT_ID="PRODUCT_TAP_WIN_COMPONENT_ID" --- -2.25.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.6.10.bb b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.6.12.bb index ba53d40f47..d81b8ce449 100644 --- a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.6.10.bb +++ b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.6.12.bb @@ -14,7 +14,7 @@ SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \ UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads" -SRC_URI[sha256sum] = "1993bbb7b9edb430626eaa24573f881fd3df642f427fcb824b1aed1fca1bcc9b" +SRC_URI[sha256sum] = "1c610fddeb686e34f1367c347e027e418e07523a10f4d8ce4a2c2af2f61a1929" CVE_STATUS[CVE-2020-27569] = "not-applicable-config: Applies only Aviatrix OpenVPN client, not openvpn" diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-overloadable-function-attribute-with-c.patch b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-overloadable-function-attribute-with-c.patch new file mode 100644 index 0000000000..092f4431bf --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-overloadable-function-attribute-with-c.patch @@ -0,0 +1,38 @@ +From c7de6834f0cd92b7341ab17a5c6996f3fbd40140 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 21 Jun 2024 22:16:47 -0700 +Subject: [PATCH] librdmacm: Use overloadable function attribute with clang + + This is to fix build warnings seen with upcoming clang19 and + glibc 2.40, since glibc 2.40 has improved fortyfying this + function with clang, it ends up with build errors like below + +librdmacm/preload.c:796:9: error: at most one overload for a given name may lack the 'overloadable' attribute +| 796 | ssize_t recvfrom(int socket, void *buf, size_t len, int flags, +| | ^ +| /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/rdma-core/51.0/recipe-sysroot/usr/include/sys/socket.h:163:16: note: previous unmarked overload of function is here +| 163 | extern ssize_t recvfrom (int __fd, void *__restrict __buf, size_t __n, +| | ^ + +Upstream-Status: Submitted [https://github.com/linux-rdma/rdma-core/pull/1475] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + librdmacm/preload.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +--- a/librdmacm/preload.c ++++ b/librdmacm/preload.c +@@ -792,8 +792,11 @@ ssize_t recv(int socket, void *buf, size + return (fd_fork_get(socket, &fd) == fd_rsocket) ? + rrecv(fd, buf, len, flags) : real.recv(fd, buf, len, flags); + } +- +-ssize_t recvfrom(int socket, void *buf, size_t len, int flags, ++ssize_t ++#if defined(__clang__) && defined(__GLIBC__) ++__attribute__((overloadable)) ++#endif ++recvfrom(int socket, void *buf, size_t len, int flags, + struct sockaddr *src_addr, socklen_t *addrlen) + { + int fd; diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb index 7c26a8c436..0c204c109f 100644 --- a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb @@ -8,6 +8,7 @@ RDEPENDS:${PN} = "bash perl" SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=https \ file://0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch \ file://0001-include-libgen.h-for-basename.patch \ + file://0001-librdmacm-Use-overloadable-function-attribute-with-c.patch \ " SRCREV = "6cd09097ad2eebde9a7fa3d3bb09a2cea6e3c2d6" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/sngrep/sngrep_1.8.1.bb b/meta-openembedded/meta-networking/recipes-support/sngrep/sngrep_1.8.2.bb index 50248078a2..518ca9e277 100644 --- a/meta-openembedded/meta-networking/recipes-support/sngrep/sngrep_1.8.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/sngrep/sngrep_1.8.2.bb @@ -16,7 +16,7 @@ DEPENDS = "\ " SRC_URI = "git://github.com/irontec/sngrep.git;protocol=https;branch=master" -SRCREV = "373abb90804ba71f980c7120e62f90d3a5c81213" +SRCREV = "dad1033640f249fa4994f976cf6ee96826c15702" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb b/meta-openembedded/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb index 0531ffe640..2d63119750 100644 --- a/meta-openembedded/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb @@ -15,3 +15,7 @@ CFLAGS += "-D_GNU_SOURCE " do_install() { oe_runmake 'DESTDIR=${D}' 'PREFIX=${prefix}' install } + +# http://errors.yoctoproject.org/Errors/Details/766895/ +# ssmping.c:55:51: error: passing argument 3 of 'getsockname' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch index 82d3551019..8c4ca55fbb 100644 --- a/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch +++ b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch @@ -1,4 +1,4 @@ -From 7ff4eba20b5c4fc7365e5ee0dfb775ed29bdd5ce Mon Sep 17 00:00:00 2001 +From c815368a3e41dd3f639eb8fd82d21bc0bab55d1e Mon Sep 17 00:00:00 2001 From: Kai Kang <kai.kang@windriver.com> Date: Wed, 1 Nov 2017 09:23:41 -0400 Subject: [PATCH] stunnel: fix compile error when openssl disable des support @@ -17,10 +17,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com> 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/common.h b/src/common.h -index 2b4869f..180d31a 100644 +index f112cf9..8d4be01 100644 --- a/src/common.h +++ b/src/common.h -@@ -492,7 +492,9 @@ extern char *sys_errlist[]; +@@ -496,7 +496,9 @@ extern char *sys_errlist[]; #ifndef OPENSSL_NO_MD4 #include <openssl/md4.h> #endif /* !defined(OPENSSL_NO_MD4) */ @@ -31,19 +31,19 @@ index 2b4869f..180d31a 100644 #include <openssl/dh.h> #if OPENSSL_VERSION_NUMBER<0x10100000L diff --git a/src/protocol.c b/src/protocol.c -index cfe6d3b..3936aea 100644 +index c8c65ea..b071b06 100644 --- a/src/protocol.c +++ b/src/protocol.c -@@ -81,7 +81,7 @@ NOEXPORT void ldap_client_middle(CLI *); - +@@ -82,7 +82,7 @@ NOEXPORT void ldap_client_middle(CLI *); NOEXPORT void connect_server_early(CLI *); + NOEXPORT const char *connect_client_init(SERVICE_OPTIONS *); NOEXPORT void connect_client_middle(CLI *); -#ifndef OPENSSL_NO_MD4 +#if !defined(OPENSSL_NO_MD4) && !defined(OPENSSL_NO_DES) NOEXPORT void ntlm(CLI *); NOEXPORT char *ntlm1(void); NOEXPORT char *ntlm3(char *, char *, char *, char *); -@@ -1331,7 +1331,7 @@ NOEXPORT void connect_client_middle(CLI *c) { +@@ -1334,7 +1334,7 @@ NOEXPORT void connect_client_middle(CLI *c) { fd_printf(c, c->remote_fd.fd, "Host: %s", c->opt->protocol_host); if(c->opt->protocol_username && c->opt->protocol_password) { if(!strcasecmp(c->opt->protocol_authentication, "ntlm")) { @@ -52,7 +52,7 @@ index cfe6d3b..3936aea 100644 ntlm(c); #else s_log(LOG_ERR, "NTLM authentication is not available"); -@@ -1374,7 +1374,7 @@ NOEXPORT void connect_client_middle(CLI *c) { +@@ -1377,7 +1377,7 @@ NOEXPORT void connect_client_middle(CLI *c) { str_free(line); } @@ -61,6 +61,3 @@ index cfe6d3b..3936aea 100644 /* * NTLM code is based on the following documentation: --- -2.34.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.72.bb b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.73.bb index 6d21027a16..e13b7871ca 100644 --- a/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.72.bb +++ b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.73.bb @@ -11,7 +11,7 @@ SRC_URI = "https://stunnel.org/archive/5.x/${BP}.tar.gz \ file://fix-openssl-no-des.patch \ " -SRC_URI[sha256sum] = "3d532941281ae353319735144e4adb9ae489a10b7e309c58a48157f08f42e949" +SRC_URI[sha256sum] = "bc917c3bcd943a4d632360c067977a31e85e385f5f4845f69749bce88183cb38" inherit autotools bash-completion pkgconfig diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest index 2bfb2267da..2bfb2267da 100755..100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.4.bb b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.5.bb index 803a9bb5f5..32b869f241 100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.4.bb +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.5.bb @@ -21,12 +21,12 @@ RDEPENDS:${PN}-ptest += " make perl \ " SRC_URI = " \ - http://www.tcpdump.org/release/${BP}.tar.gz \ + http://www.tcpdump.org/release/${BP}.tar.xz \ file://add-ptest.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "0232231bb2f29d6bf2426e70a08a7e0c63a0d59a9b44863b7f5e2357a6e49fea" +SRC_URI[sha256sum] = "d76395ab82d659d526291b013eee200201380930793531515abfc6e77b4f2ee5" UPSTREAM_CHECK_REGEX = "tcpdump-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice_1.7.bb b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice_1.8.bb index 93197dc3bc..3d61160bb0 100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice_1.7.bb +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice_1.8.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://tcpslice.c;endline=20;md5=99519e2e5234d1662a4ce16baa6 SRC_URI = "http://www.tcpdump.org/release/${BP}.tar.gz \ " -SRC_URI[sha256sum] = "e513f0710c4ab45ec627e5df6f7b80d12e488146e1bd500c92247e20ca608903" +SRC_URI[sha256sum] = "082967d6bf793499d3d655cea2149e07c0da97287f1877a6eab88d17cb703d0d" UPSTREAM_CHECK_REGEX = "tcpslice-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-do-not-run-conftest-in-case-of-cross-co.patch b/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-do-not-run-conftest-in-case-of-cross-co.patch deleted file mode 100644 index 08cb3b88fa..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-do-not-run-conftest-in-case-of-cross-co.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 42f7bbc1ce4913fe2c0bc76293c5445d31690f5d Mon Sep 17 00:00:00 2001 -From: Chen Qi <Qi.Chen@windriver.com> -Date: Thu, 7 Mar 2024 21:02:07 -0800 -Subject: [PATCH] configure.ac: do not run conftest in case of cross - compilation - -It'll give us nothing but error like below: - - ./conftest: cannot execute binary file: Exec format error - ... - ./configure: line 23950: test: -eq: unary operator expected - -The version check only has effect on Apple systems. We'd better -avoid error like above when cross compilation. - -Also, in case of cross compilation, instead of having the above -Exec format error and resulting in unaligned_cv_fail to yes, set -it directly to yes. - -Upstream-Status: Submitted [https://github.com/appneta/tcpreplay/pull/849] - -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 387219de..15201601 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -928,7 +928,7 @@ cat >conftest.c <<EOF - EOF - ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LPCAPLIB \ - conftest.c $LIBS >/dev/null 2>&1 --if test -x conftest ; then -+if test -x conftest -a "$cross_compiling" != "yes"; then - full_libpcap_version=$(LD_LIBRARY_PATH="$LPCAP_LD_LIBRARY_PATH" ./conftest) - libpcap_version=$(echo "$full_libpcap_version" | ${CUT} -d' ' -f3) - pcap_version_ok=yes -@@ -1709,7 +1709,7 @@ case "$host_os" in - EOF - ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS \ - conftest.c $LIBS >/dev/null 2>&1 -- if test ! -x conftest ; then -+ if test ! -x conftest -o "$cross_compiling" = "yes" ; then - dnl failed to compile for some reason - unaligned_cv_fail=yes - else --- -2.42.0 - diff --git a/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch b/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch deleted file mode 100644 index 709d2cccbc..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 5f8c78362b3b1e06f5adff2d4b140509c4799894 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Sun, 3 Sep 2023 12:31:59 +0200 -Subject: [PATCH] configure.ac: unify search dirs for pcap and add lib32 - -* add lib32 because when building lib32-tcpreplay it's - impossible to set --with-libpcap so that it would find - both include files as well as the library in lib32 directory - -* maybe it would be beneficial to split --with-libpcap - into --with-libpcap-includedir --with-libpcap-libdir as this - already searches in the --with-libpcap value with and - without any "lib" prefix, but include files always expect - "include" dir there - -* most of this code was added in: - https://github.com/appneta/tcpreplay/commit/202b8e82f9fd3c84ce5804577caeb36a33baabe7#diff-49473dca262eeab3b4a43002adb08b4db31020d190caaad1594b47f1d5daa810R570 - -* then search for - ${host_cpu} lib/${host_cpu} (without -${host_os} suffix) - and ${build_arch}-${host_os} lib/${build_arch}-${host_os} - was added, but only for search of dynamic library in: - https://github.com/appneta/tcpreplay/commit/c3d5236563985a99f8bb02c3f1bd6950e3929047 - -* ${build_arch}-${host_os} lib/${build_arch}-${host_os} - was later replaced with: - lib/${MULTIARCH} ${MULTIARCH} - and it was added to static library search as well - - but for dynamic library it was searching in reversed order: - ${MULTIARCH} lib/${MULTIARCH} - https://github.com/appneta/tcpreplay/commit/ed9e3a818bde04813144014561e62f018c9eb85f - - I don't think this reversed order was intentional, just unify all 4 cases - to use the same directories in the same order - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> -Upstream-Status: Submitted [https://github.com/appneta/tcpreplay/pull/819] ---- - configure.ac | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 387219de..26ba31a5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -671,7 +671,7 @@ AC_ARG_WITH(libpcap, - LPCAPINCDIR=${testdir} - if test $dynamic_link = yes; then - for ext in .dylib .so .tbd ; do -- for dir in . lib lib64 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do -+ for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do - sharefile=$(ls ${testdir}/$dir/libpcap${ext}* 2> /dev/null | sort | head -n1) - if test -n "${sharefile}"; then - LPCAP_LD_LIBRARY_PATH="$(dirname ${sharefile})" -@@ -690,7 +690,7 @@ AC_ARG_WITH(libpcap, - dnl If dynamic library not found, try static - dnl - for ext in ${libext} .a .A.tbd ; do -- for dir in . lib lib64 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do -+ for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do - staticfile=$(ls ${testdir}/$dir/libpcap${ext} 2> /dev/null | sort | head -n1) - if test -n "${staticfile}"; then - LPCAPLIB="${staticfile}" -@@ -771,7 +771,7 @@ AC_ARG_WITH(libpcap, - LPCAPINCDIR="${testdir}/include" - if test $dynamic_link = yes; then - for ext in .dylib .so .tbd; do -- for dir in . lib lib64 ${host_cpu} lib/${host_cpu} ${host_cpu}-${host_os} lib/${host_cpu}-${host_os} ${MULTIARCH} lib/${MULTIARCH}; do -+ for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do - sharefile=$(ls "${testdir}/$dir/libpcap${ext}" 2> /dev/null | sort | head -n1) - if test -n "${sharefile}"; then - LPCAPLIB="-L$(dirname ${sharefile}) -lpcap" -@@ -790,7 +790,7 @@ AC_ARG_WITH(libpcap, - dnl If dynamic library not found, try static - dnl - for ext in ${libext} .a .A.tbd ; do -- for dir in . lib lib64 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do -+ for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do - staticfile=$(ls "${testdir}/$dir/libpcap${ext}" 2> /dev/null | sort | head -n1) - if test -n "${staticfile}"; then - LPCAPLIB="${staticfile}" diff --git a/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.4.bb b/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.5.1.bb index 26de40a65a..f01bbb95a5 100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.4.bb +++ b/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.5.1.bb @@ -9,11 +9,9 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=10f0474a2f0e5dccfca20f69d6598ad8" SRC_URI = "https://github.com/appneta/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ file://0001-libopts.m4-set-POSIX_SHELL-to-bin-sh.patch \ - file://0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch \ - file://0001-configure.ac-do-not-run-conftest-in-case-of-cross-co.patch \ " -SRC_URI[sha256sum] = "44f18fb6d3470ecaf77a51b901a119dae16da5be4d4140ffbb2785e37ad6d4bf" +SRC_URI[sha256sum] = "2de79bfd67ec92ca9ae2ffb50456dd1d53ff40f3fa71b422c65e8062013c9e85" UPSTREAM_CHECK_URI = "https://github.com/appneta/tcpreplay/releases" diff --git a/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.5.bb b/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.6.bb index 862cba91e9..b72c375400 100644 --- a/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.5.bb +++ b/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.6.bb @@ -17,7 +17,7 @@ UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/traceroute/files/tracerou SRC_URI = "${SOURCEFORGE_MIRROR}/traceroute/traceroute/${BP}/${BP}.tar.gz \ " -SRC_URI[sha256sum] = "9c6c260d96eaab51e3ce461b0a84fe87123ebc6dd6c9a59fab803f95b35a859e" +SRC_URI[sha256sum] = "9ccef9cdb9d7a98ff7fbf93f79ebd0e48881664b525c4b232a0fcec7dcb9db5e" EXTRA_OEMAKE = "VPATH=${STAGING_LIBDIR}" LTOEXTRA += "-flto-partition=none" diff --git a/meta-openembedded/meta-networking/recipes-support/unbound/unbound/run-ptest b/meta-openembedded/meta-networking/recipes-support/unbound/unbound/run-ptest new file mode 100644 index 0000000000..433a687c65 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/unbound/unbound/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +cd tests || exit 1 +retVal=0 +./unittest +./testbound -s +for x in ./testdata/*.rpl; do + output="$(./testbound -p $x -o -vvvvv 2>&1)" + if test $? -eq 0; then + echo "$x :Pass" + else + echo "$output" + echo "$x :Fail" + retVal=1 + fi +done +exit $retVal diff --git a/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.20.0.bb b/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.21.0.bb index fe0111f595..8c042dc5f4 100644 --- a/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.20.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.21.0.bb @@ -9,10 +9,12 @@ SECTION = "net" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=5308494bc0590c0cb036afd781d78f06" -SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=https;branch=branch-1.20.0" -SRCREV = "b9525c5fd47ba481a29b90109017d2253beb105d" +SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=https;branch=master \ + file://run-ptest \ + " +SRCREV = "79e4c578518886a32475cfbb0de383ff3a905033" -inherit autotools pkgconfig systemd update-rc.d +inherit autotools pkgconfig systemd update-rc.d ptest DEPENDS = "openssl libtool-native bison-native expat" RDEPENDS:${PN} = "bash openssl-bin daemonize" @@ -32,6 +34,10 @@ do_configure:append() { sed -i -e 's#${RECIPE_SYSROOT}##g' ${B}/config.h } +do_compile:append() { + oe_runmake tests +} + do_install:append() { install -d ${D}${systemd_unitdir}/system install -m 0644 ${B}/contrib/unbound.service ${D}${systemd_unitdir}/system @@ -40,6 +46,19 @@ do_install:append() { install -m 0755 ${S}/contrib/unbound.init_yocto ${D}${sysconfdir}/init.d/unbound } +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + install -d ${D}${PTEST_PATH}/tests/testdata + + install -m 0544 ${B}/unittest ${D}${PTEST_PATH}/tests/ + install -m 0544 ${B}/testbound ${D}${PTEST_PATH}/tests/ + install -m 0664 ${S}/testdata/test_signatures* ${D}${PTEST_PATH}/tests/ + install -m 0664 ${S}/testdata/test_sigs* ${D}${PTEST_PATH}/tests/ + install -m 0664 ${S}/testdata/test_ds* ${D}${PTEST_PATH}/tests/ + install -m 0664 ${S}/testdata/test_nsec3_hash* ${D}${PTEST_PATH}/tests/ + install -m 0644 ${S}/testdata/*.rpl ${D}/${PTEST_PATH}/tests/testdata/ +} + SYSTEMD_SERVICE:${PN} = "${BPN}.service" INITSCRIPT_NAME = "unbound" diff --git a/meta-openembedded/meta-networking/recipes-support/wavemon/wavemon_0.9.5.bb b/meta-openembedded/meta-networking/recipes-support/wavemon/wavemon_0.9.6.bb index 9da43cf9f4..c3de38a6f8 100644 --- a/meta-openembedded/meta-networking/recipes-support/wavemon/wavemon_0.9.5.bb +++ b/meta-openembedded/meta-networking/recipes-support/wavemon/wavemon_0.9.6.bb @@ -14,7 +14,7 @@ PACKAGECONFIG[cap] = "--with-libcap,--without-libcap,libcap" DEPENDS = "libnl ncurses" SRC_URI = "git://github.com/uoaerg/wavemon;branch=master;protocol=https" -SRCREV = "a7c2f190e010db508ead31fa952478e2a1c13d64" +SRCREV = "8ba6604027c0aa5131070e3fafdcda323d58a7ad" # Needs some help to find libnl3 headers. # Reorder -pthread flag on the command line. diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_4.2.5.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb index 7cbe3e6324..3fa293d0cd 100644 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_4.2.5.bb +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb @@ -17,7 +17,7 @@ SRC_URI = "https://1.eu.dl.wireshark.org/src/wireshark-${PV}.tar.xz \ UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" -SRC_URI[sha256sum] = "55e793ab87a9a73aac44336235c92cb76c52180c469b362ed3a54f26fbb1261f" +SRC_URI[sha256sum] = "2c5de08e19081bd666a2ce3f052c023274d06acaabc5d667a3c3051a9c618f86" PE = "1" @@ -42,7 +42,7 @@ PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF" PACKAGECONFIG[sbc] = "-DENABLE_SBC=ON,-DENABLE_SBC=OFF, sbc" PACKAGECONFIG[libssh] = "-DENABLE_LIBSSH=ON,-DENABLE_LIBSSH=OFF, libssh2" PACKAGECONFIG[lz4] = "-DENABLE_LZ4=ON,-DENABLE_LZ4=OFF, lz4" -PACKAGECONFIG[zstd] = "-DENABLE_STTD=ON,-DENABLE_ZSTD=OFF, zstd" +PACKAGECONFIG[zstd] = "-DENABLE_ZSTD=ON,-DENABLE_ZSTD=OFF, zstd" PACKAGECONFIG[nghttp2] = "-DENABLE_NGHTTP2=ON,-DENABLE_NGHTTP2=OFF, nghttp2" # these next two options require addional layers |