mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/freeradius-server: bump to version 3.2.3

Browse Source 
- Refresh patches
- autoconf must be switched to autoreconf because of
  7cd23f2de6
- redis cache module is available since
  575bff4810

https://github.com/FreeRADIUS/freeradius-server/blob/release_3_2_3/doc/ChangeLog

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine
2023-11-04 15:05:24 +01:00
committed by Thomas Petazzoni
parent 5a8d6014c7
commit 4155139365
5 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch
View File

@@ -9,6 +9,8 @@ Upstream: Not applicable
Signed-off-by: David Gouarin <david.gouarin@thalesgroup.com> Signed-off-by: David Gouarin <david.gouarin@thalesgroup.com>
Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com> Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com>
[Fabrice: update for 3.2.3]
SIgned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
--- ---
scripts/libtool.mk | 4 ++-- scripts/libtool.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
@@ -18,13 +20,14 @@ index 57915e1053..c28260dd7e 100644
--- a/scripts/libtool.mk --- a/scripts/libtool.mk
+++ b/scripts/libtool.mk +++ b/scripts/libtool.mk
@@ -43,8 +43,8 @@ ifeq "${LIBTOOL}" "JLIBTOOL" @@ -43,8 +43,8 @@ ifeq "${LIBTOOL}" "JLIBTOOL"
# binary! # binary!
${JLIBTOOL}: ${top_makedir}/jlibtool.c ${JLIBTOOL}: ${top_makedir}/jlibtool.c
$(Q)mkdir -p $(dir $@) $(Q)mkdir -p $(dir $@)
- $(Q)echo CC jlibtool.c - $(Q)echo CC jlibtool.c
- $(Q)${CC} $< -o $@ - $(Q)${CC} $< -o $@ ${JLIBTOOL_DEFS}
+ $(Q)echo HOSTCC jlibtool.c + $(Q)echo HOSTCC jlibtool.c
+ $(Q)${HOSTCC} $< -o $@ + $(Q)${HOSTCC} $< -o $@ ${JLIBTOOL_DEFS}
clean: jlibtool_clean clean: jlibtool_clean

20
package/freeradius-server/0003-configure.ac-allow-cross-compilation.patch
View File

@@ -19,6 +19,8 @@ Fetch from: http://cgit.openembedded.org/meta-openembedded/tree/meta-networking/
Signed-off-by: David Gouarin <david.gouarin@thalesgroup.com> Signed-off-by: David Gouarin <david.gouarin@thalesgroup.com>
Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com> Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com>
Upstream: https://github.com/FreeRADIUS/freeradius-server/pull/4632 Upstream: https://github.com/FreeRADIUS/freeradius-server/pull/4632
[Fabrice: update for 3.2.3]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
--- ---
src/modules/rlm_krb5/configure.ac | 3 ++- src/modules/rlm_krb5/configure.ac | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
@@ -28,15 +30,15 @@ index efc9f29d7f..98a97e438a 100644
--- a/src/modules/rlm_krb5/configure.ac --- a/src/modules/rlm_krb5/configure.ac
+++ b/src/modules/rlm_krb5/configure.ac +++ b/src/modules/rlm_krb5/configure.ac
@@ -137,7 +137,8 @@ if test x$with_[]modname != xno; then @@ -137,7 +137,8 @@ if test x$with_[]modname != xno; then
FR_SMART_CHECK_LIB(krb5, krb5_is_thread_safe) FR_SMART_CHECK_LIB(krb5, krb5_is_thread_safe)
if test "x$ac_cv_lib_krb5_krb5_is_thread_safe" = xyes; then if test "x$ac_cv_lib_krb5_krb5_is_thread_safe" = xyes; then
AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <krb5.h>]], [[return krb5_is_thread_safe() ? 0 : 1]])], AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <krb5.h>]], [[return krb5_is_thread_safe() ? 0 : 1]])],
- [krb5threadsafe="-DKRB5_IS_THREAD_SAFE"], [AC_MSG_WARN([[libkrb5 is not threadsafe]])]) - [krb5threadsafe="-DKRB5_IS_THREAD_SAFE"], [AC_MSG_WARN([[libkrb5 is not threadsafe]])])
+ [krb5threadsafe="-DKRB5_IS_THREAD_SAFE"], [AC_MSG_WARN([[libkrb5 is not threadsafe]])], + [krb5threadsafe="-DKRB5_IS_THREAD_SAFE"], [AC_MSG_WARN([[libkrb5 is not threadsafe]])],
+ [AC_MSG_WARN(cross compiling: not checking)]) + [AC_MSG_WARN(cross compiling: not checking)])
fi fi
else else
krb5threadsafe="" krb5threadsafe=""
-- --
2.17.1 2.17.1

34
package/freeradius-server/0008-configure.ac-try-execinfo-in-libc-before-searching-l.patch
View File

@@ -12,6 +12,8 @@ FR_SMART_CHECK_LIB can find an incompatible library.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Upstream: https://github.com/FreeRADIUS/freeradius-server/pull/4632 Upstream: https://github.com/FreeRADIUS/freeradius-server/pull/4632
[Fabrice: update for 3.2.3]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
--- ---
configure.ac | 38 +++++++++++++++++++------------------- configure.ac | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-) 1 file changed, 19 insertions(+), 19 deletions(-)
@@ -20,7 +22,7 @@ diff --git a/configure.ac b/configure.ac
index f431da6db5..faa7cfc2b4 100644 index f431da6db5..faa7cfc2b4 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -2165,26 +2165,26 @@ dnl # @@ -2165,21 +2165,21 @@ dnl #
smart_try_dir=$execinfo_include_dir smart_try_dir=$execinfo_include_dir
FR_SMART_CHECK_INCLUDE(execinfo.h) FR_SMART_CHECK_INCLUDE(execinfo.h)
if test "x$ac_cv_header_execinfo_h" = "xyes"; then if test "x$ac_cv_header_execinfo_h" = "xyes"; then
@@ -28,39 +30,29 @@ index f431da6db5..faa7cfc2b4 100644
- FR_SMART_CHECK_LIB(execinfo, backtrace_symbols) - FR_SMART_CHECK_LIB(execinfo, backtrace_symbols)
+ dnl # Might be provided as part of libc + dnl # Might be provided as part of libc
+ AC_MSG_CHECKING([if execinfo provided as part of libc]) + AC_MSG_CHECKING([if execinfo provided as part of libc])
+ AC_TRY_LINK( + AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ [
+ #include <execinfo.h> + #include <execinfo.h>
+ ], + ]], [[
+ [
+ void *sym[1]; + void *sym[1];
+ backtrace_symbols(&sym, sizeof(sym)) ], + backtrace_symbols(&sym, sizeof(sym)) ]])],[
+ [
+ AC_MSG_RESULT(yes) + AC_MSG_RESULT(yes)
+ ac_cv_lib_execinfo_backtrace_symbols="yes" + ac_cv_lib_execinfo_backtrace_symbols="yes"
+ ], + ],[
+ [
+ AC_MSG_RESULT(no) + AC_MSG_RESULT(no)
+ ] + ])
+ )
if test "x$ac_cv_lib_execinfo_backtrace_symbols" != "xyes"; then if test "x$ac_cv_lib_execinfo_backtrace_symbols" != "xyes"; then
- dnl # Might be provided as part of libc - dnl # Might be provided as part of libc
- AC_MSG_CHECKING([if execinfo provided as part of libc]) - AC_MSG_CHECKING([if execinfo provided as part of libc])
- AC_TRY_LINK( - AC_LINK_IFELSE([AC_LANG_PROGRAM([[
- [
- #include <execinfo.h> - #include <execinfo.h>
- ], - ]], [[
- [
- void *sym[1]; - void *sym[1];
- backtrace_symbols(&sym, sizeof(sym)) ], - backtrace_symbols(&sym, sizeof(sym)) ]])],[
- [
- AC_MSG_RESULT(yes) - AC_MSG_RESULT(yes)
- ac_cv_lib_execinfo_backtrace_symbols="yes" - ac_cv_lib_execinfo_backtrace_symbols="yes"
- ], - ],[
- [
- AC_MSG_RESULT(no) - AC_MSG_RESULT(no)
- ] - ])
- )
+ smart_try_dir=$execinfo_lib_dir + smart_try_dir=$execinfo_lib_dir
+ FR_SMART_CHECK_LIB(execinfo, backtrace_symbols) + FR_SMART_CHECK_LIB(execinfo, backtrace_symbols)
fi fi

4
package/freeradius-server/freeradius-server.hash
View File

@@ -1,4 +1,4 @@
# Locally computed, after checking # Locally computed, after checking
# ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-3.2.0.tar.bz2.sig # ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-3.2.3.tar.bz2.sig
sha256 a3071cd78ffcb4706217561d822ee4c760daeb277a63f36a9f11d412c3c39e56 freeradius-server-3.2.0.tar.bz2 sha256 4a16aeffbfa1424e1f317fdf71d17e5523a4fd9564d87c747a60595ef93c5d1f freeradius-server-3.2.3.tar.bz2
sha256 0a0e46014fc2efd5144a30359c0e6e1ea9fa3dd407d3318204150efd7b4caf6a COPYRIGHT sha256 0a0e46014fc2efd5144a30359c0e6e1ea9fa3dd407d3318204150efd7b4caf6a COPYRIGHT

10
package/freeradius-server/freeradius-server.mk
View File

@@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
FREERADIUS_SERVER_VERSION = 3.2.0 FREERADIUS_SERVER_VERSION = 3.2.3
FREERADIUS_SERVER_SOURCE = \ FREERADIUS_SERVER_SOURCE = \
freeradius-server-$(FREERADIUS_SERVER_VERSION).tar.bz2 freeradius-server-$(FREERADIUS_SERVER_VERSION).tar.bz2
FREERADIUS_SERVER_SITE = ftp://ftp.freeradius.org/pub/freeradius FREERADIUS_SERVER_SITE = ftp://ftp.freeradius.org/pub/freeradius
@@ -16,10 +16,10 @@ FREERADIUS_SERVER_DEPENDENCIES = libtalloc
FREERADIUS_SERVER_AUTORECONF = YES FREERADIUS_SERVER_AUTORECONF = YES
# We're patching src/modules/rlm_krb5/configure.ac # We're patching src/modules/rlm_krb5/configure.ac
define FREERADIUS_SERVER_RUN_KRB5_AUTOCONF define FREERADIUS_SERVER_RUN_KRB5_AUTORECONF
cd $(@D)/src/modules/rlm_krb5; $(AUTOCONF) -I$(@D) cd $(@D)/src/modules/rlm_krb5; $(AUTORECONF) -I$(@D)/m4
endef endef
FREERADIUS_SERVER_PRE_CONFIGURE_HOOKS += FREERADIUS_SERVER_RUN_KRB5_AUTOCONF FREERADIUS_SERVER_PRE_CONFIGURE_HOOKS += FREERADIUS_SERVER_RUN_KRB5_AUTORECONF
# some compiler checks are not supported while cross compiling. # some compiler checks are not supported while cross compiling.
# instead of removing those checks, we cache the answers # instead of removing those checks, we cache the answers
@@ -73,11 +73,13 @@ endif
ifeq ($(BR2_PACKAGE_HIREDIS),y) ifeq ($(BR2_PACKAGE_HIREDIS),y)
FREERADIUS_SERVER_CONF_OPTS += \ FREERADIUS_SERVER_CONF_OPTS += \
--with-rlm_cache_redis \
--with-rlm_redis \ --with-rlm_redis \
--with-rlm_rediswho --with-rlm_rediswho
FREERADIUS_SERVER_DEPENDENCIES += hiredis FREERADIUS_SERVER_DEPENDENCIES += hiredis
else else
FREERADIUS_SERVER_CONF_OPTS += \ FREERADIUS_SERVER_CONF_OPTS += \
--without-rlm_cache_redis \
--without-rlm_redis \ --without-rlm_redis \
--without-rlm_rediswho --without-rlm_rediswho
endif endif