From owner-svn-ports-all@freebsd.org Fri Oct 26 00:30:46 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5DCA810CF613; Fri, 26 Oct 2018 00:30:46 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 137047A897; Fri, 26 Oct 2018 00:30:46 +0000 (UTC) (envelope-from jbeich@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E89AF1969F; Fri, 26 Oct 2018 00:30:45 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9Q0UjCJ054316; Fri, 26 Oct 2018 00:30:45 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9Q0UjCU054315; Fri, 26 Oct 2018 00:30:45 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201810260030.w9Q0UjCU054315@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 26 Oct 2018 00:30:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r482996 - head/net-p2p/libtorrent-rasterbar/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/net-p2p/libtorrent-rasterbar/files X-SVN-Commit-Revision: 482996 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Oct 2018 00:30:46 -0000 Author: jbeich Date: Fri Oct 26 00:30:45 2018 New Revision: 482996 URL: https://svnweb.freebsd.org/changeset/ports/482996 Log: net-p2p/libtorrent-rasterbar: replace r482779 with upstream version Patch conflict on update should make it apparent when to prune but due to how fuzz works this doesn't always happen with + lines. Modified: head/net-p2p/libtorrent-rasterbar/files/patch-boost-1.69 (contents, props changed) Modified: head/net-p2p/libtorrent-rasterbar/files/patch-boost-1.69 ============================================================================== --- head/net-p2p/libtorrent-rasterbar/files/patch-boost-1.69 Thu Oct 25 22:34:52 2018 (r482995) +++ head/net-p2p/libtorrent-rasterbar/files/patch-boost-1.69 Fri Oct 26 00:30:45 2018 (r482996) @@ -1,52 +1,53 @@ -https://github.com/arvidn/libtorrent/issues/3378 +https://github.com/arvidn/libtorrent/commit/a5da48edd4be --- include/libtorrent/disk_io_job.hpp.orig 2018-10-05 09:19:18 UTC +++ include/libtorrent/disk_io_job.hpp -@@ -42,6 +42,7 @@ POSSIBILITY OF SUCH DAMAGE. - +@@ -43,7 +43,7 @@ POSSIBILITY OF SUCH DAMAGE. #include #include -+#include #include - #include +-#include ++#include + #include "libtorrent/aux_/disable_warnings_pop.hpp" + --- include/libtorrent/kademlia/observer.hpp.orig 2018-10-05 09:19:18 UTC +++ include/libtorrent/kademlia/observer.hpp -@@ -38,6 +38,7 @@ POSSIBILITY OF SUCH DAMAGE. - - #include "libtorrent/aux_/disable_warnings_push.hpp" - -+#include - #include +@@ -42,6 +42,7 @@ POSSIBILITY OF SUCH DAMAGE. #include #include + #include ++#include + + #include "libtorrent/aux_/disable_warnings_pop.hpp" + --- include/libtorrent/proxy_base.hpp.orig 2018-10-05 09:19:18 UTC +++ include/libtorrent/proxy_base.hpp -@@ -41,6 +41,7 @@ POSSIBILITY OF SUCH DAMAGE. - +@@ -42,6 +42,7 @@ POSSIBILITY OF SUCH DAMAGE. #include "libtorrent/aux_/disable_warnings_push.hpp" #include -+#include #include ++#include #include "libtorrent/aux_/disable_warnings_pop.hpp" + namespace libtorrent { --- include/libtorrent/tracker_manager.hpp.orig 2018-10-05 09:19:21 UTC +++ include/libtorrent/tracker_manager.hpp -@@ -43,6 +43,7 @@ POSSIBILITY OF SUCH DAMAGE. - #include - #include - +@@ -50,6 +50,7 @@ POSSIBILITY OF SUCH DAMAGE. + #include + #include + #include +#include - #include - #include - #include + + #ifdef TORRENT_USE_OPENSSL + // there is no forward declaration header for asio --- src/kademlia/dht_storage.cpp.orig 2018-10-05 09:19:18 UTC +++ src/kademlia/dht_storage.cpp -@@ -37,6 +37,7 @@ POSSIBILITY OF SUCH DAMAGE. - #include +@@ -38,6 +38,7 @@ POSSIBILITY OF SUCH DAMAGE. #include #include -+#include #include ++#include #include "libtorrent/aux_/disable_warnings_pop.hpp" +