git: 6c34779afda6 - main - {net,security}/{hostapd*,wpa_supplicant*}: Remove unneeded patch
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 10 Aug 2026 17:47:58 UTC
The branch main has been updated by cy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=6c34779afda6a3e01b0da485c31a8114d3909370
commit 6c34779afda6a3e01b0da485c31a8114d3909370
Author: Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2026-08-10 17:43:42 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
CommitDate: 2026-08-10 17:47:34 +0000
{net,security}/{hostapd*,wpa_supplicant*}: Remove unneeded patch
Upstream has incorporated our patch. We can remove ours now.
Fixes: d7e66a13b386, 2b067a2748cc, f37b72501299, f37b72501299
---
net/hostapd-devel/Makefile | 1 +
net/hostapd-devel/files/patch-src_utils_os__unix.c | 16 ----------------
net/hostapd/Makefile | 1 +
net/hostapd/files/patch-src_utils_os__unix.c | 16 ----------------
security/wpa_supplicant-devel/Makefile | 2 +-
.../files/patch-src_utils_os__unix.c | 16 ----------------
security/wpa_supplicant/Makefile | 1 +
security/wpa_supplicant/files/patch-src_utils_os__unix.c | 16 ----------------
8 files changed, 4 insertions(+), 65 deletions(-)
diff --git a/net/hostapd-devel/Makefile b/net/hostapd-devel/Makefile
index 18c6143db0f7..68afb6994672 100644
--- a/net/hostapd-devel/Makefile
+++ b/net/hostapd-devel/Makefile
@@ -1,5 +1,6 @@
PORTNAME= hostapd
PORTVERSION= ${COMMIT_DATE}
+PORTREVISION= 1
CATEGORIES= net
PKGNAMESUFFIX= -devel
diff --git a/net/hostapd-devel/files/patch-src_utils_os__unix.c b/net/hostapd-devel/files/patch-src_utils_os__unix.c
deleted file mode 100644
index 2774b068e7d6..000000000000
--- a/net/hostapd-devel/files/patch-src_utils_os__unix.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/utils/os_unix.c.orig 2026-08-09 02:28:34.000000000 -0700
-+++ src/utils/os_unix.c 2026-08-10 08:33:03.420436000 -0700
-@@ -124,11 +124,13 @@
- #endif
-
- #ifdef CLOCK_MONOTONIC
-+#if !(defined(CLOCK_BOOTTIME) && CLOCK_BOOTTIME == CLOCK_MONOTONIC)
- if (clock_id == CLOCK_MONOTONIC) {
- clock_id = CLOCK_REALTIME;
- continue;
- }
- #endif
-+#endif
-
- /* No additional clockid_t values to fall back to */
- return -1;
diff --git a/net/hostapd/Makefile b/net/hostapd/Makefile
index aa9cbe4b7c10..e05d2ace3a15 100644
--- a/net/hostapd/Makefile
+++ b/net/hostapd/Makefile
@@ -1,5 +1,6 @@
PORTNAME= hostapd
PORTVERSION= 2.12
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= https://w1.fi/releases/
diff --git a/net/hostapd/files/patch-src_utils_os__unix.c b/net/hostapd/files/patch-src_utils_os__unix.c
deleted file mode 100644
index cb8af8330819..000000000000
--- a/net/hostapd/files/patch-src_utils_os__unix.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/utils/os_unix.c.orig 2026-08-07 06:10:53.000000000 -0700
-+++ src/utils/os_unix.c 2026-08-10 08:16:05.134675000 -0700
-@@ -124,11 +124,13 @@
- #endif
-
- #ifdef CLOCK_MONOTONIC
-+#if !(defined(CLOCK_BOOTTIME) && CLOCK_BOOTTIME == CLOCK_MONOTONIC)
- if (clock_id == CLOCK_MONOTONIC) {
- clock_id = CLOCK_REALTIME;
- continue;
- }
- #endif
-+#endif
-
- /* No additional clockid_t values to fall back to */
- return -1;
diff --git a/security/wpa_supplicant-devel/Makefile b/security/wpa_supplicant-devel/Makefile
index e17263a97bf9..c9497f3468a0 100644
--- a/security/wpa_supplicant-devel/Makefile
+++ b/security/wpa_supplicant-devel/Makefile
@@ -1,6 +1,6 @@
PORTNAME= wpa_supplicant
PORTVERSION= ${COMMIT_DATE}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security net
PKGNAMESUFFIX= -devel
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
deleted file mode 100644
index 2036df735915..000000000000
--- a/security/wpa_supplicant-devel/files/patch-src_utils_os__unix.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/utils/os_unix.c.orig 2026-08-09 02:28:34.000000000 -0700
-+++ src/utils/os_unix.c 2026-08-10 08:35:39.110565000 -0700
-@@ -124,11 +124,13 @@
- #endif
-
- #ifdef CLOCK_MONOTONIC
-+#if !(defined(CLOCK_BOOTTIME) && CLOCK_BOOTTIME == CLOCK_MONOTONIC)
- if (clock_id == CLOCK_MONOTONIC) {
- clock_id = CLOCK_REALTIME;
- continue;
- }
- #endif
-+#endif
-
- /* No additional clockid_t values to fall back to */
- return -1;
diff --git a/security/wpa_supplicant/Makefile b/security/wpa_supplicant/Makefile
index 1de61895073a..9454006b402d 100644
--- a/security/wpa_supplicant/Makefile
+++ b/security/wpa_supplicant/Makefile
@@ -1,5 +1,6 @@
PORTNAME= wpa_supplicant
PORTVERSION= 2.12
+PORTREVISION= 1
CATEGORIES= security net
MASTER_SITES= https://w1.fi/releases/
diff --git a/security/wpa_supplicant/files/patch-src_utils_os__unix.c b/security/wpa_supplicant/files/patch-src_utils_os__unix.c
deleted file mode 100644
index be7cf80db233..000000000000
--- a/security/wpa_supplicant/files/patch-src_utils_os__unix.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/utils/os_unix.c.orig 2026-08-07 06:10:53.000000000 -0700
-+++ src/utils/os_unix.c 2026-08-10 07:55:55.825032000 -0700
-@@ -124,11 +124,13 @@
- #endif
-
- #ifdef CLOCK_MONOTONIC
-+#if !(defined(CLOCK_BOOTTIME) && CLOCK_BOOTTIME == CLOCK_MONOTONIC)
- if (clock_id == CLOCK_MONOTONIC) {
- clock_id = CLOCK_REALTIME;
- continue;
- }
- #endif
-+#endif
-
- /* No additional clockid_t values to fall back to */
- return -1;