Attachment 178026 Details for Bug 215354 – patch

patch

py-fail2ban.diff.txt (text/plain), 5.18 KB, created by theis on 2016-12-17 16:12:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: theis

Created: 2016-12-17 16:12:58 UTC

Size: 5.18 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 419032)
>+++ Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	fail2ban
>-PORTVERSION=	0.9.5
>+PORTVERSION=	0.9.6
> CATEGORIES=	security python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
>@@ -15,7 +15,6 @@
> 
> USES=		python shebangfix
> USE_GITHUB=	yes
>-GH_TAGNAME=	d6eae28
> USE_PYTHON=	autoplist distutils
> USE_RC_SUBR=	fail2ban
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 419032)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1469085380
>-SHA256 (fail2ban-fail2ban-0.9.5-d6eae28_GH0.tar.gz) = 2d9126d3a8470d7744aeff244cf7fe2d67eff891939f19e6e29687e92df84be1
>-SIZE (fail2ban-fail2ban-0.9.5-d6eae28_GH0.tar.gz) = 338831
>+TIMESTAMP = 1481472323
>+SHA256 (fail2ban-fail2ban-0.9.6_GH0.tar.gz) = 1712e4eda469513fb2f44951957a4159e0fa62cb9da16ed48e7f4f4037f0b976
>+SIZE (fail2ban-fail2ban-0.9.6_GH0.tar.gz) = 352125
>Index: files/patch-config_filter.d_bsd-sendmail.conf
>===================================================================
>--- files/patch-config_filter.d_bsd-sendmail.conf	(revision 419032)
>+++ files/patch-config_filter.d_bsd-sendmail.conf	(working copy)
>@@ -1,4 +1,4 @@
>---- config/filter.d/bsd-sendmail.conf.orig	2015-11-03 04:11:30 UTC
>+--- config/filter.d/bsd-sendmail.conf.orig	2016-12-11 17:42:29 UTC
> +++ config/filter.d/bsd-sendmail.conf
> @@ -0,0 +1,35 @@
> +# Fail2Ban configuration file
>Index: files/patch-config_filter.d_bsd-sshd.conf
>===================================================================
>--- files/patch-config_filter.d_bsd-sshd.conf	(revision 419032)
>+++ files/patch-config_filter.d_bsd-sshd.conf	(working copy)
>@@ -1,4 +1,4 @@
>---- config/filter.d/bsd-sshd.conf.orig	2015-11-03 04:11:30 UTC
>+--- config/filter.d/bsd-sshd.conf.orig	2016-12-11 17:42:29 UTC
> +++ config/filter.d/bsd-sshd.conf
> @@ -0,0 +1,40 @@
> +# Fail2Ban configuration file
>Index: files/patch-config_filter.d_bsdftp.conf
>===================================================================
>--- files/patch-config_filter.d_bsdftp.conf	(revision 419032)
>+++ files/patch-config_filter.d_bsdftp.conf	(working copy)
>@@ -1,4 +1,4 @@
>---- config/filter.d/bsdftp.conf.orig	2015-11-03 04:11:30 UTC
>+--- config/filter.d/bsdftp.conf.orig	2016-12-11 17:42:29 UTC
> +++ config/filter.d/bsdftp.conf
> @@ -0,0 +1,40 @@
> +# Fail2Ban configuration file
>Index: files/patch-config_filter.d_common.conf
>===================================================================
>--- files/patch-config_filter.d_common.conf	(revision 419032)
>+++ files/patch-config_filter.d_common.conf	(working copy)
>@@ -1,6 +1,6 @@
>---- config/filter.d/common.conf.orig	2015-08-01 01:32:13 UTC
>+--- config/filter.d/common.conf.orig	2016-12-09 14:36:08 UTC
> +++ config/filter.d/common.conf
>-@@ -32,6 +32,9 @@ __daemon_extra_re = (?:\[ID \d+ \S+\])
>+@@ -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?:?)
>  
>Index: files/patch-setup.py
>===================================================================
>--- files/patch-setup.py	(revision 419032)
>+++ files/patch-setup.py	(working copy)
>@@ -1,10 +1,11 @@
>---- setup.py.orig	2015-08-01 01:32:13 UTC
>+--- setup.py.orig	2016-12-09 14:36:08 UTC
> +++ setup.py
>-@@ -104,26 +104,13 @@ setup(
>+@@ -149,46 +149,33 @@ setup(
>  		'bin/fail2ban-client',
>  		'bin/fail2ban-server',
>  		'bin/fail2ban-regex',
> -		'bin/fail2ban-testcases',
>+ 		# 'bin/fail2ban-python', -- link (binary), will be installed via install_scripts_f2b wrapper
>  	],
>  	packages = [
>  		'fail2ban',
>@@ -26,15 +27,36 @@
> -				for f in w[2]]
>  	},
>  	data_files = [
>- 		('/etc/fail2ban',
>-@@ -147,10 +134,6 @@ setup(
>+-		('/etc/fail2ban',
>++		('/usr/local/usr/local/etc/fail2ban',
>+ 			glob("config/*.conf")
>  		),
>+-		('/etc/fail2ban/filter.d',
>++		('/usr/local/usr/local/etc/fail2ban/filter.d',
>+ 			glob("config/filter.d/*.conf")
>+ 		),
>+-		('/etc/fail2ban/filter.d/ignorecommands',
>++		('/usr/local/usr/local/etc/fail2ban/filter.d/ignorecommands',
>+ 			glob("config/filter.d/ignorecommands/*")
>+ 		),
>+-		('/etc/fail2ban/action.d',
>++		('/usr/local/usr/local/etc/fail2ban/action.d',
>+ 			glob("config/action.d/*.conf") +
>+ 			glob("config/action.d/*.py")
>+ 		),
>+-		('/etc/fail2ban/fail2ban.d',
>++		('/usr/local/usr/local/etc/fail2ban/fail2ban.d',
>+ 			''
>+ 		),
>+-		('/etc/fail2ban/jail.d',
>++		('/usr/local/usr/local/etc/fail2ban/jail.d',
>+ 			''
>+ 		),
>  		('/var/lib/fail2ban',
>- 			''
>--		),
>--		('/usr/share/doc/fail2ban',
>--			['README.md', 'README.Solaris', 'DEVELOP', 'FILTERS',
>--			 'doc/run-rootless.txt']
>- 		)
>- 	] + data_files_extra,
>- 	**setup_extra
>+@@ -244,5 +231,5 @@ if isdir("/usr/lib/fail2ban"):
>+ if sys.argv[1] == "install":
>+ 	print("")
>+ 	print("Please do not forget to update your configuration files.")
>+-	print("They are in /etc/fail2ban/.")
>++	print("They are in /usr/local/usr/local/etc/fail2ban/.")
>+ 	print("")
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 419032)
>+++ pkg-plist	(working copy)
>@@ -1,3 +1,4 @@
>+bin/fail2ban-python
> man/man1/fail2ban-client.1.gz
> man/man1/fail2ban-regex.1.gz
> man/man1/fail2ban-server.1.gz

Actions: View

Attachments on bug 215354: 178026