mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
freeradius: upgrade 3.2.7 -> 3.2.8
ChangeLog: https://github.com/FreeRADIUS/freeradius-server/releases/tag/release_3_2_8 * Add PACKAGECONFIG[kafka] * Drop backport patch 0018-Fix-Service-start-error.patch * Refresh 0013-raddb-certs-Makefile-fix-the-occasional-verification.patch * Drop 0019-freeradius-Remove-files-which-have-license-issues.patch and backport upstream patches to fix license issue[1]. [1] https://github.com/FreeRADIUS/freeradius-server/issues/5664 Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
aa430364a2
commit
b6876c517a
|
|
@ -1,4 +1,4 @@
|
|||
From 38cbab566143b9e002ee24a1f08a52ec74186eca Mon Sep 17 00:00:00 2001
|
||||
From 7ac812c9ba377ba7c40348ea757086c5c01c04df Mon Sep 17 00:00:00 2001
|
||||
From: Mingli Yu <mingli.yu@windriver.com>
|
||||
Date: Wed, 5 Aug 2020 07:23:11 +0000
|
||||
Subject: [PATCH] raddb/certs/Makefile: fix the occasional verification failure
|
||||
|
|
@ -25,11 +25,11 @@ Upstream-Status: Pending
|
|||
|
||||
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
|
||||
---
|
||||
raddb/certs/Makefile | 30 +++++++++++++++---------------
|
||||
1 file changed, 15 insertions(+), 15 deletions(-)
|
||||
raddb/certs/Makefile | 32 ++++++++++++++++----------------
|
||||
1 file changed, 16 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/raddb/certs/Makefile b/raddb/certs/Makefile
|
||||
index cae939668e..52ae65755f 100644
|
||||
index a2f49f72c9..88874309f7 100644
|
||||
--- a/raddb/certs/Makefile
|
||||
+++ b/raddb/certs/Makefile
|
||||
@@ -59,7 +59,7 @@ passwords.mk: server.cnf ca.cnf client.cnf inner-server.cnf
|
||||
|
|
@ -63,7 +63,7 @@ index cae939668e..52ae65755f 100644
|
|||
rm ca-crl.pem
|
||||
|
||||
######################################################################
|
||||
@@ -88,18 +88,18 @@ ca.crl: ca.pem
|
||||
@@ -88,21 +88,21 @@ ca.crl: ca.pem
|
||||
#
|
||||
######################################################################
|
||||
server.csr server.key: server.cnf
|
||||
|
|
@ -79,13 +79,17 @@ index cae939668e..52ae65755f 100644
|
|||
+ @[ -f server.p12 ] || $(OPENSSL) pkcs12 -export -in server.crt -inkey server.key -out server.p12 -passin pass:$(PASSWORD_SERVER) -passout pass:$(PASSWORD_SERVER)
|
||||
chmod g+r server.p12
|
||||
|
||||
server.der: server.pem
|
||||
- $(OPENSSL) x509 -inform PEM -outform DER -in server.pem -out server.der
|
||||
+ @[ -f server.der ] || $(OPENSSL) x509 -inform PEM -outform DER -in server.pem -out server.der
|
||||
|
||||
server.pem: server.p12
|
||||
- $(OPENSSL) pkcs12 -in server.p12 -out server.pem -passin pass:$(PASSWORD_SERVER) -passout pass:$(PASSWORD_SERVER)
|
||||
+ @[ -f server.pem ] || $(OPENSSL) pkcs12 -in server.p12 -out server.pem -passin pass:$(PASSWORD_SERVER) -passout pass:$(PASSWORD_SERVER)
|
||||
chmod g+r server.pem
|
||||
|
||||
.PHONY: server.vrfy
|
||||
@@ -113,19 +113,19 @@ server.vrfy: ca.pem
|
||||
@@ -116,19 +116,19 @@ server.vrfy: ca.pem
|
||||
#
|
||||
######################################################################
|
||||
client.csr client.key: client.cnf
|
||||
|
|
@ -108,7 +112,7 @@ index cae939668e..52ae65755f 100644
|
|||
chmod g+r client.pem
|
||||
cp client.pem $(USER_NAME).pem
|
||||
|
||||
@@ -140,18 +140,18 @@ client.vrfy: ca.pem client.pem
|
||||
@@ -143,18 +143,18 @@ client.vrfy: ca.pem client.pem
|
||||
#
|
||||
######################################################################
|
||||
inner-server.csr inner-server.key: inner-server.cnf
|
||||
|
|
@ -132,5 +136,5 @@ index cae939668e..52ae65755f 100644
|
|||
|
||||
.PHONY: inner-server.vrfy
|
||||
--
|
||||
2.25.1
|
||||
2.34.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
From e97ffc1f820beff12bb8084e6337168a1cd27540 Mon Sep 17 00:00:00 2001
|
||||
From: Liu Yiding <liuyd.fnst@fujitsu.com>
|
||||
Date: Sat, 20 Sep 2025 06:50:17 +0000
|
||||
Subject: [PATCH] Fix Service start error
|
||||
|
||||
change "fips=no" to "-fips"
|
||||
based on discussions with the OpenSSL developers in
|
||||
https://github.com/FreeRADIUS/freeradius-server/issues/5631
|
||||
|
||||
Upstream-Status: Backport
|
||||
https://github.com/FreeRADIUS/freeradius-server/commit/59e262f1134fef8d53d15ae963885a08c9ea8315
|
||||
|
||||
Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
|
||||
---
|
||||
src/main/tls.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/main/tls.c b/src/main/tls.c
|
||||
index 2a348eb9bb..02a4c24f70 100644
|
||||
--- a/src/main/tls.c
|
||||
+++ b/src/main/tls.c
|
||||
@@ -3644,7 +3644,7 @@ int tls_global_init(TLS_UNUSED bool spawn_flag, TLS_UNUSED bool check)
|
||||
CONF_modules_load_file(NULL, NULL, 0);
|
||||
|
||||
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
|
||||
- EVP_set_default_properties(NULL, "fips=no");
|
||||
+ EVP_set_default_properties(NULL, "-fips");
|
||||
#endif
|
||||
|
||||
/*
|
||||
--
|
||||
2.43.0
|
||||
|
||||
|
|
@ -0,0 +1,175 @@
|
|||
From 82d874c638c80fbbf1eca7c51aca095fbbf40024 Mon Sep 17 00:00:00 2001
|
||||
From: "Alan T. DeKok" <aland@freeradius.org>
|
||||
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 <yi.zhao@windriver.com>
|
||||
---
|
||||
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 <legal@networkradius.com>
|
||||
- *
|
||||
- * 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 <legal@networkradius.com>
|
||||
- *
|
||||
- * 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 <legal@networkradius.com>
|
||||
- *
|
||||
- * 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
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,52 @@
|
|||
From a46e81a7764b57983ce6724524f745a06222dc0a Mon Sep 17 00:00:00 2001
|
||||
From: "Alan T. DeKok" <aland@freeradius.org>
|
||||
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 <yi.zhao@windriver.com>
|
||||
---
|
||||
.../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
|
||||
|
||||
|
|
@ -0,0 +1,101 @@
|
|||
From d00440f3290871aef667f80e15f256c64f9b7cd6 Mon Sep 17 00:00:00 2001
|
||||
From: "Alan T. DeKok" <aland@freeradius.org>
|
||||
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 <yi.zhao@windriver.com>
|
||||
---
|
||||
.../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 <legal@networkradius.com>
|
||||
- *
|
||||
- * 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 <legal@networkradius.com>
|
||||
- *
|
||||
- * 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
|
||||
|
||||
|
|
@ -37,13 +37,14 @@ 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-Fix-Service-start-error.patch \
|
||||
file://0019-freeradius-Remove-files-which-have-license-issues.patch \
|
||||
file://0018-update-license-1.patch \
|
||||
file://0019-update-license-2.patch \
|
||||
file://0020-update-license-3.patch \
|
||||
"
|
||||
|
||||
raddbdir = "${sysconfdir}/${MLPREFIX}raddb"
|
||||
|
||||
SRCREV = "694a97dddbdd26423504afe7c530e8e1502b7354"
|
||||
SRCREV = "032be31bb52646171099617928ec1703335bcf73"
|
||||
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "release_(?P<pver>\d+(\_\d+)+)"
|
||||
|
||||
|
|
@ -84,7 +85,6 @@ EXTRA_OECONF = " --enable-strict-dependencies \
|
|||
--without-rlm_securid \
|
||||
--without-rlm_unbound \
|
||||
--without-rlm_python \
|
||||
--without-rlm_eap_teap \
|
||||
ac_cv_path_PERL=${bindir}/perl \
|
||||
ax_cv_cc_builtin_choose_expr=no \
|
||||
ax_cv_cc_builtin_types_compatible_p=no \
|
||||
|
|
@ -113,6 +113,7 @@ PACKAGECONFIG[ruby] = "--with-rlm_ruby,--without-rlm_ruby,ruby"
|
|||
PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl"
|
||||
PACKAGECONFIG[rlm-eap-fast] = "--with-rlm_eap_fast, --without-rlm_eap_fast"
|
||||
PACKAGECONFIG[rlm-eap-pwd] = "--with-rlm_eap_pwd, --without-rlm_eap_pwd"
|
||||
PACKAGECONFIG[kafka] = "--with-rlm_kafka, --without-rlm_kafka, librdkafka"
|
||||
|
||||
inherit useradd autotools-brokensep update-rc.d systemd multilib_script multilib_header
|
||||
|
||||
Loading…
Reference in New Issue
Block a user