testssl: 2.9.5-4 -> 2.9.5-5 #38936
Merged
testssl: 2.9.5-4 -> 2.9.5-5 #38936
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@GrahamcOfBorg build testssl |
|
Success on x86_64-linux (full log) Attempted: testssl Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: testssl Partial log (click to expand)
|
dotlambda
reviewed
Apr 14, 2018
| }; | ||
|
|
||
| buildInputs = [ coreutils openssl ]; |
There was a problem hiding this comment.
That should not be necessary as both are mentioned in postPatch
There was a problem hiding this comment.
I didn't know that nix picked that up automatically, removed.
dotlambda
reviewed
Apr 14, 2018
| mkdir -p $out/bin $out/etc | ||
| cp -r etc/ $out/ | ||
| mkdir -p $out/bin | ||
| cp -r etc/ $out | ||
| cp testssl.sh $out/bin/testssl.sh |
There was a problem hiding this comment.
Here you could use install, but that's personal taste:
install -Dt $out/bin testssl.sh
cp -r etc $out
dotlambda
reviewed
Apr 14, 2018
| }; | ||
|
|
||
| patches = [ ./testssl.patch ]; | ||
|
|
||
| postPatch = '' | ||
| substituteInPlace testssl.sh \ | ||
| --replace /bin/pwd ${pwdBinPath} \ | ||
| --replace /bin/pwd ${coreutils}/bin/pwd \ |
There was a problem hiding this comment.
I can't find /bin/pwd in testssl.sh
There was a problem hiding this comment.
It's in there, when I do grep 'bin/pwd' result/bin/testssl.sh I get the following output:
cwd="$(/nix/store/jy9knxp7nmw80jkf932axrs1b4p9k4hi-coreutils-8.29/bin/pwd)" || \
if [[ "$openssl_location" =~ $(/nix/store/jy9knxp7nmw80jkf932axrs1b4p9k4hi-coreutils-8.29/bin/pwd)/bin ]]; then
On the patched one.
There was a problem hiding this comment.
It seems to be line 11404 and 11406 :p
There was a problem hiding this comment.
Ah, sorry. I was looking at the development version.
There was a problem hiding this comment.
However, I think that's a bit inconsistent: There are other places where $(pwd) or $(printf) is used. Maybe we should use makeWrapper to add coreutils to the path and replace /bin/pwd by pwd?
There was a problem hiding this comment.
I was told before that people rather patch bash scripts than to have wrappers for them, since it's easy to patch. But I've added a --replace for $(pwd) as well
There was a problem hiding this comment.
And what about printf, basename, kill, ...? I think in this case a wrapper is definitely the simplest solution.
There was a problem hiding this comment.
I also see hostname from nettools used
There was a problem hiding this comment.
I'm not sure if that's generally agreed upon, but I think this should run fine in nix-shell --pure -p testssl.
However, I get
/nix/store/mjswi7v7il7afrjpr8rf7sl42nasijgb-testssl.sh-2.9.5-5/bin/testssl.sh: line 121: hostname: command not found
Fatal error: Neither "dig", "host", "drill" or "nslookup" is present
|
Success on x86_64-linux (full log) Attempted: testssl Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: testssl Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: testssl Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: testssl Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: testssl Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: testssl Partial log (click to expand)
|
|
@dotlambda Now it works in a pure shell, and got rid of some patching by using a wrapper. |
dotlambda
reviewed
Apr 14, 2018
| dnsutils # for dig | ||
| nettools # for hostname | ||
| openssl # for openssl | ||
| openssl # for openssl |
Changelog: https://github.com/drwetter/testssl.sh/releases/tag/v2.9.5-5 Also improved expression.
dotlambda
approved these changes
Apr 14, 2018
|
Success on aarch64-linux (full log) Attempted: testssl Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: testssl Partial log (click to expand)
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Changelog:
https://github.com/drwetter/testssl.sh/releases/tag/v2.9.5-5
Also improved expression.
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)