From nobody Fri Nov 12 03:25:06 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C7617183A4B9; Fri, 12 Nov 2021 03:25:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hr3qk59J6z4ph0; Fri, 12 Nov 2021 03:25:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 92B22180F5; Fri, 12 Nov 2021 03:25:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AC3P6Pp089928; Fri, 12 Nov 2021 03:25:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AC3P6Tc089927; Fri, 12 Nov 2021 03:25:06 GMT (envelope-from git) Date: Fri, 12 Nov 2021 03:25:06 GMT Message-Id: <202111120325.1AC3P6Tc089927@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 3332f1b444d4 - main - wpa: Remove duplicate options definitions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3332f1b444d4a73238e9f59cca27bfc95fe936bd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=3332f1b444d4a73238e9f59cca27bfc95fe936bd commit 3332f1b444d4a73238e9f59cca27bfc95fe936bd Author: Cy Schubert AuthorDate: 2021-11-09 00:16:46 +0000 Commit: Cy Schubert CommitDate: 2021-11-12 03:03:05 +0000 wpa: Remove duplicate options definitions Global options are defined in usr.sbin/wpa/Makefile.inc. Those in usr.sbin/wpa/src/crypto/Makefile are duplicates of those found above. Remove them. MFC after: 1 week --- usr.sbin/wpa/src/crypto/Makefile | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/usr.sbin/wpa/src/crypto/Makefile b/usr.sbin/wpa/src/crypto/Makefile index c95834279c21..eede671aa7db 100644 --- a/usr.sbin/wpa/src/crypto/Makefile +++ b/usr.sbin/wpa/src/crypto/Makefile @@ -139,20 +139,6 @@ SRCS+= dh_groups.c .endif .if ${MK_WPA_SUPPLICANT_EAPOL} != "no" -CFLAGS+=-DCONFIG_WPS \ - -DCONFIG_HS20 \ - -DCONFIG_INTERWORKING \ - -DEAP_GTC \ - -DEAP_LEAP \ - -DEAP_MD5 \ - -DEAP_MSCHAPv2 \ - -DEAP_OTP \ - -DEAP_PEAP \ - -DEAP_PSK \ - -DEAP_TLS \ - -DEAP_TTLS \ - -DEAP_WSC \ - -DIEEE8021X_EAPOL SRCS+= ms_funcs.c .endif