wireguard-go: removed; imported into base

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: wireguard-go: removed; imported into base
From: Adam Ciarciński <aciarcinski%teonite.com@localhost>
Date: Thu, 14 Dec 2023 14:02:29 +0000
Module Name:	pkgsrc-wip
Committed By:	Adam Ciarciński <aciarcinski%teonite.com@localhost>
Pushed By:	adam
Date:		Thu Dec 14 15:02:29 2023 +0100
Changeset:	d53c249f8f48b62a20fc5b8fbb3cd05fa6c14df2

Modified Files:
	Makefile
Removed Files:
	wireguard-go/DESCR
	wireguard-go/Makefile
	wireguard-go/PLIST
	wireguard-go/distinfo
	wireguard-go/go-modules.mk
	wireguard-go/patches/patch-ipc_uapi__bsd.go
	wireguard-go/patches/patch-ipc_uapi__unix.go
	wireguard-go/patches/patch-tun_tun__netbsd.go

Log Message:
wireguard-go: removed; imported into base

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d53c249f8f48b62a20fc5b8fbb3cd05fa6c14df2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                      |  1 -
 wireguard-go/DESCR                            | 17 ------------
 wireguard-go/Makefile                         | 27 -------------------
 wireguard-go/PLIST                            |  2 --
 wireguard-go/distinfo                         | 32 ----------------------
 wireguard-go/go-modules.mk                    | 10 -------
 wireguard-go/patches/patch-ipc_uapi__bsd.go   | 12 ---------
 wireguard-go/patches/patch-ipc_uapi__unix.go  | 12 ---------
 wireguard-go/patches/patch-tun_tun__netbsd.go | 38 ---------------------------
 9 files changed, 151 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 77d36193c9..250e301c68 100644
--- a/Makefile
+++ b/Makefile
@@ -5654,7 +5654,6 @@ SUBDIR+=	wings
 SUBDIR+=	winwrangler
 SUBDIR+=	wip-tools
 SUBDIR+=	wipeout-rewrite
-SUBDIR+=	wireguard-go
 SUBDIR+=	wireless-tools
 SUBDIR+=	wireshark2
 SUBDIR+=	wise2
diff --git a/wireguard-go/DESCR b/wireguard-go/DESCR
deleted file mode 100644
index 8ad0c9b13f..0000000000
--- a/wireguard-go/DESCR
+++ /dev/null
@@ -1,17 +0,0 @@
-This is an implementation of WireGuard in Go.
-
-Most Linux kernel WireGuard users are used to adding an interface with `ip link
-add wg0 type wireguard`. With wireguard-go, instead simply run:
-
-$ wireguard-go wg0
-
-This will create an interface and fork into the background. To remove the
-interface, use the usual `ip link del wg0`, or if your system does not support
-removing interfaces directly, you may instead remove the control socket via `rm
--f /var/run/wireguard/wg0.sock`, which will result in wireguard-go shutting
-down.
-
-To run wireguard-go without forking to the background, pass `-f` or
-`--foreground`:
-
-$ wireguard-go -f wg0
diff --git a/wireguard-go/Makefile b/wireguard-go/Makefile
deleted file mode 100644
index 31387107f7..0000000000
--- a/wireguard-go/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	wireguard-go-0.0.20220316
-CATEGORIES=	net
-MASTER_SITES=	https://git.zx2c4.com/wireguard-go/snapshot/
-EXTRACT_SUFX=	.tar.xz
-
-MAINTAINER=	js%pkgsrc.org@localhost
-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 && ${CP} tun_openbsd.go tun_netbsd.go
-
-.include "go-modules.mk"
-
-.include "../../lang/go/go-module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/wireguard-go/PLIST b/wireguard-go/PLIST
deleted file mode 100644
index aca6a1a9dd..0000000000
--- a/wireguard-go/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD$
-bin/wireguard-go
diff --git a/wireguard-go/distinfo b/wireguard-go/distinfo
deleted file mode 100644
index 5777c63470..0000000000
--- a/wireguard-go/distinfo
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD$
-
-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.0.0-20220315194320-039c03cc5b86.mod) = 66613eb38a59b8a7f75e1aaeb294a1c4ea290d4e9ae699137566025e50ed741c
-SHA512 (golang.org_x_sys_@v_v0.0.0-20220315194320-039c03cc5b86.mod) = 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
-Size (golang.org_x_sys_@v_v0.0.0-20220315194320-039c03cc5b86.mod) = 33 bytes
-BLAKE2s (golang.org_x_sys_@v_v0.0.0-20220315194320-039c03cc5b86.zip) = bd35115c65f83cd3684db9872fae177c8cf18898fa02bc532c22f7ff65139734
-SHA512 (golang.org_x_sys_@v_v0.0.0-20220315194320-039c03cc5b86.zip) = 97de5e6ac75924f19e75f0cef159b88fe173cf6214ca5d65c1b277122bd41b932cacccfabb54ac87919d7c571a8068792b275c36cb971a8c67f06dfc780ed494
-Size (golang.org_x_sys_@v_v0.0.0-20220315194320-039c03cc5b86.zip) = 1734685 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 (wireguard-go-0.0.20220316.tar.xz) = d6d7c8e3b416d9947d625e756fbf8c380c7f37251e94a71f92b3f2bd8b7efc5a
-SHA512 (wireguard-go-0.0.20220316.tar.xz) = 82b53210502e01d454a62a1a7694f57b2f72178e55a2dab4909a89bc544980316ab56e10a34aa68914ccfb6f3fc4d3db8fe94013ddf5fd74b628ca6e5c184033
-Size (wireguard-go-0.0.20220316.tar.xz) = 110444 bytes
-SHA1 (patch-ipc_uapi__bsd.go) = 028dd8415c52abb844ee1e8b234cc13872e697e3
-SHA1 (patch-ipc_uapi__unix.go) = 8b0c917db05bfb94f446cf6b68b5c4ac655ebd9f
-SHA1 (patch-tun_tun__netbsd.go) = 0a9b925b520f7b6169e37dd8afa42c04ab2b0b6e
diff --git a/wireguard-go/go-modules.mk b/wireguard-go/go-modules.mk
deleted file mode 100644
index 7e36320149..0000000000
--- a/wireguard-go/go-modules.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD$
-
-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.0.0-20220315194320-039c03cc5b86.mod
-GO_MODULE_FILES+=	golang.org/x/sys/@v/v0.0.0-20220315194320-039c03cc5b86.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
diff --git a/wireguard-go/patches/patch-ipc_uapi__bsd.go b/wireguard-go/patches/patch-ipc_uapi__bsd.go
deleted file mode 100644
index 239724940a..0000000000
--- a/wireguard-go/patches/patch-ipc_uapi__bsd.go
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
-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
-  *
diff --git a/wireguard-go/patches/patch-ipc_uapi__unix.go b/wireguard-go/patches/patch-ipc_uapi__unix.go
deleted file mode 100644
index c49da7282d..0000000000
--- a/wireguard-go/patches/patch-ipc_uapi__unix.go
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
-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
-  *
diff --git a/wireguard-go/patches/patch-tun_tun__netbsd.go b/wireguard-go/patches/patch-tun_tun__netbsd.go
deleted file mode 100644
index 3266c14a35..0000000000
--- a/wireguard-go/patches/patch-tun_tun__netbsd.go
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD$
-
-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 != "" {
Prev by Date: rust174-bin: upgrade to version 1.74.1, to track the wip/rust174 package.
Next by Date: joker: update to 1.3.1
Previous by Thread: rust174-bin: upgrade to version 1.74.1, to track the wip/rust174 package.
Next by Thread: joker: update to 1.3.1
Indexes:
Home | Main Index | Thread Index | Old Index