Create /var/run/fail2ban on runtime and remove stalled sock file in case of system crash. Thanks to Michael Lorant <mikel@mlvision.com.au>. Bug #347477. Taking over maintainership

Package-Manager: portage-2.2.0_alpha6/cvs/Linux x86_64

5 files changed, 102 insertions, 6 deletions

diff --git a/net-analyzer/fail2ban/ChangeLog b/net-analyzer/fail2ban/ChangeLog
index fb3f027070c5..18fa8cf590fa 100644
--- a/net-analyzer/fail2ban/ChangeLog
+++ b/net-analyzer/fail2ban/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/fail2ban
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/ChangeLog,v 1.59 2010/11/05 15:05:51 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/ChangeLog,v 1.60 2010/12/02 21:53:01 hwoarang Exp $
+
+*fail2ban-0.8.4-r2 (02 Dec 2010)
+
+  02 Dec 2010; Markos Chandras <hwoarang@gentoo.org> +fail2ban-0.8.4-r2.ebuild,
+  +files/gentoo-initd_create_run_dir.patch, metadata.xml:
+  Create /var/run/fail2ban on runtime and remove stalled sock file in case of
+  system crash. Thanks to Michael Lorant <mikel@mlvision.com.au>. Bug #347477.
+  Taking over maintainership
 
 *fail2ban-0.8.4-r1 (05 Nov 2010)
 
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index 5c22e7dd62af..104ec5581ae7 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -5,15 +5,17 @@ AUX fail2ban-0.8.4-hashlib.patch 1129 RMD160 c3df715e57eb621274ef953d4da1991c46a
 AUX fail2ban-0.8.4-sshd-breakin.patch 1107 RMD160 719d206fd118e25d0cee3887db7b4c8b1c241524 SHA1 c9780ec64a8e59cee3c74be2863b3816ff6b16e8 SHA256 0a986bc24fe3333254b4f4eb3fd04bb2f46652ae3be2b02d137e5c7d6aa483c8
 AUX fail2ban-logrotate 191 RMD160 26756583fbaa7b7ad09e300ac9d0cbbe8a2bdcf3 SHA1 c66d4786e9532d6785b25f36999438b590ae9040 SHA256 4cfe274ec9c71dd0ae0575298f5327230f6e67b2f8fc1a616c645d0f6b3ce02f
 AUX fail2ban.conf.d 217 RMD160 7d8b079d1b569caf1d822af0ec8a040723f492c5 SHA1 9592b732be3d96699c9872add7287e82260f37c0 SHA256 e35f1f820bfe5ecaac2696d60155c348d84af428e8c615e97b900c24a587d233
+AUX gentoo-initd_create_run_dir.patch 591 RMD160 31ad2f85704fbff25b6f9ea62734e17ad6dfa9f1 SHA1 e3a00c6873e3383e86f1789c5d3be3dd891a0ea3 SHA256 0640cd1c2b932d13426fda212d50758eb649bdd4db411e985ab9e7bd5fd56608
 DIST fail2ban-0.8.4.tar.bz2 71818 RMD160 05a9dfd206f734bea9d063a2527695c1b033ea43 SHA1 0816a9f8d54013dc9b395284caff3c54f44377d8 SHA256 7a4fc0ea6dffde1db1d096757878e1b2c5f0b087a05ed7e7ca0202fb0b127982
 EBUILD fail2ban-0.8.4-r1.ebuild 1793 RMD160 23ebe439d8b2127b48e74a4f0da6e48ada3074c1 SHA1 71e3946e1dbe6dad219ffe6432d70a021689574d SHA256 28c77ff8f64ef7719bcddead8149d415c6452b62344fc0e40f20b701190f1044
+EBUILD fail2ban-0.8.4-r2.ebuild 1765 RMD160 51a79f92b53be771378c260f609f4b11701bf414 SHA1 ea4124cf6263046ec9cf2dd860f304a10ef2fb56 SHA256 a35bc4d5ac6406a80e08c5c767e72f09f0451bf4b55203ef75294b74eea2aaf2
 EBUILD fail2ban-0.8.4.ebuild 1643 RMD160 39cd31142f4415aab038eb5d9203e4188c79fde6 SHA1 66fb9cbad7425bc97f2347b6325a9e19fb023d79 SHA256 d7e907e859cec324156749f5c4e00f1ad990515373fdfc62ff48aeaad4d88b93
-MISC ChangeLog 9438 RMD160 cb86019fe1fd14aa6e0e3c486e615af53eebb292 SHA1 9336330164514533fd7dac6b3723e4976799a23a SHA256 c8775db90577f2b0ba870a22d611befa86b9dda9728b05e53c8a6b3804360cbe
-MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
+MISC ChangeLog 9797 RMD160 f7618169f41d1e83081f07670335720146e323c3 SHA1 e91ddc0c4c446f33e3d5d05ce4404fd384c0dda8 SHA256 dee76d3c07e4e8cc1c3c33d42f29fc92d1405d39af246924f3b34ee3fabb3c35
+MISC metadata.xml 252 RMD160 cdc7c3fd17bea80f58e06f161a20d23c4028d84c SHA1 efa55fa719cd06beb2ca49131d6445b6787c5da8 SHA256 4f9ebee95f874fc7e89bf6844826f7826d899d2ddf06847e3eda21465ed56113
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzUHVMACgkQ9/cejkQaxBC2rQCeKlzQkC+kBR8dd75moi6+zx4+
-iFwAnj1w26Lybsb/zJOVdH81ABdVHN0W
-=F1rc
+iEYEARECAAYFAkz4FT4ACgkQ9/cejkQaxBAGWgCdGpI3JbZ0TaLfQMLLutNTPYyV
+bdwAnAnvCJryvBoYMSAt0bHKSuYAfVPq
+=iLeH
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/fail2ban/fail2ban-0.8.4-r2.ebuild b/net-analyzer/fail2ban/fail2ban-0.8.4-r2.ebuild
new file mode 100644
index 000000000000..a923a9edac7a
--- /dev/null
+++ b/net-analyzer/fail2ban/fail2ban-0.8.4-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.8.4-r2.ebuild,v 1.1 2010/12/02 21:53:03 hwoarang Exp $
+
+EAPI=2
+
+PYTHON_DEPEND="2"
+
+inherit distutils eutils
+
+DESCRIPTION="Bans IP that make too many password failures"
+HOMEPAGE="http://fail2ban.sourceforge.net/"
+SRC_URI="mirror://sourceforge/fail2ban/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="net-misc/whois
+	virtual/mta
+	net-firewall/iptables"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-hashlib.patch \
+		"${FILESDIR}"/${P}-sshd-breakin.patch \
+		"${FILESDIR}"/gentoo-initd_create_run_dir.patch
+	distutils_src_prepare
+}
+
+src_install() {
+	distutils_src_install
+
+	newconfd files/gentoo-confd fail2ban
+	newinitd files/gentoo-initd fail2ban
+	dodoc ChangeLog README TODO || die "dodoc failed"
+	doman man/*.1 || die "doman failed"
+
+	# Use INSTALL_MASK  if you do not want to touch /etc/logrotate.d.
+	# See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-logrotate ${PN} || die
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.7"
+	previous_less_than_0_7=$?
+}
+
+pkg_postinst() {
+	if [[ $previous_less_than_0_7 = 0 ]] ; then
+		elog
+		elog "Configuration files are now in /etc/fail2ban/"
+		elog "You probably have to manually update your configuration"
+		elog "files before restarting Fail2ban!"
+		elog
+		elog "Fail2ban is not installed under /usr/lib anymore. The"
+		elog "new location is under /usr/share."
+		elog
+		elog "You are upgrading from version 0.6.x, please see:"
+		elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
+	fi
+}
diff --git a/net-analyzer/fail2ban/files/gentoo-initd_create_run_dir.patch b/net-analyzer/fail2ban/files/gentoo-initd_create_run_dir.patch
new file mode 100644
index 000000000000..79a947956e37
--- /dev/null
+++ b/net-analyzer/fail2ban/files/gentoo-initd_create_run_dir.patch
@@ -0,0 +1,19 @@
+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"
+ }
diff --git a/net-analyzer/fail2ban/metadata.xml b/net-analyzer/fail2ban/metadata.xml
index 03aa50bab7e3..9a576395d83e 100644
--- a/net-analyzer/fail2ban/metadata.xml
+++ b/net-analyzer/fail2ban/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
+<maintainer>
+	<email>hwoarang@gentoo.org</email>
+	<name>Markos Chandras</name>
+</maintainer>
 </pkgmetadata>