Index: head/release/packages/Makefile.package =================================================================== --- head/release/packages/Makefile.package (revision 350128) +++ head/release/packages/Makefile.package (revision 350129) @@ -1,80 +1,82 @@ # # $FreeBSD$ # acct_COMMENT= Accounting Utilties acct_DESC= Accounting Utilties acpi_COMMENT= ACPI Utilities acpi_DESC= ACPI Utilities amd_COMMENT= AMD Utilities amd_DESC= AMD Utilities apm_COMMENT= APM Utilities apm_DESC= APM Utilities at_COMMENT= AT Utilities at_DESC= AT Utilities autofs_COMMENT= Autofs Utilities autofs_DESC= Autofs Utilities bhyve_COMMENT= Bhyve Utilities bhyve_DESC= Bhyve Utilities binutils_COMMENT= Binutils binutils_DESC= Binutils bsdinstall_COMMENT= BSDInstall Utilities bsdinstall_DESC= BSDInstall Utilities bsnmp_COMMENT= BSNMP Utilities bsnmp_DESC= BSNMP Utilities clang_COMMENT= Clang Utilities clang_DESC= Clang Utilities clibs_COMMENT= Core C Libraries clibs_DESC= Core C Libraries dma_COMMENT= DMA Mail Agent Utilities dma_DESC= DMA Mail Agent Utilities docs_COMMENT= Documentation docs_DESC= Documentation ee_COMMENT= Easy Editor Utilities ee_DESC= Easy Editor Utilities gdb_COMMENT= GDB Utilities gdb_DESC= GDB Utilities groff_COMMENT= Groff Utilities groff_DESC= Groff Utilities hast_COMMENT= Highly Available Storage daemon hast_DESC= Highly Available Storage daemon jail_COMMENT= Jail Utilities jail_DESC= Jail Utilities jail-debug_DESCR= Debugging Symbols jail-development_DESCR=Development Files jail-profile_DESCR= Profiling Libraries jail-lib32_DESCR= 32-bit Libraries jail-lib32-debug_DESCR=32-bit Debugging Symbols jail-lib32-development_DESCR=32-bit Development Files jail-lib32-profile_DESCR=32-bit Profiling Libraries kernel_COMMENT= FreeBSD Kernel kernel_DESC= FreeBSD Kernel manuals_COMMENT= Manual Pages manuals_DESC= Manual Pages rcmds_COMMENT= Remote Command Utilities rcmds_DESC= Remote Command Utilities rescue_COMMENT= Rescue Utilities rescue_DESC= Rescue Utilities runtime_COMMENT= FreeBSD Base System runtime_DESC= FreeBSD Base System runtime-debug_DESCR= Debugging Symbols runtime-development_DESCR=Development Files runtime-profile_DESCR= Profiling Libraries runtime-lib32_DESCR= 32-bit Libraries runtime-lib32-debug_DESCR=32-bit Debugging Symbols runtime-lib32-development_DESCR=32-bit Development Files runtime-lib32-profile_DESCR=32-bit Profiling Libraries sendmail_COMMENT= Sendmail Utilities sendmail_DESC= Sendmail Utilities ssh_COMMENT= Secure Shell Utilities ssh_DESC= Secure Shell Utilities svn_COMMENT= Subversion Version Control System svn_DESC= Subversion Version Control System syscons_COMMENT= Syscons Console syscons_DESC= Syscons Console tests_COMMENT= Test Suite tests_DESC= Test Suite unbound_COMMENT= Unbound DNS Resolver unbound_DESC= Unbound DNS Resolver vi_COMMENT= Vi Editor vi_DESC= Vi Editor +wpa_COMMENT= 802.11 Supplicant +wpa_DESC= 802.11 Supplicant Index: head/release/packages/wpa.ucl =================================================================== --- head/release/packages/wpa.ucl (nonexistent) +++ head/release/packages/wpa.ucl (revision 350129) @@ -0,0 +1,24 @@ +# +# $FreeBSD$ +# + +name = "FreeBSD-%PKGNAME%" +origin = "base" +version = "%VERSION%" +comment = "%COMMENT%" +categories = [ base ] +maintainer = "re@FreeBSD.org" +www = "https://www.FreeBSD.org" +prefix = "/" +licenselogic = "single" +licenses = [ BSD2CLAUSE ] +desc = < .include "../Makefile.inc" .PATH.c:${WPA_SUPPLICANT_DISTDIR} \ ${WPA_DISTDIR}/wpa_supplicant \ ${WPA_DISTDIR}/src/eap_peer \ ${WPA_DISTDIR}/src/drivers +PACKAGE= wpa PROG= wpa_cli 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 \ eap_register.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 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 MAN= wpa_cli.8 CFLAGS+= -DCONFIG_CTRL_IFACE CFLAGS+= -DCONFIG_CTRL_IFACE_UNIX CFLAGS+= -DCONFIG_TLS=openssl # enable use of d_type to identify unix domain sockets CFLAGS+= -D_DIRENT_HAVE_D_TYPE CFLAGS+= -DCONFIG_WPA_CLI_EDIT=y LIBADD+= pcap util TLS_FUNCS=y .include "../Makefile.crypto" .include Index: head/usr.sbin/wpa/wpa_passphrase/Makefile =================================================================== --- head/usr.sbin/wpa/wpa_passphrase/Makefile (revision 350128) +++ head/usr.sbin/wpa/wpa_passphrase/Makefile (revision 350129) @@ -1,17 +1,18 @@ # $FreeBSD$ .include "../Makefile.inc" .PATH.c:${WPA_SUPPLICANT_DISTDIR} +PACKAGE= wpa 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: head/usr.sbin/wpa/wpa_priv/Makefile =================================================================== --- head/usr.sbin/wpa/wpa_priv/Makefile (revision 350128) +++ head/usr.sbin/wpa/wpa_priv/Makefile (revision 350129) @@ -1,16 +1,17 @@ # $FreeBSD$ .include "../Makefile.inc" .PATH.c:${WPA_SUPPLICANT_DISTDIR} \ ${WPA_DISTDIR}/src/drivers +PACKAGE= wpa 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 "../Makefile.crypto" .include Index: head/usr.sbin/wpa/wpa_supplicant/Makefile =================================================================== --- head/usr.sbin/wpa/wpa_supplicant/Makefile (revision 350128) +++ head/usr.sbin/wpa/wpa_supplicant/Makefile (revision 350129) @@ -1,152 +1,153 @@ # $FreeBSD$ .include .include "../Makefile.inc" .PATH.c:${WPA_SUPPLICANT_DISTDIR} \ ${WPA_DISTDIR}/src/eap_peer \ ${WPA_DISTDIR}/src/drivers +PACKAGE= wpa PROG= wpa_supplicant 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 \ dh_groups.c driver_bsd.c driver_common.c \ driver_ndis.c driver_wired.c driver_wired_common.c drivers.c \ eap_register.c eap_wsc.c eap_wsc_common.c eloop.c \ events.c gas.c gas_query.c hs20_supplicant.c \ http_client.c http_server.c \ httpread.c hw_features_common.c \ ieee802_11_common.c interworking.c l2_packet_freebsd.c main.c \ notify.c offchannel.c op_classes.c os_unix.c pmksa_cache.c preauth.c \ rrm.c scan.c upnp_xml.c uuid.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 \ 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 "../Makefile.crypto" .include