From fd2912957cea207aa891c43ed4423612909ec62f Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Thu, 22 Nov 2007 23:38:52 +0000 Subject: patch update to avoid a crash when the host in unreachable, thanks again to tonfa Package-Manager: portage-2.1.3.19 --- net-nntp/hellanzb/ChangeLog | 10 +++- net-nntp/hellanzb/Manifest | 36 ++++++------- net-nntp/hellanzb/files/digest-hellanzb-0.13-r2 | 3 -- net-nntp/hellanzb/files/digest-hellanzb-0.13-r3 | 3 ++ .../files/hellanzb-0.13-fix_multiples_hosts.diff | 30 ++++++++++- net-nntp/hellanzb/hellanzb-0.13-r2.ebuild | 60 ---------------------- net-nntp/hellanzb/hellanzb-0.13-r3.ebuild | 60 ++++++++++++++++++++++ 7 files changed, 118 insertions(+), 84 deletions(-) delete mode 100644 net-nntp/hellanzb/files/digest-hellanzb-0.13-r2 create mode 100644 net-nntp/hellanzb/files/digest-hellanzb-0.13-r3 delete mode 100644 net-nntp/hellanzb/hellanzb-0.13-r2.ebuild create mode 100644 net-nntp/hellanzb/hellanzb-0.13-r3.ebuild (limited to 'net-nntp') diff --git a/net-nntp/hellanzb/ChangeLog b/net-nntp/hellanzb/ChangeLog index cc24afb8a9b3..7890c6e6fe4b 100644 --- a/net-nntp/hellanzb/ChangeLog +++ b/net-nntp/hellanzb/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-nntp/hellanzb # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-nntp/hellanzb/ChangeLog,v 1.3 2007/11/20 14:43:07 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nntp/hellanzb/ChangeLog,v 1.4 2007/11/22 23:38:51 aballier Exp $ + +*hellanzb-0.13-r3 (22 Nov 2007) + + 22 Nov 2007; Alexis Ballier + files/hellanzb-0.13-fix_multiples_hosts.diff, -hellanzb-0.13-r2.ebuild, + +hellanzb-0.13-r3.ebuild: + patch update to avoid a crash when the host in unreachable, thanks again to + tonfa *hellanzb-0.13-r2 (20 Nov 2007) diff --git a/net-nntp/hellanzb/Manifest b/net-nntp/hellanzb/Manifest index 5ea1abfd9054..a96aeb793893 100644 --- a/net-nntp/hellanzb/Manifest +++ b/net-nntp/hellanzb/Manifest @@ -13,10 +13,10 @@ AUX hellanzb-0.13-datafiles.patch 629 RMD160 2a62f28f6fd1414b0bd4bc30a25067caff5 MD5 d6c32baee32a06e0da5ebbb13dcf372a files/hellanzb-0.13-datafiles.patch 629 RMD160 2a62f28f6fd1414b0bd4bc30a25067caff5b281d files/hellanzb-0.13-datafiles.patch 629 SHA256 720b42a6bebcc68275fc54af0d92034b0ac143bb319790745754d71f75ad319e files/hellanzb-0.13-datafiles.patch 629 -AUX hellanzb-0.13-fix_multiples_hosts.diff 3518 RMD160 b931a79742f2c6e115e593d2bd3368849f30f361 SHA1 1134961f54082ba0804568a03269398748c4d6c8 SHA256 fbf5abd788ed45f00916162956cfec9a9d02c89875428e207d7179b788d06391 -MD5 2bcb3932930f9b11998037ca4e92f0cb files/hellanzb-0.13-fix_multiples_hosts.diff 3518 -RMD160 b931a79742f2c6e115e593d2bd3368849f30f361 files/hellanzb-0.13-fix_multiples_hosts.diff 3518 -SHA256 fbf5abd788ed45f00916162956cfec9a9d02c89875428e207d7179b788d06391 files/hellanzb-0.13-fix_multiples_hosts.diff 3518 +AUX hellanzb-0.13-fix_multiples_hosts.diff 4913 RMD160 359ab012e13d06feaa5d95f8e02ddaf21c91894e SHA1 f1575fde74c4065ff0f9580ef6272380985ba029 SHA256 a0cf863ac4133417ec72c87e9498485f720159dbbed5af10f1b466feec5ab92b +MD5 8316f3c8db1f19ad7b55fa751cfdeabb files/hellanzb-0.13-fix_multiples_hosts.diff 4913 +RMD160 359ab012e13d06feaa5d95f8e02ddaf21c91894e files/hellanzb-0.13-fix_multiples_hosts.diff 4913 +SHA256 a0cf863ac4133417ec72c87e9498485f720159dbbed5af10f1b466feec5ab92b files/hellanzb-0.13-fix_multiples_hosts.diff 4913 AUX hellanzb.conf 700 RMD160 b1a897c502b143a58713d171d98642dab911c91b SHA1 f1de67993fcca92245e04e6892e4bfbed990e9fd SHA256 6bbed7f6aa0bfd42d75b47518569617db27ccc0baacecb17fa9cd6b5f28f8901 MD5 fce05c36588455045fda7c1494d78f35 files/hellanzb.conf 700 RMD160 b1a897c502b143a58713d171d98642dab911c91b files/hellanzb.conf 700 @@ -26,25 +26,25 @@ MD5 72d20f6c22d4901f5fb1ab923378fc58 files/hellanzb.init 771 RMD160 281b4319989e5d824dbdf46c0e1e596f01986947 files/hellanzb.init 771 SHA256 e96ec63ae43f13be54030f695cc2cf7d757848d3dddba7e6d911eb966aeff781 files/hellanzb.init 771 DIST hellanzb-0.13.tar.gz 163698 RMD160 2ec3069cd0c9cb6c9fdaa4a4edc4f311a86d944c SHA1 4ada7268ccb9c8f85d8de8d34fda92c3e2d84b5f SHA256 565b08725eb92ac1e278fa7df2c7b27b21588c4e24c140fddbec4a5625159127 -EBUILD hellanzb-0.13-r2.ebuild 1627 RMD160 3bb715b0f79a6cd89ef60b68f40ed79412a53767 SHA1 6d6e98e9ae209ee11357da4d260f8a6ea1719c7d SHA256 538b4c22b4d7579c9c8e0f23db016f9e4a8efdca621ee5dcc6a28a63dd97ac07 -MD5 a7206d7e5c2188f268199fe33c6f43bd hellanzb-0.13-r2.ebuild 1627 -RMD160 3bb715b0f79a6cd89ef60b68f40ed79412a53767 hellanzb-0.13-r2.ebuild 1627 -SHA256 538b4c22b4d7579c9c8e0f23db016f9e4a8efdca621ee5dcc6a28a63dd97ac07 hellanzb-0.13-r2.ebuild 1627 -MISC ChangeLog 1217 RMD160 2dbfda6aba6b83ad63b9b118c44bc34d9eb63938 SHA1 2bd8c21e9b1e2c7468832e968db21fde6ddacb3c SHA256 d9aa3f08dac8554fbd5f7c3c0c835d8bb3925e0af31bd06195566d05a47086ee -MD5 67a87e4ab9188d1f288e844304ef698c ChangeLog 1217 -RMD160 2dbfda6aba6b83ad63b9b118c44bc34d9eb63938 ChangeLog 1217 -SHA256 d9aa3f08dac8554fbd5f7c3c0c835d8bb3925e0af31bd06195566d05a47086ee ChangeLog 1217 +EBUILD hellanzb-0.13-r3.ebuild 1627 RMD160 bcc108b585718b853e279815611af6de287ebdc6 SHA1 01e9386b52e7e54b23b6fadc9a7fc333c4020fe4 SHA256 d740f290a1bbd8c6cadb59728cee91f3c368c7420fbf580356e03d82337b570a +MD5 83df7934e1d7859f0ca912d77f284129 hellanzb-0.13-r3.ebuild 1627 +RMD160 bcc108b585718b853e279815611af6de287ebdc6 hellanzb-0.13-r3.ebuild 1627 +SHA256 d740f290a1bbd8c6cadb59728cee91f3c368c7420fbf580356e03d82337b570a hellanzb-0.13-r3.ebuild 1627 +MISC ChangeLog 1491 RMD160 a08ef248e7c51c739bd228f4476460af20142e97 SHA1 9dca843ab582b010cc53e65f7e972ef8d634a8f2 SHA256 26fcdb3d7f40ebe92582161dadd05f05999b396f7969023eca646f389178eb5c +MD5 55d8ea853c11f9a46ad7b6a56532d0a1 ChangeLog 1491 +RMD160 a08ef248e7c51c739bd228f4476460af20142e97 ChangeLog 1491 +SHA256 26fcdb3d7f40ebe92582161dadd05f05999b396f7969023eca646f389178eb5c ChangeLog 1491 MISC metadata.xml 706 RMD160 7f3ebb6d6e55352055197e008a86428ac1a3d1f7 SHA1 48a67cea318c18afa7fd6b802834719843feceef SHA256 1cec98091461e56458cfafa8a79f05d8bf18da85e6f4355263b25c19f500257b MD5 76d9e359bdc7ba3e8a9dc0e16d211ec4 metadata.xml 706 RMD160 7f3ebb6d6e55352055197e008a86428ac1a3d1f7 metadata.xml 706 SHA256 1cec98091461e56458cfafa8a79f05d8bf18da85e6f4355263b25c19f500257b metadata.xml 706 -MD5 68661df5513ccd5d913adfbd07037663 files/digest-hellanzb-0.13-r2 241 -RMD160 98fe49a05962c5a71709076c36ab8f862a4db027 files/digest-hellanzb-0.13-r2 241 -SHA256 c87858ec1e5244601ca7deb5282897f8d9761607d7e8220f642773425811f6f9 files/digest-hellanzb-0.13-r2 241 +MD5 68661df5513ccd5d913adfbd07037663 files/digest-hellanzb-0.13-r3 241 +RMD160 98fe49a05962c5a71709076c36ab8f862a4db027 files/digest-hellanzb-0.13-r3 241 +SHA256 c87858ec1e5244601ca7deb5282897f8d9761607d7e8220f642773425811f6f9 files/digest-hellanzb-0.13-r3 241 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFHQvKFvFcC4BYPU0oRArIPAKCZ2NGIidfIm0B4TTtceH4rcNgYzwCgk+tC -Hl/1qy1uW4wf4Jm5gWt/57A= -=M1MS +iD8DBQFHRhMjvFcC4BYPU0oRAoypAKC12f30CI0MfNPuRGkGP36TZd73jACaAkeJ +/SWLlpM8nxSXxZO13Vxy7fU= +=F7yC -----END PGP SIGNATURE----- diff --git a/net-nntp/hellanzb/files/digest-hellanzb-0.13-r2 b/net-nntp/hellanzb/files/digest-hellanzb-0.13-r2 deleted file mode 100644 index 49b039d674c3..000000000000 --- a/net-nntp/hellanzb/files/digest-hellanzb-0.13-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 d3510c6b1b2c7b935332a469fdc8e7e2 hellanzb-0.13.tar.gz 163698 -RMD160 2ec3069cd0c9cb6c9fdaa4a4edc4f311a86d944c hellanzb-0.13.tar.gz 163698 -SHA256 565b08725eb92ac1e278fa7df2c7b27b21588c4e24c140fddbec4a5625159127 hellanzb-0.13.tar.gz 163698 diff --git a/net-nntp/hellanzb/files/digest-hellanzb-0.13-r3 b/net-nntp/hellanzb/files/digest-hellanzb-0.13-r3 new file mode 100644 index 000000000000..49b039d674c3 --- /dev/null +++ b/net-nntp/hellanzb/files/digest-hellanzb-0.13-r3 @@ -0,0 +1,3 @@ +MD5 d3510c6b1b2c7b935332a469fdc8e7e2 hellanzb-0.13.tar.gz 163698 +RMD160 2ec3069cd0c9cb6c9fdaa4a4edc4f311a86d944c hellanzb-0.13.tar.gz 163698 +SHA256 565b08725eb92ac1e278fa7df2c7b27b21588c4e24c140fddbec4a5625159127 hellanzb-0.13.tar.gz 163698 diff --git a/net-nntp/hellanzb/files/hellanzb-0.13-fix_multiples_hosts.diff b/net-nntp/hellanzb/files/hellanzb-0.13-fix_multiples_hosts.diff index 695c62ce3bc4..5cf39c311a82 100644 --- a/net-nntp/hellanzb/files/hellanzb-0.13-fix_multiples_hosts.diff +++ b/net-nntp/hellanzb/files/hellanzb-0.13-fix_multiples_hosts.diff @@ -1,6 +1,6 @@ diff -r bdbcba80e0fa Hellanzb/NZBLeecher/Protocol.py --- a/Hellanzb/NZBLeecher/Protocol.py Wed Nov 14 10:00:29 2007 +0100 -+++ b/Hellanzb/NZBLeecher/Protocol.py Wed Nov 14 10:01:07 2007 +0100 ++++ b/Hellanzb/NZBLeecher/Protocol.py Thu Nov 22 22:32:04 2007 +0100 @@ -27,18 +27,14 @@ PHI = 1.6180339887498948 # (1 + math.sqr PHI = 1.6180339887498948 # (1 + math.sqrt(5)) / 2 class NZBLeecherFactory(ReconnectingClientFactory): @@ -21,9 +21,35 @@ diff -r bdbcba80e0fa Hellanzb/NZBLeecher/Protocol.py # statistics for the current session (sessions end when downloading stops on all # clients). sessionReadBytes and sessionStartime are used to calculate the average +@@ -88,6 +84,7 @@ class NZBLeecherFactory(ReconnectingClie + p.factory = self + p.id = self.clientIds[0] + self.clientIds.remove(p.id) ++ p.host, p.port = addr.host, addr.port + + # All clients inherit the factory's anti idle timeout setting + # FIXME: I don't think there's any reason to copy these values to the +@@ -323,7 +320,7 @@ class NZBLeecher(NNTPClient, TimeoutMixi + "Override for notification when authInfoFailed() action fails" + debug(str(self) + ' AUTHINFO failed: ' + str(err)) + # FIXME: This gives us too much scroll. Need to only do it selectively +- #error(self.factory.hostname + '[' + str(self.id).zfill(2) + '] Authorization failed: ' + str(err)) ++ #error(self.host + '[' + str(self.id).zfill(2) + '] Authorization failed: ' + str(err)) + self.transport.loseConnection() + + def connectionMade(self): +@@ -428,7 +425,7 @@ class NZBLeecher(NNTPClient, TimeoutMixi + login """ + if self.username == None and self.password == None: + warn('Could not MODE READER on no auth server (%s:%i), returned: %s' % \ +- (self.factory.host, self.factory.port, str(err))) ++ (self.host, self.port, str(err))) + reactor.callLater(0, self.fetchNextNZBSegment) + elif not self.isLoggedIn: + self.setReaderAfterLogin = True diff -r bdbcba80e0fa Hellanzb/NZBLeecher/__init__.py --- a/Hellanzb/NZBLeecher/__init__.py Wed Nov 14 10:00:29 2007 +0100 -+++ b/Hellanzb/NZBLeecher/__init__.py Wed Nov 14 10:01:07 2007 +0100 ++++ b/Hellanzb/NZBLeecher/__init__.py Thu Nov 22 22:32:04 2007 +0100 @@ -122,30 +122,28 @@ def connectServer(serverName, serverDict connectionCount = 0 hosts = serverDict['hosts'] diff --git a/net-nntp/hellanzb/hellanzb-0.13-r2.ebuild b/net-nntp/hellanzb/hellanzb-0.13-r2.ebuild deleted file mode 100644 index a7e73ebbcd07..000000000000 --- a/net-nntp/hellanzb/hellanzb-0.13-r2.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nntp/hellanzb/hellanzb-0.13-r2.ebuild,v 1.1 2007/11/20 14:43:07 aballier Exp $ - -inherit distutils eutils - -DESCRIPTION="Retrieves and processes .nzb files" -HOMEPAGE="http://www.hellanzb.com/" -SRC_URI="http://www.hellanzb.com/distfiles/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="libnotify" - -RDEPEND=">=dev-python/twisted-2.0 - dev-python/twisted-web - || ( app-arch/unrar - app-arch/rar ) - app-arch/par2cmdline - libnotify? ( dev-python/notify-python )" - -DEPEND="" - -DOCS="CHANGELOG CREDITS PKG-INFO README" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${P}-datafiles.patch" - epatch "${FILESDIR}/${P}-Fix_conf_file_search_path.patch" - epatch "${FILESDIR}/${P}-Choose_interface_to_bind_on.patch" - epatch "${FILESDIR}/${P}-fix_multiples_hosts.diff" -} - -src_install() { - distutils_src_install - - newconfd "${FILESDIR}/hellanzb.conf" hellanzb - newinitd "${FILESDIR}/hellanzb.init" hellanzb - - insinto etc - doins etc/hellanzb.conf.sample -} - -pkg_postinst() { - elog "You can start hellanzb in the background automatically by using" - elog "the init-script. To do this, add it to your default runlevel:" - elog "" - elog " rc-update add hellanzb default" - elog "" - elog "Use this command to start the daemon now:" - elog "" - elog " /etc/init.d/hellanzb start" - elog "" - elog "You will have to config /etc/conf.d/hellanzb before the init-script" - elog "will work. It is recommended that you change the user under which" - elog "the daemon will run." -} diff --git a/net-nntp/hellanzb/hellanzb-0.13-r3.ebuild b/net-nntp/hellanzb/hellanzb-0.13-r3.ebuild new file mode 100644 index 000000000000..d8e2e93bce33 --- /dev/null +++ b/net-nntp/hellanzb/hellanzb-0.13-r3.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-nntp/hellanzb/hellanzb-0.13-r3.ebuild,v 1.1 2007/11/22 23:38:51 aballier Exp $ + +inherit distutils eutils + +DESCRIPTION="Retrieves and processes .nzb files" +HOMEPAGE="http://www.hellanzb.com/" +SRC_URI="http://www.hellanzb.com/distfiles/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="libnotify" + +RDEPEND=">=dev-python/twisted-2.0 + dev-python/twisted-web + || ( app-arch/unrar + app-arch/rar ) + app-arch/par2cmdline + libnotify? ( dev-python/notify-python )" + +DEPEND="" + +DOCS="CHANGELOG CREDITS PKG-INFO README" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/${P}-datafiles.patch" + epatch "${FILESDIR}/${P}-Fix_conf_file_search_path.patch" + epatch "${FILESDIR}/${P}-Choose_interface_to_bind_on.patch" + epatch "${FILESDIR}/${P}-fix_multiples_hosts.diff" +} + +src_install() { + distutils_src_install + + newconfd "${FILESDIR}/hellanzb.conf" hellanzb + newinitd "${FILESDIR}/hellanzb.init" hellanzb + + insinto etc + doins etc/hellanzb.conf.sample +} + +pkg_postinst() { + elog "You can start hellanzb in the background automatically by using" + elog "the init-script. To do this, add it to your default runlevel:" + elog "" + elog " rc-update add hellanzb default" + elog "" + elog "Use this command to start the daemon now:" + elog "" + elog " /etc/init.d/hellanzb start" + elog "" + elog "You will have to config /etc/conf.d/hellanzb before the init-script" + elog "will work. It is recommended that you change the user under which" + elog "the daemon will run." +} -- cgit v1.2.3-65-gdbad