From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 2/2] Revert "freeradius: Build without SSL"
Date: Wed, 28 Aug 2019 10:16:51 +0000
Message-ID: <20190828101651.28667-2-michael.tremer@ipfire.org>
In-Reply-To: <20190828101651.28667-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5567390447795916104=="
List-Id: <development.lists.ipfire.org>

--===============5567390447795916104==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This reverts commit 071d7754f7b955b28f7e3b5f3eb44fbaa93eb4e9.

Fixes: #12139

Signed-off-by: Michael Tremer <michael.tremer(a)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    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D freeradius
-PAK_VER    =3D 9
+PAK_VER    =3D 10
=20
 DEPS       =3D "samba"
=20
@@ -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 \
--=20
2.20.1


--===============5567390447795916104==--