Revision bump wrt opts deprecated in initscript (quite annoying to see as user every boot).

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

4 files changed, 106 insertions, 5 deletions

diff --git a/net-analyzer/fail2ban/ChangeLog b/net-analyzer/fail2ban/ChangeLog
index 299edacd273f..982fcd072528 100644
--- a/net-analyzer/fail2ban/ChangeLog
+++ b/net-analyzer/fail2ban/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/fail2ban
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/ChangeLog,v 1.73 2011/12/10 16:59:10 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/ChangeLog,v 1.74 2011/12/15 08:50:08 scarabeus Exp $
+
+*fail2ban-0.8.4-r4 (15 Dec 2011)
+
+  15 Dec 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +fail2ban-0.8.4-r4.ebuild, files/fail2ban-0.8.4-gentoo-init.patch:
+  Revision bump wrt opts deprecated in initscript (quite annoying to see as
+  user every boot).
 
   10 Dec 2011; <swift@gentoo.org> fail2ban-0.8.4-r3.ebuild:
   Add selinux use flag support
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index 6a22c926b17e..eb3d2a015d9b 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1,5 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX fail2ban-0.8.4-cve2009-5023.patch 1587 RMD160 fce36b64effa72a6e73db3698bc40c5949f6a400 SHA1 73cc35b8cc823e0a1d5f84aa1791be329cc38e2d SHA256 de788f841d650a0b875091a7c58f2dc21a243c5b4559617aec341d28492ab4e1
-AUX fail2ban-0.8.4-gentoo-init.patch 573 RMD160 831ca0d80d19f54756f654c0eaea90977b4c2acb SHA1 4c894b27fa7df09fc24ade4be90c63a0826651e3 SHA256 a6996b01b7769f76f3ef917dff642d8fc16d8f1bef35a8c9fb458e89f2ac06ae
+AUX fail2ban-0.8.4-gentoo-init.patch 591 RMD160 7e42c7ba0faa281b10778ccebaa62e549bc02e6d SHA1 abb1d9da973d187159557fe0d94f939117edfc55 SHA256 31960fce93f25bc99d255ff43e4d9f9db6fb253c1b1c0252d1dcdeeeb5bc1a4c
 AUX fail2ban-0.8.4-hashlib.patch 1129 RMD160 c3df715e57eb621274ef953d4da1991c46a60a6e SHA1 2385a85135b9040239901d381fb2cec564f7463b SHA256 a590d116849a2072fcd6403cfc985f3297e275caf11b184877faa45378237a9f
 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
@@ -7,5 +10,23 @@ AUX fail2ban.conf.d 217 RMD160 7d8b079d1b569caf1d822af0ec8a040723f492c5 SHA1 959
 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-r3.ebuild 2029 RMD160 3670f64f1f05b0d8c79c0b54c0d655155dc91fd7 SHA1 3f16d6076c4a64f21d4ad9715cacbb5bfd9706cd SHA256 f57035cb0a3f1108c227931b46588bd7fdb3e1702140bd9870677ed3fdd60d08
-MISC ChangeLog 11537 RMD160 ef2748d85508d5ddc479dada8e1b2a989f0c15d7 SHA1 6695d733bbed200546a2c53809f041a780acb78b SHA256 39c784c12e408f8d3b880ca057f8a033b99305bec8e3027cc1d4ad5cc3d5aed2
+EBUILD fail2ban-0.8.4-r4.ebuild 2052 RMD160 9974bc0a751b14738c42267e0ada4ca08688684c SHA1 7fe661b1e86feaf5cb0bb95de6d3ea8f791c1dbe SHA256 977f47a4068063d46f6663cc281c0ba247a1ab6af1ed1cff57e2892172d51e36
+MISC ChangeLog 11796 RMD160 0cb9fdc4416917887811480377805f3876a60edb SHA1 6199729416c6d6231496a333a22601ec556a9b65 SHA256 2cc170403e63b8de9f19d0857649109f127c2aee73969423ae82c19857e211ab
 MISC metadata.xml 252 RMD160 cdc7c3fd17bea80f58e06f161a20d23c4028d84c SHA1 efa55fa719cd06beb2ca49131d6445b6787c5da8 SHA256 4f9ebee95f874fc7e89bf6844826f7826d899d2ddf06847e3eda21465ed56113
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJO6bT/AAoJEOSiRoyO7jvoin8QAIw1KLQ9toAo9A89MUHrs3gv
+LsycdTB+xyqub4BkNc4bXWsFE91Mi+ToXaXHLI4BaoM5RQyDJ6UNwO0K/WrsRfjB
+x1RsF85ZaHoSHiPws6aRZKsMmMq80CxYW5SxNIEMG3WnCeD00RdVWGWDjrr1tOd8
+JqZZnQPU1NP4TQUqV4LE30fI6qjBCY/fYV9XlKvWDoHWFR4AqKZF0QITLLwruCKi
+Z93JUrVMc8jJeIpw80iq8mAQVLljwmh6OHn+bp1cn8HPwM1NEzFk1F6XCSgGkFRr
+LcRzwYxReVyXEFJ3HJiEkqTaJZFXAd7lwNSuIuQ+3DuW9ndHQNCFII20SnE1EXXZ
+ZjXnWsFM81M3SnRbYNKSEiAi1vsFHyLiynuDGjtWUOJy2XZP0D5qKiY4UgDD+Hno
+mRMpT1CqpuC4xiVwEY7csY5lLEOM5JhoLaTszAv5EPzZO0MkTp07lQpIxTIwdHNR
+78+mMoqP++5w7I5uM3U6XMZHOGhd31FsXsS4+7FdPphQqRzHYY4p1K9s9RpVFgv3
+vIYhoX3RRiwdALRBYZ3sRVnc39OYAsVhCwHB7SxSEDytcCy7XrrIPRHoqaUXSdge
+E9mRXPak8g/KTrg62HxfO4ix1k2BkKtZXpcr5XLvfgzUVYEbEQQWB+zPrAQF02xX
+N6nyr8Gk5HtZ5PVmMaZe
+=Zx1x
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/fail2ban/fail2ban-0.8.4-r4.ebuild b/net-analyzer/fail2ban/fail2ban-0.8.4-r4.ebuild
new file mode 100644
index 000000000000..857f4f8b60fe
--- /dev/null
+++ b/net-analyzer/fail2ban/fail2ban-0.8.4-r4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2011 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-r4.ebuild,v 1.1 2011/12/15 08:50:08 scarabeus Exp $
+
+EAPI="3"
+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="selinux"
+
+DEPEND="selinux? ( sec-policy/selinux-fail2ban )"
+RDEPEND="net-misc/whois
+	virtual/mta
+	net-firewall/iptables
+	selinux? ( sec-policy/selinux-fail2ban )"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-hashlib.patch \
+		"${FILESDIR}"/${P}-sshd-breakin.patch \
+		"${FILESDIR}"/gentoo-initd_create_run_dir.patch \
+		"${FILESDIR}"/${P}-cve2009-5023.patch \
+		"${FILESDIR}"/${P}-gentoo-init.patch
+	distutils_src_prepare
+}
+
+src_install() {
+	distutils_src_install
+
+	newconfd files/gentoo-confd fail2ban || die
+	newinitd files/gentoo-initd fail2ban || die
+	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() {
+	distutils_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/fail2ban-0.8.4-gentoo-init.patch b/net-analyzer/fail2ban/files/fail2ban-0.8.4-gentoo-init.patch
index 1eafedf034ed..0e28c2a33694 100644
--- a/net-analyzer/fail2ban/files/fail2ban-0.8.4-gentoo-init.patch
+++ b/net-analyzer/fail2ban/files/fail2ban-0.8.4-gentoo-init.patch
@@ -3,10 +3,10 @@ diff -r ce6b6bcedb6d files/gentoo-initd
 +++ b/files/gentoo-initd	Tue May 17 13:36:56 2011 -0600
 @@ -19,7 +19,7 @@
  # 
- # $Revision: 1.1 $
+ # $Revision: 1.2 $
  
 -opts="start stop restart reload showlog"
-+opts="reload showlog"
++extra_started_commands="reload showlog"
  
  FAIL2BAN="/usr/bin/fail2ban-client ${FAIL2BAN_OPTIONS}"