svn commit: r482996 - head/net-p2p/libtorrent-rasterbar/files

[Jan Beich]

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 <string>
  #include <boost/function/function1.hpp>
-+#include <boost/noncopyable.hpp>
  #include <boost/shared_ptr.hpp>
- #include <boost/shared_ptr.hpp>
+-#include <boost/shared_ptr.hpp>
++#include <boost/noncopyable.hpp>
  
+ #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 <boost/noncopyable.hpp>
- #include <boost/pool/pool.hpp>
+@@ -42,6 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
  #include <boost/detail/atomic_count.hpp>
  #include <boost/intrusive_ptr.hpp>
+ #include <boost/cstdint.hpp>
++#include <boost/noncopyable.hpp>
+ 
+ #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 <boost/function/function1.hpp>
-+#include <boost/noncopyable.hpp>
  #include <boost/shared_ptr.hpp>
++#include <boost/noncopyable.hpp>
  #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 <utility>
- #include <ctime>
- 
+@@ -50,6 +50,7 @@ POSSIBILITY OF SUCH DAMAGE.
+ #include <boost/tuple/tuple.hpp>
+ #include <boost/unordered_map.hpp>
+ #include <boost/optional.hpp>
 +#include <boost/noncopyable.hpp>
- #include <boost/shared_ptr.hpp>
- #include <boost/enable_shared_from_this.hpp>
- #include <boost/cstdint.hpp>
+ 
+ #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 <utility>
+@@ -38,6 +38,7 @@ POSSIBILITY OF SUCH DAMAGE.
  #include <boost/bind.hpp>
  #include <boost/function/function1.hpp>
-+#include <boost/noncopyable.hpp>
  #include <boost/tuple/tuple.hpp>
++#include <boost/noncopyable.hpp>
  
  #include "libtorrent/aux_/disable_warnings_pop.hpp"
+