From 0b55df2ac16ee339b14c4de780c83dd10c42fa36 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Mon, 17 Dec 2012 20:40:23 +0000 Subject: Revbump to fix downloads with recent rb_libtorrent. Bug #437356 Package-Manager: portage-2.1.11.37/cvs/Linux x86_64 Manifest-Sign-Key: 0xB4AFF2C2 --- net-p2p/deluge/ChangeLog | 8 ++- net-p2p/deluge/Manifest | 24 +++++++- net-p2p/deluge/deluge-1.3.5-r1.ebuild | 72 ++++++++++++++++++++++ ...uge-1.3.5-rb_libtorrent-disable-python-bindings | 60 ++++++++++++++++++ 4 files changed, 162 insertions(+), 2 deletions(-) create mode 100644 net-p2p/deluge/deluge-1.3.5-r1.ebuild create mode 100644 net-p2p/deluge/files/deluge-1.3.5-rb_libtorrent-disable-python-bindings (limited to 'net-p2p') diff --git a/net-p2p/deluge/ChangeLog b/net-p2p/deluge/ChangeLog index 28040ae745c7..4ac9a80a384e 100644 --- a/net-p2p/deluge/ChangeLog +++ b/net-p2p/deluge/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-p2p/deluge # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.177 2012/12/12 18:23:20 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.178 2012/12/17 20:40:22 hwoarang Exp $ + +*deluge-1.3.5-r1 (17 Dec 2012) + + 17 Dec 2012; Markos Chandras +deluge-1.3.5-r1.ebuild, + +files/deluge-1.3.5-rb_libtorrent-disable-python-bindings: + Revbump to fix downloads with recent rb_libtorrent. Bug #437356 12 Dec 2012; Agostino Sarubbo deluge-1.3.5.ebuild: Add ~ppc, wrt bug #413125 diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest index e5b105918fe5..56c6bc62dc27 100644 --- a/net-p2p/deluge/Manifest +++ b/net-p2p/deluge/Manifest @@ -1,9 +1,31 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX deluge-1.3.5-rb_libtorrent-disable-python-bindings 2883 SHA256 4764bd3d7fbabeb68fd3776c5dfde0eabaad3cdd71eef97fdd5daaae4d4a4587 SHA512 72d1dba662b24aef3e5ddd9ed9a2a672075d8c858c53230f1cb011e6ad23d9711f71d848173133fa215105450b30db17a7dce7d2ef4631f2add4079d1b38a380 WHIRLPOOL da9733d77adb067981b0f0a7dfd43fd5d1c01027e7a881bf7956f144f2975fcc1572ab8bae7a9e63d2225fc0a40ee1b55d0b20d45f101f4ddc0d7f41e2fb63e1 AUX deluged.conf 184 SHA256 9f686931e7f5c337d4866d91ae725b0a983ee2a409eee69a197e7db8e4bc2b3d SHA512 506501b5792413c23fa059fde3d650a2faa3a0f6e961047d92769822961d5a6562d729bfd937bea98d878f1359c56e6746441446532c2ff2ea61f0b813328b12 WHIRLPOOL 5530d891fc3db9b58ab501242d9d3f948ec3ec02a8dd5a752eddaa4a009462f012578671582583f32e86a5b158714ec95157b8b3df6b62e2f443025455f8247c AUX deluged.init 2053 SHA256 04cacfadc79e738d8cccc4de6ffe735697c01e17c0e96d9604b7018e68c8a9a3 SHA512 6af52ea49039d778c7deb15673b575bebd150da2f37e550da383d5b975d8fd00e19abe79ef6b54b3e031e492e5f8ff08d9aa2214b7c8297e68f97fd40a53dc2f WHIRLPOOL 04d4cd2ce65cb4373d0f84233703008eb7749ae74286a4b1ce6bb81e1891e2bea73edaf948845ff9c6343500e8102fb566d5d76fb478fa4f13b5a4f96a2ee0ea DIST deluge-1.3.3.tar.lzma 2094978 SHA256 c40e0f5757bc3912e9628e1a68dfa41cd487beca370c315f5d31261b931cea05 DIST deluge-1.3.5.tar.lzma 2100244 SHA256 cdb97fd64cc2131da812fad026f49e82f82b6a214e592222145ddcfb19174247 SHA512 755b5cd72dcdff0cb54d1fac5ad539f42db78a4ea8a71e13d5d493810c2d1b69865bd0026ddc14ea8fc51eb454398248524ad91bbbc8303792dd8a0513900d45 WHIRLPOOL 7f19c6ee4785b48d8c20b00ee67dfeccf1355c0ae36faf953f411bd3e977d11b7fb4fac1456cf91e0ff117021b25e6673432afd03cc1270178486867c5b89c88 EBUILD deluge-1.3.3.ebuild 1807 SHA256 0f716d0c09b1170a1e9387488d8e23b3758167a500feb3137e0d56bddb5cd101 SHA512 1f47c616b69391ec20bbb2472884a661c7bb6eaed1f597577cad2371ea159318685736f3ed68355d95b33db8196a2569e48ab5218abd906827e1d6537a9e0ca7 WHIRLPOOL 41f4df321e444007646614c77215ea41303c90271742cf332cabbed8bfc017234c29c99e84b9f36f0cb90fddbeee9f6f9465cdb04fe5c67f64ed259e69e1c2e1 +EBUILD deluge-1.3.5-r1.ebuild 1972 SHA256 4b870c87f24d3c7a036a20e88c3208389a17b832bc7d553880b1bf22e31a91d8 SHA512 545b92a7a03c6d8b2efc91ff4556d880a5b18bd1923f4ab1063d85d01a2aa109e679e0170769113c4c3df011f2f555328b286c30c0e199f6420b667859d06c63 WHIRLPOOL 2b1b7fea43e66d10a6aa45b23aaa32c6cd992fbe3bfab0b235723a732408d74a8722b273e4f681a0ffd8cb2c5d8d9083347ee50c035ed797d031e87c6e4fb1e7 EBUILD deluge-1.3.5.ebuild 1890 SHA256 593ccd278bdfff2dbe6d2de2b284ad69835773209ec5b6730b6b8bb35441109e SHA512 c9706e7bf96b037a22496e04017a690dde649b8f7d64d09eb89a5d940d62d195004f974ab4b08ba59c3d3e62573ae5864f8e2b7fd0617c8f1091f61366f268da WHIRLPOOL 110f37556f6c716d8c6ad138c518a91fb71368654865d07428ef02cb261b1a199e77619aae2300fec81b8076f3874431356194b10851408d3313ab3528f226a2 EBUILD deluge-9999.ebuild 1890 SHA256 470197e36e6f5f423231195706f1e96f5c18bfcd3d9c57f01aaf7b45b201a63f SHA512 6f14cfb83f936f9e7ac74e063df6355db3ba8dcffcfa2e819ca1cf10717d80bd35a5c1f43741de6347b553e841bcb86016bc8377c44b7dccaaa7ba62ff29dc05 WHIRLPOOL a0494db1a5a03c311c8007e1ce6d58d8a547c5801deeb7108ade04c78b77494dbd3e74b9f2739e0c8c79011e1fad28897f06f589a9071ca4a4ac271bbb1404ac -MISC ChangeLog 24534 SHA256 16b4e83aca20302cf5114f4eb104658b10044a816418c1d95a5f9b6048d01ee1 SHA512 16b974930f0dfba8739eb2ebe447a4e41b76489efd616d72706dc0e065b76d3037bc415959b2a6ff6b99c95eeb9cd2fd5e92547a2a60e2c5b7c69ec785497c08 WHIRLPOOL f012c71b681df0b9d0ccc24bbb5150a832d72060acfb00f4fd13f09b5f07fa7b80e9ab98526d2aed4a83fa9d4079110e1cd0070ad85ebb353b4453c242e838f5 +MISC ChangeLog 24777 SHA256 5a163ff9d56605407355600e19523c73640a7078dba0a258e4490f5cd19d3b18 SHA512 e4ace929dd00db6867a1e0ac6861bafa27a6f052b93f10ef5c79bde6945bbb5e3ad81df2cc158983d64748947f420ee28bd708ff45059856f43f6196754f94e5 WHIRLPOOL a18a5c2eedbd3a17643ac26e3e525235f95939d4fa59c2a214847dcbe70c24470e61028e08f107d4e80788e2e18e116d8f845d906759f60f0d0c0b85d65528b9 MISC metadata.xml 356 SHA256 659ce61ec4c1475764f4d7a515780577bcdfc81e814291fa429ed77fcb6c4bdb SHA512 c4aac10613fd08fb8e65b7f1e4141c569981d77629608a70309fbe0d5eade6c117d1a5883bf1baa37e6ced100fba807798594551219cfbb89a748dfdf730914d WHIRLPOOL 95f609ffb59d9e893047c83d51459e1f5b4197dbf1bf9f0cf85ef47f7903217f56fa3d479b5c2134469bd359c703b20c2dd77263e0f51811a41a46694b681582 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQIcBAEBCAAGBQJQz4MxAAoJEPqDWhW0r/LCvtYQAMLjRgqMeHyltARgGNrCQnTr +F6RaRVJEISMaAMudCFVIWKBdXQ2vyso7vCmEc6crO/u3siQWSMMmhUb6RstyYd6h +rkFhBE1fURj8xbCNsptjLaB5Oj+fxRfgEzRbj7Tgx7mbdLLDGscoxD4fz3ri6Wjm +RpDpPY4c6z6KTJd3s37dEBa07g9lp3tOYD7nX3jDDdL/+D9HXYXaoZgQxIwqXecl +AwqahfcUdR5iEBK+MUpPj6scaSIz47/HVG9VXHrfvTzPpeJp9enwEifhzHqBoJGw +CCnjnm6sI2OX+Us6BMmxH29jAi3mNFWcunoGX1M++DgUkoXjJwEXWqUUD3JbhwrA +IxCXTvpaN5R/+Z41z9L4E1gf+gSstWu3pYgt5hCbzSYreatWji5AaVdCZntNXQEh +11Y40OG0YX5OA8Rc/S7emRHx+8s98DLTz1KhQHQj2TT5cKqnnuSAvrrhy113AyTe +PD68lV9KH2YyOHTGLWiKvtcV4zHyCspGWrxdnfUT95IXslgmnfZa+Y2aCLk0mHQq +AuRjgEBrVzbOGGj9DIiRfPU5a/kLqOvcAojou3mMurGtA0l9hOttfN3TUDJeRi5f +fQrcTN7ZeP09VbwSvvUP3RCnuG+XSRNYPJp8MN93CKGAgNFNTcV+fXVWevH9750M +2IMDK6Eyj/izHduz72PQ +=6sHc +-----END PGP SIGNATURE----- diff --git a/net-p2p/deluge/deluge-1.3.5-r1.ebuild b/net-p2p/deluge/deluge-1.3.5-r1.ebuild new file mode 100644 index 000000000000..7a7ba7d88ee9 --- /dev/null +++ b/net-p2p/deluge/deluge-1.3.5-r1.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.3.5-r1.ebuild,v 1.1 2012/12/17 20:40:22 hwoarang Exp $ + +EAPI="3" +PYTHON_DEPEND="2:2.5" + +inherit distutils eutils flag-o-matic + +DESCRIPTION="BitTorrent client with a client/server model." +HOMEPAGE="http://deluge-torrent.org/" +SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.lzma" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86" +IUSE="geoip gtk libnotify setproctitle webinterface" + +DEPEND=">=net-libs/rb_libtorrent-0.14.9[python] + dev-python/setuptools + dev-util/intltool" +RDEPEND="${DEPEND} + dev-python/chardet + dev-python/pyopenssl + dev-python/pyxdg + || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson ) + >=dev-python/twisted-8.1 + >=dev-python/twisted-web-8.1 + geoip? ( dev-libs/geoip ) + gtk? ( + dev-python/pygame + dev-python/pygobject:2 + >=dev-python/pygtk-2.12 + gnome-base/librsvg + libnotify? ( dev-python/notify-python ) + ) + setproctitle? ( dev-python/setproctitle ) + webinterface? ( dev-python/mako )" + +pkg_setup() { + append-ldflags $(no-as-needed) + python_set_active_version 2 + python_pkg_setup +} + +src_prepare() { + distutils_src_prepare + python_convert_shebangs -r 2 . + epatch "${FILESDIR}/${P}-rb_libtorrent-disable-python-bindings" +} + +src_install() { + distutils_src_install + newinitd "${FILESDIR}"/deluged.init deluged + newconfd "${FILESDIR}"/deluged.conf deluged +} + +pkg_postinst() { + distutils_pkg_postinst + elog + elog "If after upgrading it doesn't work, please remove the" + elog "'~/.config/deluge' directory and try again, but make a backup" + elog "first!" + elog + elog "To start the daemon either run 'deluged' as user" + elog "or modify /etc/conf.d/deluged and run" + elog "/etc/init.d/deluged start as root" + elog "You can still use deluge the old way" + elog + elog "For more information look at http://dev.deluge-torrent.org/wiki/Faq" + elog +} diff --git a/net-p2p/deluge/files/deluge-1.3.5-rb_libtorrent-disable-python-bindings b/net-p2p/deluge/files/deluge-1.3.5-rb_libtorrent-disable-python-bindings new file mode 100644 index 000000000000..301019e04aed --- /dev/null +++ b/net-p2p/deluge/files/deluge-1.3.5-rb_libtorrent-disable-python-bindings @@ -0,0 +1,60 @@ +https://bugs.gentoo.org/show_bug.cgi?id=437356 + +From 37ea2854a21e50debdf7bc953a3411e5934b74d9 Mon Sep 17 00:00:00 2001 +From: Calum Lind +Date: Thu, 27 Sep 2012 16:53:22 +0000 +Subject: Fix 2160 : Disable use of python bindings for libtorrent extensions and replace with session flag + +The fixes a GIL issue causing libtorrent segfault. https://code.google.com/p/libtorrent/issues/detail?id=369 + +Note: The ut_pex plugin (Peer Exchange) will now always be enabled. +--- +diff --git a/deluge/core/core.py b/deluge/core/core.py +index 4bda811..4ca3d96 100644 +--- a/deluge/core/core.py ++++ b/deluge/core/core.py +@@ -84,7 +84,10 @@ class Core(component.Component): + while len(version) < 4: + version.append(0) + +- self.session = lt.session(lt.fingerprint("DE", *version), flags=0) ++ # Note: All libtorrent python bindings to set plugins/extensions need to be disabled ++ # due to GIL issue. https://code.google.com/p/libtorrent/issues/detail?id=369 ++ # Setting session flags to 1 enables all libtorrent default plugins ++ self.session = lt.session(lt.fingerprint("DE", *version), flags=1) + + # Load the session state if available + self.__load_session_state() +@@ -103,9 +106,11 @@ class Core(component.Component): + self.session.set_settings(self.settings) + + # Load metadata extension +- self.session.add_extension(lt.create_metadata_plugin) +- self.session.add_extension(lt.create_ut_metadata_plugin) +- self.session.add_extension(lt.create_smart_ban_plugin) ++ # Note: All libtorrent python bindings to set plugins/extensions need to be disabled ++ # due to GIL issue. https://code.google.com/p/libtorrent/issues/detail?id=369 ++ # self.session.add_extension(lt.create_metadata_plugin) ++ # self.session.add_extension(lt.create_ut_metadata_plugin) ++ # self.session.add_extension(lt.create_smart_ban_plugin) + + # Create the components + self.eventmanager = EventManager() +diff --git a/deluge/core/preferencesmanager.py b/deluge/core/preferencesmanager.py +index 40070bb..2a5cb1b 100644 +--- a/deluge/core/preferencesmanager.py ++++ b/deluge/core/preferencesmanager.py +@@ -338,7 +338,10 @@ class PreferencesManager(component.Component): + def _on_set_utpex(self, key, value): + log.debug("utpex value set to %s", value) + if value: +- self.session.add_extension(lt.create_ut_pex_plugin) ++ # Note: All libtorrent python bindings to set plugins/extensions need to be disabled ++ # due to GIL issue. https://code.google.com/p/libtorrent/issues/detail?id=369 ++ #self.session.add_extension(lt.create_ut_pex_plugin) ++ pass + + def _on_set_encryption(self, key, value): + log.debug("encryption value %s set to %s..", key, value) +-- +cgit v0.9.0.2 -- cgit v1.2.3-65-gdbad