Use FILESDIR instead of hard-coded path!

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

9 files changed, 20 insertions, 261 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/Manifest b/net-analyzer/fail2ban/Manifest
index e934ae6cbba6..b439006f1012 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1,25 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX fail2ban-0.8.6-gentoo-init.patch 428 SHA256 faa1f848f9762a49aed2f7d381dde99d1d1587ba96b3fb9a707435588416ea0a SHA512 94501cf65b857d20fe433d528d0133afe92fd1b7de7b5e4492b06346822a20cd60118909095044305f784da72c631a49e017076b76987c5562d4876fd5f85895 WHIRLPOOL 8c33822c1694d0ee001e5fbe54ee29a0aa8bbc72b81c7fd480c8c5122a64f126e1639f13c1016232015f96edc70e0b0748f6dfa1c8f9432837fc9c53724af2fd
-AUX fail2ban-0.8.6-sshd-breakin.patch 1250 SHA256 06feefd7e8539a6a27b7b694ba504489a8dba863d57dd9f95ebb09b941f240b6 SHA512 7add0e98aa3926a168cbe2944a3132a6752b03830b698d0af25b5a3cd88615c50bc700657fecc14dcee0515e6aa35a5d2163d4103ab935f4a9440a198acb0d0b WHIRLPOOL 5744051804fb05fa7c187e333ee2438c42ba248e432011cf6c3279fc270815af80fc2917cf01a6eec9b09f2e7c1f53f52098786a411568a92d124a1065212d10
 AUX fail2ban-logrotate 191 SHA256 4cfe274ec9c71dd0ae0575298f5327230f6e67b2f8fc1a616c645d0f6b3ce02f SHA512 60c80dcf8ced5a0323daef2df702f862d99ac45f56b91015ce39be8471cf9d6a3bb45d776df0330692f40db37638dc3ef2004cfc65f26d50dd67c94fbfdf4ec2 WHIRLPOOL e5eb49a4bb392b55e6302f22bebacf57d729c28f78ecd2260c0fa8b591f7e0a42f70a101a8830ee24936406c53bcab0dcf703884226489b764685192f2fef51b
 AUX fail2ban.conf.d 217 SHA256 e35f1f820bfe5ecaac2696d60155c348d84af428e8c615e97b900c24a587d233 SHA512 1e7581dd04e7777d6fd5c40cc842a7ec5f4e6a0374673d020d89dd61bf4093d48934844bee89bcac9084f9ae44f3beb66e714cf3c2763d79c3e8feb790c5e43b WHIRLPOOL a83ae6564da61ccebd00c29a18a83a8971990df2d833f9294ada6f5f3d938e448855ffb5d6c9c8849b102cd82dfc57501b97cd19ae20407d1ad50b0d71c5bbd7
-DIST fail2ban-0.8.6.tar.gz 107029 SHA256 24d02422c55f1b7d92bea30a7dde6f72f280eadf09d478fcca8b1dd40fb4e914 SHA512 3a50478f1fa3f8f27a7f2da7846143815af36d04acb3062a4e5d65ca268dba92437fb04f19ef75bae6c1973645b947d85f98c6c956b618f3d89bf75e57e8befa WHIRLPOOL 15ea80f4be1de92070ca0e633fcda8180259a42124f98d68eb45df121540dc7d0ce43a4fa831af95a32f6fa228b0a26c9423765c3d66782129b3654f934dd40a
-DIST fail2ban-0.8.7.1.tar.gz 122529 SHA256 2804a789347b1274e343a33fcca659b37d40bb5f99e77546997c96a425f6fc9b SHA512 837da4770999f6796a983dd9555df294e50c7f9676e51bf6a392551eccce9f910fdb4f980a224e8b07d035eb7d9583b94bd44ebb212c4a6b82f6f2a96a0e3a46 WHIRLPOOL 83c22a010336a3115c6931919c06bc533aa09274a71247a3a3153ca2958960982bbc9bc818d073d70e418b40ce1561a30f43408a0bdcc0bd82f7dab406ffaa10
 DIST fail2ban-0.8.8.tar.gz 125364 SHA256 5b020aaa2316dc4348a1489187db2cb124c4cf2a13f84aed7064fc5bc948a8ab SHA512 693d376386831d8ba738d90e9c66b06a8f4424bc4cc4c934e2d1d36da0f6d9eedfdc7d66ae8a5fff50fd0688a6c8283c33145f0156df3aeb7f95476df563ea26 WHIRLPOOL 6eecf0e447d1276b50f1bb74b7a3b37300546a8d9f3048f62ef9414ae79821e5f377b65180c6944f0906bb25d37d30ed40c006bf1ff4ab7216bb22003066f7ed
 DIST fail2ban-0.8.9.tar.gz 159957 SHA256 b20c1a074620a1003ec4e48e30ac40a41cc6f4242a37eb6a78fa29daa9165bb7 SHA512 b9f695a62541f3df2fd51eaa5779f2b9394927695a4d8898d495b83d7da7177e19c2b5043fb1331a90b4be9431810fde1dac61aadc8da56fd8e1044b3c47d6da WHIRLPOOL a62c8761052c16c18e2aa52bae08f66ca19b93a9719e2d2b5e45141d2b2e3f65b3370513c2263c74397ed83b9d9907f2b5c4c6c2224744593889b82a4be98da8
-EBUILD fail2ban-0.8.6-r1.ebuild 1958 SHA256 c4b4c9ec9dd5277190a04afb5d16dd7eece7b251c13da0bc6dd3454dd5259bd4 SHA512 cc4264b6a5f18130b168e1f32a7991a5c3432987c3613120c3c0cbe7314209b81e372d07ca98be499a2d942053923860693a8b6b41d9ce11504ce4c28d1f1764 WHIRLPOOL fada8ac7ba4ef894ec4974b2c03db8b9b21bc4b349e4d3ec350351383dd095c826eccbce6bb86e3b9031b20490eab8f93ad5bd4976c2ae35e24e3137e68eacf1
-EBUILD fail2ban-0.8.6.ebuild 1955 SHA256 3cf2fd4838418c1594ee37a8a1d66f7100e66c2ca6f34e2329fd04ef1a1756dc SHA512 d7dd327899a81ff010e876698c1755a833248d82b4625284b2adc7057b15643171d3ac4f31b9d6bb74fe9a0bcfc5edbfc516588bb9bc41e6af94a69b7afe46e7 WHIRLPOOL ddd09c10d04fc9576a2ff288337bc77db7ab1f4239748549d6bbe05ff67c6cb3995b9dde147efe7b8f942a6d2ca70120fda37802e5585d858c5354abd63a677f
-EBUILD fail2ban-0.8.7.1.ebuild 1763 SHA256 923e133714b3b7dc3b713889e1d150d70ac292f96b7f73779cdeb4b1dbc6f692 SHA512 92e85c93b47d4c45866c12cf9fbb58c925bb01d0e177d6cb717569fdcc6114fcabdeba62d1bd6c86b7fbed0894e584ffd2a8951bdc2c83cad051e6a45b13ed89 WHIRLPOOL b2f10dc9f79b4ba8d1e85eb9842aeb8673624a7aa759453ccfd9de12406401528a0c2addfd6618ca7bb4a286ce8527bf5ad989972917c10fa4c4c2dd05e63b65
-EBUILD fail2ban-0.8.8.ebuild 1839 SHA256 70551ac938ad57eb1ed640ec4f33c46af3bdf3553140971da3a03fdb3af688ae SHA512 e0da6d2cfc81e97da138f7a32f5710b1d84ecbd7ca27c494bc77ae71c0fcc449c43fb9d041a3238a3b53e1d3d97db64923b3b40fe329d01c1c987f3e1a37bf00 WHIRLPOOL 8b91f6d302ec0628fb0e46c35e366c220ea6f4f3999a59e39a4db72f702e668c5d897e1fc33d3367e0d8615b5b327a7bdfce647dc4cddb29793bfd6697034589
-EBUILD fail2ban-0.8.9.ebuild 1949 SHA256 2c3892aa60d9a9a1f3036ba47caf48f9ee794d8ff12eea572b323582668d8413 SHA512 6ee563b7e5fc57e9dfe7cd708445aef38d3f726f61bff885838522eae704fc958f40df8e7a4f8de7e84392f38668f2f8a96cbb9a25d3269426811e288096da45 WHIRLPOOL 7513451bd341cfbdd756cbe93ecc188f9063b9589cb7480e43e143c45ce9d6431dfbc28c38563f309f1a9fe0f5160d69cea3899e364e4dd38d72ed8eaee036a4
-MISC ChangeLog 14773 SHA256 e439c4626e5334704c9b734cf0cc5f5b7b4cc749e2bbca2ca349259debf2620c SHA512 d80191e6f7494f089e866e56559ee53c6abf5c799b7240ba33a949821e0f02f08b5a55354df4f1b95373fed6e340d94f453119c7bf91dcb7bdc09cd31fa08da0 WHIRLPOOL 15903326e26329d20ad64399993da4102c99ef9fe068280ff57307fe562a32c0f06a7a38225d7d8e78bdf541503cc78f46fb3aecceb950a68c099ed9c6b96e87
+EBUILD fail2ban-0.8.8.ebuild 1855 SHA256 29e8aa3194f1d0e1eabc348441899e13b031872c58930df7909cd71ded36f31c SHA512 9af986c97066818d4087877e2e7da8e829604bc377ad78fdd4aeb82101636351c32f5c7649692fd966a646d4080911b9177cea61061a8e4ad0dd78c389db7b2c WHIRLPOOL d57a3db96c8b5f8aaf1f96a35b61fe6e2cf002894f5a472874160211638ce57f9b7130a2d710fb9ffb28c243194935247f4dcac909adad1a9a1b71e292ccc900
+EBUILD fail2ban-0.8.9.ebuild 1965 SHA256 7362966ced062fc98fc84fe73ebbd4dd5bfe4a6eeb703831d12e7ac17dbfbdc2 SHA512 8fd5c7f5cdd029f8b13621b99ba132d683a6aaac86eb277ea016502169c29d15225d6e3c14d494932a0c97febfee5a6a783f0e3b9f302d8c1be6d166bff03a2d WHIRLPOOL 16c1f98706b5b8ead3d56dc07310ed96dc08405ebf788a7b14accd3c8fd5bb163c7c1543704be0e93c7734a7bdfc76dcbe79506bb054104acc9e65424636594c
+MISC ChangeLog 15078 SHA256 e472d164cd328040496dc670cf3a613d73ed69a1776e3398a6cc29dd29c81adc SHA512 134ecfa0bdeef0f0f1329d28532bc3013c62a44235bc5edec0eb48550ea49b44a5c8dbe5807f04265bf19f497a900ff8a9fa7d395d8bb1f04882e4a4f925629f WHIRLPOOL 730bc713b71647e538404b8efc02672af756230e65906abd4c598f683651f36c362ad1c8fc7c9ca4a8320e4286c1d5119ba0418f8287cb55a8010030719ce573
 MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGwt98ACgkQVWmRsqeSphMJjQCdEWYY+XdDCois+tlCwmQ8C4Sm
-iFYAn06r2FAvyrqYtwaH92TFaKu2auSR
-=eOlB
+iEYEAREIAAYFAlGwvnwACgkQVWmRsqeSphMAWgCeLgVDP4R8v5BI1pho/KJqEykS
+OeEAnR4RqUFaSjytpstpjgR3a5pIPR9A
+=vZyO
 -----END PGP SIGNATURE-----
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.