diff options
| -rw-r--r-- | main/fail2ban/APKBUILD | 17 | ||||
| -rw-r--r-- | main/fail2ban/gentoo-initd_create_run_dir.patch | 19 |
2 files changed, 7 insertions, 29 deletions
diff --git a/main/fail2ban/APKBUILD b/main/fail2ban/APKBUILD index 170032b4e1..8ca1be39bb 100644 --- a/main/fail2ban/APKBUILD +++ b/main/fail2ban/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Jeff Bilyk <jbilyk@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=fail2ban -pkgver=0.8.4 -pkgrel=2 +pkgver=0.8.6 +pkgrel=0 pkgdesc="Scans log files for login failures then updates iptables to reject originating ip address" url="http://www.fail2ban.org" arch="noarch" @@ -10,16 +10,14 @@ license="GPLv2" depends="python iptables logrotate" makedepends="python-dev" install="" -source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 - gentoo-initd_create_run_dir.patch +source="https://github.com/downloads/fail2ban/fail2ban/fail2ban_${pkgver}.orig.tar.gz fail2ban.confd fail2ban.logrotate " -_builddir="$srcdir/$pkgname-$pkgver" prepare() { local i - cd "$_builddir" + cd "$srcdir"/fail2ban-* for i in $source; do case $i in *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; @@ -28,11 +26,11 @@ prepare() { } build() { - cd "$_builddir" + return 0 } package() { - cd "$_builddir" + cd "$srcdir"/fail2ban-* python setup.py install --root "$pkgdir" || return 1 install -Dm755 files/gentoo-initd "$pkgdir"/etc/init.d/fail2ban \ || return 1 @@ -42,7 +40,6 @@ package() { "$pkgdir"/etc/logrotate.d/fail2ban || return 1 } -md5sums="df94335a5d12b4750869e5fe350073fa fail2ban-0.8.4.tar.bz2 -61580eb6d8d9a4d187e97bc27f2fcb1e gentoo-initd_create_run_dir.patch +md5sums="a5f08a67fe6bfb0580043d90c6f81cfd fail2ban_0.8.6.orig.tar.gz b209a04f9314dd064a4aa0ee505c8a4d fail2ban.confd 6d1af6ceebd15c8ae3938bc675efe553 fail2ban.logrotate" diff --git a/main/fail2ban/gentoo-initd_create_run_dir.patch b/main/fail2ban/gentoo-initd_create_run_dir.patch deleted file mode 100644 index 79a947956e..0000000000 --- a/main/fail2ban/gentoo-initd_create_run_dir.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: fail2ban-0.8.4/files/gentoo-initd -=================================================================== ---- fail2ban-0.8.4.orig/files/gentoo-initd -+++ fail2ban-0.8.4/files/gentoo-initd -@@ -31,6 +31,14 @@ depend() { - - start() { - ebegin "Starting fail2ban" -+ if [ ! -d /var/run/fail2ban ]; then -+ mkdir /var/run/fail2ban || return 1 -+ fi -+ if [ -e /var/run/fail2ban/fail2ban.sock ]; then -+ # remove stalled sock file after system crash -+ # bug 347477 -+ rm -rf /var/run/fail2ban/fail2ban.sock || return 1 -+ fi - ${FAIL2BAN} start &> /dev/null - eend $? "Failed to start fail2ban" - } |