5 files changed, 16 insertions, 16 deletions
diff --git a/security/py-fail2ban/files/patch-bsd-sendmail.conf b/security/py-fail2ban/files/patch-config_filter.d_bsd-sendmail.conf
index 9380b379fc9c..a9a694523735 100644
--- a/security/py-fail2ban/files/patch-bsd-sendmail.conf
+++ b/security/py-fail2ban/files/patch-config_filter.d_bsd-sendmail.conf
@@ -1,5 +1,5 @@
---- /dev/null	2012-11-27 18:33:00.000000000 +0100
-+++ config/filter.d/bsd-sendmail.conf	2012-11-27 18:32:47.000000000 +0100
+--- config/filter.d/bsd-sendmail.conf.orig	2015-11-03 04:11:30 UTC
++++ config/filter.d/bsd-sendmail.conf
 @@ -0,0 +1,35 @@
 +# Fail2Ban configuration file
 +#
diff --git a/security/py-fail2ban/files/patch-bsd-sshd.conf b/security/py-fail2ban/files/patch-config_filter.d_bsd-sshd.conf
index d39ef67f1ca0..4b20dfbbd06a 100644
--- a/security/py-fail2ban/files/patch-bsd-sshd.conf
+++ b/security/py-fail2ban/files/patch-config_filter.d_bsd-sshd.conf
@@ -1,5 +1,5 @@
---- /dev/null	2010-01-12 16:33:00.000000000 -0500
-+++ ./config/filter.d/bsd-sshd.conf	2010-01-12 16:26:22.000000000 -0500
+--- config/filter.d/bsd-sshd.conf.orig	2015-11-03 04:11:30 UTC
++++ config/filter.d/bsd-sshd.conf
 @@ -0,0 +1,40 @@
 +# Fail2Ban configuration file
 +#
diff --git a/security/py-fail2ban/files/patch-bsdftp.conf b/security/py-fail2ban/files/patch-config_filter.d_bsdftp.conf
index 65be3212fb72..9196ef473b2f 100644
--- a/security/py-fail2ban/files/patch-bsdftp.conf
+++ b/security/py-fail2ban/files/patch-config_filter.d_bsdftp.conf
@@ -1,5 +1,5 @@
---- /dev/null	2010-01-12 16:33:00.000000000 -0500
-+++ ./config/filter.d/bsdftp.conf	2010-01-12 16:26:27.000000000 -0500
+--- config/filter.d/bsdftp.conf.orig	2015-11-03 04:11:30 UTC
++++ config/filter.d/bsdftp.conf
 @@ -0,0 +1,40 @@
 +# Fail2Ban configuration file
 +#
diff --git a/security/py-fail2ban/files/patch-common.conf b/security/py-fail2ban/files/patch-config_filter.d_common.conf
index 74361cdc16c8..2a6ae9a6bb18 100644
--- a/security/py-fail2ban/files/patch-common.conf
+++ b/security/py-fail2ban/files/patch-config_filter.d_common.conf
@@ -1,12 +1,12 @@
---- config/filter.d/common.conf.orig	2012-01-20 22:50:22.000000000 +0100
-+++ config/filter.d/common.conf	2012-01-20 23:10:52.000000000 +0100
-@@ -35,6 +35,9 @@
+--- config/filter.d/common.conf.orig	2015-08-01 01:32:13 UTC
++++ config/filter.d/common.conf
+@@ -32,6 +32,9 @@ __daemon_extra_re = (?:\[ID \d+ \S+\])
  # EXAMPLES: sshd[31607], pop(pam_unix)[4920]
- __daemon_combs_re = (?:%(__pid_re)s?:\s+%(__daemon_re)s|%(__daemon_re)s%(__pid_re)s?:)
+ __daemon_combs_re = (?:%(__pid_re)s?:\s+%(__daemon_re)s|%(__daemon_re)s%(__pid_re)s?:?)
  
 +# Logging facility and priority for BSD "-v" verbose mode
 +__bsd_verbose_mode = (?:\s*\<\S+\.\S+\>\s*)
 +
  # Some messages have a kernel prefix with a timestamp
  # EXAMPLES: kernel: [769570.846956]
- __kernel_prefix = kernel: \[\d+\.\d+\]
+ __kernel_prefix = kernel: \[ *\d+\.\d+\]
diff --git a/security/py-fail2ban/files/patch-setup.py b/security/py-fail2ban/files/patch-setup.py
index ed9f33c083f5..9f3e87c3024f 100644
--- a/security/py-fail2ban/files/patch-setup.py
+++ b/security/py-fail2ban/files/patch-setup.py
@@ -1,6 +1,6 @@
---- setup.py.orig	2014-11-08 10:14:31.000000000 +0100
-+++ setup.py	2014-11-08 10:17:37.000000000 +0100
-@@ -96,26 +96,13 @@
+--- setup.py.orig	2015-08-01 01:32:13 UTC
++++ setup.py
+@@ -104,26 +104,13 @@ setup(
  		'bin/fail2ban-client',
  		'bin/fail2ban-server',
  		'bin/fail2ban-regex',
@@ -27,7 +27,7 @@
  	},
  	data_files = [
  		('/etc/fail2ban',
-@@ -136,10 +123,6 @@
+@@ -147,10 +134,6 @@ setup(
  		),
  		('/var/lib/fail2ban',
  			''
@@ -36,5 +36,5 @@
 -			['README.md', 'README.Solaris', 'DEVELOP', 'FILTERS',
 -			 'doc/run-rootless.txt']
  		)
- 	],
+ 	] + data_files_extra,
  	**setup_extra