mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 23:36:17 +01:00
Merge pull request #331238 from vs49688/fail2banfix
This commit is contained in:
commit
e26d970502
2 changed files with 17 additions and 3 deletions
|
@ -1,4 +1,7 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, python3
|
||||
, installShellFiles
|
||||
}:
|
||||
|
@ -39,6 +42,19 @@ python3.pkgs.buildPythonApplication rec {
|
|||
|
||||
doCheck = false;
|
||||
|
||||
patches = [
|
||||
# Adjust sshd filter for OpenSSH 9.8 new daemon name - remove next release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/fail2ban/fail2ban/commit/2fed408c05ac5206b490368d94599869bd6a056d.patch";
|
||||
hash = "sha256-uyrCdcBm0QyA97IpHzuGfiQbSSvhGH6YaQluG5jVIiI=";
|
||||
})
|
||||
# filter.d/sshd.conf: ungroup (unneeded for _daemon) - remove next release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/fail2ban/fail2ban/commit/50ff131a0fd8f54fdeb14b48353f842ee8ae8c1a.patch";
|
||||
hash = "sha256-YGsUPfQRRDVqhBl7LogEfY0JqpLNkwPjihWIjfGdtnQ=";
|
||||
})
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
substituteInPlace setup.py --replace /usr/share/doc/ share/doc/
|
||||
|
|
@ -7720,8 +7720,6 @@ with pkgs;
|
|||
|
||||
Fabric = with python3Packages; toPythonApplication fabric;
|
||||
|
||||
fail2ban = callPackage ../tools/security/fail2ban { };
|
||||
|
||||
fakeroot = callPackage ../tools/system/fakeroot { };
|
||||
|
||||
fakeroute = callPackage ../tools/networking/fakeroute { };
|
||||
|
|
Loading…
Reference in a new issue