search

nshalman / wireguard-go

Mirror only. Official repository is at https://git.zx2c4.com/wireguard-go
MIT License
2 stars 0 forks source link

Please rebase against upstream #1

Open jperkin opened 8 months ago

jperkin commented 8 months ago

This fork is a little behind upstream, and in particular is missing https://github.com/nshalman/wireguard-go/commit/42ec952eadc297efadc70b9911d5a59bcd2db4a6 which will hopefully fix the build against Go 1.21.

Go 1.21 is now the default in pkgsrc, and this causes wireguard-go to fail in gvisor:

https://us-central.manta.mnx.io/pkgsrc/public/reports/trunk/tools/20231031.0849/wireguard-go-0.0.20220316/build.log

due to the following constraints in gvisor@v0.0.0-20221203005347-703fd9b7fbc0/pkg/gohacks/gohacks_unsafe.go:

//go:build go1.13 && !go1.21
// +build go1.13,!go1.21

Thanks!

nshalman commented 8 months ago

A quick-and-dirty rebase of https://github.com/nshalman/wireguard-go/tree/tailscale-1.40 is up at

https://github.com/nshalman/wireguard-go/tree/20231031 https://github.com/nshalman/wireguard-go/commit/98037d67d12511ace9148c1ac920e794369c225e

I need to do some testing to see if it's working correctly.

nshalman commented 8 months ago

It seems off.

jperkin commented 8 months ago

Just to confirm that this builds fine, but if it's off then I'll wait for your ok before committing.

nshalman commented 7 months ago

I don't know what was wrong with that branch, but I rebased against a release tag from upstream and that seems to behave. Please try https://github.com/nshalman/wireguard-go/releases/tag/0.0.20230223-sunos