diff --git a/meta-networking/recipes-connectivity/freeradius/files/0001-don-t-load-legacy-provider-on-enable-fips-workaround.patch b/meta-networking/recipes-connectivity/freeradius/files/0001-don-t-load-legacy-provider-on-enable-fips-workaround.patch deleted file mode 100644 index 594286cdcf..0000000000 --- a/meta-networking/recipes-connectivity/freeradius/files/0001-don-t-load-legacy-provider-on-enable-fips-workaround.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 2c2c6a460ae8cc655df83c8964595581389676c1 Mon Sep 17 00:00:00 2001 -From: "Alan T. DeKok" -Date: Tue, 9 Sep 2025 07:03:21 -0400 -Subject: [PATCH] don't load legacy provider on --enable-fips-workaround. - Fixes #5644 - -Upstream-Status: Backport -[https://github.com/FreeRADIUS/freeradius-server/commit/2c2c6a460ae8cc655df83c8964595581389676c1] - -Signed-off-by: Yi Zhao ---- - src/main/tls.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/main/tls.c b/src/main/tls.c -index ba267983b1..c04f3228e4 100644 ---- a/src/main/tls.c -+++ b/src/main/tls.c -@@ -64,8 +64,11 @@ USES_APPLE_DEPRECATED_API /* OpenSSL API has been deprecated by Apple */ - # include - - static OSSL_PROVIDER *openssl_default_provider = NULL; -+ -+#ifndef WITH_FIPS - static OSSL_PROVIDER *openssl_legacy_provider = NULL; - #endif -+#endif - - #define LOG_PREFIX "tls" - -@@ -3693,6 +3696,7 @@ int tls_global_init(TLS_UNUSED bool spawn_flag, TLS_UNUSED bool check) - return -1; - } - -+#ifndef WITH_FIPS - /* - * Needed for MD4 - * -@@ -3703,6 +3707,7 @@ int tls_global_init(TLS_UNUSED bool spawn_flag, TLS_UNUSED bool check) - ERROR("(TLS) Failed loading legacy provider"); - return -1; - } -+#endif - #endif - - return 0; -@@ -3777,10 +3782,12 @@ void tls_global_cleanup(void) - } - openssl_default_provider = NULL; - -+#ifndef WITH_FIPS - if (openssl_legacy_provider && !OSSL_PROVIDER_unload(openssl_legacy_provider)) { - ERROR("Failed unloading legacy provider"); - } - openssl_legacy_provider = NULL; -+#endif - #endif - - CONF_modules_unload(1); --- -2.43.0 - diff --git a/meta-networking/recipes-connectivity/freeradius/files/0002-don-t-load-legacy-provider-on-enable-fips-workaround.patch b/meta-networking/recipes-connectivity/freeradius/files/0002-don-t-load-legacy-provider-on-enable-fips-workaround.patch deleted file mode 100644 index 84b78320c4..0000000000 --- a/meta-networking/recipes-connectivity/freeradius/files/0002-don-t-load-legacy-provider-on-enable-fips-workaround.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 2ff8eb44bb626e9e63f9bf06c3bcf3b34291c335 Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Tue, 31 Mar 2026 07:45:16 -0400 -Subject: [PATCH] don't load legacy provider on --enable-fips-workaround. Fixes - #5775 - -Upstream-Status: Backport -[https://github.com/FreeRADIUS/freeradius-server/commit/2ff8eb44bb626e9e63f9bf06c3bcf3b34291c335] - -Signed-off-by: Yi Zhao ---- - src/main/radclient.c | 6 ++++++ - src/modules/rlm_mschap/smbencrypt.c | 6 ++++++ - 2 files changed, 12 insertions(+) - -diff --git a/src/main/radclient.c b/src/main/radclient.c -index ea64486dcf..52555603e1 100644 ---- a/src/main/radclient.c -+++ b/src/main/radclient.c -@@ -168,7 +168,9 @@ static int _rc_request_free(rc_request_t *request) - # include - - static OSSL_PROVIDER *openssl_default_provider = NULL; -+#ifndef WITH_FIPS - static OSSL_PROVIDER *openssl_legacy_provider = NULL; -+#endif - - static int openssl3_init(void) - { -@@ -181,6 +183,7 @@ static int openssl3_init(void) - return -1; - } - -+#ifndef WITH_FIPS - /* - * Needed for MD4 - * -@@ -191,6 +194,7 @@ static int openssl3_init(void) - ERROR("(TLS) Failed loading legacy provider"); - return -1; - } -+#endif - - return 0; - } -@@ -202,10 +206,12 @@ static void openssl3_free(void) - } - openssl_default_provider = NULL; - -+#ifndef WITH_FIPS - if (openssl_legacy_provider && !OSSL_PROVIDER_unload(openssl_legacy_provider)) { - ERROR("Failed unloading legacy provider"); - } - openssl_legacy_provider = NULL; -+#endif - } - #else - #define openssl3_init() -diff --git a/src/modules/rlm_mschap/smbencrypt.c b/src/modules/rlm_mschap/smbencrypt.c -index 9a8a5ab777..531c40ec26 100644 ---- a/src/modules/rlm_mschap/smbencrypt.c -+++ b/src/modules/rlm_mschap/smbencrypt.c -@@ -43,7 +43,9 @@ static char const hex[] = "0123456789ABCDEF"; - # include - - static OSSL_PROVIDER *openssl_default_provider = NULL; -+#ifndef WITH_FIPS - static OSSL_PROVIDER *openssl_legacy_provider = NULL; -+#endif - - #define ERROR(_x) fprintf(stderr, _x) - -@@ -58,6 +60,7 @@ static int openssl3_init(void) - return -1; - } - -+#ifndef WITH_FIPS - /* - * Needed for MD4 - * -@@ -68,6 +71,7 @@ static int openssl3_init(void) - ERROR("(TLS) Failed loading legacy provider"); - return -1; - } -+#endif - - return 0; - } -@@ -79,10 +83,12 @@ static void openssl3_free(void) - } - openssl_default_provider = NULL; - -+#ifndef WITH_FIPS - if (openssl_legacy_provider && !OSSL_PROVIDER_unload(openssl_legacy_provider)) { - ERROR("Failed unloading legacy provider"); - } - openssl_legacy_provider = NULL; -+#endif - } - #else - #define openssl3_init() --- -2.43.0 - 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 @@ -From 0475d948ceab91b22172f0fae3bc01e0a1502ae8 Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Wed, 18 Jan 2017 14:59:39 +0800 -Subject: [PATCH] fix error for expansion of macro in thread.h - -The parameter declaration is missing in expansion of macro -which cause the build error: -| In file included from src/freeradius-devel/libradius.h:80:0, -| from src/lib/log.c:26: -| src/lib/log.c: In function '__fr_thread_local_destroy_fr_strerror_buffer': -| src/lib/log.c:37:31: error: 'fr_strerror_buffer' undeclared (first use in this function) -| fr_thread_local_setup(char *, fr_strerror_buffer) /* macro */ -| ^ - -Add the missing declaration in macro. - -Upstream-Status: Pending - -Signed-off-by: Yi Zhao ---- - src/include/threads.h | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/include/threads.h b/src/include/threads.h -index f2aea776d6..1c4e526797 100644 ---- a/src/include/threads.h -+++ b/src/include/threads.h -@@ -92,7 +92,7 @@ static _t __fr_thread_local_init_##_n(pthread_destructor_t func)\ - # define fr_thread_local_get(_n) _n - #elif defined(HAVE_PTHREAD_H) - # include --# define fr_thread_local_setup(_t, _n) \ -+# define fr_thread_local_setup(_t, _n) static __thread _t _n;\ - static pthread_key_t __fr_thread_local_key_##_n;\ - static pthread_once_t __fr_thread_local_once_##_n = PTHREAD_ONCE_INIT;\ - static pthread_destructor_t __fr_thread_local_destructor_##_n = NULL;\ -@@ -103,17 +103,17 @@ static void __fr_thread_local_destroy_##_n(UNUSED void *unused)\ - static void __fr_thread_local_key_init_##_n(void)\ - {\ - (void) pthread_key_create(&__fr_thread_local_key_##_n, __fr_thread_local_destroy_##_n);\ -- (void) pthread_setspecific(__fr_thread_local_key_##_n, &(_n));\ - }\ - static _t __fr_thread_local_init_##_n(pthread_destructor_t func)\ - {\ - __fr_thread_local_destructor_##_n = func;\ - if (_n) return _n; \ - (void) pthread_once(&__fr_thread_local_once_##_n, __fr_thread_local_key_init_##_n);\ -+ (void) pthread_setspecific(__fr_thread_local_key_##_n, &(_n));\ - return _n;\ - } --# define fr_thread_local_init(_n, _f) __fr_thread_local_init_##_n(_f) --# define fr_thread_local_set(_n, _v) __fr_thread_local_set_##_n(_v) --# define fr_thread_local_get(_n) __fr_thread_local_get_##_n() -+# define fr_thread_local_init(_n, _f) __fr_thread_local_init_##_n(_f) -+# define fr_thread_local_set(_n, _v) ((int)!((_n = _v) || 1)) -+# define fr_thread_local_get(_n) _n - #endif - #endif --- -2.25.1 - 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 @@ -From 82d874c638c80fbbf1eca7c51aca095fbbf40024 Mon Sep 17 00:00:00 2001 -From: "Alan T. DeKok" -Date: Mon, 27 Oct 2025 06:31:22 -0400 -Subject: [PATCH] update license - -Upstream-Status: Backport -[https://github.com/FreeRADIUS/freeradius-server/commit/82d874c638c80fbbf1eca7c51aca095fbbf40024] - -Signed-off-by: Yi Zhao ---- - src/modules/rlm_dpsk/rlm_dpsk.c | 25 +++++++--------- - .../rlm_eap/types/rlm_eap_teap/eap_teap.c | 29 +++++++------------ - .../rlm_eap/types/rlm_eap_teap/eap_teap.h | 29 +++++++------------ - .../rlm_eap/types/rlm_eap_teap/rlm_eap_teap.c | 29 +++++++------------ - 4 files changed, 44 insertions(+), 68 deletions(-) - -diff --git a/src/modules/rlm_dpsk/rlm_dpsk.c b/src/modules/rlm_dpsk/rlm_dpsk.c -index 4b818d08a5..aa07415540 100644 ---- a/src/modules/rlm_dpsk/rlm_dpsk.c -+++ b/src/modules/rlm_dpsk/rlm_dpsk.c -@@ -1,20 +1,17 @@ - /* -- * Copyright (C) 2023 Network RADIUS SARL (legal@networkradius.com) -+ * This program is is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or (at -+ * your option) any later version. - * -- * This software may not be redistributed in any form without the prior -- * written consent of Network RADIUS. -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. - * -- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- * SUCH DAMAGE. -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - - /** -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 -index 20646c5ba1..33512788c2 100644 ---- a/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap.c -+++ b/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap.c -@@ -1,24 +1,17 @@ - /* -- * eap_teap.c contains the interfaces that are called from the main handler -+ * This program is is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or (at -+ * your option) any later version. - * -- * Version: $Id$ -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. - * -- * Copyright (C) 2022 Network RADIUS SARL -- * -- * This software may not be redistributed in any form without the prior -- * written consent of Network RADIUS. -- * -- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- * SUCH DAMAGE. -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - - RCSID("$Id$") -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 -index 59f7835a26..69f4b1ebba 100644 ---- a/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap.h -+++ b/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap.h -@@ -1,24 +1,17 @@ - /* -- * eap_teap.h -+ * This program is is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or (at -+ * your option) any later version. - * -- * Version: $Id$ -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. - * -- * Copyright (C) 2022 Network RADIUS SARL -- * -- * This software may not be redistributed in any form without the prior -- * written consent of Network RADIUS. -- * -- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- * SUCH DAMAGE. -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - #ifndef _EAP_TEAP_H - #define _EAP_TEAP_H -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 -index fcf9717257..13c709b287 100644 ---- 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 -@@ -1,24 +1,17 @@ - /* -- * rlm_eap_teap.c contains the interfaces that are called from eap -+ * This program is is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or (at -+ * your option) any later version. - * -- * Version: $Id$ -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. - * -- * Copyright (C) 2022 Network RADIUS SARL -- * -- * This software may not be redistributed in any form without the prior -- * written consent of Network RADIUS. -- * -- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- * SUCH DAMAGE. -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - - RCSID("$Id$") --- -2.43.0 - 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 @@ -From a46e81a7764b57983ce6724524f745a06222dc0a Mon Sep 17 00:00:00 2001 -From: "Alan T. DeKok" -Date: Tue, 28 Oct 2025 11:33:44 -0400 -Subject: [PATCH] update license - -Upstream-Status: Backport -[https://github.com/FreeRADIUS/freeradius-server/commit/a46e81a7764b57983ce6724524f745a06222dc0a] - -Signed-off-by: Yi Zhao ---- - .../rlm_proxy_rate_limit.c | 25 ++++++++----------- - 1 file changed, 11 insertions(+), 14 deletions(-) - -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 -index 744b14a448..a855273784 100644 ---- a/src/modules/rlm_proxy_rate_limit/rlm_proxy_rate_limit.c -+++ b/src/modules/rlm_proxy_rate_limit/rlm_proxy_rate_limit.c -@@ -1,20 +1,17 @@ - /* -- * Copyright (C) 2024 Network RADIUS SAS (legal@networkradius.com) -+ * This program is is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or (at -+ * your option) any later version. - * -- * This software may not be redistributed in any form without the prior -- * written consent of Network RADIUS. -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. - * -- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- * SUCH DAMAGE. -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - - /** --- -2.43.0 - 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 @@ -From d00440f3290871aef667f80e15f256c64f9b7cd6 Mon Sep 17 00:00:00 2001 -From: "Alan T. DeKok" -Date: Wed, 29 Oct 2025 09:45:17 -0400 -Subject: [PATCH] update license - -Upstream-Status: Backport -[https://github.com/FreeRADIUS/freeradius-server/commit/d00440f3290871aef667f80e15f256c64f9b7cd6] - -Signed-off-by: Yi Zhao ---- - .../types/rlm_eap_teap/eap_teap_crypto.c | 30 +++++++------------ - .../types/rlm_eap_teap/eap_teap_crypto.h | 30 +++++++------------ - 2 files changed, 22 insertions(+), 38 deletions(-) - -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 -index 17f49f9dfc..aaa74837a9 100644 ---- 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 -@@ -1,26 +1,18 @@ - /* -- * teap-crypto.c Cryptographic functions for EAP-TEAP. -+ * This program is is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or (at -+ * your option) any later version. - * -- * Version: $Id$ -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. - * -- * Copyright (C) 2022 Network RADIUS SARL -- * -- * This software may not be redistributed in any form without the prior -- * written consent of Network RADIUS. -- * -- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- * SUCH DAMAGE. -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ -- - RCSID("$Id$") - USES_APPLE_DEPRECATED_API /* OpenSSL API has been deprecated by Apple */ - -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 -index b02f2b9083..f9403dcf93 100644 ---- 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 -@@ -1,26 +1,18 @@ - /* -- * eap_teap_crypto.h -+ * This program is is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or (at -+ * your option) any later version. - * -- * Version: $Id$ -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. - * -- * Copyright (C) 2022 Network RADIUS SARL -- * -- * This software may not be redistributed in any form without the prior -- * written consent of Network RADIUS. -- * -- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- * SUCH DAMAGE. -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ -- - #ifndef _EAP_TEAP_CRYPTO_H - #define _EAP_TEAP_CRYPTO_H - --- -2.43.0 - diff --git a/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.8.bb b/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.8.bb index 4be127209b..d9b0bc9b1e 100644 --- a/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.8.bb +++ b/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.8.bb @@ -15,7 +15,7 @@ DEPENDS = "openssl-native openssl libidn libtool libpcap libtalloc" PATCHTOOL = "git" -SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.2.x;lfs=0;;protocol=https \ +SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.2.x;lfs=0;protocol=https \ file://freeradius \ file://volatiles.58_radiusd \ file://radiusd.service \ @@ -29,7 +29,6 @@ SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.2.x;lfs=0 file://0007-rlm_python-add-PY_INC_DIR-in-search-dir.patch \ file://0008-libtool-do-not-use-jlibtool.patch \ file://0009-Fix-quoting-for-BUILD_WITH.patch \ - file://0010-fix-error-for-expansion-of-macro-in-thread.h.patch \ file://0011-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch \ file://0012-raddb-certs-Makefile-fix-the-existed-certificate-err.patch \ file://0013-raddb-certs-Makefile-fix-the-occasional-verification.patch \ @@ -37,16 +36,13 @@ SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.2.x;lfs=0 file://0015-bootstrap-check-commands-of-openssl-exist.patch \ file://0016-version.c-don-t-print-build-flags.patch \ file://0017-Add-acinclude.m4-to-include-required-macros.patch \ - file://0018-update-license-1.patch \ - file://0019-update-license-2.patch \ - file://0020-update-license-3.patch \ - file://0001-don-t-load-legacy-provider-on-enable-fips-workaround.patch \ - file://0002-don-t-load-legacy-provider-on-enable-fips-workaround.patch \ " raddbdir = "${sysconfdir}/${MLPREFIX}raddb" -SRCREV = "032be31bb52646171099617928ec1703335bcf73" +SRCREV = "4e4cbbd93ff3b469a773c964c7b5b6f53d01457a" + +PV .= "+git" UPSTREAM_CHECK_GITTAGREGEX = "release_(?P\d+(\_\d+)+)" @@ -55,6 +51,8 @@ CVE_STATUS[CVE-2011-4966] = "fixed-version: The CPE in the NVD database doesn't PARALLEL_MAKE = "" +# autoconf 2.73+Clang does not detect it correctly so help out +CFLAGS += "-DTLS_STORAGE_CLASS=__thread" LDFLAGS:append:powerpc = " -latomic" LDFLAGS:append:mipsarch = " -latomic"