From 57feccafd38a4dc5bcdbc663f416fd0d9a624435 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 27 Aug 2024 04:23:00 +0200
Subject: freeradius-server: update to 3.2.6

---
 package/freeradius-server/Makefile                 | 10 +++++-----
 .../freeradius-server/patches/patch-raddb_all_mk   | 23 ++++++++++++++++++++++
 .../patches/patch-scripts_libtool_mk               | 12 +++++------
 3 files changed, 34 insertions(+), 11 deletions(-)
 create mode 100644 package/freeradius-server/patches/patch-raddb_all_mk

diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile
index b9c1f12f2..e58967d6b 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.2.3
+PKG_VERSION:=		3.2.6
 PKG_RELEASE:=		1
-PKG_HASH:=		4bde047122e588c63fe2d599a73f7ab9a863806f9e716e88a3d77080b482c577
+PKG_HASH:=		dfed5a53596470e8c977fa2d4d154622ad673a0717d56dd085fb5000eda32f0d
 PKG_DESCR:=		flexible radius server
 PKG_SECTION:=		net/radius
-PKG_DEPENDS:=		libltdl libpcre libtalloc libressl libatomic
-PKG_BUILDDEP:=		libtool pcre talloc libressl
+PKG_DEPENDS:=		libltdl libpcre libtalloc libopenssl libatomic libreadline
+PKG_BUILDDEP:=		libtool pcre talloc openssl readline
 PKG_NEEDS:=		threads
 PKG_URL:=		http://www.freeradius.org/
-PKG_SITES:=		https://github.com/FreeRADIUS/freeradius-server/releases/download/release_3_2_3/
+PKG_SITES:=		https://github.com/FreeRADIUS/freeradius-server/releases/download/release_3_2_6/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
diff --git a/package/freeradius-server/patches/patch-raddb_all_mk b/package/freeradius-server/patches/patch-raddb_all_mk
new file mode 100644
index 000000000..6fa765ca2
--- /dev/null
+++ b/package/freeradius-server/patches/patch-raddb_all_mk
@@ -0,0 +1,23 @@
+--- freeradius-server-3.2.6.orig/raddb/all.mk	2024-08-24 15:06:25.000000000 +0200
++++ freeradius-server-3.2.6/raddb/all.mk	2024-08-26 16:30:35.470666078 +0200
+@@ -125,20 +125,6 @@ $(R)$(raddbdir)/users: $(R)$(modconfdir)
+ 	@[ -e $@ ] || echo LN-S $(patsubst $(R)$(raddbdir)/%,raddb/%,$@)
+ 	@[ -e $@ ] || ln -s $(patsubst $(R)$(raddbdir)/%,./%,$<) $@
+ 
+-ifneq "$(LOCAL_CERT_PRODUCTS)" ""
+-$(LOCAL_CERT_PRODUCTS):
+-	@echo BOOTSTRAP raddb/certs/
+-	@$(MAKE) -C $(R)$(raddbdir)/certs/
+-
+-# Bootstrap is special
+-$(R)$(raddbdir)/certs/bootstrap: | raddb/certs/bootstrap $(LOCAL_CERT_PRODUCTS)
+-	@echo INSTALL $(patsubst $(R)$(raddbdir)/%,raddb/%,$@)
+-	@$(INSTALL) -m 750 $(patsubst $(R)$(raddbdir)/%,raddb/%,$@) $@
+-else
+-$(R)$(raddbdir)/certs/bootstrap:
+-	@echo INSTALL $(patsubst $(R)$(raddbdir)/%,raddb/%,$@)
+-	@$(INSTALL) -m 750 $(patsubst $(R)$(raddbdir)/%,raddb/%,$@) $@
+-endif
+ 
+ #  List directories before the file targets.
+ #  It's not clear why GNU Make doesn't deal well with this.
diff --git a/package/freeradius-server/patches/patch-scripts_libtool_mk b/package/freeradius-server/patches/patch-scripts_libtool_mk
index bcfdeff89..9dcbbe114 100644
--- a/package/freeradius-server/patches/patch-scripts_libtool_mk
+++ b/package/freeradius-server/patches/patch-scripts_libtool_mk
@@ -1,13 +1,13 @@
---- 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
+--- freeradius-server-3.2.6.orig/scripts/libtool.mk	2024-08-24 15:06:25.000000000 +0200
++++ freeradius-server-3.2.6/scripts/libtool.mk	2024-08-26 15:15:40.489814433 +0200
+@@ -40,8 +40,8 @@ all install: ${JLIBTOOL}
+ # binary!
+ ${JLIBTOOL}: ${top_makedir}/jlibtool.c
  	$(Q)mkdir -p $(dir $@)
 -	$(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
+ clean: jlibtool_clean
  
-- 
cgit v1.2.3