From a32c043b7c2813c1a90d911d5d82f49e51f4b779 Mon Sep 17 00:00:00 2001
From: Yi-Jyun Pan <pan93412@gmail.com>
Date: Tue, 9 Jul 2024 02:06:45 +0800
Subject: [PATCH 1/3] fail2ban: 1.0.2 -> 1.1.0

---
 pkgs/tools/security/fail2ban/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix
index 7526c21d6811..50b725187476 100644
--- a/pkgs/tools/security/fail2ban/default.nix
+++ b/pkgs/tools/security/fail2ban/default.nix
@@ -5,13 +5,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "fail2ban";
-  version = "1.0.2";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "fail2ban";
     repo = "fail2ban";
     rev = version;
-    hash = "sha256-Zd8zLkFlvXTbeInEkNFyHgcAiOsX4WwF6hf5juSQvbY=";
+    hash = "sha256-0xPNhbu6/p/cbHOr5Y+PXbMbt5q/S13S5100ZZSdylE=";
   };
 
   outputs = [ "out" "man" ];

From f6328c067409aef4022b4d6cffebe369733c6270 Mon Sep 17 00:00:00 2001
From: Yi-Jyun Pan <pan93412@gmail.com>
Date: Tue, 9 Jul 2024 02:09:16 +0800
Subject: [PATCH 2/3] fail2ban: remove fail2ban-2to3

The codebase has been migrated to Python 3 already:
https://github.com/fail2ban/fail2ban/commit/03d7c92ae860dd29987e2090f4d6a24cc55c5b10
---
 pkgs/tools/security/fail2ban/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix
index 50b725187476..c96123966055 100644
--- a/pkgs/tools/security/fail2ban/default.nix
+++ b/pkgs/tools/security/fail2ban/default.nix
@@ -25,9 +25,6 @@ python3.pkgs.buildPythonApplication rec {
     ];
 
   preConfigure = ''
-    patchShebangs fail2ban-2to3
-    ./fail2ban-2to3
-
     for i in config/action.d/sendmail*.conf; do
       substituteInPlace $i \
         --replace /usr/sbin/sendmail sendmail

From e4b521fefbc73828d60035cc9ebd6729f4874521 Mon Sep 17 00:00:00 2001
From: Yi-Jyun Pan <pan93412@gmail.com>
Date: Tue, 9 Jul 2024 11:04:56 +0800
Subject: [PATCH 3/3] fail2ban: install setuptools

https://github.com/fail2ban/fail2ban/issues/3787
---
 pkgs/tools/security/fail2ban/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix
index c96123966055..49f741617de3 100644
--- a/pkgs/tools/security/fail2ban/default.nix
+++ b/pkgs/tools/security/fail2ban/default.nix
@@ -22,6 +22,9 @@ python3.pkgs.buildPythonApplication rec {
     lib.optionals stdenv.isLinux [
       systemd
       pyinotify
+
+      # https://github.com/fail2ban/fail2ban/issues/3787, remove it in the next release
+      setuptools
     ];
 
   preConfigure = ''