public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

testssl: 2.9.5-3 -> 2.9.5-4

Browse Source 
Changelog:
https://github.com/drwetter/testssl.sh/releases/tag/v2.9.5-4

Also improved the expression to be more readable.
This commit is contained in:
Elis Hirwing 2018-04-09 18:49:50 +02:00
parent a05f246bdd
commit 7b4ed22b54
No known key found for this signature in database
GPG Key ID: D57EFA625C9A925F
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/networking/testssl/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgs }: { stdenv, fetchFromGitHub, pkgs }:
let let
version = "2.9.5-3"; version = "2.9.5-4";
pwdBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ coreutils ])}/pwd"; pwdBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ coreutils ])}/pwd";
opensslBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ openssl ])}/openssl"; opensslBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ openssl ])}/openssl";
@ -12,16 +12,16 @@ in stdenv.mkDerivation rec {
owner = "drwetter"; owner = "drwetter";
repo = "testssl.sh"; repo = "testssl.sh";
rev = "v${version}"; rev = "v${version}";
sha256 = "07vlmf3gn2xa4wam2sql6c1s1hvj5adzd6l1fl12lq066v0k7r7n"; sha256 = "0pfp7r4jhvkh06vawqlvq7vp4imwp6dpq6jx8m0k3j85ywwp45pd";
}; };
patches = [ ./testssl.patch ]; patches = [ ./testssl.patch ];
postPatch = '' postPatch = ''
sed -i -e "s|/bin/pwd|${pwdBinPath}|g" \ substituteInPlace testssl.sh \
-e "s|TESTSSL_INSTALL_DIR:-\"\"|TESTSSL_INSTALL_DIR:-\"$out\"|g" \ --replace /bin/pwd ${pwdBinPath} \
-e "s|OPENSSL:-\"\"|OPENSSL:-\"${opensslBinPath}\"|g" \ --replace TESTSSL_INSTALL_DIR:-\"\" TESTSSL_INSTALL_DIR:-\"$out\" \
testssl.sh --replace @@openssl-path@@ ${opensslBinPath}
''; '';
installPhase = '' installPhase = ''

2
pkgs/applications/networking/testssl/testssl.patch
View File

@ -4,7 +4,7 @@
# following variables make use of $ENV, e.g. OPENSSL=<myprivate_path_to_openssl> ./testssl.sh <host> # following variables make use of $ENV, e.g. OPENSSL=<myprivate_path_to_openssl> ./testssl.sh <host>
# 0 means (normally) true here. Some of the variables are also accessible with a command line switch, see --help # 0 means (normally) true here. Some of the variables are also accessible with a command line switch, see --help
declare -x OPENSSL OPENSSL_TIMEOUT declare -x OPENSSL OPENSSL_TIMEOUT
+OPENSSL=${OPENSSL:-""} +OPENSSL=${OPENSSL:-"@@openssl-path@@"}
FAST_SOCKET=${FAST_SOCKET:-false} # EXPERIMENTAL feature to accelerate sockets -- DO NOT USE it for production FAST_SOCKET=${FAST_SOCKET:-false} # EXPERIMENTAL feature to accelerate sockets -- DO NOT USE it for production
COLOR=${COLOR:-2} # 2: Full color, 1: b/w+positioning, 0: no ESC at all COLOR=${COLOR:-2} # 2: Full color, 1: b/w+positioning, 0: no ESC at all
COLORBLIND=${COLORBLIND:-false} # if true, swap blue and green in the output COLORBLIND=${COLORBLIND:-false} # if true, swap blue and green in the output