X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Ffreeradius;h=967a0048352aec8c843470cd4dd4dfbcb77b7003;hp=8435684df8de8bebe5c2ce0fd0f515565c398311;hb=HEAD;hpb=eee037b8902c3163850069f302479e7733966bd0

diff --git a/lfs/freeradius b/lfs/freeradius
index 8435684df8..df59bd63b9 100644
--- a/lfs/freeradius
+++ b/lfs/freeradius
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2024  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,17 +24,21 @@
 
 include Config
 
-VER        = 3.0.14
+SUMMARY    = RADIUS Server
+
+VER        = 3.2.3
 
 THISAPP    = freeradius-server-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = freeradius
-PAK_VER    = 3
+PAK_VER    = 20
+
+DEPS       = libtalloc samba
 
-DEPS       = "samba"
+SERVICES   = freeradius
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 71f0593f68e6d4dd2efc47a61219643d
+$(DL_FILE)_BLAKE2 = 525204331a5b123dac7457c6adb755cbe9794dbff4a536ea665fc7d1cac97553e392b7b598741c2a9dd00c81decd00608499d6f25208e389b9f213f54977de84
 
 install : $(TARGET)
 
@@ -52,13 +56,13 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
-dist: 
+dist:
 	@$(PAK)
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -67,8 +71,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
 	@$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-	@$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+	@$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -77,6 +81,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/freeradius-no-buildtime-cert-gen.patch
 	$(UPDATE_AUTOMAKE)
 	cd $(DIR_APP) && \
 		./configure \
@@ -88,13 +93,16 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 			--with-threads \
 			--with-thread-pool \
 			--disable-ltdl-install \
+			--disable-openssl-version-check \
 			--without-rlm_eap_ikev2 \
 			--without-rlm_sql_iodbc \
 			--without-rlm_sql_firebird \
 			--without-rlm_sql_db2 \
 			--without-rlm_sql_oracle \
 			--without-rlm_sql_sqlite \
-			--without-rlm_sql_mysql
+			--without-rlm_sql_mysql \
+			--without-rlm_python \
+			LDFLAGS="$(LDFLAGS)"
 
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
@@ -134,8 +142,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	install -v -m 644 $(DIR_SRC)/config/backup/includes/freeradius \
 		/var/ipfire/backup/addons/includes/freeradius
 
+	# Logrotate
+	-mkdir -pv /etc/logrotate.d
+	install -v -m 644 $(DIR_SRC)/config/freeradius/logrotate \
+		/etc/logrotate.d/freeradius
+
 	#install initscripts
-	$(call INSTALL_INITSCRIPT,freeradius)
+	$(call INSTALL_INITSCRIPTS,$(SERVICES))
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)