Fix bug causing all other gtk-gnutella instances to be reported as hostile.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

4 files changed, 120 insertions, 6 deletions

diff --git a/net-p2p/gtk-gnutella/ChangeLog b/net-p2p/gtk-gnutella/ChangeLog
index 18102d5abe0d..65f6183dc407 100644
--- a/net-p2p/gtk-gnutella/ChangeLog
+++ b/net-p2p/gtk-gnutella/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/gtk-gnutella
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/ChangeLog,v 1.149 2013/10/29 22:22:38 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/ChangeLog,v 1.150 2013/12/04 08:07:18 graaff Exp $
+
+*gtk-gnutella-1.0.0-r1 (04 Dec 2013)
+
+  04 Dec 2013; Hans de Graaff <graaff@gentoo.org>
+  +gtk-gnutella-1.0.0-r1.ebuild, +files/gtk-gnutella-1.0.0-gtkg-hostile.patch:
+  Fix bug causing all other gtk-gnutella instances to be reported as hostile.
 
   29 Oct 2013; Tony Vroon <chainsaw@gentoo.org> gtk-gnutella-1.0.0.ebuild:
   Marked stable on AMD64 based on arch testing by Elijah "Armageddon" El
diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index 5de7bcbdfa5e..0723cba4bf18 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -3,16 +3,18 @@ Hash: SHA256
 
 AUX gtk-gnutella-0.96.7-ldflags.patch 379 SHA256 65cd57a59ba8922714a3d8535b15e9e81e60133eb2bd0e4233500774885d53eb SHA512 84101d0acea3eba80bcf5cfc22d0c6399da086de30820bac0596292566b17b052f94d8dd599b4085e34bb5798a8ac2e226737fc03943099cb7195bc84f2b0957 WHIRLPOOL 03c2a42a4b78465c34822d26b9367ec608d0eb0af40d01f107d22d93afff0761aeccb2d1bc3d828e6296e7fc4704e6ea6ab23dc7a0b085f248f47a2ca5cd8ac5
 AUX gtk-gnutella-1.0.0-bdf.patch 3299 SHA256 d70c417075271e7455ff9f632ec027acda2e2c9baaab18d560c2a163a29a4cc7 SHA512 96e017227db560c95a9352439fdc6cb6bd2775cc9f3a437e214323f397aa3c7cd139d308419b1d0e3b975e23dd1872e647f9db6a78e810b57af3401427cd5a3c WHIRLPOOL f8420440776009cbe55a3eb0cc3e5d7c8574fb1c15d13aca522bfbd1db53c2ab6aedfeece4c150cf908ff75e70012ce734530b563d86edfa1fd1b4d935bc3ea6
+AUX gtk-gnutella-1.0.0-gtkg-hostile.patch 658 SHA256 b915d8e8644156fec5668b9787c6929877cd00202057af5f5e341bab4d4fe354 SHA512 cfaef346827f7483cfe5e27a8ddb7441417b177bdf7bfa9eb7d80f4ae6c92d74b71405b7dffbe251754f14f9699104edd277d575c75af658c1de08f78125dc0e WHIRLPOOL 2f5146937fd9dea9385d64146e29972e5da6ee76a70e88881f1e772ef5a8b353e767eb6832c2a3462fbb0c989cec1b3a578305db72492901942353034f159668
 DIST gtk-gnutella-0.98.4.tar.bz2 19078172 SHA256 c4cac5707ece44a92e4b0387e309ca334be348a81e44c2db7f4c9946a8a58fb5 SHA512 97fcb0aebf09be1c9904da68e4983dacbd4ffcb107a4c2740148b57377f47f7f80e2d878a1b5170c87c78bf84daa4df13abe1da8febd9eaedbfcb504ec4087aa WHIRLPOOL 77673826f3aaa2f2f8b64be2feb345e58dc02e2e54463642f0437e55bd70fb74e7024e3cfc36cbefa89abe4d8f0c43a92c3a20ee99aba2029997c01813fde21b
 DIST gtk-gnutella-1.0.0.tar.bz2 18988804 SHA256 0c02add9819f8e47655083fddbecdaffb18d129e773c9e28eeeba7840789d986 SHA512 dda7687839bf2187129b3b16c82cea03f1124c2e2a355826edffaec90c72ff080ac7becaf1d0994f14e3ad717c55d2d84af33010d34d1487670ce6ceb5acdf41 WHIRLPOOL 1ec3dc330ff1a1b39635ba1d9336feef2415d1ad3a6ee9b00b92a6d4483d745af348e6d146f9907d7fe9b205d8dfd82c723fcb70f84aedbca5fa92c98908bea0
 EBUILD gtk-gnutella-0.98.4.ebuild 1870 SHA256 5fea256ed34b47f597a1ad3ff041163ef818f44e9375f0b0b039308524e4011e SHA512 88f928d435261fa33a9bb2179e01a2aed7a1cdc81895a2c9b21cf39eaeaf30165a585a5bc0e14647c49878d011a7533d3d992feb7df779c11965a83775c0ed75 WHIRLPOOL 6532ec9b6a280bc35209e97daa2d16f2141233fd47e790c905bfb9a65d86be18707c87be0e058ca37be403986eff99896e89943f07b795222574c94ed08414b4
+EBUILD gtk-gnutella-1.0.0-r1.ebuild 2048 SHA256 c9b474fb71e2981078a3160922486810be2577f73ba47435abe63e859dcf25e7 SHA512 93ac0c5f6d0181e07675d587d55dde38657f0608aecc140ba44b8cbfe66f05c9278678b03e78ff9904395e2ce55c6f44b6c0171b9a90db1893063e1701b3e8a9 WHIRLPOOL 074a8a3c86b9e6879fcfcff1db61fde80ee03f5a3ebabddd3e3f6541126447f6e7e1dc0a6b992c881645dd2616bd457cb00cf6fe6f8252506b60a7eb242b0311
 EBUILD gtk-gnutella-1.0.0.ebuild 2000 SHA256 4efa6c48aa9f75e537a4af4fa261bd402fdba63dba19e9b1cdaad99f54773a58 SHA512 bc4a09f03284bf6414702a85868d243b83e90b5ea6bcc56d2f8ba3a878b78f5ae5ce3815bc8b37dd2f1c259424b1e01ca412e42248b4f66e13f5d246f784a297 WHIRLPOOL eeed8a707070dbb6b715ed3c0daecba965acb8e70542846accef333da98c736e306a67e2efcca683063667ada3a010c131137bf3a0d4d50170d5309b96f91ebb
-MISC ChangeLog 22191 SHA256 36c1af270ad065840a78d414a692ce6118528294ce22feb88ec72182923745df SHA512 addd0960044903a4464a6082bbdf0400ef9d8a3246a2aca76e72c12ba2f50b511468e2c1ca78e5905d3689214040ae7cd81ff9fb629075308af0a60b2732d05e WHIRLPOOL 6575fba9a92ad51274699b9a1657d55ef08e8eeddeb6001e4418467c551b739ec50e72d686ab985198d1d33d1dd7e89c6c205e9e44b877bc3653558885a4f319
+MISC ChangeLog 22435 SHA256 3bbace299e3fac193df625ea4623ee844024ab8ef96b7dc0ddab9ee392806a6e SHA512 85a6f2dce85f18d119cfcf88ca313ec2f9d0f20054f10eafd065afa050de319d6f019707658734790c4b88e88d1b56595f05120555a51c4315e8b27a059019f9 WHIRLPOOL 8edf8b962d60a67fa154f51d8e15e7c9a70659153b806ac6e8990646a4a537f2f3069a7df7d9f117c07deb8c889895a8273a38ba5fa9ab608e3a352c2404ed34
 MISC metadata.xml 220 SHA256 d58e366dd43b562958c2857ad163829d8bc5061a7b855715ba07fa0edb1cd201 SHA512 aeb560115bbb1de6094c8637a6f6b6196a5a83d63670935236820580c6b36b5f41c7ac104ea8716bd25bc5daabfff6229e4117d280812fb63746aa371f30741d WHIRLPOOL 8510e0e6893b57af04c14659cb75799aa7452e06c10f64ac1b3c3ed55c23e8365b829872e9c60a230de64af728e4d11dfcedeaf325c05353e8f081c37d6ae728
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJwNmIACgkQp5vW4rUFj5rcrwCgmlV6emUEz3Yb1GtHBb8mRckU
-DA8AnRwY/zejqVwQY6c3NjOAgT5WnzB1
-=nOHD
+iF4EAREIAAYFAlKe4rgACgkQiIP6VqMIqNdfDwD/TrRIDaFRPmX5/N3Js5mABybE
+czBFrrrrXoDmiCZgwmAA/0Ou2OH0QLtJLGQPJT9+afibYpfGN0Kg1oj04njCF6WH
+=EzJD
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/gtk-gnutella/files/gtk-gnutella-1.0.0-gtkg-hostile.patch b/net-p2p/gtk-gnutella/files/gtk-gnutella-1.0.0-gtkg-hostile.patch
new file mode 100644
index 000000000000..b5ed4bee412b
--- /dev/null
+++ b/net-p2p/gtk-gnutella/files/gtk-gnutella-1.0.0-gtkg-hostile.patch
@@ -0,0 +1,20 @@
+commit e4dc3902f6c451448bbeb5c1908df617bd44e244
+Author: Raphael Manfredi <Raphael.Manfredi@pobox.com>
+Date:   Tue Dec 3 23:41:31 2013 +0100
+
+    guid_extract_gtkg_info(): fixed grave bug, making all GTKGs appear hostile.
+
+diff --git a/src/core/guid.c b/src/core/guid.c
+index c6f1651..fb4c838 100644
+--- a/src/core/guid.c
++++ b/src/core/guid.c
+@@ -345,7 +345,8 @@ guid_extract_gtkg_info(const struct guid *guid, size_t start,
+ 	product_major = product_get_major();
+ 
+ 	if (major != product_major) {
+-		if (major + 1 != product_major || major - 1 != product_major)
++		int8 delta = product_major - major;
++		if (delta < -1 || delta > 1)
+ 			return FALSE;
+ 	}
+ 
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.0.0-r1.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..d9f7111ac394
--- /dev/null
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.0.0-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-1.0.0-r1.ebuild,v 1.1 2013/12/04 08:07:18 graaff Exp $
+
+EAPI=5
+
+inherit eutils
+
+IUSE="nls dbus ssl +gtk"
+
+DESCRIPTION="A GTK+ Gnutella client"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+RDEPEND="
+	dev-libs/glib:2
+	sys-libs/zlib
+	gtk? ( >=x11-libs/gtk+-2.2.1:2 )
+	dbus? ( >=sys-apps/dbus-0.35.2 )
+	ssl? ( >=net-libs/gnutls-2.2.5 )
+	nls? ( >=sys-devel/gettext-0.11.5 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	strip-linguas -i po
+
+	echo "# Gentoo-selected LINGUAS" > po/LINGUAS
+	for ling in ${LINGUAS}; do
+		echo $ling >> po/LINGUAS
+	done
+
+	# Already fixed upstream but not released yet. Included as requested
+	# by upstream.
+	epatch "${FILESDIR}/${P}-bdf.patch"
+	epatch "${FILESDIR}/${P}-gtkg-hostile.patch"
+}
+
+src_configure() {
+	# There is no option to turn off optimization through the build.sh
+	# script.
+	sed -i -e "s/Configure -Oder/Configure -Oder -Doptimize=none/" build.sh || die
+
+	# The build script does not support the equivalent --enable
+	# options so we must construct the configuration by hand.
+
+	local myconf
+
+	if ! use nls; then
+		myconf="${myconf} --disable-nls"
+	fi
+
+	if ! use dbus; then
+		myconf="${myconf} --disable-dbus"
+	fi
+
+	if ! use ssl; then
+		myconf="${myconf} --disable-gnutls"
+	fi
+
+	if use gtk; then
+		myconf="${myconf} --gtk2"
+	else
+		myconf="${myconf} --topless"
+	fi
+
+	./build.sh \
+		--configure-only \
+		--prefix="/usr" \
+		--cc=$(tc-getCC) \
+		${myconf}
+}
+
+src_install() {
+	dodir /usr/bin
+	emake INSTALL_PREFIX="${D}" install || die "Install failed"
+	dodoc AUTHORS ChangeLog README TODO
+
+	# Touch the symbols file into the future to avoid warnings from
+	# gtk-gnutella later on, since we will most likely strip the binary.
+	touch --date="next minute" "${D}/usr/lib/gtk-gnutella/gtk-gnutella.nm" || die
+}