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

Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging

Browse Source
This commit is contained in:
Luke Granger-Brown
2021-04-12 18:49:01 +00:00
parent 82ca81cd62 60daed5714
commit 08b22e605b
377 changed files with 13801 additions and 5789 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/security/chipsec/compile-ko.diff
+13
View File
@@ -0,0 +1,13 @@
diff --git i/setup.py w/setup.py
index cfe2665..5795874 100755
--- i/setup.py
+++ w/setup.py
@@ -179,7 +179,7 @@ class build_ext(_build_ext):
driver_build_function = self._build_win_driver
self._build_win_compression()
- if not self.skip_driver:
+ if True:
driver_build_function()
def get_source_files(self):
pkgs/tools/security/chipsec/default.nix
+38 -13
View File
@@ -1,29 +1,54 @@
{ stdenv, lib, fetchFromGitHub, python2Packages, nasm, libelf
, kernel ? null, withDriver ? false }:
python2Packages.buildPythonApplication rec {
{ lib
, stdenv
, fetchFromGitHub
, kernel ? null
, libelf
, nasm
, python3
, withDriver ? false
}:
python3.pkgs.buildPythonApplication rec {
pname = "chipsec";
version = "1.5.1";
version = "1.6.1";
disabled = !stdenv.isLinux;
src = fetchFromGitHub {
owner = "chipsec";
repo = "chipsec";
rev = version;
sha256 = "1rxr9i08a22m15slvlkrhnki30jixi2ds096kmmc2nqzfr9yibmb";
sha256 = "01sp24z63r3nqxx57zc4873b8i5dqipy7yrxzrwjns531vznhiy2";
};
disabled = !stdenv.isLinux;
patches = lib.optionals withDriver [ ./ko-path.diff ./compile-ko.diff ];
KSRC = lib.optionalString withDriver "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
nativeBuildInputs = [
nasm libelf
libelf
nasm
];
setupPyBuildFlags = lib.optional (!withDriver) "--skip-driver";
checkInputs = [
python3.pkgs.distro
python3.pkgs.pytestCheckHook
];
checkPhase = "python setup.py build "
+ lib.optionalString (!withDriver) "--skip-driver "
+ "test";
preBuild = lib.optionalString withDriver ''
export CHIPSEC_BUILD_LIB=$(mktemp -d)
mkdir -p $CHIPSEC_BUILD_LIB/chipsec/helper/linux
'';
KERNEL_SRC_DIR = lib.optionalString withDriver "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
preInstall = lib.optionalString withDriver ''
mkdir -p $out/${python3.pkgs.python.sitePackages}/drivers/linux
mv $CHIPSEC_BUILD_LIB/chipsec/helper/linux/chipsec.ko \
$out/${python3.pkgs.python.sitePackages}/drivers/linux/chipsec.ko
'';
setupPyBuildFlags = [ "--build-lib=$CHIPSEC_BUILD_LIB" ]
++ lib.optional (!withDriver) "--skip-driver";
pythonImportsCheck = [ "chipsec" ];
meta = with lib; {
description = "Platform Security Assessment Framework";
@@ -34,7 +59,7 @@ python2Packages.buildPythonApplication rec {
interfaces, and forensic capabilities. It can be run on Windows, Linux,
Mac OS X and UEFI shell.
'';
license = licenses.gpl2;
license = licenses.gpl2Only;
homepage = "https://github.com/chipsec/chipsec";
maintainers = with maintainers; [ johnazoidberg ];
platforms = if withDriver then [ "x86_64-linux" ] else platforms.all;
pkgs/tools/security/chipsec/ko-path.diff
+13
View File
@@ -0,0 +1,13 @@
diff --git c/chipsec/helper/linux/linuxhelper.py i/chipsec/helper/linux/linuxhelper.py
index c51b5e6..4be05ea 100644
--- c/chipsec/helper/linux/linuxhelper.py
+++ i/chipsec/helper/linux/linuxhelper.py
@@ -152,7 +152,7 @@ class LinuxHelper(Helper):
else:
a2 = "a2=0x{}".format(phys_mem_access_prot)
- driver_path = os.path.join(chipsec.file.get_main_dir(), "chipsec", "helper", "linux", "chipsec.ko" )
+ driver_path = os.path.join(chipsec.file.get_main_dir(), "drivers", "linux", "chipsec.ko" )
if not os.path.exists(driver_path):
driver_path += ".xz"
if not os.path.exists(driver_path):
pkgs/tools/security/clamav/default.nix
+2 -2
View File
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "clamav";
version = "0.103.1";
version = "0.103.2";
src = fetchurl {
url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz";
sha256 = "sha256-cwjEe4myaK87nzYUBSiSekn/PmM6nJwKrCcS2BBW4lc=";
sha256 = "sha256-1LXQrGZiYuQjoyb7VHeMqnxpYk1sP5VCiV/rhHgnG9I=";
};
# don't install sample config files into the absolute sysconfdir folder
pkgs/tools/security/clevis/default.nix
+2 -2
View File
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "clevis";
version = "15";
version = "16";
src = fetchFromGitHub {
owner = "latchset";
repo = pname;
rev = "v${version}";
sha256 = "0wfgd2v1r47ckh5qp60b903191fx0fa27zyadxlsb8riqszhmwvz";
sha256 = "sha256-DWrxk+Nb2ptF5nCaXYvRY8hAFa/n+6OGdKWO+Sq61yk=";
};
nativeBuildInputs = [ meson ninja pkg-config asciidoc ];
pkgs/tools/security/dnsx/default.nix
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "dnsx";
version = "1.0.1";
version = "1.0.2";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "dnsx";
rev = "v${version}";
sha256 = "1pgq21pbnz2dm272zrhd455njj5vg4kywpd230acj675nlgir6y1";
sha256 = "sha256-CjWFXYU34PE4I9xihQbPxVcxLyiMCYueuaB/LaXhHQg=";
};
vendorSha256 = "0j2cqvskzxbyfrvsv4gm4qwfjm0digizcg157z5iignnknddajax";
vendorSha256 = "sha256-vTXvlpXpFf78Cwxq/y6ysSeXM3g71kHBn9zd6c4mxlk=";
meta = with lib; {
description = "Fast and multi-purpose DNS toolkit";
pkgs/tools/security/enpass/data.json
+3 -3
View File
@@ -1,8 +1,8 @@
{
"amd64": {
"path": "pool/main/e/enpass/enpass_6.5.1.723_amd64.deb",
"sha256": "d9bb408fa2253ce44ab5396898f7db13291ce23ae58964f4a27ade38bd5067bf",
"version": "6.5.1.723"
"path": "pool/main/e/enpass/enpass_6.6.1.809_amd64.deb",
"sha256": "b1b9bd67653c3163bd80b340150ecf123552cbe4af23c350fbadea8ffd7939ba",
"version": "6.6.1.809"
},
"i386": {
"path": "pool/main/e/enpass/enpass_5.6.9_i386.deb",
pkgs/tools/security/gitleaks/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "gitleaks";
version = "7.3.0";
version = "7.4.0";
src = fetchFromGitHub {
owner = "zricethezav";
repo = pname;
rev = "v${version}";
sha256 = "sha256-IJaumIFuIhrvXZ45uz8RUxAuprnWdv2lNzxNUascvVc=";
sha256 = "sha256-AY9pOARFAqIOimhcwEyau2MwJCFsWu8I36P7Z0xyJH0=";
};
vendorSha256 = "sha256-Cc4DJPpOMHxDcH22S7znYo7QHNRXv8jOJhznu09kaE4=";
pkgs/tools/security/hfinger/default.nix
+36
View File
@@ -0,0 +1,36 @@
{ lib
, fetchFromGitHub
, python3
, wireshark-cli
}:
python3.pkgs.buildPythonApplication rec {
pname = "hfinger";
version = "0.2.0";
disabled = python3.pythonOlder "3.3";
src = fetchFromGitHub {
owner = "CERT-Polska";
repo = pname;
rev = "v${version}";
sha256 = "1vz8mf572qyng684fvb9gdwaaiybk7mjmikbymvjvy24d10raak1";
};
propagatedBuildInputs = with python3.pkgs; [
fnvhash
python_magic
] ++ [
wireshark-cli
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "hfinger" ];
meta = with lib; {
description = "Fingerprinting tool for HTTP requests";
homepage = "https://github.com/CERT-Polska/hfinger";
license = with licenses; [ gpl3Only ];
maintainers = with maintainers; [ fab ];
};
}
pkgs/tools/security/httpx/default.nix
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "httpx";
version = "1.0.3";
version = "1.0.4";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "httpx";
rev = "v${version}";
sha256 = "15ihc5926kbai16i59c7bmvgd162qq9dpd52g4vrp7dq4jrz155m";
sha256 = "sha256-w5CNvtlhvm1SyAKaoA7Fw8ZSY9Z78MentrSNS4mpr1Q=";
};
vendorSha256 = "0fg93vhwpx113fpw8qg4ram4bdh6a8x3a36pr1c962s4vhrabwy2";
vendorSha256 = "sha256-VBxGapvC2QE/0slsAiCBzmwOSMeGepZU0pYVDepSrwg=";
meta = with lib; {
description = "Fast and multi-purpose HTTP toolkit";
pkgs/tools/security/metasploit/Gemfile
+1 -1
View File
@@ -1,4 +1,4 @@
# frozen_string_literal: true
source "https://rubygems.org"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.38"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.39"
pkgs/tools/security/metasploit/Gemfile.lock
+15 -15
View File
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
revision: 4c7a221f3d186b0cd65d2a765533fda54f0848f4
ref: refs/tags/6.0.38
revision: 5cba6ecd3c745f45290400f0705400f26913852e
ref: refs/tags/6.0.39
specs:
metasploit-framework (6.0.38)
metasploit-framework (6.0.39)
actionpack (~> 5.2.2)
activerecord (~> 5.2.2)
activesupport (~> 5.2.2)
@@ -27,11 +27,11 @@ GIT
jsobfu
json
metasm
metasploit-concern
metasploit-credential
metasploit-model
metasploit-concern (~> 3.0.0)
metasploit-credential (~> 4.0.0)
metasploit-model (~> 3.1.0)
metasploit-payloads (= 2.0.41)
metasploit_data_models
metasploit_data_models (~> 4.1.0)
metasploit_payloads-mettle (= 1.0.8)
mqtt
msgpack
@@ -123,13 +123,13 @@ GEM
arel-helpers (2.12.0)
activerecord (>= 3.1.0, < 7)
aws-eventstream (1.1.1)
aws-partitions (1.441.0)
aws-partitions (1.443.0)
aws-sdk-core (3.113.1)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-ec2 (1.232.0)
aws-sdk-ec2 (1.234.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-iam (1.52.0)
@@ -190,7 +190,7 @@ GEM
jsobfu (0.4.2)
rkelly-remix
json (2.5.1)
loofah (2.9.0)
loofah (2.9.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
metasm (1.0.4)
@@ -213,7 +213,7 @@ GEM
activesupport (~> 5.2.2)
railties (~> 5.2.2)
metasploit-payloads (2.0.41)
metasploit_data_models (4.1.2)
metasploit_data_models (4.1.3)
activerecord (~> 5.2.2)
activesupport (~> 5.2.2)
arel-helpers
@@ -238,7 +238,7 @@ GEM
network_interface (0.0.2)
nexpose (7.3.0)
nio4r (2.5.7)
nokogiri (1.11.2)
nokogiri (1.11.3)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
octokit (4.20.0)
@@ -330,15 +330,15 @@ GEM
rex-socket
rex-text
rex-struct2 (0.1.3)
rex-text (0.2.33)
rex-text (0.2.34)
rex-zip (0.1.4)
rex-text
rexml (3.2.4)
rexml (3.2.5)
rkelly-remix (0.0.7)
ruby-macho (2.5.0)
ruby-rc4 (0.1.5)
ruby2_keywords (0.0.4)
ruby_smb (2.0.7)
ruby_smb (2.0.8)
bindata
openssl-ccm
openssl-cmac
pkgs/tools/security/metasploit/default.nix
+2 -2
View File
@@ -8,13 +8,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
version = "6.0.38";
version = "6.0.39";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
sha256 = "sha256-/e1BWhkM4A+xrvDS6Z01sND9aOZDn+cL0RIcAgT5oZs=";
sha256 = "sha256-9uoxxcuEJudJGRQfkVBUWDHoZ1sxaIb+Hjf/sEpcqik=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/tools/security/metasploit/gemset.nix
+19 -19
View File
@@ -114,10 +114,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07i9mqbh19pd25wd3laxv1bcmzcpriw54g0x3mqzkn600h8f3lg9";
sha256 = "0vvav3449v3m0nyflcw07sbxlpgqf4pwa2fmirgjvc9r9asssi79";
type = "gem";
};
version = "1.441.0";
version = "1.443.0";
};
aws-sdk-core = {
groups = ["default"];
@@ -134,10 +134,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0n7hi66zpm8mgfgf32gw7c9p4rv09q9kipsr01l5l2n2d69k67q5";
sha256 = "1rlq8vifcmz24v1aw8vj2czqj4dnf00smm5ndfpaxz5k6550lbz4";
type = "gem";
};
version = "1.232.0";
version = "1.234.0";
};
aws-sdk-iam = {
groups = ["default"];
@@ -474,10 +474,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bzwvxvilx7w1p3pg028ks38925y9i0xm870lm7s12w7598hiyck";
sha256 = "1w9mbii8515p28xd4k72f3ab2g6xiyq15497ys5r8jn6m355lgi7";
type = "gem";
};
version = "2.9.0";
version = "2.9.1";
};
metasm = {
groups = ["default"];
@@ -514,12 +514,12 @@
platforms = [];
source = {
fetchSubmodules = false;
rev = "4c7a221f3d186b0cd65d2a765533fda54f0848f4";
sha256 = "16x1z420470js45yg7s3wrlgvl5h6nfyklphmsqhzq0c35d43vgx";
rev = "5cba6ecd3c745f45290400f0705400f26913852e";
sha256 = "0adabi5b1zrp3vz8cs1ibdkyhcaqai8927ql354yf9l4rg2k3spn";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
version = "6.0.38";
version = "6.0.39";
};
metasploit-model = {
groups = ["default"];
@@ -546,10 +546,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1kzlvq20ml4b5lr1qbrkmivdi37mxi8fasdqg4yla2libfbdz008";
sha256 = "0li8lphplsmv9x1f14c22w95gjx2lscas3x5py7x7kc05pfv33bg";
type = "gem";
};
version = "4.1.2";
version = "4.1.3";
};
metasploit_payloads-mettle = {
groups = ["default"];
@@ -696,10 +696,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0b51df8fwadak075cvi17w0nch6qz1r66564qp29qwfj67j9qp0p";
sha256 = "19d78mdg2lbz9jb4ph6nk783c9jbsdm8rnllwhga6pd53xffp6x0";
type = "gem";
};
version = "1.11.2";
version = "1.11.3";
};
octokit = {
groups = ["default"];
@@ -1096,10 +1096,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1933p6fri27d2gscws43k1v8jw1821l5j4yfi9z97ch5l80mv1zr";
sha256 = "01g6jr73c3hbqhmzlc80jlqz2cwn9bq1j3cc19fpkq3hdg89drjp";
type = "gem";
};
version = "0.2.33";
version = "0.2.34";
};
rex-zip = {
groups = ["default"];
@@ -1116,10 +1116,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3";
sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
type = "gem";
};
version = "3.2.4";
version = "3.2.5";
};
rkelly-remix = {
groups = ["default"];
@@ -1166,10 +1166,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0px84i3d9kqb40ff7nk3k7hb3w3kk80w5zsgi61svgddp1dbzh1n";
sha256 = "0bg7xxw5cww4wy7vhr54i07ni82sh4qq465fir7az5z0hf36b1kg";
type = "gem";
};
version = "2.0.7";
version = "2.0.8";
};
rubyntlm = {
groups = ["default"];
pkgs/tools/security/sops/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "sops";
version = "3.7.0";
version = "3.7.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "mozilla";
repo = pname;
sha256 = "1a0v1jgbz8n3dymzr2shg2ms9sxjwaci209ldzq8v4g737v10zgm";
sha256 = "0z3jcyl245yjszzjf2h6l1dwa092vxzvfmnivmwi6jvpsdcv33h1";
};
vendorSha256 = "1qaml2h3c8fhmi8ahp2fmd0hagqp5xqaf8jxjh4mfmbv2is3yz1l";
vendorSha256 = "1mnwgsbpi56ql0lbpn7dkaps96x9b1lmhlk5cd6d40da7xj616n7";
doCheck = false;
pkgs/tools/security/step-ca/default.nix
+21 -7
View File
@@ -2,29 +2,43 @@
, lib
, fetchFromGitHub
, buildGoModule
, coreutils
, pcsclite
, PCSC
, pkg-config
, hsmSupport ? true
}:
buildGoModule rec {
pname = "step-ca";
version = "0.15.6";
version = "0.15.11";
src = fetchFromGitHub {
owner = "smallstep";
repo = "certificates";
rev = "v${version}";
sha256 = "0n26692ph4q4cmrqammfazmx1k9p2bydwqc57q4hz5ni6jd31zbz";
sha256 = "wFRs3n6V0z2keNVtqFw1q5jpA6BvNK5EftsNhichfsY=";
};
vendorSha256 = "0w0phyqymcg2h2jjasxmkf4ryn4y1bqahcy94rs738cqr5ifyfbg";
vendorSha256 = "f1NdszqYYx6X1HqwqG26jjfjXq1gDXLOrh64ccKRQ90=";
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = lib.optionals hsmSupport [ pkg-config ];
buildInputs =
lib.optional stdenv.isLinux (lib.getDev pcsclite)
++ lib.optional stdenv.isDarwin PCSC;
lib.optionals (hsmSupport && stdenv.isLinux) [ pcsclite ]
++ lib.optionals (hsmSupport && stdenv.isDarwin) [ PCSC ];
postPatch = ''
substituteInPlace systemd/step-ca.service --replace "/bin/kill" "${coreutils}/bin/kill"
'';
preBuild = ''
${lib.optionalString (!hsmSupport) "export CGO_ENABLED=0"}
'';
postInstall = ''
install -Dm444 -t $out/lib/systemd/system systemd/step-ca.service
'';
# Tests fail on darwin with
# panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted [recovered]
@@ -35,7 +49,7 @@ buildGoModule rec {
description = "A private certificate authority (X.509 & SSH) & ACME server for secure automated certificate management, so you can use TLS everywhere & SSO for SSH";
homepage = "https://smallstep.com/certificates/";
license = licenses.asl20;
maintainers = with maintainers; [ cmcdragonkai ];
maintainers = with maintainers; [ cmcdragonkai mohe2015 ];
platforms = platforms.linux ++ platforms.darwin;
};
}