[arch-commits] Commit in fail2ban/trunk (PKGBUILD failban-0.9.0-fix-indentation.patch)

[Bartłomiej Piotrowski]

    Date: Tuesday, October 28, 2014 @ 08:49:43
  Author: bpiotrowski
Revision: 121510

upgpkg: fail2ban 0.9.1-1

new upstream release

Modified:
  fail2ban/trunk/PKGBUILD
Deleted:
  fail2ban/trunk/failban-0.9.0-fix-indentation.patch

-------------------------------------+
 PKGBUILD                            |   18 +++------------
 failban-0.9.0-fix-indentation.patch |   39 ----------------------------------
 2 files changed, 4 insertions(+), 53 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-28 07:27:12 UTC (rev 121509)
+++ PKGBUILD	2014-10-28 07:49:43 UTC (rev 121510)
@@ -5,8 +5,8 @@
 # Contributor: nbags <neilbags at gmail.com>
 
 pkgname=fail2ban
-pkgver=0.9.0
-pkgrel=4
+pkgver=0.9.1
+pkgrel=1
 pkgdesc='Bans IPs after too many failed authentication attempts'
 url='http://www.fail2ban.org/'
 license=('GPL')
@@ -14,16 +14,9 @@
 depends=('python' 'iptables' 'python-pyinotify' 'whois' 'sqlite')
 backup=(etc/fail2ban/fail2ban.conf)
 install=fail2ban.install
-source=(https://github.com/fail2ban/$pkgname/archive/$pkgver.tar.gz
-        failban-0.9.0-fix-indentation.patch)
-md5sums=('c8e0df39cbc32ee8646b82be9b7b5e53'
-         '3b22b9d826c82a503df31a24f10d58a6')
+source=(https://github.com/fail2ban/$pkgname/archive/$pkgver.tar.gz)
+md5sums=('3554cc3de3f06ddfd7f90f8305b765b8')
 
-prepare() {
-  cd $pkgname-$pkgver
-  patch -p1 -i ../failban-0.9.0-fix-indentation.patch
-}
-
 package() {
   cd $pkgname-$pkgver
   python setup.py install --prefix /usr --root "$pkgdir" --optimize=1
@@ -37,9 +30,6 @@
   install -Dm644 files/bash-completion \
     "$pkgdir"/usr/share/bash-completion/completions/fail2ban
 
-  # avoid conflict with filesystem>=2012.06
-  rm -r "$pkgdir"/var/run
-
   # fix sendmail location
   sed -i 's/sbin/bin/g' "$pkgdir"/etc/fail2ban/action.d/sendmail*.conf
 

Deleted: failban-0.9.0-fix-indentation.patch
===================================================================
--- failban-0.9.0-fix-indentation.patch	2014-10-28 07:27:12 UTC (rev 121509)
+++ failban-0.9.0-fix-indentation.patch	2014-10-28 07:49:43 UTC (rev 121510)
@@ -1,39 +0,0 @@
-From e193e67718b77a1603a91079d7ab4d2307570a8e Mon Sep 17 00:00:00 2001
-From: Steven Hiscocks <steven at hiscocks.me.uk>
-Date: Sun, 16 Mar 2014 18:25:16 +0000
-Subject: [PATCH] BF: fail2ban-regex mix of tabs and spaces
-
----
- bin/fail2ban-regex | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/bin/fail2ban-regex b/bin/fail2ban-regex
-index 270b70d..4317d06 100755
---- a/bin/fail2ban-regex
-+++ b/bin/fail2ban-regex
-@@ -395,7 +395,7 @@ class Fail2banRegex(object):
- 				if lines < self._maxlines or getattr(self, '_print_all_' + ltype):
- 					ans = [[]]
- 					for arg in [l, regexlist]:
--					    ans = [ x + [y] for x in ans for y in arg ]
-+						ans = [ x + [y] for x in ans for y in arg ]
- 					b = map(lambda a: a[0] +  ' | ' + a[1].getFailRegex() + ' |  ' + debuggexURL(a[0], a[1].getFailRegex()), ans)
- 					pprint_list([x.rstrip() for x in b], header)
- 				else:
-@@ -466,11 +466,11 @@ if __name__ == "__main__":
- 	if opts.print_no_missed and opts.print_all_missed:
- 		sys.stderr.write("ERROR: --print-no-missed and --print-all-missed are mutually exclusive.\n\n")
- 		parser.print_help()
--	        sys.exit(-1)
-+		sys.exit(-1)
- 	if opts.print_no_ignored and opts.print_all_ignored:
- 		sys.stderr.write("ERROR: --print-no-ignored and --print-all-ignored are mutually exclusive.\n\n")
- 		parser.print_help()
--	        sys.exit(-1)
-+		sys.exit(-1)
- 
- 	print
- 	print "Running tests"
--- 
-1.8.5.5
-