Unverified Commit df951077 authored by Zane van Iperen's avatar Zane van Iperen
Browse files

fail2ban: backport openssh 9.8 fixes + move to by-name 

See [1].

[1]: https://discourse.nixos.org/t/fail2ban-is-not-working-for-sshd-with-systemd-backend/48972/3?u=vs49688
parent e20e12a9

pkgs/tools/security/fail2ban/default.nix→pkgs/by-name/fa/fail2ban/package.nix

+17 −1
Original line number Diff line number Diff line 
{ 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/

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -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 { };