Index: stable/11/usr.sbin/wpa/Makefile.inc =================================================================== --- stable/11/usr.sbin/wpa/Makefile.inc (revision 319189) +++ stable/11/usr.sbin/wpa/Makefile.inc (revision 319190) @@ -1,38 +1,38 @@ # $FreeBSD$ BINDIR?= /usr/sbin -WPA_DISTDIR?= ${.CURDIR}/../../../contrib/wpa/ +WPA_DISTDIR?= ${SRCTOP}/contrib/wpa/ WPA_SUPPLICANT_DISTDIR?=${WPA_DISTDIR}/wpa_supplicant HOSTAPD_DISTDIR?= ${WPA_DISTDIR}/hostapd -.PATH.c:${.CURDIR}/.. \ +.PATH.c:${.CURDIR:H} \ ${WPA_DISTDIR}/src/ap \ ${WPA_DISTDIR}/src/common \ ${WPA_DISTDIR}/src/crypto \ ${WPA_DISTDIR}/src/eapol_auth \ ${WPA_DISTDIR}/src/eap_common \ ${WPA_DISTDIR}/src/eap_peer \ ${WPA_DISTDIR}/src/eap_server \ ${WPA_DISTDIR}/src/eapol_supp \ ${WPA_DISTDIR}/src/l2_packet \ ${WPA_DISTDIR}/src/radius \ ${WPA_DISTDIR}/src/rsn_supp \ ${WPA_DISTDIR}/src/tls \ ${WPA_DISTDIR}/src/utils \ ${WPA_DISTDIR}/src/wps CFLAGS+=-I${.CURDIR} CFLAGS+=-I${HOSTAPD_DISTDIR} CFLAGS+=-I${WPA_DISTDIR}/src CFLAGS+=-I${WPA_DISTDIR}/src/common CFLAGS+=-I${WPA_DISTDIR}/src/crypto CFLAGS+=-I${WPA_DISTDIR}/src/drivers CFLAGS+=-I${WPA_DISTDIR}/src/l2_packet CFLAGS+=-I${WPA_DISTDIR}/src/utils CFLAGS+=-I${WPA_DISTDIR}/src/wps CFLAGS+= -DCONFIG_CTRL_IFACE CFLAGS+= -DCONFIG_CTRL_IFACE_UNIX .include Index: stable/11/usr.sbin/wpa/hostapd/Makefile =================================================================== --- stable/11/usr.sbin/wpa/hostapd/Makefile (revision 319189) +++ stable/11/usr.sbin/wpa/hostapd/Makefile (revision 319190) @@ -1,122 +1,122 @@ # $FreeBSD$ .include -.include "${.CURDIR}/../Makefile.inc" +.include "../Makefile.inc" .PATH.c:${HOSTAPD_DISTDIR} \ ${WPA_DISTDIR}/src/drivers PROG= hostapd SRCS= accounting.c aes-omac1.c ap_config.c ap_drv_ops.c ap_mlme.c authsrv.c \ base64.c beacon.c bss_load.c chap.c common.c config_file.c \ ctrl_iface.c \ ctrl_iface_ap.c driver_common.c l2_packet_freebsd.c driver_bsd.c \ drivers.c drv_callbacks.c eap_common.c eap_peap_common.c \ eap_register.c eap_server.c eap_server_methods.c eap_user_db.c \ eapol_auth_dump.c eapol_auth_sm.c eloop.c gas.c gas_serv.c hostapd.c \ hs20.c http_client.c http_server.c httpread.c \ hw_features_common.c ieee802_11_auth.c \ ieee802_11_common.c ieee802_11_shared.c ieee802_1x.c ip_addr.c \ main.c ms_funcs.c os_unix.c peerkey_auth.c pmksa_cache_auth.c \ preauth_auth.c radius.c radius_client.c radius_das.c sta_info.c \ tkip_countermeasures.c upnp_xml.c utils.c uuid.c vlan_init.c \ wpa_auth.c wpa_auth_glue.c wpa_auth_ie.c wpa_common.c wpa_debug.c \ wpabuf.c wps.c wps_attr_build.c wps_attr_parse.c wps_attr_process.c \ wps_common.c wps_dev_attr.c wps_enrollee.c wps_hostapd.c \ wps_registrar.c wps_upnp.c wps_upnp_ap.c wps_upnp_event.c \ wps_upnp_ssdp.c wps_upnp_web.c MAN= hostapd.8 hostapd.conf.5 .if ${MK_EXAMPLES} != "no" FILESDIR= ${SHAREDIR}/examples/hostapd .PATH: ${HOSTAPD_DISTDIR} FILES= hostapd.conf hostapd.eap_user hostapd.wpa_psk .endif CFLAGS+=-DCONFIG_DRIVER_BSD \ -DCONFIG_DRIVER_RADIUS_ACL \ -DCONFIG_HS20 \ -DCONFIG_INTERWORKING \ -DCONFIG_PEERKEY \ -DCONFIG_RSN_PREAUTH \ -DCONFIG_WPS \ -DCONFIG_WPS2 \ -DCONFIG_WPS_UPNP \ -DHOSTAPD .if ${MK_INET6} != "no" CFLAGS+= -DCONFIG_IPV6 .endif #CFLAGS+= -g LIBADD+= pcap util # User customizations for wpa_supplicant/hostapd build environment CFLAGS+=${HOSTAPD_CFLAGS} #DPADD+=${HOSTAPD_DPADD} LDADD+=${HOSTAPD_LDADD} #LDFLAGS+=${HOSTAPD_LDFLAGS} CFLAGS+=-DDPKCS12_FUNCS \ -DEAP_SERVER \ -DEAP_SERVER_GTC \ -DEAP_SERVER_IDENTITY \ -DEAP_SERVER_MD5 \ -DEAP_SERVER_MSCHAPV2 \ -DEAP_SERVER_PEAP \ -DEAP_SERVER_TLS \ -DEAP_SERVER_TTLS \ -DEAP_SERVER_WSC \ -DEAP_TLS_FUNCS SRCS+= eap_server_gtc.c \ eap_server_identity.c \ eap_server_md5.c \ eap_server_mschapv2.c \ eap_server_peap.c \ eap_server_tls.c \ eap_server_tls_common.c \ eap_server_ttls.c \ eap_server_wsc.c \ eap_wsc_common.c TLS_FUNCS=y .if !empty(CFLAGS:M*-DCONFIG_WPS) NEED_SIM_COMMON=y .endif .if !empty(CFLAGS:M*-DEAP_SERVER_AKA) SRCS+= eap_server_aka.c NEED_SIM_COMMON=y .endif .if !empty(CFLAGS:M*-DEAP_SERVER_SIM) SRCS+= eap_server_sim.c NEED_SIM_COMMON=y .endif .if defined(NEED_SIM_COMMON) SRCS+= eap_sim_common.c \ eap_sim_db.c NEED_FIPS186_2_PRF=y .endif .if !empty(CFLAGS:M*-DEAP_SERVER_GPSK) CFLAGS+=-DEAP_GPSK_SHA256 SRCS+= eap_server_gpsk.c \ eap_gpsk_common.c NEED_AES_OMAC1=y .endif .if !empty(CFLAGS:M*-DEAP_SERVER_PAX) SRCS+= eap_server_pax.c \ eap_pax_common.c .endif .if !empty(CFLAGS:M*-DEAP_SERVER_SAKE) SRCS+= eap_server_sake.c \ eap_sake_common.c .endif -.include "${.CURDIR}/../Makefile.crypto" +.include "../Makefile.crypto" .include Index: stable/11/usr.sbin/wpa/hostapd_cli/Makefile =================================================================== --- stable/11/usr.sbin/wpa/hostapd_cli/Makefile (revision 319189) +++ stable/11/usr.sbin/wpa/hostapd_cli/Makefile (revision 319190) @@ -1,17 +1,17 @@ # $FreeBSD$ -.include "${.CURDIR}/../Makefile.inc" +.include "../Makefile.inc" .PATH.c:${HOSTAPD_DISTDIR} PROG= hostapd_cli SRCS= common.c edit.c eloop.c hostapd_cli.c os_unix.c wpa_ctrl.c wpa_debug.c CFLAGS+= -DCONFIG_CTRL_IFACE CFLAGS+= -DCONFIG_CTRL_IFACE_UNIX LIBADD+= util MAN= hostapd_cli.8 .include Index: stable/11/usr.sbin/wpa/wpa_cli/Makefile =================================================================== --- stable/11/usr.sbin/wpa/wpa_cli/Makefile (revision 319189) +++ stable/11/usr.sbin/wpa/wpa_cli/Makefile (revision 319190) @@ -1,20 +1,20 @@ # $FreeBSD$ -.include "${.CURDIR}/../Makefile.inc" +.include "../Makefile.inc" .PATH.c:${WPA_SUPPLICANT_DISTDIR} PROG= wpa_cli SRCS= common.c edit.c eloop.c os_unix.c wpa_cli.c wpa_ctrl.c wpa_debug.c MAN= wpa_cli.8 CFLAGS+= -DCONFIG_CTRL_IFACE CFLAGS+= -DCONFIG_CTRL_IFACE_UNIX # enable use of d_type to identify unix domain sockets CFLAGS+= -D_DIRENT_HAVE_D_TYPE CFLAGS+= -DCONFIG_WPA_CLI_EDIT=y LIBADD+= util .include Index: stable/11/usr.sbin/wpa/wpa_passphrase/Makefile =================================================================== --- stable/11/usr.sbin/wpa/wpa_passphrase/Makefile (revision 319189) +++ stable/11/usr.sbin/wpa/wpa_passphrase/Makefile (revision 319190) @@ -1,17 +1,17 @@ # $FreeBSD$ -.include "${.CURDIR}/../Makefile.inc" +.include "../Makefile.inc" .PATH.c:${WPA_SUPPLICANT_DISTDIR} PROG= wpa_passphrase SRCS= common.c md5-internal.c md5.c os_unix.c sha1-internal.c sha1-pbkdf2.c \ sha1.c wpa_passphrase.c CFLAGS+= -DCONFIG_CRYPTO_INTERNAL -DINTERNAL_SHA1 -DINTERNAL_MD5 LIBADD+= util MAN= wpa_passphrase.8 .include Index: stable/11/usr.sbin/wpa/wpa_priv/Makefile =================================================================== --- stable/11/usr.sbin/wpa/wpa_priv/Makefile (revision 319189) +++ stable/11/usr.sbin/wpa/wpa_priv/Makefile (revision 319190) @@ -1,16 +1,16 @@ # $FreeBSD$ -.include "${.CURDIR}/../Makefile.inc" +.include "../Makefile.inc" .PATH.c:${WPA_SUPPLICANT_DISTDIR} \ ${WPA_DISTDIR}/src/drivers PROG= wpa_priv SRCS= drivers.c os_unix.c eloop.c common.c wpa_debug.c wpabuf.c wpa_priv.c \ driver_common.c l2_packet_freebsd.c LIBADD= pcap -.include "${.CURDIR}/../Makefile.crypto" +.include "../Makefile.crypto" .include Index: stable/11/usr.sbin/wpa/wpa_supplicant/Makefile =================================================================== --- stable/11/usr.sbin/wpa/wpa_supplicant/Makefile (revision 319189) +++ stable/11/usr.sbin/wpa/wpa_supplicant/Makefile (revision 319190) @@ -1,147 +1,147 @@ # $FreeBSD$ .include -.include "${.CURDIR}/../Makefile.inc" +.include "../Makefile.inc" .PATH.c:${WPA_SUPPLICANT_DISTDIR} \ ${WPA_DISTDIR}/src/drivers PROG= wpa_supplicant SRCS= ap_drv_ops.c base64.c blacklist.c bss.c common.c config.c \ config_file.c ctrl_iface.c ctrl_iface_unix.c driver_bsd.c \ driver_common.c driver_ndis.c driver_wired.c drivers.c \ eap_register.c eloop.c events.c gas.c gas_query.c hs20.c \ hs20_supplicant.c http_client.c http_server.c httpread.c \ hw_features_common.c \ ieee802_11_common.c ieee802_11_shared.c \ interworking.c l2_packet_freebsd.c main.c \ notify.c offchannel.c os_unix.c peerkey.c pmksa_cache.c \ preauth.c scan.c upnp_xml.c uuid.c wmm_ac.c \ wpa.c wpa_common.c wpa_debug.c \ wpa_ft.c wpa_ie.c wpa_supplicant.c wpabuf.c wpas_glue.c wps.c \ wps_attr_build.c wps_attr_parse.c wps_attr_process.c \ wps_common.c wps_dev_attr.c wps_enrollee.c wps_registrar.c \ wps_supplicant.c wps_upnp.c wps_upnp_ap.c wps_upnp_event.c \ wps_upnp_ssdp.c wps_upnp_web.c Packet32.c MAN= wpa_supplicant.8 wpa_supplicant.conf.5 .if ${MK_EXAMPLES} != "no" FILESDIR= ${SHAREDIR}/examples/etc .PATH: ${WPA_SUPPLICANT_DISTDIR} FILES= wpa_supplicant.conf .endif CFLAGS+=-DCONFIG_BACKEND_FILE \ -DCONFIG_DEBUG_SYSLOG \ -DCONFIG_DRIVER_BSD \ -DCONFIG_DRIVER_NDIS \ -DCONFIG_DRIVER_WIRED \ -DCONFIG_GAS \ -DCONFIG_HS20 \ -DCONFIG_IEEE80211R \ -DCONFIG_INTERWORKING \ -DCONFIG_PEERKEY \ -DCONFIG_PRIVSEP \ -DCONFIG_SMARTCARD \ -DCONFIG_TERMINATE_ONLASTIF \ -DCONFIG_TLS=openssl \ -DCONFIG_WPS \ -DCONFIG_WPS2 \ -DCONFIG_WPS_UPNP \ -DPKCS12_FUNCS #CFLAGS+= -g LIBADD= pcap util # User customizations to the wpa_supplicant build environment CFLAGS+=${WPA_SUPPLICANT_CFLAGS} #DPADD+=${WPA_SUPPLICANT_DPADD} LDADD+=${WPA_SUPPLICANT_LDADD} #LDFLAGS+=${WPA_SUPPLICANT_LDFLAGS} .if ${MK_WPA_SUPPLICANT_EAPOL} != "no" CFLAGS+=-DEAP_GTC \ -DEAP_LEAP \ -DEAP_MD5 \ -DEAP_MSCHAPv2 \ -DEAP_OTP \ -DEAP_PEAP \ -DEAP_PSK \ -DEAP_TLS \ -DEAP_TTLS \ -DIEEE8021X_EAPOL SRCS+= chap.c \ eap.c \ eap_common.c \ eap_gtc.c \ eap_leap.c \ eap_md5.c \ eap_methods.c \ eap_mschapv2.c \ eap_otp.c \ eap_peap.c \ eap_peap_common.c \ eap_psk.c \ eap_psk_common.c \ eap_tls.c \ eap_tls_common.c \ eap_ttls.c \ eapol_supp_sm.c \ ms_funcs.c \ mschapv2.c TLS_FUNCS=y NEED_AES_EAX=y NEED_AES_ENCBLOCK=y NEED_AES_OMAC1=y .endif .if !empty(CFLAGS:M*-DEAP_AKA) SRCS+= eap_aka.c NEED_SIM_COMMON=y NEED_AES_CBC=y .endif .if !empty(CFLAGS:M*-DEAP_SIM) SRCS+= eap_sim.c NEED_SIM_COMMON=y NEED_AES_CBC=y .endif .if defined(NEED_SIM_COMMON) SRCS+= eap_sim_common.c NEED_FIPS186_2_PRF=y .endif # PC/SC interface for smartcards (USIM, GSM SIM) # GSM/UMTS authentication algorithm (for EAP-SIM/EAP-AKA) # NB: requires devel/pcsc-lite # # WPA_SUPPLICANT_CFLAGS=-DEAP_AKA -DPCSC_FUNCS -I/usr/local/include/PCSC # WPA_SUPPLICANT_LDADD=-L/usr/local/lib # .if !empty(CFLAGS:M*-DPCSC_FUNCS) SRCS+= pcsc_funcs.c LIBADD+= pcslite pthread .endif .if !empty(CFLAGS:M*-DEAP_GPSK) CFLAGS+=-DEAP_GPSK_SHA256 SRCS+= eap_gpsk.c \ eap_gpsk_common.c NEED_AES_OMAC1=y .endif .if !empty(CFLAGS:M*-DEAP_PAX) SRCS+= eap_pax.c \ eap_pax_common.c .endif .if !empty(CFLAGS:M*-DEAP_SAKE) SRCS+= eap_sake.c \ eap_sake_common.c .endif -.include "${.CURDIR}/../Makefile.crypto" +.include "../Makefile.crypto" .include Index: stable/11 =================================================================== --- stable/11 (revision 319189) +++ stable/11 (revision 319190) Property changes on: stable/11 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r314541