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

monkeysphere: wrap the monkeysphere executable with the necessary crypto libraries … #35361

Merged
merged 1 commit into from Apr 29, 2018
Merged

monkeysphere: wrap the monkeysphere executable with the necessary crypto libraries … #35361

merged 1 commit into from Apr 29, 2018

Conversation

sconybeare
Copy link
Contributor

@sconybeare sconybeare commented Feb 22, 2018 •
edited

…for ssh-proxycommand

Motivation for this change

It was previously impossible to use this package to verify the public key of a host, since the perl program which printed the key fingerprint would crash due to these libraries being unavailable. This bug is fixed herein.

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.

@sconybeare sconybeare changed the title wrap the monkeysphere executable with the necessary crypto libraries … monkeysphere: wrap the monkeysphere executable with the necessary crypto libraries … Feb 22, 2018
@fpletz
Copy link
Member

fpletz commented Feb 23, 2018

@GrahamcOfBorg build monkeysphere

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

/nix/store/l890x3dpvqb312rgggcg68kxl77zcz38-monkeysphere-0.37/bin/.monkeysphere-wrapped: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/bash"
/nix/store/l890x3dpvqb312rgggcg68kxl77zcz38-monkeysphere-0.37/share/monkeysphere/transitions/0.23: interpreter directive changed from "/bin/bash" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/bash"
/nix/store/l890x3dpvqb312rgggcg68kxl77zcz38-monkeysphere-0.37/share/monkeysphere/transitions/0.28: interpreter directive changed from "/bin/bash" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/bash"
/nix/store/l890x3dpvqb312rgggcg68kxl77zcz38-monkeysphere-0.37/share/monkeysphere/common: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/bash"
/nix/store/l890x3dpvqb312rgggcg68kxl77zcz38-monkeysphere-0.37/share/monkeysphere/keytrans: interpreter directive changed from "/usr/bin/perl" to "/nix/store/s029gmjpgvm776wfb56naqny9qja9339-perl-5.24.3/bin/perl"
/nix/store/l890x3dpvqb312rgggcg68kxl77zcz38-monkeysphere-0.37/share/monkeysphere/monkeysphere-authentication-keys-for-user: interpreter directive changed from "/usr/bin/env sh" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/sh"
/nix/store/l890x3dpvqb312rgggcg68kxl77zcz38-monkeysphere-0.37/share/monkeysphere/checkperms: interpreter directive changed from "/usr/bin/perl" to "/nix/store/s029gmjpgvm776wfb56naqny9qja9339-perl-5.24.3/bin/perl"
checking for references to /tmp/nix-build-monkeysphere-0.37.drv-0 in /nix/store/l890x3dpvqb312rgggcg68kxl77zcz38-monkeysphere-0.37...
moving /nix/store/l890x3dpvqb312rgggcg68kxl77zcz38-monkeysphere-0.37/sbin/* to /nix/store/l890x3dpvqb312rgggcg68kxl77zcz38-monkeysphere-0.37/bin
/nix/store/l890x3dpvqb312rgggcg68kxl77zcz38-monkeysphere-0.37

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Partial log (click to expand)

/nix/store/bklpdlc7zyc0vcs2j3v0dsc4j9qvqwv3-monkeysphere-0.37/sbin/monkeysphere-authentication: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/pkjmwq7sqrvjg7cjiph6hq0khsmfl6p8-bash-4.4-p12/bin/bash"
/nix/store/bklpdlc7zyc0vcs2j3v0dsc4j9qvqwv3-monkeysphere-0.37/sbin/monkeysphere-host: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/pkjmwq7sqrvjg7cjiph6hq0khsmfl6p8-bash-4.4-p12/bin/bash"
/nix/store/bklpdlc7zyc0vcs2j3v0dsc4j9qvqwv3-monkeysphere-0.37/share/monkeysphere/checkperms: interpreter directive changed from "/usr/bin/perl" to "/nix/store/zdy8xlih8znc7kkgdwhsih504hy8c8w0-perl-5.24.3/bin/perl"
/nix/store/bklpdlc7zyc0vcs2j3v0dsc4j9qvqwv3-monkeysphere-0.37/share/monkeysphere/common: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/pkjmwq7sqrvjg7cjiph6hq0khsmfl6p8-bash-4.4-p12/bin/bash"
/nix/store/bklpdlc7zyc0vcs2j3v0dsc4j9qvqwv3-monkeysphere-0.37/share/monkeysphere/keytrans: interpreter directive changed from "/usr/bin/perl" to "/nix/store/zdy8xlih8znc7kkgdwhsih504hy8c8w0-perl-5.24.3/bin/perl"
/nix/store/bklpdlc7zyc0vcs2j3v0dsc4j9qvqwv3-monkeysphere-0.37/share/monkeysphere/monkeysphere-authentication-keys-for-user: interpreter directive changed from "/usr/bin/env sh" to "/nix/store/pkjmwq7sqrvjg7cjiph6hq0khsmfl6p8-bash-4.4-p12/bin/sh"
/nix/store/bklpdlc7zyc0vcs2j3v0dsc4j9qvqwv3-monkeysphere-0.37/share/monkeysphere/transitions/0.23: interpreter directive changed from "/bin/bash" to "/nix/store/pkjmwq7sqrvjg7cjiph6hq0khsmfl6p8-bash-4.4-p12/bin/bash"
/nix/store/bklpdlc7zyc0vcs2j3v0dsc4j9qvqwv3-monkeysphere-0.37/share/monkeysphere/transitions/0.28: interpreter directive changed from "/bin/bash" to "/nix/store/pkjmwq7sqrvjg7cjiph6hq0khsmfl6p8-bash-4.4-p12/bin/bash"
moving /nix/store/bklpdlc7zyc0vcs2j3v0dsc4j9qvqwv3-monkeysphere-0.37/sbin/* to /nix/store/bklpdlc7zyc0vcs2j3v0dsc4j9qvqwv3-monkeysphere-0.37/bin
/nix/store/bklpdlc7zyc0vcs2j3v0dsc4j9qvqwv3-monkeysphere-0.37

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

/nix/store/w9aqjh3ramrib8spxjzpdbb1h6ir9c37-monkeysphere-0.37/bin/.monkeysphere-wrapped: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/bash"
/nix/store/w9aqjh3ramrib8spxjzpdbb1h6ir9c37-monkeysphere-0.37/share/monkeysphere/keytrans: interpreter directive changed from "/usr/bin/perl" to "/nix/store/g1naqig0jxakwmf8688d95xfm8xch4dm-perl-5.24.3/bin/perl"
/nix/store/w9aqjh3ramrib8spxjzpdbb1h6ir9c37-monkeysphere-0.37/share/monkeysphere/checkperms: interpreter directive changed from "/usr/bin/perl" to "/nix/store/g1naqig0jxakwmf8688d95xfm8xch4dm-perl-5.24.3/bin/perl"
/nix/store/w9aqjh3ramrib8spxjzpdbb1h6ir9c37-monkeysphere-0.37/share/monkeysphere/common: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/bash"
/nix/store/w9aqjh3ramrib8spxjzpdbb1h6ir9c37-monkeysphere-0.37/share/monkeysphere/monkeysphere-authentication-keys-for-user: interpreter directive changed from "/usr/bin/env sh" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/sh"
/nix/store/w9aqjh3ramrib8spxjzpdbb1h6ir9c37-monkeysphere-0.37/share/monkeysphere/transitions/0.28: interpreter directive changed from "/bin/bash" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/bash"
/nix/store/w9aqjh3ramrib8spxjzpdbb1h6ir9c37-monkeysphere-0.37/share/monkeysphere/transitions/0.23: interpreter directive changed from "/bin/bash" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/bash"
checking for references to /build in /nix/store/w9aqjh3ramrib8spxjzpdbb1h6ir9c37-monkeysphere-0.37...
moving /nix/store/w9aqjh3ramrib8spxjzpdbb1h6ir9c37-monkeysphere-0.37/sbin/* to /nix/store/w9aqjh3ramrib8spxjzpdbb1h6ir9c37-monkeysphere-0.37/bin
/nix/store/w9aqjh3ramrib8spxjzpdbb1h6ir9c37-monkeysphere-0.37

fpletz
fpletz approved these changes Feb 23, 2018
View reviewed changes
Copy link
Member

@fpletz fpletz left a comment

Choose a reason for hiding this comment

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

Thanks!

@fpletz
Copy link
Member

fpletz commented Feb 23, 2018

Oh, as you signed your commit: Could you please reword the commit message as you did the title of this PR? Thanks!

@xeji xeji merged commit 5e06ec7 into NixOS:master Apr 29, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fpletz fpletz fpletz approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@sconybeare @fpletz @GrahamcOfBorg @xeji @Janik-Haag