Rebase to upstream 3.2.8

Resolves: RHEL-107671
Signed-off-by: Antonio Torres <antorres@redhat.com>
This commit is contained in:
Antonio Torres 2025-09-02 10:44:48 +02:00
parent cc4614d901
commit c91ab185fb
No known key found for this signature in database
GPG Key ID: 359FAF777296F653
7 changed files with 26 additions and 9282 deletions

1
.gitignore vendored
View File

@ -43,3 +43,4 @@ freeradius-*.src.rpm
/freeradius-server-3.2.2.tar.bz2
/freeradius-server-3.2.3.tar.bz2
/freeradius-server-3.2.5.tar.bz2
/freeradius-server-3.2.8.tar.bz2

View File

@ -9,12 +9,12 @@ Subject: [PATCH] Adjust configuration to fit Red Hat specifics
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/raddb/mods-available/eap b/raddb/mods-available/eap
index 2621e183c..94494b2c6 100644
index 97c7435a7c..26daec88d0 100644
--- a/raddb/mods-available/eap
+++ b/raddb/mods-available/eap
@@ -533,7 +533,7 @@
# You should also delete all of the files
# in the directory when the server starts.
@@ -696,7 +696,7 @@ eap {
# and create the temporary directory with the
# systemd `RuntimeDirectory` unit option.
#
- # tmpdir = /tmp/radiusd
+ # tmpdir = /var/run/radiusd/tmp

View File

@ -12,11 +12,11 @@ Signed-off-by: Antonio Torres <antorres@redhat.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/all.mk b/src/main/all.mk
index f3db386a2a..2517cd215a 100644
index 0251b85800..06c57cf64c 100644
--- a/src/main/all.mk
+++ b/src/main/all.mk
@@ -1,3 +1,3 @@
SUBMAKEFILES := radclient.mk radiusd.mk radsniff.mk radmin.mk radattr.mk \
- radwho.mk radlast.mk radtest.mk radzap.mk checkrad.mk radsecret.mk \
+ radwho.mk radlast.mk radtest.mk radzap.mk checkrad.mk \
libfreeradius-server.mk unittest.mk
libfreeradius-server.mk unittest.mk fuzzer.mk

File diff suppressed because it is too large Load Diff

View File

@ -27,17 +27,17 @@ index 0b2cd74de8..8c623cf95c 100644
#
# For creating documentation via doc/all.mk
diff --git a/configure b/configure
index 5041ca264f..ed01ee2bdd 100755
index 2b82073e9c..ede47569ac 100755
--- a/configure
+++ b/configure
@@ -679,6 +679,7 @@ AUTOCONF
ACLOCAL
@@ -681,6 +681,7 @@ ACLOCAL
LAST
RUSERS
SNMPWALK
+ENABLE_REPRODUCIBLE_BUILDS
SNMPGET
openssl_version_check_config
WITH_DHCP
WITH_RADLAST
@@ -6976,6 +6977,7 @@ fi

View File

@ -1,7 +1,7 @@
Summary: High-performance and highly configurable free RADIUS server
Name: freeradius
Version: 3.2.5
Release: 5%{?dist}
Version: 3.2.8
Release: 1%{?dist}
License: GPL-2.0-or-later AND LGPL-2.0-or-later
URL: http://www.freeradius.org/
@ -29,7 +29,6 @@ Patch5: freeradius-bootstrap-make-permissions.patch
Patch6: freeradius-ldap-infinite-timeout-on-starttls.patch
Patch7: freeradius-ease-openssl-version-check.patch
Patch8: freeradius-configure-c99.patch
Patch9: freeradius-no-antora-docs.patch
Patch10: freeradius-no-sql-scripts.patch
Patch11: freeradius-disable-openssl-engine.patch
Patch12: freeradius-disable-perl-script.patch
@ -217,7 +216,6 @@ This plugin provides the REST support for the FreeRADIUS server project.
%patch 6 -p1
%patch 7 -p1
%patch 8 -p1
%patch 9 -p1
%patch 10 -p1
%patch 11 -p1
%patch 12 -p1
@ -340,6 +338,7 @@ rm $RPM_BUILD_ROOT/%{_libdir}/freeradius/rlm_test.so
# remove unsupported config files
rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/raddb/experimental.conf
rm -rf $RPM_BUILD_ROOT/%{docdir}/antora
# Mongo will never be supported on Fedora or RHEL
rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/raddb/mods-config/sql/ippool/mongo/queries.conf
@ -444,6 +443,7 @@ EOF
%dir %attr(750,root,radiusd) /etc/raddb/mods-config/preprocess
%attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-config/preprocess/*
%attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-config/realm/freeradius-naptr-to-home-server.sh
%attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-config/kafka/messages-json.conf
%dir %attr(750,root,radiusd) /etc/raddb/mods-config/sql
%dir %attr(750,root,radiusd) /etc/raddb/mods-config/sql/counter
@ -557,6 +557,10 @@ EOF
%attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/wimax
%attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/yubikey
%attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/dpsk
%attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/kafka
%attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/kafka_async
%attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/proxy_rate_limit
# mods-enabled
# symlink: /etc/raddb/mods-enabled/xxx -> ../mods-available/xxx
@ -591,6 +595,7 @@ EOF
%config(missingok) /etc/raddb/mods-enabled/unix
%config(missingok) /etc/raddb/mods-enabled/unpack
%config(missingok) /etc/raddb/mods-enabled/utf8
%config(missingok) /etc/raddb/mods-enabled/proxy_rate_limit
# policy
%dir %attr(750,root,radiusd) /etc/raddb/policy.d
@ -684,6 +689,7 @@ EOF
%{_libdir}/freeradius/rlm_yubikey.so
%{_libdir}/freeradius/rlm_dpsk.so
%{_libdir}/freeradius/rlm_eap_teap.so
%{_libdir}/freeradius/rlm_proxy_rate_limit.so
# main man pages
%doc %{_mandir}/man5/clients.conf.5.gz
@ -914,6 +920,10 @@ EOF
%attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest
%changelog
* Tue Sep 02 2025 Antonio Torres <antorres@redhat.com> - 3.2.8-1
- Rebase to release 3.2.8
Resolves: RHEL-107671
* Tue Apr 22 2025 Antonio Torres <antorres@redhat.com> - 3.2.5-5
- Rebuild for OpenSSL 3.5
Resolves: RHEL-88054

View File

@ -1 +1 @@
SHA512 (freeradius-server-3.2.5.tar.bz2) = 55e653630674a957dcd52ae58e5fd7b5a510b84aaa80e0552bce8089221e02f652618b53753f438981472a5f47df7c8426b9a5ecda0b06ad9f4c25b23604c86b
SHA512 (freeradius-server-3.2.8.tar.bz2) = 31db199c3847bfdb80b726e16cece0d660bd741fae0fca8ba96aaaee30972c657438c4e1fdaa7ef070f84d8b7889a8da8db1defc542b0c0e18f247156f17e0ae