From e8aab5b796e8faffac42a1e431a65c45dd44f0b5 Mon Sep 17 00:00:00 2001 From: "Danilo G. Baio" Date: Tue, 30 Jul 2019 23:36:22 +0000 Subject: net-p2p/libtorrent: Update to 0.13.8 Patches removed were incorporated upstream. Reported by: tj@mrsk.me (email) --- net-p2p/libtorrent/files/patch-socket-issue | 47 ----------------------------- 1 file changed, 47 deletions(-) delete mode 100644 net-p2p/libtorrent/files/patch-socket-issue (limited to 'net-p2p/libtorrent/files/patch-socket-issue') diff --git a/net-p2p/libtorrent/files/patch-socket-issue b/net-p2p/libtorrent/files/patch-socket-issue deleted file mode 100644 index db662c6901e3..000000000000 --- a/net-p2p/libtorrent/files/patch-socket-issue +++ /dev/null @@ -1,47 +0,0 @@ -https://github.com/rakshasa/libtorrent/pull/181 - -From 0f957c2576d0d0c4c227e4453d92f67884e608af Mon Sep 17 00:00:00 2001 -From: Vladyslav Movchan -Date: Sat, 3 Nov 2018 19:52:56 +0200 -Subject: [PATCH] Prevent loss of 'm_ipv6_socket' attribute which led to - execution of setsockopt(..., IPPROTO_IP, IP_TOS, ...) on IPv6 socket - ---- - src/net/socket_fd.cc | 4 ++-- - src/net/socket_fd.h | 1 + - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/net/socket_fd.cc b/src/net/socket_fd.cc -index 54cb6ded..f04059f6 100644 ---- src/net/socket_fd.cc -+++ src/net/socket_fd.cc -@@ -251,7 +251,7 @@ SocketFd::accept(rak::socket_address* sa) { - socklen_t len = sizeof(rak::socket_address); - - if (sa == NULL) { -- return SocketFd(::accept(m_fd, NULL, &len)); -+ return SocketFd(::accept(m_fd, NULL, &len), m_ipv6_socket); - } - - int fd = ::accept(m_fd, sa->c_sockaddr(), &len); -@@ -260,7 +260,7 @@ SocketFd::accept(rak::socket_address* sa) { - *sa = sa->sa_inet6()->normalize_address(); - } - -- return SocketFd(fd); -+ return SocketFd(fd, m_ipv6_socket); - } - - // unsigned int -diff --git a/src/net/socket_fd.h b/src/net/socket_fd.h -index ca765e88..2329b4e9 100644 ---- src/net/socket_fd.h -+++ src/net/socket_fd.h -@@ -51,6 +51,7 @@ class SocketFd { - - SocketFd() : m_fd(-1) {} - explicit SocketFd(int fd) : m_fd(fd) {} -+ SocketFd(int fd, bool ipv6_socket) : m_fd(fd), m_ipv6_socket(ipv6_socket) {} - - bool is_valid() const { return m_fd >= 0; } - -- cgit v1.2.3