From 996e0e445ee360471af074eb43e85118fce10654 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Tue, 26 Mar 2024 16:25:40 +0100
Subject: [PATCH] python3 fixes

---
 debian/control         |  4 ++--
 debian/rules           | 42 ++----------------------------------------
 fail2ban-p2p-client.py |  2 +-
 fail2ban-p2p/config.py |  2 +-
 fail2ban-p2p/crypto.py |  2 +-
 fail2ban-p2p/node.py   |  4 ++--
 setup.cfg              |  4 ++--
 7 files changed, 11 insertions(+), 49 deletions(-)

diff --git a/debian/control b/debian/control
index b6c86bc..cf41070 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Manuel Munz <manu@somakoma.de>
 Build-Depends: debhelper (>= 8.0.0)
 Build-Depends-Indep: dh-python
-XS-Python-Version: current, >= 2.4
+XS-Python-Version: current, >= 3.2
 Standards-Version: 3.9.2
 #Homepage: 
 #Vcs-Git: git://git.debian.org/collab-maint/fail2ban-p2p.git
@@ -12,7 +12,7 @@ Standards-Version: 3.9.2
 
 Package: fail2ban-p2p
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-m2crypto, python-argparse, adduser
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3-m2crypto, adduser
 XS-Python-Version: ${python:Versions}
 Description: Distribute attacker information from fail2ban via a p2p network
  Fail2ban-p2p can be used to distribute information about atackers in a
diff --git a/debian/rules b/debian/rules
index c81740a..efe246f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,9 +11,8 @@
 
 DESTDIR=$(CURDIR)/debian/fail2ban-p2p
 
-
 %:
-	dh $@ --with python2
+	dh $@ --with python3
 
 # Override auto test because upstream do not use the standard unittest discover
 override_dh_auto_test:
@@ -24,42 +23,5 @@ override_dh_auto_build:
 # Override of auto_install to remove information from package
 override_dh_auto_install:
 	#dh_auto_install
-	python setup.py install --root=$(DESTDIR) --no-compile --install-layout=deb
+	python3 setup.py install --root=$(DESTDIR) --no-compile --install-layout=deb
 
-
-clean: clean-inits
-	dh_testdir
-	dh_testroot
-	rm -f  build-stamp configure-stamp
-	rm -rf build
-	# Does not hurt to ask distutils to do their duty
-	python setup.py clean
-	# Enforce removal of *.pyc files. Apparently dh_clean does
-	# not perform find on provided filename patterns.
-	find . -name \*.pyc -exec rm -f {} \;
-	dh_clean
-
-#
-# Just to comply with policy 4.8
-binary-arch:
-
-# Build architecture-independent files here.
-binary-indep: install
-	dh_testdir
-	dh_testroot
-	#dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installlogrotate
-	dh_python2
-	dh_installinit -- defaults 99
-	#dh_installman man/*.1
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep
-.PHONY: build clean binary-indep binary-arch binary install configure copy-inits clean-inits
diff --git a/fail2ban-p2p-client.py b/fail2ban-p2p-client.py
index f19f952..dfc2ccf 100755
--- a/fail2ban-p2p-client.py
+++ b/fail2ban-p2p-client.py
@@ -105,7 +105,7 @@ if args.b or dump:
         #"protocolVersion": version.protocol,
         "msg": serializable_dict,
         "signature": StringSignature,
-	    "protocolVersion": version.protocolVersion
+            "protocolVersion": version.protocolVersion
     }
     cmdsigned = json.dumps(signed_dict) 
 
diff --git a/fail2ban-p2p/config.py b/fail2ban-p2p/config.py
index b7b35e0..dd5c777 100644
--- a/fail2ban-p2p/config.py
+++ b/fail2ban-p2p/config.py
@@ -29,7 +29,7 @@ class Config:
     threshold = 0    
 
     def __init__(self, configPath = '/etc/fail2ban-p2p'):
-	self.__dict__ = self.__shared_state # borg pattern.
+        self.__dict__ = self.__shared_state # borg pattern.
 
     def loadConfig(self):
         """
diff --git a/fail2ban-p2p/crypto.py b/fail2ban-p2p/crypto.py
index 920c6cf..f912346 100644
--- a/fail2ban-p2p/crypto.py
+++ b/fail2ban-p2p/crypto.py
@@ -39,5 +39,5 @@ def create_keys():
         logger.debug("Public key was saved to " + c.pubkey)
     except IOError as e:
         logger.error("Could not save the keypair, check permissions! " + "%s" % e)
-	exit()
+        exit()
 
diff --git a/fail2ban-p2p/node.py b/fail2ban-p2p/node.py
index 6225113..e415023 100644
--- a/fail2ban-p2p/node.py
+++ b/fail2ban-p2p/node.py
@@ -215,9 +215,9 @@ class Node:
 
         """
         error = False
-	friendPath = os.path.join(self.configPath, 'friends')
+        friendPath = os.path.join(self.configPath, 'friends')
         friends = [f for f in os.listdir(friendPath) if os.path.isfile(os.path.join(friendPath, f))]
-	if not friends:
+        if not friends:
             logger.warning("No friends found. In order to properly use fail2ban-p2p" +
                            " add at least one friend.")
 
diff --git a/setup.cfg b/setup.cfg
index 308c351..fcb9e93 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [install]
-install-purelib=/usr/share/fail2ban-p2p
+install_purelib = /usr/share/fail2ban-p2p
 
 [sdist]
-formats=bztar
+formats = bztar