Use FILESDIR instead of hard-coded path!

(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key A792A613)

8 files changed, 14 insertions, 248 deletions

diff --git a/net-analyzer/fail2ban/ChangeLog b/net-analyzer/fail2ban/ChangeLog
index 5f5e3c3a3844..1153f44b98a3 100644
--- a/net-analyzer/fail2ban/ChangeLog
+++ b/net-analyzer/fail2ban/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/fail2ban
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/ChangeLog,v 1.95 2013/06/06 16:25:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/ChangeLog,v 1.96 2013/06/06 16:53:14 jer Exp $
+
+  06 Jun 2013; Jeroen Roovers <jer@gentoo.org> -fail2ban-0.8.6-r1.ebuild,
+  -fail2ban-0.8.6.ebuild, -fail2ban-0.8.7.1.ebuild,
+  -files/fail2ban-0.8.6-gentoo-init.patch,
+  -files/fail2ban-0.8.6-sshd-breakin.patch, fail2ban-0.8.8.ebuild,
+  fail2ban-0.8.9.ebuild:
+  Use FILESDIR instead of hard-coded path!
 
 *fail2ban-0.8.9 (06 Jun 2013)
 
diff --git a/net-analyzer/fail2ban/fail2ban-0.8.6-r1.ebuild b/net-analyzer/fail2ban/fail2ban-0.8.6-r1.ebuild
deleted file mode 100644
index 3549328e4f2e..000000000000
--- a/net-analyzer/fail2ban/fail2ban-0.8.6-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.8.6-r1.ebuild,v 1.2 2012/09/07 12:01:41 pinkbyte Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-
-inherit distutils eutils vcs-snapshot
-
-DESCRIPTION="Bans IP that make too many password failures"
-HOMEPAGE="http://www.fail2ban.org/"
-SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-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
-	virtual/logger
-	net-firewall/iptables
-	selinux? ( sec-policy/selinux-fail2ban )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sshd-breakin.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/fail2ban-0.8.6.ebuild b/net-analyzer/fail2ban/fail2ban-0.8.6.ebuild
deleted file mode 100644
index dffae843b272..000000000000
--- a/net-analyzer/fail2ban/fail2ban-0.8.6.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.8.6.ebuild,v 1.7 2012/04/17 21:50:27 ranger Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-
-inherit distutils eutils
-
-DESCRIPTION="Bans IP that make too many password failures"
-HOMEPAGE="http://www.fail2ban.org/"
-SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-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 )"
-
-S="${WORKDIR}"/${PN}-${PN}-a20d1f8
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sshd-breakin.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/fail2ban-0.8.7.1.ebuild b/net-analyzer/fail2ban/fail2ban-0.8.7.1.ebuild
deleted file mode 100644
index 9cdcff03ae42..000000000000
--- a/net-analyzer/fail2ban/fail2ban-0.8.7.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.8.7.1.ebuild,v 1.1 2012/09/07 12:10:52 pinkbyte Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-
-inherit distutils eutils vcs-snapshot
-
-DESCRIPTION="Bans IP that make too many password failures"
-HOMEPAGE="http://www.fail2ban.org/"
-SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-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
-	virtual/logger
-	net-firewall/iptables
-	selinux? ( sec-policy/selinux-fail2ban )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_install() {
-	distutils_src_install
-
-	newconfd files/gentoo-confd fail2ban
-	newinitd files/gentoo-initd fail2ban
-	dodoc ChangeLog README TODO
-	doman man/*.1
-
-	# 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}
-}
-
-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/fail2ban-0.8.8.ebuild b/net-analyzer/fail2ban/fail2ban-0.8.8.ebuild
index c09bf9be77c6..946063139378 100644
--- a/net-analyzer/fail2ban/fail2ban-0.8.8.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.8.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.8.8.ebuild,v 1.7 2013/01/04 13:15:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.8.8.ebuild,v 1.8 2013/06/06 16:53:14 jer Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -35,8 +35,8 @@ src_prepare() {
 src_install() {
 	distutils_src_install
 
-	newconfd files/gentoo-confd fail2ban
-	newinitd files/gentoo-initd fail2ban
+	newconfd "${FILESDIR}"/gentoo-confd fail2ban
+	newinitd "${FILESDIR}"/gentoo-initd fail2ban
 	dodoc ChangeLog README TODO
 	doman man/*.1
 
diff --git a/net-analyzer/fail2ban/fail2ban-0.8.9.ebuild b/net-analyzer/fail2ban/fail2ban-0.8.9.ebuild
index ed8be0e79adc..58882fe103e6 100644
--- a/net-analyzer/fail2ban/fail2ban-0.8.9.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.8.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.8.9.ebuild,v 1.1 2013/06/06 16:23:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.8.9.ebuild,v 1.2 2013/06/06 16:53:14 jer Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{5,6,7} )
@@ -39,8 +39,8 @@ src_install() {
 
 	rm -rf "${D}"/usr/share/doc/fail2ban
 
-	newconfd files/gentoo-confd fail2ban
-	newinitd files/gentoo-initd fail2ban
+	newconfd "${FILESDIR}"/gentoo-confd fail2ban
+	newinitd "${FILESDIR}"/gentoo-initd fail2ban
 	doman man/*.1
 
 	# Use INSTALL_MASK  if you do not want to touch /etc/logrotate.d.
diff --git a/net-analyzer/fail2ban/files/fail2ban-0.8.6-gentoo-init.patch b/net-analyzer/fail2ban/files/fail2ban-0.8.6-gentoo-init.patch
deleted file mode 100644
index c60187052ee7..000000000000
--- a/net-analyzer/fail2ban/files/fail2ban-0.8.6-gentoo-init.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Committed upstream, in version >0.8.6
-https://github.com/fail2ban/fail2ban/pull/46
-
-diff -u -r a/files/gentoo-initd b/files/gentoo-initd
---- a/files/gentoo-initd	2011-11-29 07:46:04.000000000 +0400
-+++ b/files/gentoo-initd	2012-01-28 23:08:50.790118353 +0400
-@@ -19,7 +19,7 @@
- # 
- # $Revision: 1.2 $
- 
--opts="reload showlog"
-+extra_started_commands="reload showlog"
- 
- FAIL2BAN="/usr/bin/fail2ban-client ${FAIL2BAN_OPTIONS}"
- 
diff --git a/net-analyzer/fail2ban/files/fail2ban-0.8.6-sshd-breakin.patch b/net-analyzer/fail2ban/files/fail2ban-0.8.6-sshd-breakin.patch
deleted file mode 100644
index 106d282d3839..000000000000
--- a/net-analyzer/fail2ban/files/fail2ban-0.8.6-sshd-breakin.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Do not port to version >0.8.6 per upstream's advice
-https://github.com/fail2ban/fail2ban/pull/46
-
-Index: fail2ban-fail2ban-a20d1f8/config/filter.d/sshd.conf
-===================================================================
---- fail2ban-fail2ban-a20d1f8.orig/config/filter.d/sshd.conf
-+++ fail2ban-fail2ban-a20d1f8/config/filter.d/sshd.conf
-@@ -31,8 +31,8 @@ failregex = ^%(__prefix_line)s(?:error:
-             ^%(__prefix_line)sUser .+ from <HOST> not allowed because not listed in AllowUsers$
-             ^%(__prefix_line)sauthentication failure; logname=\S* uid=\S* euid=\S* tty=\S* ruser=\S* rhost=<HOST>(?:\s+user=.*)?\s*$
-             ^%(__prefix_line)srefused connect from \S+ \(<HOST>\)\s*$
--            ^%(__prefix_line)sAddress <HOST> .* POSSIBLE BREAK-IN ATTEMPT!*\s*$
--            ^%(__prefix_line)sUser .+ from <HOST> not allowed because none of user's groups are listed in AllowGroups\s*$
-+            ^%(__prefix_line)sreverse mapping checking getaddrinfo for .* \[<HOST>\] .* POSSIBLE BREAK-IN ATTEMPT!*\s*$
-+            ^%(__prefix_line)sUser \S+ from <HOST> not allowed because none of user's groups are listed in AllowGroups\s*$
- 
- # Option:  ignoreregex
- # Notes.:  regex to ignore. If this regex matches, the line is ignored.