The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=8c6732ac77753cf1dde28e2b3a39303bd5847c34
commit 8c6732ac77753cf1dde28e2b3a39303bd5847c34 Author: Cy Schubert <[email protected]> AuthorDate: 2021-04-17 17:48:35 +0000 Commit: Cy Schubert <[email protected]> CommitDate: 2021-04-17 17:48:35 +0000 usr.sbin/wpa: complete the revert of wpa import This completes the revert of b51f459a2098622c31ed54f5c1bf0e03efce403b. --- usr.sbin/wpa/Makefile.inc | 1 + usr.sbin/wpa/hostapd/Makefile | 2 -- usr.sbin/wpa/hostapd_cli/Makefile | 3 +-- usr.sbin/wpa/wpa_cli/Makefile | 9 ++------- usr.sbin/wpa/wpa_passphrase/Makefile | 3 +-- usr.sbin/wpa/wpa_priv/Makefile | 1 - usr.sbin/wpa/wpa_supplicant/Makefile | 13 +++---------- 7 files changed, 8 insertions(+), 24 deletions(-) diff --git a/usr.sbin/wpa/Makefile.inc b/usr.sbin/wpa/Makefile.inc index b19ae26b22d4..0a69ca08166b 100644 --- a/usr.sbin/wpa/Makefile.inc +++ b/usr.sbin/wpa/Makefile.inc @@ -18,6 +18,7 @@ HOSTAPD_DISTDIR?= ${WPA_DISTDIR}/hostapd ${WPA_DISTDIR}/src/radius \ ${WPA_DISTDIR}/src/rsn_supp \ ${WPA_DISTDIR}/src/tls \ + ${WPA_DISTDIR}/src/utils \ ${WPA_DISTDIR}/src/wps CFLAGS+=-I${.CURDIR} diff --git a/usr.sbin/wpa/hostapd/Makefile b/usr.sbin/wpa/hostapd/Makefile index bd32f8db052e..579694046989 100644 --- a/usr.sbin/wpa/hostapd/Makefile +++ b/usr.sbin/wpa/hostapd/Makefile @@ -8,7 +8,6 @@ ${WPA_DISTDIR}/src/eap_server \ ${WPA_DISTDIR}/src/eap_peer \ ${WPA_DISTDIR}/src/drivers \ - ${WPA_DISTDIR}/src/utils \ ${WPA_DISTDIR}/wpa_supplicant PACKAGE= hostapd @@ -25,7 +24,6 @@ SRCS= accounting.c \ chap.c \ common.c \ config_file.c \ - crc32.c \ ctrl_iface.c \ ctrl_iface_ap.c \ ctrl_iface_common.c \ diff --git a/usr.sbin/wpa/hostapd_cli/Makefile b/usr.sbin/wpa/hostapd_cli/Makefile index e2a9438e1de2..eda50e222d2e 100644 --- a/usr.sbin/wpa/hostapd_cli/Makefile +++ b/usr.sbin/wpa/hostapd_cli/Makefile @@ -2,8 +2,7 @@ .include "../Makefile.inc" -.PATH.c:${HOSTAPD_DISTDIR} \ - ${WPA_DISTDIR}/src/utils +.PATH.c:${HOSTAPD_DISTDIR} PACKAGE= hostapd PROG= hostapd_cli diff --git a/usr.sbin/wpa/wpa_cli/Makefile b/usr.sbin/wpa/wpa_cli/Makefile index bf7a496db3a8..504b0883f52f 100644 --- a/usr.sbin/wpa/wpa_cli/Makefile +++ b/usr.sbin/wpa/wpa_cli/Makefile @@ -7,12 +7,11 @@ .PATH.c:${WPA_SUPPLICANT_DISTDIR} \ ${WPA_DISTDIR}/wpa_supplicant \ ${WPA_DISTDIR}/src/eap_peer \ - ${WPA_DISTDIR}/src/utils \ ${WPA_DISTDIR}/src/drivers PACKAGE= wpa PROG= wpa_cli -SRCS= base64.c bitfield.c bss.c bssid_ignore.c cli.c common.c config.c \ +SRCS= base64.c bitfield.c blacklist.c bss.c cli.c common.c config.c \ config_file.c \ ctrl_iface.c ctrl_iface_common.c ctrl_iface_unix.c \ drivers.c driver_common.c \ @@ -20,7 +19,7 @@ SRCS= base64.c bitfield.c bss.c bssid_ignore.c cli.c common.c config.c \ edit.c eloop.c events.c hw_features_common.c \ ieee802_11_common.c l2_packet_freebsd.c notify.c \ op_classes.c \ - os_unix.c robust_av.c rrm.c scan.c wmm_ac.c \ + os_unix.c rrm.c scan.c wmm_ac.c \ wpa.c wpa_cli.c \ wpa_ctrl.c wpa_common.c \ wpa_debug.c wpa_ie.c wpa_supplicant.c wpabuf.c wpas_glue.c @@ -38,10 +37,6 @@ LIBADD+= pcap util TLS_FUNCS=y -OBJS+= utils_config.o -utils_config.o: ${WPA_DISTDIR}/src/utils/config.c - ${CC} -c ${CFLAGS} -o ${.OBJDIR}/utils_config.o ${WPA_DISTDIR}/src/utils/config.c - .include "../Makefile.crypto" .include <bsd.prog.mk> diff --git a/usr.sbin/wpa/wpa_passphrase/Makefile b/usr.sbin/wpa/wpa_passphrase/Makefile index 877b73829bf2..9a929c07b6fc 100644 --- a/usr.sbin/wpa/wpa_passphrase/Makefile +++ b/usr.sbin/wpa/wpa_passphrase/Makefile @@ -2,8 +2,7 @@ .include "../Makefile.inc" -.PATH.c:${WPA_SUPPLICANT_DISTDIR} \ - ${WPA_DISTDIR}/src/utils +.PATH.c:${WPA_SUPPLICANT_DISTDIR} PACKAGE= wpa PROG= wpa_passphrase diff --git a/usr.sbin/wpa/wpa_priv/Makefile b/usr.sbin/wpa/wpa_priv/Makefile index 05d8f743f8f2..9fd4e3ca98a0 100644 --- a/usr.sbin/wpa/wpa_priv/Makefile +++ b/usr.sbin/wpa/wpa_priv/Makefile @@ -3,7 +3,6 @@ .include "../Makefile.inc" .PATH.c:${WPA_SUPPLICANT_DISTDIR} \ - ${WPA_DISTDIR}/src/utils \ ${WPA_DISTDIR}/src/drivers PACKAGE= wpa diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplicant/Makefile index 6a80ce33a956..352e13e6bde6 100644 --- a/usr.sbin/wpa/wpa_supplicant/Makefile +++ b/usr.sbin/wpa/wpa_supplicant/Makefile @@ -6,13 +6,12 @@ .PATH.c:${WPA_SUPPLICANT_DISTDIR} \ ${WPA_DISTDIR}/src/eap_peer \ - ${WPA_DISTDIR}/src/utils \ ${WPA_DISTDIR}/src/drivers PACKAGE= wpa PROG= wpa_supplicant -SRCS= base64.c bitfield.c bss.c bssid_ignore.c cli.c common.c \ +SRCS= base64.c bitfield.c blacklist.c bss.c cli.c common.c \ config.c config_file.c \ ctrl_iface.c ctrl_iface_common.c ctrl_iface_unix.c \ driver_bsd.c driver_common.c \ @@ -22,10 +21,8 @@ SRCS= base64.c bitfield.c bss.c bssid_ignore.c cli.c common.c \ http_client.c http_server.c \ httpread.c hw_features_common.c \ ieee802_11_common.c l2_packet_freebsd.c main.c \ - notify.c offchannel.c op_classes.c os_unix.c \ - pmksa_cache.c preauth.c \ - robust_av.c \ - rrm.c scan.c twt.c upnp_xml.c \ + notify.c offchannel.c op_classes.c os_unix.c pmksa_cache.c preauth.c \ + rrm.c scan.c upnp_xml.c \ wmm_ac.c wpa.c wpa_common.c wpa_ctrl.c \ wpa_debug.c wpa_ft.c wpa_ie.c wpa_supplicant.c wpabuf.c wpas_glue.c @@ -160,10 +157,6 @@ SRCS+= eap_sake.c \ eap_sake_common.c .endif -OBJS+= utils_config.o -utils_config.o: ${WPA_DISTDIR}/src/utils/config.c - ${CC} -c ${CFLAGS} -o ${.OBJDIR}/utils_config.o ${WPA_DISTDIR}/src/utils/config.c - .include "../Makefile.crypto" .include <bsd.prog.mk> _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main To unsubscribe, send any mail to "[email protected]"
