[arch-commits] Commit in fail2ban/trunk (PKGBUILD service tmpfiles.conf)

[Bartłomiej Piotrowski]

    Date: Saturday, April 26, 2014 @ 20:42:25
  Author: bpiotrowski
Revision: 110195

upgpkg: fail2ban 0.9.0-3

- remove unused systemd service and tmpfiles.d config
- switch to python 3
- add upstream logrotate config
- remove jail.conf from backup array; jail.local or jail.d should be used instead

Modified:
  fail2ban/trunk/PKGBUILD
Deleted:
  fail2ban/trunk/service
  fail2ban/trunk/tmpfiles.conf

---------------+
 PKGBUILD      |   28 +++++++++++++---------------
 service       |   13 -------------
 tmpfiles.conf |    1 -
 3 files changed, 13 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-26 18:33:23 UTC (rev 110194)
+++ PKGBUILD	2014-04-26 18:42:25 UTC (rev 110195)
@@ -1,5 +1,5 @@
 # $Id$
-# Contributor: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
 # Contributor: michalzxc
 # Contributor: nbags <neilbags at gmail.com>
@@ -6,21 +6,17 @@
 
 pkgname=fail2ban
 pkgver=0.9.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Bans IPs after too many failed authentication attempts'
 url='http://www.fail2ban.org/'
 license=('GPL')
 arch=('any')
-depends=('python2' 'iptables' 'python2-pyinotify' 'whois' 'python2-systemd')
-backup=(etc/fail2ban/fail2ban.conf
-        etc/fail2ban/jail.conf)
+depends=('python' 'iptables' 'python-pyinotify' 'whois')
+backup=(etc/fail2ban/fail2ban.conf)
 install=fail2ban.install
 source=(https://github.com/fail2ban/$pkgname/archive/$pkgver.tar.gz
-        service tmpfiles.conf
         failban-0.9.0-fix-indentation.patch)
 md5sums=('c8e0df39cbc32ee8646b82be9b7b5e53'
-         'b4af226eb2d3029241a70e005ec7b3ac'
-         '88d51ecc760ad2e017a165c632f49892'
          '3b22b9d826c82a503df31a24f10d58a6')
 
 prepare() {
@@ -30,14 +26,16 @@
 
 package() {
   cd $pkgname-$pkgver
-  python2 setup.py install --root "$pkgdir"
+  python setup.py install --prefix /usr --root "$pkgdir" --optimize=1
 
   install -Dm644 files/fail2ban.service \
-          "$pkgdir"/usr/lib/systemd/system/$pkgname.service
+    "$pkgdir"/usr/lib/systemd/system/$pkgname.service
   install -Dm644 files/fail2ban-tmpfiles.conf \
-          "$pkgdir"/usr/lib/tmpfiles.d/$pkgname.conf
+    "$pkgdir"/usr/lib/tmpfiles.d/$pkgname.conf
+ install -Dm644 files/fail2ban-logrotate \
+    "$pkgdir"/etc/logrotate.d/fail2ban
   install -Dm644 files/bash-completion \
-          "$pkgdir"/usr/share/bash-completion/completions/fail2ban
+    "$pkgdir"/usr/share/bash-completion/completions/fail2ban
 
   # avoid conflict with filesystem>=2012.06
   rm -r "$pkgdir"/var/run
@@ -47,10 +45,10 @@
 
   install -Dm644 man/fail2ban.1 "$pkgdir"/usr/share/man/man1/fail2ban.1
   install -Dm644 man/fail2ban-client.1 \
-          "$pkgdir"/usr/share/man/man1/fail2ban-client.1
+    "$pkgdir"/usr/share/man/man1/fail2ban-client.1
   install -Dm644 man/fail2ban-regex.1 \
-          "$pkgdir"/usr/share/man/man1/fail2ban-regex.1
+    "$pkgdir"/usr/share/man/man1/fail2ban-regex.1
   install -Dm644 man/fail2ban-server.1 \
-          "$pkgdir"/usr/share/man/man1/fail2ban-server.1
+    "$pkgdir"/usr/share/man/man1/fail2ban-server.1
   install -Dm644 man/jail.conf.5 "$pkgdir"/usr/share/man/man5/jail.conf.5
 }

Deleted: service
===================================================================
--- service	2014-04-26 18:33:23 UTC (rev 110194)
+++ service	2014-04-26 18:42:25 UTC (rev 110195)
@@ -1,13 +0,0 @@
-[Unit]
-Description=Ban IPs that make too many password failures
-After=syslog.target network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/fail2ban-client start
-ExecReload=/usr/bin/fail2ban-client reload
-ExecStop=/usr/bin/fail2ban-client stop
-PIDFile=/var/run/fail2ban/fail2ban.pid
-
-[Install]
-WantedBy=multi-user.target

Deleted: tmpfiles.conf
===================================================================
--- tmpfiles.conf	2014-04-26 18:33:23 UTC (rev 110194)
+++ tmpfiles.conf	2014-04-26 18:42:25 UTC (rev 110195)
@@ -1 +0,0 @@
-d /run/fail2ban 0755 root root - -