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.

Sign up for GitHub

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

Jump to bottom

linux-pam: remove broken musl pam_exec patch #109906

Merged
merged 1 commit into from Jan 19, 2021
Merged

linux-pam: remove broken musl pam_exec patch #109906

merged 1 commit into from Jan 19, 2021

Conversation

pjjw
Copy link
Contributor

@pjjw pjjw commented Jan 19, 2021 •
edited

it looks like this build wasn't tested with musl-libc after upgrading to
1.5.1, and has been broken in this configuration since, as the removed
patch does not apply cleanly. the good news is it's been fixed upstream,
rendering it unnecessary.

Motivation for this change

linux-pam fails to build with musl-libc

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@pjjw
linux-pam: remove broken musl pam_exec patch
a51b757 
it looks like this build wasn't tested with musl-libc after upgrading to
1.5.1, and has been broken in this configuration since, as the removed
patch does not apply cleanly. the good news is it's been fixed upstream,
rendering it unnecessary.
@SuperSandro2000
Copy link
Member

and has been broken in this configuration since, as the removed
patch does not apply cleanly.

That is because of

patches = lib.optionals (stdenv.hostPlatform.libc == "musl") [

I think adding linux-pam-musl would avoid this in the future.

@SuperSandro2000 SuperSandro2000 merged commit 47409af into NixOS:master Jan 19, 2021
This was referenced Jan 20, 2021
Closed
Closed
Closed
@nh2
Copy link
Contributor

nh2 commented Feb 9, 2021

For more detail, musl-fix-pam_exec.patch was removed from Alpine Linux in https://git.alpinelinux.org/aports/commit/main/linux-pam?id=9ba93cf3f515b4f0b9b3802b84d42c4e436afe8b following the upstream fix in linux-pam/linux-pam#90.

However, we also still have the other 2 patches in that Alpine removed:

libpam-fix-build-with-eglibc-2.16.patch
fix-compat.patch

in https://git.alpinelinux.org/aports/commit/main/linux-pam?id=9ba93cf3f515b4f0b9b3802b84d42c4e436afe8b

Shouldn't we remove those too?

@nh2 nh2 mentioned this pull request Feb 9, 2021
Merged
10 tasks
nh2 added a commit to nh2/nixpkgs that referenced this pull request Feb 10, 2021
@nh2
pkgsStatic.linux-pam: Remove no longer necessary musl patches.
da899ed 
See NixOS#109906 (comment).

These Alpine patches:

    libpam-fix-build-with-eglibc-2.16.patch
    fix-compat.patch

were removed in:

    https://git.alpinelinux.org/aports/commit/main/linux-pam?id=9ba93cf3f515b4f0b9b3802b84d42c4e436afe8b
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@pjjw @SuperSandro2000 @nh2