diff options
11 files changed, 20 insertions, 296 deletions
diff --git a/net-analyzer/fail2ban/ChangeLog b/net-analyzer/fail2ban/ChangeLog index f005eddfb805..424be2050208 100644 --- a/net-analyzer/fail2ban/ChangeLog +++ b/net-analyzer/fail2ban/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-analyzer/fail2ban # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/ChangeLog,v 1.82 2012/04/17 21:50:27 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/ChangeLog,v 1.83 2012/04/23 16:12:09 darkside Exp $ + + 23 Apr 2012; Jeremy Olexa <darkside@gentoo.org> -fail2ban-0.8.4-r3.ebuild, + -fail2ban-0.8.4-r4.ebuild, -files/fail2ban-0.8.4-cve2009-5023.patch, + -files/fail2ban-0.8.4-gentoo-init.patch, -files/fail2ban-0.8.4-hashlib.patch, + -files/fail2ban-0.8.4-sshd-breakin.patch, + files/fail2ban-0.8.6-gentoo-init.patch, + files/fail2ban-0.8.6-sshd-breakin.patch, + -files/gentoo-initd_create_run_dir.patch: + Remove old files, add upstream patch references 17 Apr 2012; Brent Baude <ranger@gentoo.org> fail2ban-0.8.6.ebuild: Marking fail2ban-0.8.6 ppc64 for bug 411315 diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest index 29f9aed3a8c6..e0252354db23 100644 --- a/net-analyzer/fail2ban/Manifest +++ b/net-analyzer/fail2ban/Manifest @@ -1,16 +1,8 @@ -AUX fail2ban-0.8.4-cve2009-5023.patch 1587 RMD160 fce36b64effa72a6e73db3698bc40c5949f6a400 SHA1 73cc35b8cc823e0a1d5f84aa1791be329cc38e2d SHA256 de788f841d650a0b875091a7c58f2dc21a243c5b4559617aec341d28492ab4e1 -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-0.8.6-gentoo-init.patch 344 RMD160 8670288e5c25e55b0ee88b45fb5ad874af8b663f SHA1 bb2c4601e18e09a186ede15539f6163c91918e1c SHA256 469afb4f1e439ee4816c743a86eaf3c6bcb82a6702e6c04c7f321a04ee9ac3de -AUX fail2ban-0.8.6-sshd-breakin.patch 1152 RMD160 96e6200e64a28795597813c5d52e03df5da7b3f3 SHA1 94a6f95ec0f9673e5d00dc7c01b29333e37d9eec SHA256 e79adc5dcf815f9806bfe798a01240a07a4f9f27f9422ca3f29d7edffb64c575 +AUX fail2ban-0.8.6-gentoo-init.patch 428 RMD160 3d71f02c565657e653c6543fd322583843305bd7 SHA1 09f3a6d5620ca9ec1e99710302078ff7db672fa3 SHA256 faa1f848f9762a49aed2f7d381dde99d1d1587ba96b3fb9a707435588416ea0a +AUX fail2ban-0.8.6-sshd-breakin.patch 1250 RMD160 5bbdf12e0c998ba092422f11143feece3671ebfb SHA1 4aea24f06b45e8b79ced0bef62a0f81f422a9696 SHA256 06feefd7e8539a6a27b7b694ba504489a8dba863d57dd9f95ebb09b941f240b6 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 DIST fail2ban-0.8.6.tar.gz 107029 RMD160 70678ca46849a462367603fb3d0e2c6c2f3b75cf SHA1 f05df2ac989aec47cc40830aafcd6c945ec575ea SHA256 24d02422c55f1b7d92bea30a7dde6f72f280eadf09d478fcca8b1dd40fb4e914 -EBUILD fail2ban-0.8.4-r3.ebuild 2029 RMD160 3670f64f1f05b0d8c79c0b54c0d655155dc91fd7 SHA1 3f16d6076c4a64f21d4ad9715cacbb5bfd9706cd SHA256 f57035cb0a3f1108c227931b46588bd7fdb3e1702140bd9870677ed3fdd60d08 -EBUILD fail2ban-0.8.4-r4.ebuild 2052 RMD160 9974bc0a751b14738c42267e0ada4ca08688684c SHA1 7fe661b1e86feaf5cb0bb95de6d3ea8f791c1dbe SHA256 977f47a4068063d46f6663cc281c0ba247a1ab6af1ed1cff57e2892172d51e36 EBUILD fail2ban-0.8.6.ebuild 1955 RMD160 948cfc21d8c54d8972f71f0b287f25bbece2af87 SHA1 29685b2f9ac29c3a1ac966f1ec9a9950572fe98c SHA256 3cf2fd4838418c1594ee37a8a1d66f7100e66c2ca6f34e2329fd04ef1a1756dc -MISC ChangeLog 12863 RMD160 ba6eae8b06750cdd4629471b502091289ae6974f SHA1 5e5b9f42187c553e2c1cf14b8a000967925f38e9 SHA256 2eeaa39af40bcbaa288fcae5f51448a50fcd4777ff338006c836fb4ec8ef3f16 +MISC ChangeLog 13317 RMD160 6993e3047335f5c2d81686167bf6fefe5f201af3 SHA1 f5715693ea9270532ff00e3c381273fb784cacce SHA256 cc0d3d602ca3fe02a405fd519ad93efcd23c6780caa471490cb0f37780e7ca44 MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 diff --git a/net-analyzer/fail2ban/fail2ban-0.8.4-r3.ebuild b/net-analyzer/fail2ban/fail2ban-0.8.4-r3.ebuild deleted file mode 100644 index b64c8293895c..000000000000 --- a/net-analyzer/fail2ban/fail2ban-0.8.4-r3.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# 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-r3.ebuild,v 1.8 2011/12/10 16:59:10 swift 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 - 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() { - 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.4-r4.ebuild b/net-analyzer/fail2ban/fail2ban-0.8.4-r4.ebuild deleted file mode 100644 index 857f4f8b60fe..000000000000 --- a/net-analyzer/fail2ban/fail2ban-0.8.4-r4.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# 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-cve2009-5023.patch b/net-analyzer/fail2ban/files/fail2ban-0.8.4-cve2009-5023.patch deleted file mode 100644 index d1b69a44c0d5..000000000000 --- a/net-analyzer/fail2ban/files/fail2ban-0.8.4-cve2009-5023.patch +++ /dev/null @@ -1,45 +0,0 @@ -Index: config/action.d/mail-buffered.conf -=================================================================== ---- config/action.d/mail-buffered.conf (revision 766) -+++ config/action.d/mail-buffered.conf (revision 767) -@@ -81,7 +81,7 @@ - - # Default temporary file - # --tmpfile = /tmp/fail2ban-mail.txt -+tmpfile = /var/run/fail2ban/tmp-mail.txt - - # Destination/Addressee of the mail - # -Index: config/action.d/sendmail-buffered.conf -=================================================================== ---- config/action.d/sendmail-buffered.conf (revision 766) -+++ config/action.d/sendmail-buffered.conf (revision 767) -@@ -101,5 +101,5 @@ - - # Default temporary file - # --tmpfile = /tmp/fail2ban-mail.txt -+tmpfile = /var/run/fail2ban/tmp-mail.txt - -Index: config/action.d/dshield.conf -=================================================================== ---- config/action.d/dshield.conf (revision 766) -+++ config/action.d/dshield.conf (revision 767) -@@ -206,5 +206,5 @@ - # Notes.: Base name of temporary files used for buffering - # Values: [ STRING ] Default: /tmp/fail2ban-dshield - # --tmpfile = /tmp/fail2ban-dshield -+tmpfile = /var/run/fail2ban/tmp-dshield - -Index: config/action.d/mynetwatchman.conf -=================================================================== ---- config/action.d/mynetwatchman.conf (revision 766) -+++ config/action.d/mynetwatchman.conf (revision 767) -@@ -141,4 +141,4 @@ - # Notes.: Base name of temporary files - # Values: [ STRING ] Default: /tmp/fail2ban-mynetwatchman - # --tmpfile = /tmp/fail2ban-mynetwatchman -+tmpfile = /var/run/fail2ban/tmp-mynetwatchman 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 deleted file mode 100644 index 0e28c2a33694..000000000000 --- a/net-analyzer/fail2ban/files/fail2ban-0.8.4-gentoo-init.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -r ce6b6bcedb6d files/gentoo-initd ---- a/files/gentoo-initd Tue May 17 13:20:13 2011 -0600 -+++ b/files/gentoo-initd Tue May 17 13:36:56 2011 -0600 -@@ -19,7 +19,7 @@ - # - # $Revision: 1.2 $ - --opts="start stop restart reload showlog" -+extra_started_commands="reload showlog" - - FAIL2BAN="/usr/bin/fail2ban-client ${FAIL2BAN_OPTIONS}" - -@@ -41,14 +41,6 @@ - eend $? "Failed to stop fail2ban" - } - --restart() { -- if ! service_stopped "${SVCNAME}" ; then -- svc_stop || return "$?" -- sleep 1 -- fi -- svc_start --} -- - reload() { - ebegin "Reloading fail2ban" - ${FAIL2BAN} reload > /dev/null diff --git a/net-analyzer/fail2ban/files/fail2ban-0.8.4-hashlib.patch b/net-analyzer/fail2ban/files/fail2ban-0.8.4-hashlib.patch deleted file mode 100644 index 4ab90b85c88f..000000000000 --- a/net-analyzer/fail2ban/files/fail2ban-0.8.4-hashlib.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: fail2ban-0.8.4/server/filter.py -=================================================================== ---- fail2ban-0.8.4.orig/server/filter.py -+++ fail2ban-0.8.4/server/filter.py -@@ -439,7 +439,7 @@ class FileFilter(Filter): - # In order to detect log rotation, the hash (MD5) of the first line of the file - # is computed and compared to the previous hash of this line. - --import md5 -+import hashlib - - class FileContainer: - -@@ -454,7 +454,7 @@ class FileContainer: - try: - firstLine = handler.readline() - # Computes the MD5 of the first line. -- self.__hash = md5.new(firstLine).digest() -+ self.__hash = hashlib.md5(firstLine).digest() - # Start at the beginning of file if tail mode is off. - if tail: - handler.seek(0, 2) -@@ -471,7 +471,7 @@ class FileContainer: - self.__handler = open(self.__filename) - firstLine = self.__handler.readline() - # Computes the MD5 of the first line. -- myHash = md5.new(firstLine).digest() -+ myHash = hashlib.md5(firstLine).digest() - stats = os.fstat(self.__handler.fileno()) - # Compare hash and inode - if self.__hash != myHash or self.__ino != stats.st_ino: diff --git a/net-analyzer/fail2ban/files/fail2ban-0.8.4-sshd-breakin.patch b/net-analyzer/fail2ban/files/fail2ban-0.8.4-sshd-breakin.patch deleted file mode 100644 index dcfc43f95f25..000000000000 --- a/net-analyzer/fail2ban/files/fail2ban-0.8.4-sshd-breakin.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: fail2ban-0.8.4/config/filter.d/sshd.conf -=================================================================== ---- fail2ban-0.8.4.orig/config/filter.d/sshd.conf -+++ fail2ban-0.8.4/config/filter.d/sshd.conf -@@ -31,8 +31,8 @@ failregex = ^%(__prefix_line)s(?:error: - ^%(__prefix_line)sUser \S+ 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 \S+ from <HOST> not allowed because none of user's groups are listed in AllowGroups$ -+ ^%(__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$ - - # Option: ignoreregex - # Notes.: regex to ignore. If this regex matches, the line is ignored. 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 index 3f4193984607..c60187052ee7 100644 --- a/net-analyzer/fail2ban/files/fail2ban-0.8.6-gentoo-init.patch +++ b/net-analyzer/fail2ban/files/fail2ban-0.8.6-gentoo-init.patch @@ -1,9 +1,12 @@ +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.1 $ + # $Revision: 1.2 $ -opts="reload showlog" +extra_started_commands="reload showlog" 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 index 508b2d41d33f..106d282d3839 100644 --- a/net-analyzer/fail2ban/files/fail2ban-0.8.6-sshd-breakin.patch +++ b/net-analyzer/fail2ban/files/fail2ban-0.8.6-sshd-breakin.patch @@ -1,3 +1,6 @@ +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 diff --git a/net-analyzer/fail2ban/files/gentoo-initd_create_run_dir.patch b/net-analyzer/fail2ban/files/gentoo-initd_create_run_dir.patch deleted file mode 100644 index 79a947956e37..000000000000 --- a/net-analyzer/fail2ban/files/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" - } |