From owner-svn-ports-head@freebsd.org Thu Dec 29 16:18:49 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DEB23C96D89; Thu, 29 Dec 2016 16:18:49 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9F9BC1B6C; Thu, 29 Dec 2016 16:18:49 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBTGImle083870; Thu, 29 Dec 2016 16:18:48 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBTGImQ8083866; Thu, 29 Dec 2016 16:18:48 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201612291618.uBTGImQ8083866@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 29 Dec 2016 16:18:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429927 - in head/net-p2p/qbittorrent: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Dec 2016 16:18:50 -0000 Author: amdmi3 Date: Thu Dec 29 16:18:48 2016 New Revision: 429927 URL: https://svnweb.freebsd.org/changeset/ports/429927 Log: - Update to 3.3.10 PR: 215575 Submitted by: matthew@reztek.cz Approved by: yuri@rawbw.com (maintainer) Added: head/net-p2p/qbittorrent/files/patch-src_base_bittorrent_session.cpp (contents, props changed) Modified: head/net-p2p/qbittorrent/Makefile head/net-p2p/qbittorrent/distinfo head/net-p2p/qbittorrent/files/patch-src_base_utils_string.cpp Modified: head/net-p2p/qbittorrent/Makefile ============================================================================== --- head/net-p2p/qbittorrent/Makefile Thu Dec 29 15:49:56 2016 (r429926) +++ head/net-p2p/qbittorrent/Makefile Thu Dec 29 16:18:48 2016 (r429927) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= qbittorrent -PORTVERSION= 3.3.7 -PORTREVISION= 1 +PORTVERSION= 3.3.10 CATEGORIES= net-p2p ipv6 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} Modified: head/net-p2p/qbittorrent/distinfo ============================================================================== --- head/net-p2p/qbittorrent/distinfo Thu Dec 29 15:49:56 2016 (r429926) +++ head/net-p2p/qbittorrent/distinfo Thu Dec 29 16:18:48 2016 (r429927) @@ -1,3 +1,3 @@ -TIMESTAMP = 1473733537 -SHA256 (qbittorrent-3.3.7.tar.xz) = 72dc824a90fadc0825e6be6f1c215e38f976262c7f83b625061d542b2b664c40 -SIZE (qbittorrent-3.3.7.tar.xz) = 2884792 +TIMESTAMP = 1482707995 +SHA256 (qbittorrent-3.3.10.tar.xz) = 2c657ceacdc84033da044a0a9ecba7e0fdb35858324dc097546f989166f1a8d2 +SIZE (qbittorrent-3.3.10.tar.xz) = 2959380 Added: head/net-p2p/qbittorrent/files/patch-src_base_bittorrent_session.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/qbittorrent/files/patch-src_base_bittorrent_session.cpp Thu Dec 29 16:18:48 2016 (r429927) @@ -0,0 +1,64 @@ +Revert the following commit until libtorrent 1.1.2 is released: + +From 729c80f9104a3d01ec724351bd6910b4b8d14c6c Mon Sep 17 00:00:00 2001 +From: sledgehammer999 +Date: Mon, 31 Oct 2016 02:31:56 +0200 +Subject: [PATCH] Use new libtorrent 1.1.2+ utility function to generate client + ID instead. + +--- src/base/bittorrent/session.cpp.orig 2016-12-17 18:02:06 UTC ++++ src/base/bittorrent/session.cpp +@@ -45,6 +45,7 @@ + #include + + #include ++#include + #include + #include + +@@ -194,6 +195,36 @@ namespace + + template + LowerLimited lowerLimited(T limit, T ret) { return LowerLimited(limit, ret); } ++ ++#if LIBTORRENT_VERSION_NUM >= 10100 ++ std::string makeFingerprint(const char* peerId, int major, int minor, int revision, int tag) ++ { ++ Q_ASSERT(peerId); ++ Q_ASSERT(major >= 0); ++ Q_ASSERT(minor >= 0); ++ Q_ASSERT(revision >= 0); ++ Q_ASSERT(tag >= 0); ++ Q_ASSERT(std::strlen(peerId) == 2); ++ ++ auto versionToChar = [](int v) -> char ++ { ++ if (v >= 0 && v < 10) return static_cast('0' + v); ++ if (v >= 10) return static_cast('A' + (v - 10)); ++ Q_ASSERT(false); ++ return '0'; ++ }; ++ ++ std::ostringstream buf; ++ buf << '-' ++ << peerId ++ << versionToChar(major) ++ << versionToChar(minor) ++ << versionToChar(revision) ++ << versionToChar(tag) ++ << '-'; ++ return buf.str(); ++ } ++#endif + } + + // Session +@@ -334,7 +365,7 @@ Session::Session(QObject *parent) + dispatchAlerts(alertPtr.release()); + }); + #else +- std::string peerId = libt::generate_fingerprint(PEER_ID, VERSION_MAJOR, VERSION_MINOR, VERSION_BUGFIX, VERSION_BUILD); ++ std::string peerId = makeFingerprint(PEER_ID, VERSION_MAJOR, VERSION_MINOR, VERSION_BUGFIX, VERSION_BUILD); + libt::settings_pack pack; + pack.set_int(libt::settings_pack::alert_mask, alertMask); + pack.set_str(libt::settings_pack::peer_fingerprint, peerId); Modified: head/net-p2p/qbittorrent/files/patch-src_base_utils_string.cpp ============================================================================== --- head/net-p2p/qbittorrent/files/patch-src_base_utils_string.cpp Thu Dec 29 15:49:56 2016 (r429926) +++ head/net-p2p/qbittorrent/files/patch-src_base_utils_string.cpp Thu Dec 29 16:18:48 2016 (r429927) @@ -1,4 +1,6 @@ ---- src/base/utils/string.cpp.orig 2016-09-23 15:05:18 UTC +Avoid use of thread local storage on versions prior to which it was supported. + +--- src/base/utils/string.cpp.orig 2016-12-17 18:02:06 UTC +++ src/base/utils/string.cpp @@ -37,7 +37,7 @@ #ifdef QBT_USES_QT5