Skip to content

Commit 4568ace

Browse files
jykanasekgodara912
andauthored
freeradius : update version to 3.2.5 (microsoft#12201)
Co-authored-by: kgodara912 <[email protected]>
1 parent a79e42f commit 4568ace

10 files changed

+442
-223
lines changed

SPECS-EXTENDED/freeradius/fix-error-for-expansion-of-macro-in-thread.h.patch

Lines changed: 0 additions & 61 deletions
This file was deleted.

SPECS-EXTENDED/freeradius/freeradius-Use-system-crypto-policy-by-default.patch

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,5 @@ index 137fcbc6cc..a65f8a8711 100644
8383
#
8484
# Connection timeout for outgoing TLS connections.
8585
--
86-
2.21.0
86+
2.21.0
87+
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
The backtrace_symbols function expects a pointer to an array of void *
2+
values, not a pointer to an array of a single element. Removing the
3+
address operator ensures that the right type is used.
4+
5+
This avoids an unconditional failure of this probe with compilers that
6+
treat incompatible pointer types as a compilation error.
7+
8+
Submitted upstream: <https://github.com/FreeRADIUS/freeradius-server/pull/5246>
9+
10+
diff --git a/configure b/configure
11+
index ed01ee2bdd912f63..1e6d2284779cdd58 100755
12+
--- a/configure
13+
+++ b/configure
14+
@@ -13390,7 +13390,7 @@ main (void)
15+
{
16+
17+
void *sym[1];
18+
- backtrace_symbols(&sym, sizeof(sym))
19+
+ backtrace_symbols(sym, sizeof(sym))
20+
;
21+
return 0;
22+
}
23+
diff --git a/configure.ac b/configure.ac
24+
index 76320213b51d7bb4..6a689711d6c90483 100644
25+
--- a/configure.ac
26+
+++ b/configure.ac
27+
@@ -2168,7 +2168,7 @@ if test "x$ac_cv_header_execinfo_h" = "xyes"; then
28+
#include <execinfo.h>
29+
]], [[
30+
void *sym[1];
31+
- backtrace_symbols(&sym, sizeof(sym)) ]])],[
32+
+ backtrace_symbols(sym, sizeof(sym)) ]])],[
33+
AC_MSG_RESULT(yes)
34+
ac_cv_lib_execinfo_backtrace_symbols="yes"
35+
],[
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
From: Antonio Torres <[email protected]>
2+
Date: Tue, 12 Sep 2023
3+
Subject: Ease OpenSSL version check requirement
4+
5+
FreeRADIUS includes an OpenSSL version check that compares built vs linked version,
6+
and fails to start if this check fails. We can ease this requirement in Fedora/RHEL as
7+
ABI changes are tracked and soname is changed accordingly, as discussed in previous
8+
Bugzilla for this issue [1].
9+
10+
[1]: https://bugzilla.redhat.com/show_bug.cgi?id=1299388
11+
12+
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2238511
13+
Signed-off-by: Antonio Torres <[email protected]>
14+
---
15+
src/main/version.c | 4 ++--
16+
1 file changed, 2 insertions(+), 2 deletions(-)
17+
18+
diff --git a/src/main/version.c b/src/main/version.c
19+
index c190337c1d..fee2150eb2 100644
20+
--- a/src/main/version.c
21+
+++ b/src/main/version.c
22+
@@ -79,11 +79,11 @@ int ssl_check_consistency(void)
23+
*/
24+
if ((ssl_linked & 0x0000000f) != (ssl_built & 0x0000000f)) {
25+
mismatch:
26+
- ERROR("libssl version mismatch. built: %lx linked: %lx",
27+
+ DEBUG2("libssl version mismatch. built: %lx linked: %lx",
28+
(unsigned long) ssl_built,
29+
(unsigned long) ssl_linked);
30+
31+
- return -1;
32+
+ return 0;
33+
}
34+
35+
/*
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
From: Antonio Torres <[email protected]>
2+
Date: Fri, 28 Jan 2022
3+
Subject: Use infinite timeout when using LDAP+start-TLS
4+
5+
This will ensure that the TLS connection to the LDAP server will complete
6+
before starting FreeRADIUS, as it forces libldap to use a blocking socket during
7+
the process. Infinite timeout is the OpenLDAP default.
8+
Avoids this: https://git.openldap.org/openldap/openldap/-/blob/87ffc60006298069a5a044b8e63dab27a61d3fdf/libraries/libldap/tls2.c#L1134
9+
10+
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1992551
11+
Signed-off-by: Antonio Torres <[email protected]>
12+
---
13+
src/modules/rlm_ldap/ldap.c | 5 ++++-
14+
1 file changed, 4 insertions(+), 1 deletion(-)
15+
16+
diff --git a/src/modules/rlm_ldap/ldap.c b/src/modules/rlm_ldap/ldap.c
17+
index cf7a84e069..841bf888a1 100644
18+
--- a/src/modules/rlm_ldap/ldap.c
19+
+++ b/src/modules/rlm_ldap/ldap.c
20+
@@ -1472,7 +1472,10 @@ void *mod_conn_create(TALLOC_CTX *ctx, void *instance)
21+
}
22+
23+
#ifdef LDAP_OPT_NETWORK_TIMEOUT
24+
- if (inst->net_timeout) {
25+
+ bool using_tls = inst->start_tls ||
26+
+ inst->port == 636 ||
27+
+ strncmp(inst->server, "ldaps://", strlen("ldaps://")) == 0;
28+
+ if (inst->net_timeout && !using_tls) {
29+
memset(&tv, 0, sizeof(tv));
30+
tv.tv_sec = inst->net_timeout;
31+

SPECS-EXTENDED/freeradius/freeradius-no-buildtime-cert-gen.patch

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,26 @@ index 0b2cd74de8..8c623cf95c 100644
2727
#
2828
# For creating documentation via doc/all.mk
2929
diff --git a/configure b/configure
30-
index 77a1436510..74ff9a1fd4 100755
30+
index 5041ca264f..ed01ee2bdd 100755
3131
--- a/configure
3232
+++ b/configure
33-
@@ -652,6 +652,7 @@ AUTOCONF
33+
@@ -679,6 +679,7 @@ AUTOCONF
3434
ACLOCAL
3535
RUSERS
3636
SNMPWALK
3737
+ENABLE_REPRODUCIBLE_BUILDS
3838
SNMPGET
3939
openssl_version_check_config
4040
WITH_DHCP
41-
@@ -5961,7 +5962,7 @@ else
42-
openssl_version_check_config=
43-
fi
41+
@@ -6976,6 +6977,7 @@ fi
42+
4443

45-
-
46-
+ENABLE_REPRODUCIBLE_BUILDS=yes
4744
# Check whether --enable-reproducible-builds was given.
48-
if test "${enable_reproducible_builds+set}" = set; then :
45+
+ENABLE_REPRODUCIBLE_BUILDS=yes
46+
if test ${enable_reproducible_builds+y}
47+
then :
4948
enableval=$enable_reproducible_builds; case "$enableval" in
50-
@@ -5973,6 +5974,7 @@ $as_echo "#define ENABLE_REPRODUCIBLE_BUILDS 1" >>confdefs.h
49+
@@ -6987,6 +6989,7 @@ printf "%s\n" "#define ENABLE_REPRODUCIBLE_BUILDS 1" >>confdefs.h
5150
;;
5251
*)
5352
reproducible_builds=no

SPECS-EXTENDED/freeradius/freeradius.signatures.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"Signatures": {
33
"freeradius-logrotate": "d9f040861ee70def0c6fd6bad8b901503e1b48b5283cd319f72b28c6493ba29d",
44
"freeradius-pam-conf": "5e7dc31dd832ee6365c32bbe8042863ef8381cb1f076dfad72caa2e86d7050d7",
5-
"freeradius-server-3.2.3.tar.bz2": "4a16aeffbfa1424e1f317fdf71d17e5523a4fd9564d87c747a60595ef93c5d1f",
5+
"freeradius-server-3.2.5.tar.bz2": "0fe4f57b28b942c5e5955f48a88769817ca287a830b939d7120ffcff3fcdba88",
66
"freeradius-tmpfiles.conf": "125b30adfdee54a4ae3865e7a75ad71b91c1385190a2d3fb876cf20cfc923a08",
77
"freeradius.sysusers": "313b1c8868c014ae368861a92356818f16fabae594ba6483981097b2d815efe2",
8-
"radiusd.service": "300647599fcd3f96d2a8065dd49bfeab086a6353c6f97bd32edc698e3550e312"
8+
"radiusd.service": "bd5b8c9675a9884e5625a02b12262da30ef6bb84379724593b1d7d2610a02a88"
99
}
1010
}

0 commit comments

Comments
 (0)