Skip to content

[24.11] headscale: backport BaseDomain and ServerURL checks#357969

Closed
motiejus wants to merge 1 commit intoNixOS:release-24.11from
motiejus:24.11-headscale-backport-serverurl
Closed

[24.11] headscale: backport BaseDomain and ServerURL checks#357969
motiejus wants to merge 1 commit intoNixOS:release-24.11from
motiejus:24.11-headscale-backport-serverurl

Conversation

@motiejus
Copy link
Contributor

@motiejus motiejus commented Nov 21, 2024

Currently users upgrading from 24.05 to 24.11 may stumble across an overly-restrictive BaseURL and ServerURL check in headscale1.

A fix has been merged upstream2, this is backport, so users can have it easier upgrading from 24.05 to 24.11.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Currently users upgrading from 24.05 to 24.11 may stumble across an
overly-restrictive BaseURL and ServerURL check in headscale[1].

A fix has been merged upstream[2], this is backport, so users can have
it easier upgrading from 24.05 to 24.11.

[1]: juanfont/headscale#2210
[2]: juanfont/headscale#2248
@motiejus motiejus marked this pull request as ready for review November 22, 2024 14:23
@motiejus motiejus requested a review from kradalby November 22, 2024 14:27
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Nov 22, 2024
@06kellyjac
Copy link
Member

Since this is merged upstream can we fetchpatch the upstream commit please. Plus a comment to remove next release.

Also could you make the PR against master and we can backport to 24.11 from there.

@motiejus
Copy link
Contributor Author

Since this is merged upstream can we fetchpatch the upstream commit please. Plus a comment to remove next release.

This does not apply cleanly to the released version, thus the patch.

Also could you make the PR against master and we can backport to 24.11 from there.

Ok.

@motiejus
Copy link
Contributor Author

#358255

@motiejus motiejus closed this Nov 22, 2024
@motiejus motiejus deleted the 24.11-headscale-backport-serverurl branch November 22, 2024 21:43
wolfgangwalther pushed a commit that referenced this pull request Jan 3, 2025
Currently users upgrading from 24.05 to 24.11 may stumble across an
overly-restrictive BaseURL and ServerURL check in headscale[1].

A fix has been merged upstream[2], this is backport, so users can have
it easier upgrading from 24.05 to 24.11 or unstable.

The patch does not apply cleanly on v0.23.0, so putting it here instead.

Supersedes #357969, this will be backported to 24.11 with a tag.

[1]: juanfont/headscale#2210
[2]: juanfont/headscale#2248
nixpkgs-ci bot pushed a commit that referenced this pull request Jan 3, 2025
Currently users upgrading from 24.05 to 24.11 may stumble across an
overly-restrictive BaseURL and ServerURL check in headscale[1].

A fix has been merged upstream[2], this is backport, so users can have
it easier upgrading from 24.05 to 24.11 or unstable.

The patch does not apply cleanly on v0.23.0, so putting it here instead.

Supersedes #357969, this will be backported to 24.11 with a tag.

[1]: juanfont/headscale#2210
[2]: juanfont/headscale#2248

(cherry picked from commit f1bdc12)
thomasjm pushed a commit to codedownio/nixpkgs that referenced this pull request Jan 5, 2025
Currently users upgrading from 24.05 to 24.11 may stumble across an
overly-restrictive BaseURL and ServerURL check in headscale[1].

A fix has been merged upstream[2], this is backport, so users can have
it easier upgrading from 24.05 to 24.11 or unstable.

The patch does not apply cleanly on v0.23.0, so putting it here instead.

Supersedes NixOS#357969, this will be backported to 24.11 with a tag.

[1]: juanfont/headscale#2210
[2]: juanfont/headscale#2248
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants