From nobody Tue Jul 19 18:02:27 2022 X-Original-To: dev-commits-src-branches@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 4LnRW74NKBz4WgPy; Tue, 19 Jul 2022 18:02:27 +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 4LnRW730Wmz43Zh; Tue, 19 Jul 2022 18:02:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658253747; 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=2dtfh2VYyHAW1NQk32z3UMNqb+gk1zoYE3/Ga8W1GtY=; b=vjGBtd61C0oROBf4D8IlTS4tqeF5+bsedgookfJ+AIHo4W0Tc5F6+vQVNut+8FfZ7w4P6x QH5uhrcZ0bDABkkJsvdcetsYBUdBFxDvfIDpcFuYzvc2LFYq+PKRkg/qCb2QJnE86g1rse ZdR4aBDXC4z5PzyL+hIegfdkbXLSm/GeJYxdIOqa51NNjuzu0qZegjBVUTfW8i1yU/4Zh5 WjpN1FGGA/ydYUly43mDGh9YvOPdocQZb8/hsFQk9WXry7etCGfPf8XaCb3GEN7OP0Zzqa 9UcuQYQg/iF0avzNffLh2ERZTl1AwksFqCMNC4tSa/7mGko/AQB8A8Jo9K0FoA== 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 4LnRW726QRzSky; Tue, 19 Jul 2022 18:02:27 +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 26JI2RLX076937; Tue, 19 Jul 2022 18:02:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26JI2Rkm076929; Tue, 19 Jul 2022 18:02:27 GMT (envelope-from git) Date: Tue, 19 Jul 2022 18:02:27 GMT Message-Id: <202207191802.26JI2Rkm076929@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: 40450c3acb6c - stable/13 - WPA_DISTDIR does not need to end in a slash List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 40450c3acb6c5fd6f8e3e3ac21bc79ae857728f1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658253747; 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=2dtfh2VYyHAW1NQk32z3UMNqb+gk1zoYE3/Ga8W1GtY=; b=QLwVLrNIkjwb8LEN1ytvFOeYz4tkxykXjXFHZPT937l5b/xwdxPihdU2TPd/9FPRaxudVB 0UvPdXP7UKQ2PYLu9F3oydUk8QDORNlLY7kwJnoFgGAUFyjyCySnqsxB6NVDpcjk8JO3b8 wgocKtyiqAVm/xUJkUTj7SJwbEEuYtG/VEK8MXmdgiRLIBl5ELXLpchTL8Fw9uj6QC49Lc cM5xqHYKyWiYqnHMP1gTyIoHeh3IPcHcwRj3jtcqeapgOGJc41+5IgwGsJQ5u0BEWK1Ojn aEQuLZBfKuJTSwx8YhRweC4k5Fyxnv34l0RTkkA9SPzxSUZjoCyDhWXPxYw/bA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658253747; a=rsa-sha256; cv=none; b=xILoRl8AIRizE5RSUXlxeHmSVKi26bbjjmYwrF8rv11K4XU3/qi+VjOUiGWLPgxZCA3pGg xawpagPr0MFuBV6dY1dV3JbyBr39UtE308ymN05muh2A1ujphaHpaZBvPXrRNWzB4uysx+ IJptMz0MI+BS2L0hWbsnKiD3I16/LvdJ0LyoK6T24Ni79e9daAVlMvmZW9SsbMcJTgxOMb 5ECYUjdX4FP6ilUcZjyBhES4DAMRfXAciQlKAl0jq5fW1glDncPlOXlByxnsxd4C/dNz41 2nB0WCN8DfM635QiTwELU1bhav+ParHXUTm3Lw6AA0mXzZB4aJPFdHoXqKE8uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=40450c3acb6c5fd6f8e3e3ac21bc79ae857728f1 commit 40450c3acb6c5fd6f8e3e3ac21bc79ae857728f1 Author: Dimitry Andric AuthorDate: 2022-07-16 15:45:26 +0000 Commit: Dimitry Andric CommitDate: 2022-07-19 18:00:56 +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 d35fe520b532..d674d3ae5fd2 100644 --- a/usr.sbin/wpa/Makefile.inc +++ b/usr.sbin/wpa/Makefile.inc @@ -6,7 +6,7 @@ BINDIR?= /usr/sbin WARNS?= 0 -WPA_DISTDIR?= ${SRCTOP}/contrib/wpa/ +WPA_DISTDIR?= ${SRCTOP}/contrib/wpa WPA_SUPPLICANT_DISTDIR?=${WPA_DISTDIR}/wpa_supplicant HOSTAPD_DISTDIR?= ${WPA_DISTDIR}/hostapd