Skip to content
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

iterm2: 3.5.10 -> 3.5.11 #370402

Merged
merged 1 commit into from
Jan 4, 2025
Merged

iterm2: 3.5.10 -> 3.5.11 #370402

merged 1 commit into from
Jan 4, 2025

Conversation

niklaskorz
Copy link
Contributor

@niklaskorz niklaskorz commented Jan 2, 2025

Fixes a critical security issue in iTerm2's ssh integration: https://iterm2.com/downloads/stable/iTerm2-3_5_11.changelog

nixpkgs-24.11 is not affected (has 3.5.4)

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.

Add a 👍 reaction to pull requests you find important.

@niklaskorz niklaskorz added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Jan 2, 2025
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Jan 2, 2025
Copy link
Contributor

@LeSuisse LeSuisse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change looks good, I do not have a macOS system to test it, it would be nice if a Darwin user could do a quick smoke test.

Copy link
Member

@DimitarNestorov DimitarNestorov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works fine for me

image

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 370402


aarch64-darwin

✅ 1 package built:
  • iterm2

@LeSuisse
Copy link
Contributor

LeSuisse commented Jan 4, 2025

Thanks for the confirmation!

@LeSuisse LeSuisse merged commit 04c5bc3 into NixOS:master Jan 4, 2025
56 of 57 checks passed
@DimitarNestorov DimitarNestorov added the backport release-24.11 Backport PR automatically label Jan 4, 2025
@nix-backports
Copy link

nix-backports bot commented Jan 4, 2025

Backport failed for release-24.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.11
git worktree add -d .worktree/backport-370402-to-release-24.11 origin/release-24.11
cd .worktree/backport-370402-to-release-24.11
git switch --create backport-370402-to-release-24.11
git cherry-pick -x 2ce46489b3ebc4903355f05ab33f1458ed860b80

@niklaskorz
Copy link
Contributor Author

@DimitarNestorov 3.5.10 thankfully wasn't backported to 24.11. Ideally you'd create a manual backport PR cherry-picking the update commits from both PRs (so the vulnerable version isn't backported in isolation).

@DimitarNestorov
Copy link
Member

Manual backport: #370837

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1.severity: security Issues which raise a security issue, or PRs that fix one 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux backport release-24.11 Backport PR automatically
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants