-
Notifications
You must be signed in to change notification settings - Fork 6
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
rebasing patches for go1.21 #66
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
phirework
force-pushed
the
phirework/1.21
branch
from
June 21, 2023 21:25
26dbf95
to
1b166d5
Compare
Can you fix the commit messages to not say |
|
Otherwise looks good, thanks! |
Signed-off-by: Jenny Zhang <[email protected]>
…nspecified addr listens For debugging Mac firewall dialog boxes blocking+failing tests. Change-Id: Ic1a0cd51de7fe553de1c1c9333fa1cc75b8490f2 (cherry picked from commit 8c9eff4)
Git checkouts are not reproducible (in particular, the .git directory's hashes vary according to the moods of git re: packing and other local settings), so building our Go toolchain via Nix leads to source hashes that change from machine to machine and over time. Since Nix already knows the exact git revision it's building from, this change lets Nix provide that hash to cmd/dist directly, skipping the rooting around in .git to find the right hash. Signed-off-by: Jenny Zhang <[email protected]> (cherry picked from commit 6a17f14)
Lets us build a statically linked toolchain that has the same cgo behavior as the standard dynamic toolchain. Signed-off-by: Jenny Zhang <[email protected]> (Cherry-picked from a2f29de)
Updates #55 Updates tailscale/corp#8944 Signed-off-by: Jenny Zhang <[email protected]> (Cherry-picked from 13373ca)
Loosely inspired by nettrace/httptrace, allows functions to be called when sockets are read from or written to. The hooks are specified via the context (with a WithSockTrace function). Only implemented for network sockets on POSIX systems. Updates tailscale/corp#9230 Updates #58 Signed-off-by: Jenny Zhang <[email protected]> (Cherry-picked from fb11c0d)
Extends the hooks added by #45 to also expose when TCP sockets are created or closed (meant to allow TCP stats to be read from them). We don't do this for all socket types since stats are not available for UDP sockets, and they tend to be short-lived, thus invoking the hooks would be useless overhead. Also fixes read/write hooks to not count out-of-band data, since that's usually not sent over the wire. Updates tailscale/corp#9230 Updates #58 Signed-off-by: Jenny Zhang <[email protected]> (Cherry-picked from db4dc90)
phirework
force-pushed
the
phirework/1.21
branch
from
June 22, 2023 16:14
1b166d5
to
4d51c4a
Compare
@bradfitz done |
bradfitz
approved these changes
Jun 22, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Steps:
git checkout tailscale.go1.20 -- .github
,git commit
patch: .github/workflows #47git cherry-pick 8c9eff4
, resolve conflict patch: net: add TS_PANIC_ON_TEST_LISTEN_UNSPEC env to panic on unspecified addr listens #48git cherry-pick 6a17f14
, resolve conflict (ignored26292c0
because changes were already included in step 1) patch: cmd/dist: stamp git commit into runtime.Version value #49git cherry-pick a2f29de
, resolve conflict patch: let cmd/go be built statically and still make cgo binaries from that static binary #52git cherry-pick 13373ca
patch: net, net/http: add enforcement hooks #55git cherry-pick fb11c0d
andgit cherry-pick db4dc90
patch: net: add socket read/write hooks #58