Author: bschmidt
Date: Sat Apr 28 10:59:29 2012
New Revision: 234756
URL: http://svn.freebsd.org/changeset/base/234756
Log:
Follow up r234711 and do same for the supplicant, one file/option per
line. While here merge the options which are always enabled.
MFC after: 2 weeks
Modified:
head/usr.sbin/wpa/Makefile.inc
head/usr.sbin/wpa/wpa_supplicant/Makefile
Modified: head/usr.sbin/wpa/Makefile.inc
==============================================================================
--- head/usr.sbin/wpa/Makefile.inc Sat Apr 28 09:21:43 2012
(r234755)
+++ head/usr.sbin/wpa/Makefile.inc Sat Apr 28 10:59:29 2012
(r234756)
@@ -12,10 +12,13 @@ HOSTAPD_DISTDIR?= ${WPA_DISTDIR}/hostapd
${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
CFLAGS+=-I${.CURDIR}
Modified: head/usr.sbin/wpa/wpa_supplicant/Makefile
==============================================================================
--- head/usr.sbin/wpa/wpa_supplicant/Makefile Sat Apr 28 09:21:43 2012
(r234755)
+++ head/usr.sbin/wpa/wpa_supplicant/Makefile Sat Apr 28 10:59:29 2012
(r234756)
@@ -2,24 +2,53 @@
.include "${.CURDIR}/../Makefile.inc"
-.PATH.c:${WPA_SUPPLICANT_DISTDIR} \
- ${WPA_DISTDIR}/src/drivers \
- ${WPA_DISTDIR}/src/eap_peer \
- ${WPA_DISTDIR}/src/rsn_supp \
- ${WPA_DISTDIR}/src/crypto
+.PATH.c:${WPA_DISTDIR}/src/drivers
PROG= wpa_supplicant
-SRCS= aes-cbc.c aes-ctr.c aes-eax.c aes-encblock.c \
- aes-internal.c aes-omac1.c aes-unwrap.c \
- aes-wrap.c bss.c blacklist.c common.c config.c ctrl_iface.c \
- ctrl_iface_unix.c drivers.c eloop.c events.c l2_packet_freebsd.c main.c\
- md5.c notify.c preauth.c pmksa_cache.c scan.c \
- sha1-pbkdf2.c sha1-tlsprf.c sha1-tprf.c sha1.c \
- wpa.c wpa_common.c wpa_debug.c wpa_ie.c wpa_supplicant.c \
- wpabuf.c wpas_glue.c \
- driver_ndis.c Packet32.c \
+SRCS= aes-cbc.c \
+ aes-ctr.c \
+ aes-eax.c \
+ aes-encblock.c \
+ aes-internal.c \
+ aes-omac1.c \
+ aes-unwrap.c \
+ aes-wrap.c \
+ base64.c \
+ blacklist.c \
+ bss.c \
+ common.c \
+ config.c \
+ config_file.c \
+ ctrl_iface.c \
+ ctrl_iface_unix.c \
+ driver_ndis.c \
driver_wired.c \
- driver_freebsd.c os_unix.c
+ drivers.c \
+ eap_register.c \
+ eloop.c \
+ events.c \
+ main.c \
+ md5.c \
+ notify.c \
+ os_unix.c \
+ peerkey.c \
+ pmksa_cache.c \
+ preauth.c \
+ scan.c \
+ sha1-pbkdf2.c \
+ sha1-tlsprf.c \
+ sha1-tprf.c \
+ sha1.c \
+ wpa.c \
+ wpa_common.c \
+ wpa_debug.c \
+ wpa_ie.c \
+ wpa_supplicant.c \
+ wpabuf.c \
+ wpas_glue.c
+SRCS+= driver_freebsd.c \
+ l2_packet_freebsd.c \
+ Packet32.c
MAN= wpa_supplicant.8 wpa_supplicant.conf.5
@@ -29,23 +58,19 @@ FILESDIR= ${SHAREDIR}/examples/etc
FILES= wpa_supplicant.conf
.endif
-CFLAGS+=-I${WPA_SUPPLICANT_DISTDIR}
-CFLAGS+=-I${WPA_DISTDIR}/src/drivers
-CFLAGS+=-I${WPA_DISTDIR}/src/rsn_supp
-
-CFLAGS+= -DCONFIG_DRIVER_BSD
-CFLAGS+= -DCONFIG_DRIVER_NDIS
-CFLAGS+= -DCONFIG_DRIVER_WIRED
-CFLAGS+= -DCONFIG_TERMINATE_ONLASTIF
-CFLAGS+= -DCONFIG_DEBUG_SYSLOG
+CFLAGS+=-DCONFIG_BACKEND_FILE \
+ -DCONFIG_DEBUG_SYSLOG \
+ -DCONFIG_DRIVER_BSD \
+ -DCONFIG_DRIVER_NDIS \
+ -DCONFIG_DRIVER_WIRED \
+ -DCONFIG_PEERKEY \
+ -DCONFIG_SMARTCARD \
+ -DCONFIG_TERMINATE_ONLASTIF \
+ -DPKCS12_FUNCS
#CFLAGS+= -g
DPADD+= ${LIBPCAP}
LDADD+= -lpcap
-# NB: we only support wpa_supplicant.conf file
-SRCS+= config_file.c base64.c
-CFLAGS+=-DCONFIG_BACKEND_FILE
-
# User customizations to the wpa_supplicant build environment
CFLAGS+=${WPA_SUPPLICANT_CFLAGS}
#DPADD+=${WPA_SUPPLICANT_DPADD}
@@ -53,22 +78,39 @@ LDADD+=${WPA_SUPPLICANT_LDADD}
#LDFLAGS+=${WPA_SUPPLICANT_LDFLAGS}
.if ${MK_WPA_SUPPLICANT_EAPOL} != "no"
-SRCS+= eapol_supp_sm.c eap.c eap_common.c eap_methods.c eap_register.c
-CFLAGS+= -DIEEE8021X_EAPOL
.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH)
-CFLAGS+=-DEAP_TLS -DEAP_PEAP -DEAP_MSCHAPv2 -DEAP_LEAP -DEAP_PSK \
- -DEAP_TLV -DEAP_TLS_FUNCS -DEAP_TLS_OPENSSL
-SRCS+= chap.c crypto_openssl.c \
+
+CFLAGS+=-DEAP_LEAP \
+ -DEAP_MD5 \
+ -DEAP_MSCHAPv2 \
+ -DEAP_PEAP \
+ -DEAP_PSK \
+ -DEAP_TLS \
+ -DEAP_TLV \
+ -DEAP_TLS_FUNCS \
+ -DEAP_TLS_OPENSSL \
+ -DEAP_TTLS \
+ -DIEEE8021X_EAPOL
+SRCS+= chap.c \
+ crypto_openssl.c \
+ eap.c \
+ eap_common.c \
eap_leap.c \
+ eap_md5.c \
+ eap_methods.c \
eap_mschapv2.c \
- eap_peap.c eap_peap_common.c \
- eap_psk.c eap_psk_common.c \
- eap_tls.c eap_tls_common.c \
- mschapv2.c ms_funcs.c tls_openssl.c
-
-CFLAGS+=-DEAP_TTLS -DEAP_MD5
-SRCS+= eap_ttls.c eap_md5.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_openssl.c
.if !empty(CFLAGS:M*-DEAP_GTC)
SRCS+= eap_gtc.c
@@ -90,6 +132,7 @@ SRCS+= eap_sim.c
.if defined(NEED_SIM_COMMON)
SRCS+= eap_sim_common.c
+.endif
# PC/SC interface for smartcards (USIM, GSM SIM)
# GSM/UMTS authentication algorithm (for EAP-SIM/EAP-AKA)
@@ -103,26 +146,24 @@ SRCS+= pcsc_funcs.c
DPADD+=${LIBPTHREAD}
LDADD+=-lpcsclite -lpthread
.endif
-.endif
.if !empty(CFLAGS:M*-DEAP_GPSK)
CFLAGS+=-DEAP_GPSK_SHA256
-SRCS+= eap_gpsk.c eap_gpsk_common.c
+SRCS+= eap_gpsk.c \
+ eap_gpsk_common.c
NEED_SHA256= true
.endif
.if !empty(CFLAGS:M*-DEAP_PAX)
-SRCS+= eap_pax.c eap_pax_common.c
+SRCS+= eap_pax.c \
+ eap_pax_common.c
.endif
.if !empty(CFLAGS:M*-DEAP_SAKE)
-SRCS+= eap_sake.c eap_sake_common.c
+SRCS+= eap_sake.c \
+ eap_sake_common.c
.endif
-# NB: requires patch to openssl
-#CFLAGS+= -DEAP_FAST
-#SRCS+= eap_fast.c
-
NEED_LIBSSL= true
.else
CFLAGS+= -DEAP_TLS_NONE
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
