Revert "freeradius: Build without SSL"

This reverts commit 071d7754f7b955b28f7e3b5f3eb44fbaa93eb4e9.

Fixes: #12139
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/packages/freeradius b/config/rootfiles/packages/freeradius
index c193dcabd1ee735d304042b006ccc6e79910dced..0cf0a1be98e127459ee02d7e3bc982ef7777eec4 100644 (file)
--- 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 daa8a7915b78a0b58005349eb29deb46d0cf43ec..1417f422d644e78147071ec0d4ce75d7e8245c27 100644 (file)
--- 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 \