Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 533C184FC4 for ; Thu, 14 Dec 2023 13:56:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id K89dRWghHCDZ for ; Thu, 14 Dec 2023 13:56:24 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id E6DCA84CF8 for ; Thu, 14 Dec 2023 13:56:23 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id DA6B4FA42; Thu, 14 Dec 2023 13:56:23 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1702562183128270" MIME-Version: 1.0 Date: Thu, 14 Dec 2023 13:56:23 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/net To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20231214135623.DA6B4FA42@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1702562183128270 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Thu Dec 14 13:56:23 UTC 2023 Modified Files: pkgsrc/net: Makefile Added Files: pkgsrc/net/wireguard-go: DESCR Makefile PLIST distinfo go-modules.mk pkgsrc/net/wireguard-go/patches: patch-ipc_uapi__bsd.go patch-ipc_uapi__unix.go patch-tun_tun__netbsd.go Log Message: wireguard-go: added version 0.0.20230223 WireGuard is an extremely simple yet fast and modern VPN that utilizes state-of-the-art cryptography. It aims to be faster, simpler, leaner, and more useful than IPsec, while avoiding the massive headache. It intends to be considerably more performant than OpenVPN. WireGuard is designed as a general purpose VPN for running on embedded interfaces and super computers alike, fit for many different circumstances. This is an implementation of WireGuard in Go. To generate a diff of this commit: cvs rdiff -u -r1.1549 -r1.1550 pkgsrc/net/Makefile cvs rdiff -u -r0 -r1.1 pkgsrc/net/wireguard-go/DESCR \ pkgsrc/net/wireguard-go/Makefile pkgsrc/net/wireguard-go/PLIST \ pkgsrc/net/wireguard-go/distinfo pkgsrc/net/wireguard-go/go-modules.mk cvs rdiff -u -r0 -r1.1 pkgsrc/net/wireguard-go/patches/patch-ipc_uapi__bsd.go \ pkgsrc/net/wireguard-go/patches/patch-ipc_uapi__unix.go \ pkgsrc/net/wireguard-go/patches/patch-tun_tun__netbsd.go Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1702562183128270 Content-Disposition: inline Content-Length: 12675 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/Makefile diff -u pkgsrc/net/Makefile:1.1549 pkgsrc/net/Makefile:1.1550 --- pkgsrc/net/Makefile:1.1549 Mon Nov 13 20:04:51 2023 +++ pkgsrc/net/Makefile Thu Dec 14 13:56:23 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1549 2023/11/13 20:04:51 wiz Exp $ +# $NetBSD: Makefile,v 1.1550 2023/12/14 13:56:23 adam Exp $ # COMMENT= Networking tools @@ -1034,6 +1034,7 @@ SUBDIR+= whois3 SUBDIR+= whoson SUBDIR+= wide-dhcpv6 SUBDIR+= wimon +SUBDIR+= wireguard-go SUBDIR+= wireguard-tools SUBDIR+= wireshark SUBDIR+= wistumbler Added files: Index: pkgsrc/net/wireguard-go/DESCR diff -u /dev/null pkgsrc/net/wireguard-go/DESCR:1.1 --- /dev/null Thu Dec 14 13:56:23 2023 +++ pkgsrc/net/wireguard-go/DESCR Thu Dec 14 13:56:23 2023 @@ -0,0 +1,8 @@ +WireGuard is an extremely simple yet fast and modern VPN that utilizes +state-of-the-art cryptography. It aims to be faster, simpler, leaner, and more +useful than IPsec, while avoiding the massive headache. It intends to be +considerably more performant than OpenVPN. WireGuard is designed as a general +purpose VPN for running on embedded interfaces and super computers alike, fit +for many different circumstances. + +This is an implementation of WireGuard in Go. Index: pkgsrc/net/wireguard-go/Makefile diff -u /dev/null pkgsrc/net/wireguard-go/Makefile:1.1 --- /dev/null Thu Dec 14 13:56:23 2023 +++ pkgsrc/net/wireguard-go/Makefile Thu Dec 14 13:56:23 2023 @@ -0,0 +1,27 @@ +# $NetBSD: Makefile,v 1.1 2023/12/14 13:56:23 adam Exp $ + +DISTNAME= wireguard-go-0.0.20230223 +CATEGORIES= net +MASTER_SITES= https://git.zx2c4.com/wireguard-go/snapshot/ +EXTRACT_SUFX= .tar.xz + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= https://www.wireguard.com/ +COMMENT= Implementation of WireGuard in Go +LICENSE= mit + +INSTALLATION_DIRS+= bin + +do-install: + ${INSTALL_PROGRAM} ${WRKDIR}/.gopath/bin/wireguard \ + ${DESTDIR}${PREFIX}/bin/wireguard-go + +GO_BUILD_PATTERN= . + +pre-patch: + cd ${WRKSRC}/tun && ${LN} tun_openbsd.go tun_netbsd.go + +.include "go-modules.mk" + +.include "../../lang/go/go-module.mk" +.include "../../mk/bsd.pkg.mk" Index: pkgsrc/net/wireguard-go/PLIST diff -u /dev/null pkgsrc/net/wireguard-go/PLIST:1.1 --- /dev/null Thu Dec 14 13:56:23 2023 +++ pkgsrc/net/wireguard-go/PLIST Thu Dec 14 13:56:23 2023 @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST,v 1.1 2023/12/14 13:56:23 adam Exp $ +bin/wireguard-go Index: pkgsrc/net/wireguard-go/distinfo diff -u /dev/null pkgsrc/net/wireguard-go/distinfo:1.1 --- /dev/null Thu Dec 14 13:56:23 2023 +++ pkgsrc/net/wireguard-go/distinfo Thu Dec 14 13:56:23 2023 @@ -0,0 +1,50 @@ +$NetBSD: distinfo,v 1.1 2023/12/14 13:56:23 adam Exp $ + +BLAKE2s (github.com_google_btree_@v_v1.0.1.mod) = 4f561ac81ef1ba1adb7dddfb23b3997c6fe655ba46cfc65425ccc8de38122dca +SHA512 (github.com_google_btree_@v_v1.0.1.mod) = b1f1c83260a976b4d1e79b029bdcf7813184e3f6d45b066400f329b099ab478ac54afcddce10b3e358a14ae8af48c7a1b56dd231388ece034b6092fd11cc44c7 +Size (github.com_google_btree_@v_v1.0.1.mod) = 629 bytes +BLAKE2s (github.com_google_btree_@v_v1.0.1.zip) = abfc4ccb1a7f9cb0e7f4087a6f78db8a6f9f89e6b0efa962c90d51954350f052 +SHA512 (github.com_google_btree_@v_v1.0.1.zip) = b82644edae6e2d95dcbc7a7575e5eff35765fae183459dc809f44f337826ed38cf84ebfd01f142b79e3cdecfa3c0b65f9ff83aa91fb33a1a0c7c0bf48d472c63 +Size (github.com_google_btree_@v_v1.0.1.zip) = 18241 bytes +BLAKE2s (golang.org_x_crypto_@v_v0.0.0-20220315160706-3147a52a75dd.mod) = 3218fb197e3df718e689eb2e6187e8b6164db45fcd92c7b120f1805fb409353f +SHA512 (golang.org_x_crypto_@v_v0.0.0-20220315160706-3147a52a75dd.mod) = 8b89bda14a8eea63c73e602efb4f90d9bd5ba816041b8c8eeb516a7edbb70578e2c594f4ac7168b5cef417075b295f6aab908514244cb9bb05f7bb13f1170bb3 +Size (golang.org_x_crypto_@v_v0.0.0-20220315160706-3147a52a75dd.mod) = 255 bytes +BLAKE2s (golang.org_x_crypto_@v_v0.0.0-20220315160706-3147a52a75dd.zip) = 94ec7f1fc2ae1309373c1d910f659c8914004c4cfcef23c1c123354f208c9ac2 +SHA512 (golang.org_x_crypto_@v_v0.0.0-20220315160706-3147a52a75dd.zip) = 2ca2f410b0cd460a779a226c60ed2aba099f67a536555edbb339f74bd5bcf133114b53f1dbe218d259f08e76abd55ec29bf2b18f3f8c9642304c0193f0ef7a12 +Size (golang.org_x_crypto_@v_v0.0.0-20220315160706-3147a52a75dd.zip) = 1775692 bytes +BLAKE2s (golang.org_x_net_@v_v0.0.0-20220225172249-27dd8689420f.mod) = 01ff91ba1b2385e7b781caaf1557e07e3b0d8932b1e515f746929b11a21d642b +SHA512 (golang.org_x_net_@v_v0.0.0-20220225172249-27dd8689420f.mod) = 429ece90e145151ec4cff356689cdbc04ab43f85f2dbd594f60176f49b0ee5f9f2bfe7c7bd88bb5564adb8f3d28ea12a2722ad79a80640ede67a3ad4f9e72caa +Size (golang.org_x_net_@v_v0.0.0-20220225172249-27dd8689420f.mod) = 179 bytes +BLAKE2s (golang.org_x_net_@v_v0.0.0-20220225172249-27dd8689420f.zip) = a08a3f4a52ebefc4c926aa14ece0b36d6859323795182ea09ef63b978c66e493 +SHA512 (golang.org_x_net_@v_v0.0.0-20220225172249-27dd8689420f.zip) = 1d3da4703e57f8924888f50a75ae499f59ae8560c578eef721e4c3450e123c11e53e91265349f81aaece1c84a8d5cb55ad2d670205bef8094fc3d80ba2a9473d +Size (golang.org_x_net_@v_v0.0.0-20220225172249-27dd8689420f.zip) = 1584604 bytes +BLAKE2s (golang.org_x_sys_@v_v0.2.0.mod) = 66613eb38a59b8a7f75e1aaeb294a1c4ea290d4e9ae699137566025e50ed741c +SHA512 (golang.org_x_sys_@v_v0.2.0.mod) = 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655 +Size (golang.org_x_sys_@v_v0.2.0.mod) = 33 bytes +BLAKE2s (golang.org_x_sys_@v_v0.2.0.zip) = 693501d19dd6f12b0d451a65c5e0590ea985a7e63015468929f0fe1c90076a72 +SHA512 (golang.org_x_sys_@v_v0.2.0.zip) = 58791ccf0c8d020bb84316351fdfbb9d135314c7e90909f86f430c4ee444df84b4e3fe6a5bf7023be212cbecccb0c0171799d9329f43a435ebb71822f845e6a0 +Size (golang.org_x_sys_@v_v0.2.0.zip) = 1862113 bytes +BLAKE2s (golang.org_x_time_@v_v0.0.0-20191024005414-555d28b269f0.mod) = f8a17647799023d32e6a0af341ba3fc6e74004a882f89f943385a363c1b64af4 +SHA512 (golang.org_x_time_@v_v0.0.0-20191024005414-555d28b269f0.mod) = 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7 +Size (golang.org_x_time_@v_v0.0.0-20191024005414-555d28b269f0.mod) = 25 bytes +BLAKE2s (golang.org_x_time_@v_v0.0.0-20191024005414-555d28b269f0.zip) = 742f115d1ced689b7121f08c611ab3da1e016015283690543069b42d97fa130f +SHA512 (golang.org_x_time_@v_v0.0.0-20191024005414-555d28b269f0.zip) = 58cb42ebeb88c06e049caf8c609e95243e7bdba51057de7d7301885aa904111dbe85962b5faef216ae45aa73f371b5de6516800a6f5765219cfde3fb06372afe +Size (golang.org_x_time_@v_v0.0.0-20191024005414-555d28b269f0.zip) = 11971 bytes +BLAKE2s (golang.zx2c4.com_wintun_@v_v0.0.0-20211104114900-415007cec224.mod) = d0a8981e147a2bc39165eea1213a548643d5eeb40a9ecf6d31252ef219c35c13 +SHA512 (golang.zx2c4.com_wintun_@v_v0.0.0-20211104114900-415007cec224.mod) = d6e1f05265246a911533552ad2d79e9b411fb438fdee5374541650fdfb550636b6952a0f96244f1eaed4110b8fab8de05ba2346b9de54f751780034fa614c30d +Size (golang.zx2c4.com_wintun_@v_v0.0.0-20211104114900-415007cec224.mod) = 101 bytes +BLAKE2s (golang.zx2c4.com_wintun_@v_v0.0.0-20211104114900-415007cec224.zip) = 126b11ad182659b8a538ed9008b0e4f3ef3ff061db1ef716da6fd5a208cb056e +SHA512 (golang.zx2c4.com_wintun_@v_v0.0.0-20211104114900-415007cec224.zip) = ca168248e592dea0933d4d876a21b054cbf4d2746c0ec8fcb74abfae783bab3e2ecb1ca8ca25b60d507364d2d85c231baaa52d4a46e954a8ff95acac97634cce +Size (golang.zx2c4.com_wintun_@v_v0.0.0-20211104114900-415007cec224.zip) = 5997 bytes +BLAKE2s (gvisor.dev_gvisor_@v_v0.0.0-20221203005347-703fd9b7fbc0.mod) = e9e99717616ba67503e25d70ed4cf5534d4d977bff65129660175a1f69efac08 +SHA512 (gvisor.dev_gvisor_@v_v0.0.0-20221203005347-703fd9b7fbc0.mod) = 5df745e5cae2711c30ccde8186409c3ebe9ed736b6306a963b26bbdb87193d66453da6b377bb6389935b982d0f7d1078753ac7be83f904832ba5035e28a0d4ea +Size (gvisor.dev_gvisor_@v_v0.0.0-20221203005347-703fd9b7fbc0.mod) = 3141 bytes +BLAKE2s (gvisor.dev_gvisor_@v_v0.0.0-20221203005347-703fd9b7fbc0.zip) = dea0b1dfe12df7ce99fbb3b8466461fe7c7a83729db048b1f7c9d3e60b256ab7 +SHA512 (gvisor.dev_gvisor_@v_v0.0.0-20221203005347-703fd9b7fbc0.zip) = c969bea4f39a52f7a6ea8b548b5c55ae4471ea66ad1750e63e2fbe2f0fcd94efa27d54446ba1e12de465580fbd18a4c140a2f343caaa853326906182a014cd85 +Size (gvisor.dev_gvisor_@v_v0.0.0-20221203005347-703fd9b7fbc0.zip) = 3866243 bytes +BLAKE2s (wireguard-go-0.0.20230223.tar.xz) = 622d0e39f42c86eb7e2cc547cc3a6bdba51db1ae85b86fa79be4f4d5a6cd15d0 +SHA512 (wireguard-go-0.0.20230223.tar.xz) = 221ecea400fdfdfd564d8ab3b1939cab289b28a00c8d2e8e41bd56484f09d66e20a3dd34dc81471e7fc5133bebffc621be984b8a8d3475a0e4b08daa350d5583 +Size (wireguard-go-0.0.20230223.tar.xz) = 77552 bytes +SHA1 (patch-ipc_uapi__bsd.go) = 028dd8415c52abb844ee1e8b234cc13872e697e3 +SHA1 (patch-ipc_uapi__unix.go) = 8b0c917db05bfb94f446cf6b68b5c4ac655ebd9f +SHA1 (patch-tun_tun__netbsd.go) = f47590820fc278b599636dde5409ec926275a4b0 Index: pkgsrc/net/wireguard-go/go-modules.mk diff -u /dev/null pkgsrc/net/wireguard-go/go-modules.mk:1.1 --- /dev/null Thu Dec 14 13:56:23 2023 +++ pkgsrc/net/wireguard-go/go-modules.mk Thu Dec 14 13:56:23 2023 @@ -0,0 +1,16 @@ +# $NetBSD: go-modules.mk,v 1.1 2023/12/14 13:56:23 adam Exp $ + +GO_MODULE_FILES+= github.com/google/btree/@v/v1.0.1.mod +GO_MODULE_FILES+= github.com/google/btree/@v/v1.0.1.zip +GO_MODULE_FILES+= golang.org/x/crypto/@v/v0.0.0-20220315160706-3147a52a75dd.mod +GO_MODULE_FILES+= golang.org/x/crypto/@v/v0.0.0-20220315160706-3147a52a75dd.zip +GO_MODULE_FILES+= golang.org/x/net/@v/v0.0.0-20220225172249-27dd8689420f.mod +GO_MODULE_FILES+= golang.org/x/net/@v/v0.0.0-20220225172249-27dd8689420f.zip +GO_MODULE_FILES+= golang.org/x/sys/@v/v0.2.0.mod +GO_MODULE_FILES+= golang.org/x/sys/@v/v0.2.0.zip +GO_MODULE_FILES+= golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod +GO_MODULE_FILES+= golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip +GO_MODULE_FILES+= golang.zx2c4.com/wintun/@v/v0.0.0-20211104114900-415007cec224.mod +GO_MODULE_FILES+= golang.zx2c4.com/wintun/@v/v0.0.0-20211104114900-415007cec224.zip +GO_MODULE_FILES+= gvisor.dev/gvisor/@v/v0.0.0-20221203005347-703fd9b7fbc0.mod +GO_MODULE_FILES+= gvisor.dev/gvisor/@v/v0.0.0-20221203005347-703fd9b7fbc0.zip Index: pkgsrc/net/wireguard-go/patches/patch-ipc_uapi__bsd.go diff -u /dev/null pkgsrc/net/wireguard-go/patches/patch-ipc_uapi__bsd.go:1.1 --- /dev/null Thu Dec 14 13:56:23 2023 +++ pkgsrc/net/wireguard-go/patches/patch-ipc_uapi__bsd.go Thu Dec 14 13:56:23 2023 @@ -0,0 +1,12 @@ +$NetBSD: patch-ipc_uapi__bsd.go,v 1.1 2023/12/14 13:56:23 adam Exp $ + +Add NetBSD to the list of OSes for this file. + +--- ipc/uapi_bsd.go.orig 2022-03-17 03:32:14.000000000 +0000 ++++ ipc/uapi_bsd.go +@@ -1,4 +1,4 @@ +-//go:build darwin || freebsd || openbsd ++//go:build darwin || freebsd || openbsd || netbsd + + /* SPDX-License-Identifier: MIT + * Index: pkgsrc/net/wireguard-go/patches/patch-ipc_uapi__unix.go diff -u /dev/null pkgsrc/net/wireguard-go/patches/patch-ipc_uapi__unix.go:1.1 --- /dev/null Thu Dec 14 13:56:23 2023 +++ pkgsrc/net/wireguard-go/patches/patch-ipc_uapi__unix.go Thu Dec 14 13:56:23 2023 @@ -0,0 +1,12 @@ +$NetBSD: patch-ipc_uapi__unix.go,v 1.1 2023/12/14 13:56:23 adam Exp $ + +Support NetBSD. + +--- ipc/uapi_unix.go.orig 2022-06-07 07:27:04.052864036 +0000 ++++ ipc/uapi_unix.go +@@ -1,4 +1,4 @@ +-//go:build linux || darwin || freebsd || openbsd ++//go:build linux || darwin || freebsd || openbsd || netbsd + + /* SPDX-License-Identifier: MIT + * Index: pkgsrc/net/wireguard-go/patches/patch-tun_tun__netbsd.go diff -u /dev/null pkgsrc/net/wireguard-go/patches/patch-tun_tun__netbsd.go:1.1 --- /dev/null Thu Dec 14 13:56:23 2023 +++ pkgsrc/net/wireguard-go/patches/patch-tun_tun__netbsd.go Thu Dec 14 13:56:23 2023 @@ -0,0 +1,38 @@ +$NetBSD: patch-tun_tun__netbsd.go,v 1.1 2023/12/14 13:56:23 adam Exp $ + +Enables multi-af mode for NetBSD tun(4). + +--- tun/tun_netbsd.go.orig 2023-07-03 19:33:35.358738005 +0000 ++++ tun/tun_netbsd.go +@@ -25,7 +25,7 @@ type ifreq_mtu struct { + Pad0 [12]byte + } + +-const _TUNSIFMODE = 0x8004745d ++const _TUNSIFHEAD = 0x80047442 + + type NativeTun struct { + name string +@@ -130,6 +130,22 @@ func CreateTUN(name string, mtu int) (De + + tun, err := CreateTUNFromFile(tunfile, mtu) + ++ // set multi-af mode ++ ifheadmode := 1 ++ var errno syscall.Errno ++ _, _, errno = unix.Syscall( ++ unix.SYS_IOCTL, ++ tunfile.Fd(), ++ uintptr(_TUNSIFHEAD), ++ uintptr(unsafe.Pointer(&ifheadmode)), ++ ) ++ ++ if errno != 0 { ++ tunfile.Close() ++ return nil, fmt.Errorf("Unable to put into multi-af mode: %v", errno) ++ } ++ ++ + if err == nil && name == "tun" { + fname := os.Getenv("WG_TUN_NAME_FILE") + if fname != "" { --_----------=_1702562183128270--