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

john: Fix extra utility programs #33257

Merged
merged 1 commit into from Jan 4, 2018
Merged

Conversation

danielfullmer
Copy link
Contributor

Motivation for this change

The john package includes a number of extra utilities, mostly of the form "x2john" where "x" is some password file format. These are written either in python, perl, or included in the "john" executable and available when called through a symlink.

This commit (mostly) fixes these utilities. Previously, the symlinks were not included, and the perl/python scripts wouldn't run since they didn't have correct shebang lines or dependencies. This should correct that.

One important note is that some utilities have versions written in multiple languages (for whatever reason). For example, aix2john.pl and aix2john.py, as well as dmg2john and dmg2john.py. The previous build script would strip off the .{pl,py} extension of python and perl scripts, which would clobber these identically named utilities. I've left the .{pl,py} extensions as-is in my commit.

Finally, I've left a TODO in for a couple of utilities (radius2john.pl and lion2john-alt.pl) that are still not working, because their dependencies are not packaged in nixpkgs.

CC @offline

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@pbogdan
Copy link
Member

pbogdan commented Jan 1, 2018

/cc @offlinehacker

@joachifm joachifm merged commit 24e8c38 into NixOS:master Jan 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants