svn commit: r529853 - head/security/wpa_supplicant

[Cy Schubert]

Author: cy
Date: Mon Mar 30 02:29:04 2020
New Revision: 529853
URL: https://svnweb.freebsd.org/changeset/ports/529853

Log:
  Add DBUS option.
  
  PR:		245099
  Submitted by:	greg at unrelenting.technology

Modified:
  head/security/wpa_supplicant/Makefile   (contents, props changed)

Modified: head/security/wpa_supplicant/Makefile
==============================================================================
--- head/security/wpa_supplicant/Makefile	Mon Mar 30 02:22:09 2020	(r529852)
+++ head/security/wpa_supplicant/Makefile	Mon Mar 30 02:29:04 2020	(r529853)
@@ -2,6 +2,7 @@
 
 PORTNAME=	wpa_supplicant
 PORTVERSION=	2.9
+PORTREVISION=	1
 CATEGORIES=	security net
 MASTER_SITES=	https://w1.fi/releases/
 
@@ -39,11 +40,11 @@ OPTIONS_DEFINE=		WPS WPS_ER WPS_NOREG WPS_NFC WPS_UPNP
 			IEEE80211R DEBUG_FILE DEBUG_SYSLOG PRIVSEP \
 			DELAYED_MIC IEEE80211N IEEE80211AC INTERWORKING \
 			IEEE8021X_EAPOL \
-			HS20 NO_ROAMING P2P TDLS DOCS
+			HS20 NO_ROAMING P2P TDLS DBUS DOCS
 OPTIONS_DEFAULT=	BSD WIRED NDIS \
 			TLS PEAP TTLS MD5 MSCHAPV2 GTC LEAP OTP PSK \
 			WPS PKCS12 SMARTCARD IEEE80211R DEBUG_SYSLOG \
-			INTERWORKING HS20
+			INTERWORKING HS20 DBUS
 
 WPS_DESC=		Wi-Fi Protected Setup
 WPS_ER_DESC=		Enable WPS External Registrar
@@ -101,6 +102,8 @@ GPSK_DESC=		Generalized Pre-Shared Key
 TNC_DESC=		Trusted Network Connect
 
 PRIVSEP_PLIST_FILES=	sbin/wpa_priv
+DBUS_PLIST_FILES=	share/dbus-1/system-services/fi.w1.wpa_supplicant1.service \
+			etc/dbus-1/system.d/dbus-wpa_supplicant.conf
 
 .include <bsd.port.pre.mk>
 
@@ -118,6 +121,10 @@ CFLAGS+=	-I${LOCALBASE}/include/PCSC
 LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
 
+.if ${PORT_OPTIONS:MDBUS}
+LIB_DEPENDS+=	libdbus-1.so:devel/dbus
+.endif
+
 post-patch:
 	@${CP} ${FILESDIR}/Packet32.[ch] ${FILESDIR}/ntddndis.h \
 		${WRKSRC}/src/utils
@@ -161,6 +168,10 @@ post-patch:
 .if ${PORT_OPTIONS:MDELAYED_MIC}
 	@${ECHO_CMD} CONFIG_DELAYED_MIC_ERROR_REPORT=y >> ${CFG}
 .endif
+.if ${PORT_OPTIONS:MDBUS}
+	@${ECHO_CMD} CONFIG_CTRL_IFACE_DBUS_NEW=y >> ${CFG}
+	@${ECHO_CMD} CONFIG_CTRL_IFACE_DBUS_INTRO=y >> ${CFG}
+.endif
 	@${ECHO_CMD} CONFIG_OS=unix >> ${CFG}
 	@${ECHO_CMD} CONFIG_CTRL_IFACE=unix >> ${CFG}
 	@${ECHO_CMD} CONFIG_BACKEND=file >> ${CFG}
@@ -180,5 +191,13 @@ do-install-DOCS-on:
 
 do-install-PRIVSEP-on:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/wpa_priv ${STAGEDIR}${PREFIX}/sbin
+
+do-install-DBUS-on:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/dbus-1/system-services/
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/dbus-1/system.d/
+	${INSTALL_DATA} ${BUILD_WRKSRC}/dbus/fi.w1.wpa_supplicant1.service \
+		${STAGEDIR}${PREFIX}/share/dbus-1/system-services/
+	${INSTALL_DATA} ${BUILD_WRKSRC}/dbus/dbus-wpa_supplicant.conf \
+		${STAGEDIR}${PREFIX}/etc/dbus-1/system.d/
 
 .include <bsd.port.post.mk>