git: 2cb43631ab12 - main - Merge commit '93bf91b4012a28610672d2266366dfa0a663b70f' into HEAD

From: Kyle Evans <kevans_at_FreeBSD.org>
Date: Sat, 05 Nov 2022 03:47:41 UTC 
The branch main has been updated by kevans:

URL: https://cgit.FreeBSD.org/src/commit/?id=2cb43631ab122ee0b2a3a101003b73415a9bf963

commit 2cb43631ab122ee0b2a3a101003b73415a9bf963
Merge: 269865a8eed2 93bf91b4012a
Author:     Kyle Evans <kevans@FreeBSD.org>
AuthorDate: 2022-11-05 03:46:21 +0000
Commit:     Kyle Evans <kevans@FreeBSD.org>
CommitDate: 2022-11-05 03:46:21 +0000

    Merge commit '93bf91b4012a28610672d2266366dfa0a663b70f' into HEAD
    
    This fixes a warning in wireguard-tools, as well as two issues pointed out by
    FreeBSD's Coverity instance.
    
    CID:            1500405, 1500421

 contrib/wireguard-tools/.gitignore    |  5 +++++
 contrib/wireguard-tools/ipc-freebsd.h | 22 ++++++++++++++++------
 contrib/wireguard-tools/show.c        |  2 +-
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --cc contrib/wireguard-tools/.gitignore
index 4343ea95a0a2,000000000000..12b1f78af874
mode 100644,000000..100644
--- a/contrib/wireguard-tools/.gitignore
+++ b/contrib/wireguard-tools/.gitignore
@@@ -1,16 -1,0 +1,21 @@@
 +# GPL-2.0, not used on FreeBSD:
 +Makefile
 +completion
 +fuzz/
 +ipc-uapi-windows.h
 +ipc-windows.h
 +netlink.h
 +uapi/
 +wg-quick/
 +wincompat/
 +
 +# License OK, but not needed for FreeBSD
 +ipc-linux.h
 +ipc-openbsd.h
 +man/wg-quick.8
 +systemd/
++
++# Build artifacts
++wg
++*.d
++*.o