Attachment 212752 Details for Bug 245099 – wpa-dbus.patch

[patch] wpa-dbus.patch

wpa-dbus.patch (text/plain), 2.19 KB, created by Val Packett on 2020-03-27 11:56:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Val Packett

Created: 2020-03-27 11:56:03 UTC

Size: 2.19 KB

patch

obsolete

>diff --git i/security/wpa_supplicant/Makefile w/security/wpa_supplicant/Makefile
>index eb20a387fab5..98db935d810d 100644
>--- i/security/wpa_supplicant/Makefile
>+++ w/security/wpa_supplicant/Makefile
>@@ -39,11 +39,11 @@ OPTIONS_DEFINE=		WPS WPS_ER WPS_NOREG WPS_NFC WPS_UPNP PKCS12 SMARTCARD \
> 			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 +101,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 +120,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
>@@ -160,6 +166,10 @@ post-patch:
> .endif
> .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}
>@@ -181,4 +191,12 @@ 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>

Actions: View | Diff

Attachments on bug 245099: 212752