haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 22:48:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

libtorrent: apply a workaround

Browse Source
This commit is contained in:
Sergei Reznikov
2019-03-04 15:55:41 +03:00
parent 9a11461cec
commit 58e8b01f1d
2 changed files with 62 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net-libs/libtorrent/libtorrent-0.13.7.recipe
View File

@@ -4,7 +4,7 @@ with the goals of being efficient and easy to use."
HOMEPAGE="http://libtorrent.rakshasa.no/" HOMEPAGE="http://libtorrent.rakshasa.no/"
COPYRIGHT="2005-2018 Jari Sundell" COPYRIGHT="2005-2018 Jari Sundell"
LICENSE="GNU LGPL v2" LICENSE="GNU LGPL v2"
REVISION="1" REVISION="2"
SOURCE_URI="https://github.com/rakshasa/rtorrent/releases/download/v0.9.7/libtorrent-$portVersion.tar.gz" SOURCE_URI="https://github.com/rakshasa/rtorrent/releases/download/v0.9.7/libtorrent-$portVersion.tar.gz"
CHECKSUM_SHA256="c738f60f4d7b6879cd2745fb4310bf24c9287219c1fd619706a9d5499ca7ecc1" CHECKSUM_SHA256="c738f60f4d7b6879cd2745fb4310bf24c9287219c1fd619706a9d5499ca7ecc1"
PATCHES="libtorrent-$portVersion.patchset" PATCHES="libtorrent-$portVersion.patchset"

62
net-libs/libtorrent/patches/libtorrent-0.13.7.patchset
View File

@@ -1,4 +1,4 @@
From 20901d2aa6674bb2a9887a3775811da0e0cca88e Mon Sep 17 00:00:00 2001 From 3a221c1f3a413103a32aea71451ab7cd82222edf Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net> From: Sergei Reznikov <diver@gelios.net>
Date: Thu, 3 Jan 2019 11:47:05 +0300 Date: Thu, 3 Jan 2019 11:47:05 +0300
Subject: Fix build on Haiku Subject: Fix build on Haiku
@@ -25,3 +25,63 @@ index 54cb6de..fba9d7c
-- --
2.19.1 2.19.1
From 6ca0922b9b43d10199357c1e4a97506431452ad5 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Mon, 4 Mar 2019 15:51:53 +0300
Subject: Workaround a bug "rtorrent: Could not allocate socket for listening."
https://github.com/rakshasa/rtorrent/issues/820#issuecomment-455900997
diff --git a/src/net/socket_fd.cc b/src/net/socket_fd.cc
index fba9d7c..725e76e 100644
--- a/src/net/socket_fd.cc
+++ b/src/net/socket_fd.cc
@@ -128,40 +128,14 @@ SocketFd::get_error() const {
bool
SocketFd::open_stream() {
- m_fd = socket(rak::socket_address::pf_inet6, SOCK_STREAM, IPPROTO_TCP);
-
- if (m_fd == -1) {
- m_ipv6_socket = false;
- return (m_fd = socket(rak::socket_address::pf_inet, SOCK_STREAM, IPPROTO_TCP)) != -1;
- }
-
- m_ipv6_socket = true;
-
- if (!set_ipv6_v6only(false)) {
- close();
- return false;
- }
-
- return true;
+ m_ipv6_socket = false;
+ return (m_fd = socket(rak::socket_address::pf_inet, SOCK_STREAM, IPPROTO_TCP)) != -1;
}
bool
SocketFd::open_datagram() {
- m_fd = socket(rak::socket_address::pf_inet6, SOCK_DGRAM, 0);
-
- if (m_fd == -1) {
- m_ipv6_socket = false;
- return (m_fd = socket(rak::socket_address::pf_inet, SOCK_DGRAM, 0)) != -1;
- }
-
- m_ipv6_socket = true;
-
- if (!set_ipv6_v6only(false)) {
- close();
- return false;
- }
-
- return true;
+ m_ipv6_socket = false;
+ return (m_fd = socket(rak::socket_address::pf_inet, SOCK_DGRAM, 0)) != -1;
}
bool
--
2.19.1