Unverified Commit 26ccb580 authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #277283 from fabaff/flare-floss-bump 

flare-floss: 2.3.0 -> 3.0.1, python311Packages.binary2strings: init at 0.1.13
parents f81c57d7 ad7472b5

pkgs/development/python-modules/binary2strings/default.nix

0 → 100644
+48 −0
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchFromGitHub

, pybind11

, pytestCheckHook

, pythonOlder

, setuptools

}:



buildPythonPackage rec {

  pname = "binary2strings";

  version = "0.1.13";

  pyproject = true;



  disabled = pythonOlder "3.7";



  src = fetchFromGitHub {

    owner = "glmcdona";

    repo = "binary2strings";

    rev = "refs/tags/v${version}";

    hash = "sha256-3UPT0PdnPAhOu3J2vU5NxE3f4Nb1zwuX3hJiy87nLD0=";

  };



  nativeBuildInputs = [

    pybind11

    setuptools

  ];



  nativeCheckInputs = [

    pytestCheckHook

  ];



  pythonImportsCheck = [

    "binary2strings"

  ];



  pytestFlagsArray = [

    "tests/test.py"

  ];



  meta = with lib; {

    description = "Module to extract Ascii, Utf8, and Unicode strings from binary data";

    homepage = "https://github.com/glmcdona/binary2strings";

    changelog = "https://github.com/glmcdona/binary2strings/releases/tag/v${version}";

    license = licenses.mit;

    maintainers = with maintainers; [ fab ];

  };

}

pkgs/tools/security/flare-floss/default.nix

+12 −3
Original line number Diff line number Diff line
@@ -5,15 +5,15 @@ 


python3.pkgs.buildPythonPackage rec {

  pname = "flare-floss";

  version = "2.3.0";

  format = "setuptools";

  version = "3.0.1";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "mandiant";

    repo = "flare-floss";

    rev = "refs/tags/v${version}";

    fetchSubmodules = true; # for tests

    hash = "sha256-tOLnve5XBc3TtSgucPIddBHD0YJhsRpRduXsKrtJ/eQ=";

    hash = "sha256-bmOWOFqyvOvSrNTbwLqo0WMq4IAZxZ0YYaWCdCrpziU=";

  };



  postPatch = ''
@@ -24,7 +24,12 @@ python3.pkgs.buildPythonPackage rec { 
      --replace 'sigs_path = os.path.join(get_default_root(), "sigs")' 'sigs_path = "'"$out"'/share/flare-floss/sigs"'

  '';



  nativeBuildInputs = with python3.pkgs; [

    setuptools

  ];



  propagatedBuildInputs = with python3.pkgs; [

    binary2strings

    halo

    networkx

    pefile
@@ -47,6 +52,10 @@ python3.pkgs.buildPythonPackage rec { 
    cp -r floss/sigs $out/share/flare-floss/

  '';



  preCheck = ''

    export HOME=$(mktemp -d)

  '';



  meta = with lib; {

    description = "Automatically extract obfuscated strings from malware";

    homepage = "https://github.com/mandiant/flare-floss";

pkgs/top-level/python-packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -1456,6 +1456,8 @@ self: super: with self; { 














  binary = callPackage ../development/python-modules/binary { };



























  binary2strings = callPackage ../development/python-modules/binary2strings { };



























  binaryornot = callPackage ../development/python-modules/binaryornot { };





























  bincopy = callPackage ../development/python-modules/bincopy { };