From nobody Sun Jun 9 05:20:01 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 4VxjtT5Mbvz5NbTW; Sun, 09 Jun 2024 05:20:01 +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 4VxjtT4rfRz4chr; Sun, 9 Jun 2024 05:20:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717910401; 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=3fu8HvFQ/9JVEtJJiNc/n8FHpWeQRqnzzQCfd8sEndk=; b=jyaUjhtCZvFNwQZyBgWMm4e0hfrhO/RjMsW/iEGRPsCU0PWanZCIaNb7uaxyWBcxsS0TCr f1Ov2hZ1bOYFWv14bHS64bqi0+1o0unjUjhf7hm5Zy0L9hbK/bQdzVeOIU+XNepoi2o4DW P3tyJv00xg6ln6jxbG4CpjXieCaaj+7AVC8nErUB9YiRIOJzFN3vI5RADb4IHtRvATzP6i YqxGns42xQbexUU9lr9/V8bTH7AsXUS1hp0qRxjjaMSgsvVV3SqelIjUUkfCWiTNabgFhu tG3QMm5OyP6S6Z97ZXgn7oREAMvyQ5XRmuJgPDfJD4c0jawb00NEcIALt1djOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717910401; a=rsa-sha256; cv=none; b=uieXp63+IiLFHbcgILMcYpk/TvJqh4nlUUtTGTXCbK+TvchQQ0oQQ009ocHAkamUqujpXX jXN96lGLDgaDAlFuCgHg6rhX+Jkep12mHdfFO6thVGOuNHfVvWKCWzu7r8gURhWFpIAXlk xBWGpHBRd2Vuk64c32mOhRUXqk4t3+dKL6jyDN3q/vg4p0za2srVp71+GuYEd8DH2wH4oy 16fEs3mCoKh9gsOOZ8aHBOAbmqKem1Y3PvpSzFPV0yJdHsEi3FjJ7oEywUj/uC+76HC+6L D3UAS9Ll43BLlCNju8jVS09pATNzqofo49DXh7iuhpVb3nzo23TkyjKXT6jJ+Q== 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=1717910401; 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=3fu8HvFQ/9JVEtJJiNc/n8FHpWeQRqnzzQCfd8sEndk=; b=QgLRMFfZdld1b9JBTcXmbapcc6WJPdtzZfcS0Tvjt4H0GLkNbf1L53DeO17avaLMoGol2E aqWYr3za2ZnbyLYsMjtisjPYCENruzhIzKjxPUuHGAJ/nCj/Czmj+B++/wGFzpFcvPTvsJ r099Ja9cu5LGVGBH2AC6NQKFl9d5EhEtnnj/ufmdNPLMw08eQRcsrkSofMthLLfXHBjUcU lVU78FLz7EFAenHZuy+kGYxFFoPvFCdnBgYw0cXLheoYWPd/8S5xPs6GA8JBbaWfAJ9nCC huEr6/uuxo5MY0oTcLopV9jdOVNwi7Tx7/6YbdjnKFj3/9UD+FhrqtG+xhUn9w== 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 4VxjtT4KqTzTHb; Sun, 9 Jun 2024 05:20:01 +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 4595K1vj078034; Sun, 9 Jun 2024 05:20:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4595K1I0078029; Sun, 9 Jun 2024 05:20:01 GMT (envelope-from git) Date: Sun, 9 Jun 2024 05:20:01 GMT Message-Id: <202406090520.4595K1I0078029@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: 8930e017ab24 - main - net/wpa_supplicant_gui: 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: 8930e017ab2424f8ad9526d5ec8ce16ae8ec2dbf Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=8930e017ab2424f8ad9526d5ec8ce16ae8ec2dbf commit 8930e017ab2424f8ad9526d5ec8ce16ae8ec2dbf Author: Cy Schubert AuthorDate: 2024-06-09 05:18:41 +0000 Commit: Cy Schubert CommitDate: 2024-06-09 05:19:47 +0000 net/wpa_supplicant_gui: 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 --- net/wpa_supplicant_gui/Makefile | 2 +- .../files/patch-src_utils_os__unix.c | 26 ++++++++++++---------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/net/wpa_supplicant_gui/Makefile b/net/wpa_supplicant_gui/Makefile index 68689f8c8e74..666ed2be8285 100644 --- a/net/wpa_supplicant_gui/Makefile +++ b/net/wpa_supplicant_gui/Makefile @@ -1,6 +1,6 @@ PORTNAME= wpa_supplicant_gui DISTVERSION= 2.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= https://w1.fi/releases/ \ LOCAL/yuri/net/wpa_supplicant_gui/:icons diff --git a/net/wpa_supplicant_gui/files/patch-src_utils_os__unix.c b/net/wpa_supplicant_gui/files/patch-src_utils_os__unix.c index ccb80bf9fbe6..612df647489e 100644 --- a/net/wpa_supplicant_gui/files/patch-src_utils_os__unix.c +++ b/net/wpa_supplicant_gui/files/patch-src_utils_os__unix.c @@ -1,13 +1,15 @@ ---- src/utils/os_unix.c.orig 2015-09-27 19:02:05 UTC -+++ src/utils/os_unix.c -@@ -23,6 +23,10 @@ - #include - #endif /* __MACH__ */ - -+#ifdef __FreeBSD__ -+#define fdatasync fsync +--- 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 -+ - #include "os.h" - #include "common.h" - + case CLOCK_REALTIME: + return -1; + }