From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D75A11388C2 for ; Fri, 4 Mar 2016 08:44:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4AF32E07DF; Fri, 4 Mar 2016 08:44:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CDFF8E07DF for ; Fri, 4 Mar 2016 08:44:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2E1B5340A9D for ; Fri, 4 Mar 2016 08:44:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 25AFC1AE8 for ; Fri, 4 Mar 2016 08:44:43 +0000 (UTC) From: "Ian Delaney" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Delaney" Message-ID: <1456757067.c7a49e7c181fd8041bdfa9c62a9971dd3b98392d.idella4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/deluge/files/deluge-1.3.5-rb_libtorrent-disable-python-bindings X-VCS-Directories: net-p2p/deluge/files/ X-VCS-Committer: idella4 X-VCS-Committer-Name: Ian Delaney X-VCS-Revision: c7a49e7c181fd8041bdfa9c62a9971dd3b98392d X-VCS-Branch: master Date: Fri, 4 Mar 2016 08:44:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b9388a0c-8234-40fb-bfa3-23c3b51153d9 X-Archives-Hash: 5e147d8416ab93191244aebe1c441302 commit: c7a49e7c181fd8041bdfa9c62a9971dd3b98392d Author: Paolo Pedroni iol it> AuthorDate: Mon Feb 29 14:44:27 2016 +0000 Commit: Ian Delaney gentoo org> CommitDate: Mon Feb 29 14:44:27 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7a49e7c net-p2p/deluge: remove unused patch This file is no longer needed ...uge-1.3.5-rb_libtorrent-disable-python-bindings | 60 ---------------------- 1 file changed, 60 deletions(-) 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 deleted file mode 100644 index 301019e..0000000 --- a/net-p2p/deluge/files/deluge-1.3.5-rb_libtorrent-disable-python-bindings +++ /dev/null @@ -1,60 +0,0 @@ -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