Signed-off-by: Michael Tremer michael.tremer@ipfire.org --- config/rootfiles/packages/freeradius | 5 +++++ lfs/freeradius | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/config/rootfiles/packages/freeradius b/config/rootfiles/packages/freeradius index 9cbd214ac..c193dcabd 100644 --- a/config/rootfiles/packages/freeradius +++ b/config/rootfiles/packages/freeradius @@ -1,3 +1,4 @@ +etc/logrotate.d/freeradius etc/raddb #etc/raddb/README.rst #etc/raddb/certs @@ -135,6 +136,7 @@ etc/raddb #etc/raddb/mods-config/sql/ippool/mysql/queries.conf #etc/raddb/mods-config/sql/ippool/mysql/schema.sql #etc/raddb/mods-config/sql/ippool/postgresql +#etc/raddb/mods-config/sql/ippool/postgresql/procedure.sql #etc/raddb/mods-config/sql/ippool/postgresql/queries.conf #etc/raddb/mods-config/sql/ippool/postgresql/schema.sql #etc/raddb/mods-config/sql/ippool/sqlite @@ -327,6 +329,7 @@ usr/bin/smbencrypt #usr/include/freeradius/rfc7499.h #usr/include/freeradius/rfc7930.h #usr/include/freeradius/rfc8045.h +#usr/include/freeradius/rfc8559.h #usr/include/freeradius/sha1.h #usr/include/freeradius/stats.h #usr/include/freeradius/sysutmp.h @@ -792,6 +795,7 @@ usr/share/freeradius #usr/share/freeradius/dictionary.paloalto #usr/share/freeradius/dictionary.patton #usr/share/freeradius/dictionary.perle +#usr/share/freeradius/dictionary.pfsense #usr/share/freeradius/dictionary.propel #usr/share/freeradius/dictionary.prosoft #usr/share/freeradius/dictionary.proxim @@ -832,6 +836,7 @@ usr/share/freeradius #usr/share/freeradius/dictionary.rfc7499 #usr/share/freeradius/dictionary.rfc7930 #usr/share/freeradius/dictionary.rfc8045 +#usr/share/freeradius/dictionary.rfc8559 #usr/share/freeradius/dictionary.riverbed #usr/share/freeradius/dictionary.riverstone #usr/share/freeradius/dictionary.roaringpenguin diff --git a/lfs/freeradius b/lfs/freeradius index 4afe55f18..daa8a7915 100644 --- a/lfs/freeradius +++ b/lfs/freeradius @@ -24,15 +24,15 @@
include Config
-VER = 3.0.18 +VER = 3.0.19
THISAPP = freeradius-server-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = freeradius -PAK_VER = 8 +PAK_VER = 9
DEPS = "samba"
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 05f0c8c7ac79659f808ff31751daa857 +$(DL_FILE)_MD5 = 3e4048353931eda01f03ef89039f0651
install : $(TARGET)
@@ -80,7 +80,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @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) && \
This reverts commit 071d7754f7b955b28f7e3b5f3eb44fbaa93eb4e9.
Fixes: #12139
Signed-off-by: Michael Tremer michael.tremer@ipfire.org --- config/rootfiles/packages/freeradius | 22 ++++++++++++++++++++++ lfs/freeradius | 4 ++-- 2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/config/rootfiles/packages/freeradius b/config/rootfiles/packages/freeradius index c193dcabd..0cf0a1be9 100644 --- a/config/rootfiles/packages/freeradius +++ b/config/rootfiles/packages/freeradius @@ -8,6 +8,7 @@ etc/raddb #etc/raddb/certs/ca.cnf #etc/raddb/certs/client.cnf #etc/raddb/certs/inner-server.cnf +#etc/raddb/certs/passwords.mk #etc/raddb/certs/server.cnf #etc/raddb/certs/xpextensions #etc/raddb/clients.conf @@ -397,6 +398,9 @@ usr/lib/freeradius/rlm_dynamic_clients.so #usr/lib/freeradius/rlm_eap.a #usr/lib/freeradius/rlm_eap.la usr/lib/freeradius/rlm_eap.so +#usr/lib/freeradius/rlm_eap_fast.a +#usr/lib/freeradius/rlm_eap_fast.la +usr/lib/freeradius/rlm_eap_fast.so #usr/lib/freeradius/rlm_eap_gtc.a #usr/lib/freeradius/rlm_eap_gtc.la usr/lib/freeradius/rlm_eap_gtc.so @@ -409,9 +413,21 @@ usr/lib/freeradius/rlm_eap_md5.so #usr/lib/freeradius/rlm_eap_mschapv2.a #usr/lib/freeradius/rlm_eap_mschapv2.la usr/lib/freeradius/rlm_eap_mschapv2.so +#usr/lib/freeradius/rlm_eap_peap.a +#usr/lib/freeradius/rlm_eap_peap.la +usr/lib/freeradius/rlm_eap_peap.so +#usr/lib/freeradius/rlm_eap_pwd.a +#usr/lib/freeradius/rlm_eap_pwd.la +usr/lib/freeradius/rlm_eap_pwd.so #usr/lib/freeradius/rlm_eap_sim.a #usr/lib/freeradius/rlm_eap_sim.la usr/lib/freeradius/rlm_eap_sim.so +#usr/lib/freeradius/rlm_eap_tls.a +#usr/lib/freeradius/rlm_eap_tls.la +usr/lib/freeradius/rlm_eap_tls.so +#usr/lib/freeradius/rlm_eap_ttls.a +#usr/lib/freeradius/rlm_eap_ttls.la +usr/lib/freeradius/rlm_eap_ttls.so #usr/lib/freeradius/rlm_exec.a #usr/lib/freeradius/rlm_exec.la usr/lib/freeradius/rlm_exec.so @@ -442,6 +458,9 @@ usr/lib/freeradius/rlm_logintime.so #usr/lib/freeradius/rlm_mschap.a #usr/lib/freeradius/rlm_mschap.la usr/lib/freeradius/rlm_mschap.so +#usr/lib/freeradius/rlm_otp.a +#usr/lib/freeradius/rlm_otp.la +usr/lib/freeradius/rlm_otp.so #usr/lib/freeradius/rlm_pam.a #usr/lib/freeradius/rlm_pam.la usr/lib/freeradius/rlm_pam.so @@ -501,6 +520,9 @@ usr/lib/freeradius/rlm_unpack.so #usr/lib/freeradius/rlm_utf8.a #usr/lib/freeradius/rlm_utf8.la usr/lib/freeradius/rlm_utf8.so +#usr/lib/freeradius/rlm_wimax.a +#usr/lib/freeradius/rlm_wimax.la +usr/lib/freeradius/rlm_wimax.so #usr/lib/freeradius/rlm_yubikey.a #usr/lib/freeradius/rlm_yubikey.la usr/lib/freeradius/rlm_yubikey.so diff --git a/lfs/freeradius b/lfs/freeradius index daa8a7915..1417f422d 100644 --- a/lfs/freeradius +++ b/lfs/freeradius @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = freeradius -PAK_VER = 9 +PAK_VER = 10
DEPS = "samba"
@@ -92,8 +92,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --with-system-libtool \ --with-threads \ --with-thread-pool \ - --without-openssl \ --disable-ltdl-install \ + --disable-openssl-version-check \ --without-rlm_eap_ikev2 \ --without-rlm_sql_iodbc \ --without-rlm_sql_firebird \
-
Michael Tremer