Date: Tue, 10 Mar 2015 17:28:25 +0000 (UTC) From: Ruslan Makhmatkhanov <rm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r380945 - in head/net-p2p/deluge: . files Message-ID: <201503101728.t2AHSPtg037741@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rm Date: Tue Mar 10 17:28:24 2015 New Revision: 380945 URL: https://svnweb.freebsd.org/changeset/ports/380945 QAT: https://qat.redports.org/buildarchive/r380945/ Log: net-p2p/deluge: fix blocklist plugin Add upstream patch to fix blocklist plugin with version of Twisted that's now in ports tree. Upstream bug report: http://dev.deluge-torrent.org/ticket/2737 PR: 198332 Reported by: Chris Ross <cross+freebsd@distal.com> Added: head/net-p2p/deluge/files/patch-deluge_httpdownloader.py (contents, props changed) Modified: head/net-p2p/deluge/Makefile Modified: head/net-p2p/deluge/Makefile ============================================================================== --- head/net-p2p/deluge/Makefile Tue Mar 10 17:17:26 2015 (r380944) +++ head/net-p2p/deluge/Makefile Tue Mar 10 17:28:24 2015 (r380945) @@ -2,7 +2,7 @@ PORTNAME= deluge PORTVERSION= 1.3.11 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= net-p2p python MASTER_SITES= http://download.deluge-torrent.org/source/ Added: head/net-p2p/deluge/files/patch-deluge_httpdownloader.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/deluge/files/patch-deluge_httpdownloader.py Tue Mar 10 17:28:24 2015 (r380945) @@ -0,0 +1,44 @@ +This patch is fixing new blocklist plugin incompatibility with newer +versions of Twisted. The fix will be included in deluge 1.3.12. + +References: + * bug-report: http://dev.deluge-torrent.org/ticket/2737 + * commit: http://dev.deluge-torrent.org/changeset/d40dfcd53c243 + +Index: deluge/httpdownloader.py +=================================================================== +--- deluge/httpdownloader.py (revision 8bf18d6694db24e04cb65f20f2e219ec14043f8e) ++++ deluge/httpdownloader.py (revision d40dfcd53c2439de121ddaff476e66194dc2c738) +@@ -147,5 +147,5 @@ + # Only use the basename + filename = os.path.basename(filename) +- ++ + filename = filename.strip() + if filename.startswith(".") or ";" in filename or "|" in filename: +@@ -193,15 +193,20 @@ + headers["accept-encoding"] = "deflate, gzip, x-gzip" + +- # In twisted 13.1.0 the _parse() function was replaced by the _URI class +- if hasattr(client, '_parse'): ++ # In Twisted 13.1.0 _parse() function replaced by _URI class. ++ # In Twisted 15.0.0 _URI class renamed to URI. ++ if hasattr(client, "_parse"): + scheme, host, port, path = client._parse(url) + else: +- from twisted.web.client import _URI +- uri = _URI.fromBytes(url) ++ try: ++ from twisted.web.client import _URI as URI ++ except ImportError: ++ from twisted.web.client import URI ++ ++ uri = URI.fromBytes(url) + scheme = uri.scheme + host = uri.host + port = uri.port + path = uri.path +- ++ + factory = HTTPDownloader(url, filename, callback, headers, force_filename, allow_compression) + if scheme == "https":
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503101728.t2AHSPtg037741>