git: ec62cd3082dc - main - net/wireguard-kmod: Update to 0.0.20220615
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 15 Jun 2022 14:23:09 UTC
The branch main has been updated by decke:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ec62cd3082dc26ead484fbb49c8268ca5b584d77
commit ec62cd3082dc26ead484fbb49c8268ca5b584d77
Author: Bernhard Froehlich <decke@FreeBSD.org>
AuthorDate: 2022-06-15 14:18:39 +0000
Commit: Bernhard Froehlich <decke@FreeBSD.org>
CommitDate: 2022-06-15 14:18:39 +0000
net/wireguard-kmod: Update to 0.0.20220615
== Changes ==
* build: include compat.h for all files
* compat: fix version stamp
Two lingering compat issues.
* if_wg: wg_peer_alloc and wg_aip_add: Use M_WAITOK with malloc
A small cleanup to memory allocation and error path logic.
* crypto: use OCF to encrypt/decrypt packets when supported
* crypto: use <crypto/chacha20_poly1305.h> when present
* crypto: use curve25519 API from the kernel when available
* crypto: harmonize with compat and clean up
* ci: add FreeBSD 12.3 and 13.1
* compat: update version to handle sbcreatecontrol() changes
More fixes to the compat layer.
* wg_noise: import hmac from crypto
* crypto: inline blake2s convenience function
A few crypto cleanups.
Crypto from OCF and FreeBSD's library code will now be used when available
---
net/wireguard-kmod/Makefile | 3 +--
net/wireguard-kmod/distinfo | 6 +++---
net/wireguard-kmod/files/patch-Makefile | 23 -----------------------
net/wireguard-kmod/files/patch-compat.h | 14 --------------
4 files changed, 4 insertions(+), 42 deletions(-)
diff --git a/net/wireguard-kmod/Makefile b/net/wireguard-kmod/Makefile
index 131a1e20a673..d524f8ecc890 100644
--- a/net/wireguard-kmod/Makefile
+++ b/net/wireguard-kmod/Makefile
@@ -1,6 +1,5 @@
PORTNAME= wireguard-kmod
-PORTVERSION= 0.0.20220610
-PORTREVISION= 1
+PORTVERSION= 0.0.20220615
CATEGORIES= net net-vpn
MASTER_SITES= https://git.zx2c4.com/wireguard-freebsd/snapshot/
DISTNAME= wireguard-freebsd-${PORTVERSION}
diff --git a/net/wireguard-kmod/distinfo b/net/wireguard-kmod/distinfo
index a1bbe2c7fe76..f45d8322d8f8 100644
--- a/net/wireguard-kmod/distinfo
+++ b/net/wireguard-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1654889136
-SHA256 (wireguard-freebsd-0.0.20220610.tar.xz) = 518779c383e8087a60a7ec7b0969158a48b2f19a34a13b62683c982960295f17
-SIZE (wireguard-freebsd-0.0.20220610.tar.xz) = 46064
+TIMESTAMP = 1655302401
+SHA256 (wireguard-freebsd-0.0.20220615.tar.xz) = ad6c42d20a7c0ad2989e729dd41ea5a6a019426b762dfd0c6417e340935cca82
+SIZE (wireguard-freebsd-0.0.20220615.tar.xz) = 46744
diff --git a/net/wireguard-kmod/files/patch-Makefile b/net/wireguard-kmod/files/patch-Makefile
deleted file mode 100644
index 7fcb0b959840..000000000000
--- a/net/wireguard-kmod/files/patch-Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-From ccf37db6e6b983bafcd7a6a7abd7e066026b388f Mon Sep 17 00:00:00 2001
-From: "Jason A. Donenfeld" <Jason@zx2c4.com>
-Date: Fri, 10 Jun 2022 22:28:48 +0200
-Subject: build: include compat.h for all files
-
-54b2075 ("build: only include compat.h for if_wg.c and fix build with an
-obj directory") scoped compat.h to if_wg.c, which broke building on
-12.3.
-
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- src/Makefile | 2 +-
-
---- Makefile
-+++ Makefile
-@@ -6,6 +6,6 @@ SRCS= opt_inet.h opt_inet6.h device_if.h bus_if.h ifdi_if.h
-
- SRCS+= if_wg.c wg_noise.c wg_cookie.c crypto.c
-
--CFLAGS.if_wg.c+= -include ${.CURDIR}/compat.h
-+CFLAGS+= -include ${.CURDIR}/compat.h
-
- .include <bsd.kmod.mk>
diff --git a/net/wireguard-kmod/files/patch-compat.h b/net/wireguard-kmod/files/patch-compat.h
deleted file mode 100644
index 568f5c28ad0a..000000000000
--- a/net/wireguard-kmod/files/patch-compat.h
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix typing mistake in FreeBSD version
-
-Submitted by: Michael Butler <imb@protected-networks.net>
---- compat.h.orig 2022-06-10 17:21:17 UTC
-+++ compat.h
-@@ -8,7 +8,7 @@
-
- #include <sys/param.h>
-
--#if __FreeBSD_version < 1400517
-+#if __FreeBSD_version < 1400057
- #include <sys/sockbuf.h>
- #define sbcreatecontrol(a, b, c, d, e) sbcreatecontrol(a, b, c, d)
- #endif