Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 22 Oct 2016 21:07:00 +0000 (UTC)
From:      Ryan Steinmetz <zi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r424487 - head/net/freeradius3
Message-ID:  <201610222107.u9ML70kc018360@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: zi
Date: Sat Oct 22 21:07:00 2016
New Revision: 424487
URL: https://svnweb.freebsd.org/changeset/ports/424487

Log:
  - Resolve build failure under 9.3

Modified:
  head/net/freeradius3/Makefile
  head/net/freeradius3/pkg-plist

Modified: head/net/freeradius3/Makefile
==============================================================================
--- head/net/freeradius3/Makefile	Sat Oct 22 20:41:16 2016	(r424486)
+++ head/net/freeradius3/Makefile	Sat Oct 22 21:07:00 2016	(r424487)
@@ -286,6 +286,14 @@ CONFIGURE_ARGS+=--with-udpfromto
 WITH_OPENSSL_PORT=yes
 .endif
 
+# rlm_eap_fast is currently broken under 9.x:
+# https://github.com/FreeRADIUS/freeradius-server/issues/1803
+.if ${OSVERSION} < 1000015
+PLIST_SUB+=     EAPFAST="@comment "
+.else
+PLIST_SUB+=     EAPFAST=""
+.endif
+
 .include <bsd.port.pre.mk>
 
 # if we're installing, place sample configs into ${EXAMPLESDIR}
@@ -342,6 +350,9 @@ SUB_LIST+=	RADIUS_USER="${RADIUS_USER}" 
 SUB_LIST+=	REQUIRE="${_REQUIRE}"
 
 post-patch:
+.if ${OSVERSION} < 1000015
+	${RM} -r ${WRKSRC}/src/modules/rlm_eap/types/rlm_eap_fast
+.endif
 # never try to find execinfo.h (needed until we can enable/disable backtrace
 	@${REINPLACE_CMD} -e '/#include <execinfo.h>/d' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -Ee "s:tests/all.mk ::" ${WRKSRC}/src/all.mk

Modified: head/net/freeradius3/pkg-plist
==============================================================================
--- head/net/freeradius3/pkg-plist	Sat Oct 22 20:41:16 2016	(r424486)
+++ head/net/freeradius3/pkg-plist	Sat Oct 22 21:07:00 2016	(r424487)
@@ -141,9 +141,9 @@ include/freeradius/vqp.h
 %%LIBDIR%%/rlm_eap_gtc.a
 %%LIBDIR%%/rlm_eap_gtc.la
 %%LIBDIR%%/rlm_eap_gtc.so
-%%LIBDIR%%/rlm_eap_fast.a
-%%LIBDIR%%/rlm_eap_fast.la
-%%LIBDIR%%/rlm_eap_fast.so
+%%EAPFAST%%%%LIBDIR%%/rlm_eap_fast.a
+%%EAPFAST%%%%LIBDIR%%/rlm_eap_fast.la
+%%EAPFAST%%%%LIBDIR%%/rlm_eap_fast.so
 %%LIBDIR%%/rlm_eap_leap.a
 %%LIBDIR%%/rlm_eap_leap.la
 %%LIBDIR%%/rlm_eap_leap.so



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610222107.u9ML70kc018360>