Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 2 Jun 2024 05:36:36 GMT
From:      Cy Schubert <cy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 765936405a69 - main - security/wpa_supplicant: Fix 15-CURRENT 108de784513d build
Message-ID:  <202406020536.4525aaap013003@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=765936405a694785f7a047bd7587489681382912

commit 765936405a694785f7a047bd7587489681382912
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2024-06-02 05:10:05 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2024-06-02 05:31:09 +0000

    security/wpa_supplicant: 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
---
 security/wpa_supplicant/files/patch-src_utils_os__unix.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/security/wpa_supplicant/files/patch-src_utils_os__unix.c b/security/wpa_supplicant/files/patch-src_utils_os__unix.c
new file mode 100644
index 000000000000..612df647489e
--- /dev/null
+++ b/security/wpa_supplicant/files/patch-src_utils_os__unix.c
@@ -0,0 +1,15 @@
+--- src/utils/os_unix.c.orig	2022-01-16 12:51:29.000000000 -0800
++++ src/utils/os_unix.c	2024-06-01 22:03:18.774245000 -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;
+ 		}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406020536.4525aaap013003>