From d04d68f8de4bbc99cfa20adbcfdb668e9ab1ff64 Mon Sep 17 00:00:00 2001 From: Antonio Torres Date: Wed, 15 Mar 2023 11:50:38 +0100 Subject: [PATCH 01/33] Migrate to SPDX license Signed-off-by: Antonio Torres --- freeradius.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/freeradius.spec b/freeradius.spec index 331a11d..43c8991 100644 --- a/freeradius.spec +++ b/freeradius.spec @@ -1,8 +1,8 @@ Summary: High-performance and highly configurable free RADIUS server Name: freeradius Version: 3.2.1 -Release: 3%{?dist} -License: GPLv2+ and LGPLv2+ +Release: 4%{?dist} +License: GPL-2.0-or-later AND LGPL-2.0-or-later URL: http://www.freeradius.org/ # Is elliptic curve cryptography supported? @@ -891,6 +891,9 @@ EOF %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest %changelog +* Wed Mar 15 2023 Antonio Torres - 3.2.1-4 +- Migrate to SPDX license + * Thu Jan 19 2023 Fedora Release Engineering - 3.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 049df291ead2f8c0c98b8a75ae860a0cd8b0c7fc Mon Sep 17 00:00:00 2001 From: Antonio Torres Date: Tue, 21 Mar 2023 09:39:33 +0100 Subject: [PATCH 02/33] Update to 3.2.2 upstream release Signed-off-by: Antonio Torres --- .gitignore | 1 + freeradius.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a9618a9..2000371 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ freeradius-*.src.rpm /freeradius-server-3.0.25.tar.bz2 /freeradius-server-3.2.0.tar.bz2 /freeradius-server-3.2.1.tar.bz2 +/freeradius-server-3.2.2.tar.bz2 diff --git a/freeradius.spec b/freeradius.spec index 43c8991..bc30b7a 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.1 -Release: 4%{?dist} +Version: 3.2.2 +Release: 1%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later URL: http://www.freeradius.org/ @@ -891,6 +891,9 @@ EOF %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest %changelog +* Tue Mar 21 2023 Antonio Torres - 3.2.2-1 +- Update to upstream release 3.2.2 + * Wed Mar 15 2023 Antonio Torres - 3.2.1-4 - Migrate to SPDX license diff --git a/sources b/sources index 56e81d0..4c58610 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (freeradius-server-3.2.1.tar.bz2) = 0f9e98cbf0eff4c5af54731ec34a8c9070252eaf2f91ca0c87caae939f6356fa91a6e1ed98ba66dbf1c1bafecdfcf38603fb4f65a5955e88974f49a5b7885f7a +SHA512 (freeradius-server-3.2.2.tar.bz2) = 91dc574560a1f75cafa8bc78c0676f0e3dae7154ecbb395e0e1f6738f78d8bcfe1bff122364452798fd0434c4056fd946799b8f29a1141398bf0542a37870689 From e6dba7c680751f1208f0e853d144a41003c39b68 Mon Sep 17 00:00:00 2001 From: Antonio Torres Date: Tue, 21 Mar 2023 10:08:47 +0100 Subject: [PATCH 03/33] Add new packaged file to spec Signed-off-by: Antonio Torres --- freeradius.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/freeradius.spec b/freeradius.spec index bc30b7a..7dff486 100644 --- a/freeradius.spec +++ b/freeradius.spec @@ -682,6 +682,7 @@ EOF %doc %{_mandir}/man5/rlm_passwd.5.gz %doc %{_mandir}/man5/rlm_realm.5.gz %doc %{_mandir}/man5/rlm_sql.5.gz +%doc %{_mandir}/man5/rlm_unbound.5.gz %doc %{_mandir}/man5/rlm_unix.5.gz %doc %{_mandir}/man5/unlang.5.gz %doc %{_mandir}/man5/users.5.gz From 3f56050138088ee8fa767d1b8690bed9ff8d5773 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 14 Jun 2023 00:18:40 +0200 Subject: [PATCH 04/33] Rebuilt for Python 3.12 --- freeradius.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/freeradius.spec b/freeradius.spec index 7dff486..ed59651 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: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later URL: http://www.freeradius.org/ @@ -892,6 +892,9 @@ EOF %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest %changelog +* Tue Jun 13 2023 Python Maint - 3.2.2-2 +- Rebuilt for Python 3.12 + * Tue Mar 21 2023 Antonio Torres - 3.2.2-1 - Update to upstream release 3.2.2 From d1c3541f6618536b08ae5b1b38360a7b6a5a882e Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 11 Jul 2023 15:55:37 +0200 Subject: [PATCH 05/33] Perl 5.38 rebuild --- freeradius.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/freeradius.spec b/freeradius.spec index ed59651..db969b6 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: 2%{?dist} +Release: 3%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later URL: http://www.freeradius.org/ @@ -892,6 +892,9 @@ EOF %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest %changelog +* Tue Jul 11 2023 Jitka Plesnikova - 3.2.2-3 +- Perl 5.38 rebuild + * Tue Jun 13 2023 Python Maint - 3.2.2-2 - Rebuilt for Python 3.12 From ca09fc02d802483ed32117062687b46d66a8d0f6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 20:14:54 +0000 Subject: [PATCH 06/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- freeradius.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/freeradius.spec b/freeradius.spec index db969b6..d3d9b15 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: 3%{?dist} +Release: 4%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later URL: http://www.freeradius.org/ @@ -892,6 +892,9 @@ EOF %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 3.2.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jul 11 2023 Jitka Plesnikova - 3.2.2-3 - Perl 5.38 rebuild From edb8438befbfbb64a666ca7f85889303f2191e9a Mon Sep 17 00:00:00 2001 From: Antonio Torres Date: Tue, 12 Sep 2023 14:35:31 +0200 Subject: [PATCH 07/33] 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..a9798eb 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 +* Tue Sep 12 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 ea6ff99048fa146680862b947a8741a670b1dc63 Mon Sep 17 00:00:00 2001 From: Antonio Torres Date: Tue, 24 Oct 2023 14:16:56 +0200 Subject: [PATCH 08/33] 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 a9798eb..1602744 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 + * Tue Sep 12 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 1793f410aa789704b5ac0be9cf7d0eaece906d1a Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 19 Dec 2023 07:59:23 +0100 Subject: [PATCH 09/33] Fix C compatibility issue in configure script Related to: --- freeradius-configure-c99.patch | 35 ++++++++++++++++++++++++++++++++++ freeradius.spec | 7 ++++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 freeradius-configure-c99.patch diff --git a/freeradius-configure-c99.patch b/freeradius-configure-c99.patch new file mode 100644 index 0000000..cc9daff --- /dev/null +++ b/freeradius-configure-c99.patch @@ -0,0 +1,35 @@ +The backtrace_symbols function expects a pointer to an array of void * +values, not a pointer to an array of a single element. Removing the +address operator ensures that the right type is used. + +This avoids an unconditional failure of this probe with compilers that +treat incompatible pointer types as a compilation error. + +Submitted upstream: + +diff --git a/configure b/configure +index ed01ee2bdd912f63..1e6d2284779cdd58 100755 +--- a/configure ++++ b/configure +@@ -13390,7 +13390,7 @@ main (void) + { + + void *sym[1]; +- backtrace_symbols(&sym, sizeof(sym)) ++ backtrace_symbols(sym, sizeof(sym)) + ; + return 0; + } +diff --git a/configure.ac b/configure.ac +index 76320213b51d7bb4..6a689711d6c90483 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2168,7 +2168,7 @@ if test "x$ac_cv_header_execinfo_h" = "xyes"; then + #include + ]], [[ + void *sym[1]; +- backtrace_symbols(&sym, sizeof(sym)) ]])],[ ++ backtrace_symbols(sym, sizeof(sym)) ]])],[ + AC_MSG_RESULT(yes) + ac_cv_lib_execinfo_backtrace_symbols="yes" + ],[ diff --git a/freeradius.spec b/freeradius.spec index 1602744..aba3a92 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.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later URL: http://www.freeradius.org/ @@ -28,6 +28,7 @@ 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 +Patch8: freeradius-configure-c99.patch %global docdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} @@ -211,6 +212,7 @@ This plugin provides the REST support for the FreeRADIUS server project. %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build # Force compile/link options, extra security for network facing daemon @@ -894,6 +896,9 @@ EOF %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest %changelog +* Tue Dec 19 2023 Florian Weimer - 3.2.3-2 +- Fix C compatibility issue in configure script + * Tue Oct 24 2023 Antonio Torres - 3.2.3-1 - Update to upstream release 3.2.3 From bcdc6e99f998861dd38cca80f1838bda785ea555 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 19:47:24 +0000 Subject: [PATCH 10/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- freeradius.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/freeradius.spec b/freeradius.spec index aba3a92..17cf81e 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.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later URL: http://www.freeradius.org/ @@ -896,6 +896,9 @@ EOF %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 3.2.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Dec 19 2023 Florian Weimer - 3.2.3-2 - Fix C compatibility issue in configure script From d68944b4aff752a0d7776893ce1a6a21239e26db Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 12:02:29 +0000 Subject: [PATCH 11/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- freeradius.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/freeradius.spec b/freeradius.spec index 17cf81e..e8cd4ad 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.3 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later URL: http://www.freeradius.org/ @@ -896,6 +896,9 @@ EOF %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 3.2.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 3.2.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From db785d8a9d46ae84ce297cc55e60713395cf4155 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:46 +0200 Subject: [PATCH 12/33] Eliminate use of obsolete %patchN syntax (#2283636) --- freeradius.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/freeradius.spec b/freeradius.spec index e8cd4ad..0f3f01e 100644 --- a/freeradius.spec +++ b/freeradius.spec @@ -205,14 +205,14 @@ This plugin provides the REST support for the FreeRADIUS server project. %setup -q -n %{dist_base} # Note: We explicitly do not make patch backup files because 'make install' # mistakenly includes the backup files, especially problematic for raddb config files. -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 +%patch -P1 -p1 +%patch -P2 -p1 +%patch -P3 -p1 +%patch -P4 -p1 +%patch -P5 -p1 +%patch -P6 -p1 +%patch -P7 -p1 +%patch -P8 -p1 %build # Force compile/link options, extra security for network facing daemon From d549c4c107aaf904b0d9953f3c61658c91e42a71 Mon Sep 17 00:00:00 2001 From: Antonio Torres Date: Fri, 31 May 2024 10:34:15 +0200 Subject: [PATCH 13/33] Update to 3.2.4 upstream release Signed-off-by: Antonio Torres --- .gitignore | 1 + freeradius.spec | 11 +++++++++-- sources | 2 +- 3 files changed, 11 insertions(+), 3 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 0f3f01e..d4d7a80 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.3 -Release: 4%{?dist} +Version: 3.2.4 +Release: 1%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later URL: http://www.freeradius.org/ @@ -415,6 +415,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 @@ -541,6 +542,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 @@ -666,6 +668,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 @@ -896,6 +900,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 + * Wed Jan 24 2024 Fedora Release Engineering - 3.2.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 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 dbcdacd2d0baed12051821a13956c9181e676d79 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 08:46:18 +0200 Subject: [PATCH 14/33] Rebuilt for Python 3.13 --- freeradius.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/freeradius.spec b/freeradius.spec index d4d7a80..4e4f75e 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.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later URL: http://www.freeradius.org/ @@ -900,6 +900,9 @@ EOF %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest %changelog +* Fri Jun 07 2024 Python Maint - 3.2.4-2 +- Rebuilt for Python 3.13 + * Fri May 31 2024 Antonio Torres - 3.2.4-1 - Update to upstream release 3.2.4 From 2238015f6add31de28744d38cdcf54cfc8a0f73f Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 12 Jun 2024 12:52:04 +0200 Subject: [PATCH 15/33] Perl 5.40 rebuild --- freeradius.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/freeradius.spec b/freeradius.spec index 4e4f75e..3064e03 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.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later URL: http://www.freeradius.org/ @@ -900,6 +900,9 @@ EOF %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest %changelog +* Wed Jun 12 2024 Jitka Plesnikova - 3.2.4-3 +- Perl 5.40 rebuild + * Fri Jun 07 2024 Python Maint - 3.2.4-2 - Rebuilt for Python 3.13 From 005987d712cb48eff67c75886b69d27f2e3b54c2 Mon Sep 17 00:00:00 2001 From: Antonio Torres Date: Wed, 26 Jun 2024 12:24:50 +0200 Subject: [PATCH 16/33] Generate certificates in auth test Signed-off-by: Antonio Torres --- tests/auth-tests/runtest.sh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/auth-tests/runtest.sh b/tests/auth-tests/runtest.sh index 7be8432..ceaeaa7 100755 --- a/tests/auth-tests/runtest.sh +++ b/tests/auth-tests/runtest.sh @@ -16,6 +16,25 @@ PACKAGE="freeradius" RADIUS_CLIENT_CONF="/etc/raddb/clients.conf" RADIUD_PALIN_TEXT_AUTH_FILE="/etc/raddb/mods-config/files/authorize" +generate_cert(){ + pushd /etc/raddb/certs/ + #remove certificates if exists;generate new certificates + if [[ -f /etc/raddb/certs/bootstrap ]]; then + rlLog "Destroy and create new default certificates via bootstrap script" + rm -f *.pem *.der *.csr *.crt *.key *.p12 serial* index.txt* dh + rlRun "sh /etc/raddb/certs/bootstrap" 0 "Gnenerating certificates" + else + rlLogWarning "!!! WARNING bootsrap file does not exist !!!" + rlLog "Destroy and create new default certificates via make scripts" + make destroycerts -C /etc/raddb/certs/ + #create new certificates + make -C /etc/raddb/certs/ + chown root:radiusd dh ca.* client.* server.* + chmod 640 dh ca.* client.* server.* + fi + popd +} + rlJournalStart rlPhaseStartSetup rlAssertRpm $PACKAGE @@ -29,6 +48,7 @@ rlJournalStart rlRun "cp clients.conf $RADIUS_CLIENT_CONF" rlRun "cp authorize $RADIUD_PALIN_TEXT_AUTH_FILE" rlRun "systemctl daemon-reload" + generate_cert rlPhaseEnd rlPhaseStartTest From bead332d1108ae465a785c66a89de0d024ca7881 Mon Sep 17 00:00:00 2001 From: Antonio Torres Date: Tue, 9 Jul 2024 14:46:02 +0200 Subject: [PATCH 17/33] Update to 3.2.5 Signed-off-by: Antonio Torres --- .gitignore | 1 + freeradius.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 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 3064e03..b7f86da 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.4 -Release: 3%{?dist} +Version: 3.2.5 +Release: 1%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later URL: http://www.freeradius.org/ @@ -900,6 +900,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 + * Wed Jun 12 2024 Jitka Plesnikova - 3.2.4-3 - Perl 5.40 rebuild 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 From bf421ace1262bb0115fc4fb5be5021a242abb85b Mon Sep 17 00:00:00 2001 From: Antonio Torres Date: Tue, 9 Jul 2024 16:28:49 +0200 Subject: [PATCH 18/33] Include openssl-devel-engine build dependency Signed-off-by: Antonio Torres --- freeradius.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/freeradius.spec b/freeradius.spec index b7f86da..36a9d7a 100644 --- a/freeradius.spec +++ b/freeradius.spec @@ -38,6 +38,8 @@ BuildRequires: gcc BuildRequires: gdbm-devel BuildRequires: openssl BuildRequires: openssl-devel +# https://fedoraproject.org/wiki/Changes/OpensslDeprecateEngine +BuildRequires: openssl-devel-engine BuildRequires: pam-devel BuildRequires: zlib-devel BuildRequires: net-snmp-devel From a49c1eef4fbb923d1c5434033fc2b3942a797f63 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 23:38:19 +0000 Subject: [PATCH 19/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- freeradius.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/freeradius.spec b/freeradius.spec index 36a9d7a..cd94c06 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.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later URL: http://www.freeradius.org/ @@ -902,6 +902,9 @@ EOF %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 3.2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jul 09 2024 Antonio Torres - 3.2.5-1 - Update to upstream release 3.2.5 From d3acc3cf6f4817483514bcc9765b78b42a0adec8 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 5 Nov 2024 19:51:30 -0500 Subject: [PATCH 20/33] Drop openssl-devel-engine dependency The only use of OpenSSL ENGINE API is already guarded by OPENSSL_NO_ENGINE, which is now automatically defined when openssl-devel-engine is absent. This allows freeradius to be compiled without it. https://fedoraproject.org/wiki/Changes/OpensslDeprecateEngine --- freeradius-openssl-no-engine.patch | 54 ++++++++++++++++++++++++++++++ freeradius.spec | 9 +++-- 2 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 freeradius-openssl-no-engine.patch diff --git a/freeradius-openssl-no-engine.patch b/freeradius-openssl-no-engine.patch new file mode 100644 index 0000000..b03ae2b --- /dev/null +++ b/freeradius-openssl-no-engine.patch @@ -0,0 +1,54 @@ +diff --git a/configure b/configure +index 1e6d228..40a26f5 100755 +--- a/configure ++++ b/configure +@@ -10518,7 +10518,7 @@ smart_prefix= + printf "%s\n" "#define HAVE_OPENSSL_SSL_H 1" >>confdefs.h + + +- for ac_header in openssl/asn1.h openssl/conf.h openssl/crypto.h openssl/err.h openssl/evp.h openssl/hmac.h openssl/md5.h openssl/md4.h openssl/rand.h openssl/sha.h openssl/ssl.h openssl/ocsp.h openssl/engine.h ++ for ac_header in openssl/asn1.h openssl/conf.h openssl/crypto.h openssl/err.h openssl/evp.h openssl/hmac.h openssl/md5.h openssl/md4.h openssl/rand.h openssl/sha.h openssl/ssl.h openssl/ocsp.h + do : + as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +diff --git a/configure.ac b/configure.ac +index 6a68971..4a95148 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1449,8 +1449,7 @@ if test "x$WITH_OPENSSL" = xyes; then + openssl/rand.h \ + openssl/sha.h \ + openssl/ssl.h \ +- openssl/ocsp.h \ +- openssl/engine.h, ++ openssl/ocsp.h, + [ OPENSSL_CPPFLAGS="$smart_include" ], + [ + AC_MSG_FAILURE([failed locating OpenSSL headers. Use --with-openssl-include-dir=, or --with-openssl=no (builds without OpenSSL)]) +diff --git a/src/include/autoconf.h.in b/src/include/autoconf.h.in +index 4774482..21d5cea 100644 +--- a/src/include/autoconf.h.in ++++ b/src/include/autoconf.h.in +@@ -285,9 +285,6 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_OPENSSL_CRYPTO_H + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_OPENSSL_ENGINE_H +- + /* Define to 1 if you have the header file. */ + #undef HAVE_OPENSSL_ERR_H + +diff --git a/src/include/tls-h b/src/include/tls-h +index 506fb19..514e03a 100644 +--- a/src/include/tls-h ++++ b/src/include/tls-h +@@ -37,7 +37,7 @@ RCSIDH(tls_h, "$Id$") + # define OPENSSL_NO_KRB5 + #endif + #include +-#ifdef HAVE_OPENSSL_ENGINE_H ++#ifndef OPENSSL_NO_ENGINE + # include + #endif + #include diff --git a/freeradius.spec b/freeradius.spec index cd94c06..f5f6645 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.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later URL: http://www.freeradius.org/ @@ -29,6 +29,7 @@ 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-openssl-no-engine.patch %global docdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} @@ -38,8 +39,6 @@ BuildRequires: gcc BuildRequires: gdbm-devel BuildRequires: openssl BuildRequires: openssl-devel -# https://fedoraproject.org/wiki/Changes/OpensslDeprecateEngine -BuildRequires: openssl-devel-engine BuildRequires: pam-devel BuildRequires: zlib-devel BuildRequires: net-snmp-devel @@ -215,6 +214,7 @@ This plugin provides the REST support for the FreeRADIUS server project. %patch -P6 -p1 %patch -P7 -p1 %patch -P8 -p1 +%patch -P9 -p1 %build # Force compile/link options, extra security for network facing daemon @@ -902,6 +902,9 @@ EOF %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest %changelog +* Wed Nov 06 2024 Yaakov Selkowitz - 3.2.5-3 +- Drop openssl-devel-engine dependency + * Wed Jul 17 2024 Fedora Release Engineering - 3.2.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 10de3e72439792481246199eeabbecd8bde3a9d7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 18:49:50 +0000 Subject: [PATCH 21/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- freeradius.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/freeradius.spec b/freeradius.spec index f5f6645..3efbfdc 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.5 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later URL: http://www.freeradius.org/ @@ -902,6 +902,9 @@ EOF %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 3.2.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Nov 06 2024 Yaakov Selkowitz - 3.2.5-3 - Drop openssl-devel-engine dependency From 4e419c7e373b4201dd15191a2ff4e4f9ea109cca Mon Sep 17 00:00:00 2001 From: Antonio Torres Date: Thu, 23 Jan 2025 10:52:45 +0100 Subject: [PATCH 22/33] Fix usage of /usr/sbin Point to %_bindir instead, according to https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin Resolves: #2340178 Signed-off-by: Antonio Torres --- freeradius.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/freeradius.spec b/freeradius.spec index 3efbfdc..d21666f 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.5 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later URL: http://www.freeradius.org/ @@ -596,10 +596,10 @@ EOF # binaries %defattr(-,root,root) -/usr/sbin/checkrad -/usr/sbin/raddebug -/usr/sbin/radiusd -/usr/sbin/radmin +%{_bindir}/checkrad +%{_bindir}/raddebug +%{_bindir}/radiusd +%{_bindir}/radmin # dictionaries %dir %attr(755,root,root) /usr/share/freeradius @@ -902,6 +902,9 @@ EOF %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest %changelog +* Thu Jan 23 2025 Antonio Torres - 3.2.5-5 +- Fix usage of /usr/sbin according to https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin + * Thu Jan 16 2025 Fedora Release Engineering - 3.2.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From e4d007f46777248ab063891e6e85a3b057e33053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 1 Feb 2025 19:54:05 +0100 Subject: [PATCH 23/33] Add explicit BR: libxcrypt-devel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Esser --- freeradius.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/freeradius.spec b/freeradius.spec index d21666f..4360f5b 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.5 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later URL: http://www.freeradius.org/ @@ -49,6 +49,7 @@ BuildRequires: systemd-units BuildRequires: libtalloc-devel BuildRequires: chrpath BuildRequires: systemd-rpm-macros +BuildRequires: libxcrypt-devel %if ! 0%{?rhel} BuildRequires: libyubikey-devel @@ -902,6 +903,9 @@ EOF %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest %changelog +* Sat Feb 01 2025 Björn Esser - 3.2.5-6 +- Add explicit BR: libxcrypt-devel + * Thu Jan 23 2025 Antonio Torres - 3.2.5-5 - Fix usage of /usr/sbin according to https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin From 8f48670e2ad70452bd45e0c3c84120d6e47ff812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 17:03:17 +0100 Subject: [PATCH 24/33] Drop call to %sysusers_create_compat After https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers, rpm will handle account creation automatically. --- freeradius.spec | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/freeradius.spec b/freeradius.spec index 4360f5b..cf2e24b 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.5 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later URL: http://www.freeradius.org/ @@ -59,7 +59,7 @@ BuildRequires: ykclient-devel # Require OpenSSL version we built with, or newer, to avoid startup failures # due to runtime OpenSSL version checks. Requires: openssl >= %(rpm -q --queryformat '%%{EPOCH}:%%{VERSION}' openssl) -Requires(pre): shadow-utils glibc-common +Requires(pre): glibc-common Requires(post): systemd-sysv Requires(post): systemd-units # Needed for certificate generation as upstream bootstrap script isn't @@ -356,11 +356,6 @@ All documentation is in the freeradius-doc sub-package. EOF - -# Make sure our user/group is present prior to any package or subpackage installation -%pre -%sysusers_create_compat %{SOURCE105} - %preun %systemd_preun radiusd.service @@ -903,6 +898,9 @@ EOF %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest %changelog +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 3.2.5-7 +- Drop call to %sysusers_create_compat + * Sat Feb 01 2025 Björn Esser - 3.2.5-6 - Add explicit BR: libxcrypt-devel From cc31b38a9e8adef8918a4e6e366e6a54b8e42ccc Mon Sep 17 00:00:00 2001 From: Antonio Torres Date: Wed, 5 Mar 2025 10:55:22 +0100 Subject: [PATCH 25/33] Update to upstream release 3.2.7 Signed-off-by: Antonio Torres --- .gitignore | 1 + ...t-configuration-to-fit-Red-Hat-specifics.patch | 13 ++++++++----- freeradius-no-buildtime-cert-gen.patch | 15 +++++++++------ freeradius.spec | 10 ++++++++-- sources | 2 +- 5 files changed, 27 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 8b82526..1e3b99a 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ freeradius-*.src.rpm /freeradius-server-3.2.3.tar.bz2 /freeradius-server-3.2.4.tar.bz2 /freeradius-server-3.2.5.tar.bz2 +/freeradius-server-3.2.7.tar.bz2 diff --git a/freeradius-Adjust-configuration-to-fit-Red-Hat-specifics.patch b/freeradius-Adjust-configuration-to-fit-Red-Hat-specifics.patch index 6b2329b..33747d0 100644 --- a/freeradius-Adjust-configuration-to-fit-Red-Hat-specifics.patch +++ b/freeradius-Adjust-configuration-to-fit-Red-Hat-specifics.patch @@ -3,25 +3,27 @@ From: Nikolai Kondrashov Date: Mon, 8 Sep 2014 12:32:13 +0300 Subject: [PATCH] Adjust configuration to fit Red Hat specifics +[antorres@redhat.com]: update patch to match 3.2.7 release + --- raddb/mods-available/eap | 4 ++-- raddb/radiusd.conf.in | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/raddb/mods-available/eap b/raddb/mods-available/eap -index 2621e183c..94494b2c6 100644 +index 84660d7c1e..ffcef4b406 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 # The command used to verify the client cert. # We recommend using the OpenSSL command-line -@@ -548,7 +548,7 @@ +@@ -711,7 +711,7 @@ eap { # deleted by the server when the command # returns. # @@ -30,6 +32,7 @@ index 2621e183c..94494b2c6 100644 } # OCSP Configuration + diff --git a/raddb/radiusd.conf.in b/raddb/radiusd.conf.in index a83c1f687..e500cf97b 100644 --- a/raddb/radiusd.conf.in diff --git a/freeradius-no-buildtime-cert-gen.patch b/freeradius-no-buildtime-cert-gen.patch index b435d82..6846827 100644 --- a/freeradius-no-buildtime-cert-gen.patch +++ b/freeradius-no-buildtime-cert-gen.patch @@ -3,6 +3,8 @@ From: Alexander Scheel Date: Wed, 8 May 2019 12:58:02 -0400 Subject: [PATCH] Don't generate certificates in reproducible builds +[antorres@redhat.com]: updated to match upstream release 3.2.7 + Signed-off-by: Alexander Scheel --- Make.inc.in | 5 +++++ @@ -27,18 +29,18 @@ index 0b2cd74de8..8c623cf95c 100644 # # For creating documentation via doc/all.mk diff --git a/configure b/configure -index 5041ca264f..ed01ee2bdd 100755 +index f1dfa97c44..ba5c53768d 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 -@@ -6976,6 +6977,7 @@ fi + WITH_RADLAST +@@ -7001,6 +7002,7 @@ fi # Check whether --enable-reproducible-builds was given. @@ -46,7 +48,7 @@ index 5041ca264f..ed01ee2bdd 100755 if test ${enable_reproducible_builds+y} then : enableval=$enable_reproducible_builds; case "$enableval" in -@@ -6987,6 +6989,7 @@ printf "%s\n" "#define ENABLE_REPRODUCIBLE_BUILDS 1" >>confdefs.h +@@ -7012,6 +7014,7 @@ printf "%s\n" "#define ENABLE_REPRODUCIBLE_BUILDS 1" >>confdefs.h ;; *) reproducible_builds=no @@ -54,6 +56,7 @@ index 5041ca264f..ed01ee2bdd 100755 esac fi + diff --git a/configure.ac b/configure.ac index ce4d9b0ae5..790cbf02a0 100644 --- a/configure.ac diff --git a/freeradius.spec b/freeradius.spec index cf2e24b..04cbe1b 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.5 -Release: 7%{?dist} +Version: 3.2.7 +Release: 1%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later URL: http://www.freeradius.org/ @@ -541,6 +541,7 @@ 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/proxy_rate_limit # mods-enabled # symlink: /etc/raddb/mods-enabled/xxx -> ../mods-available/xxx @@ -575,6 +576,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 @@ -668,6 +670,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 @@ -898,6 +901,9 @@ EOF %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest %changelog +* Wed Mar 5 2025 Antonio Torres - 3.2.7-1 +- Update to upstream release 3.2.7 + * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 3.2.5-7 - Drop call to %sysusers_create_compat diff --git a/sources b/sources index 4768856..38a1c91 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (freeradius-server-3.2.5.tar.bz2) = 55e653630674a957dcd52ae58e5fd7b5a510b84aaa80e0552bce8089221e02f652618b53753f438981472a5f47df7c8426b9a5ecda0b06ad9f4c25b23604c86b +SHA512 (freeradius-server-3.2.7.tar.bz2) = c4a13471844ab4ce041db1567e2827370433725beadfbf425d2522b0bf9a4def8ebd41d3c4f45ad350dacdf86bc5bf3952d519d84672c7dde25a12005a009ae5 From 017f82cf9096d8f05e65ee9a3de052053bbd1f8d Mon Sep 17 00:00:00 2001 From: Antonio Torres Date: Wed, 5 Mar 2025 12:47:16 +0100 Subject: [PATCH 26/33] Skip building rlm_sqlippool_tool helper script This script relies on a Perl package that is no longer available. Skip building it and let the users clone it manually instead, as it's only a helper script for SQL modules users. Signed-off-by: Antonio Torres --- freeradius-no-sqlippool-tool.patch | 28 ++++++++++++++++++++++++++++ freeradius.spec | 4 +++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 freeradius-no-sqlippool-tool.patch diff --git a/freeradius-no-sqlippool-tool.patch b/freeradius-no-sqlippool-tool.patch new file mode 100644 index 0000000..58d3282 --- /dev/null +++ b/freeradius-no-sqlippool-tool.patch @@ -0,0 +1,28 @@ +From: Antonio Torres +Date: Wed, 5 Mar 2025 +Subject: Remove sqlippool tool + +This script relies on a Perl package, perl-Net-IP, that won't be available. +Remove it from build script and let the user pull it manually instead, as it's +just a helper script for SQL module users. + +--- +diff --git a/scripts/all.mk b/scripts/all.mk +index a6e90aa3eb..517adb8590 100644 +--- a/scripts/all.mk ++++ b/scripts/all.mk +@@ -1,5 +1,5 @@ + install: $(R)$(sbindir)/rc.radiusd $(R)$(sbindir)/raddebug \ +- $(R)$(bindir)/radsqlrelay $(R)$(bindir)/radcrypt $(R)$(bindir)/rlm_sqlippool_tool ++ $(R)$(bindir)/radsqlrelay $(R)$(bindir)/radcrypt + + $(R)$(sbindir)/rc.radiusd: scripts/rc.radiusd + @mkdir -p $(dir $@) +@@ -16,7 +16,3 @@ $(R)$(bindir)/radsqlrelay: scripts/sql/radsqlrelay + $(R)$(bindir)/radcrypt: scripts/cryptpasswd + @mkdir -p $(dir $@) + @$(INSTALL) -m 755 $< $@ +- +-$(R)$(bindir)/rlm_sqlippool_tool: scripts/sql/rlm_sqlippool_tool +- @mkdir -p $(dir $@) +- @$(INSTALL) -m 755 $< $@ diff --git a/freeradius.spec b/freeradius.spec index 04cbe1b..305a171 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.7 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later URL: http://www.freeradius.org/ @@ -30,6 +30,7 @@ Patch6: freeradius-ldap-infinite-timeout-on-starttls.patch Patch7: freeradius-ease-openssl-version-check.patch Patch8: freeradius-configure-c99.patch Patch9: freeradius-openssl-no-engine.patch +Patch10: freeradius-no-sqlippool-tool.patch %global docdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} @@ -216,6 +217,7 @@ This plugin provides the REST support for the FreeRADIUS server project. %patch -P7 -p1 %patch -P8 -p1 %patch -P9 -p1 +%patch -P10 -p1 %build # Force compile/link options, extra security for network facing daemon From d2672b8eeeae945377a5de60a0387871e17f8ddc Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 20:20:01 +0200 Subject: [PATCH 27/33] Rebuilt for Python 3.14 --- freeradius.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/freeradius.spec b/freeradius.spec index 305a171..ff157b6 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.7 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later URL: http://www.freeradius.org/ @@ -903,6 +903,9 @@ EOF %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest %changelog +* Mon Jun 02 2025 Python Maint - 3.2.7-3 +- Rebuilt for Python 3.14 + * Wed Mar 5 2025 Antonio Torres - 3.2.7-1 - Update to upstream release 3.2.7 From 7629f49dacdf122486ae365b6f26d4658bb9c0fd Mon Sep 17 00:00:00 2001 From: Antonio Torres Date: Wed, 11 Jun 2025 10:02:40 +0200 Subject: [PATCH 28/33] Update logrotate script with try-reload-or-restart systemd has renamed reload-or-try-restart to try-reload-or-restart. The former is still accepted, but may be removed in the future. Resolves: rhbz#2371329 Signed-off-by: Antonio Torres --- freeradius-logrotate | 2 +- freeradius.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/freeradius-logrotate b/freeradius-logrotate index c962254..1a2ec6f 100644 --- a/freeradius-logrotate +++ b/freeradius-logrotate @@ -34,7 +34,7 @@ compress su radiusd radiusd postrotate - /usr/bin/systemctl reload-or-try-restart radiusd + /usr/bin/systemctl try-reload-or-restart radiusd endscript } diff --git a/freeradius.spec b/freeradius.spec index ff157b6..c2efab3 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.7 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later URL: http://www.freeradius.org/ @@ -903,6 +903,10 @@ EOF %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest %changelog +* Wed Jun 11 2025 Antonio Torres - 3.2.7-4 +- Update logrotate postrotate script with `systemctl try-reload-or-restart` + Resolves: rhbz#2371329 + * Mon Jun 02 2025 Python Maint - 3.2.7-3 - Rebuilt for Python 3.14 From 62f35fae1411fc1285c7b554108ae0ba5052acd7 Mon Sep 17 00:00:00 2001 From: Bruno Vernay Date: Mon, 16 Jun 2025 07:04:30 +0000 Subject: [PATCH 29/33] Fix chown syntax MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Quoting the man page: "The BSD syntax user[.group] was changed to user[:group] in this volume of POSIX.1‐2017 because the is a valid character in login names (as specified by the Base Definitions volume of POSIX.1‐2017, login names consist of characters in the portable filename character set)." --- radiusd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radiusd.service b/radiusd.service index f545280..9bfa3cd 100644 --- a/radiusd.service +++ b/radiusd.service @@ -5,7 +5,7 @@ After=syslog.target network-online.target ipa.service dirsrv.target krb5kdc.serv [Service] Type=forking PIDFile=/var/run/radiusd/radiusd.pid -ExecStartPre=-/bin/chown -R radiusd.radiusd /var/run/radiusd +ExecStartPre=-/bin/chown -R radiusd:radiusd /var/run/radiusd ExecStartPre=/usr/sbin/radiusd -C ExecStart=/usr/sbin/radiusd -d /etc/raddb ExecReload=/usr/sbin/radiusd -C From 7b23cc2e89448478a738fffd043bb017b13269ad Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 8 Jul 2025 14:25:54 +0200 Subject: [PATCH 30/33] Perl 5.42 rebuild --- freeradius.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/freeradius.spec b/freeradius.spec index c2efab3..1459c44 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.7 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later URL: http://www.freeradius.org/ @@ -903,6 +903,9 @@ EOF %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest %changelog +* Tue Jul 08 2025 Jitka Plesnikova - 3.2.7-5 +- Perl 5.42 rebuild + * Wed Jun 11 2025 Antonio Torres - 3.2.7-4 - Update logrotate postrotate script with `systemctl try-reload-or-restart` Resolves: rhbz#2371329 From 94437a86b09e0f7535344f88949168b3e042c775 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 20:47:53 +0000 Subject: [PATCH 31/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- freeradius.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/freeradius.spec b/freeradius.spec index 1459c44..7629663 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.7 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later URL: http://www.freeradius.org/ @@ -903,6 +903,9 @@ EOF %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 3.2.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jul 08 2025 Jitka Plesnikova - 3.2.7-5 - Perl 5.42 rebuild From dda92203906463ccaa1074755a5ba8a1577af2b4 Mon Sep 17 00:00:00 2001 From: Antonio Torres Date: Mon, 10 Nov 2025 10:04:31 +0100 Subject: [PATCH 32/33] Update to 3.2.8 Signed-off-by: Antonio Torres --- .gitignore | 1 + freeradius.spec | 25 ++++++++++++++++++++++--- sources | 2 +- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1e3b99a..4530dbe 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ freeradius-*.src.rpm /freeradius-server-3.2.4.tar.bz2 /freeradius-server-3.2.5.tar.bz2 /freeradius-server-3.2.7.tar.bz2 +/freeradius-server-3.2.8.tar.bz2 diff --git a/freeradius.spec b/freeradius.spec index 7629663..700a7d4 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.7 -Release: 6%{?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/ @@ -14,7 +14,7 @@ URL: http://www.freeradius.org/ %global dist_base freeradius-server-%{version} -Source0: ftp://ftp.freeradius.org/pub/radius/%{dist_base}.tar.bz2 +Source0: https://www.freeradius.org/ftp/pub/freeradius/%{dist_base}.tar.bz2 Source100: radiusd.service Source102: freeradius-logrotate Source103: freeradius-pam-conf @@ -204,6 +204,16 @@ BuildRequires: json-c-devel %description rest This plugin provides the REST support for the FreeRADIUS server project. + +%package kafka +Summary: Kafka producer support for FreeRADIUS +Requires: %{name} = %{version}-%{release} +Requires: librdkafka +BuildRequires: librdkafka-devel + +%description kafka +This plugin provides Kafka producer support for the FreeRADIUS server project. + %prep %setup -q -n %{dist_base} # Note: We explicitly do not make patch backup files because 'make install' @@ -902,7 +912,16 @@ EOF %{_libdir}/freeradius/rlm_rest.so %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest +%files kafka +%{_libdir}/freeradius/rlm_kafka.so +%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-config/kafka/messages-json.conf + %changelog +* Mon Nov 10 2025 Antonio Torres - 3.2.8-1 +- Update to upstream release 3.2.8 + * Wed Jul 23 2025 Fedora Release Engineering - 3.2.7-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 38a1c91..3fdee90 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (freeradius-server-3.2.7.tar.bz2) = c4a13471844ab4ce041db1567e2827370433725beadfbf425d2522b0bf9a4def8ebd41d3c4f45ad350dacdf86bc5bf3952d519d84672c7dde25a12005a009ae5 +SHA512 (freeradius-server-3.2.8.tar.bz2) = 31db199c3847bfdb80b726e16cece0d660bd741fae0fca8ba96aaaee30972c657438c4e1fdaa7ef070f84d8b7889a8da8db1defc542b0c0e18f247156f17e0ae From 43ef939726ac1d34a901b5d0dc672fd358c975e0 Mon Sep 17 00:00:00 2001 From: Antonio Torres Date: Wed, 7 Jan 2026 11:21:33 +0100 Subject: [PATCH 33/33] Enable SELinux flag for JIT usage Resolves: #2427017 Signed-off-by: Antonio Torres --- freeradius.spec | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/freeradius.spec b/freeradius.spec index 700a7d4..7b65a15 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.8 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later URL: http://www.freeradius.org/ @@ -371,7 +371,19 @@ EOF %preun %systemd_preun radiusd.service +%post +# related: https://bugzilla.redhat.com/show_bug.cgi?id=2427017 +# https://github.com/FreeRADIUS/freeradius-server/commit/7d9fcdff99113b7eb3413f436fecccbc5d34bd96 +if [ -x /usr/sbin/setsebool ]; then + /usr/sbin/setsebool -P radius_use_jit on || : +fi + %postun +if [ $1 -eq 0 ]; then + if [ -x /usr/sbin/setsebool ]; then + /usr/sbin/setsebool -P radius_use_jit off || : + fi +fi %systemd_postun_with_restart radiusd.service /bin/systemctl try-restart radiusd.service >/dev/null 2>&1 || : @@ -919,6 +931,10 @@ EOF %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-config/kafka/messages-json.conf %changelog +* Mon Jan 05 2026 Antonio Torres - 3.2.8-2 +- Enable selinux flag for JIT usage + Resolves: #2427017 + * Mon Nov 10 2025 Antonio Torres - 3.2.8-1 - Update to upstream release 3.2.8