summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/bind/bind-9.16.24/0001-avoid-start-failure-with-bind-user.patch (renamed from meta/recipes-connectivity/bind/bind-9.16.23/0001-avoid-start-failure-with-bind-user.patch)0
-rw-r--r--meta/recipes-connectivity/bind/bind-9.16.24/0001-named-lwresd-V-and-start-log-hide-build-options.patch (renamed from meta/recipes-connectivity/bind/bind-9.16.23/0001-named-lwresd-V-and-start-log-hide-build-options.patch)0
-rw-r--r--meta/recipes-connectivity/bind/bind-9.16.24/bind-ensure-searching-for-json-headers-searches-sysr.patch (renamed from meta/recipes-connectivity/bind/bind-9.16.23/bind-ensure-searching-for-json-headers-searches-sysr.patch)0
-rw-r--r--meta/recipes-connectivity/bind/bind-9.16.24/bind9 (renamed from meta/recipes-connectivity/bind/bind-9.16.23/bind9)0
-rw-r--r--meta/recipes-connectivity/bind/bind-9.16.24/conf.patch (renamed from meta/recipes-connectivity/bind/bind-9.16.23/conf.patch)0
-rw-r--r--meta/recipes-connectivity/bind/bind-9.16.24/generate-rndc-key.sh (renamed from meta/recipes-connectivity/bind/bind-9.16.23/generate-rndc-key.sh)0
-rw-r--r--meta/recipes-connectivity/bind/bind-9.16.24/init.d-add-support-for-read-only-rootfs.patch (renamed from meta/recipes-connectivity/bind/bind-9.16.23/init.d-add-support-for-read-only-rootfs.patch)0
-rw-r--r--meta/recipes-connectivity/bind/bind-9.16.24/make-etc-initd-bind-stop-work.patch (renamed from meta/recipes-connectivity/bind/bind-9.16.23/make-etc-initd-bind-stop-work.patch)0
-rw-r--r--meta/recipes-connectivity/bind/bind-9.16.24/named.service (renamed from meta/recipes-connectivity/bind/bind-9.16.23/named.service)0
-rw-r--r--meta/recipes-connectivity/bind/bind_9.16.24.bb (renamed from meta/recipes-connectivity/bind/bind_9.16.23.bb)4
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5_5.63.bb (renamed from meta/recipes-connectivity/bluez5/bluez5_5.62.bb)2
-rw-r--r--meta/recipes-connectivity/connman/connman-conf.bb33
-rw-r--r--meta/recipes-connectivity/connman/connman-conf/qemuall/wired-connection.service10
-rw-r--r--meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup16
-rw-r--r--meta/recipes-connectivity/connman/connman-conf/qemuall/wired.config9
-rw-r--r--meta/recipes-connectivity/connman/connman/connman5
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patch37
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2_5.16.0.bb (renamed from meta/recipes-connectivity/iproute2/iproute2_5.15.0.bb)3
-rw-r--r--meta/recipes-connectivity/kea/kea_2.0.1.bb (renamed from meta/recipes-connectivity/kea/kea_2.0.0.bb)2
-rw-r--r--meta/recipes-connectivity/libuv/libuv_1.43.0.bb (renamed from meta/recipes-connectivity/libuv/libuv_1.42.0.bb)2
-rw-r--r--meta/recipes-connectivity/ofono/ofono_1.34.bb (renamed from meta/recipes-connectivity/ofono/ofono_1.33.bb)2
-rw-r--r--meta/recipes-connectivity/openssl/openssl/armv8-32bit.patch29
-rw-r--r--meta/recipes-connectivity/openssl/openssl/reproducibility.patch22
-rw-r--r--meta/recipes-connectivity/openssl/openssl_3.0.1.bb (renamed from meta/recipes-connectivity/openssl/openssl_3.0.0.bb)23
-rw-r--r--meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch20
-rw-r--r--meta/recipes-connectivity/resolvconf/resolvconf_1.91.bb (renamed from meta/recipes-connectivity/resolvconf/resolvconf_1.87.bb)3
-rw-r--r--meta/recipes-connectivity/socat/socat/0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch35
-rw-r--r--meta/recipes-connectivity/socat/socat_1.7.4.3.bb (renamed from meta/recipes-connectivity/socat/socat_1.7.4.2.bb)5
28 files changed, 129 insertions, 133 deletions
diff --git a/meta/recipes-connectivity/bind/bind-9.16.23/0001-avoid-start-failure-with-bind-user.patch b/meta/recipes-connectivity/bind/bind-9.16.24/0001-avoid-start-failure-with-bind-user.patch
index ec1bc7b..ec1bc7b 100644
--- a/meta/recipes-connectivity/bind/bind-9.16.23/0001-avoid-start-failure-with-bind-user.patch
+++ b/meta/recipes-connectivity/bind/bind-9.16.24/0001-avoid-start-failure-with-bind-user.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.16.23/0001-named-lwresd-V-and-start-log-hide-build-options.patch b/meta/recipes-connectivity/bind/bind-9.16.24/0001-named-lwresd-V-and-start-log-hide-build-options.patch
index 4dc6a5a..4dc6a5a 100644
--- a/meta/recipes-connectivity/bind/bind-9.16.23/0001-named-lwresd-V-and-start-log-hide-build-options.patch
+++ b/meta/recipes-connectivity/bind/bind-9.16.24/0001-named-lwresd-V-and-start-log-hide-build-options.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.16.23/bind-ensure-searching-for-json-headers-searches-sysr.patch b/meta/recipes-connectivity/bind/bind-9.16.24/bind-ensure-searching-for-json-headers-searches-sysr.patch
index f9cdc7c..f9cdc7c 100644
--- a/meta/recipes-connectivity/bind/bind-9.16.23/bind-ensure-searching-for-json-headers-searches-sysr.patch
+++ b/meta/recipes-connectivity/bind/bind-9.16.24/bind-ensure-searching-for-json-headers-searches-sysr.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.16.23/bind9 b/meta/recipes-connectivity/bind/bind-9.16.24/bind9
index 968679f..968679f 100644
--- a/meta/recipes-connectivity/bind/bind-9.16.23/bind9
+++ b/meta/recipes-connectivity/bind/bind-9.16.24/bind9
diff --git a/meta/recipes-connectivity/bind/bind-9.16.23/conf.patch b/meta/recipes-connectivity/bind/bind-9.16.24/conf.patch
index aa3642a..aa3642a 100644
--- a/meta/recipes-connectivity/bind/bind-9.16.23/conf.patch
+++ b/meta/recipes-connectivity/bind/bind-9.16.24/conf.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.16.23/generate-rndc-key.sh b/meta/recipes-connectivity/bind/bind-9.16.24/generate-rndc-key.sh
index 633e29c..633e29c 100644
--- a/meta/recipes-connectivity/bind/bind-9.16.23/generate-rndc-key.sh
+++ b/meta/recipes-connectivity/bind/bind-9.16.24/generate-rndc-key.sh
diff --git a/meta/recipes-connectivity/bind/bind-9.16.23/init.d-add-support-for-read-only-rootfs.patch b/meta/recipes-connectivity/bind/bind-9.16.24/init.d-add-support-for-read-only-rootfs.patch
index 11db95e..11db95e 100644
--- a/meta/recipes-connectivity/bind/bind-9.16.23/init.d-add-support-for-read-only-rootfs.patch
+++ b/meta/recipes-connectivity/bind/bind-9.16.24/init.d-add-support-for-read-only-rootfs.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.16.23/make-etc-initd-bind-stop-work.patch b/meta/recipes-connectivity/bind/bind-9.16.24/make-etc-initd-bind-stop-work.patch
index 146f3e3..146f3e3 100644
--- a/meta/recipes-connectivity/bind/bind-9.16.23/make-etc-initd-bind-stop-work.patch
+++ b/meta/recipes-connectivity/bind/bind-9.16.24/make-etc-initd-bind-stop-work.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.16.23/named.service b/meta/recipes-connectivity/bind/bind-9.16.24/named.service
index cda56ef..cda56ef 100644
--- a/meta/recipes-connectivity/bind/bind-9.16.23/named.service
+++ b/meta/recipes-connectivity/bind/bind-9.16.24/named.service
diff --git a/meta/recipes-connectivity/bind/bind_9.16.23.bb b/meta/recipes-connectivity/bind/bind_9.16.24.bb
index c1bf250..ef5fd42 100644
--- a/meta/recipes-connectivity/bind/bind_9.16.23.bb
+++ b/meta/recipes-connectivity/bind/bind_9.16.24.bb
@@ -20,7 +20,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \
20 file://0001-avoid-start-failure-with-bind-user.patch \ 20 file://0001-avoid-start-failure-with-bind-user.patch \
21 " 21 "
22 22
23SRC_URI[sha256sum] = "dedb5e27aa9cb6a9ce3e872845887ff837b99e4e9a91a5e2fcd67cf6e1ef173c" 23SRC_URI[sha256sum] = "5582f3734bd6232284f93f14206b8a46d1f819dea4797ae157066f6963b08507"
24 24
25UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" 25UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/"
26# stay at 9.16 follow the ESV versions divisible by 4 26# stay at 9.16 follow the ESV versions divisible by 4
@@ -46,7 +46,7 @@ EXTRA_OECONF = " --with-libtool --disable-devpoll --disable-auto-validation --en
46 " 46 "
47LDFLAGS:append = " -lz" 47LDFLAGS:append = " -lz"
48 48
49inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native distutils3-base', '', d)} 49inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native setuptools3-base', '', d)}
50 50
51# dhcp needs .la so keep them 51# dhcp needs .la so keep them
52REMOVE_LIBTOOL_LA = "0" 52REMOVE_LIBTOOL_LA = "0"
diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.62.bb b/meta/recipes-connectivity/bluez5/bluez5_5.63.bb
index 411ac8b..34c4767 100644
--- a/meta/recipes-connectivity/bluez5/bluez5_5.62.bb
+++ b/meta/recipes-connectivity/bluez5/bluez5_5.63.bb
@@ -1,6 +1,6 @@
1require bluez5.inc 1require bluez5.inc
2 2
3SRC_URI[sha256sum] = "38090a5b750e17fc08d3e52178ed8d3254c5f4bd2c48830d5c1955b88e3bc0c2" 3SRC_URI[sha256sum] = "9349e11e8160bb3d720835d271250d8a7424d3690f5289e6db6fe07cc66c6d76"
4 4
5# These issues have kernel fixes rather than bluez fixes so exclude here 5# These issues have kernel fixes rather than bluez fixes so exclude here
6CVE_CHECK_WHITELIST += "CVE-2020-12352 CVE-2020-24490" 6CVE_CHECK_WHITELIST += "CVE-2020-12352 CVE-2020-24490"
diff --git a/meta/recipes-connectivity/connman/connman-conf.bb b/meta/recipes-connectivity/connman/connman-conf.bb
index 006f976..97ac498 100644
--- a/meta/recipes-connectivity/connman/connman-conf.bb
+++ b/meta/recipes-connectivity/connman/connman-conf.bb
@@ -1,36 +1,19 @@
1SUMMARY = "Connman config to setup wired interface on qemu machines" 1SUMMARY = "Connman config to ignore wired interface on qemu machines"
2DESCRIPTION = "This is the ConnMan configuration to set up a Wired \ 2DESCRIPTION = "This is the ConnMan configuration to avoid touching wired \
3network interface for a qemu machine." 3network interface inside qemu machines."
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" 5LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
6 6
7inherit systemd
8
9SRC_URI:append:qemuall = " file://wired.config \
10 file://wired-setup \
11 file://wired-connection.service \
12"
13PR = "r2" 7PR = "r2"
14 8
15S = "${WORKDIR}" 9S = "${WORKDIR}"
16 10
17PACKAGE_ARCH = "${MACHINE_ARCH}" 11PACKAGE_ARCH = "${MACHINE_ARCH}"
18 12
19FILES:${PN} = "${localstatedir}/* ${datadir}/*" 13FILES:${PN} = "${sysconfdir}/*"
20 14
21do_install() { 15# Kernel IP-Config is perfectly capable of setting up networking passed in via ip=
22 #Configure Wired network interface in case of qemu* machines 16do_install:append:qemuall() {
23 if test -e ${WORKDIR}/wired.config && 17 mkdir -p ${D}${sysconfdir}/default
24 test -e ${WORKDIR}/wired-setup && 18 echo "export EXTRA_PARAM=\"-I eth0\"" > ${D}${sysconfdir}/default/connman
25 test -e ${WORKDIR}/wired-connection.service; then
26 install -d ${D}${localstatedir}/lib/connman
27 install -m 0644 ${WORKDIR}/wired.config ${D}${localstatedir}/lib/connman
28 install -d ${D}${datadir}/connman
29 install -m 0755 ${WORKDIR}/wired-setup ${D}${datadir}/connman
30 install -d ${D}${systemd_system_unitdir}
31 install -m 0644 ${WORKDIR}/wired-connection.service ${D}${systemd_system_unitdir}
32 sed -i -e 's|@SCRIPTDIR@|${datadir}/connman|g' ${D}${systemd_system_unitdir}/wired-connection.service
33 fi
34} 19}
35
36SYSTEMD_SERVICE:${PN}:qemuall = "wired-connection.service"
diff --git a/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-connection.service b/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-connection.service
deleted file mode 100644
index 48adfc0..0000000
--- a/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-connection.service
+++ /dev/null
@@ -1,10 +0,0 @@
1[Unit]
2Description=Setup a wired interface
3Before=connman.service
4
5[Service]
6Type=oneshot
7ExecStart=@SCRIPTDIR@/wired-setup
8
9[Install]
10WantedBy=network.target
diff --git a/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup b/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup
deleted file mode 100644
index c46899e..0000000
--- a/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup
+++ /dev/null
@@ -1,16 +0,0 @@
1#!/bin/sh
2
3CONFIGF=/var/lib/connman/wired.config
4
5# Extract wired network config from /proc/cmdline
6NET_CONF=`cat /proc/cmdline |sed -ne 's/^.*ip=\([^ ]*\):\([^ ]*\):\([^ ]*\):\([^ ]*\).*$/\1\/\4\/\3/p'`
7
8# Check if eth0 is already set via kernel cmdline
9if [ "x$NET_CONF" = "x" ]; then
10 # Wired interface is not configured via kernel cmdline
11 # Remove connman config file template
12 rm -f ${CONFIGF}
13else
14 # Setup a connman config accordingly
15 sed -i -e "s|^IPv4 =.*|IPv4 = ${NET_CONF}|" ${CONFIGF}
16fi
diff --git a/meta/recipes-connectivity/connman/connman-conf/qemuall/wired.config b/meta/recipes-connectivity/connman/connman-conf/qemuall/wired.config
deleted file mode 100644
index 42998ce..0000000
--- a/meta/recipes-connectivity/connman/connman-conf/qemuall/wired.config
+++ /dev/null
@@ -1,9 +0,0 @@
1[global]
2Name = Wired
3Description = Wired network configuration
4
5[service_ethernet]
6Type = ethernet
7IPv4 =
8MAC = 52:54:00:12:34:56
9Nameservers = 8.8.8.8
diff --git a/meta/recipes-connectivity/connman/connman/connman b/meta/recipes-connectivity/connman/connman/connman
index c64fa0d..310a696 100644
--- a/meta/recipes-connectivity/connman/connman/connman
+++ b/meta/recipes-connectivity/connman/connman/connman
@@ -27,7 +27,6 @@ while read dev mtpt fstype rest; do
27done 27done
28 28
29do_start() { 29do_start() {
30 EXTRA_PARAM=""
31 if test $nfsroot -eq 1 ; then 30 if test $nfsroot -eq 1 ; then
32 NET_DEVS=`cat /proc/net/dev | sed -ne 's/^\([a-zA-Z0-9 ]*\):.*$/\1/p'` 31 NET_DEVS=`cat /proc/net/dev | sed -ne 's/^\([a-zA-Z0-9 ]*\):.*$/\1/p'`
33 NET_ADDR=`cat /proc/cmdline | sed -ne 's/^.*ip=\([^ :]*\).*$/\1/p'` 32 NET_ADDR=`cat /proc/cmdline | sed -ne 's/^.*ip=\([^ :]*\).*$/\1/p'`
@@ -36,13 +35,13 @@ do_start() {
36 if [ "$NET_ADDR" = dhcp ]; then 35 if [ "$NET_ADDR" = dhcp ]; then
37 ethn=`ifconfig | grep "^eth" | sed -e "s/\(eth[0-9]\)\(.*\)/\1/"` 36 ethn=`ifconfig | grep "^eth" | sed -e "s/\(eth[0-9]\)\(.*\)/\1/"`
38 if [ ! -z "$ethn" ]; then 37 if [ ! -z "$ethn" ]; then
39 EXTRA_PARAM="-I $ethn" 38 EXTRA_PARAM="$EXTRA_PARAM -I $ethn"
40 fi 39 fi
41 else 40 else
42 for i in $NET_DEVS; do 41 for i in $NET_DEVS; do
43 ADDR=`ifconfig $i | sed 's/addr://g' | sed -ne 's/^.*inet \([0-9.]*\) .*$/\1/p'` 42 ADDR=`ifconfig $i | sed 's/addr://g' | sed -ne 's/^.*inet \([0-9.]*\) .*$/\1/p'`
44 if [ "$NET_ADDR" = "$ADDR" ]; then 43 if [ "$NET_ADDR" = "$ADDR" ]; then
45 EXTRA_PARAM="-I $i" 44 EXTRA_PARAM="$EXTRA_PARAM -I $i"
46 break 45 break
47 fi 46 fi
48 done 47 done
diff --git a/meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patch b/meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patch
new file mode 100644
index 0000000..e4c0cf4
--- /dev/null
+++ b/meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patch
@@ -0,0 +1,37 @@
1From 8bced38a941a181f1468fa39541e872e51b6022f Mon Sep 17 00:00:00 2001
2From: Sam James <sam@gentoo.org>
3Date: Thu, 13 Jan 2022 08:14:13 +0000
4Subject: [PATCH] lib: fix ax25.h include for musl
5
6ax25.h isn't guaranteed to be avilable in netax25/*;
7it's dependent on our choice of libc (it's not available
8on musl at least) [0].
9
10Let's use the version from linux-headers.
11
12[0] https://sourceware.org/glibc/wiki/Synchronizing_Headers
13Bug: https://bugs.gentoo.org/831102
14
15Signed-off-by: Sam James <sam@gentoo.org>
16Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
17
18Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=8bced38a941a181f1468fa39541e872e51b6022f]
19---
20 lib/ax25_ntop.c | 2 +-
21 1 file changed, 1 insertion(+), 1 deletion(-)
22
23diff --git a/lib/ax25_ntop.c b/lib/ax25_ntop.c
24index cfd0e04b..3a72a43e 100644
25--- a/lib/ax25_ntop.c
26+++ b/lib/ax25_ntop.c
27@@ -2,7 +2,7 @@
28
29 #include <errno.h>
30 #include <sys/socket.h>
31-#include <netax25/ax25.h>
32+#include <linux/ax25.h>
33
34 #include "utils.h"
35
36--
372.32.0 (Apple Git-132)
diff --git a/meta/recipes-connectivity/iproute2/iproute2_5.15.0.bb b/meta/recipes-connectivity/iproute2/iproute2_5.16.0.bb
index 99a7433..871f8d8 100644
--- a/meta/recipes-connectivity/iproute2/iproute2_5.15.0.bb
+++ b/meta/recipes-connectivity/iproute2/iproute2_5.16.0.bb
@@ -2,9 +2,10 @@ require iproute2.inc
2 2
3SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ 3SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \
4 file://0001-libc-compat.h-add-musl-workaround.patch \ 4 file://0001-libc-compat.h-add-musl-workaround.patch \
5 file://0001-lib-fix-ax25.h-include-for-musl.patch \
5 " 6 "
6 7
7SRC_URI[sha256sum] = "38e3e4a5f9a7f5575c015027a10df097c149111eeb739993128e5b2b35b291ff" 8SRC_URI[sha256sum] = "c064b66f6b001c2a35aa5224b5b1ac8aa4bee104d7dce30d6f10a84cb8b01e2f"
8 9
9# CFLAGS are computed in Makefile and reference CCOPTS 10# CFLAGS are computed in Makefile and reference CCOPTS
10# 11#
diff --git a/meta/recipes-connectivity/kea/kea_2.0.0.bb b/meta/recipes-connectivity/kea/kea_2.0.1.bb
index 9f33c32..900ceb6 100644
--- a/meta/recipes-connectivity/kea/kea_2.0.0.bb
+++ b/meta/recipes-connectivity/kea/kea_2.0.1.bb
@@ -18,7 +18,7 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \
18 file://fix_pid_keactrl.patch \ 18 file://fix_pid_keactrl.patch \
19 file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \ 19 file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \
20 " 20 "
21SRC_URI[sha256sum] = "05854e0c3871b452edace18eccc6ab618940e0249fbe7c232a36d06ae59bf41d" 21SRC_URI[sha256sum] = "f50bb9a954e314316b4033a175dc807496bb9c1754110bd92a21c165a9e84c57"
22 22
23inherit autotools systemd update-rc.d upstream-version-is-even 23inherit autotools systemd update-rc.d upstream-version-is-even
24 24
diff --git a/meta/recipes-connectivity/libuv/libuv_1.42.0.bb b/meta/recipes-connectivity/libuv/libuv_1.43.0.bb
index 2dfbb8b..1b536de 100644
--- a/meta/recipes-connectivity/libuv/libuv_1.42.0.bb
+++ b/meta/recipes-connectivity/libuv/libuv_1.43.0.bb
@@ -5,7 +5,7 @@ BUGTRACKER = "https://github.com/libuv/libuv/issues"
5LICENSE = "MIT" 5LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47" 6LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47"
7 7
8SRCREV = "6ce14710da7079eb248868171f6343bc409ea3a4" 8SRCREV = "988f2bfc4defb9a85a536a3e645834c161143ee0"
9SRC_URI = "git://github.com/libuv/libuv;branch=v1.x;protocol=https" 9SRC_URI = "git://github.com/libuv/libuv;branch=v1.x;protocol=https"
10 10
11S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
diff --git a/meta/recipes-connectivity/ofono/ofono_1.33.bb b/meta/recipes-connectivity/ofono/ofono_1.34.bb
index 1fab90c..24369b3 100644
--- a/meta/recipes-connectivity/ofono/ofono_1.33.bb
+++ b/meta/recipes-connectivity/ofono/ofono_1.34.bb
@@ -13,7 +13,7 @@ SRC_URI = "\
13 file://0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch \ 13 file://0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch \
14 file://0002-mbim-Fix-build-with-ell-0.39-by-restoring-unlikely-m.patch \ 14 file://0002-mbim-Fix-build-with-ell-0.39-by-restoring-unlikely-m.patch \
15" 15"
16SRC_URI[sha256sum] = "e4591c5353ad2069cb9c0861fad3f1bf655137f9785fc5f16151d509e49ba708" 16SRC_URI[sha256sum] = "c0b96d3013447ec2bcb74579bef90e4e59c68dbfa4b9c6fbce5d12401a43aac7"
17 17
18inherit autotools pkgconfig update-rc.d systemd gobject-introspection-data 18inherit autotools pkgconfig update-rc.d systemd gobject-introspection-data
19 19
diff --git a/meta/recipes-connectivity/openssl/openssl/armv8-32bit.patch b/meta/recipes-connectivity/openssl/openssl/armv8-32bit.patch
deleted file mode 100644
index 1935651..0000000
--- a/meta/recipes-connectivity/openssl/openssl/armv8-32bit.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1Upstream-Status: Submitted [https://github.com/openssl/openssl/pull/16951]
2Signed-off-by: Ross Burton <ross.burton@arm.com>
3
4From 5118e96a3dbedde2523e7726fa34af30923a9add Mon Sep 17 00:00:00 2001
5From: Tom Cosgrove <tom.cosgrove@arm.com>
6Date: Tue, 2 Nov 2021 15:26:21 +0000
7Subject: [PATCH] Fix builds on Armv8 systems without AArch64
8
9This fixes "undefined reference to `aes_gcm_dec_128_kernel' in function
10`armv8_aes_gcm_decrypt'" and similar
11
12Fixes #16949
13---
14 include/crypto/aes_platform.h | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/include/crypto/aes_platform.h b/include/crypto/aes_platform.h
18index 015c3bd4ab91..e95ad5aa5de6 100644
19--- a/include/crypto/aes_platform.h
20+++ b/include/crypto/aes_platform.h
21@@ -100,7 +100,7 @@ void AES_xts_decrypt(const unsigned char *inp, unsigned char *out, size_t len,
22 # define AES_PMULL_CAPABLE ((OPENSSL_armcap_P & ARMV8_PMULL) && (OPENSSL_armcap_P & ARMV8_AES))
23 # define AES_GCM_ENC_BYTES 512
24 # define AES_GCM_DEC_BYTES 512
25-# if __ARM_MAX_ARCH__>=8
26+# if __ARM_MAX_ARCH__>=8 && defined(__aarch64__)
27 # define AES_gcm_encrypt armv8_aes_gcm_encrypt
28 # define AES_gcm_decrypt armv8_aes_gcm_decrypt
29 # define AES_GCM_ASM(gctx) ((gctx)->ctr==aes_v8_ctr32_encrypt_blocks && \
diff --git a/meta/recipes-connectivity/openssl/openssl/reproducibility.patch b/meta/recipes-connectivity/openssl/openssl/reproducibility.patch
new file mode 100644
index 0000000..8accbc9
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl/reproducibility.patch
@@ -0,0 +1,22 @@
1Using localtime() means the output can depend on the timezone of the build machine.
2Using gmtime() is safer. For complete reproducibility use SOURCE_DATE_EPOCH if set.
3
4Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5Upstream-Status: Pending [should be suitable]
6
7Index: openssl-3.0.1/apps/progs.pl
8===================================================================
9--- openssl-3.0.1.orig/apps/progs.pl
10+++ openssl-3.0.1/apps/progs.pl
11@@ -21,7 +21,10 @@ die "Unrecognised option, must be -C or
12 my %commands = ();
13 my $cmdre = qr/^\s*int\s+([a-z_][a-z0-9_]*)_main\(\s*int\s+argc\s*,/;
14 my $apps_openssl = shift @ARGV;
15-my $YEAR = [localtime()]->[5] + 1900;
16+my $YEAR = [gmtime()]->[5] + 1900;
17+if (defined($ENV{SOURCE_DATE_EPOCH}) && $ENV{SOURCE_DATE_EPOCH} !~ /\D/) {
18+ $YEAR = [gmtime($ENV{SOURCE_DATE_EPOCH})]->[5] + 1900;
19+}
20
21 # because the program apps/openssl has object files as sources, and
22 # they then have the corresponding C files as source, we need to chain
diff --git a/meta/recipes-connectivity/openssl/openssl_3.0.0.bb b/meta/recipes-connectivity/openssl/openssl_3.0.1.bb
index 8852a51..7727ec4 100644
--- a/meta/recipes-connectivity/openssl/openssl_3.0.0.bb
+++ b/meta/recipes-connectivity/openssl/openssl_3.0.1.bb
@@ -12,14 +12,14 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
12 file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ 12 file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \
13 file://afalg.patch \ 13 file://afalg.patch \
14 file://0001-Configure-do-not-tweak-mips-cflags.patch \ 14 file://0001-Configure-do-not-tweak-mips-cflags.patch \
15 file://armv8-32bit.patch \ 15 file://reproducibility.patch \
16 " 16 "
17 17
18SRC_URI:append:class-nativesdk = " \ 18SRC_URI:append:class-nativesdk = " \
19 file://environment.d-openssl.sh \ 19 file://environment.d-openssl.sh \
20 " 20 "
21 21
22SRC_URI[sha256sum] = "59eedfcb46c25214c9bd37ed6078297b4df01d012267fe9e9eee31f61bc70536" 22SRC_URI[sha256sum] = "c311ad853353bce796edad01a862c50a8a587f62e7e2100ef465ab53ec9b06d1"
23 23
24inherit lib_package multilib_header multilib_script ptest perlnative 24inherit lib_package multilib_header multilib_script ptest perlnative
25MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" 25MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash"
@@ -69,6 +69,9 @@ do_configure () {
69 esac 69 esac
70 target="$os-${HOST_ARCH}" 70 target="$os-${HOST_ARCH}"
71 case $target in 71 case $target in
72 linux-arc)
73 target=linux-latomic
74 ;;
72 linux-arm*) 75 linux-arm*)
73 target=linux-armv4 76 target=linux-armv4
74 ;; 77 ;;
@@ -190,21 +193,21 @@ do_install_ptest () {
190 install -m755 ${B}/apps/CA.pl ${D}${PTEST_PATH}/apps 193 install -m755 ${B}/apps/CA.pl ${D}${PTEST_PATH}/apps
191 194
192 install -d ${D}${PTEST_PATH}/engines 195 install -d ${D}${PTEST_PATH}/engines
193 install -m755 ${B}/engines/ossltest.so ${D}${PTEST_PATH}/engines 196 install -m755 ${B}/engines/dasync.so ${D}${PTEST_PATH}/engines
194 install -m755 ${B}/engines/loader_attic.so ${D}${PTEST_PATH}/engines 197 install -m755 ${B}/engines/loader_attic.so ${D}${PTEST_PATH}/engines
198 install -m755 ${B}/engines/ossltest.so ${D}${PTEST_PATH}/engines
195 199
196 install -d ${D}${PTEST_PATH}/providers 200 install -d ${D}${PTEST_PATH}/providers
197 install -m755 ${B}/providers/legacy.so ${D}${PTEST_PATH}/providers 201 install -m755 ${B}/providers/legacy.so ${D}${PTEST_PATH}/providers
198 202
199 install -d ${D}${PTEST_PATH}/Configurations 203 install -d ${D}${PTEST_PATH}/Configurations
200 cp -rf ${S}/Configurations/* ${D}${PTEST_PATH}/Configurations/ 204 cp -rf ${S}/Configurations/* ${D}${PTEST_PATH}/Configurations/
201 205
202 # seems to be needed with perl 5.32.1 206 # seems to be needed with perl 5.32.1
203 install -d ${D}${PTEST_PATH}/util/perl/recipes 207 install -d ${D}${PTEST_PATH}/util/perl/recipes
204 cp ${D}${PTEST_PATH}/test/recipes/tconversion.pl ${D}${PTEST_PATH}/util/perl/recipes/ 208 cp ${D}${PTEST_PATH}/test/recipes/tconversion.pl ${D}${PTEST_PATH}/util/perl/recipes/
205 209
206 sed 's|${S}|${PTEST_PATH}|g' -i ${D}${PTEST_PATH}/util/wrap.pl 210 sed 's|${S}|${PTEST_PATH}|g' -i ${D}${PTEST_PATH}/util/wrap.pl
207
208} 211}
209 212
210# Add the openssl.cnf file to the openssl-conf package. Make the libcrypto 213# Add the openssl.cnf file to the openssl-conf package. Make the libcrypto
@@ -230,7 +233,7 @@ CONFFILES:openssl-conf = "${sysconfdir}/ssl/openssl.cnf"
230 233
231RRECOMMENDS:libcrypto += "openssl-conf" 234RRECOMMENDS:libcrypto += "openssl-conf"
232RDEPENDS:${PN}-misc = "perl" 235RDEPENDS:${PN}-misc = "perl"
233RDEPENDS:${PN}-ptest += "openssl-bin perl perl-modules bash" 236RDEPENDS:${PN}-ptest += "openssl-bin perl perl-modules bash sed"
234 237
235RDEPENDS:${PN}-bin += "openssl-conf" 238RDEPENDS:${PN}-bin += "openssl-conf"
236 239
diff --git a/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch b/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch
deleted file mode 100644
index 1aead07..0000000
--- a/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1
2busybox installs readlink into /usr/bin, so ensure /usr/bin
3is in the path.
4
5Upstream-Status: Submitted
6Signed-off-by: Saul Wold <sgw@linux.intel.com>
7
8Index: resolvconf-1.76/etc/resolvconf/update.d/libc
9===================================================================
10--- resolvconf-1.76.orig/etc/resolvconf/update.d/libc
11+++ resolvconf-1.76/etc/resolvconf/update.d/libc
12@@ -16,7 +16,7 @@
13 #
14
15 set -e
16-PATH=/sbin:/bin
17+PATH=/sbin:/bin:/usr/bin
18
19 [ -x /lib/resolvconf/list-records ] || exit 1
20
diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.87.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.91.bb
index f57abe3..cb25238 100644
--- a/meta/recipes-connectivity/resolvconf/resolvconf_1.87.bb
+++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.91.bb
@@ -12,11 +12,10 @@ HOMEPAGE = "http://packages.debian.org/resolvconf"
12RDEPENDS:${PN} = "bash" 12RDEPENDS:${PN} = "bash"
13 13
14SRC_URI = "git://salsa.debian.org/debian/resolvconf.git;protocol=https;branch=unstable \ 14SRC_URI = "git://salsa.debian.org/debian/resolvconf.git;protocol=https;branch=unstable \
15 file://fix-path-for-busybox.patch \
16 file://99_resolvconf \ 15 file://99_resolvconf \
17 " 16 "
18 17
19SRCREV = "1dda36d8465e335c60190c41e7185d782da1bd7b" 18SRCREV = "859209d573e7aec0e95d812c6b52444591a628d1"
20 19
21S = "${WORKDIR}/git" 20S = "${WORKDIR}/git"
22 21
diff --git a/meta/recipes-connectivity/socat/socat/0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch b/meta/recipes-connectivity/socat/socat/0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch
new file mode 100644
index 0000000..fbfb081
--- /dev/null
+++ b/meta/recipes-connectivity/socat/socat/0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch
@@ -0,0 +1,35 @@
1From d67d6b4f981db9612d808bd723176a1d2996d53a Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Mon, 17 Jan 2022 13:21:32 +0100
4Subject: [PATCH] configure.ac: check getprotobynumber_r with AC_TRY_LINK
5
6AC_TRY_COMPILE won't error out if the function is altogether absent
7(e.g. on linux musl C library), the test needs to link all the way.
8
9Upstream-Status: Submitted [via email to socat@dest-unreach.org]
10Signed-off-by: Alexander Kanavin <alex@linutronix.de>
11---
12 configure.ac | 6 +++---
13 1 file changed, 3 insertions(+), 3 deletions(-)
14
15diff --git a/configure.ac b/configure.ac
16index d4acc9e..973a7f2 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -137,13 +137,13 @@ AC_MSG_RESULT($sc_cv_have_prototype_hstrerror)
20 # getprotobynumber_r() is not standardized
21 AC_MSG_CHECKING(for getprotobynumber_r() variant)
22 AC_CACHE_VAL(sc_cv_getprotobynumber_r,
23-[AC_TRY_COMPILE([#include <stddef.h>
24+[AC_TRY_LINK([#include <stddef.h>
25 #include <netdb.h>],[getprotobynumber_r(1,NULL,NULL,1024,NULL);],
26 [sc_cv_getprotobynumber_r=1; tmp_bynum_variant=Linux],
27- [AC_TRY_COMPILE([#include <stddef.h>
28+ [AC_TRY_LINK([#include <stddef.h>
29 #include <netdb.h>],[getprotobynumber_r(1,NULL,NULL,1024);],
30 [sc_cv_getprotobynumber_r=2; tmp_bynum_variant=Solaris],
31- [AC_TRY_COMPILE([#include <stddef.h>
32+ [AC_TRY_LINK([#include <stddef.h>
33 #include <netdb.h>],[getprotobynumber_r(1,NULL,NULL);],
34 [sc_cv_getprotobynumber_r=3; tmp_bynum_variant=AIX],
35
diff --git a/meta/recipes-connectivity/socat/socat_1.7.4.2.bb b/meta/recipes-connectivity/socat/socat_1.7.4.3.bb
index 0edde6a..a4a0a89 100644
--- a/meta/recipes-connectivity/socat/socat_1.7.4.2.bb
+++ b/meta/recipes-connectivity/socat/socat_1.7.4.3.bb
@@ -10,9 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://README;beginline=257;endline=287;md5=82520b052f322ac2b5b3dfdc7c7eea86" 10 file://README;beginline=257;endline=287;md5=82520b052f322ac2b5b3dfdc7c7eea86"
11 11
12SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \ 12SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \
13" 13 file://0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch \
14 "
14 15
15SRC_URI[sha256sum] = "6690a9f9990457b505097a272bbf2cbf4cc35576176f76646e3524b0e91c1763" 16SRC_URI[sha256sum] = "d47318104415077635119dfee44bcfb41de3497374a9a001b1aff6e2f0858007"
16 17
17inherit autotools 18inherit autotools
18 19