Different patch for bug #224945: use thereceived group from the server instead of the group asked, so that it does not fail if there are spaces in the group name or if the group changes.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.3 x86_64

4 files changed, 98 insertions, 2 deletions

diff --git a/net-nntp/hellanzb/ChangeLog b/net-nntp/hellanzb/ChangeLog
index 76acf5724ace..67fe0c548ff8 100644
--- a/net-nntp/hellanzb/ChangeLog
+++ b/net-nntp/hellanzb/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-nntp/hellanzb
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/hellanzb/ChangeLog,v 1.8 2008/06/18 14:05:56 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/hellanzb/ChangeLog,v 1.9 2008/08/30 20:16:02 aballier Exp $
+
+*hellanzb-0.13-r7 (30 Aug 2008)
+
+  30 Aug 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/hellanzb-0.13-gettinggroup.patch, +hellanzb-0.13-r7.ebuild:
+  Different patch for bug #224945: use thereceived group from the server
+  instead of the group asked, so that it does not fail if there are spaces
+  in the group name or if the group changes.
 
 *hellanzb-0.13-r6 (18 Jun 2008)
 
diff --git a/net-nntp/hellanzb/Manifest b/net-nntp/hellanzb/Manifest
index 188ab9faef05..79f8821e67b2 100644
--- a/net-nntp/hellanzb/Manifest
+++ b/net-nntp/hellanzb/Manifest
@@ -1,12 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX hellanzb-0.13-Choose_interface_to_bind_on.patch 2665 RMD160 dc643177cd8414e408a71fdea591b3c6bfc39923 SHA1 e02f905297606f46f9a17d9714fab0790e3d3790 SHA256 b87f5448f40442f6e315ea5ce3985ae1b7dd51b312783e612386c0e4f8240ffb
 AUX hellanzb-0.13-Fix_conf_file_search_path.patch 1222 RMD160 6e8d07055658ca45403555ce339bc2fa01d9eb9c SHA1 712a3221f1af9747cb24ae685c7b32501f6da1d3 SHA256 84f7020663ec9f17cbef7cbe22c46fa04dbb22bb62089e4090ce9ee564b39172
 AUX hellanzb-0.13-datafiles.patch 629 RMD160 2a62f28f6fd1414b0bd4bc30a25067caff5b281d SHA1 6162353cc47927acabe0b466b03662a1762ebe89 SHA256 720b42a6bebcc68275fc54af0d92034b0ac143bb319790745754d71f75ad319e
 AUX hellanzb-0.13-fix_multiples_hosts.diff 4913 RMD160 359ab012e13d06feaa5d95f8e02ddaf21c91894e SHA1 f1575fde74c4065ff0f9580ef6272380985ba029 SHA256 a0cf863ac4133417ec72c87e9498485f720159dbbed5af10f1b466feec5ab92b
+AUX hellanzb-0.13-gettinggroup.patch 481 RMD160 715ba7a1bf445611c2ebf92b16076a79b54da8a3 SHA1 804db0486b55bd01ef3138d44338074519e9e04e SHA256 b94e04ea99fa710472b02f8e55a403f42b40552e54e57fb93acf7e4e461f962b
 AUX hellanzb-0.13-strip-extra-space-in-group.patch 532 RMD160 d70f28fd84175564badd49f3801e20a684199b03 SHA1 52f2dd4d6f58078826c844db8c58809868616853 SHA256 93f62c8db513345763bdf42469a006f6bc8245e22130caf61adb955896402256
 AUX hellanzb.conf 700 RMD160 b1a897c502b143a58713d171d98642dab911c91b SHA1 f1de67993fcca92245e04e6892e4bfbed990e9fd SHA256 6bbed7f6aa0bfd42d75b47518569617db27ccc0baacecb17fa9cd6b5f28f8901
 AUX hellanzb.init 790 RMD160 487b3499f3ee9692492550596323cfbef0670a0d SHA1 861068599b7f440e03847f484e2a00499b993574 SHA256 23f4fb0d9c93047aa0e6bcb67e70041f1aa443f51fc4e9291c9dc7b518bca305
 DIST hellanzb-0.13.tar.gz 163698 RMD160 2ec3069cd0c9cb6c9fdaa4a4edc4f311a86d944c SHA1 4ada7268ccb9c8f85d8de8d34fda92c3e2d84b5f SHA256 565b08725eb92ac1e278fa7df2c7b27b21588c4e24c140fddbec4a5625159127
 EBUILD hellanzb-0.13-r5.ebuild 1663 RMD160 a1fff35e571560947b385c5fbf819e05876b2e07 SHA1 6a7d0f9474cc500fc84dfcca050e183b7d6984d1 SHA256 355e8225528d1840dd5207197a2f0c934f3f2df7c14ca60d30eb91c7ac49d65c
 EBUILD hellanzb-0.13-r6.ebuild 1721 RMD160 117bfe079768287c8358a985d5d9080d7f6f0214 SHA1 0b9f64e0e3ea4b0767bb7643de8874c71e2eae5c SHA256 c3ff9e60971d77c6ebc33b821230dd1fe81d3bdb13d5b7f602847e90ad898141
-MISC ChangeLog 2357 RMD160 29bcffc6841e5c9a7064b9c7059d136b6f5969df SHA1 e8258b37997e70bc7ae49c76e24da68e740bb7d5 SHA256 2af599bbe73ddf611e32da1105da464154273907373cc17ec3890ae785024a61
+EBUILD hellanzb-0.13-r7.ebuild 1709 RMD160 53cc82bc52547b4826d45f21027216e6a5813924 SHA1 4ded3f340ecbd38d3e1c879e245fde0abc154163 SHA256 4d2a073e0ae1b9f0f442d9d1fb004d857973a60f51dc549fda41c42d8453cc05
+MISC ChangeLog 2707 RMD160 5bf1eebb7a3d9aa221e4923fcf1fd0315ca0cc66 SHA1 00aaf1b1996224937dcbde4e1d9637a62fa716bf SHA256 7eca14237a73d39f498ac1c7e2de77cd3a6024ecf9a4a2b226d187faa6cd5a6c
 MISC metadata.xml 706 RMD160 7f3ebb6d6e55352055197e008a86428ac1a3d1f7 SHA1 48a67cea318c18afa7fd6b802834719843feceef SHA256 1cec98091461e56458cfafa8a79f05d8bf18da85e6f4355263b25c19f500257b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAki5qokACgkQvFcC4BYPU0qm2QCfVd8guBpQpitIGyOqNWiEW2Vk
+OG0An0LSK3BglD0gWF65VEA7NGcfV4WT
+=1AI5
+-----END PGP SIGNATURE-----
diff --git a/net-nntp/hellanzb/files/hellanzb-0.13-gettinggroup.patch b/net-nntp/hellanzb/files/hellanzb-0.13-gettinggroup.patch
new file mode 100644
index 000000000000..2f7af1ad1a96
--- /dev/null
+++ b/net-nntp/hellanzb/files/hellanzb-0.13-gettinggroup.patch
@@ -0,0 +1,14 @@
+diff -r 92936345c3f5 Hellanzb/NZBLeecher/Protocol.py
+--- a/Hellanzb/NZBLeecher/Protocol.py	Mon Aug 18 10:38:55 2008 +0200
++++ b/Hellanzb/NZBLeecher/Protocol.py	Mon Aug 18 11:34:20 2008 +0200
+@@ -655,7 +655,7 @@
+         reactor.callInThread(decode, segment)
+ 
+     def gotGroup(self, group):
+-        group = group[3]
++        group = self.gettingGroup
+         self.activeGroups.append(group)
+         self.gettingGroup = None
+         debug(str(self) + ' got GROUP: ' + group)
+
+
diff --git a/net-nntp/hellanzb/hellanzb-0.13-r7.ebuild b/net-nntp/hellanzb/hellanzb-0.13-r7.ebuild
new file mode 100644
index 000000000000..92862b80fb5b
--- /dev/null
+++ b/net-nntp/hellanzb/hellanzb-0.13-r7.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/hellanzb/hellanzb-0.13-r7.ebuild,v 1.1 2008/08/30 20:16:02 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="~amd64 ~x86"
+IUSE="libnotify ssl"
+
+RDEPEND=">=dev-python/twisted-2.0
+		dev-python/twisted-web
+		|| ( app-arch/unrar
+			 app-arch/rar )
+		app-arch/par2cmdline
+		ssl? ( dev-python/pyopenssl )
+		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"
+	epatch "${FILESDIR}/${P}-gettinggroup.patch"
+}
+
+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."
+}