diff options
Diffstat (limited to 'meta-networking')
144 files changed, 2003 insertions, 2566 deletions
diff --git a/meta-networking/recipes-connectivity/cloudflared/cloudflared_2026.3.0.bb b/meta-networking/recipes-connectivity/cloudflared/cloudflared_2026.3.0.bb new file mode 100644 index 0000000000..f0b8530a69 --- /dev/null +++ b/meta-networking/recipes-connectivity/cloudflared/cloudflared_2026.3.0.bb | |||
| @@ -0,0 +1,36 @@ | |||
| 1 | SUMMARY = "Cloudflare Tunnel client" | ||
| 2 | DESCRIPTION = "cloudflared is the command-line client for Cloudflare Tunnel, \ | ||
| 3 | a tunneling daemon that proxies traffic from the Cloudflare network to your origins." | ||
| 4 | HOMEPAGE = "https://github.com/cloudflare/cloudflared" | ||
| 5 | SECTION = "networking" | ||
| 6 | |||
| 7 | LICENSE = "Apache-2.0" | ||
| 8 | LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=175792518e4ac015ab6696d16c4f607e" | ||
| 9 | |||
| 10 | SRC_URI = "git://github.com/cloudflare/cloudflared.git;protocol=https;branch=master;destsuffix=${GO_SRCURI_DESTSUFFIX} \ | ||
| 11 | file://cloudflared.service \ | ||
| 12 | file://default \ | ||
| 13 | " | ||
| 14 | SRCREV = "d2a87e9b93456ad7f82417400f4209d513668487" | ||
| 15 | |||
| 16 | GO_IMPORT = "github.com/cloudflare/cloudflared" | ||
| 17 | GO_INSTALL = "${GO_IMPORT}/cmd/cloudflared" | ||
| 18 | GO_LINKSHARED = "" | ||
| 19 | SRCREV_SHORT = "${@d.getVar('SRCREV')[:8]}" | ||
| 20 | GO_EXTRA_LDFLAGS = "-X main.Version=${PV}-${SRCREV_SHORT}" | ||
| 21 | |||
| 22 | inherit go-mod systemd | ||
| 23 | |||
| 24 | SYSTEMD_SERVICE:${PN} = "cloudflared.service" | ||
| 25 | |||
| 26 | do_install:append() { | ||
| 27 | install -d ${D}${systemd_system_unitdir} | ||
| 28 | install -m 0644 ${UNPACKDIR}/cloudflared.service ${D}${systemd_system_unitdir}/cloudflared.service | ||
| 29 | install -d ${D}${sysconfdir}/default | ||
| 30 | install -m 0644 ${UNPACKDIR}/default ${D}${sysconfdir}/default/cloudflared | ||
| 31 | } | ||
| 32 | |||
| 33 | FILES:${PN}-src += "${libdir}/go/src" | ||
| 34 | |||
| 35 | # Fix shebang and QA Issue with scripts with /bin/bash and /usr/bin/python3 | ||
| 36 | INSANE_SKIP:${PN}-dev = "file-rdeps" | ||
diff --git a/meta-networking/recipes-connectivity/cloudflared/files/cloudflared.service b/meta-networking/recipes-connectivity/cloudflared/files/cloudflared.service new file mode 100644 index 0000000000..decaf0e329 --- /dev/null +++ b/meta-networking/recipes-connectivity/cloudflared/files/cloudflared.service | |||
| @@ -0,0 +1,15 @@ | |||
| 1 | [Unit] | ||
| 2 | Description=cloudflared | ||
| 3 | After=network-online.target | ||
| 4 | Wants=network-online.target | ||
| 5 | |||
| 6 | [Service] | ||
| 7 | Type=notify | ||
| 8 | DynamicUser=yes | ||
| 9 | EnvironmentFile=/etc/default/cloudflared | ||
| 10 | ExecStart=/usr/bin/cloudflared --no-autoupdate tunnel run --token ${TUNNEL_TOKEN} | ||
| 11 | Restart=on-failure | ||
| 12 | RestartSec=5s | ||
| 13 | |||
| 14 | [Install] | ||
| 15 | WantedBy=multi-user.target | ||
diff --git a/meta-networking/recipes-connectivity/cloudflared/files/default b/meta-networking/recipes-connectivity/cloudflared/files/default new file mode 100644 index 0000000000..1e00173af6 --- /dev/null +++ b/meta-networking/recipes-connectivity/cloudflared/files/default | |||
| @@ -0,0 +1,2 @@ | |||
| 1 | # Cloudflare Tunnel token from the dashboard | ||
| 2 | TUNNEL_TOKEN= | ||
diff --git a/meta-networking/recipes-connectivity/daq/libdaq_3.0.25.bb b/meta-networking/recipes-connectivity/daq/libdaq_3.0.27.bb index b999f385a6..fb45ad74b3 100644 --- a/meta-networking/recipes-connectivity/daq/libdaq_3.0.25.bb +++ b/meta-networking/recipes-connectivity/daq/libdaq_3.0.27.bb | |||
| @@ -12,7 +12,7 @@ inherit autotools pkgconfig | |||
| 12 | SRC_URI = "git://github.com/snort3/libdaq.git;protocol=https;branch=master;tag=v${PV} \ | 12 | SRC_URI = "git://github.com/snort3/libdaq.git;protocol=https;branch=master;tag=v${PV} \ |
| 13 | file://0001-example-Use-lm-for-the-fst-module.patch" | 13 | file://0001-example-Use-lm-for-the-fst-module.patch" |
| 14 | 14 | ||
| 15 | SRCREV = "7baba902b3fee7a81be663bfb71418402411c24a" | 15 | SRCREV = "959b13d76aa3409acadfe22d1c30864698a297a7" |
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | FILES:${PN} += "${libdir}/daq/*.so" | 18 | FILES:${PN} += "${libdir}/daq/*.so" |
diff --git a/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3p1.bb b/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3p1.bb index 707eeb0e26..04fe9b9acd 100644 --- a/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3p1.bb +++ b/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3p1.bb | |||
| @@ -39,7 +39,7 @@ BIND_EXTRA_CONFIG = "\ | |||
| 39 | --host=${HOST_SYS} \ | 39 | --host=${HOST_SYS} \ |
| 40 | --target=${TARGET_SYS} \ | 40 | --target=${TARGET_SYS} \ |
| 41 | " | 41 | " |
| 42 | 42 | CACHED_CONFIGUREVARS += "ac_cv_prog_cc_c23=no" | |
| 43 | EXTRA_OECONF = "--with-bind-extra-config="${BIND_EXTRA_CONFIG}" \ | 43 | EXTRA_OECONF = "--with-bind-extra-config="${BIND_EXTRA_CONFIG}" \ |
| 44 | --enable-paranoia \ | 44 | --enable-paranoia \ |
| 45 | --disable-static \ | 45 | --disable-static \ |
diff --git a/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b7.bb b/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b8.bb index 7a392b2c23..eabf4027d6 100644 --- a/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b7.bb +++ b/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b8.bb | |||
| @@ -4,21 +4,19 @@ HOMEPAGE = "http://sourceforge.net/projects/ez-ipupdate/" | |||
| 4 | LICENSE = "GPL-2.0-only" | 4 | LICENSE = "GPL-2.0-only" |
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=7783169b4be06b54e86730eb01bc3a31" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=7783169b4be06b54e86730eb01bc3a31" |
| 6 | 6 | ||
| 7 | SRC_URI = "http://sourceforge.net/projects/ez-ipupdate/files/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ | 7 | SRC_URI = "${DEBIAN_MIRROR}/main/e/${BPN}/${BPN}_${PV}.orig.tar.gz \ |
| 8 | file://Makefile.am.patch \ | 8 | file://Makefile.am.patch \ |
| 9 | file://cache_file.c.patch \ | ||
| 10 | file://conf_file.c.patch \ | ||
| 11 | file://wformat.patch \ | 9 | file://wformat.patch \ |
| 12 | file://0001-ez-ipupdate-Include-time.h-for-time-API-prototype.patch \ | 10 | file://0001-ez-ipupdate-Include-time.h-for-time-API-prototype.patch \ |
| 13 | file://CVE-2003-0887.patch \ | 11 | file://CVE-2003-0887.patch \ |
| 12 | file://0001-configure-Check-for-string.h-system-header.patch \ | ||
| 14 | " | 13 | " |
| 15 | SRC_URI[md5sum] = "525be4550b4461fdf105aed8e753b020" | 14 | SRC_URI[sha256sum] = "bf5b8d11ffe055c5891d0ab64bbfa86e99cbda645d40f346146b939fec8d962d" |
| 16 | SRC_URI[sha256sum] = "a15ec0dc0b78ec7578360987c68e43a67bc8d3591cbf528a323588830ae22c20" | ||
| 17 | 15 | ||
| 18 | inherit autotools pkgconfig | 16 | inherit autotools pkgconfig |
| 19 | 17 | ||
| 20 | do_install:append(){ | 18 | #do_install:append(){ |
| 21 | install -m 0744 -d ${D}${localstatedir}/lib/ez-ipupdate | 19 | # install -m 0744 -d ${D}${localstatedir}/lib/ez-ipupdate |
| 22 | } | 20 | #} |
| 23 | 21 | ||
| 24 | FILES:${PN} += "${localstatedir}/lib/ez-ipupdate" | 22 | #FILES:${PN} += "${localstatedir}/lib/ez-ipupdate" |
diff --git a/meta-networking/recipes-connectivity/ez-ipupdate/files/0001-configure-Check-for-string.h-system-header.patch b/meta-networking/recipes-connectivity/ez-ipupdate/files/0001-configure-Check-for-string.h-system-header.patch new file mode 100644 index 0000000000..e9995a3500 --- /dev/null +++ b/meta-networking/recipes-connectivity/ez-ipupdate/files/0001-configure-Check-for-string.h-system-header.patch | |||
| @@ -0,0 +1,53 @@ | |||
| 1 | From 811f253c03464489d445ab6627bb4187d27e98ef Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <khem.raj@oss.qualcomm.com> | ||
| 3 | Date: Sat, 4 Apr 2026 19:12:37 +0000 | ||
| 4 | Subject: [PATCH] configure: Check for string.h system header | ||
| 5 | |||
| 6 | This is needed for functions like memcpy in md5.c but | ||
| 7 | it only includes string.h when its detected by autotools | ||
| 8 | however the needed check for detecting it during configure | ||
| 9 | are missing. This patch adds them | ||
| 10 | |||
| 11 | Upstream-Status: Pending | ||
| 12 | |||
| 13 | Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com> | ||
| 14 | --- | ||
| 15 | config.h.in | 3 +++ | ||
| 16 | configure.in | 3 ++- | ||
| 17 | 2 files changed, 5 insertions(+), 1 deletion(-) | ||
| 18 | |||
| 19 | diff --git a/config.h.in b/config.h.in | ||
| 20 | index 2ce447f..52a8d7d 100644 | ||
| 21 | --- a/config.h.in | ||
| 22 | +++ b/config.h.in | ||
| 23 | @@ -129,6 +129,9 @@ | ||
| 24 | /* Define if you have the <signal.h> header file. */ | ||
| 25 | #undef HAVE_SIGNAL_H | ||
| 26 | |||
| 27 | +/* Define if you have the <string.h> header file. */ | ||
| 28 | +#undef HAVE_STRING_H | ||
| 29 | + | ||
| 30 | /* Define if you have the <stdarg.h> header file. */ | ||
| 31 | #undef HAVE_STDARG_H | ||
| 32 | |||
| 33 | diff --git a/configure.in b/configure.in | ||
| 34 | index c97b9fc..f5d0808 100644 | ||
| 35 | --- a/configure.in | ||
| 36 | +++ b/configure.in | ||
| 37 | @@ -62,6 +62,7 @@ AC_CHECK_HEADERS( arpa/inet.h \ | ||
| 38 | sys/stat.h \ | ||
| 39 | fcntl.h \ | ||
| 40 | signal.h \ | ||
| 41 | + string.h \ | ||
| 42 | syslog.h \ | ||
| 43 | pwd.h \ | ||
| 44 | stdarg.h \ | ||
| 45 | @@ -104,7 +105,7 @@ AC_ARG_ENABLE(default-service, | ||
| 46 | dyndns, dyndns-static, ods, tzo, gnudip, easydns, easydns-partner, dyns, hn, zoneedit, heipv6tb], | ||
| 47 | [ use_SERVICE=$enableval; | ||
| 48 | AC_MSG_RESULT(yes) ], | ||
| 49 | - [ AC_MSG_RESULT(no) | ||
| 50 | + [ AC_MSG_RESULT(no) | ||
| 51 | use_SERVICE=null | ||
| 52 | AC_MSG_WARN(not setting default service) ] ) | ||
| 53 | case "$use_SERVICE" in | ||
diff --git a/meta-networking/recipes-connectivity/ez-ipupdate/files/CVE-2003-0887.patch b/meta-networking/recipes-connectivity/ez-ipupdate/files/CVE-2003-0887.patch index 53aa355008..14abe27c00 100644 --- a/meta-networking/recipes-connectivity/ez-ipupdate/files/CVE-2003-0887.patch +++ b/meta-networking/recipes-connectivity/ez-ipupdate/files/CVE-2003-0887.patch | |||
| @@ -26,8 +26,6 @@ Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | |||
| 26 | example-tzo.conf | 2 +- | 26 | example-tzo.conf | 2 +- |
| 27 | 10 files changed, 10 insertions(+), 10 deletions(-) | 27 | 10 files changed, 10 insertions(+), 10 deletions(-) |
| 28 | 28 | ||
| 29 | diff --git a/example-dhs.conf b/example-dhs.conf | ||
| 30 | index 3fe9a04..f976ae5 100755 | ||
| 31 | --- a/example-dhs.conf | 29 | --- a/example-dhs.conf |
| 32 | +++ b/example-dhs.conf | 30 | +++ b/example-dhs.conf |
| 33 | @@ -11,7 +11,7 @@ host=mydomain.whatever.com | 31 | @@ -11,7 +11,7 @@ host=mydomain.whatever.com |
| @@ -39,8 +37,6 @@ index 3fe9a04..f976ae5 100755 | |||
| 39 | 37 | ||
| 40 | # uncomment this once you have everything working how you want and you are | 38 | # uncomment this once you have everything working how you want and you are |
| 41 | # ready to have ez-ipupdate running in the background all the time. to stop it | 39 | # ready to have ez-ipupdate running in the background all the time. to stop it |
| 42 | diff --git a/example-dyndns.conf b/example-dyndns.conf | ||
| 43 | index f539dec..84b4807 100755 | ||
| 44 | --- a/example-dyndns.conf | 40 | --- a/example-dyndns.conf |
| 45 | +++ b/example-dyndns.conf | 41 | +++ b/example-dyndns.conf |
| 46 | @@ -19,7 +19,7 @@ max-interval=2073600 | 42 | @@ -19,7 +19,7 @@ max-interval=2073600 |
| @@ -52,8 +48,6 @@ index f539dec..84b4807 100755 | |||
| 52 | 48 | ||
| 53 | # uncomment this once you have everything working how you want and you are | 49 | # uncomment this once you have everything working how you want and you are |
| 54 | # ready to have ez-ipupdate running in the background all the time. to stop it | 50 | # ready to have ez-ipupdate running in the background all the time. to stop it |
| 55 | diff --git a/example-dyns.conf b/example-dyns.conf | ||
| 56 | index 868768d..856a4d7 100644 | ||
| 57 | --- a/example-dyns.conf | 51 | --- a/example-dyns.conf |
| 58 | +++ b/example-dyns.conf | 52 | +++ b/example-dyns.conf |
| 59 | @@ -11,7 +11,7 @@ host=myhost | 53 | @@ -11,7 +11,7 @@ host=myhost |
| @@ -65,8 +59,6 @@ index 868768d..856a4d7 100644 | |||
| 65 | 59 | ||
| 66 | # uncomment this once you have everything working how you want and you are | 60 | # uncomment this once you have everything working how you want and you are |
| 67 | # ready to have ez-ipupdate running in the background all the time. to stop it | 61 | # ready to have ez-ipupdate running in the background all the time. to stop it |
| 68 | diff --git a/example-easydns.conf b/example-easydns.conf | ||
| 69 | index 0ff20da..15d9b78 100755 | ||
| 70 | --- a/example-easydns.conf | 62 | --- a/example-easydns.conf |
| 71 | +++ b/example-easydns.conf | 63 | +++ b/example-easydns.conf |
| 72 | @@ -11,7 +11,7 @@ host=mydomain.whatever.com | 64 | @@ -11,7 +11,7 @@ host=mydomain.whatever.com |
| @@ -78,8 +70,6 @@ index 0ff20da..15d9b78 100755 | |||
| 78 | 70 | ||
| 79 | # uncomment this once you have everything working how you want and you are | 71 | # uncomment this once you have everything working how you want and you are |
| 80 | # ready to have ez-ipupdate running in the background all the time. to stop it | 72 | # ready to have ez-ipupdate running in the background all the time. to stop it |
| 81 | diff --git a/example-gnudip.conf b/example-gnudip.conf | ||
| 82 | index 3b2fb63..d09df1f 100755 | ||
| 83 | --- a/example-gnudip.conf | 73 | --- a/example-gnudip.conf |
| 84 | +++ b/example-gnudip.conf | 74 | +++ b/example-gnudip.conf |
| 85 | @@ -15,7 +15,7 @@ max-interval=2073600 | 75 | @@ -15,7 +15,7 @@ max-interval=2073600 |
| @@ -91,8 +81,6 @@ index 3b2fb63..d09df1f 100755 | |||
| 91 | 81 | ||
| 92 | # uncomment this once you have everything working how you want and you are | 82 | # uncomment this once you have everything working how you want and you are |
| 93 | # ready to have ez-ipupdate running in the background all the time. to stop it | 83 | # ready to have ez-ipupdate running in the background all the time. to stop it |
| 94 | diff --git a/example-heipv6tb.conf b/example-heipv6tb.conf | ||
| 95 | index e31aa9c..3ebc822 100644 | ||
| 96 | --- a/example-heipv6tb.conf | 84 | --- a/example-heipv6tb.conf |
| 97 | +++ b/example-heipv6tb.conf | 85 | +++ b/example-heipv6tb.conf |
| 98 | @@ -18,7 +18,7 @@ max-interval=2073600 | 86 | @@ -18,7 +18,7 @@ max-interval=2073600 |
| @@ -104,8 +92,6 @@ index e31aa9c..3ebc822 100644 | |||
| 104 | 92 | ||
| 105 | # uncomment this once you have everything working how you want and you are | 93 | # uncomment this once you have everything working how you want and you are |
| 106 | # ready to have ez-ipupdate running in the background all the time. to stop it | 94 | # ready to have ez-ipupdate running in the background all the time. to stop it |
| 107 | diff --git a/example-justlinux.conf b/example-justlinux.conf | ||
| 108 | index 0afeb2c..28b3327 100755 | ||
| 109 | --- a/example-justlinux.conf | 95 | --- a/example-justlinux.conf |
| 110 | +++ b/example-justlinux.conf | 96 | +++ b/example-justlinux.conf |
| 111 | @@ -11,7 +11,7 @@ host=mydomain.penguinpowered.com | 97 | @@ -11,7 +11,7 @@ host=mydomain.penguinpowered.com |
| @@ -117,8 +103,6 @@ index 0afeb2c..28b3327 100755 | |||
| 117 | 103 | ||
| 118 | # uncomment this once you have everything working how you want and you are | 104 | # uncomment this once you have everything working how you want and you are |
| 119 | # ready to have ez-ipupdate running in the background all the time. to stop it | 105 | # ready to have ez-ipupdate running in the background all the time. to stop it |
| 120 | diff --git a/example-ods.conf b/example-ods.conf | ||
| 121 | index d0ff889..7b16f2c 100755 | ||
| 122 | --- a/example-ods.conf | 106 | --- a/example-ods.conf |
| 123 | +++ b/example-ods.conf | 107 | +++ b/example-ods.conf |
| 124 | @@ -11,7 +11,7 @@ host=mydomain.ods.org | 108 | @@ -11,7 +11,7 @@ host=mydomain.ods.org |
| @@ -130,8 +114,6 @@ index d0ff889..7b16f2c 100755 | |||
| 130 | 114 | ||
| 131 | # uncomment this once you have everything working how you want and you are | 115 | # uncomment this once you have everything working how you want and you are |
| 132 | # ready to have ez-ipupdate running in the background all the time. to stop it | 116 | # ready to have ez-ipupdate running in the background all the time. to stop it |
| 133 | diff --git a/example-pgpow.conf b/example-pgpow.conf | ||
| 134 | index 29a92d6..81e351b 100755 | ||
| 135 | --- a/example-pgpow.conf | 117 | --- a/example-pgpow.conf |
| 136 | +++ b/example-pgpow.conf | 118 | +++ b/example-pgpow.conf |
| 137 | @@ -11,7 +11,7 @@ host=mydomain.penguinpowered.com | 119 | @@ -11,7 +11,7 @@ host=mydomain.penguinpowered.com |
| @@ -143,8 +125,6 @@ index 29a92d6..81e351b 100755 | |||
| 143 | 125 | ||
| 144 | # uncomment this once you have everything working how you want and you are | 126 | # uncomment this once you have everything working how you want and you are |
| 145 | # ready to have ez-ipupdate running in the background all the time. to stop it | 127 | # ready to have ez-ipupdate running in the background all the time. to stop it |
| 146 | diff --git a/example-tzo.conf b/example-tzo.conf | ||
| 147 | index 2a71db3..10b8dc4 100755 | ||
| 148 | --- a/example-tzo.conf | 128 | --- a/example-tzo.conf |
| 149 | +++ b/example-tzo.conf | 129 | +++ b/example-tzo.conf |
| 150 | @@ -15,7 +15,7 @@ max-interval=2073600 | 130 | @@ -15,7 +15,7 @@ max-interval=2073600 |
diff --git a/meta-networking/recipes-connectivity/ez-ipupdate/files/cache_file.c.patch b/meta-networking/recipes-connectivity/ez-ipupdate/files/cache_file.c.patch deleted file mode 100644 index 0199cb1278..0000000000 --- a/meta-networking/recipes-connectivity/ez-ipupdate/files/cache_file.c.patch +++ /dev/null | |||
| @@ -1,34 +0,0 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | |||
| 3 | Dont assume errno type | ||
| 4 | |||
| 5 | --- ez-ipupdate-3.0.11b7/cache_file.c.orig 2014-07-02 14:01:07.126029412 -0600 | ||
| 6 | +++ ez-ipupdate-3.0.11b7/cache_file.c 2014-07-02 14:08:27.422026332 -0600 | ||
| 7 | @@ -43,11 +43,11 @@ | ||
| 8 | #include <cache_file.h> | ||
| 9 | |||
| 10 | #if HAVE_STRERROR | ||
| 11 | -extern int errno; | ||
| 12 | +# include <errno.h> | ||
| 13 | # define error_string strerror(errno) | ||
| 14 | #elif HAVE_SYS_ERRLIST | ||
| 15 | extern const char *const sys_errlist[]; | ||
| 16 | -extern int errno; | ||
| 17 | +# include <errno.h> | ||
| 18 | # define error_string (sys_errlist[errno]) | ||
| 19 | #else | ||
| 20 | # define error_string "error message not found" | ||
| 21 | @@ -63,11 +63,11 @@ | ||
| 22 | # define dprintf(x) | ||
| 23 | #endif | ||
| 24 | #if HAVE_STRERROR | ||
| 25 | -extern int errno; | ||
| 26 | +# include <errno.h> | ||
| 27 | # define error_string strerror(errno) | ||
| 28 | #elif HAVE_SYS_ERRLIST | ||
| 29 | extern const char *const sys_errlist[]; | ||
| 30 | -extern int errno; | ||
| 31 | +# include <errno.h> | ||
| 32 | # define error_string (sys_errlist[errno]) | ||
| 33 | #else | ||
| 34 | # define error_string "error message not found" | ||
diff --git a/meta-networking/recipes-connectivity/ez-ipupdate/files/conf_file.c.patch b/meta-networking/recipes-connectivity/ez-ipupdate/files/conf_file.c.patch deleted file mode 100644 index 6325c1873f..0000000000 --- a/meta-networking/recipes-connectivity/ez-ipupdate/files/conf_file.c.patch +++ /dev/null | |||
| @@ -1,20 +0,0 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | |||
| 3 | Dont assume errno type | ||
| 4 | |||
| 5 | --- ez-ipupdate-3.0.11b7/conf_file.c.orig 2014-07-02 14:01:19.174029328 -0600 | ||
| 6 | +++ ez-ipupdate-3.0.11b7/conf_file.c 2014-07-02 14:08:42.982026223 -0600 | ||
| 7 | @@ -38,11 +38,11 @@ | ||
| 8 | #include <conf_file.h> | ||
| 9 | |||
| 10 | #if HAVE_STRERROR | ||
| 11 | -extern int errno; | ||
| 12 | +# include <errno.h> | ||
| 13 | # define error_string strerror(errno) | ||
| 14 | #elif HAVE_SYS_ERRLIST | ||
| 15 | extern const char *const sys_errlist[]; | ||
| 16 | -extern int errno; | ||
| 17 | +# include <errno.h> | ||
| 18 | # define error_string (sys_errlist[errno]) | ||
| 19 | #else | ||
| 20 | # define error_string "error message not found" | ||
diff --git a/meta-networking/recipes-connectivity/ez-ipupdate/files/wformat.patch b/meta-networking/recipes-connectivity/ez-ipupdate/files/wformat.patch index 3b791559d5..7463e3c535 100644 --- a/meta-networking/recipes-connectivity/ez-ipupdate/files/wformat.patch +++ b/meta-networking/recipes-connectivity/ez-ipupdate/files/wformat.patch | |||
| @@ -1,4 +1,9 @@ | |||
| 1 | Upstream-Status: Pending | 1 | |
| 2 | This patch is used by Gentoo to mitigate CVE-2004-0980: | ||
| 3 | https://bugs.gentoo.org/69658 | ||
| 4 | |||
| 5 | CVE: CVE-2004-0980 | ||
| 6 | Upstream-Status: Inactive-Upstream [last commit: 2002] | ||
| 2 | 7 | ||
| 3 | Index: ez-ipupdate-3.0.11b7/ez-ipupdate.c | 8 | Index: ez-ipupdate-3.0.11b7/ez-ipupdate.c |
| 4 | =================================================================== | 9 | =================================================================== |
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0010-fix-error-for-expansion-of-macro-in-thread.h.patch b/meta-networking/recipes-connectivity/freeradius/files/0010-fix-error-for-expansion-of-macro-in-thread.h.patch deleted file mode 100644 index cae27ad3a4..0000000000 --- a/meta-networking/recipes-connectivity/freeradius/files/0010-fix-error-for-expansion-of-macro-in-thread.h.patch +++ /dev/null | |||
| @@ -1,61 +0,0 @@ | |||
| 1 | From 0475d948ceab91b22172f0fae3bc01e0a1502ae8 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Yi Zhao <yi.zhao@windriver.com> | ||
| 3 | Date: Wed, 18 Jan 2017 14:59:39 +0800 | ||
| 4 | Subject: [PATCH] fix error for expansion of macro in thread.h | ||
| 5 | |||
| 6 | The parameter declaration is missing in expansion of macro | ||
| 7 | which cause the build error: | ||
| 8 | | In file included from src/freeradius-devel/libradius.h:80:0, | ||
| 9 | | from src/lib/log.c:26: | ||
| 10 | | src/lib/log.c: In function '__fr_thread_local_destroy_fr_strerror_buffer': | ||
| 11 | | src/lib/log.c:37:31: error: 'fr_strerror_buffer' undeclared (first use in this function) | ||
| 12 | | fr_thread_local_setup(char *, fr_strerror_buffer) /* macro */ | ||
| 13 | | ^ | ||
| 14 | |||
| 15 | Add the missing declaration in macro. | ||
| 16 | |||
| 17 | Upstream-Status: Pending | ||
| 18 | |||
| 19 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
| 20 | --- | ||
| 21 | src/include/threads.h | 10 +++++----- | ||
| 22 | 1 file changed, 5 insertions(+), 5 deletions(-) | ||
| 23 | |||
| 24 | diff --git a/src/include/threads.h b/src/include/threads.h | ||
| 25 | index f2aea776d6..1c4e526797 100644 | ||
| 26 | --- a/src/include/threads.h | ||
| 27 | +++ b/src/include/threads.h | ||
| 28 | @@ -92,7 +92,7 @@ static _t __fr_thread_local_init_##_n(pthread_destructor_t func)\ | ||
| 29 | # define fr_thread_local_get(_n) _n | ||
| 30 | #elif defined(HAVE_PTHREAD_H) | ||
| 31 | # include <pthread.h> | ||
| 32 | -# define fr_thread_local_setup(_t, _n) \ | ||
| 33 | +# define fr_thread_local_setup(_t, _n) static __thread _t _n;\ | ||
| 34 | static pthread_key_t __fr_thread_local_key_##_n;\ | ||
| 35 | static pthread_once_t __fr_thread_local_once_##_n = PTHREAD_ONCE_INIT;\ | ||
| 36 | static pthread_destructor_t __fr_thread_local_destructor_##_n = NULL;\ | ||
| 37 | @@ -103,17 +103,17 @@ static void __fr_thread_local_destroy_##_n(UNUSED void *unused)\ | ||
| 38 | static void __fr_thread_local_key_init_##_n(void)\ | ||
| 39 | {\ | ||
| 40 | (void) pthread_key_create(&__fr_thread_local_key_##_n, __fr_thread_local_destroy_##_n);\ | ||
| 41 | - (void) pthread_setspecific(__fr_thread_local_key_##_n, &(_n));\ | ||
| 42 | }\ | ||
| 43 | static _t __fr_thread_local_init_##_n(pthread_destructor_t func)\ | ||
| 44 | {\ | ||
| 45 | __fr_thread_local_destructor_##_n = func;\ | ||
| 46 | if (_n) return _n; \ | ||
| 47 | (void) pthread_once(&__fr_thread_local_once_##_n, __fr_thread_local_key_init_##_n);\ | ||
| 48 | + (void) pthread_setspecific(__fr_thread_local_key_##_n, &(_n));\ | ||
| 49 | return _n;\ | ||
| 50 | } | ||
| 51 | -# define fr_thread_local_init(_n, _f) __fr_thread_local_init_##_n(_f) | ||
| 52 | -# define fr_thread_local_set(_n, _v) __fr_thread_local_set_##_n(_v) | ||
| 53 | -# define fr_thread_local_get(_n) __fr_thread_local_get_##_n() | ||
| 54 | +# define fr_thread_local_init(_n, _f) __fr_thread_local_init_##_n(_f) | ||
| 55 | +# define fr_thread_local_set(_n, _v) ((int)!((_n = _v) || 1)) | ||
| 56 | +# define fr_thread_local_get(_n) _n | ||
| 57 | #endif | ||
| 58 | #endif | ||
| 59 | -- | ||
| 60 | 2.25.1 | ||
| 61 | |||
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0016-version.c-don-t-print-build-flags.patch b/meta-networking/recipes-connectivity/freeradius/files/0016-version.c-don-t-print-build-flags.patch index 8917457ec2..6fb9d9fa3b 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/0016-version.c-don-t-print-build-flags.patch +++ b/meta-networking/recipes-connectivity/freeradius/files/0016-version.c-don-t-print-build-flags.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 99ea83d998d3b8957830afa15cec42ba265b67ca Mon Sep 17 00:00:00 2001 | 1 | From ac503b5395d566c677013c051165290ab024cdef Mon Sep 17 00:00:00 2001 |
| 2 | From: Mingli Yu <mingli.yu@windriver.com> | 2 | From: Mingli Yu <mingli.yu@windriver.com> |
| 3 | Date: Wed, 3 Aug 2022 16:44:29 +0800 | 3 | Date: Wed, 3 Aug 2022 16:44:29 +0800 |
| 4 | Subject: [PATCH] version.c: don't print build flags | 4 | Subject: [PATCH] version.c: don't print build flags |
| @@ -13,10 +13,10 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | |||
| 13 | 1 file changed, 13 deletions(-) | 13 | 1 file changed, 13 deletions(-) |
| 14 | 14 | ||
| 15 | diff --git a/src/main/version.c b/src/main/version.c | 15 | diff --git a/src/main/version.c b/src/main/version.c |
| 16 | index 44a6edc699..a0e6f26911 100644 | 16 | index 1bdb562..0368fba 100644 |
| 17 | --- a/src/main/version.c | 17 | --- a/src/main/version.c |
| 18 | +++ b/src/main/version.c | 18 | +++ b/src/main/version.c |
| 19 | @@ -614,19 +614,6 @@ void version_print(void) | 19 | @@ -622,19 +622,6 @@ void version_print(void) |
| 20 | DEBUG2(" unknown"); | 20 | DEBUG2(" unknown"); |
| 21 | #endif | 21 | #endif |
| 22 | 22 | ||
| @@ -35,7 +35,4 @@ index 44a6edc699..a0e6f26911 100644 | |||
| 35 | -#endif | 35 | -#endif |
| 36 | DEBUG2(" "); | 36 | DEBUG2(" "); |
| 37 | } | 37 | } |
| 38 | INFO("FreeRADIUS Version " RADIUSD_VERSION_STRING); | 38 | |
| 39 | -- | ||
| 40 | 2.25.1 | ||
| 41 | |||
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0018-update-license-1.patch b/meta-networking/recipes-connectivity/freeradius/files/0018-update-license-1.patch deleted file mode 100644 index 8647c389ab..0000000000 --- a/meta-networking/recipes-connectivity/freeradius/files/0018-update-license-1.patch +++ /dev/null | |||
| @@ -1,175 +0,0 @@ | |||
| 1 | From 82d874c638c80fbbf1eca7c51aca095fbbf40024 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: "Alan T. DeKok" <aland@freeradius.org> | ||
| 3 | Date: Mon, 27 Oct 2025 06:31:22 -0400 | ||
| 4 | Subject: [PATCH] update license | ||
| 5 | |||
| 6 | Upstream-Status: Backport | ||
| 7 | [https://github.com/FreeRADIUS/freeradius-server/commit/82d874c638c80fbbf1eca7c51aca095fbbf40024] | ||
| 8 | |||
| 9 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
| 10 | --- | ||
| 11 | src/modules/rlm_dpsk/rlm_dpsk.c | 25 +++++++--------- | ||
| 12 | .../rlm_eap/types/rlm_eap_teap/eap_teap.c | 29 +++++++------------ | ||
| 13 | .../rlm_eap/types/rlm_eap_teap/eap_teap.h | 29 +++++++------------ | ||
| 14 | .../rlm_eap/types/rlm_eap_teap/rlm_eap_teap.c | 29 +++++++------------ | ||
| 15 | 4 files changed, 44 insertions(+), 68 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/src/modules/rlm_dpsk/rlm_dpsk.c b/src/modules/rlm_dpsk/rlm_dpsk.c | ||
| 18 | index 4b818d08a5..aa07415540 100644 | ||
| 19 | --- a/src/modules/rlm_dpsk/rlm_dpsk.c | ||
| 20 | +++ b/src/modules/rlm_dpsk/rlm_dpsk.c | ||
| 21 | @@ -1,20 +1,17 @@ | ||
| 22 | /* | ||
| 23 | - * Copyright (C) 2023 Network RADIUS SARL (legal@networkradius.com) | ||
| 24 | + * This program is is free software; you can redistribute it and/or modify | ||
| 25 | + * it under the terms of the GNU General Public License as published by | ||
| 26 | + * the Free Software Foundation; either version 2 of the License, or (at | ||
| 27 | + * your option) any later version. | ||
| 28 | * | ||
| 29 | - * This software may not be redistributed in any form without the prior | ||
| 30 | - * written consent of Network RADIUS. | ||
| 31 | + * This program is distributed in the hope that it will be useful, | ||
| 32 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 33 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 34 | + * GNU General Public License for more details. | ||
| 35 | * | ||
| 36 | - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND | ||
| 37 | - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 38 | - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 39 | - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 40 | - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 41 | - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 42 | - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 43 | - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 44 | - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 45 | - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 46 | - * SUCH DAMAGE. | ||
| 47 | + * You should have received a copy of the GNU General Public License | ||
| 48 | + * along with this program; if not, write to the Free Software | ||
| 49 | + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA | ||
| 50 | */ | ||
| 51 | |||
| 52 | /** | ||
| 53 | diff --git a/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap.c b/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap.c | ||
| 54 | index 20646c5ba1..33512788c2 100644 | ||
| 55 | --- a/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap.c | ||
| 56 | +++ b/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap.c | ||
| 57 | @@ -1,24 +1,17 @@ | ||
| 58 | /* | ||
| 59 | - * eap_teap.c contains the interfaces that are called from the main handler | ||
| 60 | + * This program is is free software; you can redistribute it and/or modify | ||
| 61 | + * it under the terms of the GNU General Public License as published by | ||
| 62 | + * the Free Software Foundation; either version 2 of the License, or (at | ||
| 63 | + * your option) any later version. | ||
| 64 | * | ||
| 65 | - * Version: $Id$ | ||
| 66 | + * This program is distributed in the hope that it will be useful, | ||
| 67 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 68 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 69 | + * GNU General Public License for more details. | ||
| 70 | * | ||
| 71 | - * Copyright (C) 2022 Network RADIUS SARL <legal@networkradius.com> | ||
| 72 | - * | ||
| 73 | - * This software may not be redistributed in any form without the prior | ||
| 74 | - * written consent of Network RADIUS. | ||
| 75 | - * | ||
| 76 | - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND | ||
| 77 | - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 78 | - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 79 | - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 80 | - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 81 | - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 82 | - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 83 | - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 84 | - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 85 | - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 86 | - * SUCH DAMAGE. | ||
| 87 | + * You should have received a copy of the GNU General Public License | ||
| 88 | + * along with this program; if not, write to the Free Software | ||
| 89 | + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA | ||
| 90 | */ | ||
| 91 | |||
| 92 | RCSID("$Id$") | ||
| 93 | diff --git a/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap.h b/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap.h | ||
| 94 | index 59f7835a26..69f4b1ebba 100644 | ||
| 95 | --- a/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap.h | ||
| 96 | +++ b/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap.h | ||
| 97 | @@ -1,24 +1,17 @@ | ||
| 98 | /* | ||
| 99 | - * eap_teap.h | ||
| 100 | + * This program is is free software; you can redistribute it and/or modify | ||
| 101 | + * it under the terms of the GNU General Public License as published by | ||
| 102 | + * the Free Software Foundation; either version 2 of the License, or (at | ||
| 103 | + * your option) any later version. | ||
| 104 | * | ||
| 105 | - * Version: $Id$ | ||
| 106 | + * This program is distributed in the hope that it will be useful, | ||
| 107 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 108 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 109 | + * GNU General Public License for more details. | ||
| 110 | * | ||
| 111 | - * Copyright (C) 2022 Network RADIUS SARL <legal@networkradius.com> | ||
| 112 | - * | ||
| 113 | - * This software may not be redistributed in any form without the prior | ||
| 114 | - * written consent of Network RADIUS. | ||
| 115 | - * | ||
| 116 | - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND | ||
| 117 | - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 118 | - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 119 | - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 120 | - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 121 | - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 122 | - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 123 | - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 124 | - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 125 | - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 126 | - * SUCH DAMAGE. | ||
| 127 | + * You should have received a copy of the GNU General Public License | ||
| 128 | + * along with this program; if not, write to the Free Software | ||
| 129 | + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA | ||
| 130 | */ | ||
| 131 | #ifndef _EAP_TEAP_H | ||
| 132 | #define _EAP_TEAP_H | ||
| 133 | diff --git a/src/modules/rlm_eap/types/rlm_eap_teap/rlm_eap_teap.c b/src/modules/rlm_eap/types/rlm_eap_teap/rlm_eap_teap.c | ||
| 134 | index fcf9717257..13c709b287 100644 | ||
| 135 | --- a/src/modules/rlm_eap/types/rlm_eap_teap/rlm_eap_teap.c | ||
| 136 | +++ b/src/modules/rlm_eap/types/rlm_eap_teap/rlm_eap_teap.c | ||
| 137 | @@ -1,24 +1,17 @@ | ||
| 138 | /* | ||
| 139 | - * rlm_eap_teap.c contains the interfaces that are called from eap | ||
| 140 | + * This program is is free software; you can redistribute it and/or modify | ||
| 141 | + * it under the terms of the GNU General Public License as published by | ||
| 142 | + * the Free Software Foundation; either version 2 of the License, or (at | ||
| 143 | + * your option) any later version. | ||
| 144 | * | ||
| 145 | - * Version: $Id$ | ||
| 146 | + * This program is distributed in the hope that it will be useful, | ||
| 147 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 148 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 149 | + * GNU General Public License for more details. | ||
| 150 | * | ||
| 151 | - * Copyright (C) 2022 Network RADIUS SARL <legal@networkradius.com> | ||
| 152 | - * | ||
| 153 | - * This software may not be redistributed in any form without the prior | ||
| 154 | - * written consent of Network RADIUS. | ||
| 155 | - * | ||
| 156 | - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND | ||
| 157 | - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 158 | - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 159 | - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 160 | - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 161 | - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 162 | - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 163 | - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 164 | - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 165 | - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 166 | - * SUCH DAMAGE. | ||
| 167 | + * You should have received a copy of the GNU General Public License | ||
| 168 | + * along with this program; if not, write to the Free Software | ||
| 169 | + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA | ||
| 170 | */ | ||
| 171 | |||
| 172 | RCSID("$Id$") | ||
| 173 | -- | ||
| 174 | 2.43.0 | ||
| 175 | |||
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0019-update-license-2.patch b/meta-networking/recipes-connectivity/freeradius/files/0019-update-license-2.patch deleted file mode 100644 index 4fa3ecd265..0000000000 --- a/meta-networking/recipes-connectivity/freeradius/files/0019-update-license-2.patch +++ /dev/null | |||
| @@ -1,52 +0,0 @@ | |||
| 1 | From a46e81a7764b57983ce6724524f745a06222dc0a Mon Sep 17 00:00:00 2001 | ||
| 2 | From: "Alan T. DeKok" <aland@freeradius.org> | ||
| 3 | Date: Tue, 28 Oct 2025 11:33:44 -0400 | ||
| 4 | Subject: [PATCH] update license | ||
| 5 | |||
| 6 | Upstream-Status: Backport | ||
| 7 | [https://github.com/FreeRADIUS/freeradius-server/commit/a46e81a7764b57983ce6724524f745a06222dc0a] | ||
| 8 | |||
| 9 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
| 10 | --- | ||
| 11 | .../rlm_proxy_rate_limit.c | 25 ++++++++----------- | ||
| 12 | 1 file changed, 11 insertions(+), 14 deletions(-) | ||
| 13 | |||
| 14 | diff --git a/src/modules/rlm_proxy_rate_limit/rlm_proxy_rate_limit.c b/src/modules/rlm_proxy_rate_limit/rlm_proxy_rate_limit.c | ||
| 15 | index 744b14a448..a855273784 100644 | ||
| 16 | --- a/src/modules/rlm_proxy_rate_limit/rlm_proxy_rate_limit.c | ||
| 17 | +++ b/src/modules/rlm_proxy_rate_limit/rlm_proxy_rate_limit.c | ||
| 18 | @@ -1,20 +1,17 @@ | ||
| 19 | /* | ||
| 20 | - * Copyright (C) 2024 Network RADIUS SAS (legal@networkradius.com) | ||
| 21 | + * This program is is free software; you can redistribute it and/or modify | ||
| 22 | + * it under the terms of the GNU General Public License as published by | ||
| 23 | + * the Free Software Foundation; either version 2 of the License, or (at | ||
| 24 | + * your option) any later version. | ||
| 25 | * | ||
| 26 | - * This software may not be redistributed in any form without the prior | ||
| 27 | - * written consent of Network RADIUS. | ||
| 28 | + * This program is distributed in the hope that it will be useful, | ||
| 29 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 30 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 31 | + * GNU General Public License for more details. | ||
| 32 | * | ||
| 33 | - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND | ||
| 34 | - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 35 | - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 36 | - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 37 | - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 38 | - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 39 | - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 40 | - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 41 | - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 42 | - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 43 | - * SUCH DAMAGE. | ||
| 44 | + * You should have received a copy of the GNU General Public License | ||
| 45 | + * along with this program; if not, write to the Free Software | ||
| 46 | + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA | ||
| 47 | */ | ||
| 48 | |||
| 49 | /** | ||
| 50 | -- | ||
| 51 | 2.43.0 | ||
| 52 | |||
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0020-update-license-3.patch b/meta-networking/recipes-connectivity/freeradius/files/0020-update-license-3.patch deleted file mode 100644 index f77c585bda..0000000000 --- a/meta-networking/recipes-connectivity/freeradius/files/0020-update-license-3.patch +++ /dev/null | |||
| @@ -1,101 +0,0 @@ | |||
| 1 | From d00440f3290871aef667f80e15f256c64f9b7cd6 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: "Alan T. DeKok" <aland@freeradius.org> | ||
| 3 | Date: Wed, 29 Oct 2025 09:45:17 -0400 | ||
| 4 | Subject: [PATCH] update license | ||
| 5 | |||
| 6 | Upstream-Status: Backport | ||
| 7 | [https://github.com/FreeRADIUS/freeradius-server/commit/d00440f3290871aef667f80e15f256c64f9b7cd6] | ||
| 8 | |||
| 9 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
| 10 | --- | ||
| 11 | .../types/rlm_eap_teap/eap_teap_crypto.c | 30 +++++++------------ | ||
| 12 | .../types/rlm_eap_teap/eap_teap_crypto.h | 30 +++++++------------ | ||
| 13 | 2 files changed, 22 insertions(+), 38 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap_crypto.c b/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap_crypto.c | ||
| 16 | index 17f49f9dfc..aaa74837a9 100644 | ||
| 17 | --- a/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap_crypto.c | ||
| 18 | +++ b/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap_crypto.c | ||
| 19 | @@ -1,26 +1,18 @@ | ||
| 20 | /* | ||
| 21 | - * teap-crypto.c Cryptographic functions for EAP-TEAP. | ||
| 22 | + * This program is is free software; you can redistribute it and/or modify | ||
| 23 | + * it under the terms of the GNU General Public License as published by | ||
| 24 | + * the Free Software Foundation; either version 2 of the License, or (at | ||
| 25 | + * your option) any later version. | ||
| 26 | * | ||
| 27 | - * Version: $Id$ | ||
| 28 | + * This program is distributed in the hope that it will be useful, | ||
| 29 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 30 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 31 | + * GNU General Public License for more details. | ||
| 32 | * | ||
| 33 | - * Copyright (C) 2022 Network RADIUS SARL <legal@networkradius.com> | ||
| 34 | - * | ||
| 35 | - * This software may not be redistributed in any form without the prior | ||
| 36 | - * written consent of Network RADIUS. | ||
| 37 | - * | ||
| 38 | - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND | ||
| 39 | - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 40 | - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 41 | - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 42 | - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 43 | - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 44 | - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 45 | - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 46 | - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 47 | - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 48 | - * SUCH DAMAGE. | ||
| 49 | + * You should have received a copy of the GNU General Public License | ||
| 50 | + * along with this program; if not, write to the Free Software | ||
| 51 | + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA | ||
| 52 | */ | ||
| 53 | - | ||
| 54 | RCSID("$Id$") | ||
| 55 | USES_APPLE_DEPRECATED_API /* OpenSSL API has been deprecated by Apple */ | ||
| 56 | |||
| 57 | diff --git a/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap_crypto.h b/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap_crypto.h | ||
| 58 | index b02f2b9083..f9403dcf93 100644 | ||
| 59 | --- a/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap_crypto.h | ||
| 60 | +++ b/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap_crypto.h | ||
| 61 | @@ -1,26 +1,18 @@ | ||
| 62 | /* | ||
| 63 | - * eap_teap_crypto.h | ||
| 64 | + * This program is is free software; you can redistribute it and/or modify | ||
| 65 | + * it under the terms of the GNU General Public License as published by | ||
| 66 | + * the Free Software Foundation; either version 2 of the License, or (at | ||
| 67 | + * your option) any later version. | ||
| 68 | * | ||
| 69 | - * Version: $Id$ | ||
| 70 | + * This program is distributed in the hope that it will be useful, | ||
| 71 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 72 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 73 | + * GNU General Public License for more details. | ||
| 74 | * | ||
| 75 | - * Copyright (C) 2022 Network RADIUS SARL <legal@networkradius.com> | ||
| 76 | - * | ||
| 77 | - * This software may not be redistributed in any form without the prior | ||
| 78 | - * written consent of Network RADIUS. | ||
| 79 | - * | ||
| 80 | - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND | ||
| 81 | - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 82 | - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 83 | - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 84 | - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 85 | - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 86 | - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 87 | - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 88 | - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 89 | - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 90 | - * SUCH DAMAGE. | ||
| 91 | + * You should have received a copy of the GNU General Public License | ||
| 92 | + * along with this program; if not, write to the Free Software | ||
| 93 | + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA | ||
| 94 | */ | ||
| 95 | - | ||
| 96 | #ifndef _EAP_TEAP_CRYPTO_H | ||
| 97 | #define _EAP_TEAP_CRYPTO_H | ||
| 98 | |||
| 99 | -- | ||
| 100 | 2.43.0 | ||
| 101 | |||
diff --git a/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.8.bb b/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.10.bb index 9b05968638..eef0e8f519 100644 --- a/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.8.bb +++ b/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.10.bb | |||
| @@ -15,7 +15,9 @@ DEPENDS = "openssl-native openssl libidn libtool libpcap libtalloc" | |||
| 15 | 15 | ||
| 16 | PATCHTOOL = "git" | 16 | PATCHTOOL = "git" |
| 17 | 17 | ||
| 18 | SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.2.x;lfs=0;;protocol=https \ | 18 | FREERADIUS_TAG = "release_${@d.getVar('PV').replace('.', '_')}" |
| 19 | |||
| 20 | SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.2.x;tag=${FREERADIUS_TAG};lfs=0;protocol=https \ | ||
| 19 | file://freeradius \ | 21 | file://freeradius \ |
| 20 | file://volatiles.58_radiusd \ | 22 | file://volatiles.58_radiusd \ |
| 21 | file://radiusd.service \ | 23 | file://radiusd.service \ |
| @@ -29,7 +31,6 @@ SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.2.x;lfs=0 | |||
| 29 | file://0007-rlm_python-add-PY_INC_DIR-in-search-dir.patch \ | 31 | file://0007-rlm_python-add-PY_INC_DIR-in-search-dir.patch \ |
| 30 | file://0008-libtool-do-not-use-jlibtool.patch \ | 32 | file://0008-libtool-do-not-use-jlibtool.patch \ |
| 31 | file://0009-Fix-quoting-for-BUILD_WITH.patch \ | 33 | file://0009-Fix-quoting-for-BUILD_WITH.patch \ |
| 32 | file://0010-fix-error-for-expansion-of-macro-in-thread.h.patch \ | ||
| 33 | file://0011-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch \ | 34 | file://0011-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch \ |
| 34 | file://0012-raddb-certs-Makefile-fix-the-existed-certificate-err.patch \ | 35 | file://0012-raddb-certs-Makefile-fix-the-existed-certificate-err.patch \ |
| 35 | file://0013-raddb-certs-Makefile-fix-the-occasional-verification.patch \ | 36 | file://0013-raddb-certs-Makefile-fix-the-occasional-verification.patch \ |
| @@ -37,14 +38,11 @@ SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.2.x;lfs=0 | |||
| 37 | file://0015-bootstrap-check-commands-of-openssl-exist.patch \ | 38 | file://0015-bootstrap-check-commands-of-openssl-exist.patch \ |
| 38 | file://0016-version.c-don-t-print-build-flags.patch \ | 39 | file://0016-version.c-don-t-print-build-flags.patch \ |
| 39 | file://0017-Add-acinclude.m4-to-include-required-macros.patch \ | 40 | file://0017-Add-acinclude.m4-to-include-required-macros.patch \ |
| 40 | file://0018-update-license-1.patch \ | ||
| 41 | file://0019-update-license-2.patch \ | ||
| 42 | file://0020-update-license-3.patch \ | ||
| 43 | " | 41 | " |
| 44 | 42 | ||
| 45 | raddbdir = "${sysconfdir}/${MLPREFIX}raddb" | 43 | raddbdir = "${sysconfdir}/${MLPREFIX}raddb" |
| 46 | 44 | ||
| 47 | SRCREV = "032be31bb52646171099617928ec1703335bcf73" | 45 | SRCREV = "9071ea041b9172e52eabbba91619afaf3a238795" |
| 48 | 46 | ||
| 49 | UPSTREAM_CHECK_GITTAGREGEX = "release_(?P<pver>\d+(\_\d+)+)" | 47 | UPSTREAM_CHECK_GITTAGREGEX = "release_(?P<pver>\d+(\_\d+)+)" |
| 50 | 48 | ||
| @@ -53,6 +51,8 @@ CVE_STATUS[CVE-2011-4966] = "fixed-version: The CPE in the NVD database doesn't | |||
| 53 | 51 | ||
| 54 | PARALLEL_MAKE = "" | 52 | PARALLEL_MAKE = "" |
| 55 | 53 | ||
| 54 | # autoconf 2.73+Clang does not detect it correctly so help out | ||
| 55 | CFLAGS += "-DTLS_STORAGE_CLASS=__thread" | ||
| 56 | 56 | ||
| 57 | LDFLAGS:append:powerpc = " -latomic" | 57 | LDFLAGS:append:powerpc = " -latomic" |
| 58 | LDFLAGS:append:mipsarch = " -latomic" | 58 | LDFLAGS:append:mipsarch = " -latomic" |
| @@ -114,6 +114,7 @@ PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl" | |||
| 114 | PACKAGECONFIG[rlm-eap-fast] = "--with-rlm_eap_fast, --without-rlm_eap_fast" | 114 | PACKAGECONFIG[rlm-eap-fast] = "--with-rlm_eap_fast, --without-rlm_eap_fast" |
| 115 | PACKAGECONFIG[rlm-eap-pwd] = "--with-rlm_eap_pwd, --without-rlm_eap_pwd" | 115 | PACKAGECONFIG[rlm-eap-pwd] = "--with-rlm_eap_pwd, --without-rlm_eap_pwd" |
| 116 | PACKAGECONFIG[kafka] = "--with-rlm_kafka, --without-rlm_kafka, librdkafka" | 116 | PACKAGECONFIG[kafka] = "--with-rlm_kafka, --without-rlm_kafka, librdkafka" |
| 117 | PACKAGECONFIG[legacy-openssl] = ",--enable-fips-workaround,,openssl-ossl-module-legacy" | ||
| 117 | 118 | ||
| 118 | inherit useradd autotools-brokensep update-rc.d systemd multilib_script multilib_header | 119 | inherit useradd autotools-brokensep update-rc.d systemd multilib_script multilib_header |
| 119 | 120 | ||
diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.10.bb b/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.10.bb deleted file mode 100644 index b126aee7db..0000000000 --- a/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.10.bb +++ /dev/null | |||
| @@ -1,79 +0,0 @@ | |||
| 1 | SUMMARY = "Lightweight crypto and SSL/TLS library" | ||
| 2 | DESCRIPTION = "mbedtls is a lean open source crypto library \ | ||
| 3 | for providing SSL and TLS support in your programs. It offers \ | ||
| 4 | an intuitive API and documented header files, so you can actually \ | ||
| 5 | understand what the code does. It features: \ | ||
| 6 | \ | ||
| 7 | - Symmetric algorithms, like AES, Blowfish, Triple-DES, DES, ARC4, \ | ||
| 8 | Camellia and XTEA \ | ||
| 9 | - Hash algorithms, like SHA-1, SHA-2, RIPEMD-160 and MD5 \ | ||
| 10 | - Entropy pool and random generators, like CTR-DRBG and HMAC-DRBG \ | ||
| 11 | - Public key algorithms, like RSA, Elliptic Curves, Diffie-Hellman, \ | ||
| 12 | ECDSA and ECDH \ | ||
| 13 | - SSL v3 and TLS 1.0, 1.1 and 1.2 \ | ||
| 14 | - Abstraction layers for ciphers, hashes, public key operations, \ | ||
| 15 | platform abstraction and threading \ | ||
| 16 | " | ||
| 17 | |||
| 18 | HOMEPAGE = "https://tls.mbed.org/" | ||
| 19 | |||
| 20 | LICENSE = "Apache-2.0 | GPL-2.0-or-later" | ||
| 21 | LIC_FILES_CHKSUM = "file://LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" | ||
| 22 | |||
| 23 | SECTION = "libs" | ||
| 24 | |||
| 25 | SRCREV = "2fc8413bfcb51354c8e679141b17b3f1a5942561" | ||
| 26 | SRC_URI = "git://github.com/Mbed-TLS/mbedtls.git;protocol=https;branch=archive/mbedtls-2.28;tag=${BPN} \ | ||
| 27 | file://run-ptest \ | ||
| 28 | " | ||
| 29 | |||
| 30 | inherit cmake update-alternatives ptest | ||
| 31 | |||
| 32 | PACKAGECONFIG ??= "shared-libs programs ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" | ||
| 33 | PACKAGECONFIG[shared-libs] = "-DUSE_SHARED_MBEDTLS_LIBRARY=ON,-DUSE_SHARED_MBEDTLS_LIBRARY=OFF" | ||
| 34 | PACKAGECONFIG[programs] = "-DENABLE_PROGRAMS=ON,-DENABLE_PROGRAMS=OFF" | ||
| 35 | PACKAGECONFIG[werror] = "-DMBEDTLS_FATAL_WARNINGS=ON,-DMBEDTLS_FATAL_WARNINGS=OFF" | ||
| 36 | # Make X.509 and TLS calls use PSA | ||
| 37 | # https://github.com/Mbed-TLS/mbedtls/blob/development/docs/use-psa-crypto.md | ||
| 38 | PACKAGECONFIG[psa] = "" | ||
| 39 | PACKAGECONFIG[tests] = "-DENABLE_TESTING=ON,-DENABLE_TESTING=OFF" | ||
| 40 | |||
| 41 | EXTRA_OECMAKE = "-DLIB_INSTALL_DIR:STRING=${libdir}" | ||
| 42 | |||
| 43 | # For now the only way to enable PSA is to explicitly pass a -D via CFLAGS | ||
| 44 | CFLAGS:append = "${@bb.utils.contains('PACKAGECONFIG', 'psa', ' -DMBEDTLS_USE_PSA_CRYPTO', '', d)}" | ||
| 45 | |||
| 46 | PROVIDES += "polarssl" | ||
| 47 | RPROVIDES:${PN} = "polarssl" | ||
| 48 | |||
| 49 | PACKAGES =+ "${PN}-programs" | ||
| 50 | FILES:${PN}-programs = "${bindir}/" | ||
| 51 | |||
| 52 | ALTERNATIVE:${PN}-programs = "${@bb.utils.contains('PACKAGECONFIG', 'programs', 'hello', '', d)}" | ||
| 53 | ALTERNATIVE_LINK_NAME[hello] = "${bindir}/hello" | ||
| 54 | |||
| 55 | BBCLASSEXTEND = "native nativesdk" | ||
| 56 | |||
| 57 | CVE_PRODUCT = "mbed_tls" | ||
| 58 | |||
| 59 | CVE_STATUS[CVE-2021-43666] = "backported-patch: Fix merged upstream https://github.com/Mbed-TLS/mbedtls/pull/5310" | ||
| 60 | CVE_STATUS[CVE-2021-45451] = "backported-patch: Fix merged upstream https://github.com/Mbed-TLS/mbedtls/commit/9a4a9c66a48edfe9ece03c7e4a53310adf73a86c" | ||
| 61 | |||
| 62 | # Strip host paths from autogenerated test files | ||
| 63 | do_compile:append() { | ||
| 64 | sed -i 's+${S}/++g' ${B}/tests/*.c 2>/dev/null || : | ||
| 65 | sed -i 's+${B}/++g' ${B}/tests/*.c 2>/dev/null || : | ||
| 66 | } | ||
| 67 | |||
| 68 | # Export source files/headers needed by Arm Trusted Firmware | ||
| 69 | sysroot_stage_all:append() { | ||
| 70 | sysroot_stage_dir "${S}/library" "${SYSROOT_DESTDIR}/usr/share/mbedtls-source/library" | ||
| 71 | sysroot_stage_dir "${S}/include" "${SYSROOT_DESTDIR}/usr/share/mbedtls-source/include" | ||
| 72 | } | ||
| 73 | |||
| 74 | do_install_ptest () { | ||
| 75 | install -d ${D}${PTEST_PATH}/tests | ||
| 76 | cp -f ${B}/tests/test_suite_* ${D}${PTEST_PATH}/tests/ | ||
| 77 | find ${D}${PTEST_PATH}/tests/ -type f -name "*.c" -delete | ||
| 78 | cp -fR ${S}/tests/data_files ${D}${PTEST_PATH}/tests/ | ||
| 79 | } | ||
diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.5.bb b/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.6.bb index e6dfe43092..23d5c0878f 100644 --- a/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.5.bb +++ b/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.6.bb | |||
| @@ -15,7 +15,8 @@ understand what the code does. It features: \ | |||
| 15 | platform abstraction and threading \ | 15 | platform abstraction and threading \ |
| 16 | " | 16 | " |
| 17 | 17 | ||
| 18 | HOMEPAGE = "https://tls.mbed.org/" | 18 | HOMEPAGE = "https://www.trustedfirmware.org/projects/mbed-tls/" |
| 19 | BUGTRACKER = "https://github.com/Mbed-TLS/mbedtls/issues" | ||
| 19 | 20 | ||
| 20 | LICENSE = "Apache-2.0 | GPL-2.0-or-later" | 21 | LICENSE = "Apache-2.0 | GPL-2.0-or-later" |
| 21 | LIC_FILES_CHKSUM = "file://LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" | 22 | LIC_FILES_CHKSUM = "file://LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" |
| @@ -26,7 +27,7 @@ SRC_URI = "gitsm://github.com/Mbed-TLS/mbedtls.git;protocol=https;branch=mbedtls | |||
| 26 | file://run-ptest \ | 27 | file://run-ptest \ |
| 27 | " | 28 | " |
| 28 | 29 | ||
| 29 | SRCREV = "e185d7fd85499c8ce5ca2a54f5cf8fe7dbe3f8df" | 30 | SRCREV = "0bebf8b8c7f07abe3571ded48a11aa907a1ffb20" |
| 30 | 31 | ||
| 31 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" | 32 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" |
| 32 | 33 | ||
diff --git a/meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch b/meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch deleted file mode 100644 index e33d8eac1d..0000000000 --- a/meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 1 | From 54698856e5602bbd9d61e855814c854a013b4840 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sat, 22 Dec 2018 18:47:45 -0800 | ||
| 4 | Subject: [PATCH] Add OpenEmbedded cross compile case | ||
| 5 | |||
| 6 | Upstream-Status: Submitted [https://github.com/miniupnp/miniupnp/pull/410] | ||
| 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 8 | --- | ||
| 9 | genconfig.sh | 11 +++++++++++ | ||
| 10 | 1 file changed, 11 insertions(+) | ||
| 11 | |||
| 12 | --- a/genconfig.sh | ||
| 13 | +++ b/genconfig.sh | ||
| 14 | @@ -103,6 +103,12 @@ if [ -f ../shared/tomato_version ]; then | ||
| 15 | OS_VERSION="Tomato $TOMATO_VER" | ||
| 16 | fi | ||
| 17 | |||
| 18 | +# OpenEmbedded special case | ||
| 19 | +if [ -f ./os.openembedded ]; then | ||
| 20 | + OS_NAME=OpenEmbedded | ||
| 21 | + OS_VERSION=$(cat ./os.openembedded) | ||
| 22 | +fi | ||
| 23 | + | ||
| 24 | ${RM} ${CONFIGFILE} | ||
| 25 | |||
| 26 | echo "/* MiniUPnP Project" >> ${CONFIGFILE} | ||
| 27 | @@ -346,6 +352,11 @@ case $OS_NAME in | ||
| 28 | echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE} | ||
| 29 | FW=iptables | ||
| 30 | ;; | ||
| 31 | + OpenEmbedded) | ||
| 32 | + OS_URL=http://www.openembedded.org/ | ||
| 33 | + echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE} | ||
| 34 | + FW=iptables | ||
| 35 | + ;; | ||
| 36 | AstLinux) | ||
| 37 | OS_URL=http://www.astlinux.org/ | ||
| 38 | echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE} | ||
diff --git a/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.3.10.bb index b7ba37f290..91f86659f7 100644 --- a/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb +++ b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.3.10.bb | |||
| @@ -5,7 +5,7 @@ the network." | |||
| 5 | 5 | ||
| 6 | SECTION = "networking" | 6 | SECTION = "networking" |
| 7 | LICENSE = "BSD-3-Clause" | 7 | LICENSE = "BSD-3-Clause" |
| 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a1ed15843ce66639bcf9f109cf247870" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=9526418307cb153aee96a4f9b33bd1c7" |
| 9 | 9 | ||
| 10 | inherit gettext pkgconfig systemd | 10 | inherit gettext pkgconfig systemd |
| 11 | 11 | ||
| @@ -13,9 +13,8 @@ DEPENDS += "iptables net-tools util-linux libmnl libnetfilter-conntrack openssl" | |||
| 13 | 13 | ||
| 14 | SRC_URI = "http://miniupnp.tuxfamily.org/files/download.php?file=${BP}.tar.gz;downloadfilename=${BP}.tar.gz \ | 14 | SRC_URI = "http://miniupnp.tuxfamily.org/files/download.php?file=${BP}.tar.gz;downloadfilename=${BP}.tar.gz \ |
| 15 | file://miniupnpd.service \ | 15 | file://miniupnpd.service \ |
| 16 | file://0001-Add-OpenEmbedded-cross-compile-case.patch \ | ||
| 17 | " | 16 | " |
| 18 | SRC_URI[sha256sum] = "218fad7af31f3c22fb4c9db28a55a2a8b5067d41f5b38f52008a057a00d2206d" | 17 | SRC_URI[sha256sum] = "f9c34ed3632fb60cd248dd5897bd98479a103a75688b056ca2f069e68ab32987" |
| 19 | 18 | ||
| 20 | UPSTREAM_CHECK_URI = "https://miniupnp.tuxfamily.org/files/" | 19 | UPSTREAM_CHECK_URI = "https://miniupnp.tuxfamily.org/files/" |
| 21 | UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\.tar" | 20 | UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\.tar" |
| @@ -27,6 +26,7 @@ EXTRA_OEMAKE = "-f Makefile.linux" | |||
| 27 | 26 | ||
| 28 | do_configure() { | 27 | do_configure() { |
| 29 | echo "${@d.getVar('DISTRO_VERSION')}" > ${S}/os.openembedded | 28 | echo "${@d.getVar('DISTRO_VERSION')}" > ${S}/os.openembedded |
| 29 | ./configure | ||
| 30 | CONFIG_OPTIONS="--leasefile --vendorcfg ${PACKAGECONFIG_CONFARGS}" oe_runmake --always-make config.h | 30 | CONFIG_OPTIONS="--leasefile --vendorcfg ${PACKAGECONFIG_CONFARGS}" oe_runmake --always-make config.h |
| 31 | } | 31 | } |
| 32 | 32 | ||
diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.1.2.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.1.2.bb index 6a6e554453..8bb6c9009d 100644 --- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.1.2.bb +++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.1.2.bb | |||
| @@ -57,6 +57,8 @@ do_install:append() { | |||
| 57 | -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ | 57 | -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ |
| 58 | -e 's,@SYSCONFDIR@,${sysconfdir},g' \ | 58 | -e 's,@SYSCONFDIR@,${sysconfdir},g' \ |
| 59 | ${D}${sysconfdir}/init.d/mosquitto | 59 | ${D}${sysconfdir}/init.d/mosquitto |
| 60 | |||
| 61 | install -m 0644 ${S}/mosquitto.conf ${D}${sysconfdir}/mosquitto/mosquitto.conf | ||
| 60 | } | 62 | } |
| 61 | 63 | ||
| 62 | PACKAGE_BEFORE_PN = "libmosquitto1 libmosquittopp1 ${PN}-clients ${PN}-examples" | 64 | PACKAGE_BEFORE_PN = "libmosquitto1 libmosquittopp1 ${PN}-clients ${PN}-examples" |
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.56.0.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.56.0.bb index de163fe00e..138d7118eb 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.56.0.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.56.0.bb | |||
| @@ -48,7 +48,6 @@ SRC_URI:append:libc-musl = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', | |||
| 48 | 48 | ||
| 49 | SRCREV = "56b51b98fbb8627c4c09a483702e18fd8aee7ce1" | 49 | SRCREV = "56b51b98fbb8627c4c09a483702e18fd8aee7ce1" |
| 50 | 50 | ||
| 51 | |||
| 52 | # ['auto', 'symlink', 'file', 'netconfig', 'resolvconf'] | 51 | # ['auto', 'symlink', 'file', 'netconfig', 'resolvconf'] |
| 53 | NETWORKMANAGER_DNS_RC_MANAGER_DEFAULT ??= "auto" | 52 | NETWORKMANAGER_DNS_RC_MANAGER_DEFAULT ??= "auto" |
| 54 | 53 | ||
| @@ -72,25 +71,12 @@ EXTRA_OEMESON = "\ | |||
| 72 | -Dman=false \ | 71 | -Dman=false \ |
| 73 | " | 72 | " |
| 74 | 73 | ||
| 75 | # stolen from https://github.com/void-linux/void-packages/blob/master/srcpkgs/NetworkManager/template | ||
| 76 | # avoids: | ||
| 77 | # | ../NetworkManager-1.16.0/libnm-core/nm-json.c:106:50: error: 'RTLD_DEEPBIND' undeclared (first use in this function); did you mean 'RTLD_DEFAULT'? | ||
| 78 | CFLAGS:append:libc-musl = " \ | ||
| 79 | -DRTLD_DEEPBIND=0 \ | ||
| 80 | " | ||
| 81 | |||
| 82 | # networkmanager-1.52.0/src/nmcli/agent.c:88:29: error: incompatible function pointer types assigning to 'rl_hook_func_t *' (aka 'int (*)(void)') from 'int (const char *, int)' [-Wincompatible-function-pointer-types] | ||
| 83 | # 88 | rl_startup_hook = set_deftext; | ||
| 84 | # | ^ ~~~~~~~~~~~ | ||
| 85 | |||
| 86 | CFLAGS:append:toolchain-clang = " -Wno-error=incompatible-function-pointer-types" | ||
| 87 | |||
| 88 | PACKAGECONFIG ??= "readline nss ifupdown dnsmasq nmcli \ | 74 | PACKAGECONFIG ??= "readline nss ifupdown dnsmasq nmcli \ |
| 89 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ | 75 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ |
| 90 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \ | 76 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \ |
| 91 | ${@bb.utils.filter('DISTRO_FEATURES', 'wifi polkit ppp', d)} \ | 77 | ${@bb.utils.filter('DISTRO_FEATURES', 'wifi polkit ppp', d)} \ |
| 92 | ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit', '', d)} \ | 78 | ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit', '', d)} \ |
| 93 | ${@bb.utils.contains('DISTRO_FEATURES_BACKFILL_CONSIDERED', 'gobject-introspection-data', '', 'vala', d)} \ | 79 | ${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection-data', 'vala', '', d)} \ |
| 94 | " | 80 | " |
| 95 | 81 | ||
| 96 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'vala', 'vala', '', d)} | 82 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'vala', 'vala', '', d)} |
| @@ -325,4 +311,9 @@ do_install:append() { | |||
| 325 | if ${@bb.utils.contains('PACKAGECONFIG','dhcpcd','true','false',d)}; then | 311 | if ${@bb.utils.contains('PACKAGECONFIG','dhcpcd','true','false',d)}; then |
| 326 | install -Dm 0644 ${UNPACKDIR}/enable-dhcpcd.conf ${D}${nonarch_libdir}/NetworkManager/conf.d/enable-dhcpcd.conf | 312 | install -Dm 0644 ${UNPACKDIR}/enable-dhcpcd.conf ${D}${nonarch_libdir}/NetworkManager/conf.d/enable-dhcpcd.conf |
| 327 | fi | 313 | fi |
| 314 | |||
| 315 | # Don't ship initrd specific services into rootfs to avoid the conflict with the main services | ||
| 316 | rm -f ${D}${systemd_system_unitdir}/NetworkManager-config-initrd.service | ||
| 317 | rm -f ${D}${systemd_system_unitdir}/NetworkManager-initrd.service | ||
| 318 | rm -f ${D}${systemd_system_unitdir}/NetworkManager-wait-online-initrd.service | ||
| 328 | } | 319 | } |
diff --git a/meta-networking/recipes-connectivity/samba/samba/0001-Don-t-check-xsltproc-manpages.patch b/meta-networking/recipes-connectivity/samba/samba/0001-Don-t-check-xsltproc-manpages.patch index a498348c20..afa1154827 100644 --- a/meta-networking/recipes-connectivity/samba/samba/0001-Don-t-check-xsltproc-manpages.patch +++ b/meta-networking/recipes-connectivity/samba/samba/0001-Don-t-check-xsltproc-manpages.patch | |||
| @@ -9,25 +9,14 @@ Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> | |||
| 9 | 9 | ||
| 10 | Rebase to 4.14.4 | 10 | Rebase to 4.14.4 |
| 11 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | 11 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
| 12 | |||
| 13 | Rebase to 4.23.5 | ||
| 14 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 12 | --- | 15 | --- |
| 13 | lib/ldb/wscript | 2 +- | ||
| 14 | lib/talloc/wscript | 2 +- | 16 | lib/talloc/wscript | 2 +- |
| 15 | lib/tdb/wscript | 2 +- | 17 | lib/tdb/wscript | 2 +- |
| 16 | 3 files changed, 3 insertions(+), 3 deletions(-) | 18 | 2 files changed, 2 insertions(+), 2 deletions(-) |
| 17 | 19 | ||
| 18 | diff --git a/lib/ldb/wscript b/lib/ldb/wscript | ||
| 19 | index ed5d45f..de3c648 100644 | ||
| 20 | --- a/lib/ldb/wscript | ||
| 21 | +++ b/lib/ldb/wscript | ||
| 22 | @@ -144,7 +144,7 @@ def configure(conf): | ||
| 23 | conf.DEFINE('EXPECTED_SYSTEM_LDB_VERSION_RELEASE', int(v[2])) | ||
| 24 | |||
| 25 | if conf.env.standalone_ldb: | ||
| 26 | - conf.CHECK_XSLTPROC_MANPAGES() | ||
| 27 | + #conf.CHECK_XSLTPROC_MANPAGES() | ||
| 28 | |||
| 29 | # we need this for the ldap backend | ||
| 30 | if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'): | ||
| 31 | diff --git a/lib/talloc/wscript b/lib/talloc/wscript | 20 | diff --git a/lib/talloc/wscript b/lib/talloc/wscript |
| 32 | index 075f1ec..9bd9f73 100644 | 21 | index 075f1ec..9bd9f73 100644 |
| 33 | --- a/lib/talloc/wscript | 22 | --- a/lib/talloc/wscript |
diff --git a/meta-networking/recipes-connectivity/samba/samba/0003-Add-config-option-without-valgrind.patch b/meta-networking/recipes-connectivity/samba/samba/0003-Add-config-option-without-valgrind.patch index 2c9d29c9fe..70e7f28cc7 100644 --- a/meta-networking/recipes-connectivity/samba/samba/0003-Add-config-option-without-valgrind.patch +++ b/meta-networking/recipes-connectivity/samba/samba/0003-Add-config-option-without-valgrind.patch | |||
| @@ -37,10 +37,10 @@ diff --git a/wscript b/wscript | |||
| 37 | index 95ddd9e..6d9577a 100644 | 37 | index 95ddd9e..6d9577a 100644 |
| 38 | --- a/wscript | 38 | --- a/wscript |
| 39 | +++ b/wscript | 39 | +++ b/wscript |
| 40 | @@ -123,6 +123,13 @@ def options(opt): | 40 | @@ -131,6 +131,13 @@ |
| 41 | help=('Disable kernely keyring support for credential storage'), | 41 | help=('Disable kernely keyring support for credential storage'), |
| 42 | action='store_false', dest='enable_keyring') | 42 | action='store_false', dest='enable_keyring') |
| 43 | 43 | ||
| 44 | + opt.add_option('--with-valgrind', | 44 | + opt.add_option('--with-valgrind', |
| 45 | + help=("Enable use of valgrind"), | 45 | + help=("Enable use of valgrind"), |
| 46 | + action="store_true", dest='enable_valgrind') | 46 | + action="store_true", dest='enable_valgrind') |
| @@ -48,9 +48,6 @@ index 95ddd9e..6d9577a 100644 | |||
| 48 | + help=("Disable use of valgrind"), | 48 | + help=("Disable use of valgrind"), |
| 49 | + action="store_false", dest='enable_valgrind', default=False) | 49 | + action="store_false", dest='enable_valgrind', default=False) |
| 50 | + | 50 | + |
| 51 | gr = opt.option_group('developer options') | 51 | opt.samba_add_onoff_option('ldap') |
| 52 | |||
| 53 | opt.load('python') # options for disabling pyc or pyo compilation | ||
| 54 | -- | ||
| 55 | 2.25.1 | ||
| 56 | 52 | ||
| 53 | opt.option_group('developer options') | ||
diff --git a/meta-networking/recipes-connectivity/samba/samba/0003-Replace-memset_s-with-memset_explicit.patch b/meta-networking/recipes-connectivity/samba/samba/0003-Replace-memset_s-with-memset_explicit.patch index a96cd062cd..74ea1a7ab4 100644 --- a/meta-networking/recipes-connectivity/samba/samba/0003-Replace-memset_s-with-memset_explicit.patch +++ b/meta-networking/recipes-connectivity/samba/samba/0003-Replace-memset_s-with-memset_explicit.patch | |||
| @@ -15,7 +15,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
| 15 | 15 | ||
| 16 | --- a/lib/replace/replace.h | 16 | --- a/lib/replace/replace.h |
| 17 | +++ b/lib/replace/replace.h | 17 | +++ b/lib/replace/replace.h |
| 18 | @@ -815,50 +815,50 @@ typedef unsigned long long ptrdiff_t ; | 18 | @@ -811,50 +811,50 @@ typedef unsigned long long ptrdiff_t ; |
| 19 | /** | 19 | /** |
| 20 | * Zero a structure. | 20 | * Zero a structure. |
| 21 | */ | 21 | */ |
| @@ -74,7 +74,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
| 74 | 74 | ||
| 75 | /** | 75 | /** |
| 76 | * Explicitly zero data in string. This is guaranteed to be not optimized | 76 | * Explicitly zero data in string. This is guaranteed to be not optimized |
| 77 | @@ -867,7 +867,7 @@ typedef unsigned long long ptrdiff_t ; | 77 | @@ -863,7 +863,7 @@ typedef unsigned long long ptrdiff_t ; |
| 78 | #define BURN_STR(x) do { \ | 78 | #define BURN_STR(x) do { \ |
| 79 | if ((x) != NULL) { \ | 79 | if ((x) != NULL) { \ |
| 80 | size_t s = strlen(x); \ | 80 | size_t s = strlen(x); \ |
| @@ -193,116 +193,3 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
| 193 | 193 | ||
| 194 | talloc_free(mem_ctx); | 194 | talloc_free(mem_ctx); |
| 195 | } | 195 | } |
| 196 | --- a/lib/cmdline/cmdline.c | ||
| 197 | +++ b/lib/cmdline/cmdline.c | ||
| 198 | @@ -358,7 +358,7 @@ bool samba_cmdline_burn(int argc, char * | ||
| 199 | p += ulen; | ||
| 200 | } | ||
| 201 | |||
| 202 | - memset_s(p, strlen(p), '\0', strlen(p)); | ||
| 203 | + memset_explicit(p, '\0', strlen(p)); | ||
| 204 | burnt = true; | ||
| 205 | } | ||
| 206 | } | ||
| 207 | --- a/lib/util/data_blob.c | ||
| 208 | +++ b/lib/util/data_blob.c | ||
| 209 | @@ -1,19 +1,19 @@ | ||
| 210 | -/* | ||
| 211 | +/* | ||
| 212 | Unix SMB/CIFS implementation. | ||
| 213 | Easy management of byte-length data | ||
| 214 | Copyright (C) Andrew Tridgell 2001 | ||
| 215 | Copyright (C) Andrew Bartlett 2001 | ||
| 216 | - | ||
| 217 | + | ||
| 218 | This program is free software; you can redistribute it and/or modify | ||
| 219 | it under the terms of the GNU General Public License as published by | ||
| 220 | the Free Software Foundation; either version 3 of the License, or | ||
| 221 | (at your option) any later version. | ||
| 222 | - | ||
| 223 | + | ||
| 224 | This program is distributed in the hope that it will be useful, | ||
| 225 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 226 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 227 | GNU General Public License for more details. | ||
| 228 | - | ||
| 229 | + | ||
| 230 | You should have received a copy of the GNU General Public License | ||
| 231 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 232 | */ | ||
| 233 | @@ -67,7 +67,7 @@ _PUBLIC_ DATA_BLOB data_blob_talloc_name | ||
| 234 | } | ||
| 235 | |||
| 236 | /** | ||
| 237 | - construct a zero data blob, using supplied TALLOC_CTX. | ||
| 238 | + construct a zero data blob, using supplied TALLOC_CTX. | ||
| 239 | use this sparingly as it initialises data - better to initialise | ||
| 240 | yourself if you want specific data in the blob | ||
| 241 | **/ | ||
| 242 | @@ -95,7 +95,7 @@ clear a DATA_BLOB's contents | ||
| 243 | _PUBLIC_ void data_blob_clear(DATA_BLOB *d) | ||
| 244 | { | ||
| 245 | if (d->data) { | ||
| 246 | - memset_s(d->data, d->length, 0, d->length); | ||
| 247 | + memset_explicit(d->data, 0, d->length); | ||
| 248 | } | ||
| 249 | } | ||
| 250 | |||
| 251 | @@ -219,7 +219,7 @@ _PUBLIC_ DATA_BLOB data_blob_string_cons | ||
| 252 | } | ||
| 253 | |||
| 254 | /** | ||
| 255 | - * Create a new data blob from const data | ||
| 256 | + * Create a new data blob from const data | ||
| 257 | */ | ||
| 258 | |||
| 259 | _PUBLIC_ DATA_BLOB data_blob_const(const void *p, size_t length) | ||
| 260 | @@ -266,7 +266,7 @@ _PUBLIC_ bool data_blob_append(TALLOC_CT | ||
| 261 | if ((const uint8_t *)p + length < (const uint8_t *)p) { | ||
| 262 | return false; | ||
| 263 | } | ||
| 264 | - | ||
| 265 | + | ||
| 266 | if (!data_blob_realloc(mem_ctx, blob, new_len)) { | ||
| 267 | return false; | ||
| 268 | } | ||
| 269 | --- a/lib/util/talloc_keep_secret.c | ||
| 270 | +++ b/lib/util/talloc_keep_secret.c | ||
| 271 | @@ -22,27 +22,13 @@ | ||
| 272 | |||
| 273 | static int talloc_keep_secret_destructor(void *ptr) | ||
| 274 | { | ||
| 275 | - int ret; | ||
| 276 | size_t size = talloc_get_size(ptr); | ||
| 277 | |||
| 278 | if (unlikely(size == 0)) { | ||
| 279 | return 0; | ||
| 280 | } | ||
| 281 | |||
| 282 | - ret = memset_s(ptr, size, 0, size); | ||
| 283 | - if (unlikely(ret != 0)) { | ||
| 284 | - char *msg = NULL; | ||
| 285 | - int ret2; | ||
| 286 | - ret2 = asprintf(&msg, | ||
| 287 | - "talloc_keep_secret_destructor: memset_s() failed: %s", | ||
| 288 | - strerror(ret)); | ||
| 289 | - if (ret2 != -1) { | ||
| 290 | - smb_panic(msg); | ||
| 291 | - } else { | ||
| 292 | - smb_panic("talloc_keep_secret_destructor: memset_s() failed"); | ||
| 293 | - } | ||
| 294 | - } | ||
| 295 | - | ||
| 296 | + memset_explicit(ptr, 0, size); | ||
| 297 | return 0; | ||
| 298 | } | ||
| 299 | |||
| 300 | --- a/librpc/ndr/util.c | ||
| 301 | +++ b/librpc/ndr/util.c | ||
| 302 | @@ -32,5 +32,5 @@ _PUBLIC_ void ndr_print_sockaddr_storage | ||
| 303 | |||
| 304 | _PUBLIC_ void ndr_zero_memory(void *ptr, size_t len) | ||
| 305 | { | ||
| 306 | - memset_s(ptr, len, 0, len); | ||
| 307 | + memset_explicit(ptr, 0, len); | ||
| 308 | } | ||
diff --git a/meta-networking/recipes-connectivity/samba/samba/0004-Add-options-to-configure-the-use-of-libbsd.patch b/meta-networking/recipes-connectivity/samba/samba/0004-Add-options-to-configure-the-use-of-libbsd.patch index c72bd133ee..88acfeef07 100644 --- a/meta-networking/recipes-connectivity/samba/samba/0004-Add-options-to-configure-the-use-of-libbsd.patch +++ b/meta-networking/recipes-connectivity/samba/samba/0004-Add-options-to-configure-the-use-of-libbsd.patch | |||
| @@ -19,7 +19,7 @@ diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript | |||
| 19 | index 30cb366..d167551 100644 | 19 | index 30cb366..d167551 100644 |
| 20 | --- a/buildtools/wafsamba/wscript | 20 | --- a/buildtools/wafsamba/wscript |
| 21 | +++ b/buildtools/wafsamba/wscript | 21 | +++ b/buildtools/wafsamba/wscript |
| 22 | @@ -145,6 +145,13 @@ Currently the only tested value is 'smbtorture,smbd/smbd' for Samba'''), | 22 | @@ -155,6 +155,13 @@ Currently the only tested value is 'smbtorture,smbd/smbd' for Samba'''), |
| 23 | help=("Disable use of gettext"), | 23 | help=("Disable use of gettext"), |
| 24 | action="store_true", dest='disable_gettext', default=False) | 24 | action="store_true", dest='disable_gettext', default=False) |
| 25 | 25 | ||
| @@ -37,40 +37,60 @@ diff --git a/lib/replace/wscript b/lib/replace/wscript | |||
| 37 | index 9dd9b48..a22ae59 100644 | 37 | index 9dd9b48..a22ae59 100644 |
| 38 | --- a/lib/replace/wscript | 38 | --- a/lib/replace/wscript |
| 39 | +++ b/lib/replace/wscript | 39 | +++ b/lib/replace/wscript |
| 40 | @@ -444,20 +444,21 @@ def configure(conf): | 40 | @@ -444,31 +444,32 @@ |
| 41 | 41 | ||
| 42 | strlcpy_in_bsd = False | 42 | strlcpy_in_bsd = False |
| 43 | 43 | ||
| 44 | - # libbsd on some platforms provides strlcpy and strlcat | 44 | - # libbsd on some platforms provides strlcpy and strlcat |
| 45 | - if not conf.CHECK_FUNCS('strlcpy strlcat'): | 45 | - if not conf.CHECK_FUNCS('strlcpy strlcat'): |
| 46 | - if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', | 46 | - if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', |
| 47 | - checklibc=True): | 47 | - checklibc=True): |
| 48 | - strlcpy_in_bsd = True | 48 | - strlcpy_in_bsd = True |
| 49 | - if not conf.CHECK_FUNCS('getpeereid'): | 49 | - elif conf.env.enable_fuzzing: |
| 50 | - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') | 50 | - # Just to complicate it more, some versions of Honggfuzz have |
| 51 | - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): | 51 | - # got strlcpy and strlcat in libc, but not in <string.h> |
| 52 | - conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') | 52 | - # (unless it is there coincidentally, on a BSD). Therefore we |
| 53 | - if not conf.CHECK_FUNCS('setproctitle_init'): | 53 | - # can't use CHECK_FUNCS alone to decide whether to add the |
| 54 | - conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') | 54 | - # headers to replace.h. |
| 55 | - | 55 | - # |
| 56 | - if not conf.CHECK_FUNCS('closefrom'): | 56 | - # As this is only known to happen on a fuzzing compiler, we'll |
| 57 | - conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') | 57 | - # skip the check when not in fuzzing mode. |
| 58 | - conf.CHECK_HEADERS('bsd/string.h') | ||
| 58 | + if Options.options.enable_libbsd: | 59 | + if Options.options.enable_libbsd: |
| 59 | + # libbsd on some platforms provides strlcpy and strlcat | 60 | + # libbsd on some platforms provides strlcpy and strlcat |
| 60 | + if not conf.CHECK_FUNCS('strlcpy strlcat'): | 61 | + if not conf.CHECK_FUNCS('strlcpy strlcat'): |
| 61 | + if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', | 62 | + if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', |
| 62 | + checklibc=True): | 63 | + checklibc=True): |
| 63 | + strlcpy_in_bsd = True | 64 | + strlcpy_in_bsd = True |
| 65 | + elif conf.env.enable_fuzzing: | ||
| 66 | + # Just to complicate it more, some versions of Honggfuzz have | ||
| 67 | + # got strlcpy and strlcat in libc, but not in <string.h> | ||
| 68 | + # (unless it is there coincidentally, on a BSD). Therefore we | ||
| 69 | + # can't use CHECK_FUNCS alone to decide whether to add the | ||
| 70 | + # headers to replace.h. | ||
| 71 | + # | ||
| 72 | + # As this is only known to happen on a fuzzing compiler, we'll | ||
| 73 | + # skip the check when not in fuzzing mode. | ||
| 74 | + conf.CHECK_HEADERS('bsd/string.h') | ||
| 75 | |||
| 76 | - if not conf.CHECK_FUNCS('getpeereid'): | ||
| 77 | - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') | ||
| 78 | - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): | ||
| 79 | - conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') | ||
| 80 | - if not conf.CHECK_FUNCS('setproctitle_init'): | ||
| 81 | - conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') | ||
| 64 | + if not conf.CHECK_FUNCS('getpeereid'): | 82 | + if not conf.CHECK_FUNCS('getpeereid'): |
| 65 | + conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') | 83 | + conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') |
| 66 | + if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): | 84 | + if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): |
| 67 | + conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') | 85 | + conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') |
| 68 | + if not conf.CHECK_FUNCS('setproctitle_init'): | 86 | + if not conf.CHECK_FUNCS('setproctitle_init'): |
| 69 | + conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') | 87 | + conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') |
| 70 | + | 88 | |
| 89 | - if not conf.CHECK_FUNCS('closefrom'): | ||
| 90 | - conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') | ||
| 71 | + if not conf.CHECK_FUNCS('closefrom'): | 91 | + if not conf.CHECK_FUNCS('closefrom'): |
| 72 | + conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') | 92 | + conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') |
| 73 | 93 | ||
| 74 | conf.CHECK_CODE(''' | 94 | conf.CHECK_CODE(''' |
| 75 | struct ucred cred; | 95 | struct ucred cred; |
| 76 | diff --git a/lib/texpect/wscript b/lib/texpect/wscript | 96 | diff --git a/lib/texpect/wscript b/lib/texpect/wscript |
diff --git a/meta-networking/recipes-connectivity/samba/samba/0004-lib-replace-Remove-memset_s.patch b/meta-networking/recipes-connectivity/samba/samba/0004-lib-replace-Remove-memset_s.patch index 409c36da7c..6e01ae35e7 100644 --- a/meta-networking/recipes-connectivity/samba/samba/0004-lib-replace-Remove-memset_s.patch +++ b/meta-networking/recipes-connectivity/samba/samba/0004-lib-replace-Remove-memset_s.patch | |||
| @@ -24,7 +24,7 @@ diff --git a/lib/replace/README b/lib/replace/README | |||
| 24 | index bb9d008..d8431e7 100644 | 24 | index bb9d008..d8431e7 100644 |
| 25 | --- a/lib/replace/README | 25 | --- a/lib/replace/README |
| 26 | +++ b/lib/replace/README | 26 | +++ b/lib/replace/README |
| 27 | @@ -74,7 +74,6 @@ realpath | 27 | @@ -73,7 +73,6 @@ realpath |
| 28 | poll | 28 | poll |
| 29 | setproctitle | 29 | setproctitle |
| 30 | memset_explicit | 30 | memset_explicit |
| @@ -36,219 +36,10 @@ diff --git a/lib/replace/replace.c b/lib/replace/replace.c | |||
| 36 | index 8615899..a419837 100644 | 36 | index 8615899..a419837 100644 |
| 37 | --- a/lib/replace/replace.c | 37 | --- a/lib/replace/replace.c |
| 38 | +++ b/lib/replace/replace.c | 38 | +++ b/lib/replace/replace.c |
| 39 | @@ -1,4 +1,4 @@ | 39 | @@ -965,37 +965,6 @@ |
| 40 | -/* | ||
| 41 | +/* | ||
| 42 | Unix SMB/CIFS implementation. | ||
| 43 | replacement routines for broken systems | ||
| 44 | Copyright (C) Andrew Tridgell 1992-1998 | ||
| 45 | @@ -8,7 +8,7 @@ | ||
| 46 | ** NOTE! The following LGPL license applies to the replace | ||
| 47 | ** library. This does NOT imply that all of Samba is released | ||
| 48 | ** under the LGPL | ||
| 49 | - | ||
| 50 | + | ||
| 51 | This library is free software; you can redistribute it and/or | ||
| 52 | modify it under the terms of the GNU Lesser General Public | ||
| 53 | License as published by the Free Software Foundation; either | ||
| 54 | @@ -91,7 +91,7 @@ size_t rep_strlcpy(char *d, const char *s, size_t bufsize) | ||
| 55 | #endif | ||
| 56 | |||
| 57 | #ifndef HAVE_STRLCAT | ||
| 58 | -/* like strncat but does not 0 fill the buffer and always null | ||
| 59 | +/* like strncat but does not 0 fill the buffer and always null | ||
| 60 | terminates. bufsize is the length of the buffer, which should | ||
| 61 | be one more than the maximum resulting string length */ | ||
| 62 | size_t rep_strlcat(char *d, const char *s, size_t bufsize) | ||
| 63 | @@ -116,7 +116,7 @@ size_t rep_strlcat(char *d, const char *s, size_t bufsize) | ||
| 64 | |||
| 65 | #ifndef HAVE_MKTIME | ||
| 66 | /******************************************************************* | ||
| 67 | -a mktime() replacement for those who don't have it - contributed by | ||
| 68 | +a mktime() replacement for those who don't have it - contributed by | ||
| 69 | C.A. Lademann <cal@zls.com> | ||
| 70 | Corrections by richard.kettlewell@kewill.com | ||
| 71 | ********************************************************************/ | ||
| 72 | @@ -137,7 +137,7 @@ time_t rep_mktime(struct tm *t) | ||
| 73 | return((time_t)-1); | ||
| 74 | |||
| 75 | n = t->tm_year + 1900 - 1; | ||
| 76 | - epoch = (t->tm_year - 70) * YEAR + | ||
| 77 | + epoch = (t->tm_year - 70) * YEAR + | ||
| 78 | ((n / 4 - n / 100 + n / 400) - (1969 / 4 - 1969 / 100 + 1969 / 400)) * DAY; | ||
| 79 | |||
| 80 | y = t->tm_year + 1900; | ||
| 81 | @@ -147,7 +147,7 @@ time_t rep_mktime(struct tm *t) | ||
| 82 | epoch += mon [m] * DAY; | ||
| 83 | if(m == 1 && y % 4 == 0 && (y % 100 != 0 || y % 400 == 0)) | ||
| 84 | epoch += DAY; | ||
| 85 | - | ||
| 86 | + | ||
| 87 | if(++m > 11) { | ||
| 88 | m = 0; | ||
| 89 | y++; | ||
| 90 | @@ -156,7 +156,7 @@ time_t rep_mktime(struct tm *t) | ||
| 91 | |||
| 92 | epoch += (t->tm_mday - 1) * DAY; | ||
| 93 | epoch += t->tm_hour * HOUR + t->tm_min * MINUTE + t->tm_sec; | ||
| 94 | - | ||
| 95 | + | ||
| 96 | if((u = localtime(&epoch)) != NULL) { | ||
| 97 | t->tm_sec = u->tm_sec; | ||
| 98 | t->tm_min = u->tm_min; | ||
| 99 | @@ -176,7 +176,7 @@ time_t rep_mktime(struct tm *t) | ||
| 100 | |||
| 101 | #ifndef HAVE_INITGROUPS | ||
| 102 | /**************************************************************************** | ||
| 103 | - some systems don't have an initgroups call | ||
| 104 | + some systems don't have an initgroups call | ||
| 105 | ****************************************************************************/ | ||
| 106 | int rep_initgroups(char *name, gid_t id) | ||
| 107 | { | ||
| 108 | @@ -194,7 +194,7 @@ int rep_initgroups(char *name, gid_t id) | ||
| 109 | int i,j; | ||
| 110 | struct group *g; | ||
| 111 | char *gr; | ||
| 112 | - | ||
| 113 | + | ||
| 114 | if((grouplst = malloc(sizeof(gid_t) * max_gr)) == NULL) { | ||
| 115 | errno = ENOMEM; | ||
| 116 | return -1; | ||
| 117 | @@ -250,9 +250,9 @@ void *rep_memmove(void *dest,const void *src,int size) | ||
| 118 | |||
| 119 | if (d < s) { | ||
| 120 | /* we can forward copy */ | ||
| 121 | - if (s-d >= sizeof(int) && | ||
| 122 | - !(s%sizeof(int)) && | ||
| 123 | - !(d%sizeof(int)) && | ||
| 124 | + if (s-d >= sizeof(int) && | ||
| 125 | + !(s%sizeof(int)) && | ||
| 126 | + !(d%sizeof(int)) && | ||
| 127 | !(size%sizeof(int))) { | ||
| 128 | /* do it all as words */ | ||
| 129 | int *idest = (int *)dest; | ||
| 130 | @@ -267,9 +267,9 @@ void *rep_memmove(void *dest,const void *src,int size) | ||
| 131 | } | ||
| 132 | } else { | ||
| 133 | /* must backward copy */ | ||
| 134 | - if (d-s >= sizeof(int) && | ||
| 135 | - !(s%sizeof(int)) && | ||
| 136 | - !(d%sizeof(int)) && | ||
| 137 | + if (d-s >= sizeof(int) && | ||
| 138 | + !(s%sizeof(int)) && | ||
| 139 | + !(d%sizeof(int)) && | ||
| 140 | !(size%sizeof(int))) { | ||
| 141 | /* do it all as words */ | ||
| 142 | int *idest = (int *)dest; | ||
| 143 | @@ -281,7 +281,7 @@ void *rep_memmove(void *dest,const void *src,int size) | ||
| 144 | char *cdest = (char *)dest; | ||
| 145 | char *csrc = (char *)src; | ||
| 146 | for (i=size-1;i>=0;i--) cdest[i] = csrc[i]; | ||
| 147 | - } | ||
| 148 | + } | ||
| 149 | } | ||
| 150 | return(dest); | ||
| 151 | } | ||
| 152 | @@ -334,16 +334,16 @@ void rep_vsyslog (int facility_priority, const char *format, va_list arglist) | ||
| 153 | size_t rep_strnlen(const char *s, size_t max) | ||
| 154 | { | ||
| 155 | size_t len; | ||
| 156 | - | ||
| 157 | + | ||
| 158 | for (len = 0; len < max; len++) { | ||
| 159 | if (s[len] == '\0') { | ||
| 160 | break; | ||
| 161 | } | ||
| 162 | } | ||
| 163 | - return len; | ||
| 164 | + return len; | ||
| 165 | } | 40 | } |
| 166 | #endif | 41 | #endif |
| 167 | - | 42 | |
| 168 | + | ||
| 169 | #ifndef HAVE_STRNDUP | ||
| 170 | /** | ||
| 171 | Some platforms don't have strndup. | ||
| 172 | @@ -351,7 +351,7 @@ void rep_vsyslog (int facility_priority, const char *format, va_list arglist) | ||
| 173 | char *rep_strndup(const char *s, size_t n) | ||
| 174 | { | ||
| 175 | char *ret; | ||
| 176 | - | ||
| 177 | + | ||
| 178 | n = strnlen(s, n); | ||
| 179 | ret = malloc(n+1); | ||
| 180 | if (!ret) | ||
| 181 | @@ -407,7 +407,7 @@ int rep_chroot(const char *dname) | ||
| 182 | |||
| 183 | /***************************************************************** | ||
| 184 | Possibly replace mkstemp if it is broken. | ||
| 185 | -*****************************************************************/ | ||
| 186 | +*****************************************************************/ | ||
| 187 | |||
| 188 | #ifndef HAVE_SECURE_MKSTEMP | ||
| 189 | int rep_mkstemp(char *template) | ||
| 190 | @@ -425,7 +425,7 @@ int rep_mkstemp(char *template) | ||
| 191 | char *rep_mkdtemp(char *template) | ||
| 192 | { | ||
| 193 | char *dname; | ||
| 194 | - | ||
| 195 | + | ||
| 196 | if ((dname = mktemp(template))) { | ||
| 197 | if (mkdir(dname, 0700) >= 0) { | ||
| 198 | return dname; | ||
| 199 | @@ -532,7 +532,7 @@ long long int rep_strtoll(const char *str, char **endptr, int base) | ||
| 200 | { | ||
| 201 | #ifdef HAVE_STRTOQ | ||
| 202 | return strtoq(str, endptr, base); | ||
| 203 | -#elif defined(HAVE___STRTOLL) | ||
| 204 | +#elif defined(HAVE___STRTOLL) | ||
| 205 | return __strtoll(str, endptr, base); | ||
| 206 | #elif SIZEOF_LONG == SIZEOF_LONG_LONG | ||
| 207 | return (long long int) strtol(str, endptr, base); | ||
| 208 | @@ -568,7 +568,7 @@ unsigned long long int rep_strtoull(const char *str, char **endptr, int base) | ||
| 209 | { | ||
| 210 | #ifdef HAVE_STRTOUQ | ||
| 211 | return strtouq(str, endptr, base); | ||
| 212 | -#elif defined(HAVE___STRTOULL) | ||
| 213 | +#elif defined(HAVE___STRTOULL) | ||
| 214 | return __strtoull(str, endptr, base); | ||
| 215 | #elif SIZEOF_LONG == SIZEOF_LONG_LONG | ||
| 216 | return (unsigned long long int) strtoul(str, endptr, base); | ||
| 217 | @@ -599,7 +599,7 @@ unsigned long long int rep_strtoull(const char *str, char **endptr, int base) | ||
| 218 | #endif /* HAVE_STRTOULL */ | ||
| 219 | |||
| 220 | #ifndef HAVE_SETENV | ||
| 221 | -int rep_setenv(const char *name, const char *value, int overwrite) | ||
| 222 | +int rep_setenv(const char *name, const char *value, int overwrite) | ||
| 223 | { | ||
| 224 | char *p; | ||
| 225 | size_t l1, l2; | ||
| 226 | @@ -644,10 +644,10 @@ int rep_unsetenv(const char *name) | ||
| 227 | for (i=0;environ[i];i++) /* noop */ ; | ||
| 228 | |||
| 229 | count=i; | ||
| 230 | - | ||
| 231 | + | ||
| 232 | for (i=0;i<count;) { | ||
| 233 | if (strncmp(environ[i], name, len) == 0 && environ[i][len] == '=') { | ||
| 234 | - /* note: we do _not_ free the old variable here. It is unsafe to | ||
| 235 | + /* note: we do _not_ free the old variable here. It is unsafe to | ||
| 236 | do so, as the pointer may not have come from malloc */ | ||
| 237 | memmove(&environ[i], &environ[i+1], (count-i)*sizeof(char *)); | ||
| 238 | count--; | ||
| 239 | @@ -688,7 +688,7 @@ int rep_utimes(const char *filename, const struct timeval tv[2]) | ||
| 240 | #endif | ||
| 241 | |||
| 242 | #ifndef HAVE_DUP2 | ||
| 243 | -int rep_dup2(int oldfd, int newfd) | ||
| 244 | +int rep_dup2(int oldfd, int newfd) | ||
| 245 | { | ||
| 246 | errno = ENOSYS; | ||
| 247 | return -1; | ||
| 248 | @@ -965,37 +965,6 @@ void *rep_memset_explicit(void *block, int c, size_t size) | ||
| 249 | } | ||
| 250 | #endif | ||
| 251 | |||
| 252 | -#ifndef HAVE_MEMSET_S | 43 | -#ifndef HAVE_MEMSET_S |
| 253 | -# ifndef RSIZE_MAX | 44 | -# ifndef RSIZE_MAX |
| 254 | -# define RSIZE_MAX (SIZE_MAX >> 1) | 45 | -# define RSIZE_MAX (SIZE_MAX >> 1) |
| @@ -267,7 +58,7 @@ index 8615899..a419837 100644 | |||
| 267 | - } | 58 | - } |
| 268 | - | 59 | - |
| 269 | -#if defined(HAVE_MEMSET_EXPLICIT) | 60 | -#if defined(HAVE_MEMSET_EXPLICIT) |
| 270 | - memset_explicit(dest, destsz, ch, count); | 61 | - memset_explicit(dest, ch, count); |
| 271 | -#else /* HAVE_MEMSET_EXPLICIT */ | 62 | -#else /* HAVE_MEMSET_EXPLICIT */ |
| 272 | - memset(dest, ch, count); | 63 | - memset(dest, ch, count); |
| 273 | -# if defined(HAVE_GCC_VOLATILE_MEMORY_PROTECTION) | 64 | -# if defined(HAVE_GCC_VOLATILE_MEMORY_PROTECTION) |
diff --git a/meta-networking/recipes-connectivity/samba/samba/9aa5c43315d83c19514251a11c4fba5a137f2821.patch b/meta-networking/recipes-connectivity/samba/samba/9aa5c43315d83c19514251a11c4fba5a137f2821.patch deleted file mode 100644 index e07e86e887..0000000000 --- a/meta-networking/recipes-connectivity/samba/samba/9aa5c43315d83c19514251a11c4fba5a137f2821.patch +++ /dev/null | |||
| @@ -1,70 +0,0 @@ | |||
| 1 | From 9aa5c43315d83c19514251a11c4fba5a137f2821 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Andreas Schneider <asn@samba.org> | ||
| 3 | Date: Tue, 21 Jan 2025 17:59:27 +0100 | ||
| 4 | Subject: [PATCH] lib:replace: Don't use deprecated readline CPPFunction cast | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | HAVE_RL_COMPLETION_FUNC_T was unused and not checking for the right | ||
| 10 | function. | ||
| 11 | |||
| 12 | libcli/smbreadline/smbreadline.c: In function ‘smb_readline’: | ||
| 13 | libcli/smbreadline/smbreadline.c:139:17: warning: ‘CPPFunction’ is deprecated [-Wdeprecated-declarations] | ||
| 14 | 139 | rl_attempted_completion_function = RL_COMPLETION_CAST completion_fn; | ||
| 15 | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| 16 | libcli/smbreadline/smbreadline.c:139:50: error: assignment to ‘char ** (*)(const char *, int, int)’ from incompatible pointer type ‘char ** (*)(void)’ [-Wincompatible-pointer-types] | ||
| 17 | 139 | rl_attempted_completion_function = RL_COMPLETION_CAST completion_fn; | ||
| 18 | | ^ | ||
| 19 | |||
| 20 | BUG: https://bugzilla.samba.org/show_bug.cgi?id=15788 | ||
| 21 | |||
| 22 | Signed-off-by: Andreas Schneider <asn@samba.org> | ||
| 23 | Reviewed-by: Alexander Bokovoy <ab@samba.org> | ||
| 24 | |||
| 25 | Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org> | ||
| 26 | Autobuild-Date(master): Tue Jan 21 19:38:37 UTC 2025 on atb-devel-224 | ||
| 27 | |||
| 28 | Upstream-Status: Backport [https://github.com/samba-team/samba/commit/9aa5c43315d83c19514251a11c4fba5a137f2821] | ||
| 29 | |||
| 30 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
| 31 | --- | ||
| 32 | lib/replace/system/readline.h | 4 +++- | ||
| 33 | libcli/smbreadline/wscript_configure | 8 +++++--- | ||
| 34 | 2 files changed, 8 insertions(+), 4 deletions(-) | ||
| 35 | |||
| 36 | diff --git a/lib/replace/system/readline.h b/lib/replace/system/readline.h | ||
| 37 | index 9a9af266ca6d..ac3604fc12e0 100644 | ||
| 38 | --- a/lib/replace/system/readline.h | ||
| 39 | +++ b/lib/replace/system/readline.h | ||
| 40 | @@ -46,7 +46,9 @@ | ||
| 41 | #endif | ||
| 42 | |||
| 43 | #ifdef HAVE_NEW_LIBREADLINE | ||
| 44 | -#ifdef HAVE_CPPFUNCTION | ||
| 45 | +#if defined(HAVE_RL_COMPLETION_FUNC_T) | ||
| 46 | +# define RL_COMPLETION_CAST (rl_completion_func_t *) | ||
| 47 | +#elif defined(HAVE_CPPFUNCTION) | ||
| 48 | # define RL_COMPLETION_CAST (CPPFunction *) | ||
| 49 | #elif defined(HAVE_RL_COMPLETION_T) | ||
| 50 | # define RL_COMPLETION_CAST (rl_completion_t *) | ||
| 51 | diff --git a/libcli/smbreadline/wscript_configure b/libcli/smbreadline/wscript_configure | ||
| 52 | index 912ff53a150d..f5a401ebae00 100644 | ||
| 53 | --- a/libcli/smbreadline/wscript_configure | ||
| 54 | +++ b/libcli/smbreadline/wscript_configure | ||
| 55 | @@ -51,10 +51,12 @@ conf.CHECK_CODE(''' | ||
| 56 | # endif | ||
| 57 | # endif | ||
| 58 | #endif | ||
| 59 | -int main(void) {rl_completion_t f; return 0;} | ||
| 60 | +int main(void) {rl_completion_func_t f; return 0;} | ||
| 61 | ''', | ||
| 62 | -'HAVE_RL_COMPLETION_FUNC_T', execute=False, addmain=False, | ||
| 63 | -msg='Checking for rl_completion_t') | ||
| 64 | + 'HAVE_RL_COMPLETION_FUNC_T', | ||
| 65 | + execute=False, | ||
| 66 | + addmain=False, | ||
| 67 | + msg='Checking for rl_completion_func_t') | ||
| 68 | |||
| 69 | conf.CHECK_CODE(''' | ||
| 70 | #ifdef HAVE_READLINE_READLINE_H | ||
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.19.9.bb b/meta-networking/recipes-connectivity/samba/samba_4.23.5.bb index 3ed1d46754..ec3149562a 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.19.9.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.23.5.bb | |||
| @@ -14,6 +14,10 @@ ${SAMBA_MIRROR} http://www.mirrorservice.org/sites/ftp.samba.org \n \ | |||
| 14 | 14 | ||
| 15 | export PYTHONHASHSEED = "1" | 15 | export PYTHONHASHSEED = "1" |
| 16 | 16 | ||
| 17 | # If XML_CATALOG_FILES env var is not defined, waf defaults | ||
| 18 | # to build host folders looking for catalogs. | ||
| 19 | export XML_CATALOG_FILES = "" | ||
| 20 | |||
| 17 | SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ | 21 | SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ |
| 18 | file://smb.conf \ | 22 | file://smb.conf \ |
| 19 | file://volatiles.03_samba \ | 23 | file://volatiles.03_samba \ |
| @@ -24,7 +28,6 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ | |||
| 24 | file://0005-Fix-pyext_PATTERN-for-cross-compilation.patch \ | 28 | file://0005-Fix-pyext_PATTERN-for-cross-compilation.patch \ |
| 25 | file://0006-smbtorture-skip-test-case-tfork_cmd_send.patch \ | 29 | file://0006-smbtorture-skip-test-case-tfork_cmd_send.patch \ |
| 26 | file://0007-Deleted-settiong-of-python-to-fix-the-install-confli.patch \ | 30 | file://0007-Deleted-settiong-of-python-to-fix-the-install-confli.patch \ |
| 27 | file://9aa5c43315d83c19514251a11c4fba5a137f2821.patch \ | ||
| 28 | file://0001-lib-replace-Implement-memset_explicit.patch \ | 31 | file://0001-lib-replace-Implement-memset_explicit.patch \ |
| 29 | file://0002-lib-replace-Add-test-for-memset_explicit.patch \ | 32 | file://0002-lib-replace-Add-test-for-memset_explicit.patch \ |
| 30 | file://0003-Replace-memset_s-with-memset_explicit.patch \ | 33 | file://0003-Replace-memset_s-with-memset_explicit.patch \ |
| @@ -36,7 +39,7 @@ SRC_URI:append:libc-musl = " \ | |||
| 36 | file://samba-4.3.9-remove-getpwent_r.patch \ | 39 | file://samba-4.3.9-remove-getpwent_r.patch \ |
| 37 | " | 40 | " |
| 38 | 41 | ||
| 39 | SRC_URI[sha256sum] = "71ed406444714c90bb9d36c576d807b67af15449f297e91106d42b3ca2fa5549" | 42 | SRC_URI[sha256sum] = "593a43ddd0d57902237dfa76888f7b02cb7fc7747111369cb31e126db4836b9f" |
| 40 | 43 | ||
| 41 | UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.19(\.\d+)+).tar.gz" | 44 | UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.19(\.\d+)+).tar.gz" |
| 42 | 45 | ||
| @@ -47,7 +50,7 @@ CVE_STATUS[CVE-2011-2411] = "not-applicable-platform: vulnerable only on HP NonS | |||
| 47 | # remove default added RDEPENDS on perl | 50 | # remove default added RDEPENDS on perl |
| 48 | RDEPENDS:${PN}:remove = "perl" | 51 | RDEPENDS:${PN}:remove = "perl" |
| 49 | 52 | ||
| 50 | DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libaio libpam libtasn1 libtasn1-native jansson libparse-yapp-perl-native gnutls cmocka" | 53 | DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libaio libpam libtasn1 libtasn1-native jansson libparse-yapp-perl-native gnutls cmocka ngtcp2 bison-native" |
| 51 | 54 | ||
| 52 | inherit features_check | 55 | inherit features_check |
| 53 | REQUIRED_DISTRO_FEATURES = "pam" | 56 | REQUIRED_DISTRO_FEATURES = "pam" |
| @@ -62,7 +65,7 @@ INITSCRIPT_NAME = "samba" | |||
| 62 | INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ." | 65 | INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ." |
| 63 | 66 | ||
| 64 | SYSTEMD_PACKAGES = "${PN}-base ${PN}-ad-dc winbind ctdb" | 67 | SYSTEMD_PACKAGES = "${PN}-base ${PN}-ad-dc winbind ctdb" |
| 65 | SYSTEMD_SERVICE:${PN}-base = "nmb.service smb.service" | 68 | SYSTEMD_SERVICE:${PN}-base = "nmb.service smb.service samba-bgqd.service" |
| 66 | SYSTEMD_SERVICE:${PN}-ad-dc = "${@bb.utils.contains('PACKAGECONFIG', 'ad-dc', 'samba.service', '', d)}" | 69 | SYSTEMD_SERVICE:${PN}-ad-dc = "${@bb.utils.contains('PACKAGECONFIG', 'ad-dc', 'samba.service', '', d)}" |
| 67 | SYSTEMD_SERVICE:winbind = "winbind.service" | 70 | SYSTEMD_SERVICE:winbind = "winbind.service" |
| 68 | SYSTEMD_SERVICE:ctdb = "ctdb.service" | 71 | SYSTEMD_SERVICE:ctdb = "ctdb.service" |
| @@ -109,7 +112,7 @@ SAMBA4_MODULES = "${SAMBA4_IDMAP_MODULES},${SAMBA4_PDB_MODULES},${SAMBA4_AUTH_MO | |||
| 109 | # .so files so there will not be a conflict. This is not done consistantly, so be very careful | 112 | # .so files so there will not be a conflict. This is not done consistantly, so be very careful |
| 110 | # when adding to this list. | 113 | # when adding to this list. |
| 111 | # | 114 | # |
| 112 | SAMBA4_LIBS = "heimdal,NONE" | 115 | SAMBA4_LIBS = "heimdal,libquic,NONE" |
| 113 | 116 | ||
| 114 | EXTRA_OECONF += "--enable-fhs \ | 117 | EXTRA_OECONF += "--enable-fhs \ |
| 115 | --with-piddir=/run \ | 118 | --with-piddir=/run \ |
| @@ -132,6 +135,19 @@ EXTRA_OECONF += "--enable-fhs \ | |||
| 132 | 135 | ||
| 133 | LDFLAGS += "-Wl,-z,relro,-z,now" | 136 | LDFLAGS += "-Wl,-z,relro,-z,now" |
| 134 | 137 | ||
| 138 | do_configure:prepend() { | ||
| 139 | # The xsltproc tool is actually a wrapper script in OE, which exports its own XML_CATALOG_FILES env var | ||
| 140 | # However samba does that too. So here I'm trying to concatenate the variables. | ||
| 141 | # The original looks like this in the wrapper: | ||
| 142 | # export XML_CATALOG_FILES=oe-core-specific-thing | ||
| 143 | # and this sed prepends the value with $XML_CATALOG_FILES, and encloses it in quotes. So the end value is | ||
| 144 | # export XML_CATALOG_FILES="$XML_CATALOG FILES oe-core-specific-thing" | ||
| 145 | # The first grep just checks if it was already done, so it is not prepended multiple times. | ||
| 146 | |||
| 147 | grep \$XML_CATALOG_FILES ${STAGING_BINDIR_NATIVE}/xsltproc || \ | ||
| 148 | sed -i 's,\(XML_CATALOG_FILES\)=\(.*\),\1="\$XML_CATALOG_FILES \2",' ${STAGING_BINDIR_NATIVE}/xsltproc | ||
| 149 | } | ||
| 150 | |||
| 135 | do_configure:append() { | 151 | do_configure:append() { |
| 136 | cd ${S}/pidl/ | 152 | cd ${S}/pidl/ |
| 137 | perl Makefile.PL PREFIX=${prefix} | 153 | perl Makefile.PL PREFIX=${prefix} |
| @@ -213,6 +229,9 @@ do_install:append() { | |||
| 213 | find ${D}${libdir}/perl5/ -type f -name "perllocal.pod" -delete | 229 | find ${D}${libdir}/perl5/ -type f -name "perllocal.pod" -delete |
| 214 | find ${D}${libdir}/perl5/ -type f -name ".packlist" -delete | 230 | find ${D}${libdir}/perl5/ -type f -name ".packlist" -delete |
| 215 | sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${bindir}/pidl | 231 | sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${bindir}/pidl |
| 232 | |||
| 233 | sed -i 's,${UNPACKDIR},,g' ${S}/bin/default/libcli/wsp/wsp_aqs_lexer.c | ||
| 234 | sed -i 's,${UNPACKDIR},,g' ${S}/bin/default/libcli/wsp/wsp_aqs_lexer.h | ||
| 216 | } | 235 | } |
| 217 | 236 | ||
| 218 | PACKAGES =+ "${PN}-python3 ${PN}-pidl \ | 237 | PACKAGES =+ "${PN}-python3 ${PN}-pidl \ |
| @@ -245,7 +264,7 @@ PACKAGESPLITFUNCS:prepend = "samba_populate_packages " | |||
| 245 | PACKAGES_DYNAMIC = "samba-auth-.* samba-pdb-.*" | 264 | PACKAGES_DYNAMIC = "samba-auth-.* samba-pdb-.*" |
| 246 | 265 | ||
| 247 | RDEPENDS:${PN} += "${PN}-base ${PN}-python3 ${PN}-dsdb-modules python3" | 266 | RDEPENDS:${PN} += "${PN}-base ${PN}-python3 ${PN}-dsdb-modules python3" |
| 248 | RDEPENDS:${PN}-python3 += "pytalloc python3-tdb pyldb" | 267 | RDEPENDS:${PN}-python3 += "pytalloc python3-tdb" |
| 249 | 268 | ||
| 250 | FILES:${PN}-base = "${sbindir}/nmbd \ | 269 | FILES:${PN}-base = "${sbindir}/nmbd \ |
| 251 | ${sbindir}/smbd \ | 270 | ${sbindir}/smbd \ |
diff --git a/meta-networking/recipes-connectivity/tailscale/tailscale-go-mods.inc b/meta-networking/recipes-connectivity/tailscale/tailscale-go-mods.inc index 3cfea84a55..7e2e91bb56 100644 --- a/meta-networking/recipes-connectivity/tailscale/tailscale-go-mods.inc +++ b/meta-networking/recipes-connectivity/tailscale/tailscale-go-mods.inc | |||
| @@ -1,43 +1,54 @@ | |||
| 1 | SRC_URI += " \ | 1 | |
| 2 | gomod://filippo.io/edwards25519;version=v1.1.0;sha256sum=9ac43a686d06fdebd719f7af3866c87eb069302272dfb131007adf471c308b65 \ | 2 | # This file has been generated by go-mod-update-modules.bbclass |
| 3 | # | ||
| 4 | # Do not modify it by hand, as the contents will be replaced when | ||
| 5 | # running the update-modules task. | ||
| 6 | |||
| 7 | SRC_URI += "\ | ||
| 8 | gomod://filippo.io/edwards25519;version=v1.2.0;sha256sum=98f2d3ca9b88daa031b0fb2fb521b7ea386af1fed61b6f445a20bef7fa381c17 \ | ||
| 9 | gomod://fyne.io/systray;version=v1.11.1-0.20250812065214-4856ac3adc3c;sha256sum=7782bef2e30904a5e34477f713a4c598b1ddf3b3a70deead056549ad22248311 \ | ||
| 10 | gomod://github.com/Kodeworks/golang-image-ico;version=v0.0.0-20141118225523-73f0f4cfade9;sha256sum=1d677069e35c4a3e4f290e68c6e2391f6237aee9ce3f39448ed09a2ddab274b0 \ | ||
| 3 | gomod://github.com/anmitsu/go-shlex;version=v0.0.0-20200514113438-38f4b401e2be;sha256sum=2a5cf7c9a2709f649fd508cbacb2be96e4fba4d534a28a122ee4d7574af40b5e \ | 11 | gomod://github.com/anmitsu/go-shlex;version=v0.0.0-20200514113438-38f4b401e2be;sha256sum=2a5cf7c9a2709f649fd508cbacb2be96e4fba4d534a28a122ee4d7574af40b5e \ |
| 4 | gomod://github.com/aws/aws-sdk-go-v2;version=v1.36.0;sha256sum=ec276e274bbe39c35d3c2c8c1ec5cba494d6449cd8166d741676cdf0a9d1697b \ | 12 | gomod://github.com/atotto/clipboard;version=v0.1.4;sha256sum=d67b2c36c662751309fd2ec351df3651584bea840bd27be9a90702c3a238b43f \ |
| 13 | gomod://github.com/aws/aws-sdk-go-v2;version=v1.41.0;sha256sum=869834493118f72f9349f5493959bcd8fc951fa236eecd0095c16322f5b2f53c \ | ||
| 5 | gomod://github.com/aws/aws-sdk-go-v2/config;version=v1.29.5;sha256sum=ce165d37c7b1dfee2047137f1176c197dc397a5553ef6fc0dba799b21908475b \ | 14 | gomod://github.com/aws/aws-sdk-go-v2/config;version=v1.29.5;sha256sum=ce165d37c7b1dfee2047137f1176c197dc397a5553ef6fc0dba799b21908475b \ |
| 6 | gomod://github.com/aws/aws-sdk-go-v2/credentials;version=v1.17.58;sha256sum=238cc4a98dde7bc3e94dc0f0005c4d988a244daaa9fe4fda706a781ec62bf7e2 \ | 15 | gomod://github.com/aws/aws-sdk-go-v2/credentials;version=v1.17.58;sha256sum=238cc4a98dde7bc3e94dc0f0005c4d988a244daaa9fe4fda706a781ec62bf7e2 \ |
| 7 | gomod://github.com/aws/aws-sdk-go-v2/feature/ec2/imds;version=v1.16.27;sha256sum=408958244a10036461c3a3b27fcdaf20efa3af19168bd527b6617319a754309c \ | 16 | gomod://github.com/aws/aws-sdk-go-v2/feature/ec2/imds;version=v1.16.27;sha256sum=408958244a10036461c3a3b27fcdaf20efa3af19168bd527b6617319a754309c \ |
| 8 | gomod://github.com/aws/aws-sdk-go-v2/internal/configsources;version=v1.3.31;sha256sum=7929b44beec37b00c9ee5269b0f109d7ccc2bb26a8528ab14e0f172076a41205 \ | 17 | gomod://github.com/aws/aws-sdk-go-v2/internal/configsources;version=v1.4.16;sha256sum=5bd82543507e01fab6a9344a995a431682f4061770b25005f9116f43ae539ac4 \ |
| 9 | gomod://github.com/aws/aws-sdk-go-v2/internal/endpoints/v2;version=v2.6.31;sha256sum=6ae31e302c828ecf80310e85059c49ce44668b8c62aa52fa964b0d745a6f62b1 \ | 18 | gomod://github.com/aws/aws-sdk-go-v2/internal/endpoints/v2;version=v2.7.16;sha256sum=0a4cc94f6843c9c50a1839783123b4664a07d5a67d8a49157304f8550c0c2e39 \ |
| 10 | gomod://github.com/aws/aws-sdk-go-v2/internal/ini;version=v1.8.2;sha256sum=53d1a9a401283711118c91e6e9fdb8193ce6430ca4bbe6b5454bcaaa51e81de0 \ | 19 | gomod://github.com/aws/aws-sdk-go-v2/internal/ini;version=v1.8.2;sha256sum=53d1a9a401283711118c91e6e9fdb8193ce6430ca4bbe6b5454bcaaa51e81de0 \ |
| 11 | gomod://github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding;version=v1.12.2;sha256sum=6ab252b3b962a6b34f0107583f6ff8e4a68e02dcd8df9573e895e5ca60ff139c \ | 20 | gomod://github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding;version=v1.13.4;sha256sum=e9b9e131812d339f4ac2b20bb504caf1cde680e048e15688bd8126ecd300e5e2 \ |
| 12 | gomod://github.com/aws/aws-sdk-go-v2/service/internal/presigned-url;version=v1.12.12;sha256sum=a92f4383630fa976eeb484b051a6224a8d1d277c4b3ca93a40cce57d06cbbec2 \ | 21 | gomod://github.com/aws/aws-sdk-go-v2/service/internal/presigned-url;version=v1.13.16;sha256sum=1ba321f470ad6ce8673c303386f15136b8fa2f86b23e6a181dbf5c74cb84ef7b \ |
| 13 | gomod://github.com/aws/aws-sdk-go-v2/service/ssm;version=v1.44.7;sha256sum=e09b97aa37ffd7c003a8a2e7574668e92eabd267d2a78d22fb440bcd93a61e46 \ | 22 | gomod://github.com/aws/aws-sdk-go-v2/service/ssm;version=v1.44.7;sha256sum=e09b97aa37ffd7c003a8a2e7574668e92eabd267d2a78d22fb440bcd93a61e46 \ |
| 14 | gomod://github.com/aws/aws-sdk-go-v2/service/sso;version=v1.24.14;sha256sum=9196a430068584c9d1e621aff0a45b32adaf190b4363dddda8b341901e188f51 \ | 23 | gomod://github.com/aws/aws-sdk-go-v2/service/sso;version=v1.24.14;sha256sum=9196a430068584c9d1e621aff0a45b32adaf190b4363dddda8b341901e188f51 \ |
| 15 | gomod://github.com/aws/aws-sdk-go-v2/service/ssooidc;version=v1.28.13;sha256sum=acaeca3476410d64512a4d9feefd6c8d16effa76718f72db4ba7b786c7fcc398 \ | 24 | gomod://github.com/aws/aws-sdk-go-v2/service/ssooidc;version=v1.28.13;sha256sum=acaeca3476410d64512a4d9feefd6c8d16effa76718f72db4ba7b786c7fcc398 \ |
| 16 | gomod://github.com/aws/aws-sdk-go-v2/service/sts;version=v1.33.13;sha256sum=1800e76ad35287ca7067374b7489ebd7f1d25426c93ae9e40fd73e2a78f29e75 \ | 25 | gomod://github.com/aws/aws-sdk-go-v2/service/sts;version=v1.41.5;sha256sum=de6f3748c40c13e10b790a7c02023aa559b153c251856e3b3940ee47cc0bc007 \ |
| 17 | gomod://github.com/aws/smithy-go;version=v1.22.2;sha256sum=e5701b5798a3ff01b7139ec07e5bc2010f76cab82523e8989602003d61d82324 \ | 26 | gomod://github.com/aws/smithy-go;version=v1.24.0;sha256sum=655a1e00489bcf29a94cf26878c2f0b3b74c8bfb5d3c566baa3b94e088fbf417 \ |
| 18 | gomod://github.com/coder/websocket;version=v1.8.12;sha256sum=ad8d323970c04679f4566ee7db98946508c37cdd21a46a875d5257d631a9e990 \ | 27 | gomod://github.com/coder/websocket;version=v1.8.12;sha256sum=ad8d323970c04679f4566ee7db98946508c37cdd21a46a875d5257d631a9e990 \ |
| 19 | gomod://github.com/coreos/go-iptables;version=v0.7.1-0.20240112124308-65c67c9f46e6;sha256sum=6d0ae6344f1d355f72e6aaba583ce73822861511337ca92cc1c4727fc8ba66dd \ | 28 | gomod://github.com/coreos/go-iptables;version=v0.7.1-0.20240112124308-65c67c9f46e6;sha256sum=6d0ae6344f1d355f72e6aaba583ce73822861511337ca92cc1c4727fc8ba66dd \ |
| 20 | gomod://github.com/creack/pty;version=v1.1.23;sha256sum=2151b7121020954864de83eacf854634866cca0a3bfe33a2ebffa2edebc25df3 \ | 29 | gomod://github.com/creachadair/msync;version=v0.7.1;sha256sum=ee8dd1d2cc8a1e555fcfaecc7407425216ee87cd4414093d9a3d8d50fc622e5d \ |
| 30 | gomod://github.com/creack/pty;version=v1.1.24;sha256sum=754e25253e76a5583b80d57d3add3afe68fc4d9f2a490968a9d1eda8c8fd8815 \ | ||
| 21 | gomod://github.com/digitalocean/go-smbios;version=v0.0.0-20180907143718-390a4f403a8e;sha256sum=2bc498a09aa55b3417bebacce448b2d2ab757981e59b6b016d08cf97e4a7bdde \ | 31 | gomod://github.com/digitalocean/go-smbios;version=v0.0.0-20180907143718-390a4f403a8e;sha256sum=2bc498a09aa55b3417bebacce448b2d2ab757981e59b6b016d08cf97e4a7bdde \ |
| 22 | gomod://github.com/djherbis/times;version=v1.6.0;sha256sum=21d69060967bc03ea3c39ff8c0b1a95511e96eccd3749a2daef1a02af1bc0a85 \ | 32 | gomod://github.com/djherbis/times;version=v1.6.0;sha256sum=21d69060967bc03ea3c39ff8c0b1a95511e96eccd3749a2daef1a02af1bc0a85 \ |
| 23 | gomod://github.com/fxamacker/cbor/v2;version=v2.7.0;sha256sum=b48771460405bab6896c85e21ebc5ff287d4018c6db5c8d822c55769c80dde03 \ | 33 | gomod://github.com/fogleman/gg;version=v1.3.0;sha256sum=792f7a3ea9eea31b7947dabaf9d5a307389245069078e4bf435d76cb0505439c \ |
| 24 | gomod://github.com/gaissmai/bart;version=v0.18.0;sha256sum=566f2401988b2536055d87f6851ea596518377ee4592176375b84a5ca791fc77 \ | 34 | gomod://github.com/fxamacker/cbor/v2;version=v2.9.0;sha256sum=5b0ec6424bd522aeeeab30cbdcad6f40bf976a9a2ddf125ab27b97826140d97a \ |
| 25 | gomod://github.com/go-json-experiment/json;version=v0.0.0-20250223041408-d3c622f1b874;sha256sum=96edf3942a5665ff2b27f0da4586e2602fe4816dc31e184d3bcd6fbf4cdb13e4 \ | 35 | gomod://github.com/gaissmai/bart;version=v0.26.1;sha256sum=7cead7fb3f4be36f3864efaf1344d72ca7ba03ab5a557338c80ca6d4bda59cca \ |
| 36 | gomod://github.com/go-json-experiment/json;version=v0.0.0-20250813024750-ebf49471dced;sha256sum=e20ad9cf462e43db906cd2dc237061d6a5b575d10bd4ece52f1857b15a107006 \ | ||
| 26 | gomod://github.com/godbus/dbus/v5;version=v5.1.1-0.20230522191255-76236955d466;sha256sum=262f43ec87570238a0e770e7fa656dda70fe6050a7edf5addc30287cb64b21a6 \ | 37 | gomod://github.com/godbus/dbus/v5;version=v5.1.1-0.20230522191255-76236955d466;sha256sum=262f43ec87570238a0e770e7fa656dda70fe6050a7edf5addc30287cb64b21a6 \ |
| 27 | gomod://github.com/golang/groupcache;version=v0.0.0-20210331224755-41bb18bfe9da;sha256sum=b27034e8fc013627543e1ad098cfc65329f2896df3da5cf3266cc9166f93f3a5 \ | 38 | gomod://github.com/golang/freetype;version=v0.0.0-20170609003504-e2365dfdc4a0;sha256sum=cdcb9e6a14933dcbf167b44dcd5083fc6a2e52c4fae8fb79747c691efeb7d84e \ |
| 28 | gomod://github.com/google/btree;version=v1.1.2;sha256sum=faee8550c5fffb4ae1dadde5ccaccb13298726f9fad226bb4eed0c03c90a481d \ | 39 | gomod://github.com/golang/groupcache;version=v0.0.0-20241129210726-2c02b8208cf8;sha256sum=163367355442a630b12b0b452892cd98e99fcfdf7e40b68d358be73479cc1c23 \ |
| 40 | gomod://github.com/google/btree;version=v1.1.3;sha256sum=11b736bc8252b52fecdf346d3707ccf3a2b6d458ba21b4f843616fc12eeb30b2 \ | ||
| 29 | gomod://github.com/google/go-tpm;version=v0.9.4;sha256sum=a8a5e504fbd78284a50e6ab625f6248cfbb89421fafdfee71d66abc6e1dfc192 \ | 41 | gomod://github.com/google/go-tpm;version=v0.9.4;sha256sum=a8a5e504fbd78284a50e6ab625f6248cfbb89421fafdfee71d66abc6e1dfc192 \ |
| 30 | gomod://github.com/google/nftables;version=v0.2.1-0.20240414091927-5e242ec57806;sha256sum=ceb96b39a6f9004d8c217a6ae61b91a69c250bc30fbf3a04cd87cbbfddea73c8 \ | 42 | gomod://github.com/google/nftables;version=v0.2.1-0.20240414091927-5e242ec57806;sha256sum=ceb96b39a6f9004d8c217a6ae61b91a69c250bc30fbf3a04cd87cbbfddea73c8 \ |
| 31 | gomod://github.com/gorilla/csrf;version=v1.7.3;sha256sum=39923b0dde0b8be30d3572589a8cc2ea515ca36a3e542269645db36aff7d6842 \ | ||
| 32 | gomod://github.com/gorilla/securecookie;version=v1.1.2;sha256sum=fd7c0de7000c2e6a123d73e1249e1dce892ba29d2d03b00dc81d5fcee41d5895 \ | ||
| 33 | gomod://github.com/hdevalence/ed25519consensus;version=v0.2.0;sha256sum=111cafade3ba9c7c3adf66b6a424386e30829c46c60b80dabe288e1837d30e33 \ | 43 | gomod://github.com/hdevalence/ed25519consensus;version=v0.2.0;sha256sum=111cafade3ba9c7c3adf66b6a424386e30829c46c60b80dabe288e1837d30e33 \ |
| 44 | gomod://github.com/huin/goupnp;version=v1.3.0;sha256sum=df663b90b9b3bf16e1cfa810a6c3dd904993e8c1155dbf65566ce0361f163dce \ | ||
| 34 | gomod://github.com/illarion/gonotify/v3;version=v3.0.2;sha256sum=fef3e17f676c8ce98b60f0e2180fc4e3331e6e1604eaf96ab8791e073f96a7af \ | 45 | gomod://github.com/illarion/gonotify/v3;version=v3.0.2;sha256sum=fef3e17f676c8ce98b60f0e2180fc4e3331e6e1604eaf96ab8791e073f96a7af \ |
| 35 | gomod://github.com/insomniacslk/dhcp;version=v0.0.0-20231206064809-8c70d406f6d2;sha256sum=be28971fb642a9c4cf9f16e07332310af05c291584b6440b32849ca058dd345d \ | 46 | gomod://github.com/insomniacslk/dhcp;version=v0.0.0-20231206064809-8c70d406f6d2;sha256sum=be28971fb642a9c4cf9f16e07332310af05c291584b6440b32849ca058dd345d \ |
| 36 | gomod://github.com/jellydator/ttlcache/v3;version=v3.1.0;sha256sum=278dfc9b4882eaeb9b56e925b574028f3e9cc4436645b93f56ccb69de134a898 \ | 47 | gomod://github.com/jellydator/ttlcache/v3;version=v3.1.0;sha256sum=278dfc9b4882eaeb9b56e925b574028f3e9cc4436645b93f56ccb69de134a898 \ |
| 37 | gomod://github.com/jmespath/go-jmespath;version=v0.4.0;sha256sum=d1f77b6790d7c4321a74260f3675683d3ac06b0a614b5f83e870beae0a8b2867 \ | 48 | gomod://github.com/jmespath/go-jmespath;version=v0.4.0;sha256sum=d1f77b6790d7c4321a74260f3675683d3ac06b0a614b5f83e870beae0a8b2867 \ |
| 38 | gomod://github.com/jsimonetti/rtnetlink;version=v1.4.0;sha256sum=81625291f4d0a08718dfd2170873d1adfd8fc2248657584f520c4de6de9e2e4d \ | 49 | gomod://github.com/jsimonetti/rtnetlink;version=v1.4.0;sha256sum=81625291f4d0a08718dfd2170873d1adfd8fc2248657584f520c4de6de9e2e4d \ |
| 39 | gomod://github.com/kballard/go-shellquote;version=v0.0.0-20180428030007-95032a82bc51;sha256sum=ae4cb7b097dc4eb0c248dff00ed3bbf0f36984c4162ad1d615266084e58bd6cc \ | 50 | gomod://github.com/kballard/go-shellquote;version=v0.0.0-20180428030007-95032a82bc51;sha256sum=ae4cb7b097dc4eb0c248dff00ed3bbf0f36984c4162ad1d615266084e58bd6cc \ |
| 40 | gomod://github.com/klauspost/compress;version=v1.17.11;sha256sum=88dea800cc6a11ccb9dd2f0dd487f30e8701870abdfc11245e41dcfc9f3d428e \ | 51 | gomod://github.com/klauspost/compress;version=v1.18.5;sha256sum=e1fdde95d97978146243f1e793ce18a09b107d6cd6032347fcb5b9115181497d \ |
| 41 | gomod://github.com/kortschak/wol;version=v0.0.0-20200729010619-da482cc4850a;sha256sum=09c15500a0ef54af0796f37282dd5377d2b866e4c36c87dcb6b2894cf3114dc5 \ | 52 | gomod://github.com/kortschak/wol;version=v0.0.0-20200729010619-da482cc4850a;sha256sum=09c15500a0ef54af0796f37282dd5377d2b866e4c36c87dcb6b2894cf3114dc5 \ |
| 42 | gomod://github.com/kr/fs;version=v0.1.0;sha256sum=d376bd98e81aea34585fc3b04bab76363e9e87cde69383964e57e9779f2af81e \ | 53 | gomod://github.com/kr/fs;version=v0.1.0;sha256sum=d376bd98e81aea34585fc3b04bab76363e9e87cde69383964e57e9779f2af81e \ |
| 43 | gomod://github.com/mattn/go-colorable;version=v0.1.13;sha256sum=08be322dcc584a9fcfde5caf0cf878b4e11cd98f252e32bc704e92c5a4ba9d15 \ | 54 | gomod://github.com/mattn/go-colorable;version=v0.1.13;sha256sum=08be322dcc584a9fcfde5caf0cf878b4e11cd98f252e32bc704e92c5a4ba9d15 \ |
| @@ -46,38 +57,40 @@ SRC_URI += " \ | |||
| 46 | gomod://github.com/mdlayher/netlink;version=v1.7.3-0.20250113171957-fbb4dce95f42;sha256sum=b427c8c746e87c2f8033678fb87cdcf5cefb21ce16f35930eff91683661395f0 \ | 57 | gomod://github.com/mdlayher/netlink;version=v1.7.3-0.20250113171957-fbb4dce95f42;sha256sum=b427c8c746e87c2f8033678fb87cdcf5cefb21ce16f35930eff91683661395f0 \ |
| 47 | gomod://github.com/mdlayher/sdnotify;version=v1.0.0;sha256sum=26f4efbcba73eaec323973c8ae335bad430e5d6947097976cfbe7c9547f68c90 \ | 58 | gomod://github.com/mdlayher/sdnotify;version=v1.0.0;sha256sum=26f4efbcba73eaec323973c8ae335bad430e5d6947097976cfbe7c9547f68c90 \ |
| 48 | gomod://github.com/mdlayher/socket;version=v0.5.0;sha256sum=931626341956178fe6015b128fdda22283480d05dc964675307eb61ed39c29fe \ | 59 | gomod://github.com/mdlayher/socket;version=v0.5.0;sha256sum=931626341956178fe6015b128fdda22283480d05dc964675307eb61ed39c29fe \ |
| 49 | gomod://github.com/miekg/dns;version=v1.1.58;sha256sum=179bd419d011fd90802355756f59fff70ddf9a5886a4db6336a6d05783552b16 \ | ||
| 50 | gomod://github.com/mitchellh/go-ps;version=v1.0.0;sha256sum=f2f0400b1d5e136419daed275c27a930b0f5447ac12bb8acd3ddbe39547b2834 \ | 60 | gomod://github.com/mitchellh/go-ps;version=v1.0.0;sha256sum=f2f0400b1d5e136419daed275c27a930b0f5447ac12bb8acd3ddbe39547b2834 \ |
| 51 | gomod://github.com/peterbourgon/ff/v3;version=v3.4.0;sha256sum=b49537268ce67eb755d773fdd2a3e1c9c6dec0731993a4f742080416eb9b12a6 \ | 61 | gomod://github.com/peterbourgon/ff/v3;version=v3.4.0;sha256sum=b49537268ce67eb755d773fdd2a3e1c9c6dec0731993a4f742080416eb9b12a6 \ |
| 52 | gomod://github.com/pierrec/lz4/v4;version=v4.1.21;sha256sum=bd2e8ef13800ca42205b0d4085a927a6d012b82cfa831769be4830036e953bec \ | 62 | gomod://github.com/pierrec/lz4/v4;version=v4.1.25;sha256sum=f8a08e363b7ac3835d6785281e7b26bee4928dade20b2750286397180e5c7a75 \ |
| 63 | gomod://github.com/pires/go-proxyproto;version=v0.8.1;sha256sum=a979a2f26160bfcb6f3829dd546d5f53c8b1879e7ad84466e359cf3f6237aa4c \ | ||
| 53 | gomod://github.com/pkg/sftp;version=v1.13.6;sha256sum=0cdf6bd0edef9db8137ce398c9bbe514713e42cf2d4d415b5025f4a3c33f249d \ | 64 | gomod://github.com/pkg/sftp;version=v1.13.6;sha256sum=0cdf6bd0edef9db8137ce398c9bbe514713e42cf2d4d415b5025f4a3c33f249d \ |
| 54 | gomod://github.com/safchain/ethtool;version=v0.3.0;sha256sum=bfa1a3fe314a3f2ac4c4385a6c4694708e4881bfd86c34668eca92656e398590 \ | 65 | gomod://github.com/safchain/ethtool;version=v0.3.0;sha256sum=bfa1a3fe314a3f2ac4c4385a6c4694708e4881bfd86c34668eca92656e398590 \ |
| 55 | gomod://github.com/skip2/go-qrcode;version=v0.0.0-20200617195104-da1b6568686e;sha256sum=3fc1c4d11c79001d1cc2df0de87493b324b9af141cc59ae8c212612dd2c90e90 \ | 66 | gomod://github.com/skip2/go-qrcode;version=v0.0.0-20200617195104-da1b6568686e;sha256sum=3fc1c4d11c79001d1cc2df0de87493b324b9af141cc59ae8c212612dd2c90e90 \ |
| 56 | gomod://github.com/tailscale/goupnp;version=v1.0.1-0.20210804011211-c64d0f06ea05;sha256sum=1c7ed6ecc16b6f402c225bae88a067a8bc1574cded894638b820c5da751823cc \ | 67 | gomod://github.com/tailscale/gliderssh;version=v0.3.4-0.20260330083525-c1389c70ff89;sha256sum=b80328e5c37bd7f6f8a3c304d8938ade18e12b035b753cd50db265147814befd \ |
| 57 | gomod://github.com/tailscale/hujson;version=v0.0.0-20221223112325-20486734a56a;sha256sum=8e65bacebfc0a1edc067fd97f839fcfeb93c1e7b8cc0186d1773cff4e125d9d5 \ | 68 | gomod://github.com/tailscale/hujson;version=v0.0.0-20260302212456-ecc657c15afd;sha256sum=9f9c320dd90c86880b26107b931d6c056e99642d4c4e50fafcdf7de8ea0989e6 \ |
| 58 | gomod://github.com/tailscale/netlink;version=v1.1.1-0.20240822203006-4d49adab4de7;sha256sum=a5195ef600f8d9a0fb8501eea85e4fe0321a74bd57dec88f07b8569d0ee4f55e \ | 69 | gomod://github.com/tailscale/netlink;version=v1.1.1-0.20240822203006-4d49adab4de7;sha256sum=a5195ef600f8d9a0fb8501eea85e4fe0321a74bd57dec88f07b8569d0ee4f55e \ |
| 59 | gomod://github.com/tailscale/peercred;version=v0.0.0-20250107143737-35a0c7bd7edc;sha256sum=87d0f4f3b1d59ea45c9a87b775b615bebd721a5870dafedc63cc860ec4aac281 \ | 70 | gomod://github.com/tailscale/peercred;version=v0.0.0-20250107143737-35a0c7bd7edc;sha256sum=87d0f4f3b1d59ea45c9a87b775b615bebd721a5870dafedc63cc860ec4aac281 \ |
| 60 | gomod://github.com/tailscale/web-client-prebuilt;version=v0.0.0-20250124233751-d4cd19a26976;sha256sum=1d02f0804bb41e0743b7d889b8e2dbd8466a89793f03997f4c1fd10f9e8974c3 \ | 71 | gomod://github.com/tailscale/web-client-prebuilt;version=v0.0.0-20250124233751-d4cd19a26976;sha256sum=1d02f0804bb41e0743b7d889b8e2dbd8466a89793f03997f4c1fd10f9e8974c3 \ |
| 61 | gomod://github.com/tailscale/wireguard-go;version=v0.0.0-20250304000100-91a0587fb251;sha256sum=7b82eb990f2f3686d335cdff5e988f8d4e27e031d563fb0e37bce1a3b0c5a83f \ | 72 | gomod://github.com/tailscale/wireguard-go;version=v0.0.0-20260427181203-e3ac4a0afb4e;sha256sum=2b648406d9e57b06178836db6b2e3e9a7c5e25fefe256978a11d91d34a4a5581 \ |
| 62 | gomod://github.com/tailscale/xnet;version=v0.0.0-20240729143630-8497ac4dab2e;sha256sum=438abf28ce5fb03adf529c2cb57a451f9b243c4a2a181d9d06cdb61bb10960e7 \ | 73 | gomod://github.com/tailscale/xnet;version=v0.0.0-20240729143630-8497ac4dab2e;sha256sum=438abf28ce5fb03adf529c2cb57a451f9b243c4a2a181d9d06cdb61bb10960e7 \ |
| 63 | gomod://github.com/toqueteos/webbrowser;version=v1.2.0;sha256sum=1227d3ebeab16d8232a304a10b087984a96ad30f7439b6687bab2f5747d308cf \ | 74 | gomod://github.com/toqueteos/webbrowser;version=v1.2.0;sha256sum=1227d3ebeab16d8232a304a10b087984a96ad30f7439b6687bab2f5747d308cf \ |
| 64 | gomod://github.com/u-root/u-root;version=v0.14.0;sha256sum=a65c0a06236b10a0cea50e603fef0ced0c7e343a66ef957a45ebcd51f304d286 \ | 75 | gomod://github.com/u-root/u-root;version=v0.14.0;sha256sum=a65c0a06236b10a0cea50e603fef0ced0c7e343a66ef957a45ebcd51f304d286 \ |
| 65 | gomod://github.com/u-root/uio;version=v0.0.0-20240224005618-d2acac8f3701;sha256sum=f6e8f912e968744999d508c3df54f0308aaf337052a8d0bd3edd72583adfd9cd \ | 76 | gomod://github.com/u-root/uio;version=v0.0.0-20240224005618-d2acac8f3701;sha256sum=f6e8f912e968744999d508c3df54f0308aaf337052a8d0bd3edd72583adfd9cd \ |
| 66 | gomod://github.com/vishvananda/netns;version=v0.0.4;sha256sum=cdaebcd80614800a74537e59855730d42393ffc109ebd47e5b8437dcc4d7f429 \ | 77 | gomod://github.com/vishvananda/netns;version=v0.0.5;sha256sum=07804b88c922c2a6780efe392ffef9d126eac584384eb3eb17bcadd34cfa9422 \ |
| 67 | gomod://github.com/x448/float16;version=v0.8.4;sha256sum=73b24a41037ea999ab66851e3798a0973dbb1f214925915b01f0820f7b2f1500 \ | 78 | gomod://github.com/x448/float16;version=v0.8.4;sha256sum=73b24a41037ea999ab66851e3798a0973dbb1f214925915b01f0820f7b2f1500 \ |
| 79 | gomod://go.yaml.in/yaml/v2;version=v2.4.2;sha256sum=ed63e181cbb5a991c104639b0e6d48d45fd951f22b47d4c5d1a36156d8ed06ee \ | ||
| 68 | gomod://go4.org/mem;version=v0.0.0-20240501181205-ae6ca9944745;sha256sum=9b5037a57122457fdc5c2c0a31e3996b44cf9dfcdee5c53ed72adfd88d077795 \ | 80 | gomod://go4.org/mem;version=v0.0.0-20240501181205-ae6ca9944745;sha256sum=9b5037a57122457fdc5c2c0a31e3996b44cf9dfcdee5c53ed72adfd88d077795 \ |
| 69 | gomod://go4.org/netipx;version=v0.0.0-20231129151722-fdeea329fbba;sha256sum=e15f57de368c92b826010181906f26112ba3a0d7fde7d94c8a8c60c525dc4044 \ | 81 | gomod://go4.org/netipx;version=v0.0.0-20231129151722-fdeea329fbba;sha256sum=e15f57de368c92b826010181906f26112ba3a0d7fde7d94c8a8c60c525dc4044 \ |
| 70 | gomod://golang.org/x/crypto;version=v0.37.0;sha256sum=7ce6b2be21be1ce9e04dc784830e08931f09b5903596b8017839322c9e828667 \ | 82 | gomod://golang.org/x/crypto;version=v0.50.0;sha256sum=aaf9503dd088d2727e08f213d23424ebc75a52ee609f084ec4c726f3590c0ea5 \ |
| 71 | gomod://golang.org/x/exp;version=v0.0.0-20250210185358-939b2ce775ac;sha256sum=de413a97994a7b97541cb1f867439fa20b60361d79dc35e8e2faf847a2a188df \ | 83 | gomod://golang.org/x/exp;version=v0.0.0-20250620022241-b7579e27df2b;sha256sum=fdaae8f1b98727b49d10228492b2dee1b8c68d12f640a4f17f0fb175581bf547 \ |
| 72 | gomod://golang.org/x/net;version=v0.36.0;sha256sum=e823a351657b349cd8a705079778769534d90a5c3a6c7caed174a79608257d12 \ | 84 | gomod://golang.org/x/image;version=v0.27.0;sha256sum=db4846c8edb8cdcb556d205840361f62382df9bd5946b756e700c5fb43d90332 \ |
| 73 | gomod://golang.org/x/oauth2;version=v0.26.0;sha256sum=d4c1bfc661b8ff3ccb3d5d30babf5f67798b59e2bfa932b6f1f739e67e45dcda \ | 85 | gomod://golang.org/x/net;version=v0.53.0;sha256sum=3808b07d64ba58f58ca91737f0a165439f72b03a512ea901bad2aa1e168092d5 \ |
| 74 | gomod://golang.org/x/sync;version=v0.13.0;sha256sum=4bdaaffe69cc7c997cff97cd81dc9c6777777bd311175f100f76b049bbbe7ed9 \ | 86 | gomod://golang.org/x/oauth2;version=v0.36.0;sha256sum=15bf65ff103e5dafc809d78cd037a1d1e88ccb8451824e851156002a13304504 \ |
| 75 | gomod://golang.org/x/sys;version=v0.32.0;sha256sum=85d47075d21fd7ef35d9a47fc73f2356fb3cd2e7fab7f45c874b814bf312127d \ | 87 | gomod://golang.org/x/sync;version=v0.20.0;sha256sum=7179d4d68800f6fdcadb9d4bbf11cbb5df9b40360c89305c203fe20723cbd375 \ |
| 76 | gomod://golang.org/x/term;version=v0.31.0;sha256sum=bdeda753791b44f6815ccf3367ff57ffaca9bb100bfe8ebe112c8da133e78aec \ | 88 | gomod://golang.org/x/sys;version=v0.43.0;sha256sum=cb8b073934cf7e579c9f80c4d12619d5f96fcf97af6f07fdc649e7acec0aaddf \ |
| 77 | gomod://golang.org/x/text;version=v0.24.0;sha256sum=f585335a57a6fa5fa0c0bf319b45f0909e5ff1aba91e8567187ba8e423084c00 \ | 89 | gomod://golang.org/x/term;version=v0.42.0;sha256sum=c69cf2bf68d1d73e15a31c1c9a687316edef5c4ef9b6bb35aaedc08c6204f3c2 \ |
| 78 | gomod://golang.org/x/time;version=v0.10.0;sha256sum=7420a12017bb47bd85ccab81f9d1f7a3ff6daf8da768256292bc1dbb3bf9ba63 \ | 90 | gomod://golang.org/x/text;version=v0.36.0;sha256sum=15c60227cf084605a0256b8eacd9cfaf411109fe80c9e68b14a9367a5e42b23c \ |
| 79 | gomod://gvisor.dev/gvisor;version=v0.0.0-20250205023644-9414b50a5633;sha256sum=b373e677e77f28c095b43ed976f5d9ca885d3b1b5407a71a5691e4a47e813bd0 \ | 91 | gomod://golang.org/x/time;version=v0.12.0;sha256sum=cdcb04c43b112919c5e0d0fa1d90769124ad56918a44e6cb0747876ed7e5015c \ |
| 80 | gomod://k8s.io/client-go;version=v0.32.0;sha256sum=74ee50d42da263c0743212c17a12f16d8a3283f31f7c9209c6327b6656ac1550 \ | 92 | gomod://gvisor.dev/gvisor;version=v0.0.0-20260224225140-573d5e7127a8;sha256sum=2335e73d1effb8e5601be32b322e5d39bf1efc1eef2d296a8e054bd37a72b47f \ |
| 81 | gomod://sigs.k8s.io/yaml;version=v1.4.0;sha256sum=ef031ff78ff9b7036e174eef49dfbd77468dc4f0afb73a639b61f8ab3a1cc425 \ | 93 | gomod://k8s.io/client-go;version=v0.34.0;sha256sum=3ede34d9df9dcb02779a631ca9c653f92db3714ee887c6fdd86a66bc4889d2c0 \ |
| 94 | gomod://sigs.k8s.io/yaml;version=v1.6.0;sha256sum=cf88648a471581817b00a42ee8d24fd73eb0e3503998cf46d8e63787e11e5052 \ | ||
| 82 | gomod://software.sslmate.com/src/go-pkcs12;version=v0.4.0;sha256sum=55019a391e5302a51ba62e98909e006224b81207866da90beaf582ec0dee036f \ | 95 | gomod://software.sslmate.com/src/go-pkcs12;version=v0.4.0;sha256sum=55019a391e5302a51ba62e98909e006224b81207866da90beaf582ec0dee036f \ |
| 83 | " | 96 | " |
diff --git a/meta-networking/recipes-connectivity/tailscale/tailscale-licenses.inc b/meta-networking/recipes-connectivity/tailscale/tailscale-licenses.inc index 53d46dd45c..54690f464e 100644 --- a/meta-networking/recipes-connectivity/tailscale/tailscale-licenses.inc +++ b/meta-networking/recipes-connectivity/tailscale/tailscale-licenses.inc | |||
| @@ -1,43 +1,60 @@ | |||
| 1 | LIC_FILES_CHKSUM += " \ | 1 | |
| 2 | file://pkg/mod/filippo.io/edwards25519@v1.1.0/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707;spdx=BSD-3-Clause \ | 2 | # This file has been generated by go-mod-update-modules.bbclass |
| 3 | # | ||
| 4 | # Unknown licenses have been checked manually and completed. | ||
| 5 | # | ||
| 6 | |||
| 7 | LICENSE += "& Apache-2.0 & BSD-2-Clause & BSD-3-Clause & ISC & MIT" | ||
| 8 | |||
| 9 | LIC_FILES_CHKSUM += "\ | ||
| 10 | file://pkg/mod/filippo.io/edwards25519@v1.2.0/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707;spdx=BSD-3-Clause \ | ||
| 11 | file://pkg/mod/fyne.io/systray@v1.11.1-0.20250812065214-4856ac3adc3c/LICENSE;md5=a2be13cb34e811436f5388f0a19cc0b0;spdx=Apache-2.0 \ | ||
| 12 | file://pkg/mod/github.com/!kodeworks/golang-image-ico@v0.0.0-20141118225523-73f0f4cfade9/LICENSE;md5=591778525c869cdde0ab5a1bf283cd81;spdx=BSD-3-Clause \ | ||
| 3 | file://pkg/mod/github.com/anmitsu/go-shlex@v0.0.0-20200514113438-38f4b401e2be/LICENSE;md5=45a47c50f5b33ff9ab3347c7db1bfb6a;spdx=MIT \ | 13 | file://pkg/mod/github.com/anmitsu/go-shlex@v0.0.0-20200514113438-38f4b401e2be/LICENSE;md5=45a47c50f5b33ff9ab3347c7db1bfb6a;spdx=MIT \ |
| 4 | file://pkg/mod/github.com/aws/aws-sdk-go-v2@v1.36.0/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ | 14 | file://pkg/mod/github.com/atotto/clipboard@v0.1.4/LICENSE;md5=489200b65f13bcbcb890a96b99a58a6f;spdx=BSD-3-Clause \ |
| 5 | file://pkg/mod/github.com/aws/aws-sdk-go-v2/config@v1.29.5/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ | 15 | file://pkg/mod/github.com/aws/aws-sdk-go-v2/config@v1.29.5/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ |
| 6 | file://pkg/mod/github.com/aws/aws-sdk-go-v2/credentials@v1.17.58/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ | 16 | file://pkg/mod/github.com/aws/aws-sdk-go-v2/credentials@v1.17.58/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ |
| 7 | file://pkg/mod/github.com/aws/aws-sdk-go-v2/feature/ec2/imds@v1.16.27/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ | 17 | file://pkg/mod/github.com/aws/aws-sdk-go-v2/feature/ec2/imds@v1.16.27/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ |
| 8 | file://pkg/mod/github.com/aws/aws-sdk-go-v2/internal/configsources@v1.3.31/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ | 18 | file://pkg/mod/github.com/aws/aws-sdk-go-v2/internal/configsources@v1.4.16/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ |
| 9 | file://pkg/mod/github.com/aws/aws-sdk-go-v2/internal/endpoints/v2@v2.6.31/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ | 19 | file://pkg/mod/github.com/aws/aws-sdk-go-v2/internal/endpoints/v2@v2.7.16/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ |
| 10 | file://pkg/mod/github.com/aws/aws-sdk-go-v2/internal/ini@v1.8.2/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ | 20 | file://pkg/mod/github.com/aws/aws-sdk-go-v2/internal/ini@v1.8.2/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ |
| 11 | file://pkg/mod/github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding@v1.12.2/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ | 21 | file://pkg/mod/github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding@v1.13.4/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ |
| 12 | file://pkg/mod/github.com/aws/aws-sdk-go-v2/service/internal/presigned-url@v1.12.12/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ | 22 | file://pkg/mod/github.com/aws/aws-sdk-go-v2/service/internal/presigned-url@v1.13.16/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ |
| 13 | file://pkg/mod/github.com/aws/aws-sdk-go-v2/service/ssm@v1.44.7/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ | 23 | file://pkg/mod/github.com/aws/aws-sdk-go-v2/service/ssm@v1.44.7/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ |
| 14 | file://pkg/mod/github.com/aws/aws-sdk-go-v2/service/sso@v1.24.14/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ | 24 | file://pkg/mod/github.com/aws/aws-sdk-go-v2/service/sso@v1.24.14/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ |
| 15 | file://pkg/mod/github.com/aws/aws-sdk-go-v2/service/ssooidc@v1.28.13/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ | 25 | file://pkg/mod/github.com/aws/aws-sdk-go-v2/service/ssooidc@v1.28.13/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ |
| 16 | file://pkg/mod/github.com/aws/aws-sdk-go-v2/service/sts@v1.33.13/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ | 26 | file://pkg/mod/github.com/aws/aws-sdk-go-v2/service/sts@v1.41.5/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ |
| 17 | file://pkg/mod/github.com/aws/smithy-go@v1.22.2/LICENSE;md5=34400b68072d710fecd0a2940a0d1658;spdx=Apache-2.0 \ | 27 | file://pkg/mod/github.com/aws/aws-sdk-go-v2@v1.41.0/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ |
| 28 | file://pkg/mod/github.com/aws/aws-sdk-go-v2@v1.41.0/internal/sync/singleflight/LICENSE;md5=bdc234595bc2fe370918f5de5077c8e9;spdx=BSD-3-Clause \ | ||
| 29 | file://pkg/mod/github.com/aws/smithy-go@v1.24.0/LICENSE;md5=34400b68072d710fecd0a2940a0d1658;spdx=Apache-2.0 \ | ||
| 30 | file://pkg/mod/github.com/aws/smithy-go@v1.24.0/internal/sync/singleflight/LICENSE;md5=bdc234595bc2fe370918f5de5077c8e9;spdx=BSD-3-Clause \ | ||
| 18 | file://pkg/mod/github.com/coder/websocket@v1.8.12/LICENSE.txt;md5=bc0b6f68116166556efe7184edfda3e9;spdx=ISC \ | 31 | file://pkg/mod/github.com/coder/websocket@v1.8.12/LICENSE.txt;md5=bc0b6f68116166556efe7184edfda3e9;spdx=ISC \ |
| 19 | file://pkg/mod/github.com/coreos/go-iptables@v0.7.1-0.20240112124308-65c67c9f46e6/LICENSE;md5=19cbd64715b51267a47bf3750cc6a8a5;spdx=Apache-2.0 \ | 32 | file://pkg/mod/github.com/coreos/go-iptables@v0.7.1-0.20240112124308-65c67c9f46e6/LICENSE;md5=19cbd64715b51267a47bf3750cc6a8a5;spdx=Apache-2.0 \ |
| 20 | file://pkg/mod/github.com/creack/pty@v1.1.23/LICENSE;md5=93958070863d769117fa33b129020050;spdx=MIT \ | 33 | file://pkg/mod/github.com/creachadair/msync@v0.7.1/LICENSE;md5=b8be277519c5ee121454d43de171668a;spdx=BSD-3-Clause \ |
| 34 | file://pkg/mod/github.com/creack/pty@v1.1.24/LICENSE;md5=93958070863d769117fa33b129020050;spdx=MIT \ | ||
| 21 | file://pkg/mod/github.com/digitalocean/go-smbios@v0.0.0-20180907143718-390a4f403a8e/LICENSE.md;md5=c1653934903ab2785c09c2bdd7344526;spdx=Apache-2.0 \ | 35 | file://pkg/mod/github.com/digitalocean/go-smbios@v0.0.0-20180907143718-390a4f403a8e/LICENSE.md;md5=c1653934903ab2785c09c2bdd7344526;spdx=Apache-2.0 \ |
| 22 | file://pkg/mod/github.com/djherbis/times@v1.6.0/LICENSE;md5=3cafd141825e7a44b1c6a047b2320012;spdx=MIT \ | 36 | file://pkg/mod/github.com/djherbis/times@v1.6.0/LICENSE;md5=3cafd141825e7a44b1c6a047b2320012;spdx=MIT \ |
| 23 | file://pkg/mod/github.com/fxamacker/cbor/v2@v2.7.0/LICENSE;md5=827f5a2fa861382d35a3943adf9ebb86;spdx=MIT \ | 37 | file://pkg/mod/github.com/fogleman/gg@v1.3.0/LICENSE.md;md5=1630f0e1bac38694fdc4dcb6a9218f4a;spdx=MIT \ |
| 24 | file://pkg/mod/github.com/gaissmai/bart@v0.18.0/LICENSE;md5=05779e437ec35570aca43cc66a95e056;spdx=MIT \ | 38 | file://pkg/mod/github.com/fxamacker/cbor/v2@v2.9.0/LICENSE;md5=827f5a2fa861382d35a3943adf9ebb86;spdx=MIT \ |
| 25 | file://pkg/mod/github.com/go-json-experiment/json@v0.0.0-20250223041408-d3c622f1b874/LICENSE;md5=9d210c7471ce08e3db5261f33bf8fce6;spdx=BSD-3-Clause \ | 39 | file://pkg/mod/github.com/gaissmai/bart@v0.26.1/LICENSE;md5=05779e437ec35570aca43cc66a95e056;spdx=MIT \ |
| 40 | file://pkg/mod/github.com/go-json-experiment/json@v0.0.0-20250813024750-ebf49471dced/LICENSE;md5=9d210c7471ce08e3db5261f33bf8fce6;spdx=BSD-3-Clause \ | ||
| 26 | file://pkg/mod/github.com/godbus/dbus/v5@v5.1.1-0.20230522191255-76236955d466/LICENSE;md5=09042bd5c6c96a2b9e45ddf1bc517eed;spdx=BSD-2-Clause \ | 41 | file://pkg/mod/github.com/godbus/dbus/v5@v5.1.1-0.20230522191255-76236955d466/LICENSE;md5=09042bd5c6c96a2b9e45ddf1bc517eed;spdx=BSD-2-Clause \ |
| 27 | file://pkg/mod/github.com/golang/groupcache@v0.0.0-20210331224755-41bb18bfe9da/LICENSE;md5=19cbd64715b51267a47bf3750cc6a8a5;spdx=Apache-2.0 \ | 42 | file://pkg/mod/github.com/golang/freetype@v0.0.0-20170609003504-e2365dfdc4a0/LICENSE;md5=8e050e4860234723098ceeefa49edd05;spdx=BSD-3-Clause \ |
| 28 | file://pkg/mod/github.com/google/btree@v1.1.2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ | 43 | file://pkg/mod/github.com/golang/groupcache@v0.0.0-20241129210726-2c02b8208cf8/LICENSE;md5=19cbd64715b51267a47bf3750cc6a8a5;spdx=Apache-2.0 \ |
| 44 | file://pkg/mod/github.com/google/btree@v1.1.3/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ | ||
| 29 | file://pkg/mod/github.com/google/go-tpm@v0.9.4/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ | 45 | file://pkg/mod/github.com/google/go-tpm@v0.9.4/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ |
| 30 | file://pkg/mod/github.com/google/nftables@v0.2.1-0.20240414091927-5e242ec57806/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ | 46 | file://pkg/mod/github.com/google/nftables@v0.2.1-0.20240414091927-5e242ec57806/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ |
| 31 | file://pkg/mod/github.com/gorilla/csrf@v1.7.3/LICENSE;md5=c30eee78985cf2584cded5f89ba3d787;spdx=BSD-3-Clause \ | ||
| 32 | file://pkg/mod/github.com/gorilla/securecookie@v1.1.2/LICENSE;md5=c30eee78985cf2584cded5f89ba3d787;spdx=BSD-3-Clause \ | ||
| 33 | file://pkg/mod/github.com/hdevalence/ed25519consensus@v0.2.0/LICENSE;md5=4041895a1f717acb5be52e24edb19917;spdx=BSD-3-Clause \ | 47 | file://pkg/mod/github.com/hdevalence/ed25519consensus@v0.2.0/LICENSE;md5=4041895a1f717acb5be52e24edb19917;spdx=BSD-3-Clause \ |
| 48 | file://pkg/mod/github.com/huin/goupnp@v1.3.0/LICENSE;md5=3d7eee8afacfccb446c1ac30289c965d;spdx=BSD-2-Clause \ | ||
| 34 | file://pkg/mod/github.com/illarion/gonotify/v3@v3.0.2/LICENSE;md5=6b631a3123c7c679195702a8a35c9f21;spdx=MIT \ | 49 | file://pkg/mod/github.com/illarion/gonotify/v3@v3.0.2/LICENSE;md5=6b631a3123c7c679195702a8a35c9f21;spdx=MIT \ |
| 35 | file://pkg/mod/github.com/insomniacslk/dhcp@v0.0.0-20231206064809-8c70d406f6d2/LICENSE;md5=ceaf33b8b657b2d342dbd3bb59578d8a;spdx=BSD-3-Clause \ | 50 | file://pkg/mod/github.com/insomniacslk/dhcp@v0.0.0-20231206064809-8c70d406f6d2/LICENSE;md5=ceaf33b8b657b2d342dbd3bb59578d8a;spdx=BSD-3-Clause \ |
| 36 | file://pkg/mod/github.com/jellydator/ttlcache/v3@v3.1.0/LICENSE;md5=4cea77626c625d583c98a85a8658f9d2;spdx=MIT \ | 51 | file://pkg/mod/github.com/jellydator/ttlcache/v3@v3.1.0/LICENSE;md5=4cea77626c625d583c98a85a8658f9d2;spdx=MIT \ |
| 37 | file://pkg/mod/github.com/jmespath/go-jmespath@v0.4.0/LICENSE;md5=9abfa8353fce3f2cb28364e1e9016852;spdx=Apache-2.0 \ | 52 | file://pkg/mod/github.com/jmespath/go-jmespath@v0.4.0/LICENSE;md5=9abfa8353fce3f2cb28364e1e9016852;spdx=Apache-2.0 \ |
| 38 | file://pkg/mod/github.com/jsimonetti/rtnetlink@v1.4.0/LICENSE.md;md5=75a8090d4c02945ad9d61c7cce77ed48;spdx=MIT \ | 53 | file://pkg/mod/github.com/jsimonetti/rtnetlink@v1.4.0/LICENSE.md;md5=75a8090d4c02945ad9d61c7cce77ed48;spdx=MIT \ |
| 39 | file://pkg/mod/github.com/kballard/go-shellquote@v0.0.0-20180428030007-95032a82bc51/LICENSE;md5=9d95d1ad917c814c23909addb8692eeb;spdx=MIT \ | 54 | file://pkg/mod/github.com/kballard/go-shellquote@v0.0.0-20180428030007-95032a82bc51/LICENSE;md5=9d95d1ad917c814c23909addb8692eeb;spdx=MIT \ |
| 40 | file://pkg/mod/github.com/klauspost/compress@v1.17.11/LICENSE;md5=d0fd9ebda39468b51ff4539c9fbb13a8;spdx=BSD-3-Clause \ | 55 | file://pkg/mod/github.com/klauspost/compress@v1.18.5/LICENSE;md5=d0fd9ebda39468b51ff4539c9fbb13a8;spdx=BSD-3-Clause \ |
| 56 | file://pkg/mod/github.com/klauspost/compress@v1.18.5/internal/snapref/LICENSE;md5=b8b79c7d4cda128290b98c6a21f9aac6;spdx=BSD-3-Clause \ | ||
| 57 | file://pkg/mod/github.com/klauspost/compress@v1.18.5/zstd/internal/xxhash/LICENSE.txt;md5=802da049c92a99b4387d3f3d91b00fa9;spdx=MIT \ | ||
| 41 | file://pkg/mod/github.com/kortschak/wol@v0.0.0-20200729010619-da482cc4850a/LICENSE;md5=5a0acdb344844a21e2df8bc2e1fe5f2d;spdx=BSD-3-Clause \ | 58 | file://pkg/mod/github.com/kortschak/wol@v0.0.0-20200729010619-da482cc4850a/LICENSE;md5=5a0acdb344844a21e2df8bc2e1fe5f2d;spdx=BSD-3-Clause \ |
| 42 | file://pkg/mod/github.com/kr/fs@v0.1.0/LICENSE;md5=591778525c869cdde0ab5a1bf283cd81;spdx=BSD-3-Clause \ | 59 | file://pkg/mod/github.com/kr/fs@v0.1.0/LICENSE;md5=591778525c869cdde0ab5a1bf283cd81;spdx=BSD-3-Clause \ |
| 43 | file://pkg/mod/github.com/mattn/go-colorable@v0.1.13/LICENSE;md5=24ce168f90aec2456a73de1839037245;spdx=MIT \ | 60 | file://pkg/mod/github.com/mattn/go-colorable@v0.1.13/LICENSE;md5=24ce168f90aec2456a73de1839037245;spdx=MIT \ |
| @@ -46,40 +63,40 @@ LIC_FILES_CHKSUM += " \ | |||
| 46 | file://pkg/mod/github.com/mdlayher/netlink@v1.7.3-0.20250113171957-fbb4dce95f42/LICENSE.md;md5=e08504321a9b3e86ee07433c231b33f1;spdx=MIT \ | 63 | file://pkg/mod/github.com/mdlayher/netlink@v1.7.3-0.20250113171957-fbb4dce95f42/LICENSE.md;md5=e08504321a9b3e86ee07433c231b33f1;spdx=MIT \ |
| 47 | file://pkg/mod/github.com/mdlayher/sdnotify@v1.0.0/LICENSE.md;md5=a57b2e272a0c75c413c784bb877cda50;spdx=MIT \ | 64 | file://pkg/mod/github.com/mdlayher/sdnotify@v1.0.0/LICENSE.md;md5=a57b2e272a0c75c413c784bb877cda50;spdx=MIT \ |
| 48 | file://pkg/mod/github.com/mdlayher/socket@v0.5.0/LICENSE.md;md5=bdcb2fcb7aea8a34d189ef572a59ff88;spdx=MIT \ | 65 | file://pkg/mod/github.com/mdlayher/socket@v0.5.0/LICENSE.md;md5=bdcb2fcb7aea8a34d189ef572a59ff88;spdx=MIT \ |
| 49 | file://pkg/mod/github.com/miekg/dns@v1.1.58/LICENSE;md5=b5215dfec2c591290f399a181669bef7;spdx=BSD-3-Clause \ | ||
| 50 | file://pkg/mod/github.com/mitchellh/go-ps@v1.0.0/LICENSE.md;md5=56da355a12d4821cda57b8f23ec34bc4;spdx=MIT \ | 66 | file://pkg/mod/github.com/mitchellh/go-ps@v1.0.0/LICENSE.md;md5=56da355a12d4821cda57b8f23ec34bc4;spdx=MIT \ |
| 51 | file://pkg/mod/github.com/peterbourgon/ff/v3@v3.4.0/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e;spdx=Apache-2.0 \ | 67 | file://pkg/mod/github.com/peterbourgon/ff/v3@v3.4.0/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e;spdx=Apache-2.0 \ |
| 52 | file://pkg/mod/github.com/pierrec/lz4/v4@v4.1.21/LICENSE;md5=09ece85f3c312a63b522bfc6ebd44943;spdx=BSD-3-Clause \ | 68 | file://pkg/mod/github.com/pierrec/lz4/v4@v4.1.25/LICENSE;md5=09ece85f3c312a63b522bfc6ebd44943;spdx=BSD-3-Clause \ |
| 69 | file://pkg/mod/github.com/pires/go-proxyproto@v0.8.1/LICENSE;md5=ebfe2201eab4c067477cc534908ac12f;spdx=Apache-2.0 \ | ||
| 53 | file://pkg/mod/github.com/pkg/sftp@v1.13.6/LICENSE;md5=452fc5cc5a9127a0e828d73423d45035;spdx=BSD-2-Clause \ | 70 | file://pkg/mod/github.com/pkg/sftp@v1.13.6/LICENSE;md5=452fc5cc5a9127a0e828d73423d45035;spdx=BSD-2-Clause \ |
| 54 | file://pkg/mod/github.com/safchain/ethtool@v0.3.0/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc;spdx=Apache-2.0 \ | 71 | file://pkg/mod/github.com/safchain/ethtool@v0.3.0/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc;spdx=Apache-2.0 \ |
| 55 | file://pkg/mod/github.com/skip2/go-qrcode@v0.0.0-20200617195104-da1b6568686e/LICENSE;md5=515c25e1450ede2834397875c18439d4;spdx=MIT \ | 72 | file://pkg/mod/github.com/skip2/go-qrcode@v0.0.0-20200617195104-da1b6568686e/LICENSE;md5=515c25e1450ede2834397875c18439d4;spdx=MIT \ |
| 56 | file://pkg/mod/github.com/tailscale/goupnp@v1.0.1-0.20210804011211-c64d0f06ea05/LICENSE;md5=3d7eee8afacfccb446c1ac30289c965d;spdx=BSD-2-Clause \ | 73 | file://pkg/mod/github.com/tailscale/gliderssh@v0.3.4-0.20260330083525-c1389c70ff89/LICENSE;md5=ac631f842784b8ec269293a49121236b;spdx=BSD-3-Clause \ |
| 57 | file://pkg/mod/github.com/tailscale/hujson@v0.0.0-20221223112325-20486734a56a/LICENSE;md5=073f7ac93b9172ac4e1d258584fc0271;spdx=BSD-3-Clause \ | 74 | file://pkg/mod/github.com/tailscale/hujson@v0.0.0-20260302212456-ecc657c15afd/LICENSE;md5=073f7ac93b9172ac4e1d258584fc0271;spdx=BSD-3-Clause \ |
| 58 | file://pkg/mod/github.com/tailscale/netlink@v1.1.1-0.20240822203006-4d49adab4de7/LICENSE;md5=2ade771c7d7211af507864e8dd520529;spdx=Apache-2.0 \ | 75 | file://pkg/mod/github.com/tailscale/netlink@v1.1.1-0.20240822203006-4d49adab4de7/LICENSE;md5=2ade771c7d7211af507864e8dd520529;spdx=Apache-2.0 \ |
| 59 | file://pkg/mod/github.com/tailscale/peercred@v0.0.0-20250107143737-35a0c7bd7edc/LICENSE;md5=94eaeed21686fd9816f57f86b9914071;spdx=BSD-3-Clause \ | 76 | file://pkg/mod/github.com/tailscale/peercred@v0.0.0-20250107143737-35a0c7bd7edc/LICENSE;md5=94eaeed21686fd9816f57f86b9914071;spdx=BSD-3-Clause \ |
| 60 | file://pkg/mod/github.com/tailscale/web-client-prebuilt@v0.0.0-20250124233751-d4cd19a26976/LICENSE;md5=a672713a9eb730050e491c92edf7984d;spdx=BSD-3-Clause \ | 77 | file://pkg/mod/github.com/tailscale/web-client-prebuilt@v0.0.0-20250124233751-d4cd19a26976/LICENSE;md5=a672713a9eb730050e491c92edf7984d;spdx=BSD-3-Clause \ |
| 61 | file://pkg/mod/github.com/tailscale/wireguard-go@v0.0.0-20250304000100-91a0587fb251/LICENSE;md5=995598bc9de2b4c987c2cb87fc24f341;spdx=MIT \ | 78 | file://pkg/mod/github.com/tailscale/wireguard-go@v0.0.0-20260427181203-e3ac4a0afb4e/LICENSE;md5=995598bc9de2b4c987c2cb87fc24f341;spdx=MIT \ |
| 62 | file://pkg/mod/github.com/tailscale/xnet@v0.0.0-20240729143630-8497ac4dab2e/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707;spdx=BSD-3-Clause \ | 79 | file://pkg/mod/github.com/tailscale/xnet@v0.0.0-20240729143630-8497ac4dab2e/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707;spdx=BSD-3-Clause \ |
| 63 | file://pkg/mod/github.com/toqueteos/webbrowser@v1.2.0/LICENSE.md;md5=6072d29ffa4b14338ff8fd68f17f6851;spdx=MIT \ | 80 | file://pkg/mod/github.com/toqueteos/webbrowser@v1.2.0/LICENSE.md;md5=6072d29ffa4b14338ff8fd68f17f6851;spdx=MIT \ |
| 64 | file://pkg/mod/github.com/u-root/u-root@v0.14.0/LICENSE;md5=bf431bf303eaf01f17bef6624d9f2208;spdx=BSD-3-Clause \ | 81 | file://pkg/mod/github.com/u-root/u-root@v0.14.0/LICENSE;md5=bf431bf303eaf01f17bef6624d9f2208;spdx=BSD-3-Clause \ |
| 65 | file://pkg/mod/github.com/u-root/uio@v0.0.0-20240224005618-d2acac8f3701/LICENSE;md5=52bf39fc1e426b6459f5c9a142e5bfbd;spdx=BSD-3-Clause \ | 82 | file://pkg/mod/github.com/u-root/uio@v0.0.0-20240224005618-d2acac8f3701/LICENSE;md5=52bf39fc1e426b6459f5c9a142e5bfbd;spdx=BSD-3-Clause \ |
| 66 | file://pkg/mod/github.com/vishvananda/netns@v0.0.4/LICENSE;md5=2ade771c7d7211af507864e8dd520529;spdx=Apache-2.0 \ | 83 | file://pkg/mod/github.com/vishvananda/netns@v0.0.5/LICENSE;md5=2ade771c7d7211af507864e8dd520529;spdx=Apache-2.0 \ |
| 67 | file://pkg/mod/github.com/x448/float16@v0.8.4/LICENSE;md5=de8f8e025d57fe7ee0b67f30d571323b;spdx=MIT \ | 84 | file://pkg/mod/github.com/x448/float16@v0.8.4/LICENSE;md5=de8f8e025d57fe7ee0b67f30d571323b;spdx=MIT \ |
| 85 | file://pkg/mod/go.yaml.in/yaml/v2@v2.4.2/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e;spdx=Apache-2.0 \ | ||
| 68 | file://pkg/mod/go4.org/mem@v0.0.0-20240501181205-ae6ca9944745/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc;spdx=Apache-2.0 \ | 86 | file://pkg/mod/go4.org/mem@v0.0.0-20240501181205-ae6ca9944745/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc;spdx=Apache-2.0 \ |
| 69 | file://pkg/mod/go4.org/netipx@v0.0.0-20231129151722-fdeea329fbba/LICENSE;md5=628df198dc9e033b86b8eedff039ff86;spdx=BSD-3-Clause \ | 87 | file://pkg/mod/go4.org/netipx@v0.0.0-20231129151722-fdeea329fbba/LICENSE;md5=628df198dc9e033b86b8eedff039ff86;spdx=BSD-3-Clause \ |
| 70 | file://pkg/mod/golang.org/x/crypto@v0.37.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \ | 88 | file://pkg/mod/golang.org/x/crypto@v0.50.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \ |
| 71 | file://pkg/mod/golang.org/x/exp@v0.0.0-20250210185358-939b2ce775ac/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \ | 89 | file://pkg/mod/golang.org/x/exp@v0.0.0-20250620022241-b7579e27df2b/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \ |
| 72 | file://pkg/mod/golang.org/x/net@v0.36.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \ | 90 | file://pkg/mod/golang.org/x/image@v0.27.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \ |
| 73 | file://pkg/mod/golang.org/x/oauth2@v0.26.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \ | 91 | file://pkg/mod/golang.org/x/net@v0.53.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \ |
| 74 | file://pkg/mod/golang.org/x/sync@v0.13.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \ | 92 | file://pkg/mod/golang.org/x/oauth2@v0.36.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \ |
| 75 | file://pkg/mod/golang.org/x/sys@v0.32.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \ | 93 | file://pkg/mod/golang.org/x/sync@v0.20.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \ |
| 76 | file://pkg/mod/golang.org/x/term@v0.31.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \ | 94 | file://pkg/mod/golang.org/x/sys@v0.43.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \ |
| 77 | file://pkg/mod/golang.org/x/text@v0.24.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \ | 95 | file://pkg/mod/golang.org/x/term@v0.42.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \ |
| 78 | file://pkg/mod/golang.org/x/time@v0.10.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \ | 96 | file://pkg/mod/golang.org/x/text@v0.36.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \ |
| 79 | file://pkg/mod/gvisor.dev/gvisor@v0.0.0-20250205023644-9414b50a5633/LICENSE;md5=fbbaf7613c100c84b8f20701859dee2d;spdx=MIT+%26+Apache-2.0 \ | 97 | file://pkg/mod/golang.org/x/time@v0.12.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \ |
| 80 | file://pkg/mod/k8s.io/client-go@v0.32.0/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ | 98 | file://pkg/mod/gvisor.dev/gvisor@v0.0.0-20260224225140-573d5e7127a8/LICENSE;md5=e566fe37b81dd469e93876dc021ca01c;spdx=Apache-2.0 \ |
| 81 | file://pkg/mod/sigs.k8s.io/yaml@v1.4.0/LICENSE;md5=b5d30dd5bc47d1b56b678ac06dead1c7;spdx=MIT+%26+Apache-2.0+%26+BSD-3-Clause \ | 99 | file://pkg/mod/k8s.io/client-go@v0.34.0/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ |
| 100 | file://pkg/mod/sigs.k8s.io/yaml@v1.6.0/LICENSE;md5=b5d30dd5bc47d1b56b678ac06dead1c7;spdx=BSD-3-Clause \ | ||
| 82 | file://pkg/mod/software.sslmate.com/src/go-pkcs12@v0.4.0/LICENSE;md5=259f3802525423b1a33efb1b85f64e18;spdx=BSD-3-Clause \ | 101 | file://pkg/mod/software.sslmate.com/src/go-pkcs12@v0.4.0/LICENSE;md5=259f3802525423b1a33efb1b85f64e18;spdx=BSD-3-Clause \ |
| 83 | " | 102 | " |
| 84 | |||
| 85 | LICENSE += " & Apache-2.0 & BSD-2-Clause & BSD-3-Clause & ISC & MIT" | ||
diff --git a/meta-networking/recipes-connectivity/tailscale/tailscale_1.84.3.bb b/meta-networking/recipes-connectivity/tailscale/tailscale_1.98.3.bb index 33ae1925d5..a352c5cf58 100644 --- a/meta-networking/recipes-connectivity/tailscale/tailscale_1.84.3.bb +++ b/meta-networking/recipes-connectivity/tailscale/tailscale_1.98.3.bb | |||
| @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/tailscale/tailscale" | |||
| 4 | SECTION = "networking" | 4 | SECTION = "networking" |
| 5 | 5 | ||
| 6 | LICENSE = "BSD-3-Clause" | 6 | LICENSE = "BSD-3-Clause" |
| 7 | LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=a672713a9eb730050e491c92edf7984d" | 7 | LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=cadeae10a8856ddfdb129866b75b33e3" |
| 8 | require ${BPN}-licenses.inc | 8 | require ${BPN}-licenses.inc |
| 9 | 9 | ||
| 10 | MAJOR_MINOR = "${@oe.utils.trim_version('${PV}', 2)}" | 10 | MAJOR_MINOR = "${@oe.utils.trim_version('${PV}', 2)}" |
| @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/tailscale/tailscale.git;protocol=https;branch=releas | |||
| 12 | file://default \ | 12 | file://default \ |
| 13 | file://tailscaled.init \ | 13 | file://tailscaled.init \ |
| 14 | " | 14 | " |
| 15 | SRCREV = "7648989bc54738b1e40dde74fa822984a63cbc05" | 15 | SRCREV = "8f2c8d6a14419e95fb9d02d6bf6113893daef5c3" |
| 16 | SRCREV_SHORT = "${@d.getVar('SRCREV')[:8]}" | 16 | SRCREV_SHORT = "${@d.getVar('SRCREV')[:8]}" |
| 17 | require ${BPN}-go-mods.inc | 17 | require ${BPN}-go-mods.inc |
| 18 | 18 | ||
| @@ -22,7 +22,10 @@ GO_LINKSHARED = "" | |||
| 22 | GOBUILDFLAGS:prepend = "-tags=${@','.join(d.getVar('PACKAGECONFIG_CONFARGS').split())} " | 22 | GOBUILDFLAGS:prepend = "-tags=${@','.join(d.getVar('PACKAGECONFIG_CONFARGS').split())} " |
| 23 | GO_EXTRA_LDFLAGS = "-X tailscale.com/version.longStamp=${PV}-${SRCREV_SHORT} -X tailscale.com/version.shortStamp=${PV}" | 23 | GO_EXTRA_LDFLAGS = "-X tailscale.com/version.longStamp=${PV}-${SRCREV_SHORT} -X tailscale.com/version.shortStamp=${PV}" |
| 24 | 24 | ||
| 25 | inherit go-mod \ | 25 | # Pass build tags so go list in update-modules discovers all conditional deps |
| 26 | export GOFLAGS = "-tags=${@','.join(d.getVar('PACKAGECONFIG_CONFARGS').split())}" | ||
| 27 | |||
| 28 | inherit go-mod go-mod-update-modules \ | ||
| 26 | ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'update-rc.d', '', d)} \ | 29 | ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'update-rc.d', '', d)} \ |
| 27 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} | 30 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} |
| 28 | 31 | ||
diff --git a/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.8.4.bb b/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.9.1.bb index f16c8c1e68..2978ff1cc1 100644 --- a/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.8.4.bb +++ b/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.9.1.bb | |||
| @@ -17,7 +17,7 @@ SRC_URI = " \ | |||
| 17 | file://run-ptest \ | 17 | file://run-ptest \ |
| 18 | " | 18 | " |
| 19 | 19 | ||
| 20 | SRCREV = "59f4fa568615396fbf381b073b220d1e8d61e4c2" | 20 | SRCREV = "1d363f3adceba9d1478230ede476a37b0dcdef24" |
| 21 | 21 | ||
| 22 | 22 | ||
| 23 | inherit autotools ptest | 23 | inherit autotools ptest |
| @@ -47,5 +47,25 @@ do_install_ptest() { | |||
| 47 | cp -rf ${S}/tests ${D}${PTEST_PATH} | 47 | cp -rf ${S}/tests ${D}${PTEST_PATH} |
| 48 | } | 48 | } |
| 49 | 49 | ||
| 50 | CVE_STATUS[CVE-2025-11931] = "fixed-version: The currently used version (5.8.4) contains the fix already." | 50 | CVE_STATUS[CVE-2026-0819] = "fixed-version: fixed in 5.9.0" |
| 51 | CVE_STATUS[CVE-2025-12889] = "fixed-version: The currently used version (5.8.4) contains the fix already." | 51 | CVE_STATUS[CVE-2026-2646] = "fixed-version: fixed in 5.9.0" |
| 52 | CVE_STATUS[CVE-2026-3503] = "fixed-version: fixed in 5.9.0" | ||
| 53 | CVE_STATUS[CVE-2026-3548] = "fixed-version: fixed in 5.9.0" | ||
| 54 | CVE_STATUS[CVE-2026-5188] = "fixed-version: fixed in 5.9.1" | ||
| 55 | CVE_STATUS[CVE-2026-5194] = "fixed-version: fixed in 5.9.1" | ||
| 56 | CVE_STATUS[CVE-2026-5263] = "fixed-version: fixed in 5.9.1" | ||
| 57 | CVE_STATUS[CVE-2026-5264] = "fixed-version: fixed in 5.9.1" | ||
| 58 | CVE_STATUS[CVE-2026-5392] = "fixed-version: fixed in 5.9.1" | ||
| 59 | CVE_STATUS[CVE-2026-5393] = "fixed-version: fixed in 5.9.1" | ||
| 60 | CVE_STATUS[CVE-2026-5446] = "fixed-version: fixed in 5.9.1" | ||
| 61 | CVE_STATUS[CVE-2026-5447] = "fixed-version: fixed in 5.9.1" | ||
| 62 | CVE_STATUS[CVE-2026-5448] = "fixed-version: fixed in 5.9.1" | ||
| 63 | CVE_STATUS[CVE-2026-5460] = "fixed-version: fixed in 5.9.1" | ||
| 64 | CVE_STATUS[CVE-2026-5466] = "fixed-version: fixed in 5.9.1" | ||
| 65 | CVE_STATUS[CVE-2026-5479] = "fixed-version: fixed in 5.9.1" | ||
| 66 | CVE_STATUS[CVE-2026-5500] = "fixed-version: fixed in 5.9.1" | ||
| 67 | CVE_STATUS[CVE-2026-5503] = "fixed-version: fixed in 5.9.1" | ||
| 68 | CVE_STATUS[CVE-2026-5504] = "fixed-version: fixed in 5.9.1" | ||
| 69 | CVE_STATUS[CVE-2026-5507] = "fixed-version: fixed in 5.9.1" | ||
| 70 | CVE_STATUS[CVE-2026-5772] = "fixed-version: fixed in 5.9.1" | ||
| 71 | CVE_STATUS[CVE-2026-5778] = "fixed-version: fixed in 5.9.1" | ||
diff --git a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb index cc0445aaed..21c9dce4e1 100644 --- a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb +++ b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb | |||
| @@ -216,7 +216,6 @@ RDEPENDS:packagegroup-meta-networking-support = "\ | |||
| 216 | ndisc6 \ | 216 | ndisc6 \ |
| 217 | tcpdump \ | 217 | tcpdump \ |
| 218 | tcpslice \ | 218 | tcpslice \ |
| 219 | netcf \ | ||
| 220 | tnftp \ | 219 | tnftp \ |
| 221 | traceroute \ | 220 | traceroute \ |
| 222 | tunctl \ | 221 | tunctl \ |
diff --git a/meta-networking/recipes-daemons/atftp/atftp_0.8.0.bb b/meta-networking/recipes-daemons/atftp/atftp_0.8.1.bb index 9db0aebccb..ecd55684f5 100644 --- a/meta-networking/recipes-daemons/atftp/atftp_0.8.0.bb +++ b/meta-networking/recipes-daemons/atftp/atftp_0.8.1.bb | |||
| @@ -2,9 +2,9 @@ SUMMARY = "Advanced TFTP server and client" | |||
| 2 | SECTION = "net" | 2 | SECTION = "net" |
| 3 | HOMEPAGE = "http://packages.debian.org/atftp" | 3 | HOMEPAGE = "http://packages.debian.org/atftp" |
| 4 | LICENSE = "GPL-2.0-only" | 4 | LICENSE = "GPL-2.0-only" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f65159f73e603f89d6867d43191900e5" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=570a9b3749dd0463a1778803b12a6dce" |
| 6 | 6 | ||
| 7 | SRCREV = "d5c27eb7a9695d83569767e27ef69674173db39a" | 7 | SRCREV = "7238b7b6753157d0c4ad739df3d87a958f78d70b" |
| 8 | 8 | ||
| 9 | SRC_URI = "git://git.code.sf.net/p/atftp/code;branch=master;protocol=https \ | 9 | SRC_URI = "git://git.code.sf.net/p/atftp/code;branch=master;protocol=https \ |
| 10 | file://atftpd.init \ | 10 | file://atftpd.init \ |
diff --git a/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.3.bb b/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.4.bb index e8567ccebf..df1e8f27e1 100644 --- a/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.3.bb +++ b/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.4.bb | |||
| @@ -5,8 +5,7 @@ LICENSE = "GPL-2.0-or-later" | |||
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=432040ff3a55670c1dec0c32b209ad69" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=432040ff3a55670c1dec0c32b209ad69" |
| 6 | 6 | ||
| 7 | SRC_URI = "https://github.com/pali/igmpproxy/releases/download/${PV}/${BP}.tar.gz" | 7 | SRC_URI = "https://github.com/pali/igmpproxy/releases/download/${PV}/${BP}.tar.gz" |
| 8 | SRC_URI[md5sum] = "5565874d9631103109a72452cecb5ce7" | 8 | SRC_URI[sha256sum] = "afa4b75a823b82f71ce99f33eae4e8136b906ae8a5ede5caaad93bac38cdae24" |
| 9 | SRC_URI[sha256sum] = "d1fc244cb2fbbf99f720bda3e841fe59ece9b6919073790b4b892739b1b844eb" | ||
| 10 | 9 | ||
| 11 | UPSTREAM_CHECK_URI = "https://github.com/pali/${BPN}/releases" | 10 | UPSTREAM_CHECK_URI = "https://github.com/pali/${BPN}/releases" |
| 12 | 11 | ||
diff --git a/meta-networking/recipes-daemons/lldpd/lldpd_1.0.20.bb b/meta-networking/recipes-daemons/lldpd/lldpd_1.0.22.bb index 044f1e0745..635d54931d 100644 --- a/meta-networking/recipes-daemons/lldpd/lldpd_1.0.20.bb +++ b/meta-networking/recipes-daemons/lldpd/lldpd_1.0.22.bb | |||
| @@ -12,7 +12,7 @@ SRC_URI = "\ | |||
| 12 | file://run-ptest \ | 12 | file://run-ptest \ |
| 13 | " | 13 | " |
| 14 | 14 | ||
| 15 | SRC_URI[sha256sum] = "61b8cb22d4879e68f7825a2fb8e1e92abb4aba4773977cf0258bc32ed9f55450" | 15 | SRC_URI[sha256sum] = "9587940ed2314a86774c5499f3dfb13a8eb86232a62d243a83a1f09886848e03" |
| 16 | 16 | ||
| 17 | inherit autotools update-rc.d useradd systemd pkgconfig bash-completion github-releases ptest | 17 | inherit autotools update-rc.d useradd systemd pkgconfig bash-completion github-releases ptest |
| 18 | 18 | ||
| @@ -29,7 +29,7 @@ EXTRA_OECONF += "--without-embedded-libevent \ | |||
| 29 | " | 29 | " |
| 30 | 30 | ||
| 31 | PACKAGECONFIG ??= "cdp fdp edp sonmp lldpmed dot1 dot3" | 31 | PACKAGECONFIG ??= "cdp fdp edp sonmp lldpmed dot1 dot3" |
| 32 | PACKAGECONFIG[xml] = "--with-xml,--without-xml,libxm2" | 32 | PACKAGECONFIG[xml] = "--with-xml,--without-xml,libxml2" |
| 33 | PACKAGECONFIG[snmp] = "--with-snmp,--without-snmp,net-snmp" | 33 | PACKAGECONFIG[snmp] = "--with-snmp,--without-snmp,net-snmp" |
| 34 | PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" | 34 | PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" |
| 35 | PACKAGECONFIG[seccomp] = "--with-seccomp,--without-seccomp,libseccomp" | 35 | PACKAGECONFIG[seccomp] = "--with-seccomp,--without-seccomp,libseccomp" |
diff --git a/meta-networking/recipes-daemons/postfix/files/0001-Fix-build-with-musl.patch b/meta-networking/recipes-daemons/postfix/files/0001-Fix-build-with-musl.patch new file mode 100644 index 0000000000..6574db9d61 --- /dev/null +++ b/meta-networking/recipes-daemons/postfix/files/0001-Fix-build-with-musl.patch | |||
| @@ -0,0 +1,45 @@ | |||
| 1 | From c7ea1cce7f4f83e9ff27873a96113bdb382bb296 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Yi Zhao <yi.zhao@windriver.com> | ||
| 3 | Date: Fri, 8 May 2026 22:39:54 +0800 | ||
| 4 | Subject: [PATCH] Fix build with musl | ||
| 5 | |||
| 6 | Guard glibc-specific version check with __GLIBC__ macro. When building | ||
| 7 | with musl, __GLIBC__ is not defined, so the preprocessor previously fell | ||
| 8 | through to the #else branch and defined NO_SNPRINTF, causing a build | ||
| 9 | error: | ||
| 10 | |||
| 11 | vbuf_print.c: In function 'vbuf_print': | ||
| 12 | vbuf_print.c:208:46: error: macro 'VBUF_SNPRINTF' passed 5 arguments, but takes just 4 | ||
| 13 | 208 | VSTRING_ADDNUM(fmt, width); | ||
| 14 | | ^ | ||
| 15 | vbuf_print.c:126:9: note: macro 'VBUF_SNPRINTF' defined here | ||
| 16 | 126 | #define VBUF_SNPRINTF(bp, sz, fmt, arg) do { \ | ||
| 17 | | ^~~~~~~~~~~~~ | ||
| 18 | |||
| 19 | Wrap the entire block in #ifdef __GLIBC__ so that neither branch | ||
| 20 | is entered on musl. | ||
| 21 | |||
| 22 | Upstream-Status: Pending | ||
| 23 | |||
| 24 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
| 25 | --- | ||
| 26 | src/util/sys_defs.h | 2 ++ | ||
| 27 | 1 file changed, 2 insertions(+) | ||
| 28 | |||
| 29 | diff --git a/src/util/sys_defs.h b/src/util/sys_defs.h | ||
| 30 | index 09a05bd..15ea8c6 100644 | ||
| 31 | --- a/src/util/sys_defs.h | ||
| 32 | +++ b/src/util/sys_defs.h | ||
| 33 | @@ -794,10 +794,12 @@ extern int initgroups(const char *, int); | ||
| 34 | #define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases" | ||
| 35 | #define NATIVE_COMMAND_DIR "/usr/sbin" | ||
| 36 | #define NATIVE_DAEMON_DIR "/usr/libexec/postfix" | ||
| 37 | +#ifdef __GLIBC__ | ||
| 38 | #if HAVE_GLIBC_API_VERSION_SUPPORT(2, 1) | ||
| 39 | #define SOCKADDR_SIZE socklen_t | ||
| 40 | #define SOCKOPT_SIZE socklen_t | ||
| 41 | #endif | ||
| 42 | +#endif | ||
| 43 | #ifndef NO_IPV6 | ||
| 44 | #define HAS_IPV6 | ||
| 45 | #if HAVE_GLIBC_API_VERSION_SUPPORT(2, 4) | ||
diff --git a/meta-networking/recipes-daemons/postfix/files/0001-Fix-makedefs.patch b/meta-networking/recipes-daemons/postfix/files/0001-Fix-makedefs.patch index 785fe87452..4e187849dc 100644 --- a/meta-networking/recipes-daemons/postfix/files/0001-Fix-makedefs.patch +++ b/meta-networking/recipes-daemons/postfix/files/0001-Fix-makedefs.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From e4197bc1f431fd7e555a31e6f7f1e020b4ec8f4c Mon Sep 17 00:00:00 2001 | 1 | From 51e29c0a1d98948118e5135bb817a96811105d39 Mon Sep 17 00:00:00 2001 |
| 2 | From: Li xin <lixin.fnst@cn.fujitsu.com> | 2 | From: Li xin <lixin.fnst@cn.fujitsu.com> |
| 3 | Date: Fri, 19 Jun 2015 16:45:54 +0900 | 3 | Date: Fri, 19 Jun 2015 16:45:54 +0900 |
| 4 | Subject: [PATCH] Fix makedefs | 4 | Subject: [PATCH] Fix makedefs |
| @@ -19,10 +19,10 @@ Signed-off-by: Yao Zhao <yao.zhao@windriver.com> | |||
| 19 | 1 file changed, 11 insertions(+), 16 deletions(-) | 19 | 1 file changed, 11 insertions(+), 16 deletions(-) |
| 20 | 20 | ||
| 21 | diff --git a/makedefs b/makedefs | 21 | diff --git a/makedefs b/makedefs |
| 22 | index a740e41..28fb128 100644 | 22 | index d5103ce..9713327 100644 |
| 23 | --- a/makedefs | 23 | --- a/makedefs |
| 24 | +++ b/makedefs | 24 | +++ b/makedefs |
| 25 | @@ -230,9 +230,6 @@ echo "# pie=$pie" | 25 | @@ -232,9 +232,6 @@ echo "# pie=$pie" |
| 26 | 26 | ||
| 27 | # Defaults for most sane systems | 27 | # Defaults for most sane systems |
| 28 | 28 | ||
| @@ -32,7 +32,7 @@ index a740e41..28fb128 100644 | |||
| 32 | ARFL=rv | 32 | ARFL=rv |
| 33 | 33 | ||
| 34 | # Ugly function to make our error message more visible among the | 34 | # Ugly function to make our error message more visible among the |
| 35 | @@ -563,12 +560,12 @@ case "$SYSTEM.$RELEASE" in | 35 | @@ -608,12 +605,12 @@ case "$SYSTEM.$RELEASE" in |
| 36 | case "$CCARGS" in | 36 | case "$CCARGS" in |
| 37 | *-DNO_DB*) ;; | 37 | *-DNO_DB*) ;; |
| 38 | *-DHAS_DB*) ;; | 38 | *-DHAS_DB*) ;; |
| @@ -48,8 +48,8 @@ index a740e41..28fb128 100644 | |||
| 48 | else | 48 | else |
| 49 | # No, we're not going to try db1 db2 db3 etc. | 49 | # No, we're not going to try db1 db2 db3 etc. |
| 50 | # On a properly installed system, Postfix builds | 50 | # On a properly installed system, Postfix builds |
| 51 | @@ -577,12 +574,12 @@ case "$SYSTEM.$RELEASE" in | 51 | @@ -623,12 +620,12 @@ case "$SYSTEM.$RELEASE" in |
| 52 | echo "Install the appropriate db*-devel package first." 1>&2 | 52 | echo "Alternatively, build with CCARGS=\"-NO_DB ...\"" 1>&2 |
| 53 | exit 1 | 53 | exit 1 |
| 54 | fi | 54 | fi |
| 55 | - SYSLIBS="-ldb" | 55 | - SYSLIBS="-ldb" |
| @@ -63,7 +63,7 @@ index a740e41..28fb128 100644 | |||
| 63 | do | 63 | do |
| 64 | test -e $lib/lib$name.a -o -e $lib/lib$name.so && { | 64 | test -e $lib/lib$name.a -o -e $lib/lib$name.so && { |
| 65 | SYSLIBS="$SYSLIBS -l$name" | 65 | SYSLIBS="$SYSLIBS -l$name" |
| 66 | @@ -602,7 +599,7 @@ case "$SYSTEM.$RELEASE" in | 66 | @@ -648,7 +645,7 @@ case "$SYSTEM.$RELEASE" in |
| 67 | if [ `expr "X$CCARGS" : "X.*-DNO_EPOLL"` -gt 0 ] | 67 | if [ `expr "X$CCARGS" : "X.*-DNO_EPOLL"` -gt 0 ] |
| 68 | then | 68 | then |
| 69 | : | 69 | : |
| @@ -72,7 +72,7 @@ index a740e41..28fb128 100644 | |||
| 72 | then | 72 | then |
| 73 | echo CCARGS="$CCARGS -DNO_EPOLL" | 73 | echo CCARGS="$CCARGS -DNO_EPOLL" |
| 74 | else | 74 | else |
| 75 | @@ -626,8 +623,6 @@ int main(int argc, char **argv) | 75 | @@ -672,8 +669,6 @@ int main(int argc, char **argv) |
| 76 | } | 76 | } |
| 77 | EOF | 77 | EOF |
| 78 | ${CC-gcc} -o makedefs.test makedefs.test.c || exit 1 | 78 | ${CC-gcc} -o makedefs.test makedefs.test.c || exit 1 |
| @@ -81,7 +81,7 @@ index a740e41..28fb128 100644 | |||
| 81 | rm -f makedefs.test makedefs.test.[co] | 81 | rm -f makedefs.test makedefs.test.[co] |
| 82 | fi;; | 82 | fi;; |
| 83 | esac | 83 | esac |
| 84 | @@ -644,12 +639,12 @@ EOF | 84 | @@ -690,12 +685,12 @@ EOF |
| 85 | case "$CCARGS" in | 85 | case "$CCARGS" in |
| 86 | *-DNO_DB*) ;; | 86 | *-DNO_DB*) ;; |
| 87 | *-DHAS_DB*) ;; | 87 | *-DHAS_DB*) ;; |
| @@ -97,8 +97,8 @@ index a740e41..28fb128 100644 | |||
| 97 | else | 97 | else |
| 98 | # On a properly installed system, Postfix builds | 98 | # On a properly installed system, Postfix builds |
| 99 | # by including <db.h> and by linking with -ldb | 99 | # by including <db.h> and by linking with -ldb |
| 100 | @@ -657,12 +652,12 @@ EOF | 100 | @@ -705,12 +700,12 @@ EOF |
| 101 | echo "Install the appropriate db*-devel package first." 1>&2 | 101 | echo "See: https://www.postfix.org/NON_BERKELEYDB_README.html#build-conf" 1>&2 |
| 102 | exit 1 | 102 | exit 1 |
| 103 | fi | 103 | fi |
| 104 | - SYSLIBS="-ldb" | 104 | - SYSLIBS="-ldb" |
| @@ -112,6 +112,3 @@ index a740e41..28fb128 100644 | |||
| 112 | do | 112 | do |
| 113 | test -e $lib/lib$name.a -o -e $lib/lib$name.so && { | 113 | test -e $lib/lib$name.a -o -e $lib/lib$name.so && { |
| 114 | SYSLIBS="$SYSLIBS -l$name" | 114 | SYSLIBS="$SYSLIBS -l$name" |
| 115 | -- | ||
| 116 | 2.25.1 | ||
| 117 | |||
diff --git a/meta-networking/recipes-daemons/postfix/files/0001-makedefs-Account-for-linux-7.x-version.patch b/meta-networking/recipes-daemons/postfix/files/0001-makedefs-Account-for-linux-7.x-version.patch new file mode 100644 index 0000000000..4bc59ace7d --- /dev/null +++ b/meta-networking/recipes-daemons/postfix/files/0001-makedefs-Account-for-linux-7.x-version.patch | |||
| @@ -0,0 +1,47 @@ | |||
| 1 | From 5466d510dfbc2b7a81dcf766f83d2c89066c0446 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Changqing Li <changqing.li@windriver.com> | ||
| 3 | Date: Mon, 11 May 2026 18:16:07 +0000 | ||
| 4 | Subject: [PATCH] makedefs: Account for linux 7.x version | ||
| 5 | |||
| 6 | Major version has bumped to 7, update the scripts | ||
| 7 | |||
| 8 | Upstream-Status: Backport [The latest stable version 3.11 already fixed] | ||
| 9 | |||
| 10 | Refer: | ||
| 11 | https://www.ftp.saix.net/MTA/postfix/index.html | ||
| 12 | |||
| 13 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
| 14 | --- | ||
| 15 | makedefs | 2 +- | ||
| 16 | src/util/sys_defs.h | 2 +- | ||
| 17 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
| 18 | |||
| 19 | diff --git a/makedefs b/makedefs | ||
| 20 | index 74b103d..fe8c618 100644 | ||
| 21 | --- a/makedefs | ||
| 22 | +++ b/makedefs | ||
| 23 | @@ -625,7 +625,7 @@ EOF | ||
| 24 | : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} | ||
| 25 | : ${PLUGIN_LD="${CC-gcc} -shared"} | ||
| 26 | ;; | ||
| 27 | - Linux.[3456].*) | ||
| 28 | + Linux.[34567].*) | ||
| 29 | SYSTYPE=LINUX$RELEASE_MAJOR | ||
| 30 | case "$CCARGS" in | ||
| 31 | *-DNO_DB*) ;; | ||
| 32 | diff --git a/src/util/sys_defs.h b/src/util/sys_defs.h | ||
| 33 | index 70aab23..c5472eb 100644 | ||
| 34 | --- a/src/util/sys_defs.h | ||
| 35 | +++ b/src/util/sys_defs.h | ||
| 36 | @@ -763,7 +763,7 @@ extern int initgroups(const char *, int); | ||
| 37 | * LINUX. | ||
| 38 | */ | ||
| 39 | #if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) || defined(LINUX5) \ | ||
| 40 | - || defined(LINUX6) | ||
| 41 | + || defined(LINUX6) || defined(LINUX7) | ||
| 42 | #define SUPPORTED | ||
| 43 | #define UINT32_TYPE unsigned int | ||
| 44 | #define UINT16_TYPE unsigned short | ||
| 45 | -- | ||
| 46 | 2.53.0 | ||
| 47 | |||
diff --git a/meta-networking/recipes-daemons/postfix/files/0002-Change-fixed-postconf-to-a-variable-for-cross-compil.patch b/meta-networking/recipes-daemons/postfix/files/0002-Change-fixed-postconf-to-a-variable-for-cross-compil.patch index d46efb95cb..a74c46fa92 100644 --- a/meta-networking/recipes-daemons/postfix/files/0002-Change-fixed-postconf-to-a-variable-for-cross-compil.patch +++ b/meta-networking/recipes-daemons/postfix/files/0002-Change-fixed-postconf-to-a-variable-for-cross-compil.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 953719878466c55572294f42e85127bda5d34999 Mon Sep 17 00:00:00 2001 | 1 | From ce8deeaac8ca5d7329e1923790a1f35798953799 Mon Sep 17 00:00:00 2001 |
| 2 | From: Li xin <lixin.fnst@cn.fujitsu.com> | 2 | From: Li xin <lixin.fnst@cn.fujitsu.com> |
| 3 | Date: Fri, 19 Jun 2015 17:14:58 +0900 | 3 | Date: Fri, 19 Jun 2015 17:14:58 +0900 |
| 4 | Subject: [PATCH] Change fixed postconf to a variable for cross-compiling | 4 | Subject: [PATCH] Change fixed postconf to a variable for cross-compiling |
| @@ -12,10 +12,10 @@ Signed-off-by: Yao Zhao <yao.zhao@windriver.com> | |||
| 12 | 2 files changed, 11 insertions(+), 9 deletions(-) | 12 | 2 files changed, 11 insertions(+), 9 deletions(-) |
| 13 | 13 | ||
| 14 | diff --git a/Makefile.in b/Makefile.in | 14 | diff --git a/Makefile.in b/Makefile.in |
| 15 | index a37f89f..17cb64b 100644 | 15 | index 8d7501a..d2a85e8 100644 |
| 16 | --- a/Makefile.in | 16 | --- a/Makefile.in |
| 17 | +++ b/Makefile.in | 17 | +++ b/Makefile.in |
| 18 | @@ -22,7 +22,7 @@ META = meta/main.cf.proto meta/master.cf.proto meta/postfix-files \ | 18 | @@ -23,7 +23,7 @@ META = meta/main.cf.proto meta/master.cf.proto meta/postfix-files \ |
| 19 | EXPAND = sed -e "s;\$${LIB_PREFIX};$(LIB_PREFIX);" \ | 19 | EXPAND = sed -e "s;\$${LIB_PREFIX};$(LIB_PREFIX);" \ |
| 20 | -e "s;\$${LIB_SUFFIX};$(LIB_SUFFIX);" | 20 | -e "s;\$${LIB_SUFFIX};$(LIB_SUFFIX);" |
| 21 | SHLIB_DIR_OVERRIDE = \ | 21 | SHLIB_DIR_OVERRIDE = \ |
| @@ -102,6 +102,3 @@ index 563ee27..00d4651 100644 | |||
| 102 | "daemon_directory = $daemon_directory" \ | 102 | "daemon_directory = $daemon_directory" \ |
| 103 | "data_directory = $data_directory" \ | 103 | "data_directory = $data_directory" \ |
| 104 | "command_directory = $command_directory" \ | 104 | "command_directory = $command_directory" \ |
| 105 | -- | ||
| 106 | 2.25.1 | ||
| 107 | |||
diff --git a/meta-networking/recipes-daemons/postfix/files/0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch b/meta-networking/recipes-daemons/postfix/files/0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch index 6f8e3e84da..201b4741de 100644 --- a/meta-networking/recipes-daemons/postfix/files/0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch +++ b/meta-networking/recipes-daemons/postfix/files/0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From a8ec63a71361ccd3f6d2959c4c87b7824282b291 Mon Sep 17 00:00:00 2001 | 1 | From fc51d9145210350577fdb29a9b0680df779ae347 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sat, 26 Aug 2017 10:29:37 -0700 | 3 | Date: Sat, 26 Aug 2017 10:29:37 -0700 |
| 4 | Subject: [PATCH] makedefs: Use native compiler to build makedefs.test | 4 | Subject: [PATCH] makedefs: Use native compiler to build makedefs.test |
| @@ -13,10 +13,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
| 13 | 1 file changed, 5 insertions(+), 5 deletions(-) | 13 | 1 file changed, 5 insertions(+), 5 deletions(-) |
| 14 | 14 | ||
| 15 | diff --git a/makedefs b/makedefs | 15 | diff --git a/makedefs b/makedefs |
| 16 | index 28fb128..313b401 100644 | 16 | index 9713327..e879832 100644 |
| 17 | --- a/makedefs | 17 | --- a/makedefs |
| 18 | +++ b/makedefs | 18 | +++ b/makedefs |
| 19 | @@ -622,7 +622,7 @@ int main(int argc, char **argv) | 19 | @@ -668,7 +668,7 @@ int main(int argc, char **argv) |
| 20 | exit(0); | 20 | exit(0); |
| 21 | } | 21 | } |
| 22 | EOF | 22 | EOF |
| @@ -25,7 +25,7 @@ index 28fb128..313b401 100644 | |||
| 25 | rm -f makedefs.test makedefs.test.[co] | 25 | rm -f makedefs.test makedefs.test.[co] |
| 26 | fi;; | 26 | fi;; |
| 27 | esac | 27 | esac |
| 28 | @@ -865,7 +865,7 @@ int main(int argc, char **argv) | 28 | @@ -914,7 +914,7 @@ int main(int argc, char **argv) |
| 29 | exit(0); | 29 | exit(0); |
| 30 | } | 30 | } |
| 31 | EOF | 31 | EOF |
| @@ -34,7 +34,7 @@ index 28fb128..313b401 100644 | |||
| 34 | ./makedefs.test 2>/dev/null || | 34 | ./makedefs.test 2>/dev/null || |
| 35 | CCARGS="$CCARGS -DNO_SIGSETJMP" | 35 | CCARGS="$CCARGS -DNO_SIGSETJMP" |
| 36 | rm -f makedefs.test makedefs.test.[co] | 36 | rm -f makedefs.test makedefs.test.[co] |
| 37 | @@ -903,7 +903,7 @@ int main(int argc, char **argv) | 37 | @@ -952,7 +952,7 @@ int main(int argc, char **argv) |
| 38 | &error) != 14); | 38 | &error) != 14); |
| 39 | } | 39 | } |
| 40 | EOF | 40 | EOF |
| @@ -43,7 +43,7 @@ index 28fb128..313b401 100644 | |||
| 43 | $icu_ldflags >/dev/null 2>&1 | 43 | $icu_ldflags >/dev/null 2>&1 |
| 44 | if ./makedefs.test 2>/dev/null ; then | 44 | if ./makedefs.test 2>/dev/null ; then |
| 45 | CCARGS="$CCARGS $icu_cppflags" | 45 | CCARGS="$CCARGS $icu_cppflags" |
| 46 | @@ -1024,7 +1024,7 @@ int main(void) | 46 | @@ -1088,7 +1088,7 @@ int main(void) |
| 47 | exit(ferror(stdout) ? 1 : 0); | 47 | exit(ferror(stdout) ? 1 : 0); |
| 48 | } | 48 | } |
| 49 | EOF | 49 | EOF |
| @@ -52,7 +52,7 @@ index 28fb128..313b401 100644 | |||
| 52 | ./makedefs.test || exit 1 | 52 | ./makedefs.test || exit 1 |
| 53 | rm -f makedefs.test makedefs.test.[co] | 53 | rm -f makedefs.test makedefs.test.[co] |
| 54 | } | 54 | } |
| 55 | @@ -1180,7 +1180,7 @@ int main(void) | 55 | @@ -1245,7 +1245,7 @@ int main(void) |
| 56 | exit(ferror(stdout) ? 1 : 0); | 56 | exit(ferror(stdout) ? 1 : 0); |
| 57 | } | 57 | } |
| 58 | EOF | 58 | EOF |
| @@ -61,6 +61,3 @@ index 28fb128..313b401 100644 | |||
| 61 | parm_val=`./makedefs.test` || exit 1 | 61 | parm_val=`./makedefs.test` || exit 1 |
| 62 | rm -f makedefs.test makedefs.test.[co] | 62 | rm -f makedefs.test makedefs.test.[co] |
| 63 | eval ${parm_name}=\""\$parm_val"\" | 63 | eval ${parm_name}=\""\$parm_val"\" |
| 64 | -- | ||
| 65 | 2.25.1 | ||
| 66 | |||
diff --git a/meta-networking/recipes-daemons/postfix/files/0004-Fix-icu-config.patch b/meta-networking/recipes-daemons/postfix/files/0004-Fix-icu-config.patch index 0660ee098e..daf5c7089e 100644 --- a/meta-networking/recipes-daemons/postfix/files/0004-Fix-icu-config.patch +++ b/meta-networking/recipes-daemons/postfix/files/0004-Fix-icu-config.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 404150f53bb49af987d7338a808f47fdbd50ba7f Mon Sep 17 00:00:00 2001 | 1 | From b63facf538af99e7c79ebee8d41abd52e7d5ee5e Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sun, 16 Jan 2022 11:21:54 +0800 | 3 | Date: Sun, 16 Jan 2022 11:21:54 +0800 |
| 4 | Subject: [PATCH] Fix icu config | 4 | Subject: [PATCH] Fix icu config |
| @@ -18,10 +18,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
| 18 | 1 file changed, 1 deletion(-) | 18 | 1 file changed, 1 deletion(-) |
| 19 | 19 | ||
| 20 | diff --git a/makedefs b/makedefs | 20 | diff --git a/makedefs b/makedefs |
| 21 | index 313b401..e5db212 100644 | 21 | index e879832..f9c132e 100644 |
| 22 | --- a/makedefs | 22 | --- a/makedefs |
| 23 | +++ b/makedefs | 23 | +++ b/makedefs |
| 24 | @@ -906,7 +906,6 @@ EOF | 24 | @@ -955,7 +955,6 @@ EOF |
| 25 | ${BUILD_CC-gcc} -o makedefs.test makedefs.test.c $icu_cppflags \ | 25 | ${BUILD_CC-gcc} -o makedefs.test makedefs.test.c $icu_cppflags \ |
| 26 | $icu_ldflags >/dev/null 2>&1 | 26 | $icu_ldflags >/dev/null 2>&1 |
| 27 | if ./makedefs.test 2>/dev/null ; then | 27 | if ./makedefs.test 2>/dev/null ; then |
| @@ -29,6 +29,3 @@ index 313b401..e5db212 100644 | |||
| 29 | SYSLIBS="$SYSLIBS $icu_ldflags" | 29 | SYSLIBS="$SYSLIBS $icu_ldflags" |
| 30 | else | 30 | else |
| 31 | CCARGS="$CCARGS -DNO_EAI" | 31 | CCARGS="$CCARGS -DNO_EAI" |
| 32 | -- | ||
| 33 | 2.25.1 | ||
| 34 | |||
diff --git a/meta-networking/recipes-daemons/postfix/files/0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch b/meta-networking/recipes-daemons/postfix/files/0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch index 1571aa844d..c2e640d6ff 100644 --- a/meta-networking/recipes-daemons/postfix/files/0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch +++ b/meta-networking/recipes-daemons/postfix/files/0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 25e7d1a9bc64f39666eb0e2b9b175773615e28d2 Mon Sep 17 00:00:00 2001 | 1 | From fb5b16db0282b5d80edb0ccc6f0f197a7f663610 Mon Sep 17 00:00:00 2001 |
| 2 | From: Yi Zhao <yi.zhao@windriver.com> | 2 | From: Yi Zhao <yi.zhao@windriver.com> |
| 3 | Date: Fri, 12 Oct 2018 12:38:02 +0800 | 3 | Date: Fri, 12 Oct 2018 12:38:02 +0800 |
| 4 | Subject: [PATCH] makedefs: add -lnsl and -lresolv to SYSLIBS by default | 4 | Subject: [PATCH] makedefs: add -lnsl and -lresolv to SYSLIBS by default |
| @@ -14,10 +14,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | |||
| 14 | 1 file changed, 2 insertions(+), 20 deletions(-) | 14 | 1 file changed, 2 insertions(+), 20 deletions(-) |
| 15 | 15 | ||
| 16 | diff --git a/makedefs b/makedefs | 16 | diff --git a/makedefs b/makedefs |
| 17 | index e5db212..b00049b 100644 | 17 | index f9c132e..5ebef5b 100644 |
| 18 | --- a/makedefs | 18 | --- a/makedefs |
| 19 | +++ b/makedefs | 19 | +++ b/makedefs |
| 20 | @@ -577,16 +577,7 @@ case "$SYSTEM.$RELEASE" in | 20 | @@ -623,16 +623,7 @@ case "$SYSTEM.$RELEASE" in |
| 21 | SYSLIBS="$SYSLIBS -ldb" | 21 | SYSLIBS="$SYSLIBS -ldb" |
| 22 | ;; | 22 | ;; |
| 23 | esac | 23 | esac |
| @@ -35,7 +35,7 @@ index e5db212..b00049b 100644 | |||
| 35 | # Kernel 2.4 added IPv6 | 35 | # Kernel 2.4 added IPv6 |
| 36 | case "$RELEASE" in | 36 | case "$RELEASE" in |
| 37 | 2.[0-3].*) CCARGS="$CCARGS -DNO_IPV6";; | 37 | 2.[0-3].*) CCARGS="$CCARGS -DNO_IPV6";; |
| 38 | @@ -655,16 +646,7 @@ EOF | 38 | @@ -703,16 +694,7 @@ EOF |
| 39 | SYSLIBS="$SYSLIBS -ldb" | 39 | SYSLIBS="$SYSLIBS -ldb" |
| 40 | ;; | 40 | ;; |
| 41 | esac | 41 | esac |
| @@ -53,6 +53,3 @@ index e5db212..b00049b 100644 | |||
| 53 | SYSLIBS="$SYSLIBS -ldl" | 53 | SYSLIBS="$SYSLIBS -ldl" |
| 54 | : ${SHLIB_SUFFIX=.so} | 54 | : ${SHLIB_SUFFIX=.so} |
| 55 | : ${SHLIB_CFLAGS=-fPIC} | 55 | : ${SHLIB_CFLAGS=-fPIC} |
| 56 | -- | ||
| 57 | 2.25.1 | ||
| 58 | |||
diff --git a/meta-networking/recipes-daemons/postfix/postfix_3.10.8.bb b/meta-networking/recipes-daemons/postfix/postfix_3.11.3.bb index 2423e17169..0c38c743e7 100644 --- a/meta-networking/recipes-daemons/postfix/postfix_3.10.8.bb +++ b/meta-networking/recipes-daemons/postfix/postfix_3.11.3.bb | |||
| @@ -26,9 +26,10 @@ SRC_URI = "http://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${P | |||
| 26 | file://0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch \ | 26 | file://0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch \ |
| 27 | file://0004-Fix-icu-config.patch \ | 27 | file://0004-Fix-icu-config.patch \ |
| 28 | file://0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch \ | 28 | file://0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch \ |
| 29 | file://0001-Fix-build-with-musl.patch \ | ||
| 29 | " | 30 | " |
| 30 | 31 | ||
| 31 | SRC_URI[sha256sum] = "31d4b3eb8093d823b5a151f571719ff7c0462571bc95e6440d87ca525bfb096c" | 32 | SRC_URI[sha256sum] = "bd11dcc463d7045e40f2c11cc00216489c73b58cc40b3d06c54265b088a173e1" |
| 32 | 33 | ||
| 33 | UPSTREAM_CHECK_URI = "https://www.postfix.org/announcements.html" | 34 | UPSTREAM_CHECK_URI = "https://www.postfix.org/announcements.html" |
| 34 | UPSTREAM_CHECK_REGEX = "postfix-(?P<pver>\d+(\.\d+)+)" | 35 | UPSTREAM_CHECK_REGEX = "postfix-(?P<pver>\d+(\.\d+)+)" |
| @@ -240,8 +241,8 @@ pkg_postinst_ontarget:${PN}-cfg () { | |||
| 240 | } | 241 | } |
| 241 | 242 | ||
| 242 | PACKAGES =+ "${PN}-cfg" | 243 | PACKAGES =+ "${PN}-cfg" |
| 243 | RDEPENDS:${PN}-cfg:class-target += "${PN}-bin" | 244 | RDEPENDS:${PN}-cfg:append:class-target = " ${PN}-bin" |
| 244 | RDEPENDS:${PN}:class-target += "${PN}-cfg" | 245 | RDEPENDS:${PN}:append:class-target = " ${PN}-cfg" |
| 245 | # Exclude .debug directories from the main package | 246 | # Exclude .debug directories from the main package |
| 246 | FILES:${PN}-bin += "${localstatedir} ${bindir}/* ${sbindir}/* \ | 247 | FILES:${PN}-bin += "${localstatedir} ${bindir}/* ${sbindir}/* \ |
| 247 | ${libexecdir}/* ${systemd_unitdir}/*" | 248 | ${libexecdir}/* ${systemd_unitdir}/*" |
diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.9.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.9b.bb index d64e0a0495..3da67c9e1c 100644 --- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.9.bb +++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.9b.bb | |||
| @@ -4,8 +4,8 @@ HOMEPAGE = "http://www.proftpd.org" | |||
| 4 | LICENSE = "GPL-2.0-or-later" | 4 | LICENSE = "GPL-2.0-or-later" |
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=fb0d1484d11915fa88a6a7702f1dc184" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=fb0d1484d11915fa88a6a7702f1dc184" |
| 6 | 6 | ||
| 7 | SRCREV = "ae25959adb05ae1d6ebfa1f36bf778c9c34e9410" | 7 | SRCREV = "390b21555268bbc64b66d2dfa7ae40476419b80f" |
| 8 | BRANCH = "${PV}" | 8 | BRANCH = "1.3.9" |
| 9 | 9 | ||
| 10 | SRC_URI = "git://github.com/proftpd/proftpd.git;branch=${BRANCH};protocol=https;tag=v${PV} \ | 10 | SRC_URI = "git://github.com/proftpd/proftpd.git;branch=${BRANCH};protocol=https;tag=v${PV} \ |
| 11 | file://basic.conf.patch \ | 11 | file://basic.conf.patch \ |
diff --git a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.53.bb b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.54.bb index 02a10f8e84..222a0bb731 100644 --- a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.53.bb +++ b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.54.bb | |||
| @@ -11,7 +11,7 @@ SRC_URI = "http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${PV}.t | |||
| 11 | file://0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch \ | 11 | file://0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch \ |
| 12 | file://nostrip.patch \ | 12 | file://nostrip.patch \ |
| 13 | " | 13 | " |
| 14 | SRC_URI[sha256sum] = "b3f2b0194223b1e88bf8b0df9e91ffb5d1b9812356e9dd465f2f97b72b21265f" | 14 | SRC_URI[sha256sum] = "dc9140420ec44f7829579591ff378aa6396b4604b9c6aeae847368e0f35bd7b2" |
| 15 | 15 | ||
| 16 | inherit autotools | 16 | inherit autotools |
| 17 | 17 | ||
diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/0001-__progname-is-provided-by-libc.patch b/meta-networking/recipes-daemons/tftp-hpa/files/0001-__progname-is-provided-by-libc.patch deleted file mode 100644 index 66c15b5f8b..0000000000 --- a/meta-networking/recipes-daemons/tftp-hpa/files/0001-__progname-is-provided-by-libc.patch +++ /dev/null | |||
| @@ -1,64 +0,0 @@ | |||
| 1 | From 941038fc05be21202cab7a7a9434097fb55ecbe0 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Thorsten Glaser <tg@mirbsd.de> | ||
| 3 | Date: Thu, 31 Jul 2014 16:29:41 +0930 | ||
| 4 | Subject: [PATCH] __progname[] is provided by libc | ||
| 5 | |||
| 6 | Rename local variable to tftpd_progname to avoid a clash with glibc | ||
| 7 | global symbols and work around Debian bug #519006 (Closes: #564052). | ||
| 8 | |||
| 9 | [ hpa: specifically, double-underscore symbols in C are reserved for | ||
| 10 | the implementation, i.e. compiler/libc. ] | ||
| 11 | |||
| 12 | Signed-off-by: Ron Lee <ron@debian.org> | ||
| 13 | Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> | ||
| 14 | --- | ||
| 15 | Upstream-Status: Pending | ||
| 16 | |||
| 17 | tftpd/tftpd.c | 10 +++++----- | ||
| 18 | 1 file changed, 5 insertions(+), 5 deletions(-) | ||
| 19 | |||
| 20 | diff --git a/tftpd/tftpd.c b/tftpd/tftpd.c | ||
| 21 | index e247b97..5fec7bf 100644 | ||
| 22 | --- a/tftpd/tftpd.c | ||
| 23 | +++ b/tftpd/tftpd.c | ||
| 24 | @@ -76,7 +76,7 @@ static int ai_fam = AF_INET; | ||
| 25 | #define TRIES 6 /* Number of attempts to send each packet */ | ||
| 26 | #define TIMEOUT_LIMIT ((1 << TRIES)-1) | ||
| 27 | |||
| 28 | -const char *__progname; | ||
| 29 | +const char *tftpd_progname; | ||
| 30 | static int peer; | ||
| 31 | static unsigned long timeout = TIMEOUT; /* Current timeout value */ | ||
| 32 | static unsigned long rexmtval = TIMEOUT; /* Basic timeout value */ | ||
| 33 | @@ -395,9 +395,9 @@ int main(int argc, char **argv) | ||
| 34 | /* basename() is way too much of a pain from a portability standpoint */ | ||
| 35 | |||
| 36 | p = strrchr(argv[0], '/'); | ||
| 37 | - __progname = (p && p[1]) ? p + 1 : argv[0]; | ||
| 38 | + tftpd_progname = (p && p[1]) ? p + 1 : argv[0]; | ||
| 39 | |||
| 40 | - openlog(__progname, LOG_PID | LOG_NDELAY, LOG_DAEMON); | ||
| 41 | + openlog(tftpd_progname, LOG_PID | LOG_NDELAY, LOG_DAEMON); | ||
| 42 | |||
| 43 | srand(time(NULL) ^ getpid()); | ||
| 44 | |||
| 45 | @@ -946,14 +946,14 @@ int main(int argc, char **argv) | ||
| 46 | syslog daemon gets restarted by the time we get here. */ | ||
| 47 | if (secure && standalone) { | ||
| 48 | closelog(); | ||
| 49 | - openlog(__progname, LOG_PID | LOG_NDELAY, LOG_DAEMON); | ||
| 50 | + openlog(tftpd_progname, LOG_PID | LOG_NDELAY, LOG_DAEMON); | ||
| 51 | } | ||
| 52 | |||
| 53 | #ifdef HAVE_TCPWRAPPERS | ||
| 54 | /* Verify if this was a legal request for us. This has to be | ||
| 55 | done before the chroot, while /etc is still accessible. */ | ||
| 56 | request_init(&wrap_request, | ||
| 57 | - RQ_DAEMON, __progname, | ||
| 58 | + RQ_DAEMON, tftpd_progname, | ||
| 59 | RQ_FILE, fd, | ||
| 60 | RQ_CLIENT_SIN, &from, RQ_SERVER_SIN, &myaddr, 0); | ||
| 61 | sock_methods(&wrap_request); | ||
| 62 | -- | ||
| 63 | 2.14.1 | ||
| 64 | |||
diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/0001-tftp-Mark-toplevel-definition-as-external.patch b/meta-networking/recipes-daemons/tftp-hpa/files/0001-tftp-Mark-toplevel-definition-as-external.patch deleted file mode 100644 index 646757c783..0000000000 --- a/meta-networking/recipes-daemons/tftp-hpa/files/0001-tftp-Mark-toplevel-definition-as-external.patch +++ /dev/null | |||
| @@ -1,30 +0,0 @@ | |||
| 1 | From 2a12174a5059e84d4ff6fad8f983a4d0f2127e73 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Wed, 12 Aug 2020 12:17:31 -0700 | ||
| 4 | Subject: [PATCH] tftp: Mark toplevel definition as external | ||
| 5 | |||
| 6 | Fixes | ||
| 7 | multiple definition of `toplevel'; tftp.o:/usr/src/debug/tftp-hpa/5.2-r0/tftp-hpa-5.2/tftp/tftp.c:51: first defined here | ||
| 8 | |||
| 9 | Upstream-Status: Pending | ||
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 11 | --- | ||
| 12 | tftp/tftp.c | 2 +- | ||
| 13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 14 | |||
| 15 | diff --git a/tftp/tftp.c b/tftp/tftp.c | ||
| 16 | index 9d15022..109848c 100644 | ||
| 17 | --- a/tftp/tftp.c | ||
| 18 | +++ b/tftp/tftp.c | ||
| 19 | @@ -48,7 +48,7 @@ extern int maxtimeout; | ||
| 20 | #define PKTSIZE SEGSIZE+4 | ||
| 21 | char ackbuf[PKTSIZE]; | ||
| 22 | int timeout; | ||
| 23 | -sigjmp_buf toplevel; | ||
| 24 | +extern sigjmp_buf toplevel; | ||
| 25 | sigjmp_buf timeoutbuf; | ||
| 26 | |||
| 27 | static void nak(int, const char *); | ||
| 28 | -- | ||
| 29 | 2.28.0 | ||
| 30 | |||
diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/0001-tftp-Remove-double-inclusion-of-signal.h.patch b/meta-networking/recipes-daemons/tftp-hpa/files/0001-tftp-Remove-double-inclusion-of-signal.h.patch deleted file mode 100644 index 84658d667b..0000000000 --- a/meta-networking/recipes-daemons/tftp-hpa/files/0001-tftp-Remove-double-inclusion-of-signal.h.patch +++ /dev/null | |||
| @@ -1,39 +0,0 @@ | |||
| 1 | From e9ed48d91642d384ce07cbb9bec788f07fc6354c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Tue, 6 Sep 2022 14:51:42 -0700 | ||
| 4 | Subject: [PATCH] tftp: Remove double inclusion of signal.h | ||
| 5 | |||
| 6 | Undefine __USE_XOPEN2K8 so we can get bsd_signal definition from system | ||
| 7 | headers | ||
| 8 | |||
| 9 | Upstream-Status: Pending | ||
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 11 | --- | ||
| 12 | config.h | 4 +++- | ||
| 13 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
| 14 | |||
| 15 | diff --git a/config.h b/config.h | ||
| 16 | index 3ff2915..ae1a14b 100644 | ||
| 17 | --- a/config.h | ||
| 18 | +++ b/config.h | ||
| 19 | @@ -93,7 +93,6 @@ | ||
| 20 | #endif | ||
| 21 | |||
| 22 | #include <errno.h> | ||
| 23 | -#include <signal.h> | ||
| 24 | |||
| 25 | #ifdef HAVE_SYS_SOCKET_H | ||
| 26 | #include <sys/socket.h> | ||
| 27 | @@ -296,6 +295,9 @@ char *xstrdup(const char *); | ||
| 28 | |||
| 29 | #ifndef HAVE_BSD_SIGNAL | ||
| 30 | void (*bsd_signal(int, void (*)(int))) (int); | ||
| 31 | +#else | ||
| 32 | +#undef __USE_XOPEN2K8 | ||
| 33 | +#include <signal.h> | ||
| 34 | #endif | ||
| 35 | #ifndef HAVE_DUP2 | ||
| 36 | int dup2(int, int); | ||
| 37 | -- | ||
| 38 | 2.37.3 | ||
| 39 | |||
diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/add-error-check-for-disk-filled-up.patch b/meta-networking/recipes-daemons/tftp-hpa/files/add-error-check-for-disk-filled-up.patch index e4acd099ab..0f324a3265 100644 --- a/meta-networking/recipes-daemons/tftp-hpa/files/add-error-check-for-disk-filled-up.patch +++ b/meta-networking/recipes-daemons/tftp-hpa/files/add-error-check-for-disk-filled-up.patch | |||
| @@ -1,19 +1,19 @@ | |||
| 1 | From bd5773947af5ca80ca546ad5625818fc912bdd60 Mon Sep 17 00:00:00 2001 | 1 | From 0b89c5bd9723ebd5207590016a14e5f2c6a0bdc9 Mon Sep 17 00:00:00 2001 |
| 2 | From: "Roy.Li" <rongqing.li@windriver.com> | 2 | From: "Roy.Li" <rongqing.li@windriver.com> |
| 3 | Date: Thu, 22 Aug 2013 08:56:09 +0800 | 3 | Date: Thu, 22 Aug 2013 08:56:09 +0800 |
| 4 | Subject: [PATCH] tftp-hpa: add error check for disk filled up | 4 | Subject: [PATCH] tftp-hpa: add error check for disk filled up |
| 5 | 5 | ||
| 6 | Upstream-Status: Pending [Sent to http://www.syslinux.org/archives/2013-August/020765.html] | ||
| 7 | |||
| 8 | Add error check when the write-buffer is finally flushed to the file, | 6 | Add error check when the write-buffer is finally flushed to the file, |
| 9 | the caller can detect if the disk filled up (or had an i/o error) and | 7 | the caller can detect if the disk filled up (or had an i/o error) and |
| 10 | return a NOSAPCE nak to the other side. | 8 | return a NOSAPCE nak to the other side. |
| 11 | 9 | ||
| 10 | Upstream-Status: Pending [Sent to http://www.syslinux.org/archives/2013-August/020765.html] | ||
| 11 | |||
| 12 | Signed-off-by: Ming Liu <ming.liu@windriver.com> | 12 | Signed-off-by: Ming Liu <ming.liu@windriver.com> |
| 13 | Signed-off-by: Roy.Li <rongqing.li@windriver.com> | 13 | Signed-off-by: Roy.Li <rongqing.li@windriver.com> |
| 14 | --- | 14 | --- |
| 15 | common/tftpsubs.c | 8 +++++--- | 15 | common/tftpsubs.c | 8 +++++--- |
| 16 | tftpd/tftpd.c | 12 ++++++++++-- | 16 | tftpd/tftpd.c | 12 ++++++++++-- |
| 17 | 2 files changed, 15 insertions(+), 5 deletions(-) | 17 | 2 files changed, 15 insertions(+), 5 deletions(-) |
| 18 | 18 | ||
| 19 | diff --git a/common/tftpsubs.c b/common/tftpsubs.c | 19 | diff --git a/common/tftpsubs.c b/common/tftpsubs.c |
| @@ -47,10 +47,10 @@ index 8c999f6..b4d4ffe 100644 | |||
| 47 | 47 | ||
| 48 | /* When an error has occurred, it is possible that the two sides | 48 | /* When an error has occurred, it is possible that the two sides |
| 49 | diff --git a/tftpd/tftpd.c b/tftpd/tftpd.c | 49 | diff --git a/tftpd/tftpd.c b/tftpd/tftpd.c |
| 50 | index 1873e70..c2adbda 100644 | 50 | index 3158c6d..001237b 100644 |
| 51 | --- a/tftpd/tftpd.c | 51 | --- a/tftpd/tftpd.c |
| 52 | +++ b/tftpd/tftpd.c | 52 | +++ b/tftpd/tftpd.c |
| 53 | @@ -1681,7 +1681,11 @@ static void tftp_recvfile(const struct formats *pf, struct tftphdr *oap, int oac | 53 | @@ -1690,7 +1690,11 @@ static void tftp_recvfile(const struct formats *pf, struct tftphdr *oap, int oac |
| 54 | syslog(LOG_WARNING, "tftpd: write(ack): %m"); | 54 | syslog(LOG_WARNING, "tftpd: write(ack): %m"); |
| 55 | goto abort; | 55 | goto abort; |
| 56 | } | 56 | } |
| @@ -63,7 +63,7 @@ index 1873e70..c2adbda 100644 | |||
| 63 | for (;;) { | 63 | for (;;) { |
| 64 | n = recv_time(peer, dp, PKTSIZE, 0, &r_timeout); | 64 | n = recv_time(peer, dp, PKTSIZE, 0, &r_timeout); |
| 65 | if (n < 0) { /* really? */ | 65 | if (n < 0) { /* really? */ |
| 66 | @@ -1712,7 +1716,11 @@ static void tftp_recvfile(const struct formats *pf, struct tftphdr *oap, int oac | 66 | @@ -1721,7 +1725,11 @@ static void tftp_recvfile(const struct formats *pf, struct tftphdr *oap, int oac |
| 67 | goto abort; | 67 | goto abort; |
| 68 | } | 68 | } |
| 69 | } while (size == segsize); | 69 | } while (size == segsize); |
| @@ -77,5 +77,5 @@ index 1873e70..c2adbda 100644 | |||
| 77 | 77 | ||
| 78 | ap->th_opcode = htons((u_short) ACK); /* send the "final" ack */ | 78 | ap->th_opcode = htons((u_short) ACK); /* send the "final" ack */ |
| 79 | -- | 79 | -- |
| 80 | 1.7.10.4 | 80 | 2.34.1 |
| 81 | 81 | ||
diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/fix-writing-emtpy-file.patch b/meta-networking/recipes-daemons/tftp-hpa/files/fix-writing-emtpy-file.patch index 4f3dcd7767..0b235361c5 100644 --- a/meta-networking/recipes-daemons/tftp-hpa/files/fix-writing-emtpy-file.patch +++ b/meta-networking/recipes-daemons/tftp-hpa/files/fix-writing-emtpy-file.patch | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | [PATCH] fix the empty file writting | 1 | From 1ce974f1cf6afbc528c941a8cdf0817a3fd7c5a7 Mon Sep 17 00:00:00 2001 |
| 2 | 2 | From: "Roy.Li" <rongqing.li@windriver.com> | |
| 3 | Upstream-Status: Pending | 3 | Date: Mon, 30 Mar 2026 22:37:22 +0800 |
| 4 | Subject: [PATCH] fix the empty file writting | ||
| 4 | 5 | ||
| 5 | With the feature that checking the disk filled up, the return | 6 | With the feature that checking the disk filled up, the return |
| 6 | value of function write_behind was checked and used to detect | 7 | value of function write_behind was checked and used to detect |
| @@ -11,13 +12,15 @@ error was miss-raised. | |||
| 11 | make write_behind to return 0 if written file is empty, to fix | 12 | make write_behind to return 0 if written file is empty, to fix |
| 12 | the this bug. | 13 | the this bug. |
| 13 | 14 | ||
| 15 | Upstream-Status: Pending | ||
| 16 | |||
| 14 | Signed-off-by: Roy.Li <rongqing.li@windriver.com> | 17 | Signed-off-by: Roy.Li <rongqing.li@windriver.com> |
| 15 | --- | 18 | --- |
| 16 | common/tftpsubs.c | 5 ++++- | 19 | common/tftpsubs.c | 5 ++++- |
| 17 | 1 file changed, 4 insertions(+), 1 deletion(-) | 20 | 1 file changed, 4 insertions(+), 1 deletion(-) |
| 18 | 21 | ||
| 19 | diff --git a/common/tftpsubs.c b/common/tftpsubs.c | 22 | diff --git a/common/tftpsubs.c b/common/tftpsubs.c |
| 20 | index b4ea3f2..9f6cafc 100644 | 23 | index b4ea3f2..30e749a 100644 |
| 21 | --- a/common/tftpsubs.c | 24 | --- a/common/tftpsubs.c |
| 22 | +++ b/common/tftpsubs.c | 25 | +++ b/common/tftpsubs.c |
| 23 | @@ -198,9 +198,12 @@ int write_behind(FILE * file, int convert) | 26 | @@ -198,9 +198,12 @@ int write_behind(FILE * file, int convert) |
| @@ -35,5 +38,5 @@ index b4ea3f2..9f6cafc 100644 | |||
| 35 | return write(fileno(file), buf, count); | 38 | return write(fileno(file), buf, count); |
| 36 | 39 | ||
| 37 | -- | 40 | -- |
| 38 | 1.9.1 | 41 | 2.34.1 |
| 39 | 42 | ||
diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-0.40-remap.patch b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-0.40-remap.patch index 3f690609a6..837d2f7d08 100644 --- a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-0.40-remap.patch +++ b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-0.40-remap.patch | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | Patch originally from Fedora | 1 | Patch originally from Fedora |
| 2 | 2 | ||
| 3 | http://pkgs.fedoraproject.org/cgit/tftp.git/ | 3 | https://src.fedoraproject.org/rpms/tftp.git |
| 4 | 4 | ||
| 5 | Upstream-Status: Pending | 5 | Upstream-Status: Pending |
| 6 | 6 | ||
diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-0.42-tftpboot.patch b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-0.42-tftpboot.patch index 98a86b78b0..8a30194f4b 100644 --- a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-0.42-tftpboot.patch +++ b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-0.42-tftpboot.patch | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | Patch originally from Fedora | 1 | Patch originally from Fedora |
| 2 | 2 | ||
| 3 | http://pkgs.fedoraproject.org/cgit/tftp.git/ | 3 | https://src.fedoraproject.org/rpms/tftp.git |
| 4 | 4 | ||
| 5 | Upstream-Status: Pending | 5 | Upstream-Status: Pending |
| 6 | 6 | ||
diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-0.49-chk_retcodes.patch b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-0.49-chk_retcodes.patch index 7ae1a87220..fae887427f 100644 --- a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-0.49-chk_retcodes.patch +++ b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-0.49-chk_retcodes.patch | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | Patch originally from Fedora | 1 | Patch originally from Fedora |
| 2 | 2 | ||
| 3 | http://pkgs.fedoraproject.org/cgit/tftp.git/ | 3 | https://src.fedoraproject.org/rpms/tftp.git |
| 4 | 4 | ||
| 5 | Upstream-Status: Pending | 5 | Upstream-Status: Pending |
| 6 | 6 | ||
diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-0.39-tzfix.patch b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-0.39-tzfix.patch index 85110eb285..3a3a292e2e 100644 --- a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-0.39-tzfix.patch +++ b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-0.39-tzfix.patch | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | Patch originally from Fedora | 1 | Patch originally from Fedora |
| 2 | 2 | ||
| 3 | http://pkgs.fedoraproject.org/cgit/tftp.git/ | 3 | https://src.fedoraproject.org/rpms/tftp.git |
| 4 | 4 | ||
| 5 | Upstream-Status: Pending | 5 | Upstream-Status: Pending |
| 6 | 6 | ||
diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-0.49-fortify-strcpy-crash.patch b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-0.49-fortify-strcpy-crash.patch index 08d2b5b7d6..42fddfd0ca 100644 --- a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-0.49-fortify-strcpy-crash.patch +++ b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-0.49-fortify-strcpy-crash.patch | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | Patch originally from Fedora | 1 | Patch originally from Fedora |
| 2 | 2 | ||
| 3 | http://pkgs.fedoraproject.org/cgit/tftp.git/ | 3 | https://src.fedoraproject.org/rpms/tftp.git |
| 4 | 4 | ||
| 5 | Upstream-Status: Pending | 5 | Upstream-Status: Pending |
| 6 | 6 | ||
diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-0.49-stats.patch b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-0.49-stats.patch index 720cd69dec..f646ec5afe 100644 --- a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-0.49-stats.patch +++ b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-0.49-stats.patch | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | Patch originally from Fedora | 1 | Patch originally from Fedora |
| 2 | 2 | ||
| 3 | http://pkgs.fedoraproject.org/cgit/tftp.git/ | 3 | https://src.fedoraproject.org/rpms/tftp.git |
| 4 | 4 | ||
| 5 | Upstream-Status: Pending | 5 | Upstream-Status: Pending |
| 6 | 6 | ||
diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-5.2-pktinfo.patch b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-5.2-pktinfo.patch deleted file mode 100644 index 216349d26f..0000000000 --- a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-5.2-pktinfo.patch +++ /dev/null | |||
| @@ -1,29 +0,0 @@ | |||
| 1 | Patch originally from Fedora | ||
| 2 | |||
| 3 | http://pkgs.fedoraproject.org/cgit/tftp.git/ | ||
| 4 | |||
| 5 | Upstream-Status: Pending | ||
| 6 | |||
| 7 | diff -up tftp-hpa-5.2/tftpd/recvfrom.c.test tftp-hpa-5.2/tftpd/recvfrom.c | ||
| 8 | --- tftp-hpa-5.2/tftpd/recvfrom.c.test 2011-12-11 23:13:52.000000000 +0100 | ||
| 9 | +++ tftp-hpa-5.2/tftpd/recvfrom.c 2012-01-04 10:05:17.852042256 +0100 | ||
| 10 | @@ -149,16 +149,16 @@ myrecvfrom(int s, void *buf, int len, un | ||
| 11 | |||
| 12 | /* Try to enable getting the return address */ | ||
| 13 | #ifdef IP_RECVDSTADDR | ||
| 14 | - if (from->sa_family == AF_INET) | ||
| 15 | + if (from->sa_family == AF_INET || !from->sa_family) | ||
| 16 | setsockopt(s, IPPROTO_IP, IP_RECVDSTADDR, &on, sizeof(on)); | ||
| 17 | #endif | ||
| 18 | #ifdef IP_PKTINFO | ||
| 19 | - if (from->sa_family == AF_INET) | ||
| 20 | + if (from->sa_family == AF_INET || !from->sa_family) | ||
| 21 | setsockopt(s, IPPROTO_IP, IP_PKTINFO, &on, sizeof(on)); | ||
| 22 | #endif | ||
| 23 | #ifdef HAVE_IPV6 | ||
| 24 | #ifdef IPV6_RECVPKTINFO | ||
| 25 | - if (from->sa_family == AF_INET6) | ||
| 26 | + if (from->sa_family == AF_INET6 || !from->sa_family) | ||
| 27 | setsockopt(s, IPPROTO_IPV6, IPV6_RECVPKTINFO, &on, sizeof(on)); | ||
| 28 | #endif | ||
| 29 | #endif | ||
diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-0.49-cmd_arg.patch b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-5.3-cmd_arg.patch index 6b8ceaaeba..3571137ce1 100644 --- a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-0.49-cmd_arg.patch +++ b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-5.3-cmd_arg.patch | |||
| @@ -1,34 +1,23 @@ | |||
| 1 | Patch originally from Fedora | 1 | Patch originally from Fedora |
| 2 | 2 | ||
| 3 | http://pkgs.fedoraproject.org/cgit/tftp.git/ | 3 | https://src.fedoraproject.org/rpms/tftp.git |
| 4 | 4 | ||
| 5 | Upstream-Status: Pending | 5 | Upstream-Status: Pending |
| 6 | 6 | ||
| 7 | diff -up tftp-hpa-0.49/config.h.cmd_arg tftp-hpa-0.49/config.h | 7 | diff -up tftp-hpa-5.3/config.h.cmd_arg tftp-hpa-5.3/config.h |
| 8 | --- tftp-hpa-0.49/config.h.cmd_arg 2010-04-19 15:29:10.567331454 +0200 | 8 | --- tftp-hpa-5.3/config.h.cmd_arg 2024-05-30 00:40:13.000000000 +0200 |
| 9 | +++ tftp-hpa-0.49/config.h 2010-04-20 07:33:03.133232772 +0200 | 9 | +++ tftp-hpa-5.3/config.h 2025-12-26 22:27:30.933202754 +0100 |
| 10 | @@ -291,6 +291,7 @@ typedef int socklen_t; | 10 | @@ -277,6 +277,7 @@ typedef int socklen_t; |
| 11 | /* Prototypes for libxtra functions */ | 11 | /* Prototypes for libxtra functions */ |
| 12 | 12 | ||
| 13 | void *xmalloc(size_t); | 13 | void *xmalloc(size_t); |
| 14 | +void *xrealloc(void *, size_t); | 14 | +void *xrealloc(void *, size_t); |
| 15 | char *xstrdup(const char *); | 15 | char *xstrdup(const char *); |
| 16 | 16 | ||
| 17 | #ifndef HAVE_BSD_SIGNAL | 17 | #ifndef HAVE_SIGHANDLER_T |
| 18 | diff -up tftp-hpa-0.49/configure.in.cmd_arg tftp-hpa-0.49/configure.in | 18 | diff -up tftp-hpa-5.3/lib/xrealloc.c.cmd_arg tftp-hpa-5.3/lib/xrealloc.c |
| 19 | --- tftp-hpa-0.49/configure.in.cmd_arg 2008-10-21 00:08:31.000000000 +0200 | 19 | --- tftp-hpa-5.3/lib/xrealloc.c.cmd_arg 2025-12-26 22:19:59.751870026 +0100 |
| 20 | +++ tftp-hpa-0.49/configure.in 2010-04-19 11:05:12.387340698 +0200 | 20 | +++ tftp-hpa-5.3/lib/xrealloc.c 2025-12-26 22:19:59.751870026 +0100 |
| 21 | @@ -152,6 +152,7 @@ OBJROOT=`pwd` | ||
| 22 | |||
| 23 | XTRA=false | ||
| 24 | PA_SEARCH_LIBS_AND_ADD(xmalloc, iberty) | ||
| 25 | +PA_SEARCH_LIBS_AND_ADD(xrealloc, iberty) | ||
| 26 | PA_SEARCH_LIBS_AND_ADD(xstrdup, iberty) | ||
| 27 | PA_SEARCH_LIBS_AND_ADD(bsd_signal, bsd, bsdsignal) | ||
| 28 | PA_SEARCH_LIBS_AND_ADD(getopt_long, getopt, getopt_long) | ||
| 29 | diff -up tftp-hpa-0.49/lib/xrealloc.c.cmd_arg tftp-hpa-0.49/lib/xrealloc.c | ||
| 30 | --- tftp-hpa-0.49/lib/xrealloc.c.cmd_arg 2010-04-19 11:05:12.387340698 +0200 | ||
| 31 | +++ tftp-hpa-0.49/lib/xrealloc.c 2010-04-19 11:05:12.387340698 +0200 | ||
| 32 | @@ -0,0 +1,20 @@ | 21 | @@ -0,0 +1,20 @@ |
| 33 | +/* | 22 | +/* |
| 34 | + * xrealloc.c | 23 | + * xrealloc.c |
| @@ -50,9 +39,9 @@ diff -up tftp-hpa-0.49/lib/xrealloc.c.cmd_arg tftp-hpa-0.49/lib/xrealloc.c | |||
| 50 | + | 39 | + |
| 51 | + return p; | 40 | + return p; |
| 52 | +} | 41 | +} |
| 53 | diff -up tftp-hpa-0.49/tftp/main.c.cmd_arg tftp-hpa-0.49/tftp/main.c | 42 | diff -up tftp-hpa-5.3/tftp/main.c.cmd_arg tftp-hpa-5.3/tftp/main.c |
| 54 | --- tftp-hpa-0.49/tftp/main.c.cmd_arg 2008-10-21 00:08:31.000000000 +0200 | 43 | --- tftp-hpa-5.3/tftp/main.c.cmd_arg 2024-05-30 00:40:13.000000000 +0200 |
| 55 | +++ tftp-hpa-0.49/tftp/main.c 2010-04-19 11:05:12.389329337 +0200 | 44 | +++ tftp-hpa-5.3/tftp/main.c 2025-12-26 22:19:59.752870023 +0100 |
| 56 | @@ -89,11 +89,14 @@ int connected; | 45 | @@ -89,11 +89,14 @@ int connected; |
| 57 | const struct modes *mode; | 46 | const struct modes *mode; |
| 58 | #ifdef WITH_READLINE | 47 | #ifdef WITH_READLINE |
diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-5.3-pktinfo.patch b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-5.3-pktinfo.patch new file mode 100644 index 0000000000..02e88aed36 --- /dev/null +++ b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-5.3-pktinfo.patch | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | Patch originally from Fedora | ||
| 2 | |||
| 3 | https://src.fedoraproject.org/rpms/tftp.git | ||
| 4 | |||
| 5 | Upstream-Status: Pending | ||
| 6 | |||
| 7 | diff -up tftp-hpa-5.3/tftpd/recvfrom.c.pktinfo tftp-hpa-5.3/tftpd/recvfrom.c | ||
| 8 | --- tftp-hpa-5.3/tftpd/recvfrom.c.pktinfo 2024-05-30 00:40:13.000000000 +0200 | ||
| 9 | +++ tftp-hpa-5.3/tftpd/recvfrom.c 2025-12-26 22:30:37.142522362 +0100 | ||
| 10 | @@ -170,16 +170,16 @@ myrecvfrom(int s, void *buf, int len, un | ||
| 11 | |||
| 12 | /* Try to enable getting the return address */ | ||
| 13 | #ifdef IP_RECVDSTADDR | ||
| 14 | - if (from->sa.sa_family == AF_INET) | ||
| 15 | + if (from->sa.sa_family == AF_INET || !from->sa.sa_family) | ||
| 16 | setsockopt(s, IPPROTO_IP, IP_RECVDSTADDR, &on, sizeof(on)); | ||
| 17 | #endif | ||
| 18 | #ifdef IP_PKTINFO | ||
| 19 | - if (from->sa.sa_family == AF_INET) | ||
| 20 | + if (from->sa.sa_family == AF_INET || !from->sa.sa_family) | ||
| 21 | setsockopt(s, IPPROTO_IP, IP_PKTINFO, &on, sizeof(on)); | ||
| 22 | #endif | ||
| 23 | #ifdef HAVE_IPV6 | ||
| 24 | #ifdef IPV6_RECVPKTINFO | ||
| 25 | - if (from->sa.sa_family == AF_INET6) | ||
| 26 | + if (from->sa.sa_family == AF_INET6 || !from->sa.sa_family) | ||
| 27 | setsockopt(s, IPPROTO_IPV6, IPV6_RECVPKTINFO, &on, sizeof(on)); | ||
| 28 | #endif | ||
| 29 | #endif | ||
diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-separated-CR-and-LF.patch b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-separated-CR-and-LF.patch index e994f28402..f68e6369c4 100644 --- a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-separated-CR-and-LF.patch +++ b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-separated-CR-and-LF.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 6ed1eb8829dee351b54e183bc42c007cb306aaa5 Mon Sep 17 00:00:00 2001 | 1 | From 2be04543d790d9ec29fa8522f07f221468ccd033 Mon Sep 17 00:00:00 2001 |
| 2 | From: Zhang Xiao <xiao.zhang@windriver.com> | 2 | From: Zhang Xiao <xiao.zhang@windriver.com> |
| 3 | Date: Wed, 11 Jun 2014 14:01:16 +0800 | 3 | Date: Wed, 11 Jun 2014 14:01:16 +0800 |
| 4 | Subject: [PATCH] tftp-hpa: bug fix on separated CR and LF | 4 | Subject: [PATCH] tftp-hpa: bug fix on separated CR and LF |
| @@ -34,5 +34,5 @@ index b4d4ffe..b4ea3f2 100644 | |||
| 34 | c = *p++; /* pick up a character */ | 34 | c = *p++; /* pick up a character */ |
| 35 | if (prevchar == '\r') { /* if prev char was cr */ | 35 | if (prevchar == '\r') { /* if prev char was cr */ |
| 36 | -- | 36 | -- |
| 37 | 1.8.5.2.233.g932f7e4 | 37 | 2.34.1 |
| 38 | 38 | ||
diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-xinetd b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-xinetd deleted file mode 100644 index fe70163966..0000000000 --- a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-xinetd +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | # default: off | ||
| 2 | # description: The tftp server serves files using the trivial file transfer \ | ||
| 3 | # protocol. The tftp protocol is often used to boot diskless \ | ||
| 4 | # workstations, download configuration files to network-aware printers, \ | ||
| 5 | # and to start the installation process for some operating systems. | ||
| 6 | service tftp | ||
| 7 | { | ||
| 8 | socket_type = dgram | ||
| 9 | protocol = udp | ||
| 10 | wait = yes | ||
| 11 | user = root | ||
| 12 | server = /usr/sbin/in.tftpd-hpa | ||
| 13 | server_args = -s /var/lib/tftpboot | ||
| 14 | disable = yes | ||
| 15 | per_source = 11 | ||
| 16 | cps = 100 2 | ||
| 17 | flags = IPv6 | ||
| 18 | } | ||
diff --git a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.3.bb index 96c9bdb653..fc7e54a160 100644 --- a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb +++ b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.3.bb | |||
| @@ -5,51 +5,47 @@ booting diskless workstations. The tftp package provides the user \ | |||
| 5 | interface for TFTP, which allows users to transfer files to and from a \ | 5 | interface for TFTP, which allows users to transfer files to and from a \ |
| 6 | remote machine. This program and TFTP provide very little security, \ | 6 | remote machine. This program and TFTP provide very little security, \ |
| 7 | and should not be enabled unless it is expressly needed." | 7 | and should not be enabled unless it is expressly needed." |
| 8 | DEPENDS = "readline" | 8 | HOMEPAGE = "https://git.kernel.org/pub/scm/network/tftp/tftp-hpa.git/" |
| 9 | SECTION = "net" | 9 | SECTION = "net" |
| 10 | HOMEPAGE = "http://freecode.com/projects/tftp-hpa" | ||
| 11 | LICENSE = "BSD-4-Clause" | 10 | LICENSE = "BSD-4-Clause" |
| 12 | LIC_FILES_CHKSUM = "file://MCONFIG.in;beginline=1;endline=9;md5=c28ba5adb43041fae4629db05c83cbdd \ | 11 | LIC_FILES_CHKSUM = "file://MCONFIG.in;beginline=1;endline=9;md5=c28ba5adb43041fae4629db05c83cbdd \ |
| 13 | file://tftp/tftp.c;beginline=1;endline=32;md5=988c1cba99d70858a26cd877209857f4" | 12 | file://tftp/tftp.c;beginline=1;endline=32;md5=988c1cba99d70858a26cd877209857f4" |
| 14 | 13 | ||
| 15 | 14 | ||
| 16 | SRC_URI = "http://kernel.org/pub/software/network/tftp/tftp-hpa/tftp-hpa-${PV}.tar.bz2 \ | 15 | SRC_URI = "git://git.kernel.org/pub/scm/network/tftp/tftp-hpa.git;protocol=https;branch=master;tag=tftp-hpa-${PV} \ |
| 17 | file://tftp-0.40-remap.patch \ | 16 | file://tftp-0.40-remap.patch \ |
| 18 | file://tftp-0.42-tftpboot.patch \ | 17 | file://tftp-0.42-tftpboot.patch \ |
| 19 | file://tftp-0.49-chk_retcodes.patch \ | 18 | file://tftp-0.49-chk_retcodes.patch \ |
| 20 | file://tftp-0.49-cmd_arg.patch \ | 19 | file://tftp-hpa-5.3-cmd_arg.patch \ |
| 21 | file://tftp-hpa-0.39-tzfix.patch \ | 20 | file://tftp-hpa-0.39-tzfix.patch \ |
| 22 | file://tftp-hpa-0.49-fortify-strcpy-crash.patch \ | 21 | file://tftp-hpa-0.49-fortify-strcpy-crash.patch \ |
| 23 | file://tftp-hpa-0.49-stats.patch \ | 22 | file://tftp-hpa-0.49-stats.patch \ |
| 24 | file://tftp-hpa-5.2-pktinfo.patch \ | 23 | file://tftp-hpa-5.3-pktinfo.patch \ |
| 25 | file://default \ | ||
| 26 | file://init \ | ||
| 27 | file://add-error-check-for-disk-filled-up.patch \ | 24 | file://add-error-check-for-disk-filled-up.patch \ |
| 28 | file://tftp-hpa-bug-fix-on-separated-CR-and-LF.patch \ | 25 | file://tftp-hpa-bug-fix-on-separated-CR-and-LF.patch \ |
| 29 | file://fix-writing-emtpy-file.patch \ | 26 | file://fix-writing-emtpy-file.patch \ |
| 30 | file://0001-__progname-is-provided-by-libc.patch \ | 27 | file://default \ |
| 31 | file://0001-tftp-Mark-toplevel-definition-as-external.patch \ | 28 | file://init \ |
| 32 | file://0001-tftp-Remove-double-inclusion-of-signal.h.patch \ | ||
| 33 | file://tftpd-hpa.socket \ | 29 | file://tftpd-hpa.socket \ |
| 34 | file://tftpd-hpa.service \ | 30 | file://tftpd-hpa.service \ |
| 35 | " | 31 | " |
| 36 | 32 | ||
| 37 | SRC_URI[md5sum] = "46c9bd20bbffa62f79c958c7b99aac21" | 33 | SRCREV = "15c4f369ee741e9205dc28ce631aaf6799193b04" |
| 38 | SRC_URI[sha256sum] = "0a9f88d4c1c02687b4853b02ab5dd8779d4de4ffdb9b2e5c9332841304d1a269" | ||
| 39 | 34 | ||
| 40 | inherit autotools-brokensep update-rc.d update-alternatives systemd | 35 | inherit autotools-brokensep update-rc.d update-alternatives systemd |
| 41 | 36 | ||
| 42 | export AR = "${HOST_PREFIX}ar cq" | 37 | DEPENDS = "readline" |
| 43 | 38 | ||
| 44 | EXTRA_OECONF += "--disable-option-checking" | 39 | EXTRA_OECONF = "--enable-largefile \ |
| 40 | --enable-year2038 \ | ||
| 41 | --with-readline \ | ||
| 42 | --without-tcpwrappers \ | ||
| 43 | " | ||
| 45 | 44 | ||
| 46 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" | 45 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" |
| 47 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | 46 | PACKAGECONFIG[ipv6] = "--with-ipv6,--without-ipv6," |
| 48 | 47 | ||
| 49 | # configure.in has errors | 48 | CACHED_CONFIGUREVARS:libc-musl = "ac_cv_type_socklen_t=yes" |
| 50 | do_configure() { | ||
| 51 | oe_runconf | ||
| 52 | } | ||
| 53 | 49 | ||
| 54 | do_install() { | 50 | do_install() { |
| 55 | oe_runmake install INSTALLROOT=${D} | 51 | oe_runmake install INSTALLROOT=${D} |
| @@ -57,20 +53,25 @@ do_install() { | |||
| 57 | mv ${D}${sbindir}/in.tftpd ${D}${sbindir}/in.tftpd-hpa | 53 | mv ${D}${sbindir}/in.tftpd ${D}${sbindir}/in.tftpd-hpa |
| 58 | 54 | ||
| 59 | install -m 755 -d ${D}${localstatedir}/lib/tftpboot/ | 55 | install -m 755 -d ${D}${localstatedir}/lib/tftpboot/ |
| 60 | install -d ${D}${sysconfdir}/init.d | 56 | |
| 61 | install -m 0755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/tftpd-hpa | 57 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
| 62 | sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/tftpd-hpa | 58 | install -d ${D}${sysconfdir}/default |
| 63 | sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/tftpd-hpa | 59 | install -m 0644 ${UNPACKDIR}/default ${D}${sysconfdir}/default/tftpd-hpa |
| 64 | sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/tftpd-hpa | 60 | |
| 65 | sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/tftpd-hpa | 61 | install -d ${D}${sysconfdir}/init.d |
| 66 | 62 | install -m 0755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/tftpd-hpa | |
| 67 | install -d ${D}${sysconfdir}/default | 63 | sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/tftpd-hpa |
| 68 | install -m 0644 ${UNPACKDIR}/default ${D}${sysconfdir}/default/tftpd-hpa | 64 | sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/tftpd-hpa |
| 69 | 65 | sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/tftpd-hpa | |
| 70 | install -d ${D}${systemd_unitdir}/system | 66 | sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/tftpd-hpa |
| 71 | install -m 0644 ${UNPACKDIR}/tftpd-hpa.socket ${D}${systemd_unitdir}/system | 67 | fi |
| 72 | install -m 0644 ${UNPACKDIR}/tftpd-hpa.service ${D}${systemd_unitdir}/system | 68 | |
| 73 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/tftpd-hpa.service | 69 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
| 70 | install -d ${D}${systemd_unitdir}/system | ||
| 71 | install -m 0644 ${UNPACKDIR}/tftpd-hpa.socket ${D}${systemd_unitdir}/system | ||
| 72 | install -m 0644 ${UNPACKDIR}/tftpd-hpa.service ${D}${systemd_unitdir}/system | ||
| 73 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/tftpd-hpa.service | ||
| 74 | fi | ||
| 74 | } | 75 | } |
| 75 | 76 | ||
| 76 | FILES:${PN} = "${bindir}" | 77 | FILES:${PN} = "${bindir}" |
| @@ -92,7 +93,6 @@ ALTERNATIVE:${PN} = "tftp" | |||
| 92 | ALTERNATIVE_TARGET[tftp] = "${bindir}/tftp-hpa" | 93 | ALTERNATIVE_TARGET[tftp] = "${bindir}/tftp-hpa" |
| 93 | ALTERNATIVE_PRIORITY = "100" | 94 | ALTERNATIVE_PRIORITY = "100" |
| 94 | 95 | ||
| 95 | |||
| 96 | SYSTEMD_PACKAGES = "tftp-hpa-server" | 96 | SYSTEMD_PACKAGES = "tftp-hpa-server" |
| 97 | SYSTEMD_SERVICE:tftp-hpa-server = "tftpd-hpa.socket tftpd-hpa.service" | 97 | SYSTEMD_SERVICE:tftp-hpa-server = "tftpd-hpa.socket tftpd-hpa.service" |
| 98 | SYSTEMD_AUTO_ENABLE:tftp-hpa-server = "enable" | 98 | SYSTEMD_AUTO_ENABLE:tftp-hpa-server = "enable" |
diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb index f2c27606e1..69d97d326d 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb | |||
| @@ -35,8 +35,9 @@ RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-li | |||
| 35 | PAMLIB = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-L${STAGING_BASELIBDIR} -lpam', '', d)}" | 35 | PAMLIB = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-L${STAGING_BASELIBDIR} -lpam', '', d)}" |
| 36 | NOPAM_SRC = "file://nopam.patch" | 36 | NOPAM_SRC = "file://nopam.patch" |
| 37 | 37 | ||
| 38 | inherit update-rc.d useradd systemd | 38 | inherit update-rc.d useradd systemd multilib_script |
| 39 | 39 | ||
| 40 | MULTILIB_SCRIPTS = "${PN}:${sysconfdir}/pam.d/vsftpd" | ||
| 40 | CONFFILES:${PN} = "${sysconfdir}/vsftpd.conf" | 41 | CONFFILES:${PN} = "${sysconfdir}/vsftpd.conf" |
| 41 | LDFLAGS:append = " -lcrypt -lcap" | 42 | LDFLAGS:append = " -lcrypt -lcap" |
| 42 | CFLAGS:append:libc-musl = " -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -include fcntl.h" | 43 | CFLAGS:append:libc-musl = " -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -include fcntl.h" |
diff --git a/meta-networking/recipes-devtools/libcoap/libcoap_4.3.5a.bb b/meta-networking/recipes-devtools/libcoap/libcoap_4.3.5b.bb index 611795e17d..7ea3eba1b0 100644 --- a/meta-networking/recipes-devtools/libcoap/libcoap_4.3.5a.bb +++ b/meta-networking/recipes-devtools/libcoap/libcoap_4.3.5b.bb | |||
| @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=05d17535846895e23ea4c79b16a9e904" | |||
| 10 | SRC_URI = "git://github.com/obgm/libcoap.git;branch=release-4.3.5-patches;protocol=https;tag=v${PV} \ | 10 | SRC_URI = "git://github.com/obgm/libcoap.git;branch=release-4.3.5-patches;protocol=https;tag=v${PV} \ |
| 11 | file://run-ptest \ | 11 | file://run-ptest \ |
| 12 | " | 12 | " |
| 13 | SRCREV = "e3fdcdcfbd1588754fe9dd4b754ac9397260f0f9" | 13 | SRCREV = "851533c3cf63d16984d370ce39d586ecb3694971" |
| 14 | 14 | ||
| 15 | # patch releases often use alphabetical suffixes | 15 | # patch releases often use alphabetical suffixes |
| 16 | CVE_VERSION_SUFFIX = "alphabetical" | 16 | CVE_VERSION_SUFFIX = "alphabetical" |
| @@ -64,3 +64,4 @@ FILES:${PN}-bin = "${bindir}" | |||
| 64 | FILES:${PN}-dev += "${datadir}/${BPN}/examples" | 64 | FILES:${PN}-dev += "${datadir}/${BPN}/examples" |
| 65 | 65 | ||
| 66 | CVE_STATUS[CVE-2025-50518] = "disputed: happens only when library is used incorrectly" | 66 | CVE_STATUS[CVE-2025-50518] = "disputed: happens only when library is used incorrectly" |
| 67 | CVE_STATUS[CVE-2026-29013] = "fixed-version: fixed in 4.3.5b" | ||
diff --git a/meta-networking/recipes-devtools/python/python3-scapy_2.6.1.bb b/meta-networking/recipes-devtools/python/python3-scapy_2.6.1.bb index 678aec0135..0c547a53ce 100644 --- a/meta-networking/recipes-devtools/python/python3-scapy_2.6.1.bb +++ b/meta-networking/recipes-devtools/python/python3-scapy_2.6.1.bb | |||
| @@ -42,7 +42,7 @@ do_install_ptest() { | |||
| 42 | # note1: if ipv6 isn't enabled, skip the related test (add '-K ipv6' argument) | 42 | # note1: if ipv6 isn't enabled, skip the related test (add '-K ipv6' argument) |
| 43 | # note2: to make this test work, your ISP also must support ipv6 - the test is trying | 43 | # note2: to make this test work, your ISP also must support ipv6 - the test is trying |
| 44 | # to ping google.com through ipv6. | 44 | # to ping google.com through ipv6. |
| 45 | if [ "${@oe.utils.all_distro_features(d, 'ipv6', 'true', 'false')}" = "false" ]; then | 45 | if [ -z "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" ]; then |
| 46 | sed -i 's/UTscapy.py/UTscapy.py -K ipv6/g' ${D}${PTEST_PATH}/run-ptest | 46 | sed -i 's/UTscapy.py/UTscapy.py -K ipv6/g' ${D}${PTEST_PATH}/run-ptest |
| 47 | fi | 47 | fi |
| 48 | } | 48 | } |
diff --git a/meta-networking/recipes-extended/corosync/corosync/CVE-2026-35091.patch b/meta-networking/recipes-extended/corosync/corosync/CVE-2026-35091.patch new file mode 100644 index 0000000000..8afa5d6841 --- /dev/null +++ b/meta-networking/recipes-extended/corosync/corosync/CVE-2026-35091.patch | |||
| @@ -0,0 +1,47 @@ | |||
| 1 | From b9cb461121c8721c94a94309eb345a3c2f9ee9b4 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Jan Friesse <jfriesse@redhat.com> | ||
| 3 | Date: Thu, 2 Apr 2026 09:00:39 +0200 | ||
| 4 | Subject: [PATCH] totemsrp: Return error if sanity check fails | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | Previously, the check_memb_commit_token_sanity function correctly | ||
| 10 | checked the minimum message length. However, if the message was too | ||
| 11 | short, it incorrectly returned a success code (0) instead of the | ||
| 12 | expected failure code (-1). | ||
| 13 | |||
| 14 | This commit ensures the appropriate error code is returned when the | ||
| 15 | message length sanity check fails. | ||
| 16 | |||
| 17 | Fixes: CVE-2026-35091 | ||
| 18 | |||
| 19 | Reported-by: Sebastián Alba Vives (@Sebasteuo / 0xS4bb1) <sebasjosue84@gmail.com> | ||
| 20 | Signed-off-by: Jan Friesse <jfriesse@redhat.com> | ||
| 21 | Also-proposed-by: nicholasyang <nicholas.yang@suse.com> | ||
| 22 | Reviewed-by: Christine Caulfield <ccaulfie@redhat.com> | ||
| 23 | |||
| 24 | CVE: CVE-2026-35091 | ||
| 25 | Upstream-Status: Backport [https://github.com/corosync/corosync/commit/a16614accfdb3481264d7281843fadf439d9ab1b] | ||
| 26 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 27 | --- | ||
| 28 | exec/totemsrp.c | 4 ++-- | ||
| 29 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 30 | |||
| 31 | diff --git a/exec/totemsrp.c b/exec/totemsrp.c | ||
| 32 | index 35bf971..94d6c21 100644 | ||
| 33 | --- a/exec/totemsrp.c | ||
| 34 | +++ b/exec/totemsrp.c | ||
| 35 | @@ -3811,10 +3811,10 @@ static int check_memb_commit_token_sanity( | ||
| 36 | log_printf (instance->totemsrp_log_level_security, | ||
| 37 | "Received memb_commit_token message is too short... ignoring."); | ||
| 38 | |||
| 39 | - return (0); | ||
| 40 | + return (-1); | ||
| 41 | } | ||
| 42 | |||
| 43 | - addr_entries= mct_msg->addr_entries; | ||
| 44 | + addr_entries = mct_msg->addr_entries; | ||
| 45 | if (endian_conversion_needed) { | ||
| 46 | addr_entries = swab32(addr_entries); | ||
| 47 | } | ||
diff --git a/meta-networking/recipes-extended/corosync/corosync/CVE-2026-35092.patch b/meta-networking/recipes-extended/corosync/corosync/CVE-2026-35092.patch new file mode 100644 index 0000000000..8182647840 --- /dev/null +++ b/meta-networking/recipes-extended/corosync/corosync/CVE-2026-35092.patch | |||
| @@ -0,0 +1,57 @@ | |||
| 1 | From 8f8a4747a0223b8897deda9a40a8a099c61fa80f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Jan Friesse <jfriesse@redhat.com> | ||
| 3 | Date: Thu, 2 Apr 2026 09:44:06 +0200 | ||
| 4 | Subject: [PATCH] totemsrp: Fix integer overflow in memb_join_sanity | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | This commit addresses an integer overflow (wraparound) vulnerability | ||
| 10 | in the check_memb_join_sanity function. | ||
| 11 | |||
| 12 | Previously, the 32-bit unsigned network values proc_list_entries and | ||
| 13 | failed_list_entries were added together before being promoted to | ||
| 14 | size_t. This allowed the addition to wrap around in 32-bit arithmetic | ||
| 15 | (e.g., 0x80000000 + 0x80000000 = 0), resulting in a required_len | ||
| 16 | calculation that was incorrectly small. | ||
| 17 | |||
| 18 | The solution is to cast the list entries to size_t and verify that | ||
| 19 | neither exceeds the maximum allowed value before the addition occurs. | ||
| 20 | |||
| 21 | Fixes: CVE-2026-35092 | ||
| 22 | |||
| 23 | Reported-by: Sebastián Alba Vives (@Sebasteuo / 0xS4bb1) <sebasjosue84@gmail.com> | ||
| 24 | Signed-off-by: Jan Friesse <jfriesse@redhat.com> | ||
| 25 | Also-proposed-by: nicholasyang <nicholas.yang@suse.com> | ||
| 26 | Reviewed-by: Christine Caulfield <ccaulfie@redhat.com> | ||
| 27 | |||
| 28 | CVE: CVE-2026-35092 | ||
| 29 | Upstream-Status: Backport [https://github.com/corosync/corosync/commit/4082294f5094a7591e4e00658c5a605f05d644f1] | ||
| 30 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 31 | --- | ||
| 32 | exec/totemsrp.c | 12 +++++++++++- | ||
| 33 | 1 file changed, 11 insertions(+), 1 deletion(-) | ||
| 34 | |||
| 35 | diff --git a/exec/totemsrp.c b/exec/totemsrp.c | ||
| 36 | index 94d6c21..6845cec 100644 | ||
| 37 | --- a/exec/totemsrp.c | ||
| 38 | +++ b/exec/totemsrp.c | ||
| 39 | @@ -3786,7 +3786,17 @@ static int check_memb_join_sanity( | ||
| 40 | failed_list_entries = swab32(failed_list_entries); | ||
| 41 | } | ||
| 42 | |||
| 43 | - required_len = sizeof(struct memb_join) + ((proc_list_entries + failed_list_entries) * sizeof(struct srp_addr)); | ||
| 44 | + if (proc_list_entries > PROCESSOR_COUNT_MAX || | ||
| 45 | + failed_list_entries > PROCESSOR_COUNT_MAX) { | ||
| 46 | + log_printf (instance->totemsrp_log_level_security, | ||
| 47 | + "Received memb_join message list_entries exceeds the maximum " | ||
| 48 | + "allowed value... ignoring."); | ||
| 49 | + | ||
| 50 | + return (-1); | ||
| 51 | + } | ||
| 52 | + | ||
| 53 | + required_len = sizeof(struct memb_join) + | ||
| 54 | + (((size_t)proc_list_entries + (size_t)failed_list_entries) * sizeof(struct srp_addr)); | ||
| 55 | if (msg_len < required_len) { | ||
| 56 | log_printf (instance->totemsrp_log_level_security, | ||
| 57 | "Received memb_join message is too short... ignoring."); | ||
diff --git a/meta-networking/recipes-extended/corosync/corosync_3.1.10.bb b/meta-networking/recipes-extended/corosync/corosync_3.1.10.bb index 07d9333ec8..77dea16e98 100644 --- a/meta-networking/recipes-extended/corosync/corosync_3.1.10.bb +++ b/meta-networking/recipes-extended/corosync/corosync_3.1.10.bb | |||
| @@ -9,6 +9,8 @@ inherit autotools pkgconfig systemd github-releases | |||
| 9 | 9 | ||
| 10 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \ | 10 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \ |
| 11 | file://corosync.conf \ | 11 | file://corosync.conf \ |
| 12 | file://CVE-2026-35091.patch \ | ||
| 13 | file://CVE-2026-35092.patch \ | ||
| 12 | " | 14 | " |
| 13 | SRC_URI[sha256sum] = "be361c827f99b215b3bd3fa2fb071c03dac6831c2a351963d938caef62604bc8" | 15 | SRC_URI[sha256sum] = "be361c827f99b215b3bd3fa2fb071c03dac6831c2a351963d938caef62604bc8" |
| 14 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" | 16 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" |
diff --git a/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb b/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb index be8c49854e..5e9f9ce070 100644 --- a/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb +++ b/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb | |||
| @@ -21,7 +21,7 @@ SRC_URI:append:libc-musl = " file://0010-Adjust-header-include-sequence.patch" | |||
| 21 | SRC_URI[md5sum] = "071c8b0a59241667a0044fb040d4fc72" | 21 | SRC_URI[md5sum] = "071c8b0a59241667a0044fb040d4fc72" |
| 22 | SRC_URI[sha256sum] = "b71f654784a726329f88b412ef7b96b4e5d786ed2bd28193ed7b4c0d677dfd2a" | 22 | SRC_URI[sha256sum] = "b71f654784a726329f88b412ef7b96b4e5d786ed2bd28193ed7b4c0d677dfd2a" |
| 23 | 23 | ||
| 24 | inherit systemd autotools | 24 | inherit systemd autotools update-alternatives |
| 25 | 25 | ||
| 26 | do_install:append () { | 26 | do_install:append () { |
| 27 | # Replace upstream ebtables-save perl script with Fedora bash based rewrite | 27 | # Replace upstream ebtables-save perl script with Fedora bash based rewrite |
| @@ -49,3 +49,8 @@ FILES:${PN}-dbg += "${base_libdir}/ebtables/.debug" | |||
| 49 | FILES:${PN} += "${base_libdir}/ebtables/*.so" | 49 | FILES:${PN} += "${base_libdir}/ebtables/*.so" |
| 50 | 50 | ||
| 51 | SYSTEMD_SERVICE:${PN} = "ebtables.service" | 51 | SYSTEMD_SERVICE:${PN} = "ebtables.service" |
| 52 | |||
| 53 | ALTERNATIVE:${PN} = "ebtables" | ||
| 54 | ALTERNATIVE_LINK_NAME[ebtables] = "${sbindir}/ebtables" | ||
| 55 | ALTERNATIVE_TARGET[ebtables] = "${sbindir}/ebtables-legacy" | ||
| 56 | ALTERNATIVE_PRIORITY[ebtables] = "90" | ||
diff --git a/meta-networking/recipes-filter/nftables/nftables/0001-build-support-SOURCE_DATE_EPOCH-for-build-time-stamp.patch b/meta-networking/recipes-filter/nftables/nftables/0001-build-support-SOURCE_DATE_EPOCH-for-build-time-stamp.patch new file mode 100644 index 0000000000..f52ff28b21 --- /dev/null +++ b/meta-networking/recipes-filter/nftables/nftables/0001-build-support-SOURCE_DATE_EPOCH-for-build-time-stamp.patch | |||
| @@ -0,0 +1,41 @@ | |||
| 1 | From fde27e62b241fb7d96de36a2fd6d7879c24f5de6 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Jeremy Sowden <jeremy@azazel.net> | ||
| 3 | Date: Wed, 28 Jan 2026 18:31:07 +0000 | ||
| 4 | Subject: [PATCH] build: support `SOURCE_DATE_EPOCH` for build time-stamp | ||
| 5 | |||
| 6 | In order to support reproducible builds, set the build time-stamp to the value | ||
| 7 | of the environment variable, `SOURCE_DATE_EPOCH`, if set, and fall back to | ||
| 8 | calling `date`, otherwise. | ||
| 9 | |||
| 10 | Link: https://reproducible-builds.org/docs/source-date-epoch/ | ||
| 11 | Fixes: 64c07e38f049 ("table: Embed creating nft version into userdata") | ||
| 12 | Reported-by: Arnout Engelen <arnout@bzzt.net> | ||
| 13 | Closes: https://github.com/NixOS/nixpkgs/issues/478048 | ||
| 14 | Suggested-by: Philipp Bartsch <phil@grmr.de> | ||
| 15 | Signed-off-by: Jeremy Sowden <jeremy@azazel.net> | ||
| 16 | Signed-off-by: Phil Sutter <phil@nwl.cc> | ||
| 17 | |||
| 18 | Upstream-Status: Backport [https://git.netfilter.org/nftables/commit/?id=ca86f206c92704170a295b8dc7a41f6448835dde] | ||
| 19 | [Adjust patch for 1.1.6] | ||
| 20 | |||
| 21 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
| 22 | --- | ||
| 23 | configure.ac | 2 +- | ||
| 24 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 25 | |||
| 26 | diff --git a/configure.ac b/configure.ac | ||
| 27 | index 6825474..527049f 100644 | ||
| 28 | --- a/configure.ac | ||
| 29 | +++ b/configure.ac | ||
| 30 | @@ -165,7 +165,7 @@ AC_CONFIG_COMMANDS([nftversion.h], [ | ||
| 31 | ]) | ||
| 32 | # Current date should be fetched exactly once per build, | ||
| 33 | # so have 'make' call date and pass the value to every 'gcc' call | ||
| 34 | -AC_SUBST([MAKE_STAMP], ["\$(shell date +%s)"]) | ||
| 35 | +AC_SUBST([MAKE_STAMP], ["${SOURCE_DATE_EPOCH:-$(date +%s)}"]) | ||
| 36 | |||
| 37 | AC_ARG_ENABLE([distcheck], | ||
| 38 | AS_HELP_STRING([--enable-distcheck], [Build for distcheck]), | ||
| 39 | -- | ||
| 40 | 2.34.1 | ||
| 41 | |||
diff --git a/meta-networking/recipes-filter/nftables/nftables_1.1.6.bb b/meta-networking/recipes-filter/nftables/nftables_1.1.6.bb index d27e60a18d..ea42b74615 100644 --- a/meta-networking/recipes-filter/nftables/nftables_1.1.6.bb +++ b/meta-networking/recipes-filter/nftables/nftables_1.1.6.bb | |||
| @@ -12,13 +12,14 @@ DEPENDS = "libmnl libnftnl bison-native \ | |||
| 12 | ${@bb.utils.contains('PACKAGECONFIG', 'mini-gmp', '', 'gmp', d)}" | 12 | ${@bb.utils.contains('PACKAGECONFIG', 'mini-gmp', '', 'gmp', d)}" |
| 13 | 13 | ||
| 14 | SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.xz \ | 14 | SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.xz \ |
| 15 | file://0001-build-support-SOURCE_DATE_EPOCH-for-build-time-stamp.patch \ | ||
| 15 | file://run-ptest \ | 16 | file://run-ptest \ |
| 16 | " | 17 | " |
| 17 | SRC_URI[sha256sum] = "372931bda8556b310636a2f9020adc710f9bab66f47efe0ce90bff800ac2530c" | 18 | SRC_URI[sha256sum] = "372931bda8556b310636a2f9020adc710f9bab66f47efe0ce90bff800ac2530c" |
| 18 | 19 | ||
| 19 | inherit autotools manpages pkgconfig ptest python3native | 20 | inherit autotools manpages pkgconfig ptest python3native systemd |
| 20 | 21 | ||
| 21 | PACKAGECONFIG ?= "python readline json" | 22 | PACKAGECONFIG ?= "python readline json ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" |
| 22 | PACKAGECONFIG[editline] = "--with-cli=editline, , libedit, , , linenoise readline" | 23 | PACKAGECONFIG[editline] = "--with-cli=editline, , libedit, , , linenoise readline" |
| 23 | PACKAGECONFIG[json] = "--with-json, --without-json, jansson" | 24 | PACKAGECONFIG[json] = "--with-json, --without-json, jansson" |
| 24 | PACKAGECONFIG[linenoise] = "--with-cli=linenoise, , linenoise, , , editline readline" | 25 | PACKAGECONFIG[linenoise] = "--with-cli=linenoise, , linenoise, , , editline readline" |
| @@ -27,10 +28,14 @@ PACKAGECONFIG[mini-gmp] = "--with-mini-gmp, --without-mini-gmp" | |||
| 27 | PACKAGECONFIG[python] = "" | 28 | PACKAGECONFIG[python] = "" |
| 28 | PACKAGECONFIG[readline] = "--with-cli=readline, , readline, , , editline linenoise" | 29 | PACKAGECONFIG[readline] = "--with-cli=readline, , readline, , , editline linenoise" |
| 29 | PACKAGECONFIG[xtables] = "--with-xtables, --without-xtables, iptables" | 30 | PACKAGECONFIG[xtables] = "--with-xtables, --without-xtables, iptables" |
| 31 | PACKAGECONFIG[systemd] = "--with-unitdir=${systemd_system_unitdir}, --without-unitdir" | ||
| 30 | 32 | ||
| 31 | EXTRA_OECONF = " \ | 33 | EXTRA_OECONF = " \ |
| 32 | ${@bb.utils.contains_any('PACKAGECONFIG', 'editline linenoise readline', '', '--without-cli', d)}" | 34 | ${@bb.utils.contains_any('PACKAGECONFIG', 'editline linenoise readline', '', '--without-cli', d)}" |
| 33 | 35 | ||
| 36 | SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'nftables.service', '', d)}" | ||
| 37 | SYSTEMD_AUTO_ENABLE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'disable', '', d)}" | ||
| 38 | |||
| 34 | PEP517_SOURCE_PATH = "${S}/py" | 39 | PEP517_SOURCE_PATH = "${S}/py" |
| 35 | 40 | ||
| 36 | # xtables will need it on musl see iptables | 41 | # xtables will need it on musl see iptables |
| @@ -67,7 +72,10 @@ do_install() { | |||
| 67 | fi | 72 | fi |
| 68 | } | 73 | } |
| 69 | 74 | ||
| 70 | RDEPENDS:${PN}-ptest += " ${PN}-python bash coreutils make iproute2 iputils-ping procps python3-core python3-ctypes python3-json python3-misc sed util-linux" | 75 | RDEPENDS:${PN}-ptest += " \ |
| 76 | bash coreutils make iproute2 iputils-ping procps python3-core python3-ctypes python3-json python3-misc sed util-linux \ | ||
| 77 | ${@bb.utils.contains('PACKAGECONFIG', 'python', '${PN}-python', '', d)} \ | ||
| 78 | " | ||
| 71 | 79 | ||
| 72 | 80 | ||
| 73 | # For ptests compile the kernel with CONFIG_NFT_TPROXY | 81 | # For ptests compile the kernel with CONFIG_NFT_TPROXY |
diff --git a/meta-networking/recipes-irc/znc/znc_1.10.1.bb b/meta-networking/recipes-irc/znc/znc_1.10.2.bb index 4477068bba..7793813234 100644 --- a/meta-networking/recipes-irc/znc/znc_1.10.1.bb +++ b/meta-networking/recipes-irc/znc/znc_1.10.2.bb | |||
| @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | |||
| 6 | DEPENDS = "zlib" | 6 | DEPENDS = "zlib" |
| 7 | SRC_URI = "gitsm://github.com/znc/znc.git;branch=master;protocol=https;tag=${BP}" | 7 | SRC_URI = "gitsm://github.com/znc/znc.git;branch=master;protocol=https;tag=${BP}" |
| 8 | 8 | ||
| 9 | SRCREV = "29694fd26f5e9ec46731ee13bf66224181984966" | 9 | SRCREV = "59af2206c62724eec0d8c43d3c1c0b70610ca1d9" |
| 10 | 10 | ||
| 11 | inherit cmake pkgconfig | 11 | inherit cmake pkgconfig |
| 12 | 12 | ||
diff --git a/meta-networking/recipes-protocols/dante/dante_1.4.4.bb b/meta-networking/recipes-protocols/dante/dante_1.4.4.bb index 52cfba4c5f..6a1eed3edb 100644 --- a/meta-networking/recipes-protocols/dante/dante_1.4.4.bb +++ b/meta-networking/recipes-protocols/dante/dante_1.4.4.bb | |||
| @@ -25,6 +25,8 @@ EXTRA_OECONF += "--without-gssapi --sbindir=${bindir}" | |||
| 25 | DEPENDS += "flex-native bison-native libpam libtirpc" | 25 | DEPENDS += "flex-native bison-native libpam libtirpc" |
| 26 | inherit autotools-brokensep features_check | 26 | inherit autotools-brokensep features_check |
| 27 | 27 | ||
| 28 | CACHED_CONFIGUREVARS += "ac_cv_prog_cc_c23=no" | ||
| 29 | |||
| 28 | CPPFLAGS += "-P" | 30 | CPPFLAGS += "-P" |
| 29 | CFLAGS += "-I${STAGING_INCDIR}/tirpc" | 31 | CFLAGS += "-I${STAGING_INCDIR}/tirpc" |
| 30 | LIBS += "-ltirpc" | 32 | LIBS += "-ltirpc" |
diff --git a/meta-networking/recipes-protocols/frr/frr/0001-lib-fix-mgmt_msg-recv-to-deal-with-mis-alignment.patch b/meta-networking/recipes-protocols/frr/frr/0001-lib-fix-mgmt_msg-recv-to-deal-with-mis-alignment.patch new file mode 100644 index 0000000000..22cc10cf31 --- /dev/null +++ b/meta-networking/recipes-protocols/frr/frr/0001-lib-fix-mgmt_msg-recv-to-deal-with-mis-alignment.patch | |||
| @@ -0,0 +1,352 @@ | |||
| 1 | From 5959a3d0cbc73b0c41134bf0d9944a6bd40ba510 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Christian Hopps <chopps@labn.net> | ||
| 3 | Date: Sat, 18 Apr 2026 03:01:46 +0000 | ||
| 4 | Subject: [PATCH] lib: fix mgmt_msg recv to deal with mis-alignment | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | We need our messages to start on 64 bit boundaries as the message buffer | ||
| 10 | is accessed directly as structured data. In particular on ARM32 arch | ||
| 11 | using the data this way lead to unaligned access and SIGBUS. | ||
| 12 | |||
| 13 | The minor optimization of reading multiple messages into a single stream | ||
| 14 | buffer complicated this. Instead we KISS and switch to one message per | ||
| 15 | stream buffer. | ||
| 16 | |||
| 17 | Fixes #20087. | ||
| 18 | |||
| 19 | Signed-off-by: Christian Hopps <chopps@labn.net> | ||
| 20 | Co-developed-by: Samir MOUHOUNE <samir.mouhoune@nav-timing.safrangroup.com> | ||
| 21 | Co-developed-by: Alexis Lothoré <alexis.lothore@bootlin.com> | ||
| 22 | |||
| 23 | See also PR #20985 | ||
| 24 | |||
| 25 | This issue was identified and another solution was provided by Samir | ||
| 26 | MOUHOUNE with the following commit message comments: | ||
| 27 | |||
| 28 | On ARM32 systems, mgmtd crashes at startup on an alignment fault: | ||
| 29 | |||
| 30 | ``` | ||
| 31 | frrinit.sh[158]: Starting watchfrr with command: ' /usr/sbin/watchfrr -d mgmtd zebra staticd' | ||
| 32 | watchfrr[168]: [T83RR-8SM5G] watchfrr 10.5.2 starting: vty@0 | ||
| 33 | watchfrr[168]: [ZCJ3S-SPH5S] mgmtd state -> down : initial connection attempt failed | ||
| 34 | watchfrr[168]: [ZCJ3S-SPH5S] zebra state -> down : initial connection attempt failed | ||
| 35 | watchfrr[168]: [ZCJ3S-SPH5S] staticd state -> down : initial connection attempt failed | ||
| 36 | watchfrr[168]: [YFT0P-5Q5YX] Forked background command [pid 169]: /usr/sbin/watchfrr.sh restart all | ||
| 37 | frrinit.sh[180]: 2026/02/27 09:14:13 ZEBRA: [KGY44-D47GD][EC 4043309111] Disabling MPLS support (no kernel support) | ||
| 38 | watchfrr[168]: [QDG3Y-BY5TN] zebra state -> up : connect succeeded | ||
| 39 | kernel: Alignment trap: not handling instruction edc30b02 at [<004c3c1c>] | ||
| 40 | kernel: 8<--- cut here --- | ||
| 41 | kernel: Unhandled fault: alignment exception (0x801) at 0x008879f6 | ||
| 42 | kernel: [008879f6] *pgd=9baf6831 | ||
| 43 | watchfrr[168]: [YFT0P-5Q5YX] Forked background command [pid 189]: /usr/sbin/watchfrr.sh restart mgmtd | ||
| 44 | frrinit.sh[189]: Cannot stop mgmtd: pid 179 not running | ||
| 45 | watchfrr.sh[196]: Cannot stop mgmtd: pid 179 not running | ||
| 46 | frrinit.sh[202]: [202|zebra] sending configuration | ||
| 47 | frrinit.sh[202]: [202|zebra] done | ||
| 48 | frrinit.sh[216]: [216|watchfrr] sending configuration | ||
| 49 | frrinit.sh[218]: [218|staticd] sending configuration | ||
| 50 | watchfrr[168]: [VTVCM-Y2NW3] Configuration Read in Took: 00:00:00 | ||
| 51 | frrinit.sh[199]: Waiting for children to finish applying config... | ||
| 52 | frrinit.sh[216]: [216|watchfrr] done | ||
| 53 | ``` | ||
| 54 | |||
| 55 | When checking crashlogs in /var/tmp/frr, mgmt gives the following: | ||
| 56 | |||
| 57 | ``` | ||
| 58 | MGMTD: Received signal 7 at 1772183653 (si_addr 0x8879f6); aborting... | ||
| 59 | MGMTD: /lib/libfrr.so.0(zlog_backtrace_sigsafe+0x5c) [0xb6e89c90] | ||
| 60 | MGMTD: /lib/libfrr.so.0(zlog_signal+0xe0) [0xb6e89e80] | ||
| 61 | MGMTD: /lib/libfrr.so.0(+0xd4374) [0xb6ed3374] | ||
| 62 | MGMTD: /lib/libc.so.6(__default_rt_sa_restorer+0) [0xb6ab4d90] | ||
| 63 | MGMTD: /usr/sbin/mgmtd(mgmt_fe_adapter_send_notify+0x6b8) [0x4c3c20] | ||
| 64 | MGMTD: /lib/libfrr.so.0(mgmt_msg_procbufs+0x124) [0xb6e976b8] | ||
| 65 | MGMTD: /lib/libfrr.so.0(+0x98798) [0xb6e97798] | ||
| 66 | MGMTD: /lib/libfrr.so.0(event_call+0xa8) [0xb6ee739c] | ||
| 67 | MGMTD: /lib/libfrr.so.0(frr_run+0xd4) [0xb6e80fc8] | ||
| 68 | MGMTD: /usr/sbin/mgmtd(main+0x188) [0x4bd7ec] | ||
| 69 | MGMTD: /lib/libc.so.6(+0x236b0) [0xb6a9f6b0] | ||
| 70 | MGMTD: /lib/libc.so.6(__libc_start_main+0x98) [0xb6a9f790] | ||
| 71 | MGMTD: in thread msg_conn_proc_msgs scheduled from lib/mgmt_msg.c:543 msg_conn_sched_proc_msgs() | ||
| 72 | ``` | ||
| 73 | |||
| 74 | The issue is that messages are queued for sending/receive back-to-back | ||
| 75 | with no padding. This means that when mgmt creates a pointer back to the | ||
| 76 | data waiting in queue and tries to access fields inside the dereferenced | ||
| 77 | message, those accesses are not performed with the alignment constraints | ||
| 78 | required by some architectures. For example, ARM ABI AAPCS32 ([1]) | ||
| 79 | states that structures alignment should be the same as the "most | ||
| 80 | aligned" member; so a struct mgmt_msg_header, which contains some | ||
| 81 | uint64_t fields (which are 8-bytes alignes), should be 8-bytes aligned | ||
| 82 | as well. | ||
| 83 | |||
| 84 | On x86, this goes unnoticed because the CPU handles unaligned access | ||
| 85 | transparently. On ARM 32-bit with NEON/VFP, the compiler generates | ||
| 86 | 64-bit store instructions that trap on unaligned addresses. The kernel | ||
| 87 | cannot emulate these instructions and kills the process with SIGBUS. | ||
| 88 | |||
| 89 | [1] https://github.com/ARM-software/abi-aa/blob/main/aapcs32/aapcs32.rst#data-types-and-alignment | ||
| 90 | |||
| 91 | Upstream-Status: Backport [https://github.com/FRRouting/frr/commit/5959a3d0cbc73b0c41134bf0d9944a6bd40ba510] | ||
| 92 | |||
| 93 | Signed-off-by: Christian Hopps <chopps@labn.net> | ||
| 94 | (cherry picked from commit ae7d79f8ff25d5750e5796567ff6317030900d40) | ||
| 95 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
| 96 | --- | ||
| 97 | lib/mgmt_be_client.h | 3 +- | ||
| 98 | lib/mgmt_fe_client.h | 3 +- | ||
| 99 | lib/mgmt_msg.c | 157 ++++++++++++++++++------------------------- | ||
| 100 | 3 files changed, 68 insertions(+), 95 deletions(-) | ||
| 101 | |||
| 102 | diff --git a/lib/mgmt_be_client.h b/lib/mgmt_be_client.h | ||
| 103 | index f5627e3c4e..2f412a6fbd 100644 | ||
| 104 | --- a/lib/mgmt_be_client.h | ||
| 105 | +++ b/lib/mgmt_be_client.h | ||
| 106 | @@ -21,7 +21,8 @@ extern "C" { | ||
| 107 | |||
| 108 | #define MGMTD_BE_MAX_NUM_MSG_PROC 500 | ||
| 109 | #define MGMTD_BE_MAX_NUM_MSG_WRITE 1000 | ||
| 110 | -#define MGMTD_BE_MAX_MSG_LEN (64 * 1024) | ||
| 111 | +/* Messages can be any size, this is just the preallocated buffer size */ | ||
| 112 | +#define MGMTD_BE_MAX_MSG_LEN (4 * 1024) | ||
| 113 | |||
| 114 | #define MGMTD_BE_CONTAINER_NODE_VAL "<<container>>" | ||
| 115 | |||
| 116 | diff --git a/lib/mgmt_fe_client.h b/lib/mgmt_fe_client.h | ||
| 117 | index 8ff08b566a..3005c5dd01 100644 | ||
| 118 | --- a/lib/mgmt_fe_client.h | ||
| 119 | +++ b/lib/mgmt_fe_client.h | ||
| 120 | @@ -29,7 +29,8 @@ extern "C" { | ||
| 121 | |||
| 122 | #define MGMTD_FE_MAX_NUM_MSG_PROC 500 | ||
| 123 | #define MGMTD_FE_MAX_NUM_MSG_WRITE 100 | ||
| 124 | -#define MGMTD_FE_MAX_MSG_LEN (64 * 1024) | ||
| 125 | +/* Messages can be any size, this is just the preallocated buffer size */ | ||
| 126 | +#define MGMTD_FE_MAX_MSG_LEN (4 * 1024) | ||
| 127 | |||
| 128 | /*************************************************************** | ||
| 129 | * Data-structures | ||
| 130 | diff --git a/lib/mgmt_msg.c b/lib/mgmt_msg.c | ||
| 131 | index f299b52873..fb56f58ab5 100644 | ||
| 132 | --- a/lib/mgmt_msg.c | ||
| 133 | +++ b/lib/mgmt_msg.c | ||
| 134 | @@ -13,6 +13,7 @@ | ||
| 135 | #include "network.h" | ||
| 136 | #include "sockopt.h" | ||
| 137 | #include "stream.h" | ||
| 138 | +#include "zlog.h" | ||
| 139 | #include "frrevent.h" | ||
| 140 | #include "mgmt_msg.h" | ||
| 141 | #include "mgmt_msg_native.h" | ||
| 142 | @@ -39,8 +40,8 @@ static bool trace; | ||
| 143 | DEFINE_MTYPE(LIB, MSG_CONN, "msg connection state"); | ||
| 144 | |||
| 145 | /** | ||
| 146 | - * Read data from a socket into streams containing 1 or more full msgs headed by | ||
| 147 | - * mgmt_msg_hdr which contain API messages (currently protobuf). | ||
| 148 | + * Read data from a socket into a stream containing 1 full msg headed by | ||
| 149 | + * mgmt_msg_hdr. | ||
| 150 | * | ||
| 151 | * Args: | ||
| 152 | * ms: mgmt_msg_state for this process. | ||
| 153 | @@ -57,96 +58,80 @@ enum mgmt_msg_rsched mgmt_msg_read(struct mgmt_msg_state *ms, int fd, | ||
| 154 | bool debug) | ||
| 155 | { | ||
| 156 | const char *dbgtag = debug ? ms->idtag : NULL; | ||
| 157 | - size_t avail = STREAM_WRITEABLE(ms->ins); | ||
| 158 | struct mgmt_msg_hdr *mhdr = NULL; | ||
| 159 | - size_t total = 0; | ||
| 160 | - size_t mcount = 0; | ||
| 161 | - ssize_t n, left; | ||
| 162 | + struct stream *news; | ||
| 163 | + size_t nread; | ||
| 164 | + ssize_t n; | ||
| 165 | |||
| 166 | assert(ms && fd != -1); | ||
| 167 | - MGMT_MSG_TRACE(dbgtag, "enter with %zu bytes available to read on fd %d", avail, fd); | ||
| 168 | + MGMT_MSG_TRACE(dbgtag, "enter to read from fd %d", fd); | ||
| 169 | + | ||
| 170 | + assert(stream_get_getp(ms->ins) == 0); | ||
| 171 | + nread = stream_get_endp(ms->ins); | ||
| 172 | |||
| 173 | /* | ||
| 174 | - * Read as much as we can into the stream. | ||
| 175 | + * Get header, validate, and resize the stream, if needed, to fit incoming message. | ||
| 176 | */ | ||
| 177 | - while (avail > sizeof(struct mgmt_msg_hdr)) { | ||
| 178 | - n = stream_read_try(ms->ins, fd, avail); | ||
| 179 | - | ||
| 180 | - /* -2 is normal nothing read, and to retry */ | ||
| 181 | - if (n == -2) { | ||
| 182 | - MGMT_MSG_TRACE(dbgtag, "nothing more to read on fd %d", fd); | ||
| 183 | - break; | ||
| 184 | - } | ||
| 185 | - if (n <= 0) { | ||
| 186 | - if (n == 0) | ||
| 187 | - MGMT_MSG_ERR(ms, "got EOF/disconnect on fd %d", fd); | ||
| 188 | - else | ||
| 189 | - MGMT_MSG_ERR(ms, "got error while reading on fd %d: '%s'", fd, | ||
| 190 | - safe_strerror(errno)); | ||
| 191 | - return MSR_DISCONNECT; | ||
| 192 | + if (nread < sizeof(struct mgmt_msg_hdr)) { | ||
| 193 | + while (nread < sizeof(struct mgmt_msg_hdr)) { | ||
| 194 | + n = stream_read_try(ms->ins, fd, sizeof(struct mgmt_msg_hdr) - nread); | ||
| 195 | + if (n <= 0) | ||
| 196 | + goto not_done; | ||
| 197 | + nread += n; | ||
| 198 | + ms->nrxb += n; | ||
| 199 | } | ||
| 200 | - MGMT_MSG_TRACE(dbgtag, "read %zd bytes on fd %d", n, fd); | ||
| 201 | - ms->nrxb += n; | ||
| 202 | - avail -= n; | ||
| 203 | - } | ||
| 204 | |||
| 205 | - /* | ||
| 206 | - * Check if we have read a complete messages or not. | ||
| 207 | - */ | ||
| 208 | - assert(stream_get_getp(ms->ins) == 0); | ||
| 209 | - left = stream_get_endp(ms->ins); | ||
| 210 | - while (left > (ssize_t)sizeof(struct mgmt_msg_hdr)) { | ||
| 211 | - mhdr = (struct mgmt_msg_hdr *)(STREAM_DATA(ms->ins) + total); | ||
| 212 | + /* Validate the header is sane */ | ||
| 213 | + mhdr = (struct mgmt_msg_hdr *)STREAM_DATA(ms->ins); | ||
| 214 | if (!MGMT_MSG_IS_MARKER(mhdr->marker)) { | ||
| 215 | MGMT_MSG_DBG(dbgtag, "recv corrupt buffer on fd %d, disconnect", fd); | ||
| 216 | return MSR_DISCONNECT; | ||
| 217 | + } else if (mhdr->len <= sizeof(struct mgmt_msg_hdr)) { | ||
| 218 | + MGMT_MSG_DBG(dbgtag, "recv invalid message length %u on fd %d, disconnect", | ||
| 219 | + mhdr->len, fd); | ||
| 220 | + return MSR_DISCONNECT; | ||
| 221 | } | ||
| 222 | - if ((ssize_t)mhdr->len > left) | ||
| 223 | - break; | ||
| 224 | - | ||
| 225 | - MGMT_MSG_TRACE(dbgtag, "read full message on fd %d len %u", fd, mhdr->len); | ||
| 226 | - total += mhdr->len; | ||
| 227 | - left -= mhdr->len; | ||
| 228 | - mcount++; | ||
| 229 | - } | ||
| 230 | |||
| 231 | - if (!mcount) { | ||
| 232 | - /* Didn't manage to read a full message */ | ||
| 233 | - if (mhdr && avail == 0) { | ||
| 234 | - struct stream *news; | ||
| 235 | - /* | ||
| 236 | - * Message was longer than what was left and we have no | ||
| 237 | - * available space to read more in. B/c mcount == 0 the | ||
| 238 | - * message starts at the beginning of the stream so | ||
| 239 | - * therefor the stream is too small to fit the message.. | ||
| 240 | - * Resize the stream to fit. | ||
| 241 | - */ | ||
| 242 | + /* See if message will fit in the stream, realloc if not */ | ||
| 243 | + if (mhdr->len > ms->ins->size) { | ||
| 244 | + MGMT_MSG_DBG(dbgtag, | ||
| 245 | + "message length %u is greater than available %zu on fd %d", | ||
| 246 | + mhdr->len, ms->ins->size, fd); | ||
| 247 | news = stream_new(mhdr->len); | ||
| 248 | - stream_put(news, mhdr, left); | ||
| 249 | - stream_set_endp(news, left); | ||
| 250 | + stream_put(news, mhdr, sizeof(struct mgmt_msg_hdr)); | ||
| 251 | stream_free(ms->ins); | ||
| 252 | ms->ins = news; | ||
| 253 | } | ||
| 254 | - return MSR_SCHED_STREAM; | ||
| 255 | } | ||
| 256 | |||
| 257 | - /* | ||
| 258 | - * We have read at least one message into the stream, queue it up. | ||
| 259 | - */ | ||
| 260 | - mhdr = (struct mgmt_msg_hdr *)(STREAM_DATA(ms->ins) + total); | ||
| 261 | - stream_set_endp(ms->ins, total); | ||
| 262 | - stream_fifo_push(&ms->inq, ms->ins); | ||
| 263 | - if (left < (ssize_t)sizeof(struct mgmt_msg_hdr)) | ||
| 264 | - ms->ins = stream_new(ms->max_msg_sz); | ||
| 265 | - else | ||
| 266 | - /* handle case where message is greater than max */ | ||
| 267 | - ms->ins = stream_new(MAX(ms->max_msg_sz, mhdr->len)); | ||
| 268 | - if (left) { | ||
| 269 | - stream_put(ms->ins, mhdr, left); | ||
| 270 | - stream_set_endp(ms->ins, left); | ||
| 271 | + /* Read the rest of the message. */ | ||
| 272 | + mhdr = (struct mgmt_msg_hdr *)STREAM_DATA(ms->ins); | ||
| 273 | + while (nread < mhdr->len) { | ||
| 274 | + n = stream_read_try(ms->ins, fd, mhdr->len - nread); | ||
| 275 | + if (n <= 0) | ||
| 276 | + goto not_done; | ||
| 277 | + nread += n; | ||
| 278 | + ms->nrxb += n; | ||
| 279 | + MGMT_MSG_TRACE(dbgtag, "read %zd from fd %d (%zu of %u)", n, fd, nread, mhdr->len); | ||
| 280 | } | ||
| 281 | |||
| 282 | + /* We've got a full message, push it onto the FIFO and setup for the next message. */ | ||
| 283 | + MGMT_MSG_TRACE(dbgtag, "read full msg %zu/%u from fd %d", nread, mhdr->len, fd); | ||
| 284 | + stream_fifo_push(&ms->inq, ms->ins); | ||
| 285 | + ms->ins = stream_new(ms->max_msg_sz); | ||
| 286 | return MSR_SCHED_BOTH; | ||
| 287 | + | ||
| 288 | +not_done: | ||
| 289 | + if (n == -2) { | ||
| 290 | + MGMT_MSG_TRACE(dbgtag, "nothing more to read on fd %d", fd); | ||
| 291 | + return MSR_SCHED_STREAM; | ||
| 292 | + } | ||
| 293 | + if (n == 0) | ||
| 294 | + MGMT_MSG_ERR(ms, "got EOF/disconnect on fd %d", fd); | ||
| 295 | + else | ||
| 296 | + MGMT_MSG_ERR(ms, "got error while reading on fd %d: '%s'", fd, | ||
| 297 | + safe_strerror(errno)); | ||
| 298 | + return MSR_DISCONNECT; | ||
| 299 | } | ||
| 300 | |||
| 301 | /** | ||
| 302 | @@ -171,7 +156,6 @@ bool mgmt_msg_procbufs(struct mgmt_msg_state *ms, | ||
| 303 | const char *dbgtag = debug ? ms->idtag : NULL; | ||
| 304 | struct mgmt_msg_hdr *mhdr; | ||
| 305 | struct stream *work; | ||
| 306 | - uint8_t *data; | ||
| 307 | size_t left, nproc; | ||
| 308 | |||
| 309 | MGMT_MSG_TRACE(dbgtag, "Have %zu streams to process", ms->inq.count); | ||
| 310 | @@ -182,30 +166,17 @@ bool mgmt_msg_procbufs(struct mgmt_msg_state *ms, | ||
| 311 | if (!work) | ||
| 312 | break; | ||
| 313 | |||
| 314 | - data = STREAM_DATA(work); | ||
| 315 | left = stream_get_endp(work); | ||
| 316 | MGMT_MSG_TRACE(dbgtag, "Processing stream of len %zu", left); | ||
| 317 | - | ||
| 318 | - for (; left > sizeof(struct mgmt_msg_hdr); | ||
| 319 | - left -= mhdr->len, data += mhdr->len) { | ||
| 320 | - mhdr = (struct mgmt_msg_hdr *)data; | ||
| 321 | - | ||
| 322 | - assert(MGMT_MSG_IS_MARKER(mhdr->marker)); | ||
| 323 | - assert(left >= mhdr->len); | ||
| 324 | - | ||
| 325 | - /* | ||
| 326 | - * Q: if the handler disconnects should stop/flush? | ||
| 327 | - */ | ||
| 328 | - handle_msg(MGMT_MSG_MARKER_VERSION(mhdr->marker), (uint8_t *)(mhdr + 1), | ||
| 329 | - mhdr->len - sizeof(struct mgmt_msg_hdr), user); | ||
| 330 | - ms->nrxm++; | ||
| 331 | - nproc++; | ||
| 332 | - } | ||
| 333 | - | ||
| 334 | - if (work != ms->ins) | ||
| 335 | - stream_free(work); /* Free it up */ | ||
| 336 | - else | ||
| 337 | - stream_reset(work); /* Reset stream for next read */ | ||
| 338 | + /* | ||
| 339 | + * Q: if the handler disconnects should we stop/flush? | ||
| 340 | + */ | ||
| 341 | + mhdr = (struct mgmt_msg_hdr *)STREAM_DATA(work); | ||
| 342 | + handle_msg(MGMT_MSG_MARKER_VERSION(mhdr->marker), (uint8_t *)(mhdr + 1), | ||
| 343 | + mhdr->len - sizeof(struct mgmt_msg_hdr), user); | ||
| 344 | + ms->nrxm++; | ||
| 345 | + nproc++; | ||
| 346 | + stream_free(work); /* Free it up */ | ||
| 347 | } | ||
| 348 | |||
| 349 | /* return true if should reschedule b/c more to process. */ | ||
| 350 | -- | ||
| 351 | 2.43.0 | ||
| 352 | |||
diff --git a/meta-networking/recipes-protocols/frr/frr/CVE-2025-61099-61107-1.patch b/meta-networking/recipes-protocols/frr/frr/CVE-2025-61099-61107-1.patch deleted file mode 100644 index a1e1246cce..0000000000 --- a/meta-networking/recipes-protocols/frr/frr/CVE-2025-61099-61107-1.patch +++ /dev/null | |||
| @@ -1,40 +0,0 @@ | |||
| 1 | From e21276d430663fd8312940bb3b0ce081957e3d85 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Sun, 24 Aug 2025 21:17:55 +0800 | ||
| 4 | Subject: [PATCH] ospfd: Add null check for vty_out in check_tlv_size | ||
| 5 | |||
| 6 | From: s1awwhy <seawwhy@163.com> | ||
| 7 | |||
| 8 | Add security check for vty_out. Specifically, Check NULL for vty. If vty is not available, dump info via zlog. | ||
| 9 | |||
| 10 | Signed-off-by: s1awwhy <seawwhy@163.com> | ||
| 11 | |||
| 12 | CVE: CVE-2025-61099 CVE-2025-61100 CVE-2025-61101 CVE-2025-61102 CVE-2025-61103 CVE-2025-61104 CVE-2025-61105 CVE-2025-61106 CVE-2025-61107 | ||
| 13 | Upstream-Status: Backport [https://github.com/FRRouting/frr/commit/b7d9b7aa47627b31e4b50795284408ab6de98660] | ||
| 14 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 15 | --- | ||
| 16 | ospfd/ospf_ext.c | 8 ++++++-- | ||
| 17 | 1 file changed, 6 insertions(+), 2 deletions(-) | ||
| 18 | |||
| 19 | diff --git a/ospfd/ospf_ext.c b/ospfd/ospf_ext.c | ||
| 20 | index df0b3b9081..8ca0df3200 100644 | ||
| 21 | --- a/ospfd/ospf_ext.c | ||
| 22 | +++ b/ospfd/ospf_ext.c | ||
| 23 | @@ -1705,11 +1705,15 @@ static void ospf_ext_lsa_schedule(struct ext_itf *exti, enum lsa_opcode op) | ||
| 24 | * ------------------------------------ | ||
| 25 | */ | ||
| 26 | |||
| 27 | +/* Check NULL for vty. If vty is not available, dump info via zlog */ | ||
| 28 | #define check_tlv_size(size, msg) \ | ||
| 29 | do { \ | ||
| 30 | if (ntohs(tlvh->length) != size) { \ | ||
| 31 | - vty_out(vty, " Wrong %s TLV size: %d(%d). Abort!\n", \ | ||
| 32 | - msg, ntohs(tlvh->length), size); \ | ||
| 33 | + if (vty != NULL) \ | ||
| 34 | + vty_out(vty, " Wrong %s TLV size: %d(%d). Abort!\n", \ | ||
| 35 | + msg, ntohs(tlvh->length), size); \ | ||
| 36 | + else \ | ||
| 37 | + zlog_debug(" Wrong %s TLV size: %d(%d). Abort!", msg, ntohs(tlvh->length), size); \ | ||
| 38 | return size + TLV_HDR_SIZE; \ | ||
| 39 | } \ | ||
| 40 | } while (0) | ||
diff --git a/meta-networking/recipes-protocols/frr/frr/CVE-2025-61099-61107-2.patch b/meta-networking/recipes-protocols/frr/frr/CVE-2025-61099-61107-2.patch deleted file mode 100644 index eacada0ec4..0000000000 --- a/meta-networking/recipes-protocols/frr/frr/CVE-2025-61099-61107-2.patch +++ /dev/null | |||
| @@ -1,80 +0,0 @@ | |||
| 1 | From d9ed123b814dad7cf4b069de5601c9f279596191 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Tue, 6 Jan 2026 15:32:32 +0100 | ||
| 4 | Subject: [PATCH] ospfd: skip subsequent tlvs after invalid length | ||
| 5 | |||
| 6 | From: Louis Scalbert <louis.scalbert@6wind.com> | ||
| 7 | |||
| 8 | Do not attempt to read subsequent TLVs after an TLV invalid length is | ||
| 9 | detected. | ||
| 10 | |||
| 11 | Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com> | ||
| 12 | |||
| 13 | CVE: CVE-2025-61099 CVE-2025-61100 CVE-2025-61101 CVE-2025-61102 CVE-2025-61103 CVE-2025-61104 CVE-2025-61105 CVE-2025-61106 CVE-2025-61107 | ||
| 14 | Upstream-Status: Backport [https://github.com/FRRouting/frr/commit/33dfc7e7be1ac8b66abbf47c30a709215fbc1926] | ||
| 15 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 16 | --- | ||
| 17 | ospfd/ospf_ext.c | 6 +++--- | ||
| 18 | ospfd/ospf_ri.c | 6 +++--- | ||
| 19 | ospfd/ospf_te.c | 6 +++--- | ||
| 20 | 3 files changed, 9 insertions(+), 9 deletions(-) | ||
| 21 | |||
| 22 | diff --git a/ospfd/ospf_ext.c b/ospfd/ospf_ext.c | ||
| 23 | index 8ca0df3200..62b0020148 100644 | ||
| 24 | --- a/ospfd/ospf_ext.c | ||
| 25 | +++ b/ospfd/ospf_ext.c | ||
| 26 | @@ -1710,11 +1710,11 @@ static void ospf_ext_lsa_schedule(struct ext_itf *exti, enum lsa_opcode op) | ||
| 27 | do { \ | ||
| 28 | if (ntohs(tlvh->length) != size) { \ | ||
| 29 | if (vty != NULL) \ | ||
| 30 | - vty_out(vty, " Wrong %s TLV size: %d(%d). Abort!\n", \ | ||
| 31 | + vty_out(vty, " Wrong %s TLV size: %d(expected %d). Skip subsequent TLVs!\n", \ | ||
| 32 | msg, ntohs(tlvh->length), size); \ | ||
| 33 | else \ | ||
| 34 | - zlog_debug(" Wrong %s TLV size: %d(%d). Abort!", msg, ntohs(tlvh->length), size); \ | ||
| 35 | - return size + TLV_HDR_SIZE; \ | ||
| 36 | + zlog_debug(" Wrong %s TLV size: %d(expected %d). Skip subsequent TLVs!", msg, ntohs(tlvh->length), size); \ | ||
| 37 | + return OSPF_MAX_LSA_SIZE + 1; \ | ||
| 38 | } \ | ||
| 39 | } while (0) | ||
| 40 | |||
| 41 | diff --git a/ospfd/ospf_ri.c b/ospfd/ospf_ri.c | ||
| 42 | index 76e6efeb83..7934b25451 100644 | ||
| 43 | --- a/ospfd/ospf_ri.c | ||
| 44 | +++ b/ospfd/ospf_ri.c | ||
| 45 | @@ -1208,12 +1208,12 @@ static int ospf_router_info_lsa_update(struct ospf_lsa *lsa) | ||
| 46 | do { \ | ||
| 47 | if (ntohs(tlvh->length) > size) { \ | ||
| 48 | if (vty != NULL) \ | ||
| 49 | - vty_out(vty, " Wrong %s TLV size: %d(%d)\n", \ | ||
| 50 | + vty_out(vty, " Wrong %s TLV size: %d(expected %d). Skip subsequent TLVs!\n", \ | ||
| 51 | msg, ntohs(tlvh->length), size); \ | ||
| 52 | else \ | ||
| 53 | - zlog_debug(" Wrong %s TLV size: %d(%d)", \ | ||
| 54 | + zlog_debug(" Wrong %s TLV size: %d(expected %d). Skip subsequent TLVs!", \ | ||
| 55 | msg, ntohs(tlvh->length), size); \ | ||
| 56 | - return size + TLV_HDR_SIZE; \ | ||
| 57 | + return OSPF_MAX_LSA_SIZE + 1; \ | ||
| 58 | } \ | ||
| 59 | } while (0) | ||
| 60 | |||
| 61 | diff --git a/ospfd/ospf_te.c b/ospfd/ospf_te.c | ||
| 62 | index d187485b9f..850a7039f1 100644 | ||
| 63 | --- a/ospfd/ospf_te.c | ||
| 64 | +++ b/ospfd/ospf_te.c | ||
| 65 | @@ -3161,12 +3161,12 @@ static void ospf_te_init_ted(struct ls_ted *ted, struct ospf *ospf) | ||
| 66 | do { \ | ||
| 67 | if (ntohs(tlvh->length) > size) { \ | ||
| 68 | if (vty != NULL) \ | ||
| 69 | - vty_out(vty, " Wrong %s TLV size: %d(%d)\n", \ | ||
| 70 | + vty_out(vty, " Wrong %s TLV size: %d(expected %d). Skip subsequent TLVs!\n", \ | ||
| 71 | msg, ntohs(tlvh->length), size); \ | ||
| 72 | else \ | ||
| 73 | - zlog_debug(" Wrong %s TLV size: %d(%d)", \ | ||
| 74 | + zlog_debug(" Wrong %s TLV size: %d(expected %d). Skip subsequent TLVs!", \ | ||
| 75 | msg, ntohs(tlvh->length), size); \ | ||
| 76 | - return size + TLV_HDR_SIZE; \ | ||
| 77 | + return OSPF_MAX_LSA_SIZE + 1; \ | ||
| 78 | } \ | ||
| 79 | } while (0) | ||
| 80 | |||
diff --git a/meta-networking/recipes-protocols/frr/frr/CVE-2025-61099-61107-3.patch b/meta-networking/recipes-protocols/frr/frr/CVE-2025-61099-61107-3.patch deleted file mode 100644 index 7b983198f5..0000000000 --- a/meta-networking/recipes-protocols/frr/frr/CVE-2025-61099-61107-3.patch +++ /dev/null | |||
| @@ -1,293 +0,0 @@ | |||
| 1 | From 2d02bca97251ee53fb10b4c34c8cda0e20ae8b8e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Sun, 24 Aug 2025 21:21:23 +0800 | ||
| 4 | Subject: [PATCH] ospfd: Fix NULL Pointer Deference when dumping link info | ||
| 5 | |||
| 6 | From: s1awwhy <seawwhy@163.com> | ||
| 7 | |||
| 8 | When the command debug ospf packet all send/recv detail is enabled in the OSPF | ||
| 9 | configuration, ospfd will dump detailed information of any received or sent | ||
| 10 | OSPF packets, either via VTY or through the zlog. However, the original Opaque | ||
| 11 | LSA handling code failed to check whether the VTY context and show_opaque_info | ||
| 12 | were available, resulting in NULL pointer dereference and crashes in ospfd. | ||
| 13 | The patch fixes the Null Pointer Deference Vulnerability in | ||
| 14 | show_vty_ext_link_rmt_itf_addr, show_vty_ext_link_adj_sid, | ||
| 15 | show_vty_ext_link_lan_adj_sid, show_vty_unknown_tlv, | ||
| 16 | show_vty_link_info, show_vty_ext_pref_pref_sid, show_vtY_pref_info. | ||
| 17 | Specifically, add NULL check for vty. If vty is not available, dump details | ||
| 18 | via zlog. | ||
| 19 | |||
| 20 | Signed-off-by: s1awwhy <seawwhy@163.com> | ||
| 21 | Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com> | ||
| 22 | |||
| 23 | CVE: CVE-2025-61099 CVE-2025-61100 CVE-2025-61101 CVE-2025-61102 CVE-2025-61103 CVE-2025-61104 CVE-2025-61105 CVE-2025-61106 CVE-2025-61107 | ||
| 24 | Upstream-Status: Backport [https://github.com/FRRouting/frr/commit/034e6fe67078810b952630055614ee5710d1196e] | ||
| 25 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 26 | --- | ||
| 27 | ospfd/ospf_ext.c | 200 ++++++++++++++++++++++++++++++++--------------- | ||
| 28 | 1 file changed, 138 insertions(+), 62 deletions(-) | ||
| 29 | |||
| 30 | diff --git a/ospfd/ospf_ext.c b/ospfd/ospf_ext.c | ||
| 31 | index 62b0020148..c1fcd632e0 100644 | ||
| 32 | --- a/ospfd/ospf_ext.c | ||
| 33 | +++ b/ospfd/ospf_ext.c | ||
| 34 | @@ -1729,9 +1729,15 @@ static uint16_t show_vty_ext_link_rmt_itf_addr(struct vty *vty, | ||
| 35 | check_tlv_size(EXT_SUBTLV_RMT_ITF_ADDR_SIZE, "Remote Itf. Address"); | ||
| 36 | |||
| 37 | if (!json) | ||
| 38 | - vty_out(vty, | ||
| 39 | - " Remote Interface Address Sub-TLV: Length %u\n Address: %pI4\n", | ||
| 40 | - ntohs(top->header.length), &top->value); | ||
| 41 | + if (vty != NULL) { | ||
| 42 | + vty_out(vty, | ||
| 43 | + " Remote Interface Address Sub-TLV: Length %u\n Address: %pI4\n", | ||
| 44 | + ntohs(top->header.length), &top->value); | ||
| 45 | + } else { | ||
| 46 | + zlog_debug(" Remote Interface Address Sub-TLV: Length %u", | ||
| 47 | + ntohs(top->header.length)); | ||
| 48 | + zlog_debug(" Address: %pI4", &top->value); | ||
| 49 | + } | ||
| 50 | else | ||
| 51 | json_object_string_addf(json, "remoteInterfaceAddress", "%pI4", | ||
| 52 | &top->value); | ||
| 53 | @@ -1752,18 +1758,30 @@ static uint16_t show_vty_ext_link_adj_sid(struct vty *vty, | ||
| 54 | : SID_INDEX_SIZE(EXT_SUBTLV_ADJ_SID_SIZE); | ||
| 55 | check_tlv_size(tlv_size, "Adjacency SID"); | ||
| 56 | |||
| 57 | - if (!json) | ||
| 58 | - vty_out(vty, | ||
| 59 | - " Adj-SID Sub-TLV: Length %u\n\tFlags: 0x%x\n\tMT-ID:0x%x\n\tWeight: 0x%x\n\t%s: %u\n", | ||
| 60 | - ntohs(top->header.length), top->flags, top->mtid, | ||
| 61 | - top->weight, | ||
| 62 | - CHECK_FLAG(top->flags, EXT_SUBTLV_LINK_ADJ_SID_VFLG) | ||
| 63 | - ? "Label" | ||
| 64 | - : "Index", | ||
| 65 | - CHECK_FLAG(top->flags, EXT_SUBTLV_LINK_ADJ_SID_VFLG) | ||
| 66 | - ? GET_LABEL(ntohl(top->value)) | ||
| 67 | - : ntohl(top->value)); | ||
| 68 | - else { | ||
| 69 | + if (!json) { | ||
| 70 | + /* Add security check for vty_out. If vty is not available, dump info via zlog.*/ | ||
| 71 | + if (vty != NULL) | ||
| 72 | + vty_out(vty, | ||
| 73 | + " Adj-SID Sub-TLV: Length %u\n\tFlags: 0x%x\n\tMT-ID:0x%x\n\tWeight: 0x%x\n\t%s: %u\n", | ||
| 74 | + ntohs(top->header.length), top->flags, top->mtid, top->weight, | ||
| 75 | + CHECK_FLAG(top->flags, EXT_SUBTLV_LINK_ADJ_SID_VFLG) ? "Label" | ||
| 76 | + : "Index", | ||
| 77 | + CHECK_FLAG(top->flags, EXT_SUBTLV_LINK_ADJ_SID_VFLG) | ||
| 78 | + ? GET_LABEL(ntohl(top->value)) | ||
| 79 | + : ntohl(top->value)); | ||
| 80 | + else { | ||
| 81 | + zlog_debug(" Adj-SID Sub-TLV: Length %u", ntohs(top->header.length)); | ||
| 82 | + zlog_debug(" Flags: 0x%x", top->flags); | ||
| 83 | + zlog_debug(" MT-ID:0x%x", top->mtid); | ||
| 84 | + zlog_debug(" Weight: 0x%x", top->weight); | ||
| 85 | + zlog_debug(" %s: %u", | ||
| 86 | + CHECK_FLAG(top->flags, EXT_SUBTLV_LINK_ADJ_SID_VFLG) ? "Label" | ||
| 87 | + : "Index", | ||
| 88 | + CHECK_FLAG(top->flags, EXT_SUBTLV_LINK_ADJ_SID_VFLG) | ||
| 89 | + ? GET_LABEL(ntohl(top->value)) | ||
| 90 | + : ntohl(top->value)); | ||
| 91 | + } | ||
| 92 | + } else { | ||
| 93 | json_object_string_addf(json, "flags", "0x%x", top->flags); | ||
| 94 | json_object_string_addf(json, "mtID", "0x%x", top->mtid); | ||
| 95 | json_object_string_addf(json, "weight", "0x%x", top->weight); | ||
| 96 | @@ -1791,18 +1809,32 @@ static uint16_t show_vty_ext_link_lan_adj_sid(struct vty *vty, | ||
| 97 | : SID_INDEX_SIZE(EXT_SUBTLV_LAN_ADJ_SID_SIZE); | ||
| 98 | check_tlv_size(tlv_size, "LAN-Adjacency SID"); | ||
| 99 | |||
| 100 | - if (!json) | ||
| 101 | - vty_out(vty, | ||
| 102 | - " LAN-Adj-SID Sub-TLV: Length %u\n\tFlags: 0x%x\n\tMT-ID:0x%x\n\tWeight: 0x%x\n\tNeighbor ID: %pI4\n\t%s: %u\n", | ||
| 103 | - ntohs(top->header.length), top->flags, top->mtid, | ||
| 104 | - top->weight, &top->neighbor_id, | ||
| 105 | - CHECK_FLAG(top->flags, EXT_SUBTLV_LINK_ADJ_SID_VFLG) | ||
| 106 | - ? "Label" | ||
| 107 | - : "Index", | ||
| 108 | - CHECK_FLAG(top->flags, EXT_SUBTLV_LINK_ADJ_SID_VFLG) | ||
| 109 | - ? GET_LABEL(ntohl(top->value)) | ||
| 110 | - : ntohl(top->value)); | ||
| 111 | - else { | ||
| 112 | + if (!json) { | ||
| 113 | + /* Add security check for vty_out. If vty is not available, dump info via zlog. */ | ||
| 114 | + if (vty != NULL) { | ||
| 115 | + vty_out(vty, | ||
| 116 | + " LAN-Adj-SID Sub-TLV: Length %u\n\tFlags: 0x%x\n\tMT-ID:0x%x\n\tWeight: 0x%x\n\tNeighbor ID: %pI4\n\t%s: %u\n", | ||
| 117 | + ntohs(top->header.length), top->flags, top->mtid, top->weight, | ||
| 118 | + &top->neighbor_id, | ||
| 119 | + CHECK_FLAG(top->flags, EXT_SUBTLV_LINK_ADJ_SID_VFLG) ? "Label" | ||
| 120 | + : "Index", | ||
| 121 | + CHECK_FLAG(top->flags, EXT_SUBTLV_LINK_ADJ_SID_VFLG) | ||
| 122 | + ? GET_LABEL(ntohl(top->value)) | ||
| 123 | + : ntohl(top->value)); | ||
| 124 | + } else { | ||
| 125 | + zlog_debug(" LAN-Adj-SID Sub-TLV: Length %u", ntohs(top->header.length)); | ||
| 126 | + zlog_debug(" Flags: 0x%x", top->flags); | ||
| 127 | + zlog_debug(" MT-ID:0x%x", top->mtid); | ||
| 128 | + zlog_debug(" Weight: 0x%x", top->weight); | ||
| 129 | + zlog_debug(" Neighbor ID: %pI4", &top->neighbor_id); | ||
| 130 | + zlog_debug(" %s: %u", | ||
| 131 | + CHECK_FLAG(top->flags, EXT_SUBTLV_LINK_ADJ_SID_VFLG) ? "Label" | ||
| 132 | + : "Index", | ||
| 133 | + CHECK_FLAG(top->flags, EXT_SUBTLV_LINK_ADJ_SID_VFLG) | ||
| 134 | + ? GET_LABEL(ntohl(top->value)) | ||
| 135 | + : ntohl(top->value)); | ||
| 136 | + } | ||
| 137 | + } else { | ||
| 138 | json_object_string_addf(json, "flags", "0x%x", top->flags); | ||
| 139 | json_object_string_addf(json, "mtID", "0x%x", top->mtid); | ||
| 140 | json_object_string_addf(json, "weight", "0x%x", top->weight); | ||
| 141 | @@ -1823,14 +1855,23 @@ static uint16_t show_vty_unknown_tlv(struct vty *vty, struct tlv_header *tlvh, | ||
| 142 | { | ||
| 143 | json_object *obj; | ||
| 144 | |||
| 145 | + /* Add security check for vty_out. If vty is not available, dump info via zlog. */ | ||
| 146 | if (TLV_SIZE(tlvh) > buf_size) { | ||
| 147 | - vty_out(vty, " TLV size %d exceeds buffer size. Abort!", | ||
| 148 | - TLV_SIZE(tlvh)); | ||
| 149 | + if (vty != NULL) | ||
| 150 | + vty_out(vty, " TLV size %d exceeds buffer size. Abort!", TLV_SIZE(tlvh)); | ||
| 151 | + else | ||
| 152 | + zlog_debug(" TLV size %d exceeds buffer size. Abort!", TLV_SIZE(tlvh)); | ||
| 153 | + | ||
| 154 | return buf_size; | ||
| 155 | } | ||
| 156 | if (!json) | ||
| 157 | - vty_out(vty, " Unknown TLV: [type(0x%x), length(0x%x)]\n", | ||
| 158 | - ntohs(tlvh->type), ntohs(tlvh->length)); | ||
| 159 | + if (vty != NULL) { | ||
| 160 | + vty_out(vty, " Unknown TLV: [type(0x%x), length(0x%x)]\n", | ||
| 161 | + ntohs(tlvh->type), ntohs(tlvh->length)); | ||
| 162 | + } else { | ||
| 163 | + zlog_debug(" Unknown TLV: [type(0x%x), length(0x%x)]", | ||
| 164 | + ntohs(tlvh->type), ntohs(tlvh->length)); | ||
| 165 | + } | ||
| 166 | else { | ||
| 167 | obj = json_object_new_object(); | ||
| 168 | json_object_string_addf(obj, "type", "0x%x", | ||
| 169 | @@ -1855,19 +1896,31 @@ static uint16_t show_vty_link_info(struct vty *vty, struct tlv_header *ext, | ||
| 170 | |||
| 171 | /* Verify that TLV length is valid against remaining buffer size */ | ||
| 172 | if (length > buf_size) { | ||
| 173 | - vty_out(vty, | ||
| 174 | - " Extended Link TLV size %d exceeds buffer size. Abort!\n", | ||
| 175 | - length); | ||
| 176 | + /* Add security check for vty_out. If vty is not available, dump info via zlog. */ | ||
| 177 | + if (vty != NULL) { | ||
| 178 | + vty_out(vty, " Extended Link TLV size %d exceeds buffer size. Abort!\n", | ||
| 179 | + length); | ||
| 180 | + } else { | ||
| 181 | + zlog_debug(" Extended Link TLV size %d exceeds buffer size. Abort!", | ||
| 182 | + length); | ||
| 183 | + } | ||
| 184 | return buf_size; | ||
| 185 | } | ||
| 186 | |||
| 187 | if (!json) { | ||
| 188 | - vty_out(vty, | ||
| 189 | - " Extended Link TLV: Length %u\n Link Type: 0x%x\n" | ||
| 190 | - " Link ID: %pI4\n", | ||
| 191 | - ntohs(top->header.length), top->link_type, | ||
| 192 | - &top->link_id); | ||
| 193 | - vty_out(vty, " Link data: %pI4\n", &top->link_data); | ||
| 194 | + /* Add security check for vty_out. If vty is not available, dump info via zlog. */ | ||
| 195 | + if (vty != NULL) { | ||
| 196 | + vty_out(vty, | ||
| 197 | + " Extended Link TLV: Length %u\n Link Type: 0x%x\n" | ||
| 198 | + " Link ID: %pI4\n", | ||
| 199 | + ntohs(top->header.length), top->link_type, &top->link_id); | ||
| 200 | + vty_out(vty, " Link data: %pI4\n", &top->link_data); | ||
| 201 | + } else { | ||
| 202 | + zlog_debug(" Extended Link TLV: Length %u", ntohs(top->header.length)); | ||
| 203 | + zlog_debug(" Link Type: 0x%x", top->link_type); | ||
| 204 | + zlog_debug(" Link ID: %pI4", &top->link_id); | ||
| 205 | + zlog_debug(" Link data: %pI4", &top->link_data); | ||
| 206 | + } | ||
| 207 | } else { | ||
| 208 | json_object_string_addf(json, "linkType", "0x%x", | ||
| 209 | top->link_type); | ||
| 210 | @@ -1959,18 +2012,29 @@ static uint16_t show_vty_ext_pref_pref_sid(struct vty *vty, | ||
| 211 | : SID_INDEX_SIZE(EXT_SUBTLV_PREFIX_SID_SIZE); | ||
| 212 | check_tlv_size(tlv_size, "Prefix SID"); | ||
| 213 | |||
| 214 | - if (!json) | ||
| 215 | - vty_out(vty, | ||
| 216 | - " Prefix SID Sub-TLV: Length %u\n\tAlgorithm: %u\n\tFlags: 0x%x\n\tMT-ID:0x%x\n\t%s: %u\n", | ||
| 217 | - ntohs(top->header.length), top->algorithm, top->flags, | ||
| 218 | - top->mtid, | ||
| 219 | - CHECK_FLAG(top->flags, EXT_SUBTLV_PREFIX_SID_VFLG) | ||
| 220 | - ? "Label" | ||
| 221 | - : "Index", | ||
| 222 | - CHECK_FLAG(top->flags, EXT_SUBTLV_PREFIX_SID_VFLG) | ||
| 223 | - ? GET_LABEL(ntohl(top->value)) | ||
| 224 | - : ntohl(top->value)); | ||
| 225 | - else { | ||
| 226 | + if (!json) { | ||
| 227 | + if (vty != NULL) { | ||
| 228 | + vty_out(vty, | ||
| 229 | + " Prefix SID Sub-TLV: Length %u\n\tAlgorithm: %u\n\tFlags: 0x%x\n\tMT-ID:0x%x\n\t%s: %u\n", | ||
| 230 | + ntohs(top->header.length), top->algorithm, top->flags, top->mtid, | ||
| 231 | + CHECK_FLAG(top->flags, EXT_SUBTLV_PREFIX_SID_VFLG) ? "Label" | ||
| 232 | + : "Index", | ||
| 233 | + CHECK_FLAG(top->flags, EXT_SUBTLV_PREFIX_SID_VFLG) | ||
| 234 | + ? GET_LABEL(ntohl(top->value)) | ||
| 235 | + : ntohl(top->value)); | ||
| 236 | + } else { | ||
| 237 | + zlog_debug(" Prefix SID Sub-TLV: Length %u", ntohs(top->header.length)); | ||
| 238 | + zlog_debug(" Algorithm: %u", top->algorithm); | ||
| 239 | + zlog_debug(" Flags: 0x%x", top->flags); | ||
| 240 | + zlog_debug(" MT-ID:0x%x", top->mtid); | ||
| 241 | + zlog_debug(" %s: %u", | ||
| 242 | + CHECK_FLAG(top->flags, EXT_SUBTLV_PREFIX_SID_VFLG) ? "Label" | ||
| 243 | + : "Index", | ||
| 244 | + CHECK_FLAG(top->flags, EXT_SUBTLV_PREFIX_SID_VFLG) | ||
| 245 | + ? GET_LABEL(ntohl(top->value)) | ||
| 246 | + : ntohl(top->value)); | ||
| 247 | + } | ||
| 248 | + } else { | ||
| 249 | json_object_int_add(json, "algorithm", top->algorithm); | ||
| 250 | json_object_string_addf(json, "flags", "0x%x", top->flags); | ||
| 251 | json_object_string_addf(json, "mtID", "0x%x", top->mtid); | ||
| 252 | @@ -1995,19 +2059,31 @@ static uint16_t show_vty_pref_info(struct vty *vty, struct tlv_header *ext, | ||
| 253 | |||
| 254 | /* Verify that TLV length is valid against remaining buffer size */ | ||
| 255 | if (length > buf_size) { | ||
| 256 | - vty_out(vty, | ||
| 257 | - " Extended Link TLV size %d exceeds buffer size. Abort!\n", | ||
| 258 | - length); | ||
| 259 | + if (vty != NULL) { | ||
| 260 | + vty_out(vty, " Extended Link TLV size %d exceeds buffer size. Abort!\n", | ||
| 261 | + length); | ||
| 262 | + } else { | ||
| 263 | + zlog_debug(" Extended Link TLV size %d exceeds buffer size. Abort!", | ||
| 264 | + length); | ||
| 265 | + } | ||
| 266 | return buf_size; | ||
| 267 | } | ||
| 268 | |||
| 269 | - if (!json) | ||
| 270 | - vty_out(vty, | ||
| 271 | - " Extended Prefix TLV: Length %u\n\tRoute Type: %u\n" | ||
| 272 | - "\tAddress Family: 0x%x\n\tFlags: 0x%x\n\tAddress: %pI4/%u\n", | ||
| 273 | - ntohs(top->header.length), top->route_type, top->af, | ||
| 274 | - top->flags, &top->address, top->pref_length); | ||
| 275 | - else { | ||
| 276 | + if (!json) { | ||
| 277 | + if (vty != NULL) { | ||
| 278 | + vty_out(vty, | ||
| 279 | + " Extended Prefix TLV: Length %u\n\tRoute Type: %u\n" | ||
| 280 | + "\tAddress Family: 0x%x\n\tFlags: 0x%x\n\tAddress: %pI4/%u\n", | ||
| 281 | + ntohs(top->header.length), top->route_type, top->af, top->flags, | ||
| 282 | + &top->address, top->pref_length); | ||
| 283 | + } else { | ||
| 284 | + zlog_debug(" Extended Prefix TLV: Length %u", ntohs(top->header.length)); | ||
| 285 | + zlog_debug(" Route Type: %u", top->route_type); | ||
| 286 | + zlog_debug(" Address Family: 0x%x", top->af); | ||
| 287 | + zlog_debug(" Flags: 0x%x", top->flags); | ||
| 288 | + zlog_debug(" Address: %pI4/%u", &top->address, top->pref_length); | ||
| 289 | + } | ||
| 290 | + } else { | ||
| 291 | json_object_int_add(json, "routeType", top->route_type); | ||
| 292 | json_object_string_addf(json, "addressFamily", "0x%x", top->af); | ||
| 293 | json_object_string_addf(json, "flags", "0x%x", top->flags); | ||
diff --git a/meta-networking/recipes-protocols/frr/frr_10.5.2.bb b/meta-networking/recipes-protocols/frr/frr_10.6.1.bb index 710bdf4a5d..1cd102f0da 100644 --- a/meta-networking/recipes-protocols/frr/frr_10.5.2.bb +++ b/meta-networking/recipes-protocols/frr/frr_10.6.1.bb | |||
| @@ -10,13 +10,11 @@ LIC_FILES_CHKSUM = "file://doc/licenses/GPL-2.0;md5=b234ee4d69f5fce4486a80fdaf4a | |||
| 10 | file://doc/licenses/LGPL-2.1;md5=4fbd65380cdd255951079008b364516c" | 10 | file://doc/licenses/LGPL-2.1;md5=4fbd65380cdd255951079008b364516c" |
| 11 | 11 | ||
| 12 | 12 | ||
| 13 | SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/10.5;tag=frr-${PV} \ | 13 | SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/10.6;tag=frr-${PV} \ |
| 14 | file://frr.pam \ | 14 | file://frr.pam \ |
| 15 | file://CVE-2025-61099-61107-1.patch \ | 15 | file://0001-lib-fix-mgmt_msg-recv-to-deal-with-mis-alignment.patch \ |
| 16 | file://CVE-2025-61099-61107-2.patch \ | ||
| 17 | file://CVE-2025-61099-61107-3.patch \ | ||
| 18 | " | 16 | " |
| 19 | SRCREV = "fa68c0ca04f95125cb993b5cacb64fc1495348eb" | 17 | SRCREV = "71da51baee6fb2a02b24262defc46591c86e8a81" |
| 20 | 18 | ||
| 21 | UPSTREAM_CHECK_GITTAGREGEX = "frr-(?P<pver>\d+(\.\d+)+)$" | 19 | UPSTREAM_CHECK_GITTAGREGEX = "frr-(?P<pver>\d+(\.\d+)+)$" |
| 22 | 20 | ||
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-build-with-gcc-15.patch b/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-build-with-gcc-15.patch index af33d5444c..c232685a15 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-build-with-gcc-15.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-build-with-gcc-15.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From c84f185f29d0839b97177aecb0a78b9717947973 Mon Sep 17 00:00:00 2001 | 1 | From 0ec55ecaa7386f924ee3d64fdfbe1c2d0df1341a Mon Sep 17 00:00:00 2001 |
| 2 | From: Nguyen Dat Tho <tho3.nguyen@lge.com> | 2 | From: Nguyen Dat Tho <tho3.nguyen@lge.com> |
| 3 | Date: Wed, 9 Apr 2025 13:05:24 +0900 | 3 | Date: Wed, 9 Apr 2025 13:05:24 +0900 |
| 4 | Subject: [PATCH] Fix build with gcc-15 | 4 | Subject: [PATCH] Fix build with gcc-15 |
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch b/meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch index 5464e3febe..c9929db4ca 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From cdbc28c668dd627906f833f9a8e32ac53b0b0139 Mon Sep 17 00:00:00 2001 | 1 | From 18b1239b7abd289fe5275fddc2545727a956a4ad Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 4 Nov 2021 07:31:32 -0700 | 3 | Date: Thu, 4 Nov 2021 07:31:32 -0700 |
| 4 | Subject: [PATCH] dns-sd: Include missing headers | 4 | Subject: [PATCH] dns-sd: Include missing headers |
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0001-mDNSPosix-Rework-mbedtls-for-compatibility-with-mbed.patch b/meta-networking/recipes-protocols/mdns/mdns/0001-mDNSPosix-Rework-mbedtls-for-compatibility-with-mbed.patch new file mode 100644 index 0000000000..a561fd232f --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/mdns/0001-mDNSPosix-Rework-mbedtls-for-compatibility-with-mbed.patch | |||
| @@ -0,0 +1,57 @@ | |||
| 1 | From f4f5039eb90918b5248bd6266afdad0b33b2d010 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alex Kiernan <alex.kiernan@gmail.com> | ||
| 3 | Date: Thu, 30 Apr 2026 08:21:19 +0100 | ||
| 4 | Subject: [PATCH] mDNSPosix: Rework mbedtls for compatibility with mbedtls4 | ||
| 5 | |||
| 6 | Upstream-Status: Inactive-Upstream [Upstream does not take patches] | ||
| 7 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | ||
| 8 | --- | ||
| 9 | mDNSPosix/mbedtls.c | 21 +++++---------------- | ||
| 10 | 1 file changed, 5 insertions(+), 16 deletions(-) | ||
| 11 | |||
| 12 | diff --git a/mDNSPosix/mbedtls.c b/mDNSPosix/mbedtls.c | ||
| 13 | index 6726ef9b9145..c4b7fd4edfff 100644 | ||
| 14 | --- a/mDNSPosix/mbedtls.c | ||
| 15 | +++ b/mDNSPosix/mbedtls.c | ||
| 16 | @@ -29,14 +29,10 @@ | ||
| 17 | #include <errno.h> | ||
| 18 | #include <unistd.h> | ||
| 19 | |||
| 20 | +#include <psa/crypto.h> | ||
| 21 | + | ||
| 22 | #include <mbedtls/error.h> | ||
| 23 | -#include <mbedtls/pk.h> | ||
| 24 | -#include <mbedtls/ecp.h> | ||
| 25 | -#include <mbedtls/ecdsa.h> | ||
| 26 | -#include <mbedtls/entropy.h> | ||
| 27 | -#include <mbedtls/ctr_drbg.h> | ||
| 28 | -#include <mbedtls/sha256.h> | ||
| 29 | -#include <mbedtls/base64.h> | ||
| 30 | +#include <mbedtls/psa_util.h> | ||
| 31 | |||
| 32 | #include <mbedtls/x509.h> | ||
| 33 | #include <mbedtls/ssl.h> | ||
| 34 | @@ -53,21 +49,14 @@ struct TLSServerContext_struct { | ||
| 35 | mbedtls_ssl_config config; | ||
| 36 | }; | ||
| 37 | |||
| 38 | -// Context that is shared amongs all TLS connections, regardless of which server cert/key is in use. | ||
| 39 | -static mbedtls_entropy_context entropy; | ||
| 40 | -static mbedtls_ctr_drbg_context ctr_drbg; | ||
| 41 | - | ||
| 42 | mDNSBool | ||
| 43 | mDNSPosixTLSInit(void) | ||
| 44 | { | ||
| 45 | int status; | ||
| 46 | |||
| 47 | - mbedtls_entropy_init(&entropy); | ||
| 48 | - mbedtls_ctr_drbg_init(&ctr_drbg); | ||
| 49 | - | ||
| 50 | - status = mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy, NULL, 0); | ||
| 51 | + status = psa_crypto_init(); | ||
| 52 | if (status != 0) { | ||
| 53 | - LogRedact(MDNS_LOG_CATEGORY_DEFAULT, MDNS_LOG_ERROR, "Unable to seed RNG: %x", -status); | ||
| 54 | + LogRedact(MDNS_LOG_CATEGORY_DEFAULT, MDNS_LOG_ERROR, "PSA crypto init failed: %x", -status); | ||
| 55 | return mDNSfalse; | ||
| 56 | } | ||
| 57 | return mDNStrue; | ||
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0002-make-Set-libdns_sd.so-soname-correctly.patch b/meta-networking/recipes-protocols/mdns/mdns/0002-make-Set-libdns_sd.so-soname-correctly.patch index f547c64d93..5f91e91b1d 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0002-make-Set-libdns_sd.so-soname-correctly.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0002-make-Set-libdns_sd.so-soname-correctly.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From dcc1f39a0918cdebf53ac7c105b3d33df960ed14 Mon Sep 17 00:00:00 2001 | 1 | From 7319d6c328d7b18a048e9855902e180fe23641a2 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alex Kiernan <alex.kiernan@gmail.com> | 2 | From: Alex Kiernan <alex.kiernan@gmail.com> |
| 3 | Date: Mon, 5 Dec 2022 15:14:12 +0000 | 3 | Date: Mon, 5 Dec 2022 15:14:12 +0000 |
| 4 | Subject: [PATCH] make: Set libdns_sd.so soname correctly | 4 | Subject: [PATCH] make: Set libdns_sd.so soname correctly |
| @@ -10,7 +10,7 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
| 10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 11 | 11 | ||
| 12 | diff --git a/mDNSPosix/Makefile b/mDNSPosix/Makefile | 12 | diff --git a/mDNSPosix/Makefile b/mDNSPosix/Makefile |
| 13 | index e05ba10b4340..7c510317f1b6 100755 | 13 | index 22789f0368c7..2bb57eae5659 100755 |
| 14 | --- a/mDNSPosix/Makefile | 14 | --- a/mDNSPosix/Makefile |
| 15 | +++ b/mDNSPosix/Makefile | 15 | +++ b/mDNSPosix/Makefile |
| 16 | @@ -276,7 +276,7 @@ libdns_sd: setup $(BUILDDIR)/libdns_sd.$(LDSUFFIX) | 16 | @@ -276,7 +276,7 @@ libdns_sd: setup $(BUILDDIR)/libdns_sd.$(LDSUFFIX) |
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0004-make-Separate-TLS-targets-from-libraries.patch b/meta-networking/recipes-protocols/mdns/mdns/0004-make-Separate-TLS-targets-from-libraries.patch index 2969b5e244..b6697f0ba6 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0004-make-Separate-TLS-targets-from-libraries.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0004-make-Separate-TLS-targets-from-libraries.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From f7ee12c1f8e85b9d2fe4023b6539c8051dc710c3 Mon Sep 17 00:00:00 2001 | 1 | From e27ac4bb6243b33d23ccb7a137983887676fda7f Mon Sep 17 00:00:00 2001 |
| 2 | From: Alex Kiernan <alex.kiernan@gmail.com> | 2 | From: Alex Kiernan <alex.kiernan@gmail.com> |
| 3 | Date: Mon, 5 Dec 2022 15:14:26 +0000 | 3 | Date: Mon, 5 Dec 2022 15:14:26 +0000 |
| 4 | Subject: [PATCH] make: Separate TLS targets from libraries | 4 | Subject: [PATCH] make: Separate TLS targets from libraries |
| @@ -13,7 +13,7 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
| 13 | 1 file changed, 8 insertions(+), 6 deletions(-) | 13 | 1 file changed, 8 insertions(+), 6 deletions(-) |
| 14 | 14 | ||
| 15 | diff --git a/mDNSPosix/Makefile b/mDNSPosix/Makefile | 15 | diff --git a/mDNSPosix/Makefile b/mDNSPosix/Makefile |
| 16 | index 7c510317f1b6..8dd5984020ee 100755 | 16 | index 2bb57eae5659..490165561410 100755 |
| 17 | --- a/mDNSPosix/Makefile | 17 | --- a/mDNSPosix/Makefile |
| 18 | +++ b/mDNSPosix/Makefile | 18 | +++ b/mDNSPosix/Makefile |
| 19 | @@ -112,9 +112,11 @@ ifeq ($(findstring linux,$(os)),linux) | 19 | @@ -112,9 +112,11 @@ ifeq ($(findstring linux,$(os)),linux) |
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch b/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch index 0c1a9f373f..b8929ea439 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From e79f75487e32f87677519ec40c021b1623395bde Mon Sep 17 00:00:00 2001 | 1 | From ab62d343d7e13ae79b0445a0b3d0954ba3534a0c Mon Sep 17 00:00:00 2001 |
| 2 | From: Alex Kiernan <alex.kiernan@gmail.com> | 2 | From: Alex Kiernan <alex.kiernan@gmail.com> |
| 3 | Date: Mon, 5 Dec 2022 22:49:49 +0000 | 3 | Date: Mon, 5 Dec 2022 22:49:49 +0000 |
| 4 | Subject: [PATCH] mDNSCore: Fix broken debug parameter | 4 | Subject: [PATCH] mDNSCore: Fix broken debug parameter |
| @@ -9,11 +9,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
| 9 | mDNSCore/mDNS.c | 2 +- | 9 | mDNSCore/mDNS.c | 2 +- |
| 10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 11 | 11 | ||
| 12 | Index: mDNSResponder/mDNSCore/mDNS.c | 12 | diff --git a/mDNSCore/mDNS.c b/mDNSCore/mDNS.c |
| 13 | =================================================================== | 13 | index 08bfafb11d8d..079c9742e419 100644 |
| 14 | --- mDNSResponder.orig/mDNSCore/mDNS.c | 14 | --- a/mDNSCore/mDNS.c |
| 15 | +++ mDNSResponder/mDNSCore/mDNS.c | 15 | +++ b/mDNSCore/mDNS.c |
| 16 | @@ -9481,7 +9481,7 @@ mDNSlocal void mDNSCoreReceiveNoUnicastA | 16 | @@ -9481,7 +9481,7 @@ mDNSlocal void mDNSCoreReceiveNoUnicastAnswers(mDNS *const m, const DNSMessage * |
| 17 | { | 17 | { |
| 18 | CacheRecord *negcr; | 18 | CacheRecord *negcr; |
| 19 | const DNSServRef dnsserv = qptr->qDNSServer; | 19 | const DNSServRef dnsserv = qptr->qDNSServer; |
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch b/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch index 5f8f428302..87b163f1e2 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From a1c982808ebfb71ba7e0f16040013b7127a6e2ab Mon Sep 17 00:00:00 2001 | 1 | From a90eacb0f42e4ac63fe8c0ab624e8af7d9d47bd1 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alex Kiernan <alex.kiernan@gmail.com> | 2 | From: Alex Kiernan <alex.kiernan@gmail.com> |
| 3 | Date: Tue, 6 Dec 2022 13:28:31 +0000 | 3 | Date: Tue, 6 Dec 2022 13:28:31 +0000 |
| 4 | Subject: [PATCH] make: Add top-level Makefile | 4 | Subject: [PATCH] make: Add top-level Makefile |
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0007-mDNSShared-Make-Apple-Wireless-Direct-Link-depend-on.patch b/meta-networking/recipes-protocols/mdns/mdns/0007-mDNSShared-Make-Apple-Wireless-Direct-Link-depend-on.patch new file mode 100644 index 0000000000..7a47ddd789 --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/mdns/0007-mDNSShared-Make-Apple-Wireless-Direct-Link-depend-on.patch | |||
| @@ -0,0 +1,27 @@ | |||
| 1 | From eac5e89c884b4dd28a80f77d2c447a398e8db94f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alex Kiernan <alex.kiernan@gmail.com> | ||
| 3 | Date: Sat, 21 Mar 2026 20:12:39 +0000 | ||
| 4 | Subject: [PATCH] mDNSShared: Make Apple Wireless Direct Link depend on macOS | ||
| 5 | |||
| 6 | Upstream-Status: Inactive-Upstream [Upstream does not take patches] | ||
| 7 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | ||
| 8 | --- | ||
| 9 | mDNSShared/uds_daemon.c | 4 ++++ | ||
| 10 | 1 file changed, 4 insertions(+) | ||
| 11 | |||
| 12 | diff --git a/mDNSShared/uds_daemon.c b/mDNSShared/uds_daemon.c | ||
| 13 | index 6486f1ed51dd..3113313191d7 100644 | ||
| 14 | --- a/mDNSShared/uds_daemon.c | ||
| 15 | +++ b/mDNSShared/uds_daemon.c | ||
| 16 | @@ -3626,7 +3626,11 @@ mDNSlocal void resolve_result_callback(mDNS *const m, DNSQuestion *question, con | ||
| 17 | request_state *const req = question->QuestionContext; | ||
| 18 | const mDNSu32 name_hash = mDNS_DomainNameFNV1aHash(&question->qname); | ||
| 19 | const mDNSBool isMDNSQuestion = mDNSOpaque16IsZero(question->TargetQID); | ||
| 20 | +#if MDNS_OS(macOS) | ||
| 21 | const mDNSBool is_split_awdl_query = (req->resolve_awdl && question->InterfaceID == AWDLInterfaceID); | ||
| 22 | +#else | ||
| 23 | + const mDNSBool is_split_awdl_query = mDNSfalse; | ||
| 24 | +#endif | ||
| 25 | UDS_LOG_ANSWER_EVENT(isMDNSQuestion ? MDNS_LOG_CATEGORY_MDNS : MDNS_LOG_CATEGORY_DEFAULT, MDNS_LOG_DEFAULT, | ||
| 26 | req, question, answer, mDNSfalse, "DNSServiceResolve result", AddRecord); | ||
| 27 | |||
diff --git a/meta-networking/recipes-protocols/mdns/mdns_2881.0.25.bb b/meta-networking/recipes-protocols/mdns/mdns_2881.100.56.0.1.bb index d44eb72f67..4bbf012b83 100644 --- a/meta-networking/recipes-protocols/mdns/mdns_2881.0.25.bb +++ b/meta-networking/recipes-protocols/mdns/mdns_2881.100.56.0.1.bb | |||
| @@ -14,9 +14,11 @@ SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https | |||
| 14 | file://0006-make-Add-top-level-Makefile.patch \ | 14 | file://0006-make-Add-top-level-Makefile.patch \ |
| 15 | file://0001-Fix-build-with-gcc-15.patch \ | 15 | file://0001-Fix-build-with-gcc-15.patch \ |
| 16 | file://mdns.service \ | 16 | file://mdns.service \ |
| 17 | file://0007-mDNSShared-Make-Apple-Wireless-Direct-Link-depend-on.patch \ | ||
| 18 | file://0001-mDNSPosix-Rework-mbedtls-for-compatibility-with-mbed.patch \ | ||
| 17 | " | 19 | " |
| 18 | BRANCH = "main" | 20 | BRANCH = "rel/mDNSResponder-2881" |
| 19 | SRCREV = "d4658af3f5f291311c6aee4210aa6d39bda82bbe" | 21 | SRCREV = "ea3902cfeff86a04b4c684753c80e425edbd1a21" |
| 20 | 22 | ||
| 21 | inherit github-releases manpages systemd update-rc.d | 23 | inherit github-releases manpages systemd update-rc.d |
| 22 | 24 | ||
| @@ -25,7 +27,10 @@ PACKAGECONFIG ?= "tls \ | |||
| 25 | PACKAGECONFIG[debug] = "DEBUG=1,DEBUG=0" | 27 | PACKAGECONFIG[debug] = "DEBUG=1,DEBUG=0" |
| 26 | PACKAGECONFIG[ipv6] = "HAVE_IPV6=1,HAVE_IPV6=0" | 28 | PACKAGECONFIG[ipv6] = "HAVE_IPV6=1,HAVE_IPV6=0" |
| 27 | PACKAGECONFIG[manpages] = "" | 29 | PACKAGECONFIG[manpages] = "" |
| 30 | PACKAGECONFIG[idlesleepcontrol] = "" | ||
| 31 | PACKAGECONFIG[spc] = "" | ||
| 28 | PACKAGECONFIG[tls] = ",tls=no,mbedtls" | 32 | PACKAGECONFIG[tls] = ",tls=no,mbedtls" |
| 33 | PACKAGECONFIG[unicast] = "" | ||
| 29 | 34 | ||
| 30 | CVE_PRODUCT = "apple:mdnsresponder" | 35 | CVE_PRODUCT = "apple:mdnsresponder" |
| 31 | 36 | ||
| @@ -46,49 +51,55 @@ EXTRA_OEMAKE = "os=linux 'CC=${CCLD}' 'LD=${CCLD}' 'LINKOPTS=${LDFLAGS}' STRIP=: | |||
| 46 | 51 | ||
| 47 | # MDNS_VERSIONSTR_NODTS disables __DATE__ and __TIME__ in the version string, | 52 | # MDNS_VERSIONSTR_NODTS disables __DATE__ and __TIME__ in the version string, |
| 48 | # which are fixed anyway for build reproducibility. | 53 | # which are fixed anyway for build reproducibility. |
| 49 | TARGET_CPPFLAGS += "-DMDNS_VERSIONSTR_NODTS" | 54 | # |
| 55 | # IDLESLEEPCONTROL_DISABLED - disables sleep control for Bonjour Sleep Proxy clients | ||
| 56 | # UNICAST_DISABLED - disables unicast DNS functionality, including Wide Area Bonjour | ||
| 57 | # SPC_DISABLED - disables Bonjour Sleep Proxy client | ||
| 58 | TARGET_CPPFLAGS += "-DmDNSResponderVersion=${PV} \ | ||
| 59 | -DMDNS_VERSIONSTR_NODTS \ | ||
| 60 | ${@bb.utils.contains('PACKAGECONFIG','idlesleepcontrol','','-DIDLESLEEPCONTROL_DISABLED', d)} \ | ||
| 61 | ${@bb.utils.contains('PACKAGECONFIG','unicast','','-DUNICAST_DISABLED', d)} \ | ||
| 62 | ${@bb.utils.contains('PACKAGECONFIG','spc','','-DSPC_DISABLED', d)}" | ||
| 50 | 63 | ||
| 51 | TARGET_CC_ARCH += "${LDFLAGS}" | 64 | TARGET_CC_ARCH += "${LDFLAGS}" |
| 52 | 65 | ||
| 53 | MDNS_BUILDDIR = "build/${@bb.utils.contains('PACKAGECONFIG','debug','debug','prod', d)}" | 66 | MDNS_BUILDDIR = "build/${@bb.utils.contains('PACKAGECONFIG','debug','debug','prod', d)}" |
| 54 | 67 | ||
| 55 | do_install () { | 68 | do_install () { |
| 56 | cd mDNSPosix | 69 | install -d ${D}${bindir} |
| 57 | 70 | install -d ${D}${includedir} | |
| 71 | install -d ${D}${libdir} | ||
| 72 | install -d ${D}${mandir}/man5 | ||
| 73 | install -d ${D}${mandir}/man8 | ||
| 58 | install -d ${D}${sbindir} | 74 | install -d ${D}${sbindir} |
| 59 | install ${MDNS_BUILDDIR}/mdnsd ${D}${sbindir} | 75 | install -d ${D}${sysconfdir} |
| 76 | install -d ${D}${systemd_system_unitdir} | ||
| 77 | install -d ${D}${INIT_D_DIR} | ||
| 60 | 78 | ||
| 61 | install -d ${D}${libdir} | 79 | install ${B}/mDNSPosix/${MDNS_BUILDDIR}/mdnsd ${D}${sbindir} |
| 62 | install -m 0644 ${MDNS_BUILDDIR}/libdns_sd.so ${D}${libdir}/libdns_sd.so.1 | 80 | install ${B}/mDNSPosix/${MDNS_BUILDDIR}/mDNSClientPosix ${D}${bindir} |
| 63 | ln -s libdns_sd.so.1 ${D}${libdir}/libdns_sd.so | 81 | install ${B}/mDNSPosix/${MDNS_BUILDDIR}/mDNSNetMonitor ${D}${bindir} |
| 82 | install ${B}/mDNSPosix/${MDNS_BUILDDIR}/mDNSProxyResponderPosix ${D}${bindir} | ||
| 83 | install ${B}/mDNSPosix/${MDNS_BUILDDIR}/mDNSResponderPosix ${D}${bindir} | ||
| 64 | 84 | ||
| 65 | install -d ${D}${includedir} | 85 | install -m 0644 ${B}/mDNSPosix/${MDNS_BUILDDIR}/libdns_sd.so ${D}${libdir}/libdns_sd.so.1 |
| 66 | install -m 0644 ../mDNSShared/dns_sd.h ${D}${includedir} | 86 | ln -s libdns_sd.so.1 ${D}${libdir}/libdns_sd.so |
| 67 | 87 | ||
| 68 | install -d ${D}${mandir}/man8 | 88 | install -m 0644 ${B}/mDNSShared/dns_sd.h ${D}${includedir} |
| 69 | install -m 0644 ../mDNSShared/mDNSResponder.8 ${D}${mandir}/man8/mdnsd.8 | 89 | install -m 0644 ${B}/mDNSShared/mDNSResponder.8 ${D}${mandir}/man8/mdnsd.8 |
| 70 | 90 | ||
| 71 | install -d ${D}${bindir} | 91 | install -m 0755 ${B}/Clients/build/dns-sd ${D}${bindir} |
| 72 | install -m 0755 ../Clients/build/dns-sd ${D}${bindir} | ||
| 73 | 92 | ||
| 74 | install -d ${D}${libdir} | 93 | oe_libinstall -C ${B}/mDNSPosix/${MDNS_BUILDDIR} -so libnss_mdns-0.2 ${D}${libdir} |
| 75 | oe_libinstall -C ${MDNS_BUILDDIR} -so libnss_mdns-0.2 ${D}${libdir} | ||
| 76 | ln -s libnss_mdns-0.2.so ${D}${libdir}/libnss_mdns.so.2 | 94 | ln -s libnss_mdns-0.2.so ${D}${libdir}/libnss_mdns.so.2 |
| 77 | 95 | ||
| 78 | install -d ${D}${sysconfdir} | 96 | install -m 0644 ${B}/mDNSPosix/nss_mdns.conf ${D}${sysconfdir} |
| 79 | install -m 0644 nss_mdns.conf ${D}${sysconfdir} | 97 | install -m 0644 ${B}/mDNSPosix/nss_mdns.conf.5 ${D}${mandir}/man5 |
| 80 | 98 | install -m 0644 ${B}/mDNSPosix/libnss_mdns.8 ${D}${mandir}/man8 | |
| 81 | install -d ${D}${mandir}/man5 | ||
| 82 | install -m 0644 nss_mdns.conf.5 ${D}${mandir}/man5 | ||
| 83 | |||
| 84 | install -d ${D}${mandir}/man8 | ||
| 85 | install -m 0644 libnss_mdns.8 ${D}${mandir}/man8 | ||
| 86 | 99 | ||
| 87 | install -d ${D}${systemd_system_unitdir} | ||
| 88 | install -m 0644 ${UNPACKDIR}/mdns.service ${D}${systemd_system_unitdir} | 100 | install -m 0644 ${UNPACKDIR}/mdns.service ${D}${systemd_system_unitdir} |
| 89 | 101 | ||
| 90 | install -d ${D}${INIT_D_DIR} | 102 | install ${B}/mDNSPosix/mdnsd.sh ${D}${INIT_D_DIR}/mdns |
| 91 | install mdnsd.sh ${D}${INIT_D_DIR}/mdns | ||
| 92 | } | 103 | } |
| 93 | 104 | ||
| 94 | pkg_postinst:${PN}-libnss-mdns () { | 105 | pkg_postinst:${PN}-libnss-mdns () { |
| @@ -110,7 +121,7 @@ pkg_prerm:${PN}-libnss-mdns () { | |||
| 110 | SYSTEMD_SERVICE:${PN} = "mdns.service" | 121 | SYSTEMD_SERVICE:${PN} = "mdns.service" |
| 111 | INITSCRIPT_NAME = "mdns" | 122 | INITSCRIPT_NAME = "mdns" |
| 112 | 123 | ||
| 113 | PACKAGE_BEFORE_PN = "${PN}-libnss-mdns" | 124 | PACKAGE_BEFORE_PN = "${PN}-libnss-mdns ${PN}-clients" |
| 114 | 125 | ||
| 115 | RRECOMMENDS:${PN}:append:libc-glibc = " ${PN}-libnss-mdns" | 126 | RRECOMMENDS:${PN}:append:libc-glibc = " ${PN}-libnss-mdns" |
| 116 | 127 | ||
| @@ -118,4 +129,9 @@ FILES_SOLIBSDEV = "${libdir}/libdns_sd.so" | |||
| 118 | FILES:${PN}-libnss-mdns = "${sysconfdir}/nss_mdns.conf ${libdir}/libnss_mdns*.so*" | 129 | FILES:${PN}-libnss-mdns = "${sysconfdir}/nss_mdns.conf ${libdir}/libnss_mdns*.so*" |
| 119 | RPROVIDES:${PN}-libnss-mdns = "libnss-mdns" | 130 | RPROVIDES:${PN}-libnss-mdns = "libnss-mdns" |
| 120 | 131 | ||
| 132 | FILES:${PN}-clients = "${bindir}/mDNSClientPosix \ | ||
| 133 | ${bindir}/mDNSNetMonitor \ | ||
| 134 | ${bindir}/mDNSProxyResponderPosix \ | ||
| 135 | ${bindir}/mDNSResponderPosix" | ||
| 136 | |||
| 121 | RPROVIDES:${PN} += "libdns-sd" | 137 | RPROVIDES:${PN} += "libdns-sd" |
diff --git a/meta-networking/recipes-protocols/mjansson-mdns/files/0001-Bump-cmake_minimum_required-version-to-3.5-94.patch b/meta-networking/recipes-protocols/mjansson-mdns/files/0001-Bump-cmake_minimum_required-version-to-3.5-94.patch new file mode 100644 index 0000000000..2afccbe463 --- /dev/null +++ b/meta-networking/recipes-protocols/mjansson-mdns/files/0001-Bump-cmake_minimum_required-version-to-3.5-94.patch | |||
| @@ -0,0 +1,21 @@ | |||
| 1 | From ab8f4118469d7a0bb83b9fcb88fe53482c35f0cb Mon Sep 17 00:00:00 2001 | ||
| 2 | From: skrede <code@skrede.me> | ||
| 3 | Date: Sun, 26 Oct 2025 14:35:05 +0100 | ||
| 4 | Subject: [PATCH] Bump cmake_minimum_required version to 3.5 (#94) | ||
| 5 | |||
| 6 | Upstream-Status: Backport [https://github.com/mjansson/mdns/commit/ab8f4118469d7a0bb83b9fcb88fe53482c35f0cb] | ||
| 7 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
| 8 | --- | ||
| 9 | CMakeLists.txt | 2 +- | ||
| 10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 11 | |||
| 12 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 13 | index 1bce26d..50f1f05 100644 | ||
| 14 | --- a/CMakeLists.txt | ||
| 15 | +++ b/CMakeLists.txt | ||
| 16 | @@ -1,4 +1,4 @@ | ||
| 17 | -cmake_minimum_required(VERSION 3.0) | ||
| 18 | +cmake_minimum_required(VERSION 3.5) | ||
| 19 | project(mdns VERSION 1.4.2 LANGUAGES C) | ||
| 20 | |||
| 21 | option(MDNS_BUILD_EXAMPLE "build example" ON) | ||
diff --git a/meta-networking/recipes-protocols/mjansson-mdns/mjansson-mdns_1.4.3.bb b/meta-networking/recipes-protocols/mjansson-mdns/mjansson-mdns_1.4.3.bb new file mode 100644 index 0000000000..5c404cbb9d --- /dev/null +++ b/meta-networking/recipes-protocols/mjansson-mdns/mjansson-mdns_1.4.3.bb | |||
| @@ -0,0 +1,14 @@ | |||
| 1 | SUMMARY = "Public domain mDNS/DNS-SD library in C" | ||
| 2 | DESCRIPTION = "This library provides a header only cross-platform mDNS and DNS-DS library in C" | ||
| 3 | SECTION = "net" | ||
| 4 | LICENSE = "Unlicense" | ||
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=911690f51af322440237a253d695d19f" | ||
| 6 | |||
| 7 | SRC_URI = "git://github.com/mjansson/mdns.git;protocol=https;branch=main;tag=${PV} \ | ||
| 8 | file://0001-Bump-cmake_minimum_required-version-to-3.5-94.patch \ | ||
| 9 | " | ||
| 10 | SRCREV = "1727be0602941a714cb6048a737f0584b1cebf3c" | ||
| 11 | |||
| 12 | inherit cmake | ||
| 13 | |||
| 14 | CVE_PRODUCT = "mjansson:mdns" | ||
diff --git a/meta-networking/recipes-protocols/ngtcp2/ngtcp2_1.21.0.bb b/meta-networking/recipes-protocols/ngtcp2/ngtcp2_1.22.1.bb index f71de5aa07..acff7b548b 100644 --- a/meta-networking/recipes-protocols/ngtcp2/ngtcp2_1.21.0.bb +++ b/meta-networking/recipes-protocols/ngtcp2/ngtcp2_1.22.1.bb | |||
| @@ -4,8 +4,8 @@ BUGTRACKER = "https://github.com/ngtcp2/ngtcp2/issues" | |||
| 4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=de0966c8ff4f62661a3da92967a75434" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=de0966c8ff4f62661a3da92967a75434" |
| 6 | 6 | ||
| 7 | SRC_URI = "gitsm://github.com/ngtcp2/ngtcp2;protocol=https;branch=main;tag=v${PV};name=ngtcp2" | 7 | SRC_URI = "gitsm://github.com/ngtcp2/ngtcp2;protocol=https;branch=release-1.22;tag=v${PV}" |
| 8 | SRCREV = "9e32add590fc74707b62f61aa5e0aa5c6f8a2c60" | 8 | SRCREV = "716e64b05f4a3709dfc0b0522cf9fd4456d055e5" |
| 9 | 9 | ||
| 10 | DEPENDS = "brotli libev nghttp3" | 10 | DEPENDS = "brotli libev nghttp3" |
| 11 | 11 | ||
| @@ -18,3 +18,5 @@ PACKAGECONFIG[shared] = "-DENABLE_SHARED_LIB=ON, -DENABLE_SHARED_LIB=OFF" | |||
| 18 | PACKAGECONFIG[build-lib-only] = "-DENABLE_LIB_ONLY=ON, -DENABLE_LIB_ONLY=OFF" | 18 | PACKAGECONFIG[build-lib-only] = "-DENABLE_LIB_ONLY=ON, -DENABLE_LIB_ONLY=OFF" |
| 19 | PACKAGECONFIG[openssl] = "-DENABLE_OPENSSL=ON, -DENABLE_OPENSSL=OFF, openssl" | 19 | PACKAGECONFIG[openssl] = "-DENABLE_OPENSSL=ON, -DENABLE_OPENSSL=OFF, openssl" |
| 20 | PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON, -DENABLE_GNUTLS=OFF, gnutls" | 20 | PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON, -DENABLE_GNUTLS=OFF, gnutls" |
| 21 | |||
| 22 | CVE_STATUS[CVE-2026-40170] = "fixed-version: fixed in 1.22.1" | ||
diff --git a/meta-networking/recipes-protocols/opcua/open62541_1.4.16.bb b/meta-networking/recipes-protocols/opcua/open62541_1.5.4.bb index 32f7148f4b..9a39bb0e4f 100644 --- a/meta-networking/recipes-protocols/opcua/open62541_1.4.16.bb +++ b/meta-networking/recipes-protocols/opcua/open62541_1.5.4.bb | |||
| @@ -8,13 +8,13 @@ LIC_FILES_CHKSUM = "\ | |||
| 8 | " | 8 | " |
| 9 | 9 | ||
| 10 | SRCREV_FORMAT = "opcua_mdnsd_ua-nodeset_mqtt-c" | 10 | SRCREV_FORMAT = "opcua_mdnsd_ua-nodeset_mqtt-c" |
| 11 | SRCREV_opcua = "f63e2a819aff6e468242dc2e54ccbd5b75d63654" | 11 | SRCREV_opcua = "dfd44a234645ed29cc6d190048bc8ae80c5454cd" |
| 12 | SRCREV_mdnsd = "488d24fb9d427aec77df180268f0291eeee7fb8b" | 12 | SRCREV_mdnsd = "488d24fb9d427aec77df180268f0291eeee7fb8b" |
| 13 | SRCREV_ua-nodeset = "d1bb6a22125bd7cd986272b1ee98a18a91d76fff" | 13 | SRCREV_ua-nodeset = "257db9ad98ee7ba4b67d3500b54bfc9d744a36af" |
| 14 | SRCREV_mqtt-c = "0f4c34c8cc00b16cfee094745d68b8cdbaecd8e0" | 14 | SRCREV_mqtt-c = "0f4c34c8cc00b16cfee094745d68b8cdbaecd8e0" |
| 15 | 15 | ||
| 16 | SRC_URI = " \ | 16 | SRC_URI = " \ |
| 17 | git://github.com/open62541/open62541.git;name=opcua;branch=1.4;protocol=https \ | 17 | git://github.com/open62541/open62541.git;name=opcua;branch=1.5;protocol=https \ |
| 18 | git://github.com/Pro/mdnsd.git;name=mdnsd;protocol=https;branch=master;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/deps/mdnsd \ | 18 | git://github.com/Pro/mdnsd.git;name=mdnsd;protocol=https;branch=master;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/deps/mdnsd \ |
| 19 | git://github.com/OPCFoundation/UA-Nodeset;name=ua-nodeset;protocol=https;branch=latest;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/deps/ua-nodeset \ | 19 | git://github.com/OPCFoundation/UA-Nodeset;name=ua-nodeset;protocol=https;branch=latest;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/deps/ua-nodeset \ |
| 20 | git://github.com/LiamBindle/MQTT-C.git;name=mqtt-c;protocol=https;branch=master;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/deps/mqtt-c \ | 20 | git://github.com/LiamBindle/MQTT-C.git;name=mqtt-c;protocol=https;branch=master;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/deps/mqtt-c \ |
| @@ -59,4 +59,5 @@ do_configure:prepend:toolchain-clang:riscv32() { | |||
| 59 | 59 | ||
| 60 | do_install:append(){ | 60 | do_install:append(){ |
| 61 | sed -i 's|${RECIPE_SYSROOT}|\$\{CMAKE_SYSROOT\}|g' ${D}${libdir}/cmake/open62541/open62541Targets.cmake | 61 | sed -i 's|${RECIPE_SYSROOT}|\$\{CMAKE_SYSROOT\}|g' ${D}${libdir}/cmake/open62541/open62541Targets.cmake |
| 62 | sed -i -e 's|-l[^ ]*/lib\([^ /]*\)\.so|-l\1|g' ${D}${libdir}/pkgconfig/open62541.pc | ||
| 62 | } | 63 | } |
diff --git a/meta-networking/recipes-protocols/openflow/openflow_git.bb b/meta-networking/recipes-protocols/openflow/openflow_git.bb index 1588245f8a..d506dd4d01 100644 --- a/meta-networking/recipes-protocols/openflow/openflow_git.bb +++ b/meta-networking/recipes-protocols/openflow/openflow_git.bb | |||
| @@ -40,6 +40,8 @@ DEPENDS:append:libc-musl = " libexecinfo" | |||
| 40 | 40 | ||
| 41 | inherit autotools-brokensep pkgconfig | 41 | inherit autotools-brokensep pkgconfig |
| 42 | 42 | ||
| 43 | CACHED_CONFIGUREVARS += "ac_cv_prog_cc_c23=no" | ||
| 44 | |||
| 43 | do_configure:prepend() { | 45 | do_configure:prepend() { |
| 44 | ./boot.sh | 46 | ./boot.sh |
| 45 | } | 47 | } |
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.92.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.93.bb index 59509ecba2..765287018b 100644 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.92.bb +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.93.bb | |||
| @@ -16,7 +16,7 @@ SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getV | |||
| 16 | file://dnsmasq-noresolvconf.service \ | 16 | file://dnsmasq-noresolvconf.service \ |
| 17 | file://dnsmasq-resolved.conf \ | 17 | file://dnsmasq-resolved.conf \ |
| 18 | " | 18 | " |
| 19 | SRC_URI[sha256sum] = "fd908e79ff37f73234afcb6d3363f78353e768703d92abd8e3220ade6819b1e1" | 19 | SRC_URI[sha256sum] = "cc967771abdafeb43d10db18932d6b59fd4bed2c69c22acf8cb96aff6920d55f" |
| 20 | 20 | ||
| 21 | inherit pkgconfig update-rc.d systemd | 21 | inherit pkgconfig update-rc.d systemd |
| 22 | 22 | ||
diff --git a/meta-networking/recipes-support/dovecot/dovecot/0001-adapt-lua_newstate-to-new-api.patch b/meta-networking/recipes-support/dovecot/dovecot/0001-adapt-lua_newstate-to-new-api.patch new file mode 100644 index 0000000000..363361fcd5 --- /dev/null +++ b/meta-networking/recipes-support/dovecot/dovecot/0001-adapt-lua_newstate-to-new-api.patch | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | From 5efcbab91b510f5a2495369b729248e8bf8a5d63 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Tue, 31 Mar 2026 11:05:52 +0000 | ||
| 4 | Subject: [PATCH] adapt lua_newstate to new api | ||
| 5 | |||
| 6 | lua_newstate() in lua 5.5 has gained a new, third argument, which made | ||
| 7 | it not backwards compatible. This change adapts this call to the lua version | ||
| 8 | used in OE. | ||
| 9 | |||
| 10 | Upstream-Status: Pending | ||
| 11 | |||
| 12 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 13 | --- | ||
| 14 | src/lib-lua/dlua-script.c | 2 +- | ||
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 16 | |||
| 17 | diff --git a/src/lib-lua/dlua-script.c b/src/lib-lua/dlua-script.c | ||
| 18 | index 20f91ad..789d603 100644 | ||
| 19 | --- a/src/lib-lua/dlua-script.c | ||
| 20 | +++ b/src/lib-lua/dlua-script.c | ||
| 21 | @@ -253,7 +253,7 @@ static struct dlua_script *dlua_create_script(const char *name, | ||
| 22 | /* lua API says that lua_newstate will return NULL only if it's out of | ||
| 23 | memory. this cannot really happen with our allocator as it will | ||
| 24 | call i_fatal_status anyways if it runs out of memory */ | ||
| 25 | - script->L = lua_newstate(dlua_alloc, script); | ||
| 26 | + script->L = lua_newstate(dlua_alloc, script, luaL_makeseed(NULL)); | ||
| 27 | i_assert(script->L != NULL); | ||
| 28 | script->ref = 1; | ||
| 29 | lua_atpanic(script->L, dlua_atpanic); | ||
diff --git a/meta-networking/recipes-support/dovecot/dovecot/0001-lib-regex-remove-LIBPCRE_LIBS-from.patch b/meta-networking/recipes-support/dovecot/dovecot/0001-lib-regex-remove-LIBPCRE_LIBS-from.patch deleted file mode 100644 index b872587a88..0000000000 --- a/meta-networking/recipes-support/dovecot/dovecot/0001-lib-regex-remove-LIBPCRE_LIBS-from.patch +++ /dev/null | |||
| @@ -1,26 +0,0 @@ | |||
| 1 | From fd3d65c65c778cf0a2fba6487c8d0eb30b6780b7 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Aki Tuomi <aki.tuomi@open-xchange.com> | ||
| 3 | Date: Fri, 31 Oct 2025 12:53:33 +0200 | ||
| 4 | Subject: [PATCH] lib-regex: Remove LIBPCRE_LIBS from test dependencies | ||
| 5 | |||
| 6 | Was accidentically added in 49ae6e798310e5c4b96709db435a3714ea6468a8 | ||
| 7 | |||
| 8 | Upstream-Status: Backport [https://github.com/dovecot/core/commit/fd3d65c65c778cf0a2fba6487c8d0eb30b6780b7] | ||
| 9 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 10 | --- | ||
| 11 | src/lib-regex/Makefile.am | 2 +- | ||
| 12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 13 | |||
| 14 | diff --git a/src/lib-regex/Makefile.am b/src/lib-regex/Makefile.am | ||
| 15 | index 60f43d9779..9d26d27fa1 100644 | ||
| 16 | --- a/src/lib-regex/Makefile.am | ||
| 17 | +++ b/src/lib-regex/Makefile.am | ||
| 18 | @@ -34,7 +34,7 @@ test_regex_LDADD = libdregex.la \ | ||
| 19 | ../lib-test/libtest.la \ | ||
| 20 | ../lib/liblib.la \ | ||
| 21 | $(LIBPCRE_LIBS) | ||
| 22 | -test_regex_DEPENDENCIES = libdregex.la $(LIBPCRE_LIBS) | ||
| 23 | +test_regex_DEPENDENCIES = libdregex.la | ||
| 24 | |||
| 25 | check-local: | ||
| 26 | for bin in $(test_programs); do \ | ||
diff --git a/meta-networking/recipes-support/dovecot/dovecot_2.4.2.bb b/meta-networking/recipes-support/dovecot/dovecot_2.4.4.bb index e94306dd32..6cac8de964 100644 --- a/meta-networking/recipes-support/dovecot/dovecot_2.4.2.bb +++ b/meta-networking/recipes-support/dovecot/dovecot_2.4.4.bb | |||
| @@ -6,17 +6,17 @@ in mind. Dovecot is an excellent choice for both small and large \ | |||
| 6 | installations. It's fast, simple to set up, requires no special \ | 6 | installations. It's fast, simple to set up, requires no special \ |
| 7 | administration and it uses very little memory." | 7 | administration and it uses very little memory." |
| 8 | SECTION = "mail" | 8 | SECTION = "mail" |
| 9 | LICENSE = "LGPL-2.1-only & MIT" | 9 | LICENSE = "LGPL-2.1-only & MIT & Unicode-3.0 & BSD-3-Clause & PD" |
| 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=2956560272e5b31d9d64f03111732048" | 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=cb805cc6bdb95ba8fc2398a55fd50877" |
| 11 | 11 | ||
| 12 | SRC_URI = "http://dovecot.org/releases/2.4/dovecot-${PV}.tar.gz \ | 12 | SRC_URI = "https://dovecot.org/releases/2.4/dovecot-${PV}.tar.gz \ |
| 13 | file://0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch \ | 13 | file://0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch \ |
| 14 | file://dovecot.service \ | 14 | file://dovecot.service \ |
| 15 | file://dovecot.socket \ | 15 | file://dovecot.socket \ |
| 16 | file://0001-m4-Check-for-libunwind-instead-of-libunwind-generic.patch \ | 16 | file://0001-m4-Check-for-libunwind-instead-of-libunwind-generic.patch \ |
| 17 | file://0001-lib-regex-remove-LIBPCRE_LIBS-from.patch \ | 17 | file://0001-adapt-lua_newstate-to-new-api.patch \ |
| 18 | " | 18 | " |
| 19 | SRC_URI[sha256sum] = "2cd62e4d22b9fc1c80bd38649739950f0dbda34fbc3e62624fb6842264e93c6e" | 19 | SRC_URI[sha256sum] = "670f98d55a29b02ae6a97281e51374e553b94496480ab0a07439571ab30ca8c3" |
| 20 | 20 | ||
| 21 | DEPENDS = "openssl xz zlib bzip2 libcap icu libtirpc bison-native" | 21 | DEPENDS = "openssl xz zlib bzip2 libcap icu libtirpc bison-native" |
| 22 | CFLAGS += "-I${STAGING_INCDIR}/tirpc" | 22 | CFLAGS += "-I${STAGING_INCDIR}/tirpc" |
| @@ -29,6 +29,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ldap pam systemd', d)} | |||
| 29 | PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam," | 29 | PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam," |
| 30 | PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd," | 30 | PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd," |
| 31 | PACKAGECONFIG[ldap] = "--with-ldap=plugin,--without-ldap,openldap," | 31 | PACKAGECONFIG[ldap] = "--with-ldap=plugin,--without-ldap,openldap," |
| 32 | PACKAGECONFIG[lua] = "--with-lua=yes, --without-lua, lua" | ||
| 32 | PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," | 33 | PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," |
| 33 | 34 | ||
| 34 | # From native build in armv7a-hf/eglibc | 35 | # From native build in armv7a-hf/eglibc |
| @@ -80,3 +81,8 @@ FILES:${PN}-dev += "${libdir}/dovecot/libdovecot*.so" | |||
| 80 | FILES:${PN}-dbg += "${libdir}/dovecot/*/.debug" | 81 | FILES:${PN}-dbg += "${libdir}/dovecot/*/.debug" |
| 81 | 82 | ||
| 82 | CVE_STATUS[CVE-2016-4983] = "not-applicable-platform: Affects only postinstall script on specific distribution." | 83 | CVE_STATUS[CVE-2016-4983] = "not-applicable-platform: Affects only postinstall script on specific distribution." |
| 84 | CVE_STATUS[CVE-2025-59031] = "fixed-version: fixed since v2.4.2" | ||
| 85 | CVE_STATUS[CVE-2026-0394] = "fixed-version: fixed since v2.4.1" | ||
| 86 | CVE_STATUS[CVE-2026-24031] = "fixed-version: fixed since v2.4.3" | ||
| 87 | CVE_STATUS[CVE-2026-27855] = "fixed-version: fixed since v2.4.3" | ||
| 88 | CVE_STATUS[CVE-2026-27860] = "fixed-version: fixed since v2.4.3" | ||
diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-Fix-build-with-gcc-15.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-Fix-build-with-gcc-15.patch deleted file mode 100644 index 00105fb844..0000000000 --- a/meta-networking/recipes-support/drbd/drbd-utils/0001-Fix-build-with-gcc-15.patch +++ /dev/null | |||
| @@ -1,34 +0,0 @@ | |||
| 1 | From b42265af87d9efcc9aac91b3a3da3df5c5c66e29 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Nguyen Dat Tho <tho3.nguyen@lge.com> | ||
| 3 | Date: Wed, 9 Apr 2025 17:33:25 +0900 | ||
| 4 | Subject: [PATCH] Fix build with gcc-15 | ||
| 5 | |||
| 6 | To fix the following error: | ||
| 7 | In file included from string_matching.cpp:1: | ||
| 8 | ./string_matching.h:10:18: error: 'uint16_t' does not name a type | ||
| 9 | 10 | extern const uint16_t PATTERN_LIMIT; | ||
| 10 | | ^~~~~~~~ | ||
| 11 | ./string_matching.h:7:1: note: 'uint16_t' is defined in header '<cstdint>'; this is probably fixable by adding '#include <cstdint>' | ||
| 12 | |||
| 13 | Upstream-Status: Submitted [https://github.com/LINBIT/drbd-utils/pull/50] | ||
| 14 | |||
| 15 | Signed-off-by: Nguyen Dat Tho <tho3.nguyen@lge.com> | ||
| 16 | --- | ||
| 17 | user/drbdmon/string_matching.h | 1 + | ||
| 18 | 1 file changed, 1 insertion(+) | ||
| 19 | |||
| 20 | diff --git a/user/drbdmon/string_matching.h b/user/drbdmon/string_matching.h | ||
| 21 | index 9b3918fe..b783ba48 100644 | ||
| 22 | --- a/user/drbdmon/string_matching.h | ||
| 23 | +++ b/user/drbdmon/string_matching.h | ||
| 24 | @@ -4,6 +4,7 @@ | ||
| 25 | #include <string> | ||
| 26 | #include <memory> | ||
| 27 | #include <stdexcept> | ||
| 28 | +#include <cstdint> | ||
| 29 | |||
| 30 | namespace string_matching | ||
| 31 | { | ||
| 32 | -- | ||
| 33 | 2.34.1 | ||
| 34 | |||
diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-fix-the-hardcoded-legacy-helper-path.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-fix-the-hardcoded-legacy-helper-path.patch new file mode 100644 index 0000000000..3d7c95b4a8 --- /dev/null +++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-fix-the-hardcoded-legacy-helper-path.patch | |||
| @@ -0,0 +1,53 @@ | |||
| 1 | From 301e64db17466316ac34a28e30867cc7853777b5 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Haiqing Bai <Haiqing.Bai@windriver.com> | ||
| 3 | Date: Thu, 16 Apr 2026 10:00:19 +0000 | ||
| 4 | Subject: [PATCH] Fix the hardcoded legacy helper path | ||
| 5 | |||
| 6 | Fix the below issue: | ||
| 7 | "~# drbdadm --version | ||
| 8 | execvp() failed to exec drbdadm-84: No such file or directory" | ||
| 9 | |||
| 10 | The legacy helper path was hardcoded to "/lib/drbd", which does not exist | ||
| 11 | on systems where LIBDIR is configured to a different location (e.g. | ||
| 12 | /usr/lib). This caused drbdadm to fail when attempting to exec drbdadm-84. | ||
| 13 | Use the build-configured DRBD_LEGACY_LIB_DIR (derived from LIBDIR) instead | ||
| 14 | of the hardcoded path, so the legacy helper lookup respects the actual | ||
| 15 | install prefix. | ||
| 16 | |||
| 17 | Upstream-Status: Pending | ||
| 18 | |||
| 19 | Signed-off-by: Haiqing Bai <haiqing.bai@windriver.com> | ||
| 20 | --- | ||
| 21 | user/v9/Makefile.in | 1 + | ||
| 22 | user/v9/drbdtool_common.c | 3 +-- | ||
| 23 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
| 24 | |||
| 25 | diff --git a/user/v9/Makefile.in b/user/v9/Makefile.in | ||
| 26 | index fa12f79..980c67c 100644 | ||
| 27 | --- a/user/v9/Makefile.in | ||
| 28 | +++ b/user/v9/Makefile.in | ||
| 29 | @@ -70,6 +70,7 @@ CFLAGS += -DKEYUTILS | ||
| 30 | endif | ||
| 31 | ifeq ($(WITH_84_SUPPORT),yes) | ||
| 32 | CFLAGS += -DWITH_84_SUPPORT | ||
| 33 | +CFLAGS += -DDRBD_LEGACY_LIB_DIR=\"$(LIBDIR)\" | ||
| 34 | endif | ||
| 35 | CFLAGS += $(EXTRA_CFLAGS) | ||
| 36 | |||
| 37 | diff --git a/user/v9/drbdtool_common.c b/user/v9/drbdtool_common.c | ||
| 38 | index d07d054..ea95a16 100644 | ||
| 39 | --- a/user/v9/drbdtool_common.c | ||
| 40 | +++ b/user/v9/drbdtool_common.c | ||
| 41 | @@ -332,8 +332,7 @@ void add_component_to_path(const char *path) | ||
| 42 | |||
| 43 | void add_lib_drbd_to_path(void) | ||
| 44 | { | ||
| 45 | - /* TODO: if exec-prefix != "/" ? */ | ||
| 46 | - add_component_to_path("/lib/drbd"); | ||
| 47 | + add_component_to_path(DRBD_LEGACY_LIB_DIR); | ||
| 48 | } | ||
| 49 | |||
| 50 | /* from linux/crypto/crc32.c */ | ||
| 51 | -- | ||
| 52 | 2.53.0 | ||
| 53 | |||
diff --git a/meta-networking/recipes-support/drbd/drbd-utils_9.30.0.bb b/meta-networking/recipes-support/drbd/drbd-utils_9.34.0.bb index 4c520e8c78..abc406b5e0 100644 --- a/meta-networking/recipes-support/drbd/drbd-utils_9.30.0.bb +++ b/meta-networking/recipes-support/drbd/drbd-utils_9.34.0.bb | |||
| @@ -11,10 +11,10 @@ SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=master;prot | |||
| 11 | git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/drbd-headers;branch=master;protocol=https \ | 11 | git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/drbd-headers;branch=master;protocol=https \ |
| 12 | file://0001-drbdmon-add-LDFLAGS-when-linking.patch \ | 12 | file://0001-drbdmon-add-LDFLAGS-when-linking.patch \ |
| 13 | ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \ | 13 | ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \ |
| 14 | file://0001-Fix-build-with-gcc-15.patch \ | 14 | file://0001-fix-the-hardcoded-legacy-helper-path.patch \ |
| 15 | " | 15 | " |
| 16 | SRCREV_drbd-utils = "36ea199f38b543b2da92219109c2832e122e5bf9" | 16 | SRCREV_drbd-utils = "7fe34d56a7264cfc92fc5270471827bb3f7773e6" |
| 17 | SRCREV_drbd-headers = "94f4472513f351efba5788f783feba6ac6efe9fc" | 17 | SRCREV_drbd-headers = "8ab631bfa8eb606e53c86f50b9f2d6f51d0f9ca5" |
| 18 | 18 | ||
| 19 | SRCREV_FORMAT = "drbd-utils_drbd-headers" | 19 | SRCREV_FORMAT = "drbd-utils_drbd-headers" |
| 20 | 20 | ||
| @@ -56,7 +56,9 @@ do_install:append() { | |||
| 56 | sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/drbd-wait-promotable@.service | 56 | sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/drbd-wait-promotable@.service |
| 57 | sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/drbd.service | 57 | sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/drbd.service |
| 58 | sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/drbd@.service | 58 | sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/drbd@.service |
| 59 | sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/ocf.ra@.service | 59 | |
| 60 | install -D -m 0644 ${D}/50-drbd.preset ${D}${systemd_unitdir}/system-preset/50-drbd.preset | ||
| 61 | rm -f ${D}/50-drbd.preset | ||
| 60 | } | 62 | } |
| 61 | 63 | ||
| 62 | RDEPENDS:${PN} += "bash perl-module-getopt-long perl-module-exporter perl-module-constant perl-module-overloading perl-module-exporter-heavy" | 64 | RDEPENDS:${PN} += "bash perl-module-getopt-long perl-module-exporter perl-module-constant perl-module-overloading perl-module-exporter-heavy" |
| @@ -69,6 +71,7 @@ FILES:${PN} += "${nonarch_base_libdir}/drbd \ | |||
| 69 | ${nonarch_libdir}/tmpfiles.d \ | 71 | ${nonarch_libdir}/tmpfiles.d \ |
| 70 | ${nonarch_libdir}/drbdscripts/* \ | 72 | ${nonarch_libdir}/drbdscripts/* \ |
| 71 | ${systemd_unitdir}/system/* \ | 73 | ${systemd_unitdir}/system/* \ |
| 74 | ${systemd_unitdir}/system-preset/50-drbd.preset \ | ||
| 72 | " | 75 | " |
| 73 | FILES:${PN}-dbg += "${nonarch_base_libdir}/drbd/.debug" | 76 | FILES:${PN}-dbg += "${nonarch_base_libdir}/drbd/.debug" |
| 74 | 77 | ||
diff --git a/meta-networking/recipes-support/ettercap/ettercap/CVE-2026-3606.patch b/meta-networking/recipes-support/ettercap/ettercap/CVE-2026-3606.patch deleted file mode 100644 index e1b19ea05b..0000000000 --- a/meta-networking/recipes-support/ettercap/ettercap/CVE-2026-3606.patch +++ /dev/null | |||
| @@ -1,48 +0,0 @@ | |||
| 1 | From a7347f49b928f47fc37805c9f3a70a9487d45a65 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Koeppe <alexander@koeppe.rocks> | ||
| 3 | Date: Sun, 8 Mar 2026 17:57:39 +0100 | ||
| 4 | Subject: [PATCH] Fix heap-out-of-bounds read issue in etterfilter | ||
| 5 | (CVE-2026-3606) | ||
| 6 | |||
| 7 | CVE: CVE-2026-3603 | ||
| 8 | Upstream-Status: Backport [https://github.com/Ettercap/ettercap/commit/41c312d4be6f6067968a275bf66b2abd2a0ba385] | ||
| 9 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 10 | --- | ||
| 11 | include/ec.h | 6 ++++++ | ||
| 12 | utils/etterfilter/ef_output.c | 4 ++-- | ||
| 13 | 2 files changed, 8 insertions(+), 2 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/include/ec.h b/include/ec.h | ||
| 16 | index d69de613..80c7eaba 100644 | ||
| 17 | --- a/include/ec.h | ||
| 18 | +++ b/include/ec.h | ||
| 19 | @@ -94,6 +94,12 @@ | ||
| 20 | ON_ERROR(x, NULL, "virtual memory exhausted"); \ | ||
| 21 | } while(0) | ||
| 22 | |||
| 23 | +#define SAFE_RECALLOC(x, s) do { \ | ||
| 24 | + x = realloc(x, s); \ | ||
| 25 | + ON_ERROR(x, NULL, "virtual memory exhausted"); \ | ||
| 26 | + memset(x, 0, s); \ | ||
| 27 | +} while(0) | ||
| 28 | + | ||
| 29 | #define SAFE_STRDUP(x, s) do{ \ | ||
| 30 | x = strdup(s); \ | ||
| 31 | ON_ERROR(x, NULL, "virtual memory exhausted"); \ | ||
| 32 | diff --git a/utils/etterfilter/ef_output.c b/utils/etterfilter/ef_output.c | ||
| 33 | index 2530e599..2f49177e 100644 | ||
| 34 | --- a/utils/etterfilter/ef_output.c | ||
| 35 | +++ b/utils/etterfilter/ef_output.c | ||
| 36 | @@ -150,10 +150,10 @@ static size_t create_data_segment(u_char** data, struct filter_header *fh, struc | ||
| 37 | static size_t add_data_segment(u_char **data, size_t base, u_char **string, size_t slen) | ||
| 38 | { | ||
| 39 | /* make room for the new string */ | ||
| 40 | - SAFE_REALLOC(*data, base + slen + 1); | ||
| 41 | + SAFE_RECALLOC(*data, base + slen + 1); | ||
| 42 | |||
| 43 | /* copy the string, NULL separated */ | ||
| 44 | - memcpy(*data + base, *string, slen + 1); | ||
| 45 | + memcpy(*data + base, *string, slen); | ||
| 46 | |||
| 47 | /* | ||
| 48 | * change the pointer to the new string location | ||
diff --git a/meta-networking/recipes-support/ettercap/ettercap_0.8.4.bb b/meta-networking/recipes-support/ettercap/ettercap_0.8.4.1.bb index 6fac3a0b84..a28de7b2bd 100644 --- a/meta-networking/recipes-support/ettercap/ettercap_0.8.4.bb +++ b/meta-networking/recipes-support/ettercap/ettercap_0.8.4.1.bb | |||
| @@ -22,10 +22,9 @@ DEPENDS += "ethtool \ | |||
| 22 | RDEPENDS:${PN} += "bash ethtool libgcc" | 22 | RDEPENDS:${PN} += "bash ethtool libgcc" |
| 23 | 23 | ||
| 24 | SRC_URI = "gitsm://github.com/Ettercap/ettercap;branch=master;protocol=https;tag=v${PV} \ | 24 | SRC_URI = "gitsm://github.com/Ettercap/ettercap;branch=master;protocol=https;tag=v${PV} \ |
| 25 | file://CVE-2026-3606.patch \ | ||
| 26 | " | 25 | " |
| 27 | 26 | ||
| 28 | SRCREV = "41da65f4026a9e4cea928e61941b976d9279f508" | 27 | SRCREV = "0dc8409779f3a09cbfff4434b9a4d7b33480d88d" |
| 29 | 28 | ||
| 30 | EXTRA_OECMAKE = " \ | 29 | EXTRA_OECMAKE = " \ |
| 31 | -DCMAKE_SKIP_RPATH=TRUE \ | 30 | -DCMAKE_SKIP_RPATH=TRUE \ |
diff --git a/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb b/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb index b43900a94d..f87aa92932 100644 --- a/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb +++ b/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb | |||
| @@ -4,6 +4,7 @@ SECTION = "libs" | |||
| 4 | LICENSE = "GPL-2.0-only & LGPL-2.0-only" | 4 | LICENSE = "GPL-2.0-only & LGPL-2.0-only" |
| 5 | 5 | ||
| 6 | DEPENDS = "flex flex-native" | 6 | DEPENDS = "flex flex-native" |
| 7 | RRECOMMENDS:${PN} = "kernel-module-atm-tcp" | ||
| 7 | 8 | ||
| 8 | SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}/${PV}/${BP}.tar.gz \ | 9 | SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}/${PV}/${BP}.tar.gz \ |
| 9 | file://link-with-ldflags.patch \ | 10 | file://link-with-ldflags.patch \ |
| @@ -31,6 +32,8 @@ file://COPYING.LGPL;md5=6e29c688d912da12b66b73e32b03d812" | |||
| 31 | 32 | ||
| 32 | inherit autotools pkgconfig | 33 | inherit autotools pkgconfig |
| 33 | 34 | ||
| 35 | CACHED_CONFIGUREVARS += "ac_cv_prog_cc_c23=no" | ||
| 36 | |||
| 34 | EXTRA_OEMAKE += "ROOTPREFIX=${root_prefix}" | 37 | EXTRA_OEMAKE += "ROOTPREFIX=${root_prefix}" |
| 35 | 38 | ||
| 36 | FILES:${PN} += "${nonarch_base_libdir}/firmware" | 39 | FILES:${PN} += "${nonarch_base_libdir}/firmware" |
diff --git a/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.3.1.bb b/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.3.2.bb index 52e7e53c32..52e7e53c32 100644 --- a/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.3.1.bb +++ b/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.3.2.bb | |||
diff --git a/meta-networking/recipes-support/mdio-tools/mdio-tools.inc b/meta-networking/recipes-support/mdio-tools/mdio-tools.inc index fc8161eb1f..b90f476e89 100644 --- a/meta-networking/recipes-support/mdio-tools/mdio-tools.inc +++ b/meta-networking/recipes-support/mdio-tools/mdio-tools.inc | |||
| @@ -4,5 +4,5 @@ HOMEPAGE = "https://github.com/wkz/mdio-tools" | |||
| 4 | LICENSE = "GPL-2.0-or-later" | 4 | LICENSE = "GPL-2.0-or-later" |
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
| 6 | 6 | ||
| 7 | SRC_URI = "git://github.com/wkz/mdio-tools.git;protocol=https;branch=master" | 7 | SRC_URI = "git://github.com/wkz/mdio-tools.git;protocol=https;branch=master;tag=${PV}" |
| 8 | SRCREV = "f74eaf38dbda441df4fcaeb21ca4465957953a2f" | 8 | SRCREV = "a1fca6b8fb3b5a95ebb28324a95673488dddc005" |
diff --git a/meta-networking/recipes-support/mdio-tools/mdio-tools_1.3.1.bb b/meta-networking/recipes-support/mdio-tools/mdio-tools_1.3.2.bb index 2c8f9b8c37..3b4a525da0 100644 --- a/meta-networking/recipes-support/mdio-tools/mdio-tools_1.3.1.bb +++ b/meta-networking/recipes-support/mdio-tools/mdio-tools_1.3.2.bb | |||
| @@ -6,3 +6,4 @@ DEPENDS += "virtual/kernel libmnl" | |||
| 6 | inherit pkgconfig autotools | 6 | inherit pkgconfig autotools |
| 7 | 7 | ||
| 8 | RRECOMMENDS:${PN} = "kernel-module-mdio-netlink" | 8 | RRECOMMENDS:${PN} = "kernel-module-mdio-netlink" |
| 9 | |||
diff --git a/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch b/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch deleted file mode 100644 index 26281e73ef..0000000000 --- a/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | From dfa90817a08f206f7e2dbba44d913968ae7f7d94 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Chong Lu <Chong.Lu@windriver.com> | ||
| 3 | Date: Tue, 19 Aug 2014 17:38:32 +0800 | ||
| 4 | Subject: [PATCH] memcached: add knob to detect whether hugetlbfs are checked | ||
| 5 | |||
| 6 | Add knob to detect whether hugetlbfs are checked or not. | ||
| 7 | |||
| 8 | Upstream-Status: Pending | ||
| 9 | |||
| 10 | Signed-off-by: Chong Lu <Chong.Lu@windriver.com> | ||
| 11 | --- | ||
| 12 | configure.ac | 6 +++++- | ||
| 13 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
| 14 | |||
| 15 | diff --git a/configure.ac b/configure.ac | ||
| 16 | index 6f2ef97..bd7dd96 100644 | ||
| 17 | --- a/configure.ac | ||
| 18 | +++ b/configure.ac | ||
| 19 | @@ -559,8 +559,12 @@ if test "x$enable_static" = "xyes"; then | ||
| 20 | fi | ||
| 21 | |||
| 22 | dnl ---------------------------------------------------------------------------- | ||
| 23 | +AC_ARG_ENABLE(hugetlbfs, | ||
| 24 | + [AS_HELP_STRING([--enable-hugetlbfs],[Enable hugetlbfs])]) | ||
| 25 | |||
| 26 | -AC_SEARCH_LIBS(gethugepagesizes, hugetlbfs) | ||
| 27 | +if test "x$enable_hugetlbfs" = "xyes"; then | ||
| 28 | + AC_SEARCH_LIBS(gethugepagesizes, hugetlbfs) | ||
| 29 | +fi | ||
| 30 | |||
| 31 | AC_HEADER_STDBOOL | ||
| 32 | AH_BOTTOM([#if HAVE_STDBOOL_H | ||
diff --git a/meta-networking/recipes-support/memcached/memcached_1.6.41.bb b/meta-networking/recipes-support/memcached/memcached_1.6.42.bb index 9d759069ba..28d8ba3cf9 100644 --- a/meta-networking/recipes-support/memcached/memcached_1.6.41.bb +++ b/meta-networking/recipes-support/memcached/memcached_1.6.42.bb | |||
| @@ -19,17 +19,14 @@ RDEPENDS:${PN} += "perl perl-module-posix perl-module-autoloader \ | |||
| 19 | perl-module-tie-hash bash \ | 19 | perl-module-tie-hash bash \ |
| 20 | " | 20 | " |
| 21 | 21 | ||
| 22 | SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \ | 22 | SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz" |
| 23 | file://memcached-add-hugetlbfs-check.patch \ | 23 | SRC_URI[sha256sum] = "50f08b879d4f9d36dea9d905e9eaade15c708e38db7e9a73fc21dc8b45395de7" |
| 24 | " | ||
| 25 | SRC_URI[sha256sum] = "e097073c156eeff9e12655b054f446d57374cfba5c132dcdbe7fac64e728286a" | ||
| 26 | 24 | ||
| 27 | CVE_STATUS[CVE-2022-26635] = "disputed: this is a problem of applications using php-memcached inproperly" | 25 | CVE_STATUS[CVE-2022-26635] = "disputed: this is a problem of applications using php-memcached inproperly" |
| 28 | 26 | ||
| 29 | UPSTREAM_CHECK_URI = "${HOMEPAGE}" | 27 | UPSTREAM_CHECK_URI = "${HOMEPAGE}" |
| 30 | 28 | ||
| 31 | # set the same COMPATIBLE_HOST as libhugetlbfs | 29 | COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|riscv64|aarch64|arm).*-linux*" |
| 32 | COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|aarch64|arm).*-linux*" | ||
| 33 | 30 | ||
| 34 | # assoc.c:83:9: error: variable 'depth' set but not used [-Werror,-Wunused-but-set-variable] | 31 | # assoc.c:83:9: error: variable 'depth' set but not used [-Werror,-Wunused-but-set-variable] |
| 35 | CFLAGS:append:toolchain-clang = " -Wno-error=unused-but-set-variable" | 32 | CFLAGS:append:toolchain-clang = " -Wno-error=unused-but-set-variable" |
| @@ -42,9 +39,6 @@ python __anonymous () { | |||
| 42 | d.appendVar('EXTRA_OECONF', " ac_cv_c_endian=big") | 39 | d.appendVar('EXTRA_OECONF', " ac_cv_c_endian=big") |
| 43 | } | 40 | } |
| 44 | 41 | ||
| 45 | PACKAGECONFIG ??= "" | ||
| 46 | PACKAGECONFIG[hugetlbfs] = "--enable-hugetlbfs, --disable-hugetlbfs, libhugetlbfs" | ||
| 47 | |||
| 48 | inherit update-rc.d | 42 | inherit update-rc.d |
| 49 | 43 | ||
| 50 | INITSCRIPT_NAME = "memcached" | 44 | INITSCRIPT_NAME = "memcached" |
diff --git a/meta-networking/recipes-support/nbdkit/nbdkit_1.47.5.bb b/meta-networking/recipes-support/nbdkit/nbdkit_1.47.9.bb index 5ec440fc18..5c6c0a2e64 100644 --- a/meta-networking/recipes-support/nbdkit/nbdkit_1.47.5.bb +++ b/meta-networking/recipes-support/nbdkit/nbdkit_1.47.9.bb | |||
| @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=26250adec854bc317493f6fb98efe049" | |||
| 12 | SRC_URI = "git://gitlab.com/nbdkit/nbdkit.git;protocol=https;branch=master;tag=v${PV} \ | 12 | SRC_URI = "git://gitlab.com/nbdkit/nbdkit.git;protocol=https;branch=master;tag=v${PV} \ |
| 13 | file://0002-plugins-Avoid-absolute-buildpaths-in-binaries.patch \ | 13 | file://0002-plugins-Avoid-absolute-buildpaths-in-binaries.patch \ |
| 14 | " | 14 | " |
| 15 | SRCREV = "131372494a384a2ee21b97ec9375b7a55636a417" | 15 | SRCREV = "714956cc9901c752598a214ae72fc69a897cd3b9" |
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | DEPENDS = "curl xz e2fsprogs zlib" | 18 | DEPENDS = "curl xz e2fsprogs zlib" |
diff --git a/meta-networking/recipes-support/netcf/netcf/0001-Adopt-to-new-gnulib-read_file-fread_file-signature.patch b/meta-networking/recipes-support/netcf/netcf/0001-Adopt-to-new-gnulib-read_file-fread_file-signature.patch deleted file mode 100644 index b188248fff..0000000000 --- a/meta-networking/recipes-support/netcf/netcf/0001-Adopt-to-new-gnulib-read_file-fread_file-signature.patch +++ /dev/null | |||
| @@ -1,83 +0,0 @@ | |||
| 1 | From af256680926e166ac21bc0f11172ea6c077a9b55 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sat, 9 Mar 2024 10:40:48 -0800 | ||
| 4 | Subject: [PATCH] Adopt to new gnulib read_file/fread_file signature | ||
| 5 | |||
| 6 | It now expects a flag parameter in latest gnulib | ||
| 7 | see [1] | ||
| 8 | |||
| 9 | [1] https://public-inbox.org/bug-gnulib/87tv01c1z2.fsf-ueno@gnu.org/ | ||
| 10 | |||
| 11 | Upstream-Status: Pending | ||
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 13 | --- | ||
| 14 | src/dutil_linux.c | 4 ++-- | ||
| 15 | src/dutil_posix.c | 2 +- | ||
| 16 | src/ncftool.c | 2 +- | ||
| 17 | src/ncftransform.c | 2 +- | ||
| 18 | 4 files changed, 5 insertions(+), 5 deletions(-) | ||
| 19 | |||
| 20 | diff --git a/src/dutil_linux.c b/src/dutil_linux.c | ||
| 21 | index 742153a..eb72eb2 100644 | ||
| 22 | --- a/src/dutil_linux.c | ||
| 23 | +++ b/src/dutil_linux.c | ||
| 24 | @@ -1113,7 +1113,7 @@ static void add_link_info(struct netcf *ncf, | ||
| 25 | |||
| 26 | xasprintf(&path, "/sys/class/net/%s/operstate", ifname); | ||
| 27 | ERR_NOMEM(!path, ncf); | ||
| 28 | - state = read_file(path, &length); | ||
| 29 | + state = read_file(path, 0, &length); | ||
| 30 | if (!state) { | ||
| 31 | /* missing operstate is *not* an error. It could be due to an | ||
| 32 | * alias interface, which has no entry in /sys/class/net at | ||
| 33 | @@ -1132,7 +1132,7 @@ static void add_link_info(struct netcf *ncf, | ||
| 34 | FREE(path); | ||
| 35 | xasprintf(&path, "/sys/class/net/%s/speed", ifname); | ||
| 36 | ERR_NOMEM(path == NULL, ncf); | ||
| 37 | - speed = read_file(path, &length); | ||
| 38 | + speed = read_file(path, 0, &length); | ||
| 39 | if (!speed && errno == EINVAL) { | ||
| 40 | /* attempts to read $ifname/speed result in EINVAL if the | ||
| 41 | * interface is ifconfiged down (which isn't exactly the | ||
| 42 | diff --git a/src/dutil_posix.c b/src/dutil_posix.c | ||
| 43 | index 1313514..b9884f0 100644 | ||
| 44 | --- a/src/dutil_posix.c | ||
| 45 | +++ b/src/dutil_posix.c | ||
| 46 | @@ -211,7 +211,7 @@ int run_program(struct netcf *ncf, const char *const *argv, char **output) | ||
| 47 | "Failed to create file stream for output while executing '%s': %s", | ||
| 48 | argv_str, errbuf); | ||
| 49 | |||
| 50 | - *output = fread_file(outfile, &outlen); | ||
| 51 | + *output = fread_file(outfile, 0, &outlen); | ||
| 52 | ERR_THROW_STRERROR(*output == NULL, ncf, EEXEC, | ||
| 53 | "Error while reading output from execution of '%s': %s", | ||
| 54 | argv_str, errbuf); | ||
| 55 | diff --git a/src/ncftool.c b/src/ncftool.c | ||
| 56 | index f1b5642..c878cb0 100644 | ||
| 57 | --- a/src/ncftool.c | ||
| 58 | +++ b/src/ncftool.c | ||
| 59 | @@ -351,7 +351,7 @@ static int cmd_define(const struct command *cmd) { | ||
| 60 | struct netcf_if *nif = NULL; | ||
| 61 | int result = CMD_RES_ERR; | ||
| 62 | |||
| 63 | - xml = read_file(fname, &length); | ||
| 64 | + xml = read_file(fname, 0, &length); | ||
| 65 | if (xml == NULL) { | ||
| 66 | fprintf(stderr, "Failed to read %s\n", fname); | ||
| 67 | goto done; | ||
| 68 | diff --git a/src/ncftransform.c b/src/ncftransform.c | ||
| 69 | index fbabfc3..4c9a56d 100644 | ||
| 70 | --- a/src/ncftransform.c | ||
| 71 | +++ b/src/ncftransform.c | ||
| 72 | @@ -54,7 +54,7 @@ int main(int argc, char **argv) { | ||
| 73 | if (argc != 3 || (STRNEQ(argv[1], "get") && STRNEQ(argv[1], "put"))) | ||
| 74 | die("Usage: ncftransform (put|get) FILE\n"); | ||
| 75 | |||
| 76 | - in_xml = read_file(argv[2], &length); | ||
| 77 | + in_xml = read_file(argv[2], 0, &length); | ||
| 78 | if (in_xml == NULL) | ||
| 79 | die("Failed to read %s\n", argv[2]); | ||
| 80 | |||
| 81 | -- | ||
| 82 | 2.44.0 | ||
| 83 | |||
diff --git a/meta-networking/recipes-support/netcf/netcf_0.2.8.bb b/meta-networking/recipes-support/netcf/netcf_0.2.8.bb deleted file mode 100644 index 4170e9fab0..0000000000 --- a/meta-networking/recipes-support/netcf/netcf_0.2.8.bb +++ /dev/null | |||
| @@ -1,72 +0,0 @@ | |||
| 1 | SUMMARY = "netcf" | ||
| 2 | DESCRIPTION = "netcf is a cross-platform network configuration library." | ||
| 3 | HOMEPAGE = "https://pagure.io/netcf" | ||
| 4 | SECTION = "libs" | ||
| 5 | LICENSE = "LGPL-2.1-only" | ||
| 6 | |||
| 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=fb919cc88dbe06ec0b0bd50e001ccf1f" | ||
| 8 | |||
| 9 | SRCREV = "2c5d4255857531bc09d91dcd02e86545f29004d4" | ||
| 10 | PV .= "+git" | ||
| 11 | |||
| 12 | SRC_URI = "git://pagure.io/netcf.git;protocol=https;branch=master \ | ||
| 13 | file://0001-Adopt-to-new-gnulib-read_file-fread_file-signature.patch" | ||
| 14 | |||
| 15 | UPSTREAM_CHECK_GITTAGREGEX = "release-(?P<pver>(\d+(\.\d+)+))" | ||
| 16 | |||
| 17 | DEPENDS += "augeas libnl libxslt libxml2" | ||
| 18 | |||
| 19 | do_configure[depends] += "${MLPREFIX}gnulib:do_populate_sysroot" | ||
| 20 | |||
| 21 | |||
| 22 | inherit gettext autotools perlnative pkgconfig systemd | ||
| 23 | |||
| 24 | EXTRA_OECONF:append:class-target = " --with-driver=redhat" | ||
| 25 | |||
| 26 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" | ||
| 27 | PACKAGECONFIG[systemd] = "--with-sysinit=systemd,--with-sysinit=initscripts," | ||
| 28 | |||
| 29 | do_configure:prepend() { | ||
| 30 | currdir=`pwd` | ||
| 31 | cd ${S} | ||
| 32 | |||
| 33 | # avoid bootstrap cloning gnulib on every configure | ||
| 34 | # the dir starts out empty from the pkg, but unconditionally blow it | ||
| 35 | # away so if we reconfigure due to gnulib sysroot sig changes, we will | ||
| 36 | # get the newer gnulib content into the build here. | ||
| 37 | rm -rf ${S}/.gnulib | ||
| 38 | cp -rf ${STAGING_DATADIR}/gnulib ${S}/.gnulib | ||
| 39 | |||
| 40 | # --force to avoid errors on reconfigure e.g if recipes changed we depend on | ||
| 41 | # | bootstrap: running: libtoolize --quiet | ||
| 42 | # | libtoolize: error: 'libltdl/COPYING.LIB' exists: use '--force' to overwrite | ||
| 43 | # | ... | ||
| 44 | ./bootstrap --force --no-git --gnulib-srcdir=.gnulib | ||
| 45 | |||
| 46 | cd $currdir | ||
| 47 | } | ||
| 48 | |||
| 49 | do_install:append() { | ||
| 50 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | ||
| 51 | install -d ${D}${systemd_unitdir}/system | ||
| 52 | if [ -d "${D}${libdir}/systemd/system" ]; then | ||
| 53 | if [ "${systemd_unitdir}" != "${libdir}/systemd" ] ; then | ||
| 54 | mv ${D}${libdir}/systemd/system/* ${D}${systemd_unitdir}/system/ | ||
| 55 | rm -rf ${D}${libdir}/systemd/ | ||
| 56 | fi | ||
| 57 | elif [ "${systemd_unitdir}" != "${nonarch_libdir}/systemd" ] ; then | ||
| 58 | mv ${D}${nonarch_libdir}/systemd/system/* ${D}${systemd_unitdir}/system/ | ||
| 59 | rm -rf ${D}${nonarch_libdir}/systemd/ | ||
| 60 | fi | ||
| 61 | else | ||
| 62 | mv ${D}${sysconfdir}/rc.d/init.d/ ${D}${sysconfdir} | ||
| 63 | rm -rf ${D}${sysconfdir}/rc.d/ | ||
| 64 | fi | ||
| 65 | } | ||
| 66 | |||
| 67 | FILES:${PN} += " \ | ||
| 68 | ${libdir} \ | ||
| 69 | ${nonarch_libdir} \ | ||
| 70 | " | ||
| 71 | |||
| 72 | SYSTEMD_SERVICE:${PN} = "netcf-transaction.service" | ||
diff --git a/meta-networking/recipes-support/netperf/files/0001-cleanup-modernize-sendfile_tcp_stream-signature-from.patch b/meta-networking/recipes-support/netperf/files/0001-cleanup-modernize-sendfile_tcp_stream-signature-from.patch new file mode 100644 index 0000000000..4e8731fb25 --- /dev/null +++ b/meta-networking/recipes-support/netperf/files/0001-cleanup-modernize-sendfile_tcp_stream-signature-from.patch | |||
| @@ -0,0 +1,25 @@ | |||
| 1 | From ea9ce6ae6154660f2a1dc7a73aedf906cc935a72 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <khem.raj@oss.qualcomm.com> | ||
| 3 | Date: Sun, 12 Apr 2026 16:38:28 -0700 | ||
| 4 | Subject: [PATCH] cleanup: modernize sendfile_tcp_stream signature from K&R to ANSI C style | ||
| 5 | |||
| 6 | Upstream-Status: Pending | ||
| 7 | Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com> | ||
| 8 | --- | ||
| 9 | src/nettest_bsd.c | 3 +-- | ||
| 10 | 1 file changed, 1 insertion(+), 2 deletions(-) | ||
| 11 | |||
| 12 | diff --git a/src/nettest_bsd.c b/src/nettest_bsd.c | ||
| 13 | index 36f5810..e7feb83 100644 | ||
| 14 | --- a/src/nettest_bsd.c | ||
| 15 | +++ b/src/nettest_bsd.c | ||
| 16 | @@ -4270,8 +4270,7 @@ Size (bytes)\n\ | ||
| 17 | all it knows, nothig is different. */ | ||
| 18 | |||
| 19 | void | ||
| 20 | -sendfile_tcp_stream(remote_host) | ||
| 21 | - char remote_host[]; | ||
| 22 | +sendfile_tcp_stream (char remote_host[]) | ||
| 23 | { | ||
| 24 | |||
| 25 | char *tput_title = "\ | ||
diff --git a/meta-networking/recipes-support/netperf/netperf_git.bb b/meta-networking/recipes-support/netperf/netperf_git.bb index d5a717b0f6..8f49a7596b 100644 --- a/meta-networking/recipes-support/netperf/netperf_git.bb +++ b/meta-networking/recipes-support/netperf/netperf_git.bb | |||
| @@ -18,6 +18,7 @@ SRC_URI = "git://github.com/HewlettPackard/netperf.git;branch=master;protocol=ht | |||
| 18 | file://0001-Makefile.am-add-ACLOCAL_AMFLAGS.patch \ | 18 | file://0001-Makefile.am-add-ACLOCAL_AMFLAGS.patch \ |
| 19 | file://0001-Fix-too-many-arguments-error-occurring-in-gcc-15.patch \ | 19 | file://0001-Fix-too-many-arguments-error-occurring-in-gcc-15.patch \ |
| 20 | file://0001-Fix-multiple-definitions-with-enable-intervals.patch \ | 20 | file://0001-Fix-multiple-definitions-with-enable-intervals.patch \ |
| 21 | file://0001-cleanup-modernize-sendfile_tcp_stream-signature-from.patch \ | ||
| 21 | " | 22 | " |
| 22 | 23 | ||
| 23 | SRCREV = "3bc455b23f901dae377ca0a558e1e32aa56b31c4" | 24 | SRCREV = "3bc455b23f901dae377ca0a558e1e32aa56b31c4" |
diff --git a/meta-networking/recipes-support/ntopng/files/0001-Follow-rrd-post-1.8-change.patch b/meta-networking/recipes-support/ntopng/files/0001-Follow-rrd-post-1.8-change.patch deleted file mode 100644 index eefd4e1ab2..0000000000 --- a/meta-networking/recipes-support/ntopng/files/0001-Follow-rrd-post-1.8-change.patch +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | From a3bd9efe78f9c381f19b99c8ceb7f52b4c2a52b8 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | ||
| 3 | Date: Wed, 5 Jun 2024 09:40:17 +0300 | ||
| 4 | Subject: [PATCH] Follow rrd post-1.8 change | ||
| 5 | |||
| 6 | Git version of rrdtool has changed rrd_tune argument from char pointer | ||
| 7 | to const char pointer. GCC 14 is more strict regarding the pointer | ||
| 8 | constantness checks and errors out in such a case. Update rrd_tune | ||
| 9 | invokation. | ||
| 10 | |||
| 11 | Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | ||
| 12 | Upstream-Status: Pending [CLA is not signed on our side] | ||
| 13 | --- | ||
| 14 | src/LuaEngineNtop.cpp | 2 +- | ||
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 16 | |||
| 17 | diff --git a/src/LuaEngineNtop.cpp b/src/LuaEngineNtop.cpp | ||
| 18 | index bd2de79e3021..dd00f1608f78 100644 | ||
| 19 | --- a/src/LuaEngineNtop.cpp | ||
| 20 | +++ b/src/LuaEngineNtop.cpp | ||
| 21 | @@ -5427,7 +5427,7 @@ static int ntop_rrd_tune(lua_State* vm) { | ||
| 22 | filename = argv[1]; | ||
| 23 | |||
| 24 | reset_rrd_state(); | ||
| 25 | - status = rrd_tune(argc, (char**)argv); | ||
| 26 | + status = rrd_tune(argc, (const char**)argv); | ||
| 27 | |||
| 28 | if(status != 0) { | ||
| 29 | char *err = rrd_get_error(); | ||
| 30 | -- | ||
| 31 | 2.39.2 | ||
| 32 | |||
diff --git a/meta-networking/recipes-support/ntopng/files/0001-Makefile.in-don-t-use-the-internal-lua.patch b/meta-networking/recipes-support/ntopng/files/0001-Makefile.in-don-t-use-the-internal-lua.patch index bb5bcfbd63..402d679a90 100644 --- a/meta-networking/recipes-support/ntopng/files/0001-Makefile.in-don-t-use-the-internal-lua.patch +++ b/meta-networking/recipes-support/ntopng/files/0001-Makefile.in-don-t-use-the-internal-lua.patch | |||
| @@ -14,26 +14,32 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | |||
| 14 | Makefile.in | 2 -- | 14 | Makefile.in | 2 -- |
| 15 | 1 file changed, 2 deletions(-) | 15 | 1 file changed, 2 deletions(-) |
| 16 | 16 | ||
| 17 | diff --git a/Makefile.in b/Makefile.in | ||
| 18 | index d737e74..a611b16 100755 | ||
| 19 | --- a/Makefile.in | 17 | --- a/Makefile.in |
| 20 | +++ b/Makefile.in | 18 | +++ b/Makefile.in |
| 21 | @@ -36,7 +36,6 @@ MONGOOSE_INC=-I$(MONGOOSE_HOME) | 19 | @@ -31,8 +31,6 @@ MONGOOSE_INC=-I$(MONGOOSE_HOME) |
| 20 | |||
| 22 | LUA_PLATFORM=generic | 21 | LUA_PLATFORM=generic |
| 23 | LUA_HOME=${PWD}/third-party/lua-5.4.3 | 22 | LUA_HOME=${PWD}/third-party/lua-5.4.6 |
| 24 | LUA_INC=-I$(LUA_HOME)/src | 23 | -LUA_INC=-I$(LUA_HOME)/src |
| 25 | -LUA_LIB=$(LUA_HOME)/src/liblua.a | 24 | -LUA_LIB=$(LUA_HOME)/src/liblua.a |
| 26 | 25 | ||
| 27 | ifeq ($(OS),Linux) | 26 | HAVE_CLICKHOUSE=@HAVE_CLICKHOUSE@ |
| 28 | LUA_PLATFORM=linux | 27 | CLICKHOUSE_HOME= |
| 29 | @@ -102,7 +101,6 @@ RPM_PKG = $(TARGET)-$(NTOPNG_VERSION)-@REVISION@.$(PLATFORM).rpm | 28 | @@ -52,7 +50,7 @@ else ifeq ($(OS),Darwin) |
| 30 | RPM_DATA_PKG = $(TARGET)-data-$(NTOPNG_VERSION)-@REVISION@.noarch.rpm | 29 | LUA_PLATFORM=macosx |
| 30 | else ifeq ($(OS), $(filter $(OS), FreeBSD)) | ||
| 31 | LUA_PLATFORM=freebsd | ||
| 32 | - LUA_LIB=/usr/local/lib/liblua-5.3.a | ||
| 33 | + LUA_LIB=liblua.a | ||
| 34 | endif | ||
| 35 | |||
| 31 | ###### | 36 | ###### |
| 37 | @@ -138,7 +136,7 @@ HEADERS = $(wildcard include/*.h) $(wild | ||
| 38 | INC = $(wildcard src/*.inc) | ||
| 39 | OBJECTS_NO_MAIN := $(filter-out src/main.o,$(OBJECTS)) | ||
| 32 | 40 | ||
| 33 | -LIB_TARGETS = $(LUA_LIB) | 41 | -TEST_FILES = $(wildcard tests/src/*.cpp) |
| 42 | +TEST_FILES = $(wildcard tests/src/*.cpp) | ||
| 43 | TEST_HEADERS = $(wildcard tests/include/*.h) | ||
| 34 | 44 | ||
| 35 | ifneq ($(HAS_ZEROMQ), 0) | 45 | %.o: %.c $(HEADERS) $(INC) Makefile |
| 36 | LIB_TARGETS += $(ZEROMQ_LIB) | ||
| 37 | -- | ||
| 38 | 2.25.1 | ||
| 39 | |||
diff --git a/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-generate-configure.ac-only.patch b/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-generate-configure.ac-only.patch deleted file mode 100644 index 8d62147b9e..0000000000 --- a/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-generate-configure.ac-only.patch +++ /dev/null | |||
| @@ -1,36 +0,0 @@ | |||
| 1 | From 22f0bec462763f1b0b92daa33133e274d3b45f4f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
| 3 | Date: Thu, 5 Nov 2020 00:05:21 -0800 | ||
| 4 | Subject: [PATCH] autogen.sh: generate configure.ac only | ||
| 5 | |||
| 6 | The autogen.sh should only generate configure.ac and the | ||
| 7 | logic used to generate configure script should follow the | ||
| 8 | autotools.bbclass in oe. Otherwise there may comes below | ||
| 9 | do_configure error: | ||
| 10 | | checking whether we are cross compiling... configure: error: in `/path/tmp/work/core2-64-poky-linux/ndpi/3.4-r0/git': | ||
| 11 | | configure: error: cannot run C compiled programs. | ||
| 12 | | If you meant to cross compile, use `--host'. | ||
| 13 | |||
| 14 | Upstream-Status: Inappropriate [embedded specific] | ||
| 15 | |||
| 16 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
| 17 | --- | ||
| 18 | autogen.sh | 5 ----- | ||
| 19 | 1 file changed, 5 deletions(-) | ||
| 20 | |||
| 21 | diff --git a/autogen.sh b/autogen.sh | ||
| 22 | index 73f8d0ebe..15ff0aa84 100755 | ||
| 23 | --- a/autogen.sh | ||
| 24 | +++ b/autogen.sh | ||
| 25 | @@ -73,8 +73,3 @@ cat configure.seed | sed \ | ||
| 26 | > configure.ac | ||
| 27 | |||
| 28 | rm -f config.h config.h.in *~ #* | ||
| 29 | - | ||
| 30 | -echo "Wait please..." | ||
| 31 | -autoreconf -if | ||
| 32 | -echo "" | ||
| 33 | -echo "Now run ./configure" | ||
| 34 | -- | ||
| 35 | 2.17.1 | ||
| 36 | |||
diff --git a/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-Allow-dynamic-linking-against-ndpi-3.patch b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-Allow-dynamic-linking-against-ndpi-3.patch index c645110f22..b0cdcd8401 100644 --- a/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-Allow-dynamic-linking-against-ndpi-3.patch +++ b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-Allow-dynamic-linking-against-ndpi-3.patch | |||
| @@ -17,23 +17,42 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
| 17 | configure.ac.in | 6 ++---- | 17 | configure.ac.in | 6 ++---- |
| 18 | 1 file changed, 2 insertions(+), 4 deletions(-) | 18 | 1 file changed, 2 insertions(+), 4 deletions(-) |
| 19 | 19 | ||
| 20 | diff --git a/configure.ac.in b/configure.ac.in | ||
| 21 | index 7f4c0f893..c3299fda2 100644 | ||
| 22 | --- a/configure.ac.in | 20 | --- a/configure.ac.in |
| 23 | +++ b/configure.ac.in | 21 | +++ b/configure.ac.in |
| 24 | @@ -193,10 +193,8 @@ if test -d /usr/local/include/ndpi ; then : | 22 | @@ -235,8 +235,9 @@ AC_ARG_WITH(ndpi-includes, |
| 23 | NDPI_CUST_INC="-I$withval -I$withval/../lib/third_party/include" | ||
| 24 | ]) | ||
| 25 | |||
| 26 | -NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"` | ||
| 27 | -NDPI_LIB= | ||
| 28 | +NDPI_INC="$NDPI_CFLAGS" | ||
| 29 | +NDPI_LIB="$NDPI_LIBS" | ||
| 30 | + | ||
| 31 | NDPI_LIB_DEP= | ||
| 32 | |||
| 33 | AS_VAR_IF(with_dynamic_ndpi, no, [ | ||
| 34 | @@ -267,11 +268,6 @@ AC_MSG_CHECKING(for nDPI source) | ||
| 35 | fi | ||
| 36 | ]) | ||
| 37 | |||
| 38 | -AS_VAR_IF(with_dynamic_ndpi, yes, [ | ||
| 39 | - NDPI_LIB="-lndpi" | ||
| 40 | - NDPI_LIB_DEP=$NDPI_LIB | ||
| 41 | -]) | ||
| 42 | - | ||
| 43 | if test ! -z "$NDPI_CUST_INC" ; then : | ||
| 44 | NDPI_INC=$NDPI_CUST_INC | ||
| 45 | fi | ||
| 46 | @@ -280,12 +276,6 @@ if test ! -z "$NDPI_CUST_LIB" ; then : | ||
| 47 | NDPI_LIB=$NDPI_CUST_LIB | ||
| 25 | fi | 48 | fi |
| 26 | 49 | ||
| 27 | PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [ | 50 | -if test -z "$NDPI_LIB" ; then : |
| 28 | - NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"` | 51 | - echo "Could not find nDPI" |
| 29 | - # Use static libndpi library as building against the dynamic library fails | 52 | - echo "Please do cd ..; git clone https://github.com/ntop/nDPI.git; cd nDPI; ./autogen.sh; ${MAKE}; cd ../ntopng" |
| 30 | - NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic" | 53 | - echo "and try again" |
| 31 | - #NDPI_LIB="$NDPI_LIBS" | 54 | - exit 1 |
| 32 | + NDPI_INC="$NDPI_CFLAGS" | 55 | -fi |
| 33 | + NDPI_LIB="$NDPI_LIBS" | 56 | dnl finish: nDPI handling |
| 34 | NDPI_LIB_DEP= | 57 | |
| 35 | ], [ | 58 | AC_ARG_WITH(json-c-static, |
| 36 | AC_MSG_CHECKING(for nDPI source) | ||
| 37 | -- | ||
| 38 | 2.35.1 | ||
| 39 | |||
diff --git a/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-configure-error.patch b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-configure-error.patch deleted file mode 100644 index d4908e3227..0000000000 --- a/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-configure-error.patch +++ /dev/null | |||
| @@ -1,42 +0,0 @@ | |||
| 1 | From 29797dd037009d38e4976249ed21b2076240751e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
| 3 | Date: Wed, 4 Nov 2020 04:36:46 +0000 | ||
| 4 | Subject: [PATCH] configure.ac.in: fix configure error | ||
| 5 | |||
| 6 | fix the below error: | ||
| 7 | configure: error: cannot run test program while cross compiling | ||
| 8 | |||
| 9 | Upstream-Status: Inappropriate [embedded specific] | ||
| 10 | |||
| 11 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
| 12 | --- | ||
| 13 | configure.ac.in | 13 +------------ | ||
| 14 | 1 file changed, 1 insertion(+), 12 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/configure.ac.in b/configure.ac.in | ||
| 17 | index a321f9bbf..03f9a31b0 100644 | ||
| 18 | --- a/configure.ac.in | ||
| 19 | +++ b/configure.ac.in | ||
| 20 | @@ -642,18 +642,7 @@ if test x$radcli = xtrue; then | ||
| 21 | fi | ||
| 22 | fi | ||
| 23 | |||
| 24 | -AC_CACHE_CHECK([if pthread rwlocks are supported], [my_cv_rw_locks_supported], [ | ||
| 25 | - AC_TRY_RUN([ | ||
| 26 | - #include <pthread.h> | ||
| 27 | - | ||
| 28 | - int main() { | ||
| 29 | - pthread_rwlock_t t; | ||
| 30 | - return 0; | ||
| 31 | - } | ||
| 32 | -] | ||
| 33 | -, [my_cv_rw_locks_supported=yes], [my_cv_rw_locks_supported=no]) | ||
| 34 | -] | ||
| 35 | -) | ||
| 36 | +AC_CACHE_CHECK([if pthread rwlocks are supported], [my_cv_rw_locks_supported]) | ||
| 37 | |||
| 38 | if test "$my_cv_rw_locks_supported" = yes; then | ||
| 39 | AC_DEFINE_UNQUOTED(HAVE_RW_LOCK, 1, [pthread rwlocks supported]) | ||
| 40 | -- | ||
| 41 | 2.26.2 | ||
| 42 | |||
diff --git a/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-host-contamination.patch b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-host-contamination.patch index 5e1440b3d6..e3c0534da8 100644 --- a/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-host-contamination.patch +++ b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-host-contamination.patch | |||
| @@ -14,17 +14,95 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | |||
| 14 | configure.ac.in | 43 +++---------------------------------------- | 14 | configure.ac.in | 43 +++---------------------------------------- |
| 15 | 1 file changed, 3 insertions(+), 40 deletions(-) | 15 | 1 file changed, 3 insertions(+), 40 deletions(-) |
| 16 | 16 | ||
| 17 | diff --git a/configure.ac.in b/configure.ac.in | ||
| 18 | index 1d6380c..beffc6c 100644 | ||
| 19 | --- a/configure.ac.in | 17 | --- a/configure.ac.in |
| 20 | +++ b/configure.ac.in | 18 | +++ b/configure.ac.in |
| 21 | @@ -167,31 +167,6 @@ fi | 19 | @@ -83,30 +83,6 @@ if test "$with_dynamic_ndpi" = "yes"; th |
| 22 | # | 20 | AC_DEFINE([HAVE_DYNAMIC_NDPI], [1], [Define if using dynamic linking with nDPI]) |
| 23 | REVISION=`git log --pretty=oneline | wc -l` | 21 | fi |
| 22 | |||
| 23 | -dnl> CLANG_STDLIB="-stdlib=libc++" | ||
| 24 | - | ||
| 25 | -dnl> On Ubuntu do sudo apt-get install -y clang-14 clang-tools-14 | ||
| 26 | -if test "x$USE_CLANG" = xyes; then | ||
| 27 | - if test $SYSTEM = "Darwin"; then | ||
| 28 | - CC=clang | ||
| 29 | - CXX="clang++ -fno-color-diagnostics -fPIE -stdlib=libc++" | ||
| 30 | - else | ||
| 31 | - if test -x "/usr/bin/clang-10"; then | ||
| 32 | - CLANG_VERSION=10 | ||
| 33 | - elif test -x "/usr/bin/clang-13"; then | ||
| 34 | - CLANG_VERSION=13 | ||
| 35 | - elif test -x "/usr/bin/clang-14"; then | ||
| 36 | - CLANG_VERSION=14 | ||
| 37 | - else | ||
| 38 | - echo "Could not find clang. Please install clang-14 clang-tools-14" | ||
| 39 | - exit 1 | ||
| 40 | - fi | ||
| 41 | - | ||
| 42 | - CC=clang-$CLANG_VERSION | ||
| 43 | - CXX="clang++-$CLANG_VERSION -fno-color-diagnostics -fPIE $CLANG_STDLIB" | ||
| 44 | - fi | ||
| 45 | -fi | ||
| 46 | - | ||
| 47 | CFLAGS="${CFLAGS} -I${HERE} -I${HERE}/include" | ||
| 48 | CXXFLAGS="${CXXFLAGS} -I${HERE} -I${HERE}/include" | ||
| 49 | |||
| 50 | @@ -122,7 +98,7 @@ fi | ||
| 51 | |||
| 52 | if test -f /proc/device-tree/model; then | ||
| 53 | IS_RASPBERRY=`cat /proc/device-tree/model | grep -a -e "Orange Pi" -e Raspberry | wc -l` | ||
| 54 | - | ||
| 55 | + | ||
| 56 | if test "$IS_RASPBERRY" = "1"; then | ||
| 57 | CFLAGS="${CFLAGS} -DHAVE_EMBEDDED_SUPPORT" | ||
| 58 | CXXFLAGS="${CXXFLAGS} -DHAVE_EMBEDDED_SUPPORT" | ||
| 59 | @@ -158,39 +134,6 @@ MAKE=make | ||
| 60 | BIN_PATH=/usr/bin | ||
| 61 | LIBPCAP=-lpcap | ||
| 62 | |||
| 63 | -if test $SYSTEM = "FreeBSD" || test $SYSTEM = "Darwin"; then | ||
| 64 | - CFLAGS="${CFLAGS} -I/usr/local/include" | ||
| 65 | - LDFLAGS="${LDFLAGS} -L/usr/local/lib" | ||
| 66 | - | ||
| 67 | - dnl> https://github.com/google/sanitizers/wiki/AddressSanitizerFlags | ||
| 68 | - CC=clang | ||
| 69 | - CXX="clang++ -fpie -fno-color-diagnostics $CLANG_STDLIB" | ||
| 70 | - if test $SYSTEM = "FreeBSD"; then | ||
| 71 | - MAKE=gmake | ||
| 72 | - BIN_PATH=/usr/local/bin | ||
| 73 | - else | ||
| 74 | - dnl> Adds /opt if MacPorts is installed | ||
| 75 | - if [ test -f /opt/local/bin/port ]; then | ||
| 76 | - CFLAGS="${CFLAGS} -I/opt/local/include" | ||
| 77 | - LDFLAGS="${LDFLAGS} -L/opt/local/lib" | ||
| 78 | - fi | ||
| 79 | - fi | ||
| 80 | - dnl> CXX=clang++ -fsanitize=address -fsanitize-address-use-after-scope | ||
| 81 | - OSXV=`sw_vers -productVersion` | ||
| 82 | - if test $SYSTEM = "Darwin"; then | ||
| 83 | - OS="macOS $OSXV" | ||
| 84 | - else | ||
| 85 | - OS=`uname -or | cut -d '-' -f 1` | ||
| 86 | - fi | ||
| 87 | - if test $MACHINE = "x86_64"; then | ||
| 88 | - LDFLAGS="${LDFLAGS} -L/usr/local/opt/ntopng" | ||
| 89 | - RES=`g++ -Wall -fno-color-diagnostics Prefs.cpp 2>&1 | grep "unrecognized command line option "|wc -l` | ||
| 90 | - if test $RES -eq 0; then | ||
| 91 | - CFLAGS="-fno-color-diagnostics $CFLAGS" | ||
| 92 | - fi | ||
| 93 | - fi | ||
| 94 | -fi | ||
| 95 | - | ||
| 96 | dnl> Remove spaces | ||
| 97 | OS="${OS#"${OS%%[![:space:]]*}"}" | ||
| 98 | |||
| 99 | @@ -237,31 +180,6 @@ if test "${with_nedge+set}" = set; then | ||
| 100 | LIBS="${LIBS} -lnetfilter_queue -lnfnetlink -lnetfilter_conntrack" | ||
| 101 | fi | ||
| 24 | 102 | ||
| 25 | -if test -d "/usr/local/include"; then | 103 | -if test -d "/usr/local/include"; then |
| 26 | - CFLAGS="${CFLAGS} -I/usr/local/include" | 104 | - CFLAGS="${CFLAGS} -I/usr/local/include" |
| 27 | - CPPFLAGS="${CPPFLAGS} -I/usr/local/include" | 105 | - CXXFLAGS="${CXXFLAGS} -I/usr/local/include" |
| 28 | -fi | 106 | -fi |
| 29 | - | 107 | - |
| 30 | -if test -d "/usr/local/lib"; then | 108 | -if test -d "/usr/local/lib"; then |
| @@ -33,7 +111,7 @@ index 1d6380c..beffc6c 100644 | |||
| 33 | - | 111 | - |
| 34 | -if test -d /opt/local/include; then : | 112 | -if test -d /opt/local/include; then : |
| 35 | - CFLAGS="${CFLAGS} -I/opt/local/include" | 113 | - CFLAGS="${CFLAGS} -I/opt/local/include" |
| 36 | - CPPFLAGS="${CPPFLAGS} -I/opt/local/include" | 114 | - CXXFLAGS="${CXXFLAGS} -I/opt/local/include" |
| 37 | -fi | 115 | -fi |
| 38 | - | 116 | - |
| 39 | -if test -d /opt/local/lib; then : | 117 | -if test -d /opt/local/lib; then : |
| @@ -42,15 +120,26 @@ index 1d6380c..beffc6c 100644 | |||
| 42 | - | 120 | - |
| 43 | -if [ test -f /usr/bin/lsb_release ]; then | 121 | -if [ test -f /usr/bin/lsb_release ]; then |
| 44 | - CODENAME=`/usr/bin/lsb_release -c|cut -f 2` | 122 | - CODENAME=`/usr/bin/lsb_release -c|cut -f 2` |
| 45 | - if [[ $CODENAME == "wheezy" ]]; then : | 123 | - if test $CODENAME = "wheezy" ; then |
| 46 | - CPPFLAGS="${CPPFLAGS} -DOLD_NETFILTER_INTERFACE=1" | 124 | - CXXFLAGS="${CXXFLAGS} -DOLD_NETFILTER_INTERFACE=1" |
| 47 | - fi | 125 | - fi |
| 48 | -fi | 126 | -fi |
| 49 | - | 127 | - |
| 50 | SHORT_MACHINE=`uname -m | cut -b1-3` | 128 | if test -d "pro"; then |
| 129 | NTOPCLOUD_LIB= | ||
| 130 | NTOPCLOUD_HOME="../ntopcloud" | ||
| 131 | @@ -317,10 +235,6 @@ AC_ARG_WITH(ndpi-includes, | ||
| 132 | NDPI_CUST_INC="-I$withval -I$withval/../lib/third_party/include" | ||
| 133 | ]) | ||
| 51 | 134 | ||
| 52 | GIT_RELEASE="@GIT_RELEASE@" | 135 | -if test -d /usr/local/include/ndpi ; then : |
| 53 | @@ -300,23 +275,11 @@ fi | 136 | - echo "WARNING: /usr/local/include/ndpi is present and might lead to compile errors" |
| 137 | -fi | ||
| 138 | - | ||
| 139 | NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"` | ||
| 140 | NDPI_LIB= | ||
| 141 | NDPI_LIB_DEP= | ||
| 142 | @@ -387,7 +301,7 @@ fi | ||
| 54 | pkg-config --exists libssl | 143 | pkg-config --exists libssl |
| 55 | if test "$?" -ne 1; then | 144 | if test "$?" -ne 1; then |
| 56 | AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) | 145 | AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) |
| @@ -58,25 +147,70 @@ index 1d6380c..beffc6c 100644 | |||
| 58 | + SSL_INC="`pkg-config --cflags libssl`" | 147 | + SSL_INC="`pkg-config --cflags libssl`" |
| 59 | SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto" | 148 | SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto" |
| 60 | else | 149 | else |
| 61 | - dnl Workaround for MacOS Brew | 150 | dnl Workaround for MacOS Brew |
| 62 | - if test -d "/usr/local/opt/openssl/lib"; then | 151 | @@ -408,10 +322,6 @@ else |
| 63 | - AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) | 152 | SSL_INC="-I/usr/local/opt/openssl/include" |
| 64 | - SSL_INC="-I/usr/local/opt/openssl/include" | 153 | SSL_LIB="-L/usr/local/opt/openssl/lib -lssl -lcrypto" |
| 65 | - SSL_LIB="-L/usr/local/opt/openssl/lib -lssl -lcrypto" | 154 | dnl Workaround for FreeBSD |
| 66 | - dnl Workaround for FreeBSD | ||
| 67 | - elif test -f "/usr/lib/libssl.so"; then | 155 | - elif test -f "/usr/lib/libssl.so"; then |
| 68 | - AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) | 156 | - AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) |
| 69 | - SSL_INC="-I/usr/include" | 157 | - SSL_INC="-I/usr/include" |
| 70 | - SSL_LIB="-L/usr/lib -lssl -lcrypto" | 158 | - SSL_LIB="-L/usr/lib -lssl -lcrypto" |
| 71 | - else | 159 | else |
| 72 | - echo "Please install openssl-dev(el) package prerequisite" | 160 | echo "Please install openssl-dev(el) package prerequisite" |
| 73 | - exit -1 | 161 | exit -1 |
| 162 | @@ -433,13 +343,6 @@ fi | ||
| 163 | AC_MSG_CHECKING(for ntopng professional edition) | ||
| 164 | |||
| 165 | REDIS_SERVICE="redis.service" | ||
| 166 | -if [ test -f /usr/bin/lsb_release ]; then | ||
| 167 | - UBUNTU_RELEASE=`lsb_release -r|cut -f 2` | ||
| 168 | - UBUNTU_SUB_RELEASE=`echo $UBUNTU_RELEASE|cut -f 1 -d '.'` | ||
| 169 | - if test "$UBUNTU_SUB_RELEASE" = "8" || test "$UBUNTU_SUB_RELEASE" = "10"; then | ||
| 170 | - REDIS_SERVICE="redis-server.service" | ||
| 74 | - fi | 171 | - fi |
| 75 | + echo "Please install openssl-dev(el) package prerequisite" | 172 | -fi |
| 76 | + exit -1 | 173 | |
| 174 | SERVICE_ALIAS= | ||
| 175 | SERVICE_REQUIRES= | ||
| 176 | @@ -497,7 +400,7 @@ fi | ||
| 177 | echo "Using clickhouse-cpp stored at ${CLICKHOUSE_HOME}" | ||
| 178 | |||
| 179 | dnl> fi dnl> test $SYSTEM = "Linux" | ||
| 180 | - | ||
| 181 | + | ||
| 182 | AC_DEFINE_UNQUOTED(NTOPNG_PRO_GIT_RELEASE, "r${PRO_GIT_RELEASE}", [ntopng professional release]) | ||
| 183 | AC_DEFINE_UNQUOTED(NTOPNG_PRO_GIT_DATE, "${PRO_GIT_DATE}", [ntopng professional date]) | ||
| 184 | DUMMY=`cd ./pro; ${MAKE} build` | ||
| 185 | @@ -531,21 +434,7 @@ if test -f ".git/index"; then | ||
| 77 | fi | 186 | fi |
| 78 | 187 | ||
| 79 | AC_CHECK_LIB([gcrypt], [gcry_cipher_checktag], [LIBS="${LIBS} -lgcrypt"]) | 188 | if test $SYSTEM = "Linux"; then |
| 80 | -- | 189 | - if [ test -f /usr/bin/lsb_release ]; then |
| 81 | 2.25.1 | 190 | - OSNAME=`/usr/bin/lsb_release -d|cut -d ':' -f 2| sed -e 's/^[[[:space:]]]*//'` |
| 82 | 191 | - OS="$OSNAME" | |
| 192 | - else | ||
| 193 | - if test -f /etc/debian_version; then | ||
| 194 | - DEBIAN_VERSION=`cat /etc/debian_version` | ||
| 195 | - OSNAME="Debian $DEBIAN_VERSION" | ||
| 196 | - else | ||
| 197 | - if test -f /etc/redhat-release; then | ||
| 198 | - OS=`cat /etc/redhat-release | cut -d '(' -f 1 | awk '{$1=$1};1'` | ||
| 199 | - else | ||
| 200 | - OS=`./config.guess` | ||
| 201 | - fi | ||
| 202 | - fi | ||
| 203 | - fi | ||
| 204 | + OS=`./config.guess` | ||
| 205 | else | ||
| 206 | dnl> wget -O config.guess 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD' | ||
| 207 | if test $SYSTEM = "FreeBSD"; then | ||
| 208 | @@ -575,7 +464,7 @@ AS_VAR_IF(with_hiredis, yes, [ | ||
| 209 | else | ||
| 210 | pkg-config --exists hiredis | ||
| 211 | if test "$?" -ne 1; then | ||
| 212 | - HIREDIS_INC="`pkg-config --cflags hiredis` -I/usr/include/hiredis" | ||
| 213 | + HIREDIS_INC="`pkg-config --cflags hiredis`" | ||
| 214 | if test $SYSTEM = "FreeBSD" && $FREEBSD_VERSION != "15"; then | ||
| 215 | dnl> Note: on freebsd 15 .a is not installed | ||
| 216 | HIREDIS_LIB="/usr/local/lib/libhiredis.a" | ||
diff --git a/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-not-check-clang-on-host.patch b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-not-check-clang-on-host.patch deleted file mode 100644 index ffb106723c..0000000000 --- a/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-not-check-clang-on-host.patch +++ /dev/null | |||
| @@ -1,44 +0,0 @@ | |||
| 1 | From 5867be19e53a3cc09730b83282c83bdd26147cc3 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
| 3 | Date: Mon, 9 Nov 2020 04:05:25 +0000 | ||
| 4 | Subject: [PATCH] configure.ac.in: not check clang on host | ||
| 5 | |||
| 6 | Don't check clang on host to avoid host contamination. | ||
| 7 | |||
| 8 | Upstream-Status: Inappropriate [OE specific] | ||
| 9 | |||
| 10 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
| 11 | --- | ||
| 12 | configure.ac.in | 16 ---------------- | ||
| 13 | 1 file changed, 16 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/configure.ac.in b/configure.ac.in | ||
| 16 | index 55bd49678..94bc0bc48 100644 | ||
| 17 | --- a/configure.ac.in | ||
| 18 | +++ b/configure.ac.in | ||
| 19 | @@ -90,22 +90,6 @@ if test $SYSTEM = "FreeBSD" || test $SYSTEM = "Darwin"; then | ||
| 20 | CFLAGS="-fno-color-diagnostics $CFLAGS" | ||
| 21 | fi | ||
| 22 | fi | ||
| 23 | -else | ||
| 24 | - if test $SYSTEM = "Linux"; then | ||
| 25 | - if [ test -f /usr/bin/clang++ ]; then | ||
| 26 | - CC=clang | ||
| 27 | - CXX=clang++ | ||
| 28 | - AC_MSG_RESULT(Using clang++ compiler) | ||
| 29 | - fi | ||
| 30 | - | ||
| 31 | - if [ test -f /etc/redhat-release ]; then | ||
| 32 | - OS=`cat /etc/redhat-release` | ||
| 33 | - else | ||
| 34 | - if [ test -f /usr/bin/lsb_release ]; then | ||
| 35 | - OS=`/usr/bin/lsb_release -d|cut -d ':' -f 2` | ||
| 36 | - fi | ||
| 37 | - fi | ||
| 38 | - fi | ||
| 39 | fi | ||
| 40 | |||
| 41 | dnl> Remove spaces | ||
| 42 | -- | ||
| 43 | 2.17.1 | ||
| 44 | |||
diff --git a/meta-networking/recipes-support/ntopng/files/0001-luaengine-Use-lua-5.5-API-signature-for-lua_newstate.patch b/meta-networking/recipes-support/ntopng/files/0001-luaengine-Use-lua-5.5-API-signature-for-lua_newstate.patch new file mode 100644 index 0000000000..8046d755c2 --- /dev/null +++ b/meta-networking/recipes-support/ntopng/files/0001-luaengine-Use-lua-5.5-API-signature-for-lua_newstate.patch | |||
| @@ -0,0 +1,31 @@ | |||
| 1 | From 6c4806436c3214e32487d05ce099ac86b0b2519c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <khem.raj@oss.qualcomm.com> | ||
| 3 | Date: Sun, 22 Mar 2026 10:08:01 -0700 | ||
| 4 | Subject: [PATCH] luaengine: Use lua 5.5 API signature for lua_newstate | ||
| 5 | |||
| 6 | in Lua 5.5 lua_newstate gained a third argument, | ||
| 7 | |||
| 8 | lua_State *lua_newstate(lua_Alloc f, void *ud, unsigned int seed); | ||
| 9 | |||
| 10 | The 5.5 manual says that third argument, seed, | ||
| 11 | is "a seed for the hashing of strings," and the 5.5 incompatibilities | ||
| 12 | section explicitly calls out that lua_newstate now has | ||
| 13 | a third parameter. | ||
| 14 | |||
| 15 | Upstream-Status: Pending | ||
| 16 | Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com> | ||
| 17 | --- | ||
| 18 | src/LuaEngine.cpp | 64 +++++++++++++++++++++++------------------------ | ||
| 19 | 1 file changed, 32 insertions(+), 32 deletions(-) | ||
| 20 | |||
| 21 | --- a/src/LuaEngine.cpp | ||
| 22 | +++ b/src/LuaEngine.cpp | ||
| 23 | @@ -154,7 +154,7 @@ LuaEngine::LuaEngine() { | ||
| 24 | is_system_vm = false; | ||
| 25 | mem_used = 0; | ||
| 26 | |||
| 27 | - L = lua_newstate(l_alloc, this); | ||
| 28 | + L = lua_newstate(l_alloc, this, luaL_makeseed(NULL)); | ||
| 29 | |||
| 30 | if (!L) { | ||
| 31 | ntop->getTrace()->traceEvent(TRACE_ERROR, "Unable to create a new Lua state."); | ||
diff --git a/meta-networking/recipes-support/ntopng/ndpi_5.0.bb b/meta-networking/recipes-support/ntopng/ndpi_5.0.bb index e2040eda18..6eadf8ba62 100644 --- a/meta-networking/recipes-support/ntopng/ndpi_5.0.bb +++ b/meta-networking/recipes-support/ntopng/ndpi_5.0.bb | |||
| @@ -21,6 +21,10 @@ do_configure:prepend() { | |||
| 21 | (cd ${S} && ${S}/autogen.sh) | 21 | (cd ${S} && ${S}/autogen.sh) |
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | do_install:append() { | ||
| 25 | install -Dm 0644 ${B}/src/include/ndpi_define.h ${D}${includedir}/ndpi/ndpi_define.h | ||
| 26 | } | ||
| 27 | |||
| 24 | EXTRA_OEMAKE = " \ | 28 | EXTRA_OEMAKE = " \ |
| 25 | libdir=${libdir} \ | 29 | libdir=${libdir} \ |
| 26 | " | 30 | " |
diff --git a/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb b/meta-networking/recipes-support/ntopng/ntopng_6.6.bb index 014706893a..3c039781d8 100644 --- a/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb +++ b/meta-networking/recipes-support/ntopng/ntopng_6.6.bb | |||
| @@ -11,27 +11,28 @@ RDEPENDS:${PN} = "bash redis" | |||
| 11 | LICENSE = "GPL-3.0-only" | 11 | LICENSE = "GPL-3.0-only" |
| 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
| 13 | 13 | ||
| 14 | SRCREV = "d3ce78948e8d81dc1e2c5298ce556f9f2247aac1" | 14 | SRCREV = "d3a1229954dd783af06c9fd2dcd9ce926826a228" |
| 15 | SRC_URI = "git://github.com/ntop/ntopng.git;protocol=https;branch=5.2-stable \ | 15 | SRC_URI = "gitsm://github.com/ntop/ntopng;protocol=https;branch=6.6-stable \ |
| 16 | file://0001-configure.ac.in-fix-configure-error.patch \ | ||
| 17 | file://0001-configure.ac.in-fix-host-contamination.patch \ | 16 | file://0001-configure.ac.in-fix-host-contamination.patch \ |
| 18 | file://0001-Makefile.in-don-t-use-the-internal-lua.patch \ | 17 | file://0001-Makefile.in-don-t-use-the-internal-lua.patch \ |
| 19 | file://0001-autogen.sh-generate-configure.ac-only.patch \ | ||
| 20 | file://0001-configure.ac.in-not-check-clang-on-host.patch \ | ||
| 21 | file://0001-configure.ac.in-Allow-dynamic-linking-against-ndpi-3.patch \ | 18 | file://0001-configure.ac.in-Allow-dynamic-linking-against-ndpi-3.patch \ |
| 22 | file://0001-Follow-rrd-post-1.8-change.patch \ | 19 | file://0001-luaengine-Use-lua-5.5-API-signature-for-lua_newstate.patch \ |
| 23 | file://ntopng.service \ | 20 | file://ntopng.service \ |
| 24 | " | 21 | " |
| 25 | 22 | ||
| 26 | |||
| 27 | # don't use the lua under thirdparty as it supports cross compiling badly | 23 | # don't use the lua under thirdparty as it supports cross compiling badly |
| 28 | export LUA_LIB = "${STAGING_LIBDIR}/liblua.a" | 24 | export LUA_LIB = "-llua" |
| 29 | 25 | export LUA_INC = "-I${STAGING_INCDIR}" | |
| 26 | export NDPI_CUST_INC = "-I${STAGING_INCDIR}/ndpi" | ||
| 27 | export NDPI_CUST_LIB = "-lndpi" | ||
| 30 | LDFLAGS:append:mipsarch = " -latomic" | 28 | LDFLAGS:append:mipsarch = " -latomic" |
| 31 | LDFLAGS:append:powerpc = " -latomic" | 29 | LDFLAGS:append:powerpc = " -latomic" |
| 32 | LDFLAGS:append:riscv32 = " -latomic" | 30 | LDFLAGS:append:riscv32 = " -latomic" |
| 31 | |||
| 33 | inherit autotools-brokensep gettext pkgconfig systemd | 32 | inherit autotools-brokensep gettext pkgconfig systemd |
| 34 | 33 | ||
| 34 | EXTRA_OECONF += "--with-dynamic-ndpi" | ||
| 35 | |||
| 35 | do_install:append() { | 36 | do_install:append() { |
| 36 | install -d ${D}${systemd_unitdir}/system/ | 37 | install -d ${D}${systemd_unitdir}/system/ |
| 37 | install -m 0644 ${UNPACKDIR}/ntopng.service ${D}${systemd_unitdir}/system | 38 | install -m 0644 ${UNPACKDIR}/ntopng.service ${D}${systemd_unitdir}/system |
diff --git a/meta-networking/recipes-support/ntp/ntp/0001-ITS-10011-build-fix-compatibility-with-stricter-C99-.patch b/meta-networking/recipes-support/ntp/ntp/0001-ITS-10011-build-fix-compatibility-with-stricter-C99-.patch new file mode 100644 index 0000000000..6558fae4ae --- /dev/null +++ b/meta-networking/recipes-support/ntp/ntp/0001-ITS-10011-build-fix-compatibility-with-stricter-C99-.patch | |||
| @@ -0,0 +1,102 @@ | |||
| 1 | From 58c160ce28328f9a75d41c283ee9b94c10d6ec62 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Sam James <sam@gentoo.org> | ||
| 3 | Date: Thu, 9 Feb 2023 23:17:53 +0000 | ||
| 4 | Subject: [PATCH] ITS#10011 build: fix compatibility with stricter C99 | ||
| 5 | compilers | ||
| 6 | |||
| 7 | Fix the following warnings: | ||
| 8 | - -Wimplicit-int (fatal with Clang 16) | ||
| 9 | - -Wimplicit-function-declaration (fatal with Clang 16) | ||
| 10 | - -Wincompatible-function-pointer-types (fatal with Clang 16) | ||
| 11 | - -Wint-conversion (fatal with Clang 15) | ||
| 12 | - Old style prototypes (K&R, removed from C23) | ||
| 13 | |||
| 14 | These warnings-now-error led to misconfigurations and failure to build | ||
| 15 | OpenLDAP, as the tests used during configure caused the wrong results | ||
| 16 | to be emitted. | ||
| 17 | |||
| 18 | For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [2], | ||
| 19 | or the (new) c-std-porting mailing list [3]. | ||
| 20 | |||
| 21 | [0] https://lwn.net/Articles/913505/ | ||
| 22 | [1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213 | ||
| 23 | [2] https://wiki.gentoo.org/wiki/Modern_C_porting | ||
| 24 | [3] hosted at lists.linux.dev. | ||
| 25 | |||
| 26 | Bug: https://bugs.gentoo.org/871288 | ||
| 27 | |||
| 28 | Upstream-Status: Pending | ||
| 29 | |||
| 30 | Signed-off-by: Sam James <sam@gentoo.org> | ||
| 31 | Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com> | ||
| 32 | --- | ||
| 33 | sntp/m4/openldap.m4 | 16 +++++++++++++--- | ||
| 34 | 1 file changed, 13 insertions(+), 3 deletions(-) | ||
| 35 | |||
| 36 | diff --git a/sntp/m4/openldap.m4 b/sntp/m4/openldap.m4 | ||
| 37 | index 49ffb87..2db6aa3 100644 | ||
| 38 | --- a/sntp/m4/openldap.m4 | ||
| 39 | +++ b/sntp/m4/openldap.m4 | ||
| 40 | @@ -154,6 +154,7 @@ fi | ||
| 41 | if test $ol_cv_header_stdc = yes; then | ||
| 42 | # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. | ||
| 43 | AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <ctype.h> | ||
| 44 | +#include <stdlib.h> | ||
| 45 | #ifndef HAVE_EBCDIC | ||
| 46 | # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') | ||
| 47 | # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) | ||
| 48 | @@ -610,8 +611,12 @@ AC_DEFUN([OL_PTHREAD_TEST_INCLUDES], [[ | ||
| 49 | #define NULL (void*)0 | ||
| 50 | #endif | ||
| 51 | |||
| 52 | +#ifdef __STDC__ | ||
| 53 | +static void *task(void *p) | ||
| 54 | +#else | ||
| 55 | static void *task(p) | ||
| 56 | void *p; | ||
| 57 | +#endif | ||
| 58 | { | ||
| 59 | return (void *) (p == NULL); | ||
| 60 | } | ||
| 61 | @@ -667,9 +672,13 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[ | ||
| 62 | AC_DEFUN([OL_PTHREAD_TEST_PROGRAM], [ | ||
| 63 | AC_LANG_SOURCE([OL_PTHREAD_TEST_INCLUDES | ||
| 64 | |||
| 65 | +#ifdef __STDC__ | ||
| 66 | +int main(int argc, char **argv) | ||
| 67 | +#else | ||
| 68 | int main(argc, argv) | ||
| 69 | int argc; | ||
| 70 | char **argv; | ||
| 71 | +#endif | ||
| 72 | { | ||
| 73 | OL_PTHREAD_TEST_FUNCTION | ||
| 74 | } | ||
| 75 | @@ -791,7 +800,7 @@ AC_CACHE_CHECK([for compatible POSIX regex],ol_cv_c_posix_regex,[ | ||
| 76 | #include <sys/types.h> | ||
| 77 | #include <regex.h> | ||
| 78 | static char *pattern, *string; | ||
| 79 | -main() | ||
| 80 | +int main(void) | ||
| 81 | { | ||
| 82 | int rc; | ||
| 83 | regex_t re; | ||
| 84 | @@ -818,7 +827,8 @@ AC_DEFUN([OL_C_UPPER_LOWER], | ||
| 85 | [AC_CACHE_CHECK([if toupper() requires islower()],ol_cv_c_upper_lower,[ | ||
| 86 | AC_RUN_IFELSE([AC_LANG_SOURCE([[ | ||
| 87 | #include <ctype.h> | ||
| 88 | -main() | ||
| 89 | +#include <stdlib.h> | ||
| 90 | +int main(void) | ||
| 91 | { | ||
| 92 | if ('C' == toupper('C')) | ||
| 93 | exit(0); | ||
| 94 | @@ -873,7 +883,7 @@ AC_DEFUN([OL_NONPOSIX_STRERROR_R], | ||
| 95 | ]])],[ol_cv_nonposix_strerror_r=yes],[ol_cv_nonposix_strerror_r=no]) | ||
| 96 | else | ||
| 97 | AC_RUN_IFELSE([AC_LANG_SOURCE([[ | ||
| 98 | - main() { | ||
| 99 | + int main(void) { | ||
| 100 | char buf[100]; | ||
| 101 | buf[0] = 0; | ||
| 102 | strerror_r( 1, buf, sizeof buf ); | ||
diff --git a/meta-networking/recipes-support/ntp/ntp/0001-colcomp-sntp-libpkgver-colcomp.c-Convert-K-R-functio.patch b/meta-networking/recipes-support/ntp/ntp/0001-colcomp-sntp-libpkgver-colcomp.c-Convert-K-R-functio.patch new file mode 100644 index 0000000000..39f7e537c1 --- /dev/null +++ b/meta-networking/recipes-support/ntp/ntp/0001-colcomp-sntp-libpkgver-colcomp.c-Convert-K-R-functio.patch | |||
| @@ -0,0 +1,32 @@ | |||
| 1 | From cd54486bdced460c174fcb98680ad5ffe64f906a Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <khem.raj@oss.qualcomm.com> | ||
| 3 | Date: Mon, 13 Apr 2026 19:09:24 -0700 | ||
| 4 | Subject: [PATCH] colcomp: sntp/libpkgver/colcomp.c: Convert K&R function | ||
| 5 | definition to ANSI C style | ||
| 6 | |||
| 7 | Replace old-style K&R function declaration with modern ANSI C prototype | ||
| 8 | syntax for colcomp(). Also remove trailing whitespace after return type. | ||
| 9 | |||
| 10 | Upstream-Status: Pending | ||
| 11 | Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com> | ||
| 12 | --- | ||
| 13 | sntp/libpkgver/colcomp.c | 6 ++---- | ||
| 14 | 1 file changed, 2 insertions(+), 4 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/sntp/libpkgver/colcomp.c b/sntp/libpkgver/colcomp.c | ||
| 17 | index 4b151e3..29ecb3e 100644 | ||
| 18 | --- a/sntp/libpkgver/colcomp.c | ||
| 19 | +++ b/sntp/libpkgver/colcomp.c | ||
| 20 | @@ -33,10 +33,8 @@ | ||
| 21 | #endif | ||
| 22 | |||
| 23 | |||
| 24 | -int | ||
| 25 | -colcomp (s1, s2) | ||
| 26 | - register char *s1; | ||
| 27 | - register char *s2; | ||
| 28 | +int | ||
| 29 | +colcomp (register char *s1, register char *s2) | ||
| 30 | { | ||
| 31 | int hilo = 0; /* comparison value */ | ||
| 32 | |||
diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb b/meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb index e59725e3e9..6f9bb01c02 100644 --- a/meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb +++ b/meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb | |||
| @@ -17,6 +17,8 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g | |||
| 17 | file://0001-test-Fix-build-with-new-compiler-defaults-to-fno-com.patch \ | 17 | file://0001-test-Fix-build-with-new-compiler-defaults-to-fno-com.patch \ |
| 18 | file://0001-sntp-Fix-types-in-check-for-pthread_detach.patch \ | 18 | file://0001-sntp-Fix-types-in-check-for-pthread_detach.patch \ |
| 19 | file://0001-include-fix-build-failure-with-glibc-2.43-_Generic-m.patch \ | 19 | file://0001-include-fix-build-failure-with-glibc-2.43-_Generic-m.patch \ |
| 20 | file://0001-ITS-10011-build-fix-compatibility-with-stricter-C99-.patch \ | ||
| 21 | file://0001-colcomp-sntp-libpkgver-colcomp.c-Convert-K-R-functio.patch \ | ||
| 20 | file://ntpd \ | 22 | file://ntpd \ |
| 21 | file://ntp.conf \ | 23 | file://ntp.conf \ |
| 22 | file://ntpd.service \ | 24 | file://ntpd.service \ |
diff --git a/meta-networking/recipes-support/openvpn/openvpn/0001-tests-skip-test-execution-when-cross-compiling.patch b/meta-networking/recipes-support/openvpn/openvpn/0001-tests-skip-test-execution-when-cross-compiling.patch new file mode 100644 index 0000000000..f8f2d2907f --- /dev/null +++ b/meta-networking/recipes-support/openvpn/openvpn/0001-tests-skip-test-execution-when-cross-compiling.patch | |||
| @@ -0,0 +1,34 @@ | |||
| 1 | From 93f7f6ca0c916427d28610d3e263fa556587532d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Haixiao Yan <haixiao.yan.cn@windriver.com> | ||
| 3 | Date: Thu, 26 Mar 2026 13:43:50 +0800 | ||
| 4 | Subject: [PATCH] tests: skip test execution when cross-compiling | ||
| 5 | |||
| 6 | The auth-pam unit test Makefile.am unconditionally assigns the TESTS variable, | ||
| 7 | causing test execution to fail during cross-compilation because the target | ||
| 8 | binaries are not executable on the build host. | ||
| 9 | |||
| 10 | Upstream-Status: Pending | ||
| 11 | |||
| 12 | Signed-off-by: Haixiao Yan <haixiao.yan.cn@windriver.com> | ||
| 13 | --- | ||
| 14 | tests/unit_tests/plugins/auth-pam/Makefile.am | 2 ++ | ||
| 15 | 1 file changed, 2 insertions(+) | ||
| 16 | |||
| 17 | diff --git a/tests/unit_tests/plugins/auth-pam/Makefile.am b/tests/unit_tests/plugins/auth-pam/Makefile.am | ||
| 18 | index ba32013ac920..7da299ccde92 100644 | ||
| 19 | --- a/tests/unit_tests/plugins/auth-pam/Makefile.am | ||
| 20 | +++ b/tests/unit_tests/plugins/auth-pam/Makefile.am | ||
| 21 | @@ -4,8 +4,10 @@ AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING) auth_pam Plugin Unit-Tests | ||
| 22 | |||
| 23 | if ENABLE_PLUGIN_AUTH_PAM | ||
| 24 | check_PROGRAMS = auth_pam_testdriver | ||
| 25 | +if !CROSS_COMPILING | ||
| 26 | TESTS = $(check_PROGRAMS) | ||
| 27 | endif | ||
| 28 | +endif | ||
| 29 | |||
| 30 | auth_pam_testdriver_SOURCES = test_search_and_replace.c $(top_srcdir)/src/plugins/auth-pam/utils.h $(top_srcdir)/src/plugins/auth-pam/utils.c | ||
| 31 | auth_pam_testdriver_CFLAGS = @TEST_CFLAGS@ -I$(top_srcdir)/src/plugins/auth-pam | ||
| 32 | -- | ||
| 33 | 2.43.0 | ||
| 34 | |||
diff --git a/meta-networking/recipes-support/openvpn/openvpn/run-ptest b/meta-networking/recipes-support/openvpn/openvpn/run-ptest index 19f66b5c56..b0f5699e57 100644 --- a/meta-networking/recipes-support/openvpn/openvpn/run-ptest +++ b/meta-networking/recipes-support/openvpn/openvpn/run-ptest | |||
| @@ -1,8 +1,20 @@ | |||
| 1 | #!/bin/sh | 1 | #!/bin/sh |
| 2 | 2 | ||
| 3 | find ./ -name Makefile | while read -r x; do | 3 | # Run unit tests directly |
| 4 | make -C "$(dirname "${x}")" -k runtest-TESTS | sed \ | 4 | find ./ -name "*testdriver" -type f -executable | while read -r t; do |
| 5 | dir=$(dirname "${t}") | ||
| 6 | srcdir="${dir}" "${t}" 2>&1 | sed \ | ||
| 5 | -e 's/^\(\[ OK \].*\)$/PASS: \1/' \ | 7 | -e 's/^\(\[ OK \].*\)$/PASS: \1/' \ |
| 6 | -e 's/^\(\[ FAILED \].*\)$/FAIL: \1/' \ | 8 | -e 's/^\(\[ FAILED \].*\)$/FAIL: \1/' \ |
| 7 | -e 's/^\(\[ SKIPPED \].*\)$/SKIP: \1/' | 9 | -e 's/^\(\[ SKIPPED \].*\)$/SKIP: \1/' |
| 8 | done | 10 | done |
| 11 | |||
| 12 | # Run crypto loopback integration test | ||
| 13 | if [ -f ./t_lpback.sh ]; then | ||
| 14 | sh ./t_lpback.sh 2>&1 | ||
| 15 | if [ $? -eq 0 ]; then | ||
| 16 | echo "PASS: t_lpback" | ||
| 17 | else | ||
| 18 | echo "FAIL: t_lpback" | ||
| 19 | fi | ||
| 20 | fi | ||
diff --git a/meta-networking/recipes-support/openvpn/openvpn_2.6.17.bb b/meta-networking/recipes-support/openvpn/openvpn_2.7.0.bb index c454a93276..6ddebde4d1 100644 --- a/meta-networking/recipes-support/openvpn/openvpn_2.6.17.bb +++ b/meta-networking/recipes-support/openvpn/openvpn_2.7.0.bb | |||
| @@ -2,20 +2,21 @@ SUMMARY = "A full-featured SSL VPN solution via tun device." | |||
| 2 | HOMEPAGE = "https://openvpn.net/" | 2 | HOMEPAGE = "https://openvpn.net/" |
| 3 | SECTION = "net" | 3 | SECTION = "net" |
| 4 | LICENSE = "GPL-2.0-only" | 4 | LICENSE = "GPL-2.0-only" |
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=89196bacc47ed37a5b242a535661a049" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=924af2c382c415a0a68d0d9e7b483d23" |
| 6 | DEPENDS = "lzo lz4 openssl libcap-ng ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} ${@bb.utils.contains('PTEST_ENABLED', '1', 'cmocka', '', d)} " | 6 | DEPENDS = "lzo lz4 openssl libcap-ng ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} ${@bb.utils.contains('PTEST_ENABLED', '1', 'cmocka', '', d)} " |
| 7 | 7 | ||
| 8 | inherit autotools systemd update-rc.d pkgconfig ptest | 8 | inherit autotools systemd update-rc.d pkgconfig ptest |
| 9 | 9 | ||
| 10 | SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \ | 10 | SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \ |
| 11 | file://0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch \ | 11 | file://0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch \ |
| 12 | file://0001-tests-skip-test-execution-when-cross-compiling.patch \ | ||
| 12 | file://openvpn \ | 13 | file://openvpn \ |
| 13 | file://run-ptest \ | 14 | file://run-ptest \ |
| 14 | " | 15 | " |
| 15 | 16 | ||
| 16 | UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads" | 17 | UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads" |
| 17 | 18 | ||
| 18 | SRC_URI[sha256sum] = "4cc8e63f710d3001493b13d8a32cf22a214d5e4f71dd37d93831e2fd3208b370" | 19 | SRC_URI[sha256sum] = "2f0e10eb272be61e8fb25fe1cfa20875ff30ac857ef1418000c02290bd6dfa45" |
| 19 | 20 | ||
| 20 | CVE_STATUS[CVE-2020-27569] = "not-applicable-config: Applies only Aviatrix OpenVPN client, not openvpn" | 21 | CVE_STATUS[CVE-2020-27569] = "not-applicable-config: Applies only Aviatrix OpenVPN client, not openvpn" |
| 21 | 22 | ||
| @@ -46,7 +47,8 @@ PACKAGECONFIG[iproute2] = "--enable-iproute2,,iproute2,iproute2-ip" | |||
| 46 | PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" | 47 | PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" |
| 47 | PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" | 48 | PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" |
| 48 | 49 | ||
| 49 | RDEPENDS:${PN}-ptest:append = " make bash" | 50 | RDEPENDS:${PN}-dns-updown:append = " bash" |
| 51 | RDEPENDS:${PN}-ptest:append = " bash" | ||
| 50 | 52 | ||
| 51 | do_install:append() { | 53 | do_install:append() { |
| 52 | install -d ${D}/${sysconfdir}/init.d | 54 | install -d ${D}/${sysconfdir}/init.d |
| @@ -70,21 +72,21 @@ do_install:append() { | |||
| 70 | } | 72 | } |
| 71 | 73 | ||
| 72 | do_compile_ptest () { | 74 | do_compile_ptest () { |
| 73 | for x in `find ${B}/tests/unit_tests -name Makefile -exec grep -l buildtest-TESTS {} \;`; do | 75 | for x in `find ${B}/tests/unit_tests -name Makefile -exec grep -l check_PROGRAMS {} \;`; do |
| 74 | dir=`dirname ${x}` | 76 | dir=`dirname ${x}` |
| 75 | case $dir in | 77 | case $dir in |
| 76 | *example*) | 78 | *example*) |
| 77 | echo "Skipping directory: $dir" | 79 | echo "Skipping directory: $dir" |
| 78 | ;; | 80 | ;; |
| 79 | *) | 81 | *) |
| 80 | oe_runmake -C ${dir} buildtest-TESTS | 82 | oe_runmake -C ${dir} check-am |
| 81 | ;; | 83 | ;; |
| 82 | esac | 84 | esac |
| 83 | done | 85 | done |
| 84 | } | 86 | } |
| 85 | 87 | ||
| 86 | do_install_ptest() { | 88 | do_install_ptest() { |
| 87 | for x in $(find ${B}/tests/unit_tests -name Makefile -exec grep -l buildtest-TESTS {} \;); do | 89 | for x in $(find ${B}/tests/unit_tests -name Makefile -exec grep -l check_PROGRAMS {} \;); do |
| 88 | dir=$(dirname ${x}) | 90 | dir=$(dirname ${x}) |
| 89 | 91 | ||
| 90 | if [[ "$dir" == *example* ]]; then | 92 | if [[ "$dir" == *example* ]]; then |
| @@ -93,31 +95,35 @@ do_install_ptest() { | |||
| 93 | 95 | ||
| 94 | target_dir="${D}/${PTEST_PATH}/unit_tests/$(basename ${dir})" | 96 | target_dir="${D}/${PTEST_PATH}/unit_tests/$(basename ${dir})" |
| 95 | mkdir -p ${target_dir} | 97 | mkdir -p ${target_dir} |
| 96 | cp -f ${dir}/Makefile ${target_dir}/ | ||
| 97 | sed -i "s/^Makefile:/MM:/g" ${target_dir}/Makefile | ||
| 98 | sed -i 's/^#TESTS = $(am__EXEEXT_4)/TESTS = $(am__EXEEXT_4)/' ${target_dir}/Makefile | ||
| 99 | 98 | ||
| 100 | for testfile in $(find ${dir} -name "*testdriver"); do | 99 | for testfile in $(find ${dir} -name "*testdriver" -type f -executable); do |
| 101 | cp -rf ${testfile} ${target_dir}/ | 100 | cp -rf ${testfile} ${target_dir}/ |
| 102 | done | 101 | done |
| 103 | done | 102 | done |
| 104 | sed -i 's|find ./|find ${PTEST_PATH}|g' ${D}${PTEST_PATH}/run-ptest | 103 | |
| 104 | # Install test input data files needed by user_pass and misc tests | ||
| 105 | cp -rf ${S}/tests/unit_tests/openvpn/input ${D}/${PTEST_PATH}/unit_tests/openvpn/ | ||
| 106 | |||
| 107 | # Install COPYRIGHT.GPL needed by test_list | ||
| 108 | # test_list references srcdir/../../../COPYRIGHT.GPL | ||
| 109 | # srcdir=./unit_tests/openvpn -> resolves to ../COPYRIGHT.GPL from ptest cwd | ||
| 110 | # which is ${libdir}/openvpn/COPYRIGHT.GPL | ||
| 111 | cp -f ${S}/COPYRIGHT.GPL ${D}/${libdir}/openvpn/ | ||
| 112 | |||
| 105 | sed -i 's|${top_builddir}/src/openvpn|${sbindir}|g' ${S}/tests/t_lpback.sh | 113 | sed -i 's|${top_builddir}/src/openvpn|${sbindir}|g' ${S}/tests/t_lpback.sh |
| 106 | cp -f ${S}/tests/t_lpback.sh ${D}/${PTEST_PATH} | 114 | cp -f ${S}/tests/t_lpback.sh ${D}/${PTEST_PATH} |
| 107 | cp -f ${B}/tests/Makefile ${D}/${PTEST_PATH} | ||
| 108 | sed -i "s/^Makefile:/MM:/g" ${D}/${PTEST_PATH}/Makefile | ||
| 109 | sed -i "s/^test_scripts = t_client.sh t_lpback.sh t_cltsrv.sh/test_scripts = t_lpback.sh/g" ${D}/${PTEST_PATH}/Makefile | ||
| 110 | |||
| 111 | } | 115 | } |
| 112 | 116 | ||
| 113 | PACKAGES =+ " ${PN}-sample " | 117 | PACKAGES =+ " ${PN}-dns-updown ${PN}-sample " |
| 114 | 118 | ||
| 115 | RRECOMMENDS:${PN} = "kernel-module-tun" | 119 | RRECOMMENDS:${PN} = "kernel-module-tun" |
| 116 | 120 | ||
| 117 | FILES:${PN}-dbg += "${libdir}/openvpn/plugins/.debug" | 121 | FILES:${PN}-dbg += "${libdir}/openvpn/plugins/.debug" |
| 122 | FILES:${PN}-ptest += "${libdir}/openvpn/COPYRIGHT.GPL" | ||
| 118 | FILES:${PN} += "${systemd_system_unitdir}/openvpn-server@.service \ | 123 | FILES:${PN} += "${systemd_system_unitdir}/openvpn-server@.service \ |
| 119 | ${systemd_system_unitdir}/openvpn-client@.service \ | 124 | ${systemd_system_unitdir}/openvpn-client@.service \ |
| 120 | ${nonarch_libdir}/tmpfiles.d \ | 125 | ${nonarch_libdir}/tmpfiles.d \ |
| 121 | " | 126 | " |
| 127 | FILES:${PN}-dns-updown = "${libexecdir}/openvpn/dns-updown" | ||
| 122 | FILES:${PN}-sample = "${sysconfdir}/openvpn/sample/ \ | 128 | FILES:${PN}-sample = "${sysconfdir}/openvpn/sample/ \ |
| 123 | " | 129 | " |
diff --git a/meta-networking/recipes-support/pgpool2/pgpool2_4.6.4.bb b/meta-networking/recipes-support/pgpool2/pgpool2_4.6.6.bb index 0d7f1e0342..668e506831 100644 --- a/meta-networking/recipes-support/pgpool2/pgpool2_4.6.4.bb +++ b/meta-networking/recipes-support/pgpool2/pgpool2_4.6.6.bb | |||
| @@ -10,13 +10,13 @@ HOMEPAGE = "https://pgpool.net" | |||
| 10 | LICENSE = "BSD-2-Clause" | 10 | LICENSE = "BSD-2-Clause" |
| 11 | LIC_FILES_CHKSUM = "file://COPYING;md5=e4b38de086d73e0521de0bbdbaa4a1a9" | 11 | LIC_FILES_CHKSUM = "file://COPYING;md5=e4b38de086d73e0521de0bbdbaa4a1a9" |
| 12 | 12 | ||
| 13 | SRC_URI = "https://www.pgpool.net/mediawiki/images/pgpool-II-${PV}.tar.gz \ | 13 | SRC_URI = "https://www.pgpool.net/source/pgpool-II-${PV}.tar.gz \ |
| 14 | file://0001-Fix-build-error-when-build-this-file.patch \ | 14 | file://0001-Fix-build-error-when-build-this-file.patch \ |
| 15 | file://define_SIGNAL_ARGS.patch \ | 15 | file://define_SIGNAL_ARGS.patch \ |
| 16 | file://pgpool.sysconfig \ | 16 | file://pgpool.sysconfig \ |
| 17 | file://pgpool.service \ | 17 | file://pgpool.service \ |
| 18 | " | 18 | " |
| 19 | SRC_URI[sha256sum] = "ef0d2e91a9a11d737c6476247219e679f718bec53550646189594ef9aefd298d" | 19 | SRC_URI[sha256sum] = "a4021c06b9fbdca975e62bf15a54d93e1b38854c53b5ad9d53cd082ec185dad0" |
| 20 | 20 | ||
| 21 | S = "${UNPACKDIR}/pgpool-II-${PV}" | 21 | S = "${UNPACKDIR}/pgpool-II-${PV}" |
| 22 | 22 | ||
diff --git a/meta-networking/recipes-support/ruli/files/0001-Make-space-for-flags-from-environment.patch b/meta-networking/recipes-support/ruli/files/0001-Make-space-for-flags-from-environment.patch index c3ca07a390..739d7f797e 100644 --- a/meta-networking/recipes-support/ruli/files/0001-Make-space-for-flags-from-environment.patch +++ b/meta-networking/recipes-support/ruli/files/0001-Make-space-for-flags-from-environment.patch | |||
| @@ -12,8 +12,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
| 12 | src/Makefile | 8 ++++---- | 12 | src/Makefile | 8 ++++---- |
| 13 | 2 files changed, 14 insertions(+), 14 deletions(-) | 13 | 2 files changed, 14 insertions(+), 14 deletions(-) |
| 14 | 14 | ||
| 15 | diff --git a/sample/Makefile b/sample/Makefile | ||
| 16 | index 15cafd9..d83641f 100644 | ||
| 17 | --- a/sample/Makefile | 15 | --- a/sample/Makefile |
| 18 | +++ b/sample/Makefile | 16 | +++ b/sample/Makefile |
| 19 | @@ -35,9 +35,9 @@ ifeq ($(PLATFORM),SunOS) | 17 | @@ -35,9 +35,9 @@ ifeq ($(PLATFORM),SunOS) |
| @@ -50,13 +48,23 @@ index 15cafd9..d83641f 100644 | |||
| 50 | 48 | ||
| 51 | %.o: %.c | 49 | %.o: %.c |
| 52 | $(CC) $(ARCH) $(CPPFLAGS) $(CFLAGS) -c $< | 50 | $(CC) $(ARCH) $(CPPFLAGS) $(CFLAGS) -c $< |
| 53 | diff --git a/src/Makefile b/src/Makefile | ||
| 54 | index 9b56b5e..39a5ea1 100644 | ||
| 55 | --- a/src/Makefile | 51 | --- a/src/Makefile |
| 56 | +++ b/src/Makefile | 52 | +++ b/src/Makefile |
| 57 | @@ -45,7 +45,7 @@ endif | 53 | @@ -2,7 +2,7 @@ |
| 54 | # $Id: Makefile,v 1.57 2005/06/13 16:34:53 evertonm Exp $ | ||
| 55 | # | ||
| 58 | 56 | ||
| 59 | WARN = -pedantic -ansi -Wshadow -Wpointer-arith -Wcast-qual \ | 57 | -#DEBUG += -DRULI_SRV_DEBUG |
| 58 | +#DEBUG += -DRULI_SRV_DEBUG | ||
| 59 | #DEBUG += -DRULI_HOST_DEBUG | ||
| 60 | #DEBUG += -DRULI_RES_DEBUG | ||
| 61 | #DEBUG += -DRULI_TXT_COMPARE_DEBUG | ||
| 62 | @@ -43,9 +43,9 @@ ifeq ($(PLATFORM),SunOS) | ||
| 63 | DEFINE_SOLARIS = -D_RULI_SOLARIS_ | ||
| 64 | endif | ||
| 65 | |||
| 66 | -WARN = -pedantic -ansi -Wshadow -Wpointer-arith -Wcast-qual \ | ||
| 67 | +WARN = -Wshadow -Wpointer-arith -Wcast-qual \ | ||
| 60 | -Wcast-align -Wwrite-strings -Wredundant-decls | 68 | -Wcast-align -Wwrite-strings -Wredundant-decls |
| 61 | -CC = gcc | 69 | -CC = gcc |
| 62 | +CC ?= gcc | 70 | +CC ?= gcc |
| @@ -72,7 +80,7 @@ index 9b56b5e..39a5ea1 100644 | |||
| 72 | LIBOBJ = ruli_isaac.o ruli_mem.o ruli_rand.o ruli_util.o ruli_list.o \ | 80 | LIBOBJ = ruli_isaac.o ruli_mem.o ruli_rand.o ruli_util.o ruli_list.o \ |
| 73 | ruli_addr.o ruli_sock.o ruli_txt.o ruli_msg.o ruli_fsm.o \ | 81 | ruli_addr.o ruli_sock.o ruli_txt.o ruli_msg.o ruli_fsm.o \ |
| 74 | ruli_res.o ruli_parse.o ruli_host.o ruli_srv.o ruli_conf.o \ | 82 | ruli_res.o ruli_parse.o ruli_host.o ruli_srv.o ruli_conf.o \ |
| 75 | @@ -66,7 +66,7 @@ LIBOBJ = ruli_isaac.o ruli_mem.o ruli_rand.o ruli_util.o ruli_list.o \ | 83 | @@ -66,7 +66,7 @@ LIBOBJ = ruli_isaac.o ruli_mem.o ruli_ra |
| 76 | ruli_getaddrinfo.o | 84 | ruli_getaddrinfo.o |
| 77 | SHAREDOBJ = $(LIBOBJ:%.o=%.os) | 85 | SHAREDOBJ = $(LIBOBJ:%.o=%.os) |
| 78 | SONAME = libruli.so.4 | 86 | SONAME = libruli.so.4 |
| @@ -90,6 +98,3 @@ index 9b56b5e..39a5ea1 100644 | |||
| 90 | @echo | 98 | @echo |
| 91 | @echo "REMINDER:" | 99 | @echo "REMINDER:" |
| 92 | @echo "Add $(INSTALL_LIB_DIR) to your dynamic loader path:" | 100 | @echo "Add $(INSTALL_LIB_DIR) to your dynamic loader path:" |
| 93 | -- | ||
| 94 | 2.24.0 | ||
| 95 | |||
diff --git a/meta-networking/recipes-support/ruli/ruli_0.36.bb b/meta-networking/recipes-support/ruli/ruli_0.36.bb index 0526f842a8..972184ae2c 100644 --- a/meta-networking/recipes-support/ruli/ruli_0.36.bb +++ b/meta-networking/recipes-support/ruli/ruli_0.36.bb | |||
| @@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "11d32def5b514748fbd9ea8c88049ae99e1bb358efc74eb91a4d268a39 | |||
| 20 | 20 | ||
| 21 | # -shared is passed via CFLAGS, clang complains since its used during linking | 21 | # -shared is passed via CFLAGS, clang complains since its used during linking |
| 22 | # and not compiling | 22 | # and not compiling |
| 23 | CFLAGS:append:toolchain-clang = " -Wno-error=unused-command-line-argument" | 23 | CFLAGS:append:toolchain-clang = " -std=gnu11 -Wno-error=unused-command-line-argument" |
| 24 | 24 | ||
| 25 | EXTRA_OEMAKE = 'CC="${CC}" CPPFLAGS="${CFLAGS}" OOP_BASE_DIR="${STAGING_EXECPREFIXDIR}" \ | 25 | EXTRA_OEMAKE = 'CC="${CC}" CPPFLAGS="${CFLAGS}" OOP_BASE_DIR="${STAGING_EXECPREFIXDIR}" \ |
| 26 | INSTALL_BASE_DIR="${D}${exec_prefix}" \ | 26 | INSTALL_BASE_DIR="${D}${exec_prefix}" \ |
diff --git a/meta-networking/recipes-support/strongswan/strongswan_6.0.4.bb b/meta-networking/recipes-support/strongswan/strongswan_6.0.6.bb index 2587722b6d..daa6552899 100644 --- a/meta-networking/recipes-support/strongswan/strongswan_6.0.4.bb +++ b/meta-networking/recipes-support/strongswan/strongswan_6.0.6.bb | |||
| @@ -10,7 +10,7 @@ DEPENDS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', ' tpm2-tss', | |||
| 10 | 10 | ||
| 11 | SRC_URI = "https://download.strongswan.org/strongswan-${PV}.tar.bz2" | 11 | SRC_URI = "https://download.strongswan.org/strongswan-${PV}.tar.bz2" |
| 12 | 12 | ||
| 13 | SRC_URI[sha256sum] = "79576bb61b9a406cea9eb73d0c565cc6254a6b6d2e7198f44758d2d7c61a7aec" | 13 | SRC_URI[sha256sum] = "07df7cedae56a7f3bb07e66d21a1f9f87e961db70e99184e11d3819413e4f87c" |
| 14 | 14 | ||
| 15 | UPSTREAM_CHECK_REGEX = "strongswan-(?P<pver>\d+(\.\d+)+)\.tar" | 15 | UPSTREAM_CHECK_REGEX = "strongswan-(?P<pver>\d+(\.\d+)+)\.tar" |
| 16 | 16 | ||
| @@ -48,7 +48,7 @@ PACKAGECONFIG[pkcs12] = "--enable-pkcs12,--disable-pkcs12,,${PN}-plugin-pkcs12" | |||
| 48 | PACKAGECONFIG[rc2] = "--enable-rc2,--disable-rc2,,${PN}-plugin-rc2" | 48 | PACKAGECONFIG[rc2] = "--enable-rc2,--disable-rc2,,${PN}-plugin-rc2" |
| 49 | PACKAGECONFIG[sha1] = "--enable-sha1,--disable-sha1,,${PN}-plugin-sha1" | 49 | PACKAGECONFIG[sha1] = "--enable-sha1,--disable-sha1,,${PN}-plugin-sha1" |
| 50 | PACKAGECONFIG[sha2] = "--enable-sha2,--disable-sha2,,${PN}-plugin-sha2" | 50 | PACKAGECONFIG[sha2] = "--enable-sha2,--disable-sha2,,${PN}-plugin-sha2" |
| 51 | PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4,${PN}-plugin-soup" | 51 | PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup,${PN}-plugin-soup" |
| 52 | PACKAGECONFIG[sqlite3] = "--enable-sqlite,--disable-sqlite,sqlite3,${PN}-plugin-sqlite" | 52 | PACKAGECONFIG[sqlite3] = "--enable-sqlite,--disable-sqlite,sqlite3,${PN}-plugin-sqlite" |
| 53 | PACKAGECONFIG[stroke] = "--enable-stroke,--disable-stroke,,${PN}-plugin-stroke" | 53 | PACKAGECONFIG[stroke] = "--enable-stroke,--disable-stroke,,${PN}-plugin-stroke" |
| 54 | PACKAGECONFIG[swanctl] = "--enable-swanctl,--disable-swanctl,,libgcc" | 54 | PACKAGECONFIG[swanctl] = "--enable-swanctl,--disable-swanctl,,libgcc" |
| @@ -189,3 +189,5 @@ SYSTEMD_SERVICE:${PN} = " \ | |||
| 189 | ${@bb.utils.contains('PACKAGECONFIG', 'swanctl', '${BPN}.service', '', d)} \ | 189 | ${@bb.utils.contains('PACKAGECONFIG', 'swanctl', '${BPN}.service', '', d)} \ |
| 190 | ${@bb.utils.contains('PACKAGECONFIG', 'charon', '${BPN}-starter.service', '', d)} \ | 190 | ${@bb.utils.contains('PACKAGECONFIG', 'charon', '${BPN}-starter.service', '', d)} \ |
| 191 | " | 191 | " |
| 192 | |||
| 193 | CVE_STATUS[CVE-2026-25075] = "fixed-version: fixed in 6.0.5" | ||
diff --git a/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch b/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch index 3520bf429e..0e94a969c0 100644 --- a/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch +++ b/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From e08b9760d319d0334f2aad02d32d791c8ebd8564 Mon Sep 17 00:00:00 2001 | 1 | From 08b1bf417be039b097fae25708861fe8184c739c Mon Sep 17 00:00:00 2001 |
| 2 | From: Kai Kang <kai.kang@windriver.com> | 2 | From: Kai Kang <kai.kang@windriver.com> |
| 3 | Date: Wed, 1 Nov 2017 09:23:41 -0400 | 3 | Date: Wed, 1 Nov 2017 09:23:41 -0400 |
| 4 | Subject: [PATCH] stunnel: fix compile error when openssl disable des support | 4 | Subject: [PATCH] stunnel: fix compile error when openssl disable des support |
| @@ -17,10 +17,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com> | |||
| 17 | 2 files changed, 5 insertions(+), 3 deletions(-) | 17 | 2 files changed, 5 insertions(+), 3 deletions(-) |
| 18 | 18 | ||
| 19 | diff --git a/src/common.h b/src/common.h | 19 | diff --git a/src/common.h b/src/common.h |
| 20 | index c2229d0..5eaee8c 100644 | 20 | index ada7ff7..8484144 100644 |
| 21 | --- a/src/common.h | 21 | --- a/src/common.h |
| 22 | +++ b/src/common.h | 22 | +++ b/src/common.h |
| 23 | @@ -497,7 +497,9 @@ extern char *sys_errlist[]; | 23 | @@ -489,7 +489,9 @@ extern char *sys_errlist[]; |
| 24 | #ifndef OPENSSL_NO_MD4 | 24 | #ifndef OPENSSL_NO_MD4 |
| 25 | #include <openssl/md4.h> | 25 | #include <openssl/md4.h> |
| 26 | #endif /* !defined(OPENSSL_NO_MD4) */ | 26 | #endif /* !defined(OPENSSL_NO_MD4) */ |
| @@ -29,9 +29,9 @@ index c2229d0..5eaee8c 100644 | |||
| 29 | +#endif | 29 | +#endif |
| 30 | #ifndef OPENSSL_NO_DH | 30 | #ifndef OPENSSL_NO_DH |
| 31 | #include <openssl/dh.h> | 31 | #include <openssl/dh.h> |
| 32 | #if OPENSSL_VERSION_NUMBER<0x10100000L | 32 | #endif /* !defined(OPENSSL_NO_DH) */ |
| 33 | diff --git a/src/protocol.c b/src/protocol.c | 33 | diff --git a/src/protocol.c b/src/protocol.c |
| 34 | index c390a6f..7aca745 100644 | 34 | index cddc381..ae0f374 100644 |
| 35 | --- a/src/protocol.c | 35 | --- a/src/protocol.c |
| 36 | +++ b/src/protocol.c | 36 | +++ b/src/protocol.c |
| 37 | @@ -82,7 +82,7 @@ NOEXPORT void ldap_client_middle(CLI *); | 37 | @@ -82,7 +82,7 @@ NOEXPORT void ldap_client_middle(CLI *); |
| @@ -43,7 +43,7 @@ index c390a6f..7aca745 100644 | |||
| 43 | NOEXPORT void ntlm(CLI *); | 43 | NOEXPORT void ntlm(CLI *); |
| 44 | NOEXPORT char *ntlm1(void); | 44 | NOEXPORT char *ntlm1(void); |
| 45 | NOEXPORT char *ntlm3(char *, char *, char *, char *); | 45 | NOEXPORT char *ntlm3(char *, char *, char *, char *); |
| 46 | @@ -1391,7 +1391,7 @@ NOEXPORT void connect_client_middle(CLI *c) { | 46 | @@ -1392,7 +1392,7 @@ NOEXPORT void connect_client_middle(CLI *c) { |
| 47 | fd_printf(c, c->remote_fd.fd, "Host: %s", c->opt->protocol_host); | 47 | fd_printf(c, c->remote_fd.fd, "Host: %s", c->opt->protocol_host); |
| 48 | if(c->opt->protocol_username && c->opt->protocol_password) { | 48 | if(c->opt->protocol_username && c->opt->protocol_password) { |
| 49 | if(!strcasecmp(c->opt->protocol_authentication, "ntlm")) { | 49 | if(!strcasecmp(c->opt->protocol_authentication, "ntlm")) { |
| @@ -52,7 +52,7 @@ index c390a6f..7aca745 100644 | |||
| 52 | ntlm(c); | 52 | ntlm(c); |
| 53 | #else | 53 | #else |
| 54 | s_log(LOG_ERR, "NTLM authentication is not available"); | 54 | s_log(LOG_ERR, "NTLM authentication is not available"); |
| 55 | @@ -1434,7 +1434,7 @@ NOEXPORT void connect_client_middle(CLI *c) { | 55 | @@ -1435,7 +1435,7 @@ NOEXPORT void connect_client_middle(CLI *c) { |
| 56 | str_free(line); | 56 | str_free(line); |
| 57 | } | 57 | } |
| 58 | 58 | ||
diff --git a/meta-networking/recipes-support/stunnel/stunnel_5.77.bb b/meta-networking/recipes-support/stunnel/stunnel_5.78.bb index 954fa896ba..1740ad41f2 100644 --- a/meta-networking/recipes-support/stunnel/stunnel_5.77.bb +++ b/meta-networking/recipes-support/stunnel/stunnel_5.78.bb | |||
| @@ -3,7 +3,7 @@ DESCRIPTION = "SSL encryption wrapper between remote client and local (inetd-sta | |||
| 3 | HOMEPAGE = "https://www.stunnel.org/" | 3 | HOMEPAGE = "https://www.stunnel.org/" |
| 4 | SECTION = "net" | 4 | SECTION = "net" |
| 5 | LICENSE = "GPL-2.0-or-later" | 5 | LICENSE = "GPL-2.0-or-later" |
| 6 | LIC_FILES_CHKSUM = "file://COPYING.md;md5=1e4388407e163ad0cde171362f9a7b94" | 6 | LIC_FILES_CHKSUM = "file://COPYING.md;md5=df2a0f88c5d5e3ebce922682a7b598ec" |
| 7 | 7 | ||
| 8 | DEPENDS = "autoconf-archive libnsl2 openssl" | 8 | DEPENDS = "autoconf-archive libnsl2 openssl" |
| 9 | 9 | ||
| @@ -11,7 +11,7 @@ SRC_URI = "https://stunnel.org/archive/5.x/${BP}.tar.gz \ | |||
| 11 | file://fix-openssl-no-des.patch \ | 11 | file://fix-openssl-no-des.patch \ |
| 12 | " | 12 | " |
| 13 | 13 | ||
| 14 | SRC_URI[sha256sum] = "ec026f4fae4e0d25b940cc7a9451d925e359e7fd59e9edad20baea66ce45f263" | 14 | SRC_URI[sha256sum] = "8727e53bb8b7528f850327a2a149158422c02183bc120d1d733cc65b1e2c349d" |
| 15 | 15 | ||
| 16 | inherit autotools bash-completion pkgconfig | 16 | inherit autotools bash-completion pkgconfig |
| 17 | 17 | ||
diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2025-63938.patch b/meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2025-63938.patch deleted file mode 100644 index e06e0d3eae..0000000000 --- a/meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2025-63938.patch +++ /dev/null | |||
| @@ -1,43 +0,0 @@ | |||
| 1 | From cee659d2ac1e4e9d1ce388338f46df6c4bae8278 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Fri, 17 Oct 2025 22:57:39 +0000 | ||
| 4 | Subject: [PATCH] reqs: fix integer overflow in port number processing | ||
| 5 | |||
| 6 | From: rofl0r <rofl0r@users.noreply.github.com> | ||
| 7 | |||
| 8 | closes #586 | ||
| 9 | |||
| 10 | CVE: CVE-2025-63938 | ||
| 11 | Upstream-Status: Backport [https://github.com/tinyproxy/tinyproxy/commit/3c0fde94981b025271ffa1788ae425257841bf5a] | ||
| 12 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 13 | --- | ||
| 14 | src/reqs.c | 9 ++++++--- | ||
| 15 | 1 file changed, 6 insertions(+), 3 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/src/reqs.c b/src/reqs.c | ||
| 18 | index a65ed54..1e5895c 100644 | ||
| 19 | --- a/src/reqs.c | ||
| 20 | +++ b/src/reqs.c | ||
| 21 | @@ -174,7 +174,7 @@ static int strip_return_port (char *host) | ||
| 22 | { | ||
| 23 | char *ptr1; | ||
| 24 | char *ptr2; | ||
| 25 | - int port; | ||
| 26 | + unsigned port; | ||
| 27 | |||
| 28 | ptr1 = strrchr (host, ':'); | ||
| 29 | if (ptr1 == NULL) | ||
| 30 | @@ -186,8 +186,11 @@ static int strip_return_port (char *host) | ||
| 31 | return 0; | ||
| 32 | |||
| 33 | *ptr1++ = '\0'; | ||
| 34 | - if (sscanf (ptr1, "%d", &port) != 1) /* one conversion required */ | ||
| 35 | - return 0; | ||
| 36 | + | ||
| 37 | + port = atoi(ptr1); | ||
| 38 | + /* check that port string is in the valid range 1-0xffff) */ | ||
| 39 | + if(strlen(ptr1) > 5 || (port & 0xffff0000)) return 0; | ||
| 40 | + | ||
| 41 | return port; | ||
| 42 | } | ||
| 43 | |||
diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2026-3945-1.patch b/meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2026-3945-1.patch new file mode 100644 index 0000000000..99c4ea705d --- /dev/null +++ b/meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2026-3945-1.patch | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | From 245946bb789c8fc0e4758c344f735a5d53827dce Mon Sep 17 00:00:00 2001 | ||
| 2 | From: rofl0r <rofl0r@users.noreply.github.com> | ||
| 3 | Date: Thu, 12 Mar 2026 14:26:24 +0000 | ||
| 4 | Subject: [PATCH] reqs: check negative length values when reading chunked data | ||
| 5 | |||
| 6 | this could lead to a DoS when a legitimate client reads from an | ||
| 7 | attacker-controlled web server. | ||
| 8 | |||
| 9 | closes #597 | ||
| 10 | |||
| 11 | CVE: CVE-2026-3945 | ||
| 12 | Upstream-Status: Backport [https://github.com/tinyproxy/tinyproxy/commit/969852ccdb1d19d7ed302f0e1d324661be641e0a] | ||
| 13 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 14 | --- | ||
| 15 | src/reqs.c | 1 + | ||
| 16 | 1 file changed, 1 insertion(+) | ||
| 17 | |||
| 18 | diff --git a/src/reqs.c b/src/reqs.c | ||
| 19 | index a562c68..94ce767 100644 | ||
| 20 | --- a/src/reqs.c | ||
| 21 | +++ b/src/reqs.c | ||
| 22 | @@ -613,6 +613,7 @@ static int pull_client_data_chunked (struct conn_s *connptr) { | ||
| 23 | } | ||
| 24 | |||
| 25 | chunklen = strtol (buffer, (char**)0, 16); | ||
| 26 | + if (chunklen < 0) goto ERROR_EXIT; | ||
| 27 | |||
| 28 | if (pull_client_data (connptr, chunklen+2, 0) < 0) | ||
| 29 | goto ERROR_EXIT; | ||
diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2026-3945-2.patch b/meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2026-3945-2.patch new file mode 100644 index 0000000000..3da30b54eb --- /dev/null +++ b/meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2026-3945-2.patch | |||
| @@ -0,0 +1,31 @@ | |||
| 1 | From 8f12872b8e50fe22be0a65ead260ebbedde905cd Mon Sep 17 00:00:00 2001 | ||
| 2 | From: rofl0r <rofl0r@users.noreply.github.com> | ||
| 3 | Date: Sun, 29 Mar 2026 16:48:54 +0200 | ||
| 4 | Subject: [PATCH] reqs: prevent potential int overflow when parsing chunked | ||
| 5 | data (#603) | ||
| 6 | |||
| 7 | follow-up to 969852ccdb1d19d7ed302f0e1d324661be641e0a | ||
| 8 | |||
| 9 | closes #602 | ||
| 10 | |||
| 11 | CVE: CVE-2026-3945 | ||
| 12 | Upstream-Status: Backport [https://github.com/tinyproxy/tinyproxy/commit/bb7edc4778041b3bc8ad7fca448b67d98039cc7d] | ||
| 13 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 14 | --- | ||
| 15 | src/reqs.c | 3 ++- | ||
| 16 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
| 17 | |||
| 18 | diff --git a/src/reqs.c b/src/reqs.c | ||
| 19 | index 94ce767..7aacfd3 100644 | ||
| 20 | --- a/src/reqs.c | ||
| 21 | +++ b/src/reqs.c | ||
| 22 | @@ -613,7 +613,8 @@ static int pull_client_data_chunked (struct conn_s *connptr) { | ||
| 23 | } | ||
| 24 | |||
| 25 | chunklen = strtol (buffer, (char**)0, 16); | ||
| 26 | - if (chunklen < 0) goto ERROR_EXIT; | ||
| 27 | + /* prevent negative or huge values causing overflow */ | ||
| 28 | + if (chunklen < 0 || chunklen > 0x0fffffff) goto ERROR_EXIT; | ||
| 29 | |||
| 30 | if (pull_client_data (connptr, chunklen+2, 0) < 0) | ||
| 31 | goto ERROR_EXIT; | ||
diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.2.bb b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.3.bb index 8558291c18..56e3296066 100644 --- a/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.2.bb +++ b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.3.bb | |||
| @@ -7,10 +7,11 @@ SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.gz | |||
| 7 | file://tinyproxy.service \ | 7 | file://tinyproxy.service \ |
| 8 | file://tinyproxy.conf \ | 8 | file://tinyproxy.conf \ |
| 9 | file://run-ptest \ | 9 | file://run-ptest \ |
| 10 | file://CVE-2025-63938.patch \ | 10 | file://CVE-2026-3945-1.patch \ |
| 11 | file://CVE-2026-3945-2.patch \ | ||
| 11 | " | 12 | " |
| 12 | 13 | ||
| 13 | SRC_URI[sha256sum] = "2c8fe5496f2c642bfd189020504ab98d74b9edbafcdb94d9f108e157b5bdf96d" | 14 | SRC_URI[sha256sum] = "9bcf46db1a2375ff3e3d27a41982f1efec4706cce8899ff9f33323a8218f7592" |
| 14 | 15 | ||
| 15 | UPSTREAM_CHECK_URI = "https://github.com/tinyproxy/tinyproxy/releases" | 16 | UPSTREAM_CHECK_URI = "https://github.com/tinyproxy/tinyproxy/releases" |
| 16 | 17 | ||
diff --git a/meta-networking/recipes-support/unbound/unbound_1.24.2.bb b/meta-networking/recipes-support/unbound/unbound_1.25.1.bb index e41e2dc065..7331fc01d1 100644 --- a/meta-networking/recipes-support/unbound/unbound_1.24.2.bb +++ b/meta-networking/recipes-support/unbound/unbound_1.25.1.bb | |||
| @@ -13,7 +13,7 @@ SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=https;branch=master;t | |||
| 13 | file://run-ptest \ | 13 | file://run-ptest \ |
| 14 | " | 14 | " |
| 15 | 15 | ||
| 16 | SRCREV = "f6269baa605d31859f28770e01a24e3677e5f82c" | 16 | SRCREV = "75b6dba593d4fff000434cd64807c6ebd50bd244" |
| 17 | 17 | ||
| 18 | inherit autotools pkgconfig systemd update-rc.d ptest | 18 | inherit autotools pkgconfig systemd update-rc.d ptest |
| 19 | 19 | ||
diff --git a/meta-networking/recipes-support/vnstat/vnstat_2.6.bb b/meta-networking/recipes-support/vnstat/vnstat_2.13.bb index cf3f41c5a1..6f67777972 100644 --- a/meta-networking/recipes-support/vnstat/vnstat_2.6.bb +++ b/meta-networking/recipes-support/vnstat/vnstat_2.13.bb | |||
| @@ -6,8 +6,7 @@ SECTION = "net" | |||
| 6 | DEPENDS = "gd sqlite3" | 6 | DEPENDS = "gd sqlite3" |
| 7 | 7 | ||
| 8 | SRC_URI = "https://github.com/vergoh/vnstat/releases/download/v${PV}/${BPN}-${PV}.tar.gz" | 8 | SRC_URI = "https://github.com/vergoh/vnstat/releases/download/v${PV}/${BPN}-${PV}.tar.gz" |
| 9 | SRC_URI[md5sum] = "fe2928a81243cc8a532a357f97221736" | 9 | SRC_URI[sha256sum] = "c9fe19312d1ec3ddfbc4672aa951cf9e61ca98dc14cad3d3565f7d9803a6b187" |
| 10 | SRC_URI[sha256sum] = "89276e0a7281943edb554b874078278ad947dc312938a2451e03eb80679f7ff7" | ||
| 11 | 10 | ||
| 12 | inherit autotools pkgconfig systemd | 11 | inherit autotools pkgconfig systemd |
| 13 | 12 | ||
diff --git a/meta-networking/recipes-support/wireshark/wireshark_4.6.4.bb b/meta-networking/recipes-support/wireshark/wireshark_4.6.6.bb index 7ecad4eda8..232cb2058b 100644 --- a/meta-networking/recipes-support/wireshark/wireshark_4.6.4.bb +++ b/meta-networking/recipes-support/wireshark/wireshark_4.6.6.bb | |||
| @@ -31,7 +31,7 @@ SRC_URI:append:class-native = " file://0001-don-t-look-for-iconv.h-for-native-bu | |||
| 31 | 31 | ||
| 32 | UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src/all-versions" | 32 | UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src/all-versions" |
| 33 | 33 | ||
| 34 | SRC_URI[sha256sum] = "fbeab3d85c6c8a5763c8d9b7fe20b5c69ca9f9e7f2b824bedc73135bdca332e2" | 34 | SRC_URI[sha256sum] = "27e7ff780cd68a7466082be82ca26c06a002e74a71646ef3a6e4683e444c1a86" |
| 35 | 35 | ||
| 36 | PE = "1" | 36 | PE = "1" |
| 37 | 37 | ||
