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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

polkit: Apply unreleased patch to fix pkexec without a graphical agent #322207

Merged
merged 1 commit into from
Jun 27, 2024

Conversation

Artturin
Copy link
Member

@Artturin Artturin commented Jun 24, 2024

Merged upstream PR https://www.github.com/polkit-org/polkit/pull/423

Fixes #18012

Redo of #144797 now that the upstream PR is merged

Description of changes

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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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.

Copy link
Member

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

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

Looks okay. Thanks.

@Atemu
Copy link
Member

Atemu commented Jun 24, 2024

Just for context, in https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/59#note_2100970 you said that the previous iteration of that PR couldn't be reviewed and is security-critical; what changed?

@Artturin
Copy link
Member Author

Artturin commented Jun 24, 2024

Just for context, in https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/59#note_2100970 you said that the previous iteration of that PR couldn't be reviewed and is security-critical; what changed?

Upstream has merged the PR (they switched to github, pr description has the link)

Copy link
Contributor

Backport failed for release-24.05, 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.05
git worktree add -d .worktree/backport-322207-to-release-24.05 origin/release-24.05
cd .worktree/backport-322207-to-release-24.05
git switch --create backport-322207-to-release-24.05
git cherry-pick -x 26b7b2fe4d95856c1d44751f0035292b5d98362c

@Artturin
Copy link
Member Author

#322981

@Atemu
Copy link
Member

Atemu commented Jun 27, 2024

I still don't understand how the choice of forge would influence the decision to merge changes that cannot easily be reviewed?

@Artturin
Copy link
Member Author

I still don't understand how the choice of forge would influence the decision to merge changes that cannot easily be reviewed?

The quote I had in https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/59#note_2100970 was from @jtojnar #144797 (comment) (Who is not an upstream developer)

Now https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/59 has been recreated by an upstream developer polkit-org/polkit#423 and reviewed&merged by the upstream developer

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment