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

pam_mount: update to add support for LUKS2 #100552

Closed
wants to merge 1 commit into from
Closed

Conversation

@dnr
Copy link
Contributor

@dnr dnr commented Oct 15, 2020

Motivation for this change

Support for LUKS2 exists in the pam_mount git repo[1] but has not been
released yet. Ubuntu has been backporting a slightly different fix for a
while now[2]. This changes pam_mount to use git instead of the last
release.

[1] https://sourceforge.net/p/pam-mount/pam-mount/ci/d4434c05e7
[2] https://bugs.launchpad.net/ubuntu/+source/libpam-mount/+bug/1804408

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.
Support for LUKS2 exists in the pam_mount git repo[1] but has not been
released yet. Ubuntu has been backporting a slightly different fix for a
while now[2]. This changes pam_mount to use git instead of the last
release.

[1] https://sourceforge.net/p/pam-mount/pam-mount/ci/d4434c05e7
[2] https://bugs.launchpad.net/ubuntu/+source/libpam-mount/+bug/1804408

stdenv.mkDerivation rec {
name = "pam_mount-2.16";
name = "pam_mount-2.16-g40b6f2f";
Copy link
Member

@SuperSandro2000 SuperSandro2000 Nov 27, 2020

Suggested change
name = "pam_mount-2.16-g40b6f2f";
pname = "pam_mount";
version = "2.16-g40b6f2f";

url = "mirror://sourceforge/pam-mount/pam_mount/2.16/${name}.tar.xz";
sha256 = "1rvi4irb7ylsbhvx1cr6islm2xxw1a4b19q6z4a9864ndkm0f0mf";
src = fetchgit {
url = "git://git.code.sf.net/p/pam-mount/pam-mount";
Copy link
Member

@SuperSandro2000 SuperSandro2000 Nov 27, 2020

Suggested change
url = "git://git.code.sf.net/p/pam-mount/pam-mount";
url = "git.code.sf.net/p/pam-mount/pam-mount";

sha256 = "1rvi4irb7ylsbhvx1cr6islm2xxw1a4b19q6z4a9864ndkm0f0mf";
src = fetchgit {
url = "git://git.code.sf.net/p/pam-mount/pam-mount";
rev = "40b6f2f920922ff8bbfb45d1d5dfd5a554c16f62";
Copy link
Member

@SuperSandro2000 SuperSandro2000 Nov 27, 2020

Are there any release tags?

Copy link
Contributor Author

@dnr dnr Dec 4, 2020

At the time when I did this, there were not. Since then, it looks like upstream released 2.17, which includes this fix. I'll make a new PR to update to that instead.

@dnr
Copy link
Contributor Author

@dnr dnr commented Dec 4, 2020

Hmm. It looks like someone made a separate pr (#102934), after mine, that fixes this in a different way (checks in a patch rather than fetching from git). I did it that way because the manual discourages checking in patches if the code is available upstream. Ah well.

It looks like upstream has released 2.17 now, including this fix, so I'll make another PR to use that instead.

@dnr dnr closed this Dec 4, 2020
@dnr dnr deleted the fix/pam_mount-luks2 branch Dec 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants