From 4155139365247ea702bb536848dd1e771f98f0d2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 4 Nov 2023 15:05:24 +0100 Subject: [PATCH] package/freeradius-server: bump to version 3.2.3 - Refresh patches - autoconf must be switched to autoreconf because of https://github.com/FreeRADIUS/freeradius-server/commit/7cd23f2de660fc07bdd53816c646e7600f57b8dd - redis cache module is available since https://github.com/FreeRADIUS/freeradius-server/commit/575bff481005f060abb7d1a2f5e6dacda41dcbec https://github.com/FreeRADIUS/freeradius-server/blob/release_3_2_3/doc/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-jlibtool-cross-with-host-CC.patch | 7 ++-- ...configure.ac-allow-cross-compilation.patch | 20 ++++++----- ...-execinfo-in-libc-before-searching-l.patch | 34 +++++++------------ .../freeradius-server/freeradius-server.hash | 4 +-- .../freeradius-server/freeradius-server.mk | 10 +++--- 5 files changed, 37 insertions(+), 38 deletions(-) diff --git a/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch b/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch index 398f88e4ad..0cd55071c4 100644 --- a/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch +++ b/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch @@ -9,6 +9,8 @@ Upstream: Not applicable Signed-off-by: David Gouarin Signed-off-by: Matt Weber +[Fabrice: update for 3.2.3] +SIgned-off-by: Fabrice Fontaine --- scripts/libtool.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) @@ -18,13 +20,14 @@ index 57915e1053..c28260dd7e 100644 --- a/scripts/libtool.mk +++ b/scripts/libtool.mk @@ -43,8 +43,8 @@ ifeq "${LIBTOOL}" "JLIBTOOL" + # binary! ${JLIBTOOL}: ${top_makedir}/jlibtool.c $(Q)mkdir -p $(dir $@) - $(Q)echo CC jlibtool.c -- $(Q)${CC} $< -o $@ +- $(Q)${CC} $< -o $@ ${JLIBTOOL_DEFS} + $(Q)echo HOSTCC jlibtool.c -+ $(Q)${HOSTCC} $< -o $@ ++ $(Q)${HOSTCC} $< -o $@ ${JLIBTOOL_DEFS} clean: jlibtool_clean diff --git a/package/freeradius-server/0003-configure.ac-allow-cross-compilation.patch b/package/freeradius-server/0003-configure.ac-allow-cross-compilation.patch index d6d1bcfc78..a34c872af7 100644 --- a/package/freeradius-server/0003-configure.ac-allow-cross-compilation.patch +++ b/package/freeradius-server/0003-configure.ac-allow-cross-compilation.patch @@ -19,6 +19,8 @@ Fetch from: http://cgit.openembedded.org/meta-openembedded/tree/meta-networking/ Signed-off-by: David Gouarin Signed-off-by: Matt Weber Upstream: https://github.com/FreeRADIUS/freeradius-server/pull/4632 +[Fabrice: update for 3.2.3] +Signed-off-by: Fabrice Fontaine --- src/modules/rlm_krb5/configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) @@ -28,15 +30,15 @@ index efc9f29d7f..98a97e438a 100644 --- a/src/modules/rlm_krb5/configure.ac +++ b/src/modules/rlm_krb5/configure.ac @@ -137,7 +137,8 @@ if test x$with_[]modname != xno; then - FR_SMART_CHECK_LIB(krb5, krb5_is_thread_safe) - if test "x$ac_cv_lib_krb5_krb5_is_thread_safe" = xyes; then - AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include ]], [[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]])], -+ [AC_MSG_WARN(cross compiling: not checking)]) - fi - else - krb5threadsafe="" + FR_SMART_CHECK_LIB(krb5, krb5_is_thread_safe) + if test "x$ac_cv_lib_krb5_krb5_is_thread_safe" = xyes; then + AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include ]], [[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]])], ++ [AC_MSG_WARN(cross compiling: not checking)]) + fi + else + krb5threadsafe="" -- 2.17.1 diff --git a/package/freeradius-server/0008-configure.ac-try-execinfo-in-libc-before-searching-l.patch b/package/freeradius-server/0008-configure.ac-try-execinfo-in-libc-before-searching-l.patch index b4cbc61a89..6633bd2786 100644 --- a/package/freeradius-server/0008-configure.ac-try-execinfo-in-libc-before-searching-l.patch +++ b/package/freeradius-server/0008-configure.ac-try-execinfo-in-libc-before-searching-l.patch @@ -12,6 +12,8 @@ FR_SMART_CHECK_LIB can find an incompatible library. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Upstream: https://github.com/FreeRADIUS/freeradius-server/pull/4632 +[Fabrice: update for 3.2.3] +Signed-off-by: Fabrice Fontaine --- configure.ac | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) @@ -20,7 +22,7 @@ diff --git a/configure.ac b/configure.ac index f431da6db5..faa7cfc2b4 100644 --- a/configure.ac +++ b/configure.ac -@@ -2165,26 +2165,26 @@ dnl # +@@ -2165,21 +2165,21 @@ dnl # smart_try_dir=$execinfo_include_dir FR_SMART_CHECK_INCLUDE(execinfo.h) 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) + dnl # Might be 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 -+ ], -+ [ ++ ]], [[ + void *sym[1]; -+ backtrace_symbols(&sym, sizeof(sym)) ], -+ [ ++ backtrace_symbols(&sym, sizeof(sym)) ]])],[ + AC_MSG_RESULT(yes) + ac_cv_lib_execinfo_backtrace_symbols="yes" -+ ], -+ [ ++ ],[ + AC_MSG_RESULT(no) -+ ] -+ ) ++ ]) if test "x$ac_cv_lib_execinfo_backtrace_symbols" != "xyes"; then - dnl # Might be 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 -- ], -- [ +- ]], [[ - void *sym[1]; -- backtrace_symbols(&sym, sizeof(sym)) ], -- [ +- backtrace_symbols(&sym, sizeof(sym)) ]])],[ - AC_MSG_RESULT(yes) - ac_cv_lib_execinfo_backtrace_symbols="yes" -- ], -- [ +- ],[ - AC_MSG_RESULT(no) -- ] -- ) +- ]) + smart_try_dir=$execinfo_lib_dir + FR_SMART_CHECK_LIB(execinfo, backtrace_symbols) fi diff --git a/package/freeradius-server/freeradius-server.hash b/package/freeradius-server/freeradius-server.hash index 33ec09e7b0..a267bd6f8c 100644 --- a/package/freeradius-server/freeradius-server.hash +++ b/package/freeradius-server/freeradius-server.hash @@ -1,4 +1,4 @@ # Locally computed, after checking -# ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-3.2.0.tar.bz2.sig -sha256 a3071cd78ffcb4706217561d822ee4c760daeb277a63f36a9f11d412c3c39e56 freeradius-server-3.2.0.tar.bz2 +# ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-3.2.3.tar.bz2.sig +sha256 4a16aeffbfa1424e1f317fdf71d17e5523a4fd9564d87c747a60595ef93c5d1f freeradius-server-3.2.3.tar.bz2 sha256 0a0e46014fc2efd5144a30359c0e6e1ea9fa3dd407d3318204150efd7b4caf6a COPYRIGHT diff --git a/package/freeradius-server/freeradius-server.mk b/package/freeradius-server/freeradius-server.mk index 5a560d9153..2dd9c4e609 100644 --- a/package/freeradius-server/freeradius-server.mk +++ b/package/freeradius-server/freeradius-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERADIUS_SERVER_VERSION = 3.2.0 +FREERADIUS_SERVER_VERSION = 3.2.3 FREERADIUS_SERVER_SOURCE = \ freeradius-server-$(FREERADIUS_SERVER_VERSION).tar.bz2 FREERADIUS_SERVER_SITE = ftp://ftp.freeradius.org/pub/freeradius @@ -16,10 +16,10 @@ FREERADIUS_SERVER_DEPENDENCIES = libtalloc FREERADIUS_SERVER_AUTORECONF = YES # We're patching src/modules/rlm_krb5/configure.ac -define FREERADIUS_SERVER_RUN_KRB5_AUTOCONF - cd $(@D)/src/modules/rlm_krb5; $(AUTOCONF) -I$(@D) +define FREERADIUS_SERVER_RUN_KRB5_AUTORECONF + cd $(@D)/src/modules/rlm_krb5; $(AUTORECONF) -I$(@D)/m4 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. # instead of removing those checks, we cache the answers @@ -73,11 +73,13 @@ endif ifeq ($(BR2_PACKAGE_HIREDIS),y) FREERADIUS_SERVER_CONF_OPTS += \ + --with-rlm_cache_redis \ --with-rlm_redis \ --with-rlm_rediswho FREERADIUS_SERVER_DEPENDENCIES += hiredis else FREERADIUS_SERVER_CONF_OPTS += \ + --without-rlm_cache_redis \ --without-rlm_redis \ --without-rlm_rediswho endif