From nobody Sun Jun 2 05:36:40 2024 X-Original-To: dev-commits-ports-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 4VsQZx0pZHz5M68d; Sun, 02 Jun 2024 05:36:41 +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 4VsQZw5wD1z4WGh; Sun, 2 Jun 2024 05:36:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717306600; 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=4rZGpWe4vtX/9NZDP1DbW4a/gmG6q4AZmleJavKMo40=; b=vPQ9l/A6Zb2cy9QQnk0Jo9CBj7/1z6yaXHlulsjmMteGUh0upEuE9hgGgp5Eu8nPDfQq6D ALAHmR9jSep1oICqt34w5f2jHfNj0SiIgO3p9KbnWg8RnkcF/RMqCJWHmInjep4z4gBqRW 1w7RxaKeMJq7EpMmXoNg0qah659CWi7n4Pk6PWa7w/zKx6UXrVQqP0Dmwy2VqfJTfVm5N/ ntEZbq2C/r2Y6do841Aj24hNbIY3YsPVYsbKXba7AMEirTfcQa31MxzV714bW3y5dymfGh MIOZBJ+S6NXYA1B61uR6/MSOUGSvUIWTRwZmm8NSlbDhOTs7aOjD1szd084ozg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717306600; a=rsa-sha256; cv=none; b=m7Eohly/7YtnKZPMGpPeNR1IrCZXYY95ceYdV+GeMWpovvqPyKd3IpzSDrosBK/Rj3cwhL o0PBUAVpCUayGvqzRF660fiG2Q+zlU1gSp1ZQz1Vn0tY9fF5HgOztKR80RWopgIuWN6ux4 1DdXVOFtH3twDR/IAOzYBbtw8/wQWIV4b+MYKl3hiaWOx4mnbi4JLHJnxQpT4GjHRko1R9 H+5DJiEkLNMhJC+5ujeiShCl+CWADWIi96OyHHEbmHRhfEmDl4RXmRMrT7GgmKEAuWEvoI Q+EQjv9QGC36rtSAcisySWDYucj64vWK7Vea+VE4mlj3Einj4DRRaCbuzs+tdA== 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=1717306600; 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=4rZGpWe4vtX/9NZDP1DbW4a/gmG6q4AZmleJavKMo40=; b=aybEoXKuX07CdbGahgaekgrwAZPY9pKwBmmlThOswvA01pk6d/Kc27VT0eX+4sNTnr1u4m 0UuPMYVcgB2SWkwZItkk436zhbPgQPWCQ4ZpUH8bT/aqpmTNsjQjiHygCBlG4UTv3viKoL O+UqQOxE4nfZ+r3OAfFaGfrnA5L/L0/6PhgLMKO8V0nuPo0PIz03GGOG9JwC/W5jyZkYoK HCP3NsOWYKDAu0+i7MLjuQO+TmUqy6dkLj4WUs2P/VTR4V5SwkUJPcUBTj457O+rZeDYjQ CilwZ31UztJRhHt1Io8SgDuMiOzluUVB43lsryQG/AZZs0es135bYyzXjJjXew== 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 4VsQZw5XVpzfcw; Sun, 2 Jun 2024 05:36:40 +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 4525aeIR013181; Sun, 2 Jun 2024 05:36:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4525aeiM013178; Sun, 2 Jun 2024 05:36:40 GMT (envelope-from git) Date: Sun, 2 Jun 2024 05:36:40 GMT Message-Id: <202406020536.4525aeiM013178@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: d346a6842a1f - main - net/hostapd29: Fix 15-CURRENT 108de784513d build List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-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: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d346a6842a1f407cfdb0bb0d1511b7608b468645 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=d346a6842a1f407cfdb0bb0d1511b7608b468645 commit d346a6842a1f407cfdb0bb0d1511b7608b468645 Author: Cy Schubert AuthorDate: 2024-06-02 05:26:54 +0000 Commit: Cy Schubert CommitDate: 2024-06-02 05:32:25 +0000 net/hostapd29: 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 --- net/hostapd29/files/patch-src_utils_os__unix.c | 31 ++++++++++++-------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/net/hostapd29/files/patch-src_utils_os__unix.c b/net/hostapd29/files/patch-src_utils_os__unix.c index c56eee136a44..da8dbe006d12 100644 --- a/net/hostapd29/files/patch-src_utils_os__unix.c +++ b/net/hostapd29/files/patch-src_utils_os__unix.c @@ -1,18 +1,15 @@ ---- src/utils/os_unix.c.orig 2015-09-27 19:02:05 UTC -+++ src/utils/os_unix.c -@@ -442,6 +442,7 @@ int os_file_exists(const char *fname) - } - - -+#if !defined __FreeBSD__ && !defined __DragonFly__ - int os_fdatasync(FILE *stream) - { - if (!fflush(stream)) { -@@ -459,6 +460,7 @@ int os_fdatasync(FILE *stream) - - return -1; - } +--- src/utils/os_unix.c.orig 2024-06-01 22:24:31.970700000 -0700 ++++ src/utils/os_unix.c 2024-06-01 22:25:35.160514000 -0700 +@@ -97,10 +97,12 @@ + break; + #endif + #ifdef CLOCK_MONOTONIC ++#if !(defined(CLOCK_BOOTTIME) && CLOCK_BOOTTIME == CLOCK_MONOTONIC) + case CLOCK_MONOTONIC: + clock_id = CLOCK_REALTIME; + break; + #endif +#endif - - - #ifndef WPA_TRACE + case CLOCK_REALTIME: + return -1; + }