From a39763273e96bbd4592bebef5f38619ed51233ff Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 2 Mar 2024 11:39:46 +0100
Subject: freeradius-server: update to 3.2.3

---
 package/freeradius-server/Makefile                 |  27 ++--
 .../freeradius-server/patches/patch-acinclude_m4   | 164 ---------------------
 .../patches/patch-scripts_libtool_mk               |  14 +-
 .../patches/patch-src_include_threads_h            |  19 +--
 4 files changed, 32 insertions(+), 192 deletions(-)
 delete mode 100644 package/freeradius-server/patches/patch-acinclude_m4

diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile
index 5644f8afe..b9c1f12f2 100644
--- a/package/freeradius-server/Makefile
+++ b/package/freeradius-server/Makefile
@@ -4,16 +4,16 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		freeradius-server
-PKG_VERSION:=		3.0.21
+PKG_VERSION:=		3.2.3
 PKG_RELEASE:=		1
-PKG_HASH:=		2bf914d471d4409fd72e708e308fa32ca8d01d698c518497a1d4b867d50132ae
+PKG_HASH:=		4bde047122e588c63fe2d599a73f7ab9a863806f9e716e88a3d77080b482c577
 PKG_DESCR:=		flexible radius server
 PKG_SECTION:=		net/radius
 PKG_DEPENDS:=		libltdl libpcre libtalloc libressl libatomic
 PKG_BUILDDEP:=		libtool pcre talloc libressl
 PKG_NEEDS:=		threads
 PKG_URL:=		http://www.freeradius.org/
-PKG_SITES:=		ftp://ftp.freeradius.org/pub/radius/
+PKG_SITES:=		https://github.com/FreeRADIUS/freeradius-server/releases/download/release_3_2_3/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
@@ -71,7 +71,7 @@ endif
 
 ifneq (${ADK_PACKAGE_FREERADIUS_MOD_SQL_MYSQL},)
 PKG_CONFIGURE_LIBS+=	-lz
-PKG_CONFIGURE_OPTS+=	--with-mysql-include-dir="${STAGING_TARGET_DIR}/usr/include" \
+PKG_CONFIGURE_OPTS+=	--with-mysql-include-dir="${STAGING_TARGET_DIR}/usr/include/mysql" \
 			--with-mysql-lib-dir="${STAGING_TARGET_DIR}/usr/lib/mysql" \
 			--without-threads \
 			--with-rlm_sql
@@ -134,14 +134,14 @@ $(eval $(call PKG_mod_template,FREERADIUS_MOD_SQL,rlm_sql,))
 $(eval $(call PKG_mod_template,FREERADIUS_MOD_SQL_MYSQL,rlm_sql_mysql,))
 $(eval $(call PKG_mod_template,FREERADIUS_MOD_SQL_PGSQL,rlm_sql_postgresql,))
 
-AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ARGS+=	${PKG_CONFIGURE_OPTS} \
 			--libdir=/usr/lib/freeradius \
 			--libexecdir=/usr/lib/freeradius \
 			--disable-openssl-version-check \
 			--with-execinfo-include-dir=/dev/null \
-			--with-openssl-includes=${STAGING_TARGET_DIR}/usr/include \
-			--with-openssl-libraries=${STAGING_TARGET_DIR}/usr/lib \
+			--with-threads=yes \
+			--with-openssl-include-dir=${STAGING_TARGET_DIR}/usr/include \
+			--with-openssl-lib-dir=${STAGING_TARGET_DIR}/usr/lib \
 			--with-system-libltld \
 			--enable-strict-dependencies \
 			--with-raddbdir=/etc/freeradius \
@@ -157,15 +157,17 @@ CONFIGURE_ARGS+=	${PKG_CONFIGURE_OPTS} \
 			--without-rlm_eap_sim \
 			--without-rlm_example \
 			--without-rlm_ippool \
+			--without-rlm_json \
 			--without-rlm_krb5 \
 			--without-rlm_otp \
 			--without-rlm_smsotp \
 			--without-rlm_pam \
 			--without-rlm_perl \
-			--without-rlm_python \
+			--without-rlm_python3 \
 			--without-rlm_radutmp \
 			--without-rlm_rest \
 			--without-rlm_ruby \
+			--without-rlm_python \
 			--without-rlm_smb \
 			--without-rlm_sqlcounter \
 			--without-rlm_sql_db2 \
@@ -176,7 +178,9 @@ CONFIGURE_ARGS+=	${PKG_CONFIGURE_OPTS} \
 			--without-rlm_sql_unixodbc \
 			--without-rlm_sql_log \
 			--without-rlm_redis \
+			--without-rlm_cache_redis \
 			--without-rlm_rediswho \
+			--without-rlm_unbound \
 			--without-rlm_unix \
 			--without-rlm_eap_ikev2 \
 			--without-rlm_eap_tnc \
@@ -187,9 +191,10 @@ CONFIGURE_ARGS+=	${PKG_CONFIGURE_OPTS} \
 CONFIGURE_ENV+=		ax_cv_cc_builtin_choose_expr=yes \
 			ax_cv_cc_builtin_types_compatible_p=yes \
 			ax_cv_cc_builtin_bswap64=yes \
-			ax_cv_cc_bounded_attribute=yes
-FAKE_FLAGS+=		R="${WRKINST}" \
-			INSTALLSTRIP=""
+			ax_cv_cc_bounded_attribute=yes \
+FAKE_FLAGS+=		INSTALLSTRIP=""
+MAKE_ENV+=		VERBOSE=1 \
+			R="$(WRKINST)"
 
 freeradius-server-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
 	-${INSTALL_DIR} ${IDIR_FREERADIUS_SERVER}/etc/freeradius
diff --git a/package/freeradius-server/patches/patch-acinclude_m4 b/package/freeradius-server/patches/patch-acinclude_m4
deleted file mode 100644
index f1cefae77..000000000
--- a/package/freeradius-server/patches/patch-acinclude_m4
+++ /dev/null
@@ -1,164 +0,0 @@
---- freeradius-server-3.0.8.orig/acinclude.m4	2015-04-22 19:21:34.000000000 +0200
-+++ freeradius-server-3.0.8/acinclude.m4	2015-05-13 22:13:54.000000000 +0200
-@@ -218,22 +218,22 @@ ac_safe=`echo "$1" | sed 'y%./+-%__pm%'`
- old_CPPFLAGS="$CPPFLAGS"
- smart_include=
- dnl #  The default directories we search in (in addition to the compilers search path)
--smart_include_dir="/usr/local/include /opt/include"
-+dnl smart_include_dir="/usr/local/include /opt/include"
- 
- dnl #  Our local versions
- _smart_try_dir=
- _smart_include_dir=
- 
- dnl #  Add variants with the different prefixes and one with no prefix
--for _prefix in $smart_prefix ""; do
--  for _dir in $smart_try_dir; do
--    _smart_try_dir="${_smart_try_dir} ${_dir}/${_prefix}"
--  done
--
--  for _dir in $smart_include_dir; do
--    _smart_include_dir="${_smart_include_dir} ${_dir}/${_prefix}"
--  done
--done
-+dnl for _prefix in $smart_prefix ""; do
-+dnl   for _dir in $smart_try_dir; do
-+dnl     _smart_try_dir="${_smart_try_dir} ${_dir}/${_prefix}"
-+dnl   done
-+dnl 
-+dnl   for _dir in $smart_include_dir; do
-+dnl     _smart_include_dir="${_smart_include_dir} ${_dir}/${_prefix}"
-+dnl   done
-+dnl done
- 
- dnl #
- dnl #  Try any user-specified directory first otherwise we may pick up
-@@ -262,73 +262,73 @@ fi
- dnl #
- dnl #  Try using the default includes (with prefixes).
- dnl #
--if test "x$smart_include" = "x"; then
--  for _prefix in $smart_prefix; do
--    AC_MSG_CHECKING([for ${_prefix}/$1])
--
--    AC_TRY_COMPILE([$2
--		    #include <$1>],
--		   [int a = 1;],
--		   [
--		     smart_include="-isystem ${_prefix}/"
--		     AC_MSG_RESULT(yes)
--		     break
--		   ],
--		   [
--		     smart_include=
--		     AC_MSG_RESULT(no)
--		   ])
--  done
--fi
-+dnl if test "x$smart_include" = "x"; then
-+dnl   for _prefix in $smart_prefix; do
-+dnl     AC_MSG_CHECKING([for ${_prefix}/$1])
-+dnl 
-+dnl    AC_TRY_COMPILE([$2
-+dnl 		    #include <$1>],
-+dnl 		   [int a = 1;],
-+dnl 		   [
-+dnl 		     smart_include="-isystem ${_prefix}/"
-+dnl 		     AC_MSG_RESULT(yes)
-+dnl 		     break
-+dnl 		   ],
-+dnl 		   [
-+dnl 		     smart_include=
-+dnl 		     AC_MSG_RESULT(no)
-+dnl 		   ])
-+dnl   done
-+dnl fi
- 
- dnl #
- dnl #  Try using the default includes (without prefixes).
- dnl #
- if test "x$smart_include" = "x"; then
--    AC_MSG_CHECKING([for $1])
--
--    AC_TRY_COMPILE([$2
-+     AC_MSG_CHECKING([for $1])
-+ 
-+     AC_TRY_COMPILE([$2
- 		    #include <$1>],
--		   [int a = 1;],
--		   [
--		     smart_include=" "
--		     AC_MSG_RESULT(yes)
--		     break
--		   ],
--		   [
--		     smart_include=
-+ 		   [int a = 1;],
-+ 		   [
-+ 		     smart_include=" "
-+ 		     AC_MSG_RESULT(yes)
-+ 		     break
-+ 		   ],
-+ 		   [
-+ 		     smart_include=
- 		     AC_MSG_RESULT(no)
--		   ])
-+ 		   ])
- fi
- 
- dnl #
- dnl #  Try to guess possible locations.
- dnl #
--if test "x$smart_include" = "x"; then
--
--  for prefix in $smart_prefix; do
--    FR_LOCATE_DIR(_smart_include_dir,"${_prefix}/${1}")
--  done
--  FR_LOCATE_DIR(_smart_include_dir, $1)
--
--  for try in $_smart_include_dir; do
--    AC_MSG_CHECKING([for $1 in $try])
--    CPPFLAGS="-isystem $try $old_CPPFLAGS"
--    AC_TRY_COMPILE([$2
--		    #include <$1>],
--		   [int a = 1;],
--		   [
--		     smart_include="-isystem $try"
--		     AC_MSG_RESULT(yes)
--		     break
--		   ],
--		   [
--		     smart_include=
--		     AC_MSG_RESULT(no)
--		   ])
--  done
--  CPPFLAGS="$old_CPPFLAGS"
--fi
-+dnl if test "x$smart_include" = "x"; then
-+dnl 
-+dnl   for prefix in $smart_prefix; do
-+dnl     FR_LOCATE_DIR(_smart_include_dir,"${_prefix}/${1}")
-+dnl   done
-+dnl   FR_LOCATE_DIR(_smart_include_dir, $1)
-+dnl 
-+dnl   for try in $_smart_include_dir; do
-+dnl    AC_MSG_CHECKING([for $1 in $try])
-+dnl     CPPFLAGS="-isystem $try $old_CPPFLAGS"
-+dnl     AC_TRY_COMPILE([$2
-+dnl 		    #include <$1>],
-+dnl 		   [int a = 1;],
-+dnl 		   [
-+dnl 		     smart_include="-isystem $try"
-+dnl 		     AC_MSG_RESULT(yes)
-+dnl 		     break
-+dnl		   ],
-+dnl		   [
-+dnl		     smart_include=
-+dnl		     AC_MSG_RESULT(no)
-+dnl		   ])
-+dnl done
-+dnl  CPPFLAGS="$old_CPPFLAGS"
-+dnl fi
- 
- dnl #
- dnl #  Found it, set the appropriate variable.
diff --git a/package/freeradius-server/patches/patch-scripts_libtool_mk b/package/freeradius-server/patches/patch-scripts_libtool_mk
index c9f83db69..bcfdeff89 100644
--- a/package/freeradius-server/patches/patch-scripts_libtool_mk
+++ b/package/freeradius-server/patches/patch-scripts_libtool_mk
@@ -1,11 +1,13 @@
---- freeradius-server-3.0.13.orig/scripts/libtool.mk	2017-03-06 14:58:04.000000000 +0100
-+++ freeradius-server-3.0.13/scripts/libtool.mk	2017-03-30 05:46:58.583531343 +0200
-@@ -44,7 +44,7 @@ ifeq "${LIBTOOL}" "JLIBTOOL"
+--- freeradius-server-3.2.3.orig/scripts/libtool.mk	2023-05-26 15:56:52.000000000 +0200
++++ freeradius-server-3.2.3/scripts/libtool.mk	2024-02-27 03:44:17.243010645 +0100
+@@ -48,8 +48,8 @@ ifeq "${LIBTOOL}" "JLIBTOOL"
+     # binary!
      ${JLIBTOOL}: ${top_makedir}/jlibtool.c
  	$(Q)mkdir -p $(dir $@)
- 	$(Q)echo CC jlibtool.c
--	$(Q)${CC} $< -o $@
-+	$(Q)${CC_FOR_BUILD} $< -o $@
+-	$(Q)echo CC jlibtool.c
+-	$(Q)${CC} $< -o $@ ${JLIBTOOL_DEFS}
++	$(Q)echo CC_FOR_BUILD jlibtool.c
++	${CC_FOR_BUILD} $< -o $@ ${JLIBTOOL_DEFS}
  
      clean: jlibtool_clean
  
diff --git a/package/freeradius-server/patches/patch-src_include_threads_h b/package/freeradius-server/patches/patch-src_include_threads_h
index 4626536e4..3011af0a9 100644
--- a/package/freeradius-server/patches/patch-src_include_threads_h
+++ b/package/freeradius-server/patches/patch-src_include_threads_h
@@ -1,10 +1,6 @@
-	fix for:
-	| src/lib/log.c:37:31: error: 'fr_strerror_buffer' undeclared (first use in this function)
-	found in https://github.com/Optware/Optware-ng/commit/6ece960830b3291bc4ad5780cdb49b0a377aab2e
-
---- freeradius-server-3.0.21.orig/src/include/threads.h	2020-03-24 15:55:09.000000000 +0100
-+++ freeradius-server-3.0.21/src/include/threads.h	2021-02-16 03:54:58.449715370 +0100
-@@ -89,7 +89,7 @@ static _t __fr_thread_local_init_##_n(pt
+--- freeradius-server-3.2.3.orig/src/include/threads.h	2023-05-26 15:56:52.000000000 +0200
++++ freeradius-server-3.2.3/src/include/threads.h	2024-02-27 04:03:53.806994686 +0100
+@@ -92,7 +92,7 @@ static _t __fr_thread_local_init_##_n(pt
  #  define fr_thread_local_get(_n) _n
  #elif defined(HAVE_PTHREAD_H)
  #  include <pthread.h>
@@ -13,7 +9,7 @@
  static pthread_key_t __fr_thread_local_key_##_n;\
  static pthread_once_t __fr_thread_local_once_##_n = PTHREAD_ONCE_INIT;\
  static pthread_destructor_t __fr_thread_local_destructor_##_n = NULL;\
-@@ -100,17 +100,17 @@ static void __fr_thread_local_destroy_##
+@@ -103,17 +103,17 @@ static void __fr_thread_local_destroy_##
  static void __fr_thread_local_key_init_##_n(void)\
  {\
  	(void) pthread_key_create(&__fr_thread_local_key_##_n, __fr_thread_local_destroy_##_n);\
@@ -27,10 +23,11 @@
 +	(void) pthread_setspecific(__fr_thread_local_key_##_n, &(_n));\
  	return _n;\
  }
- #  define fr_thread_local_init(_n, _f)			__fr_thread_local_init_##_n(_f)
+-#  define fr_thread_local_init(_n, _f)			__fr_thread_local_init_##_n(_f)
 -#  define fr_thread_local_set(_n, _v)			__fr_thread_local_set_##_n(_v)
 -#  define fr_thread_local_get(_n)			__fr_thread_local_get_##_n()
-+#  define fr_thread_local_set(_n, _v)			((int)!((_n = _v) || 1))
-+#  define fr_thread_local_get(_n)			_n
++#  define fr_thread_local_init(_n, _f)	__fr_thread_local_init_##_n(_f)
++#  define fr_thread_local_set(_n, _v) ((int)!((_n = _v) || 1))
++#  define fr_thread_local_get(_n) _n
  #endif
  #endif
-- 
cgit v1.2.3