diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-08-07 23:02:23 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-08-07 23:02:23 +0200 |
| commit | cb634b2aa5bced67cd4590bbd68f87fb0c320e32 (patch) | |
| tree | c8f33ed2284bd334c9b042d398104af627d46f62 /pkgs/tools/security | |
| parent | 792f562ad546735c0b4ccea6b06813da03eb9c8e (diff) | |
| parent | 6a201763b472b53355234477b202dcc6aeedaebc (diff) | |
| download | nixpkgs-cb634b2aa5bced67cd4590bbd68f87fb0c320e32.tar nixpkgs-cb634b2aa5bced67cd4590bbd68f87fb0c320e32.tar.gz nixpkgs-cb634b2aa5bced67cd4590bbd68f87fb0c320e32.tar.bz2 nixpkgs-cb634b2aa5bced67cd4590bbd68f87fb0c320e32.tar.lz nixpkgs-cb634b2aa5bced67cd4590bbd68f87fb0c320e32.tar.xz nixpkgs-cb634b2aa5bced67cd4590bbd68f87fb0c320e32.tar.zst nixpkgs-cb634b2aa5bced67cd4590bbd68f87fb0c320e32.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/doona/default.nix | 36 | ||||
| -rw-r--r-- | pkgs/tools/security/tor/torsocks.nix | 11 |
2 files changed, 46 insertions, 1 deletions
diff --git a/pkgs/tools/security/doona/default.nix b/pkgs/tools/security/doona/default.nix new file mode 100644 index 00000000000..5e1233f308c --- /dev/null +++ b/pkgs/tools/security/doona/default.nix @@ -0,0 +1,36 @@ +{ fetchFromGitHub +, stdenv +, perl +}: + +stdenv.mkDerivation rec { + pname = "doona"; + version = "unstable-2019-03-08"; + + src = fetchFromGitHub { + owner = "wireghoul"; + repo = pname; + rev = "master"; + sha256 = "0x9irwrw5x2ia6ch6gshadrlqrgdi1ivkadmr7j4m75k04a7nvz1"; + }; + + buildInputs = [ perl ]; + + installPhase = '' + mkdir -p $out/bin + cp -r ${src}/bedmod $out/bin/bedmod + cp ${src}/doona.pl $out/bin/doona + chmod +x $out/bin/doona + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/wireghoul/doona"; + description = "A fork of the Bruteforce Exploit Detector Tool (BED)"; + longDescription = '' + A fork of the Bruteforce Exploit Detector Tool (BED). + BED is a program which is designed to check daemons for potential buffer overflows, format string bugs etc. + ''; + license = licenses.gpl2; + maintainers = with maintainers; [ pamplemousse ]; + }; +} diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index 2ce4c9806eb..381377032d6 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, libcap }: +{ stdenv, fetchgit, fetchurl, autoreconfHook, libcap }: stdenv.mkDerivation rec { pname = "torsocks"; @@ -12,10 +12,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; + patches = stdenv.lib.optional stdenv.isDarwin + (fetchurl { + url = "https://trac.torproject.org/projects/tor/raw-attachment/ticket/28538/0001-Fix-macros-for-accept4-2.patch"; + sha256 = "97881f0b59b3512acc4acb58a0d6dfc840d7633ead2f400fad70dda9b2ba30b0"; + }); + postPatch = '' # Patch torify_app() sed -i \ -e 's,\(local app_path\)=`which $1`,\1=`type -P $1`,' \ + src/bin/torsocks.in + '' + stdenv.lib.optionalString stdenv.isLinux '' + sed -i \ -e 's,\(local getcap\)=.*,\1=${libcap}/bin/getcap,' \ src/bin/torsocks.in ''; |