From 7d8b3c7e03d46a6122bb7e1fce91060ddad0be7c Mon Sep 17 00:00:00 2001 From: Antonio Torres Date: Mon, 18 Sep 2023 16:58:30 +0200 Subject: [PATCH 1/4] Ease OpenSSL version check requirement FreeRADIUS includes an OpenSSL version check that compares built vs linked version, and fails to start if this check fails. We can ease this requirement in Fedora/RHEL as ABI changes are tracked and soname is changed accordingly, as discussed in previous Bugzilla for this issue [1]. [1]: https://bugzilla.redhat.com/show_bug.cgi?id=1299388 Resolves: #2238511 Signed-off-by: Antonio Torres --- freeradius-ease-openssl-version-check.patch | 35 +++++++++++++++++++++ freeradius.spec | 8 ++++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 freeradius-ease-openssl-version-check.patch diff --git a/freeradius-ease-openssl-version-check.patch b/freeradius-ease-openssl-version-check.patch new file mode 100644 index 0000000..23f1df7 --- /dev/null +++ b/freeradius-ease-openssl-version-check.patch @@ -0,0 +1,35 @@ +From: Antonio Torres +Date: Tue, 12 Sep 2023 +Subject: Ease OpenSSL version check requirement + +FreeRADIUS includes an OpenSSL version check that compares built vs linked version, +and fails to start if this check fails. We can ease this requirement in Fedora/RHEL as +ABI changes are tracked and soname is changed accordingly, as discussed in previous +Bugzilla for this issue [1]. + +[1]: https://bugzilla.redhat.com/show_bug.cgi?id=1299388 + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2238511 +Signed-off-by: Antonio Torres +--- + src/main/version.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/main/version.c b/src/main/version.c +index c190337c1d..fee2150eb2 100644 +--- a/src/main/version.c ++++ b/src/main/version.c +@@ -79,11 +79,11 @@ int ssl_check_consistency(void) + */ + if ((ssl_linked & 0x0000000f) != (ssl_built & 0x0000000f)) { + mismatch: +- ERROR("libssl version mismatch. built: %lx linked: %lx", ++ DEBUG2("libssl version mismatch. built: %lx linked: %lx", + (unsigned long) ssl_built, + (unsigned long) ssl_linked); + +- return -1; ++ return 0; + } + + /* diff --git a/freeradius.spec b/freeradius.spec index d3d9b15..955cdb9 100644 --- a/freeradius.spec +++ b/freeradius.spec @@ -1,7 +1,7 @@ Summary: High-performance and highly configurable free RADIUS server Name: freeradius Version: 3.2.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later URL: http://www.freeradius.org/ @@ -27,6 +27,7 @@ Patch3: freeradius-bootstrap-create-only.patch Patch4: freeradius-no-buildtime-cert-gen.patch Patch5: freeradius-bootstrap-make-permissions.patch Patch6: freeradius-ldap-infinite-timeout-on-starttls.patch +Patch7: freeradius-ease-openssl-version-check.patch %global docdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} @@ -209,6 +210,7 @@ This plugin provides the REST support for the FreeRADIUS server project. %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build # Force compile/link options, extra security for network facing daemon @@ -892,6 +894,10 @@ EOF %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest %changelog +* Mon Sep 18 2023 Antonio Torres - 3.2.2-5 +- Ease OpenSSL version check requirement + Resolves #2238511 + * Wed Jul 19 2023 Fedora Release Engineering - 3.2.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 6522d88fb17e10140fb063743e0b7862cda835f5 Mon Sep 17 00:00:00 2001 From: Antonio Torres Date: Tue, 24 Oct 2023 14:22:32 +0200 Subject: [PATCH 2/4] Update to 3.2.3 upstream release Signed-off-by: Antonio Torres --- .gitignore | 1 + freeradius-no-buildtime-cert-gen.patch | 17 ++++++++--------- freeradius.spec | 7 +++++-- sources | 2 +- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 2000371..860d69f 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ freeradius-*.src.rpm /freeradius-server-3.2.0.tar.bz2 /freeradius-server-3.2.1.tar.bz2 /freeradius-server-3.2.2.tar.bz2 +/freeradius-server-3.2.3.tar.bz2 diff --git a/freeradius-no-buildtime-cert-gen.patch b/freeradius-no-buildtime-cert-gen.patch index 0d55138..b435d82 100644 --- a/freeradius-no-buildtime-cert-gen.patch +++ b/freeradius-no-buildtime-cert-gen.patch @@ -27,10 +27,10 @@ index 0b2cd74de8..8c623cf95c 100644 # # For creating documentation via doc/all.mk diff --git a/configure b/configure -index 77a1436510..74ff9a1fd4 100755 +index 5041ca264f..ed01ee2bdd 100755 --- a/configure +++ b/configure -@@ -652,6 +652,7 @@ AUTOCONF +@@ -679,6 +679,7 @@ AUTOCONF ACLOCAL RUSERS SNMPWALK @@ -38,16 +38,15 @@ index 77a1436510..74ff9a1fd4 100755 SNMPGET openssl_version_check_config WITH_DHCP -@@ -5961,7 +5962,7 @@ else - openssl_version_check_config= - fi +@@ -6976,6 +6977,7 @@ fi + -- -+ENABLE_REPRODUCIBLE_BUILDS=yes # Check whether --enable-reproducible-builds was given. - if test "${enable_reproducible_builds+set}" = set; then : ++ENABLE_REPRODUCIBLE_BUILDS=yes + if test ${enable_reproducible_builds+y} + then : enableval=$enable_reproducible_builds; case "$enableval" in -@@ -5973,6 +5974,7 @@ $as_echo "#define ENABLE_REPRODUCIBLE_BUILDS 1" >>confdefs.h +@@ -6987,6 +6989,7 @@ printf "%s\n" "#define ENABLE_REPRODUCIBLE_BUILDS 1" >>confdefs.h ;; *) reproducible_builds=no diff --git a/freeradius.spec b/freeradius.spec index 955cdb9..0c6fc07 100644 --- a/freeradius.spec +++ b/freeradius.spec @@ -1,7 +1,7 @@ Summary: High-performance and highly configurable free RADIUS server Name: freeradius -Version: 3.2.2 -Release: 5%{?dist} +Version: 3.2.3 +Release: 1%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later URL: http://www.freeradius.org/ @@ -894,6 +894,9 @@ EOF %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest %changelog +* Tue Oct 24 2023 Antonio Torres - 3.2.3-1 +- Update to upstream release 3.2.3 + * Mon Sep 18 2023 Antonio Torres - 3.2.2-5 - Ease OpenSSL version check requirement Resolves #2238511 diff --git a/sources b/sources index 4c58610..284c2d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (freeradius-server-3.2.2.tar.bz2) = 91dc574560a1f75cafa8bc78c0676f0e3dae7154ecbb395e0e1f6738f78d8bcfe1bff122364452798fd0434c4056fd946799b8f29a1141398bf0542a37870689 +SHA512 (freeradius-server-3.2.3.tar.bz2) = 06767153e262a2baa2d0cc74099bc13c23b33c2316348b5dc8ec0f5834c028571bd09b8c01726a6eabeaab8fdc3050f40bfeba2d5b1c299585d1689abad365ce From 7e522d9146d310edee6bd6e02855141c6dbbfe74 Mon Sep 17 00:00:00 2001 From: Antonio Torres Date: Fri, 31 May 2024 09:53:54 +0200 Subject: [PATCH 3/4] Update to 3.2.4 upstream release Signed-off-by: Antonio Torres --- .gitignore | 1 + freeradius.spec | 9 ++++++++- sources | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 860d69f..1eb25d0 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ freeradius-*.src.rpm /freeradius-server-3.2.1.tar.bz2 /freeradius-server-3.2.2.tar.bz2 /freeradius-server-3.2.3.tar.bz2 +/freeradius-server-3.2.4.tar.bz2 diff --git a/freeradius.spec b/freeradius.spec index 0c6fc07..8c31ec0 100644 --- a/freeradius.spec +++ b/freeradius.spec @@ -1,6 +1,6 @@ Summary: High-performance and highly configurable free RADIUS server Name: freeradius -Version: 3.2.3 +Version: 3.2.4 Release: 1%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later URL: http://www.freeradius.org/ @@ -413,6 +413,7 @@ EOF %config(noreplace) /etc/raddb/certs/Makefile %config(noreplace) /etc/raddb/certs/passwords.mk /etc/raddb/certs/README.md +/etc/raddb/certs/realms/README.md %config(noreplace) /etc/raddb/certs/xpextensions %attr(640,root,radiusd) %config(noreplace) /etc/raddb/certs/*.cnf %attr(750,root,radiusd) /etc/raddb/certs/bootstrap @@ -539,6 +540,7 @@ EOF %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/utf8 %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 # mods-enabled # symlink: /etc/raddb/mods-enabled/xxx -> ../mods-available/xxx @@ -664,6 +666,8 @@ EOF %{_libdir}/freeradius/rlm_utf8.so %{_libdir}/freeradius/rlm_wimax.so %{_libdir}/freeradius/rlm_yubikey.so +%{_libdir}/freeradius/rlm_dpsk.so +%{_libdir}/freeradius/rlm_eap_teap.so # main man pages %doc %{_mandir}/man5/clients.conf.5.gz @@ -894,6 +898,9 @@ EOF %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest %changelog +* Fri May 31 2024 Antonio Torres - 3.2.4-1 +- Update to upstream release 3.2.4 + * Tue Oct 24 2023 Antonio Torres - 3.2.3-1 - Update to upstream release 3.2.3 diff --git a/sources b/sources index 284c2d8..9c2d61f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (freeradius-server-3.2.3.tar.bz2) = 06767153e262a2baa2d0cc74099bc13c23b33c2316348b5dc8ec0f5834c028571bd09b8c01726a6eabeaab8fdc3050f40bfeba2d5b1c299585d1689abad365ce +SHA512 (freeradius-server-3.2.4.tar.bz2) = f0a0ebec906d72e44740cf66069cd8d29d93703bfb976dbb1b7ce062eb86cc2977af167577b908677a8dd4a0d9ee708605d08eb2f0f77f6feb5a0b1a244833fb From 31ccf71458a423e40cf24c1fef4f65dd36621f81 Mon Sep 17 00:00:00 2001 From: Antonio Torres Date: Tue, 9 Jul 2024 16:33:22 +0200 Subject: [PATCH 4/4] Update to 3.2.5 Signed-off-by: Antonio Torres --- .gitignore | 1 + freeradius.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1eb25d0..8b82526 100644 --- a/.gitignore +++ b/.gitignore @@ -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.4.tar.bz2 +/freeradius-server-3.2.5.tar.bz2 diff --git a/freeradius.spec b/freeradius.spec index 8c31ec0..5def006 100644 --- a/freeradius.spec +++ b/freeradius.spec @@ -1,6 +1,6 @@ Summary: High-performance and highly configurable free RADIUS server Name: freeradius -Version: 3.2.4 +Version: 3.2.5 Release: 1%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later URL: http://www.freeradius.org/ @@ -898,6 +898,9 @@ EOF %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest %changelog +* Tue Jul 09 2024 Antonio Torres - 3.2.5-1 +- Update to upstream release 3.2.5 + * Fri May 31 2024 Antonio Torres - 3.2.4-1 - Update to upstream release 3.2.4 diff --git a/sources b/sources index 9c2d61f..4768856 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (freeradius-server-3.2.4.tar.bz2) = f0a0ebec906d72e44740cf66069cd8d29d93703bfb976dbb1b7ce062eb86cc2977af167577b908677a8dd4a0d9ee708605d08eb2f0f77f6feb5a0b1a244833fb +SHA512 (freeradius-server-3.2.5.tar.bz2) = 55e653630674a957dcd52ae58e5fd7b5a510b84aaa80e0552bce8089221e02f652618b53753f438981472a5f47df7c8426b9a5ecda0b06ad9f4c25b23604c86b