From nobody Sun Jun 02 05:36:38 2024 X-Original-To: dev-commits-ports-main@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 4VsQZv1qHsz5M641; Sun, 02 Jun 2024 05:36:39 +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 4VsQZt4Cbdz4WGd; Sun, 2 Jun 2024 05:36:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717306598; 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=6Pek0s1+Rw39XIktBs+Fx/XWcH7+eKb7qc9PvZ7jwFw=; b=vObN6FszYB/T2eHCSKXisWEJLppvbFIEWMPAqiapo1xSlM3iMkgGQPBxTo4hBXcLMnT2V8 reK4tmFI3JlBgIDG00dx5pugyokOyw6w+KUK7sShP8JpSyXdm2YYGODQ+9ipY7XKG2+eT4 VDYIbhV9zR7khVB4a4sxoMM340Unrpzc1cuNYyMOBLeVYC8ND3YoJXscqD4P/AdDNLa+9q tBCTdPR2gZE/tXGXw9yqzZECdYHSFvvORfhXSCT44ycAvPRHnqyeLKBFUsI0C2h6Njjxsy n+wRuYqs1yIL41of5gqxPvlFCFJ/nbmdX387qLYbngOiIaMnj1i4NIvBnv02Fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717306598; a=rsa-sha256; cv=none; b=pRDAos5+kjah8RYIH2FLftk/XskqgH6azF9BeylcHXB6VpvMmY38RUIvHTzE/TBPRC5QOI y5omG5SRQ1RFU5kjmEYeWdmY/m4SRun49mOw+tieTrn+YEvLsyFKqQnMnxzrzhZ83VxAJo Y4n19xEDR11mZvumdbppyJXjIiN/rqgC8ZNXZS0RnjbhYrFUMHR4CJ4mEndkBbtPMo4lZ+ SDJTMg0Ym9wVAI/zfDuVR/ugfLJdC8AUvB4oSIZ2ozEpK4HvwQyL3gwFNPdvHpZz/2zDC6 UnBHBCwz1eOiOv5Ps6OEGOwgLe7CiNLM6Ysu06XDDRSSZP1kIaRKk+Kx+22lmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717306598; 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=6Pek0s1+Rw39XIktBs+Fx/XWcH7+eKb7qc9PvZ7jwFw=; b=aPaT4BcLpZs6FUHmJD/CnmGgH5WV2rfpYvIQIEawbqkmZcSESd79dZ5Q29vn0Q5RB7FqjH E3CvVcEAgDf+GL5oCp9hqikW9ZRCDAj6968P7gw9htlJAqwbdcVoKmVNCKnL7FCvT9944X 2rt/LlRubJBrEq3xAwVs/2un9dCJpQ++T1pwsLetaYjW+bXFQ39IboWdZmVVPcCvpO9Aki RdA2Xt5o2oUZenlAHLkdm+NzdF2/prNPiSPKwtPUkqw6KOYFyPKnsoKhDp5vIv5Vwkxkxa Z+2elsrWbXulfLpVNrWLxtvNL7IcJ5Bng5/OjN0399y1aW1sNgOm7qH9Id2+Sw== 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 4VsQZt3pzKzfgQ; Sun, 2 Jun 2024 05:36:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4525ac2h013097; Sun, 2 Jun 2024 05:36:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4525acxQ013094; Sun, 2 Jun 2024 05:36:38 GMT (envelope-from git) Date: Sun, 2 Jun 2024 05:36:38 GMT Message-Id: <202406020536.4525acxQ013094@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: c18ba8e8b5c9 - main - security/wpa_supplicant-devel: Fix 15-CURRENT 108de784513d build List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c18ba8e8b5c9712d1775d73484087670e23ce9db Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=c18ba8e8b5c9712d1775d73484087670e23ce9db commit c18ba8e8b5c9712d1775d73484087670e23ce9db Author: Cy Schubert AuthorDate: 2024-06-02 05:21:38 +0000 Commit: Cy Schubert CommitDate: 2024-06-02 05:31:51 +0000 security/wpa_supplicant-devel: Fix 15-CURRENT 108de784513d build On FreeBSD systems without 108de784513d the old definition will be used while on 108de784513d and newer the duplicate case will be removed. Obtained from: src 676041c41ba5 Discussed with: imp --- .../wpa_supplicant-devel/files/patch-src_utils_os__unix.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/security/wpa_supplicant-devel/files/patch-src_utils_os__unix.c b/security/wpa_supplicant-devel/files/patch-src_utils_os__unix.c new file mode 100644 index 000000000000..d3ebadbba827 --- /dev/null +++ b/security/wpa_supplicant-devel/files/patch-src_utils_os__unix.c @@ -0,0 +1,15 @@ +--- src/utils/os_unix.c.orig 2024-05-10 09:57:55.000000000 -0700 ++++ src/utils/os_unix.c 2024-06-01 22:18:54.999484000 -0700 +@@ -103,10 +103,12 @@ + break; + #endif + #ifdef CLOCK_MONOTONIC ++#if !(defined(CLOCK_BOOTTIME) && CLOCK_BOOTTIME == CLOCK_MONOTONIC) + case CLOCK_MONOTONIC: + clock_id = CLOCK_REALTIME; + break; + #endif ++#endif + case CLOCK_REALTIME: + return -1; + }