From c5202ce6963c83d647d0886853281edeeaba4163 Mon Sep 17 00:00:00 2001
From: Yaroslav Halchenko <debian@onerussian.com>
Date: Mon, 6 Aug 2007 01:39:30 +0000
Subject: [PATCH] * Added optional spaces at the end of failregex for vsftpd.

---
 debian/changelog                             |  6 ++++++
 debian/patches/00_vsftp_filter_spaces.dpatch | 21 ++++++++++++++++++++
 debian/patches/00list                        |  1 +
 3 files changed, 28 insertions(+)
 create mode 100755 debian/patches/00_vsftp_filter_spaces.dpatch

diff --git a/debian/changelog b/debian/changelog
index ae178487..dfd414b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+fail2ban (0.8.0-5~pre1) unstable; urgency=low
+
+  * Added optional spaces at the end of failregex for vsftpd.
+
+ -- Yaroslav Halchenko <debian@onerussian.com>  Sun, 05 Aug 2007 21:38:44 -0400
+
 fail2ban (0.8.0-4) unstable; urgency=low
 
   * Moved <HOST> expansion into regex.py (closes: #429263). Thanks James
diff --git a/debian/patches/00_vsftp_filter_spaces.dpatch b/debian/patches/00_vsftp_filter_spaces.dpatch
new file mode 100755
index 00000000..de064fc0
--- /dev/null
+++ b/debian/patches/00_vsftp_filter_spaces.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_vsftp_filter_spaces.dpatch by Yaroslav Halchenko <debian@onerussian.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad trunk~/config/filter.d/vsftpd.conf trunk/config/filter.d/vsftpd.conf
+--- trunk~/config/filter.d/vsftpd.conf	2007-01-29 15:51:45.000000000 -0500
++++ trunk/config/filter.d/vsftpd.conf	2007-08-03 21:55:00.000000000 -0400
+@@ -14,8 +14,8 @@
+ #          (?:::f{4,6}:)?(?P<host>\S+)
+ # Values: TEXT
+ #
+-failregex = vsftpd: .* authentication failure; .* rhost=<HOST>$
+-            \[.+\] FAIL LOGIN: Client "<HOST>"$
++failregex = vsftpd: .* authentication failure; .* rhost=<HOST>\s*$
++            \[.+\] FAIL LOGIN: Client "<HOST>"\s*$
+ 
+ # Option:  ignoreregex
+ # Notes.:  regex to ignore. If this regex matches, the line is ignored.
diff --git a/debian/patches/00list b/debian/patches/00list
index 4db8fdb8..d7682772 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,4 +1,5 @@
 00_mail-whois-lines
+00_vsftp_filter_spaces
 00_var_run_socket
 00_HOST_ignoreregex
 00_daemon_pids