From nobody Tue Jul 19 18:02:58 2022 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 4LnRWk72t2z4WgqN; Tue, 19 Jul 2022 18:02:58 +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 4LnRWk6CSXz4568; Tue, 19 Jul 2022 18:02:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658253778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KO8XEt8fdgEBd2KMrZArh4EyS04vIh8CF1OoN6nH7TM=; b=EExuWY/K6W5ErJZ6wIBdRb59DV4f0JTBJzl+VlxPi6EsQ68HQ/pwauJ9fP8xRYBCP/TxLS tRpV3pWlq+biCUJxWdXm7X/zCltDa8PooH/Li+svlm6P2VZh0hDe7WsvnVQ99dXuvhhihh MIEJn7D706CmoQfD55wYA2Ys/Tz2ludYGBeiu4GjdFOdA/jjETm5RXp4eFiPVdbjhve7kg nxCQsHfkMoNd7Rr1NvI4Md3y9YW5ZZ+dUw9va0SOm0YxCFhsTExtdy6bn9UMTLZMvUXgaG cgknlPFu/kNvcDBlBIb9Qebb4DPu11j7hRn6fvsy9NHRqj+zzpg5nqEqmkpQcA== 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 4LnRWk59KfzSqb; Tue, 19 Jul 2022 18:02:58 +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 26JI2wAd077911; Tue, 19 Jul 2022 18:02:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26JI2wYZ077910; Tue, 19 Jul 2022 18:02:58 GMT (envelope-from git) Date: Tue, 19 Jul 2022 18:02:58 GMT Message-Id: <202207191802.26JI2wYZ077910@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: d1f34a51793f - stable/12 - WPA_DISTDIR does not need to end in a slash 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: d1f34a51793f30aef5307f82489b5117ec85ca50 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658253778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KO8XEt8fdgEBd2KMrZArh4EyS04vIh8CF1OoN6nH7TM=; b=ChpfhmCsyYQqjZV8g1XeE1jbc1f10JlBFeB0fEOPq5NGTeKxcY45pVIOJefSwPjsVIK0Ft ZFl2nlUCR0GmFBR98skXXzSVdVl/qXxIPFSQu2zcn5N8ma06cRR1AdHNVRfLFIPNjDt5ll qbr152eu+/xyRBm6Gme4aW4FxNRuapQ1U2md/7yHU3R3W8XE2ds/r6VCs7G5QGrsprAx7I tKi+P9PzRLNGQbamkazFcCUPA4DXnjEaVpdqFkmFPg6gPhB3zLKZimQx1gLGOqaSPh7vBn iFojxl11jI47pjwXqEv3Vh/GPUM9RNzHWuzjHSTC2B0GOIcpnYwGucBR0YlSyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658253778; a=rsa-sha256; cv=none; b=pRad4ITYXtHw+hGDpJjMyy0RxF3d2+KEZjxowAx/Yl2QWv/xwiKXcLDjlD+Z2KbW04NZug sHHem78XsPDisfhZddLmJfqVNJGBY7/M6hZGz9xw7yXGuq4AKdgouR8fvtom/y6v3um2pB 0au/6BbfPvHk/lDP+UqjoDO1atSOUMlKJE4mYs46CMnjRCCaxUfPdN5ta++GAyayEMAfGv q+1J9RvegochQC7/MQv8QTntkDDNWLN7XvA1zz9m4gT2WNhJUMyp07EuTpvcfItvBWgZaV KusqWD7l7GcSCu7lquP9M/njhuuX3kVbupkVrLWJnu/YE3EHKIZSi4pfk/Tcyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=d1f34a51793f30aef5307f82489b5117ec85ca50 commit d1f34a51793f30aef5307f82489b5117ec85ca50 Author: Dimitry Andric AuthorDate: 2022-07-16 15:45:26 +0000 Commit: Dimitry Andric CommitDate: 2022-07-19 18:01:38 +0000 WPA_DISTDIR does not need to end in a slash Since all uses of the macro also append a slash, this leads to double slashes. MFC after: 3 days (cherry picked from commit 9917049b60f7cf7345a09d2bc22d51764a477984) --- usr.sbin/wpa/Makefile.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/wpa/Makefile.inc b/usr.sbin/wpa/Makefile.inc index 88de7fc67456..f304baecc2a4 100644 --- a/usr.sbin/wpa/Makefile.inc +++ b/usr.sbin/wpa/Makefile.inc @@ -4,7 +4,7 @@ BINDIR?= /usr/sbin -WPA_DISTDIR?= ${SRCTOP}/contrib/wpa/ +WPA_DISTDIR?= ${SRCTOP}/contrib/wpa WPA_SUPPLICANT_DISTDIR?=${WPA_DISTDIR}/wpa_supplicant HOSTAPD_DISTDIR?= ${WPA_DISTDIR}/hostapd