mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-29 16:40:18 +02:00
Merge pull request #164418 from fabaff/bump-sslyze
python3Packages.tls-parser: 1.2.2 -> 2.0.0, python3Packages.sslyze: 5.0.2 -> 5.0.3
This commit is contained in:
commit
b0ea20b46e
|
@ -9,6 +9,7 @@
|
||||||
, tls-parser
|
, tls-parser
|
||||||
, cacert
|
, cacert
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
|
, pythonAtLeast
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -50,9 +51,11 @@ let
|
||||||
"enable-tls1_3"
|
"enable-tls1_3"
|
||||||
"no-async"
|
"no-async"
|
||||||
];
|
];
|
||||||
patches = builtins.filter (
|
patches = builtins.filter
|
||||||
|
(
|
||||||
p: (builtins.baseNameOf (toString p)) != "macos-yosemite-compat.patch"
|
p: (builtins.baseNameOf (toString p)) != "macos-yosemite-compat.patch"
|
||||||
) oldAttrs.patches;
|
)
|
||||||
|
oldAttrs.patches;
|
||||||
buildInputs = oldAttrs.buildInputs ++ [ zlibStatic cacert ];
|
buildInputs = oldAttrs.buildInputs ++ [ zlibStatic cacert ];
|
||||||
meta = oldAttrs.meta // {
|
meta = oldAttrs.meta // {
|
||||||
knownVulnerabilities = [
|
knownVulnerabilities = [
|
||||||
|
@ -76,9 +79,11 @@ let
|
||||||
sha256 = "1zqb1rff1wikc62a7vj5qxd1k191m8qif5d05mwdxz2wnzywlg72";
|
sha256 = "1zqb1rff1wikc62a7vj5qxd1k191m8qif5d05mwdxz2wnzywlg72";
|
||||||
};
|
};
|
||||||
configureFlags = oldAttrs.configureFlags ++ nasslOpensslFlagsCommon;
|
configureFlags = oldAttrs.configureFlags ++ nasslOpensslFlagsCommon;
|
||||||
patches = builtins.filter (
|
patches = builtins.filter
|
||||||
|
(
|
||||||
p: (builtins.baseNameOf (toString p)) == "darwin64-arm64.patch"
|
p: (builtins.baseNameOf (toString p)) == "darwin64-arm64.patch"
|
||||||
) oldAttrs.patches;
|
)
|
||||||
|
oldAttrs.patches;
|
||||||
buildInputs = oldAttrs.buildInputs ++ [ zlibStatic ];
|
buildInputs = oldAttrs.buildInputs ++ [ zlibStatic ];
|
||||||
# openssl_1_0_2 needs `withDocs = false`
|
# openssl_1_0_2 needs `withDocs = false`
|
||||||
outputs = lib.remove "doc" oldAttrs.outputs;
|
outputs = lib.remove "doc" oldAttrs.outputs;
|
||||||
|
@ -87,21 +92,25 @@ let
|
||||||
in
|
in
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "nassl";
|
pname = "nassl";
|
||||||
version = "4.0.1";
|
version = "4.0.2";
|
||||||
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nabla-c0d3";
|
owner = "nabla-c0d3";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-QzO7ABh2weBO6NVFIj7kZpS8ashbDGompuvdKteJeUc=";
|
hash = "sha256-lLyHXLmBVvT+LgsKBU8DcUXd0qaLSrwvXxFnIB9CHcU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = let
|
postPatch =
|
||||||
|
let
|
||||||
legacyOpenSSLVersion = lib.replaceStrings [ "." ] [ "_" ] opensslLegacyStatic.version;
|
legacyOpenSSLVersion = lib.replaceStrings [ "." ] [ "_" ] opensslLegacyStatic.version;
|
||||||
modernOpenSSLVersion = lib.replaceStrings [ "." ] [ "_" ] opensslStatic.version;
|
modernOpenSSLVersion = lib.replaceStrings [ "." ] [ "_" ] opensslStatic.version;
|
||||||
zlibVersion = zlibStatic.version;
|
zlibVersion = zlibStatic.version;
|
||||||
in ''
|
in
|
||||||
|
''
|
||||||
mkdir -p deps/openssl-OpenSSL_${legacyOpenSSLVersion}/
|
mkdir -p deps/openssl-OpenSSL_${legacyOpenSSLVersion}/
|
||||||
cp ${opensslLegacyStatic.out}/lib/libssl.a \
|
cp ${opensslLegacyStatic.out}/lib/libssl.a \
|
||||||
${opensslLegacyStatic.out}/lib/libcrypto.a \
|
${opensslLegacyStatic.out}/lib/libcrypto.a \
|
||||||
|
@ -120,9 +129,17 @@ buildPythonPackage rec {
|
||||||
cp ${zlibStatic.out}/lib/libz.a deps/zlib-${zlibVersion}/
|
cp ${zlibStatic.out}/lib/libz.a deps/zlib-${zlibVersion}/
|
||||||
'';
|
'';
|
||||||
|
|
||||||
propagatedBuildInputs = [ tls-parser ];
|
nativeBuildInputs = [
|
||||||
|
invoke
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ invoke ];
|
propagatedBuildInputs = [
|
||||||
|
tls-parser
|
||||||
|
];
|
||||||
|
|
||||||
|
checkInputs = [
|
||||||
|
pytestCheckHook
|
||||||
|
];
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
invoke build.nassl
|
invoke build.nassl
|
||||||
|
@ -131,19 +148,23 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
pythonImportsCheck = [ "nassl" ];
|
pythonImportsCheck = [
|
||||||
|
"nassl"
|
||||||
checkInputs = [ pytestCheckHook ];
|
];
|
||||||
|
|
||||||
disabledTests = [
|
disabledTests = [
|
||||||
"Online"
|
"Online"
|
||||||
|
] ++ lib.optionals (pythonAtLeast "3.10") [
|
||||||
|
"test_write_bad"
|
||||||
|
"test_client_authentication_no_certificate_supplied"
|
||||||
|
"test_client_authentication_succeeds"
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
description = "Low-level OpenSSL wrapper for Python";
|
||||||
homepage = "https://github.com/nabla-c0d3/nassl";
|
homepage = "https://github.com/nabla-c0d3/nassl";
|
||||||
description = "Low-level OpenSSL wrapper for Python 3.7+";
|
|
||||||
platforms = with platforms; linux ++ darwin;
|
|
||||||
license = licenses.agpl3Only;
|
license = licenses.agpl3Only;
|
||||||
maintainers = with maintainers; [ veehaitch ];
|
maintainers = with maintainers; [ veehaitch ];
|
||||||
|
platforms = with platforms; linux ++ darwin;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,14 +16,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "sslyze";
|
pname = "sslyze";
|
||||||
version = "5.0.2";
|
version = "5.0.3";
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nabla-c0d3";
|
owner = "nabla-c0d3";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-8xtnE5oFxH3wo2Smt65/xGDHxivexN6ggUpyUg42Cjk=";
|
hash = "sha256-d465WJIDsgNAPe8KW5v2KDSgzMH7OPLSiFfFH9n+jiA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patchPhase = ''
|
patchPhase = ''
|
||||||
|
|
|
@ -7,23 +7,29 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "tls-parser";
|
pname = "tls-parser";
|
||||||
version = "1.2.2";
|
version = "2.0.0";
|
||||||
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nabla-c0d3";
|
owner = "nabla-c0d3";
|
||||||
repo = "tls_parser";
|
repo = "tls_parser";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "12qj3vg02r5a51w6gbgb1gcxicqc10lbbsdi57jkkfvbqiindbd0";
|
hash = "sha256-A1lYRe1sHDoOFdF20DP+xRMcPBWzokIXFphIpaBmwBc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = [ pytestCheckHook ];
|
checkInputs = [
|
||||||
|
pytestCheckHook
|
||||||
|
];
|
||||||
|
|
||||||
pythonImportsCheck = [ "tls_parser" ];
|
pythonImportsCheck = [
|
||||||
|
"tls_parser"
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/nabla-c0d3/tls_parser";
|
|
||||||
description = "Small library to parse TLS records";
|
description = "Small library to parse TLS records";
|
||||||
|
homepage = "https://github.com/nabla-c0d3/tls_parser";
|
||||||
platforms = with platforms; linux ++ darwin;
|
platforms = with platforms; linux ++ darwin;
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ veehaitch ];
|
maintainers = with maintainers; [ veehaitch ];
|
||||||
|
|
Loading…
Reference in a new issue