From 4ec15b0572c9db8ff4188c8192c9d708e8318c7e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 12 Jan 2020 23:53:39 +0100 Subject: [PATCH] Remove old patches --- ...for-being-a-root-to-check-if-actually-can.patch | 10 ---------- ...s.utils.CONFIG_DIR-instead-of-hardcoded-c.patch | 12 ------------ ...-system.journal-also-under-system-state-l.patch | 11 ----------- .../0004-BF-use-build_-_2to3-if-in-_2to3.patch | 14 -------------- debian/patches/series | 4 ---- 5 files changed, 51 deletions(-) delete mode 100644 debian/patches/0001-BF-RF-test-for-being-a-root-to-check-if-actually-can.patch delete mode 100644 debian/patches/0001-BF-use-tests.utils.CONFIG_DIR-instead-of-hardcoded-c.patch delete mode 100644 debian/patches/0003-BF-look-for-system.journal-also-under-system-state-l.patch delete mode 100644 debian/patches/0004-BF-use-build_-_2to3-if-in-_2to3.patch diff --git a/debian/patches/0001-BF-RF-test-for-being-a-root-to-check-if-actually-can.patch b/debian/patches/0001-BF-RF-test-for-being-a-root-to-check-if-actually-can.patch deleted file mode 100644 index dabba9e5..00000000 --- a/debian/patches/0001-BF-RF-test-for-being-a-root-to-check-if-actually-can.patch +++ /dev/null @@ -1,10 +0,0 @@ -From bd457781df3442b6721360a9f190428994292e15 Mon Sep 17 00:00:00 2001 -From: Yaroslav Halchenko -Date: Sun, 21 Jan 2018 22:01:24 -0500 -Subject: [PATCH] BF: RF test for "being a root" to check if actually can read - the file - ---- - fail2ban/tests/filtertestcase.py | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - diff --git a/debian/patches/0001-BF-use-tests.utils.CONFIG_DIR-instead-of-hardcoded-c.patch b/debian/patches/0001-BF-use-tests.utils.CONFIG_DIR-instead-of-hardcoded-c.patch deleted file mode 100644 index 6c6589c9..00000000 --- a/debian/patches/0001-BF-use-tests.utils.CONFIG_DIR-instead-of-hardcoded-c.patch +++ /dev/null @@ -1,12 +0,0 @@ -From 1200f6388a9602e0248171b1a6cb75e073cb96b2 Mon Sep 17 00:00:00 2001 -From: Yaroslav Halchenko -Date: Sun, 21 Jan 2018 20:15:56 -0500 -Subject: [PATCH 1/4] BF: use tests.utils.CONFIG_DIR instead of hardcoded - "config" in fail2banclienttestcase - -Since otherwise cannot provide custom path to the config via env var -and thus cannot test in a build directory which is out of source ---- - fail2ban/tests/fail2banclienttestcase.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - diff --git a/debian/patches/0003-BF-look-for-system.journal-also-under-system-state-l.patch b/debian/patches/0003-BF-look-for-system.journal-also-under-system-state-l.patch deleted file mode 100644 index 2d4da3a2..00000000 --- a/debian/patches/0003-BF-look-for-system.journal-also-under-system-state-l.patch +++ /dev/null @@ -1,11 +0,0 @@ -From 1618356ad52fbc79e4f7b4d0759ef05bec0ae7f1 Mon Sep 17 00:00:00 2001 -From: Yaroslav Halchenko -Date: Sun, 21 Jan 2018 21:05:32 -0500 -Subject: [PATCH 3/4] BF: look for system.journal also under system-state-logs - (i.e. /var/log) - -as it happens on Debian systems ---- - fail2ban/tests/filtertestcase.py | 21 ++++++++++++++++----- - 1 file changed, 16 insertions(+), 5 deletions(-) - diff --git a/debian/patches/0004-BF-use-build_-_2to3-if-in-_2to3.patch b/debian/patches/0004-BF-use-build_-_2to3-if-in-_2to3.patch deleted file mode 100644 index faf4b115..00000000 --- a/debian/patches/0004-BF-use-build_-_2to3-if-in-_2to3.patch +++ /dev/null @@ -1,14 +0,0 @@ -From 4d2fdd72e7463a9f6ed7ded9b58f81f4fd7688dc Mon Sep 17 00:00:00 2001 -From: Yaroslav Halchenko -Date: Sun, 21 Jan 2018 21:23:02 -0500 -Subject: [PATCH 4/4] BF: use build_*_2to3 if in _2to3 - -On Debian systems py helpers first do python setup.py build -so conversion should happen then. Manual invocation of -./fail2ban-2to3 is least preferred since modifies in place -and would require additional special handling to monitor -changed files etc ---- - setup.py | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - diff --git a/debian/patches/series b/debian/patches/series index 3ae3ca98..88a84dc3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,9 +1,5 @@ deb_path_to_common deb_init_paths deb_manpages_reportbug -0001-BF-use-tests.utils.CONFIG_DIR-instead-of-hardcoded-c.patch 0002-ENH-verify-that-use_stock_cfg-was-not-provided-while.patch -0003-BF-look-for-system.journal-also-under-system-state-l.patch -0004-BF-use-build_-_2to3-if-in-_2to3.patch -0001-BF-RF-test-for-being-a-root-to-check-if-actually-can.patch deb_no_iptables_service