diff options
Diffstat (limited to 'net-p2p/deluge/files')
-rw-r--r-- | net-p2p/deluge/files/deluge-2.0.3-fix-pickle.patch | 143 | ||||
-rw-r--r-- | net-p2p/deluge/files/deluge-2.0.3-gettext.patch | 11 | ||||
-rw-r--r-- | net-p2p/deluge/files/deluge-2.0.3-log.patch | 13 | ||||
-rw-r--r-- | net-p2p/deluge/files/deluge-web.init | 53 |
4 files changed, 0 insertions, 220 deletions
diff --git a/net-p2p/deluge/files/deluge-2.0.3-fix-pickle.patch b/net-p2p/deluge/files/deluge-2.0.3-fix-pickle.patch deleted file mode 100644 index 446ae2e9a0e1..000000000000 --- a/net-p2p/deluge/files/deluge-2.0.3-fix-pickle.patch +++ /dev/null @@ -1,143 +0,0 @@ -https://dev.deluge-torrent.org/changeset/23b3f144fce3424ae
-
-Index: deluge/core/torrentmanager.py
-===================================================================
---- deluge-2.0.3/deluge/core/torrentmanager.py (revision 8b62e50eb8bf81a177c4d62484a44b766c6f54a6)
-+++ deluge-2.0.3/deluge/core/torrentmanager.py (revision 23b3f144fce3424ae874d54a659cb7b8dd624ade)
-@@ -26,5 +26,5 @@
- import deluge.component as component
- from deluge._libtorrent import lt
--from deluge.common import archive_files, decode_bytes, get_magnet_info, is_magnet
-+from deluge.common import PY2, archive_files, decode_bytes, get_magnet_info, is_magnet
- from deluge.configmanager import ConfigManager, get_config_dir
- from deluge.core.authmanager import AUTH_LEVEL_ADMIN
-@@ -810,5 +810,8 @@
- try:
- with open(filepath, 'rb') as _file:
-- state = pickle.load(_file)
-+ if PY2:
-+ state = pickle.load(_file)
-+ else:
-+ state = pickle.load(_file, encoding='utf8')
- except (IOError, EOFError, pickle.UnpicklingError) as ex:
- message = 'Unable to load {}: {}'.format(filepath, ex)
-Index: deluge/tests/data/utf8_filename_torrents.state
-===================================================================
---- deluge-2.0.3/deluge/tests/data/utf8_filename_torrents.state (revision 23b3f144fce3424ae874d54a659cb7b8dd624ade)
-+++ deluge-2.0.3/deluge/tests/data/utf8_filename_torrents.state (revision 23b3f144fce3424ae874d54a659cb7b8dd624ade)
-@@ -0,0 +1,85 @@
-+(ideluge.core.torrentmanager
-+TorrentManagerState
-+p1
-+(dp2
-+S'torrents'
-+p3
-+(lp4
-+(ideluge.core.torrentmanager
-+TorrentState
-+p5
-+(dp6
-+S'max_download_speed'
-+p7
-+I-1
-+sS'move_completed_path'
-+p8
-+S'/home/calum/Downloads'
-+p9
-+sS'paused'
-+p10
-+I00
-+sS'max_upload_slots'
-+p11
-+I-1
-+sS'prioritize_first_last'
-+p12
-+I00
-+sS'max_connections'
-+p13
-+I-1
-+sS'compact'
-+p14
-+I00
-+sS'queue'
-+p15
-+I0
-+sS'file_priorities'
-+p16
-+(lp17
-+I4
-+asS'filename'
-+p18
-+S'\xc2\xa2.torrent'
-+p19
-+sS'max_upload_speed'
-+p20
-+I-1
-+sS'save_path'
-+p21
-+S'/home/calum/Downloads'
-+p22
-+sS'time_added'
-+p23
-+F1573563097.749759
-+sS'total_uploaded'
-+p24
-+I0
-+sS'torrent_id'
-+p25
-+S'80d81d55ef3b85f3c1b634c362e014b35594dc71'
-+p26
-+sS'auto_managed'
-+p27
-+I01
-+sS'stop_at_ratio'
-+p28
-+I00
-+sS'move_completed'
-+p29
-+I00
-+sS'trackers'
-+p30
-+(lp31
-+sS'magnet'
-+p32
-+NsS'remove_at_ratio'
-+p33
-+I00
-+sS'stop_ratio'
-+p34
-+F2
-+sS'is_finished'
-+p35
-+I00
-+sbasb.
-Index: deluge/tests/test_torrentmanager.py
-===================================================================
---- deluge-2.0.3/deluge/tests/test_torrentmanager.py (revision c6b6902e9f3e37f5b15184eb509b48b43817a331)
-+++ deluge-2.0.3/deluge/tests/test_torrentmanager.py (revision 23b3f144fce3424ae874d54a659cb7b8dd624ade)
-@@ -8,4 +8,6 @@
- from __future__ import unicode_literals
-
-+import os
-+import shutil
- import warnings
- from base64 import b64encode
-@@ -29,5 +31,5 @@
- class TorrentmanagerTestCase(BaseTestCase):
- def set_up(self):
-- common.set_tmp_config_dir()
-+ self.config_dir = common.set_tmp_config_dir()
- self.rpcserver = RPCServer(listen=False)
- self.core = Core()
-@@ -119,2 +121,11 @@
- InvalidTorrentError, self.tm.remove, 'torrentidthatdoesntexist'
- )
-+
-+ def test_open_state_from_python2(self):
-+ """Open a Python2 state with a UTF-8 encoded torrent filename."""
-+ shutil.copy(
-+ common.get_test_data_file('utf8_filename_torrents.state'),
-+ os.path.join(self.config_dir, 'state', 'torrents.state'),
-+ )
-+ state = self.tm.open_state()
-+ self.assertEqual(len(state.torrents), 1)
diff --git a/net-p2p/deluge/files/deluge-2.0.3-gettext.patch b/net-p2p/deluge/files/deluge-2.0.3-gettext.patch deleted file mode 100644 index 41cf743749c6..000000000000 --- a/net-p2p/deluge/files/deluge-2.0.3-gettext.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/deluge/i18n/util.py -+++ b/deluge/i18n/util.py -@@ -114,7 +114,7 @@ - # Workaround for Python 2 unicode gettext (keyword removed in Py3). - kwargs = {} if not deluge.common.PY2 else {'unicode': True} - -- gettext.install(I18N_DOMAIN, translations_path, names='ngettext', **kwargs) -+ gettext.install(I18N_DOMAIN, translations_path, names=['ngettext'], **kwargs) - builtins.__dict__['_n'] = builtins.__dict__['ngettext'] - - libintl = None diff --git a/net-p2p/deluge/files/deluge-2.0.3-log.patch b/net-p2p/deluge/files/deluge-2.0.3-log.patch deleted file mode 100644 index 45dd9896a915..000000000000 --- a/net-p2p/deluge/files/deluge-2.0.3-log.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://dev.deluge-torrent.org/changeset/351664ec071daa04 -https://dev.deluge-torrent.org/ticket/3327 -Index: deluge/log.py -=================================================================== ---- a/deluge/log.py -+++ b/deluge/log.py -@@ -87,5 +87,5 @@ - yield LoggingLoggerClass.exception(self, msg, *args, **kwargs) - -- def findCaller(self, stack_info=False): # NOQA: N802 -+ def findCaller(self, *args, **kwargs): # NOQA: N802 - f = logging.currentframe().f_back - rv = '(unknown file)', 0, '(unknown function)' diff --git a/net-p2p/deluge/files/deluge-web.init b/net-p2p/deluge/files/deluge-web.init deleted file mode 100644 index 1e0b4833f072..000000000000 --- a/net-p2p/deluge/files/deluge-web.init +++ /dev/null @@ -1,53 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later - -depend() { - need net -} - -checkconfig() { - if [ "${DELUGE_WEB_USER}" = "" ] ; then - eerror "Please edit /etc/conf.d/deluge-web" - eerror "You have to specify a user to run deluge-web as, as we will not run it as root!" - eerror "Modify DELUGE_WEB_USER to your needs (you can also add a group, after a colon)" - return 1 - fi - if ! getent passwd "${DELUGE_WEB_USER%:*}" >/dev/null ; then - eerror "Please edit /etc/conf.d/deluge-web" - eerror "Your user has to exist!" - return 1 - fi - if [ "${DELUGE_WEB_USER%:*}" = "${DELUGE_WEB_USER}" ] ; then - return 0 - else - if ! getent group "${DELUGE_WEB_USER#*:}" >/dev/null ; then - eerror "Please edit /etc/conf.d/deluge-web" - eerror "Your group has to exist too!" - return 1 - fi - fi - return 0 -} - -start() { - checkconfig || return $? - if [ "${DELUGE_WEB_HOME}" = "" ] ; then - DELUGE_WEB_USER_HOME=$(getent passwd "${DELUGE_WEB_USER%:*}" | cut -d ':' -f 6) - else - DELUGE_WEB_USER_HOME=${DELUGE_WEB_HOME} - fi - ebegin "Starting Deluge-Web" - start-stop-daemon --start --background --pidfile \ - /run/deluge-web.pid --make-pidfile \ - --exec /usr/bin/deluge-web --user "${DELUGE_WEB_USER%:*}" \ - -e HOME="${DELUGE_WEB_USER_HOME}" -- ${DELUGE_WEB_OPTS} - eend $? -} - -stop() { - ebegin "Stopping Deluge-Web" - start-stop-daemon --stop --user "${DELUGE_WEB_USER%:*}" \ - --pidfile /run/deluge-web.pid - eend $? -} |