View | Details | Raw Unified | Return to bug 211963
Collapse All | Expand All

(-)net-p2p/libtorrent-rasterbar/Makefile (-38 / +25 lines)
Lines 2-23 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	libtorrent-rasterbar
4
PORTNAME=	libtorrent-rasterbar
5
PORTVERSION=	1.0.9
5
PORTVERSION=	1.1.0
6
CATEGORIES?=	net-p2p ipv6
6
CATEGORIES?=	net-p2p ipv6
7
MASTER_SITES=	https://github.com/arvidn/libtorrent/releases/download/libtorrent-${PORTVERSION:S/./_/g}/
7
MASTER_SITES=	https://github.com/arvidn/libtorrent/releases/download/libtorrent-${PORTVERSION:R:S/./_/g}/
8
8
9
MAINTAINER=	ports@FreeBSD.org
9
MAINTAINER=	matthew@reztek.cz
10
COMMENT?=	C++ library implementing a BitTorrent client
10
COMMENT?=	C++ library implementing a BitTorrent client
11
11
12
LICENSE=	BSD3CLAUSE
12
LICENSE=	BSD3CLAUSE
13
13
14
LIB_DEPENDS?=	libboost_date_time.so:devel/boost-libs \
14
LIB_DEPENDS+=	libboost_chrono.so:devel/boost-libs \
15
		libGeoIP.so:net/GeoIP
15
		libboost_random.so:devel/boost-libs \
16
		libboost_system.so:devel/boost-libs
16
17
17
USES+=		compiler:c++11-lang iconv:wchar_t libtool pathfix pkgconfig
18
USES+=		compiler:c++11-lang iconv:wchar_t libtool pathfix pkgconfig ssl
18
USE_OPENSSL=	yes
19
GNU_CONFIGURE=	yes
19
GNU_CONFIGURE=	yes
20
USE_LDCONFIG=	yes
20
USE_LDCONFIG=	yes
21
TEST_TARGET=	check
21
22
22
CONFIGURE_ARGS=	--disable-static \
23
CONFIGURE_ARGS=	--disable-static \
23
		--enable-dht \
24
		--enable-dht \
Lines 26-62 Link Here
26
		--enable-deprecated-functions \
27
		--enable-deprecated-functions \
27
		--with-boost=${LOCALBASE} \
28
		--with-boost=${LOCALBASE} \
28
		--with-boost-system=boost_system \
29
		--with-boost-system=boost_system \
29
		--enable-geoip \
30
		--with-libgeoip \
31
		--with-libiconv \
30
		--with-libiconv \
32
		--with-openssl=${OPENSSLBASE}
31
		--with-openssl=${OPENSSLBASE}
33
32
34
SHLIB_VER=	8
33
SHLIB_VER=	9
35
PLIST_SUB+=	SHLIB_VER="${SHLIB_VER}"
34
PLIST_SUB+=	SHLIB_VER="${SHLIB_VER}"
36
35
37
DOCSRCDIR1=	${WRKSRC}
36
DOCFILES=	AUTHORS ChangeLog
38
DOC_FILES1=	AUTHORS ChangeLog
37
PORTDOCS=	${DOCFILES} docs/*
39
40
DOCSRCDIR2=	${WRKSRC}/docs
41
DOCSDIR2=	${DOCSDIR}/docs
42
DOC_FILES2=	*.*
43
44
DOCSRCDIR3=	${WRKSRC}/docs/img
45
DOCSDIR3=	${DOCSDIR}/docs/img
46
DOC_FILES3=	*
47
48
PORTEXAMPLES=	*.cpp
38
PORTEXAMPLES=	*.cpp
49
39
50
OPTIONS_DEFINE=	DEBUG DOCS EXAMPLES
40
OPTIONS_DEFINE=	DEBUG DOCS EXAMPLES TEST
41
TEST_DESC=	Build and run tests (increases library size)
51
42
52
DEBUG_CONFIGURE_ENABLE=	debug
43
DEBUG_CONFIGURE_ENABLE=	debug
44
TEST_CONFIGURE_ENABLE=	tests
53
45
54
.include <bsd.port.options.mk>
46
.include <bsd.port.options.mk>
55
47
56
# Restrict to stable (even) versions, indicated by the second component.
57
# With Versions 1.x not build yet net-p2p/qbittorrent
58
PORTSCOUT=	limit:^0.16\..*
59
60
.if defined(SLAVE_PORT) && ${SLAVE_PORT:tl} == "yes" && defined(USE_PYTHON)
48
.if defined(SLAVE_PORT) && ${SLAVE_PORT:tl} == "yes" && defined(USE_PYTHON)
61
CONFIGURE_ARGS+=	--enable-python-binding \
49
CONFIGURE_ARGS+=	--enable-python-binding \
62
			--with-boost-python=boost_python
50
			--with-boost-python=boost_python
Lines 68-94 Link Here
68
	@${REINPLACE_CMD} -e 's|/usr/local/include|${PREFIX}/include|' \
56
	@${REINPLACE_CMD} -e 's|/usr/local/include|${PREFIX}/include|' \
69
		${WRKSRC}/Jamfile
57
		${WRKSRC}/Jamfile
70
58
59
post-configure:
60
	${FIND} ${WRKSRC} -name Makefile -o -name link_flags | \
61
		${XARGS} ${REINPLACE_CMD} 's| *-R${LOCALBASE}/lib||'
62
71
post-install:
63
post-install:
72
.if defined(SLAVE_PORT) && ${SLAVE_PORT:tl} == "yes" && defined(USE_PYTHON)
64
.if defined(SLAVE_PORT) && ${SLAVE_PORT:tl} == "yes" && defined(USE_PYTHON)
73
	${STRIP_CMD} \
65
	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/libtorrent.so
74
	${STAGEDIR}${PYTHON_SITELIBDIR}/libtorrent.so
75
.else
66
.else
76
	${STRIP_CMD} \
67
	${STRIP_CMD} \
77
	${STAGEDIR}${PREFIX}/lib/libtorrent-rasterbar.so.${SHLIB_VER}
68
	${STAGEDIR}${PREFIX}/lib/libtorrent-rasterbar.so.${SHLIB_VER}
78
.endif
69
.endif
79
70
80
.if ${PORT_OPTIONS:MDOCS}
71
post-install-DOCS-on:
81
	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR2}
72
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
82
	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR3}
73
	${INSTALL_MAN} ${DOCFILES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
83
	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
74
	(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR})
84
	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2}
85
	${INSTALL_DATA} ${DOC_FILES3:S|^|${DOCSRCDIR3}/|} ${STAGEDIR}${DOCSDIR3}
86
.endif
87
75
88
.if ${PORT_OPTIONS:MEXAMPLES}
76
post-install-EXAMPLES-on:
89
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
77
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
90
	${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/examples/|} \
78
	${INSTALL_DATA} ${WRKSRC}/examples/${PORTEXAMPLES} \
91
		${STAGEDIR}${EXAMPLESDIR}
79
		${STAGEDIR}${EXAMPLESDIR}
92
.endif
93
80
94
.include <bsd.port.mk>
81
.include <bsd.port.mk>
(-)net-p2p/libtorrent-rasterbar/distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
SHA256 (libtorrent-rasterbar-1.0.9.tar.gz) = 11a93125ed49f796fca83da925ab7dc29e91d88b915f078caaddaaf559d63db6
1
TIMESTAMP = 1471285838
2
SIZE (libtorrent-rasterbar-1.0.9.tar.gz) = 3292886
2
SHA256 (libtorrent-rasterbar-1.1.0.tar.gz) = 2713df7da4aec5263ac11b6626ea966f368a5a8081103fd8f2f2ed97b5cd731d
3
SIZE (libtorrent-rasterbar-1.1.0.tar.gz) = 3629123
(-)net-p2p/libtorrent-rasterbar/files/patch-git_3624ce6c (+279 lines)
Line 0 Link Here
1
From 3624ce6cfd4d197db75f01ae4be37723d7d9b638 Mon Sep 17 00:00:00 2001
2
From: Arvid Norberg <arvid.norberg@gmail.com>
3
Date: Sat, 4 Jun 2016 09:53:23 -0400
4
Subject: [PATCH] fixed crash on invalid input in http_parser (#782)
5
6
fixed crash on invalid input to http_parser
7
---
8
 ChangeLog                                 |   1 +
9
 include/libtorrent/add_torrent_params.hpp |   3 +-
10
 src/http_parser.cpp                       |  32 +++++++
11
 test/test_http_parser.cpp                 | 139 +++++++++++++++++++++++++-----
12
 4 files changed, 151 insertions(+), 24 deletions(-)
13
14
diff --git a/src/http_parser.cpp b/src/http_parser.cpp
15
index a9497f8..52f6152 100644
16
--- src/http_parser.cpp
17
+++ src/http_parser.cpp
18
@@ -174,6 +174,7 @@ namespace libtorrent
19
 		if (m_state == read_status)
20
 		{
21
 			TORRENT_ASSERT(!m_finished);
22
+			TORRENT_ASSERT(pos <= recv_buffer.end);
23
 			char const* newline = std::find(pos, recv_buffer.end, '\n');
24
 			// if we don't have a full line yet, wait.
25
 			if (newline == recv_buffer.end)
26
@@ -194,6 +195,7 @@ namespace libtorrent
27
 
28
 			char const* line = pos;
29
 			++newline;
30
+			TORRENT_ASSERT(newline >= pos);
31
 			int incoming = int(newline - pos);
32
 			m_recv_pos += incoming;
33
 			boost::get<1>(ret) += newline - (m_recv_buffer.begin + start_pos);
34
@@ -227,6 +229,7 @@ namespace libtorrent
35
 		if (m_state == read_header)
36
 		{
37
 			TORRENT_ASSERT(!m_finished);
38
+			TORRENT_ASSERT(pos <= recv_buffer.end);
39
 			char const* newline = std::find(pos, recv_buffer.end, '\n');
40
 			std::string line;
41
 
42
@@ -277,6 +280,12 @@ namespace libtorrent
43
 				if (name == "content-length")
44
 				{
45
 					m_content_length = strtoll(value.c_str(), 0, 10);
46
+					if (m_content_length < 0)
47
+					{
48
+						m_state = error_state;
49
+						error = true;
50
+						return ret;
51
+					}
52
 				}
53
 				else if (name == "connection")
54
 				{
55
@@ -294,12 +303,24 @@ namespace libtorrent
56
 					if (string_begins_no_case("bytes ", ptr)) ptr += 6;
57
 					char* end;
58
 					m_range_start = strtoll(ptr, &end, 10);
59
+					if (m_range_start < 0)
60
+					{
61
+						m_state = error_state;
62
+						error = true;
63
+						return ret;
64
+					}
65
 					if (end == ptr) success = false;
66
 					else if (*end != '-') success = false;
67
 					else
68
 					{
69
 						ptr = end + 1;
70
 						m_range_end = strtoll(ptr, &end, 10);
71
+						if (m_range_end < 0)
72
+						{
73
+							m_state = error_state;
74
+							error = true;
75
+							return ret;
76
+						}
77
 						if (end == ptr) success = false;
78
 					}
79
 
80
@@ -318,6 +339,7 @@ namespace libtorrent
81
 				}
82
 
83
 				TORRENT_ASSERT(m_recv_pos <= recv_buffer.left());
84
+				TORRENT_ASSERT(pos <= recv_buffer.end);
85
 				newline = std::find(pos, recv_buffer.end, '\n');
86
 			}
87
 			boost::get<1>(ret) += newline - (m_recv_buffer.begin + start_pos);
88
@@ -347,6 +369,12 @@ namespace libtorrent
89
 					int header_size;
90
 					if (parse_chunk_header(buf, &chunk_size, &header_size))
91
 					{
92
+						if (chunk_size < 0)
93
+						{
94
+							m_state = error_state;
95
+							error = true;
96
+							return ret;
97
+						}
98
 						if (chunk_size > 0)
99
 						{
100
 							std::pair<boost::int64_t, boost::int64_t> chunk_range(m_cur_chunk_end + header_size
101
@@ -419,6 +447,7 @@ namespace libtorrent
102
 	bool http_parser::parse_chunk_header(buffer::const_interval buf
103
 		, boost::int64_t* chunk_size, int* header_size)
104
 	{
105
+		TORRENT_ASSERT(buf.begin <= buf.end);
106
 		char const* pos = buf.begin;
107
 
108
 		// ignore one optional new-line. This is since each chunk
109
@@ -429,6 +458,7 @@ namespace libtorrent
110
 		if (pos < buf.end && pos[0] == '\n') ++pos;
111
 		if (pos == buf.end) return false;
112
 
113
+		TORRENT_ASSERT(pos <= buf.end);
114
 		char const* newline = std::find(pos, buf.end, '\n');
115
 		if (newline == buf.end) return false;
116
 		++newline;
117
@@ -441,6 +471,8 @@ namespace libtorrent
118
 
119
 		// first, read the chunk length
120
 		*chunk_size = strtoll(pos, 0, 16);
121
+		if (*chunk_size < 0) return true;
122
+
123
 		if (*chunk_size != 0)
124
 		{
125
 			*header_size = newline - buf.begin;
126
diff --git a/test/test_http_parser.cpp b/test/test_http_parser.cpp
127
index c26d1c8..6835a12 100644
128
--- test/test_http_parser.cpp
129
+++ test/test_http_parser.cpp
130
@@ -361,29 +361,6 @@ TORRENT_TEST(http_parser)
131
 		TEST_EQUAL(parser.headers().find("test2")->second, "bar");
132
 	}
133
 
134
-	// test chunked encoding
135
-
136
-	parser.reset();
137
-
138
-	char const* chunked_input =
139
-		"HTTP/1.1 200 OK\r\n"
140
-		"Transfer-Encoding: chunked\r\n"
141
-		"Content-Type: text/plain\r\n"
142
-		"\r\n"
143
-		"4\r\ntest\r\n4\r\n1234\r\n10\r\n0123456789abcdef\r\n"
144
-		"0\r\n\r\n";
145
-	received = feed_bytes(parser, chunked_input);
146
-
147
-	TEST_EQUAL(strlen(chunked_input), 24 + 94)
148
-	TEST_CHECK(received == make_tuple(24, 94, false));
149
-	TEST_CHECK(parser.finished());
150
-
151
-	char mutable_buffer[100];
152
-	memcpy(mutable_buffer, parser.get_body().begin, parser.get_body().left());
153
-	int len = parser.collapse_chunk_headers(mutable_buffer, parser.get_body().left());
154
-
155
-	TEST_CHECK(std::equal(mutable_buffer, mutable_buffer + len, "test12340123456789abcdef"));
156
-
157
 	// test url parsing
158
 
159
 	error_code ec;
160
@@ -476,3 +453,119 @@ TORRENT_TEST(http_parser)
161
 	TEST_EQUAL(is_redirect(400), false);
162
 }
163
 
164
+TORRENT_TEST(chunked_encoding)
165
+{
166
+	char const* chunked_input =
167
+		"HTTP/1.1 200 OK\r\n"
168
+		"Transfer-Encoding: chunked\r\n"
169
+		"Content-Type: text/plain\r\n"
170
+		"\r\n"
171
+		"4\r\ntest\r\n4\r\n1234\r\n10\r\n0123456789abcdef\r\n"
172
+		"0\r\n\r\n";
173
+
174
+	http_parser parser;
175
+	boost::tuple<int, int, bool> const received
176
+		= feed_bytes(parser, chunked_input);
177
+
178
+	TEST_EQUAL(strlen(chunked_input), 24 + 94)
179
+	TEST_CHECK(received == make_tuple(24, 94, false));
180
+	TEST_CHECK(parser.finished());
181
+
182
+	char mutable_buffer[100];
183
+	memcpy(mutable_buffer, parser.get_body().begin, parser.get_body().left());
184
+	int len = parser.collapse_chunk_headers(mutable_buffer, parser.get_body().left());
185
+
186
+	TEST_CHECK(std::equal(mutable_buffer, mutable_buffer + len, "test12340123456789abcdef"));
187
+}
188
+
189
+TORRENT_TEST(invalid_content_length)
190
+{
191
+	char const* chunked_input =
192
+		"HTTP/1.1 200 OK\r\n"
193
+		"Transfer-Encoding: chunked\r\n"
194
+		"Content-Length: -45345\r\n"
195
+		"\r\n";
196
+
197
+	http_parser parser;
198
+	boost::tuple<int, int, bool> const received
199
+		= feed_bytes(parser, chunked_input);
200
+
201
+	TEST_CHECK(boost::get<2>(received) == true);
202
+}
203
+
204
+TORRENT_TEST(invalid_chunked)
205
+{
206
+	char const* chunked_input =
207
+		"HTTP/1.1 200 OK\r\n"
208
+		"Transfer-Encoding: chunked\r\n"
209
+		"\r\n"
210
+		"-53465234545\r\n"
211
+		"foobar";
212
+
213
+	http_parser parser;
214
+	boost::tuple<int, int, bool> const received
215
+		= feed_bytes(parser, chunked_input);
216
+
217
+	TEST_CHECK(boost::get<2>(received) == true);
218
+}
219
+
220
+TORRENT_TEST(invalid_content_range_start)
221
+{
222
+	char const* chunked_input =
223
+		"HTTP/1.1 206 OK\n"
224
+		"Content-Range: bYTes -3-4\n"
225
+		"\n";
226
+
227
+	http_parser parser;
228
+	boost::tuple<int, int, bool> const received
229
+		= feed_bytes(parser, chunked_input);
230
+
231
+	TEST_CHECK(boost::get<2>(received) == true);
232
+}
233
+
234
+TORRENT_TEST(invalid_content_range_end)
235
+{
236
+	char const* chunked_input =
237
+		"HTTP/1.1 206 OK\n"
238
+		"Content-Range: bYTes 3--434\n"
239
+		"\n";
240
+
241
+	http_parser parser;
242
+	boost::tuple<int, int, bool> const received
243
+		= feed_bytes(parser, chunked_input);
244
+
245
+	TEST_CHECK(boost::get<2>(received) == true);
246
+}
247
+
248
+TORRENT_TEST(invalid_chunk_afl)
249
+{
250
+	boost::uint8_t const invalid_chunked_input[] = {
251
+		0x48, 0x6f, 0x54, 0x50, 0x2f, 0x31, 0x2e, 0x31, // HoTP/1.1 200 OK
252
+		0x20, 0x32, 0x30, 0x30, 0x20, 0x4f, 0x4b, 0x0d, // Cont-Length: 20
253
+		0x0a, 0x43, 0x6f, 0x6e, 0x74, 0x2d, 0x4c, 0x65, // Contente: tn
254
+		0x6e, 0x67, 0x74, 0x68, 0x3a, 0x20, 0x32, 0x30, // Transfer-Encoding: chunked
255
+		0x0d, 0x0a, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, //
256
+		0x74, 0x65, 0x3a, 0x20, 0x74, 0x6e, 0x0d, 0x0a, //
257
+		0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, //
258
+		0x2d, 0x45, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, // -89abc9abcdef
259
+		0x67, 0x3a, 0x20, 0x63, 0x68, 0x75, 0x6e, 0x6b, // �
260
+		0x65, 0x64, 0x0d, 0x0a, 0x0d, 0x0d, 0x0a, 0x0d, // T����������def
261
+		0x0a, 0x0a, 0x2d, 0x38, 0x39, 0x61, 0x62, 0x63, // �
262
+		0x39, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x0d, // T�����������est-headyr: foobar
263
+		0x0a, 0xd6, 0x0d, 0x0a, 0x54, 0xbd, 0xbd, 0xbd,
264
+		0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0x64,
265
+		0x65, 0x66, 0x0d, 0x0a, 0xd6, 0x0d, 0x0a, 0x54,
266
+		0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd,
267
+		0xbd, 0xbd, 0xbd, 0x65, 0x73, 0x74, 0x2d, 0x68,
268
+		0x65, 0x61, 0x64, 0x79, 0x72, 0x3a, 0x20, 0x66,
269
+		0x6f, 0x6f, 0x62, 0x61, 0x72, 0x0d, 0x0a, 0x0d,
270
+		0x0a, 0x00
271
+	};
272
+
273
+	http_parser parser;
274
+	boost::tuple<int, int, bool> const received
275
+		= feed_bytes(parser, reinterpret_cast<char const*>(invalid_chunked_input));
276
+
277
+	TEST_CHECK(boost::get<2>(received) == true);
278
+}
279
+
(-)net-p2p/libtorrent-rasterbar/files/patch-git_95e348be (+132 lines)
Line 0 Link Here
1
From 95e348bef7ad92d7e26da712b4df478c8c739f87 Mon Sep 17 00:00:00 2001
2
From: Arvid Norberg <arvid.norberg@gmail.com>
3
Date: Fri, 29 Apr 2016 12:00:39 -0400
4
Subject: [PATCH] fix name clash with 'thread' on freebsd (#664)
5
6
---
7
 test/dht_server.cpp         |  2 +-
8
 test/peer_server.cpp        |  2 +-
9
 test/test_alert_manager.cpp |  2 +-
10
 test/test_threads.cpp       | 12 ++++++------
11
 test/test_time.cpp          |  8 ++++----
12
 test/udp_tracker.cpp        |  2 +-
13
 6 files changed, 14 insertions(+), 14 deletions(-)
14
15
diff --git a/test/dht_server.cpp b/test/dht_server.cpp
16
index 93a3b63..84b8a34 100644
17
--- test/dht_server.cpp
18
+++ test/dht_server.cpp
19
@@ -89,7 +89,7 @@ struct dht_server
20
 
21
 		fprintf(stderr, "%s: DHT initialized on port %d\n", time_now_string(), m_port);
22
 
23
-		m_thread.reset(new thread(boost::bind(&dht_server::thread_fun, this)));
24
+		m_thread.reset(new libtorrent::thread(boost::bind(&dht_server::thread_fun, this)));
25
 	}
26
 
27
 	~dht_server()
28
diff --git a/test/peer_server.cpp b/test/peer_server.cpp
29
index 315c055..8297acf 100644
30
--- test/peer_server.cpp
31
+++ test/peer_server.cpp
32
@@ -92,7 +92,7 @@ struct peer_server
33
 
34
 		fprintf(stderr, "%s: PEER peer initialized on port %d\n", time_now_string(), m_port);
35
 
36
-		m_thread.reset(new thread(boost::bind(&peer_server::thread_fun, this)));
37
+		m_thread.reset(new libtorrent::thread(boost::bind(&peer_server::thread_fun, this)));
38
 	}
39
 
40
 	~peer_server()
41
diff --git a/test/test_alert_manager.cpp b/test/test_alert_manager.cpp
42
index 3432336..bf0c28f 100644
43
--- test/test_alert_manager.cpp
44
+++ test/test_alert_manager.cpp
45
@@ -262,7 +262,7 @@ TORRENT_TEST(wait_for_alert)
46
 	mgr.get_all(alerts, num_resume);
47
 
48
 	start = clock_type::now();
49
-	thread posting_thread(boost::bind(&post_torrent_added, &mgr));
50
+	libtorrent::thread posting_thread(boost::bind(&post_torrent_added, &mgr));
51
 
52
 	a = mgr.wait_for_alert(seconds(10));
53
 	end = clock_type::now();
54
diff --git a/test/test_threads.cpp b/test/test_threads.cpp
55
index 5c9475d..55b6010 100644
56
--- test/test_threads.cpp
57
+++ test/test_threads.cpp
58
@@ -77,11 +77,11 @@ TORRENT_TEST(threads)
59
 {
60
 	condition_variable cond;
61
 	libtorrent::mutex m;
62
-	std::list<thread*> threads;
63
+	std::list<libtorrent::thread*> threads;
64
 	int waiting = 0;
65
 	for (int i = 0; i < 20; ++i)
66
 	{
67
-		threads.push_back(new thread(boost::bind(&fun, &cond, &m, &waiting, i)));
68
+		threads.push_back(new libtorrent::thread(boost::bind(&fun, &cond, &m, &waiting, i)));
69
 	}
70
 
71
 	// make sure all threads are waiting on the condition_variable
72
@@ -96,7 +96,7 @@ TORRENT_TEST(threads)
73
 	cond.notify_all();
74
 	l.unlock();
75
 
76
-	for (std::list<thread*>::iterator i = threads.begin(); i != threads.end(); ++i)
77
+	for (std::list<libtorrent::thread*>::iterator i = threads.begin(); i != threads.end(); ++i)
78
 	{
79
 		(*i)->join();
80
 		delete *i;
81
@@ -107,8 +107,8 @@ TORRENT_TEST(threads)
82
 	boost::atomic<int> c(0);
83
 	for (int i = 0; i < 3; ++i)
84
 	{
85
-		threads.push_back(new thread(boost::bind(&increment, &cond, &m, &waiting, &c)));
86
-		threads.push_back(new thread(boost::bind(&decrement, &cond, &m, &waiting, &c)));
87
+		threads.push_back(new libtorrent::thread(boost::bind(&increment, &cond, &m, &waiting, &c)));
88
+		threads.push_back(new libtorrent::thread(boost::bind(&decrement, &cond, &m, &waiting, &c)));
89
 	}
90
 
91
 	// make sure all threads are waiting on the condition_variable
92
@@ -123,7 +123,7 @@ TORRENT_TEST(threads)
93
 	cond.notify_all();
94
 	l.unlock();
95
 
96
-	for (std::list<thread*>::iterator i = threads.begin(); i != threads.end(); ++i)
97
+	for (std::list<libtorrent::thread*>::iterator i = threads.begin(); i != threads.end(); ++i)
98
 	{
99
 		(*i)->join();
100
 		delete *i;
101
diff --git a/test/test_time.cpp b/test/test_time.cpp
102
index 817dd1d..f8ddd30 100644
103
--- test/test_time.cpp
104
+++ test/test_time.cpp
105
@@ -83,10 +83,10 @@ TORRENT_TEST(time)
106
 	
107
 	mutex m;
108
 	condition_variable cv;
109
-	thread t1(boost::bind(&check_timer_loop, boost::ref(m), boost::ref(last), boost::ref(cv)));
110
-	thread t2(boost::bind(&check_timer_loop, boost::ref(m), boost::ref(last), boost::ref(cv)));
111
-	thread t3(boost::bind(&check_timer_loop, boost::ref(m), boost::ref(last), boost::ref(cv)));
112
-	thread t4(boost::bind(&check_timer_loop, boost::ref(m), boost::ref(last), boost::ref(cv)));
113
+	libtorrent::thread t1(boost::bind(&check_timer_loop, boost::ref(m), boost::ref(last), boost::ref(cv)));
114
+	libtorrent::thread t2(boost::bind(&check_timer_loop, boost::ref(m), boost::ref(last), boost::ref(cv)));
115
+	libtorrent::thread t3(boost::bind(&check_timer_loop, boost::ref(m), boost::ref(last), boost::ref(cv)));
116
+	libtorrent::thread t4(boost::bind(&check_timer_loop, boost::ref(m), boost::ref(last), boost::ref(cv)));
117
 
118
 	test_sleep(100);
119
 
120
diff --git a/test/udp_tracker.cpp b/test/udp_tracker.cpp
121
index bb63434..5d5a59f 100644
122
--- test/udp_tracker.cpp
123
+++ test/udp_tracker.cpp
124
@@ -171,7 +171,7 @@ struct udp_tracker
125
 
126
 		fprintf(stderr, "%s: UDP tracker initialized on port %d\n", time_now_string(), m_port);
127
 
128
-		m_thread.reset(new thread(boost::bind(&udp_tracker::thread_fun, this)));
129
+		m_thread.reset(new libtorrent::thread(boost::bind(&udp_tracker::thread_fun, this)));
130
 	}
131
 
132
 	void stop()
(-)net-p2p/libtorrent-rasterbar/files/patch-include-libtorrent-config.hpp (-8 / +8 lines)
Lines 1-15 Link Here
1
--- include/libtorrent/config.hpp.orig	2014-12-05 01:00:07 UTC
1
--- include/libtorrent/config.hpp.orig  2016-04-10 21:39:14 UTC
2
+++ include/libtorrent/config.hpp
2
+++ include/libtorrent/config.hpp
3
@@ -166,12 +166,6 @@ POSSIBILITY OF SUCH DAMAGE.
3
@@ -180,12 +180,6 @@ POSSIBILITY OF SUCH DAMAGE.
4
 #define TORRENT_USE_EXECINFO 1
5
 #endif
4
 
6
 
5
 #endif // __APPLE__
7
-#else // __APPLE__
6
 
7
-#else
8
-// FreeBSD has a reasonable iconv signature
8
-// FreeBSD has a reasonable iconv signature
9
-// unless we're on glibc
9
-// unless we're on glibc
10
-#ifndef __GLIBC__
10
-#ifndef __GLIBC__
11
-# define TORRENT_ICONV_ARG (const char**)
11
-# define TORRENT_ICONV_ARG (const char**)
12
-#endif
12
-#endif
13
 #endif
13
 #endif // __APPLE__
14
 #define TORRENT_HAS_FALLOCATE 0
14
 
15
 #define TORRENT_USE_IFADDRS 1
15
 #define TORRENT_HAVE_MMAP 1
(-)net-p2p/libtorrent-rasterbar/files/patch-src_lazy__bdecode.cpp (-12 lines)
Lines 1-12 Link Here
1
--- src/lazy_bdecode.cpp.orig	2014-12-05 01:00:07 UTC
2
+++ src/lazy_bdecode.cpp
3
@@ -30,6 +30,9 @@ POSSIBILITY OF SUCH DAMAGE.
4
 
5
 */
6
 
7
+#define __STDC_LIMIT_MACROS
8
+#include <stdint.h>
9
+
10
 #include "libtorrent/config.hpp"
11
 #include "libtorrent/lazy_entry.hpp"
12
 #include <cstring>
(-)net-p2p/libtorrent-rasterbar/files/patch-src_utp__stream.cpp (-11 lines)
Lines 1-11 Link Here
1
--- src/utp_stream.cpp.orig	2014-12-05 01:00:07 UTC
2
+++ src/utp_stream.cpp
3
@@ -30,6 +30,8 @@ POSSIBILITY OF SUCH DAMAGE.
4
 
5
 */
6
 
7
+#define __STDC_LIMIT_MACROS 
8
+#include <stdint.h>
9
 #include "libtorrent/config.hpp"
10
 #include "libtorrent/utp_stream.hpp"
11
 #include "libtorrent/sliding_average.hpp"
(-)net-p2p/libtorrent-rasterbar/pkg-descr (-8 / +8 lines)
Lines 1-10 Link Here
1
libtorrent is a C++ library that aims to be a good alternative to all the
1
libtorrent is an open source C++ library implementing the BitTorrent
2
other bittorrent implementations around. It is a library and not a full
2
protocol, along with most popular extensions, making it suitable for
3
featured client, although it comes with a working example client.
3
real world deployment. It is configurable to be able to fit both
4
servers and embedded devices.
5
 
6
The main goals of libtorrent are to be efficient and easy to use.
4
7
5
The main goals of libtorrent are to be cpu efficient, memory efficient and
8
NB: this is NOT the same library as the net-p2p/libtorrent port!
6
very easy to use.
7
9
8
Note that this is NOT the same library as the libtorrent port!
10
WWW: http://libtorrent.org/
9
10
WWW: http://www.rasterbar.com/products/libtorrent/
(-)net-p2p/libtorrent-rasterbar/pkg-plist (-110 / +63 lines)
Lines 2-20 Link Here
2
include/libtorrent/add_torrent_params.hpp
2
include/libtorrent/add_torrent_params.hpp
3
include/libtorrent/address.hpp
3
include/libtorrent/address.hpp
4
include/libtorrent/alert.hpp
4
include/libtorrent/alert.hpp
5
include/libtorrent/alert_dispatcher.hpp
6
include/libtorrent/alert_manager.hpp
5
include/libtorrent/alert_manager.hpp
6
include/libtorrent/alert_observer.hpp
7
include/libtorrent/alert_types.hpp
7
include/libtorrent/alert_types.hpp
8
include/libtorrent/alloca.hpp
8
include/libtorrent/alloca.hpp
9
include/libtorrent/allocator.hpp
9
include/libtorrent/allocator.hpp
10
include/libtorrent/announce_entry.hpp
10
include/libtorrent/assert.hpp
11
include/libtorrent/assert.hpp
12
include/libtorrent/aux_/alert_manager_variadic_emplace.hpp
13
include/libtorrent/aux_/allocating_handler.hpp
14
include/libtorrent/aux_/byteswap.hpp
15
include/libtorrent/aux_/cpuid.hpp
16
include/libtorrent/aux_/disable_warnings_pop.hpp
17
include/libtorrent/aux_/disable_warnings_push.hpp
18
include/libtorrent/aux_/escape_string.hpp
19
include/libtorrent/aux_/file_progress.hpp
20
include/libtorrent/aux_/merkle.hpp
21
include/libtorrent/aux_/openssl.hpp
22
include/libtorrent/aux_/proxy_settings.hpp
23
include/libtorrent/aux_/session_call.hpp
11
include/libtorrent/aux_/session_impl.hpp
24
include/libtorrent/aux_/session_impl.hpp
25
include/libtorrent/aux_/session_interface.hpp
26
include/libtorrent/aux_/session_settings.hpp
27
include/libtorrent/aux_/time.hpp
12
include/libtorrent/bandwidth_limit.hpp
28
include/libtorrent/bandwidth_limit.hpp
13
include/libtorrent/bandwidth_manager.hpp
29
include/libtorrent/bandwidth_manager.hpp
14
include/libtorrent/bandwidth_queue_entry.hpp
30
include/libtorrent/bandwidth_queue_entry.hpp
15
include/libtorrent/bandwidth_socket.hpp
31
include/libtorrent/bandwidth_socket.hpp
32
include/libtorrent/bdecode.hpp
16
include/libtorrent/bencode.hpp
33
include/libtorrent/bencode.hpp
17
include/libtorrent/bitfield.hpp
34
include/libtorrent/bitfield.hpp
35
include/libtorrent/block_cache.hpp
18
include/libtorrent/bloom_filter.hpp
36
include/libtorrent/bloom_filter.hpp
19
include/libtorrent/broadcast_socket.hpp
37
include/libtorrent/broadcast_socket.hpp
20
include/libtorrent/bt_peer_connection.hpp
38
include/libtorrent/bt_peer_connection.hpp
Lines 21-44 Link Here
21
include/libtorrent/buffer.hpp
39
include/libtorrent/buffer.hpp
22
include/libtorrent/build_config.hpp
40
include/libtorrent/build_config.hpp
23
include/libtorrent/chained_buffer.hpp
41
include/libtorrent/chained_buffer.hpp
42
include/libtorrent/choker.hpp
43
include/libtorrent/close_reason.hpp
24
include/libtorrent/config.hpp
44
include/libtorrent/config.hpp
25
include/libtorrent/connection_queue.hpp
26
include/libtorrent/copy_ptr.hpp
45
include/libtorrent/copy_ptr.hpp
46
include/libtorrent/crc32c.hpp
27
include/libtorrent/create_torrent.hpp
47
include/libtorrent/create_torrent.hpp
28
include/libtorrent/deadline_timer.hpp
48
include/libtorrent/deadline_timer.hpp
29
include/libtorrent/debug.hpp
49
include/libtorrent/debug.hpp
30
include/libtorrent/disk_buffer_holder.hpp
50
include/libtorrent/disk_buffer_holder.hpp
31
include/libtorrent/disk_buffer_pool.hpp
51
include/libtorrent/disk_buffer_pool.hpp
52
include/libtorrent/disk_interface.hpp
53
include/libtorrent/disk_io_job.hpp
32
include/libtorrent/disk_io_thread.hpp
54
include/libtorrent/disk_io_thread.hpp
55
include/libtorrent/disk_job_pool.hpp
56
include/libtorrent/disk_observer.hpp
33
include/libtorrent/ed25519.hpp
57
include/libtorrent/ed25519.hpp
34
include/libtorrent/entry.hpp
58
include/libtorrent/entry.hpp
35
include/libtorrent/enum_net.hpp
59
include/libtorrent/enum_net.hpp
36
include/libtorrent/error.hpp
60
include/libtorrent/error.hpp
37
include/libtorrent/error_code.hpp
61
include/libtorrent/error_code.hpp
38
include/libtorrent/escape_string.hpp
39
include/libtorrent/export.hpp
62
include/libtorrent/export.hpp
40
include/libtorrent/extensions.hpp
63
include/libtorrent/extensions.hpp
41
include/libtorrent/extensions/logger.hpp
42
include/libtorrent/extensions/lt_trackers.hpp
64
include/libtorrent/extensions/lt_trackers.hpp
43
include/libtorrent/extensions/metadata_transfer.hpp
65
include/libtorrent/extensions/metadata_transfer.hpp
44
include/libtorrent/extensions/smart_ban.hpp
66
include/libtorrent/extensions/smart_ban.hpp
Lines 50-55 Link Here
50
include/libtorrent/fingerprint.hpp
72
include/libtorrent/fingerprint.hpp
51
include/libtorrent/gzip.hpp
73
include/libtorrent/gzip.hpp
52
include/libtorrent/hasher.hpp
74
include/libtorrent/hasher.hpp
75
include/libtorrent/heterogeneous_queue.hpp
76
include/libtorrent/hex.hpp
53
include/libtorrent/http_connection.hpp
77
include/libtorrent/http_connection.hpp
54
include/libtorrent/http_parser.hpp
78
include/libtorrent/http_parser.hpp
55
include/libtorrent/http_seed_connection.hpp
79
include/libtorrent/http_seed_connection.hpp
Lines 58-64 Link Here
58
include/libtorrent/i2p_stream.hpp
82
include/libtorrent/i2p_stream.hpp
59
include/libtorrent/identify_client.hpp
83
include/libtorrent/identify_client.hpp
60
include/libtorrent/instantiate_connection.hpp
84
include/libtorrent/instantiate_connection.hpp
61
include/libtorrent/intrusive_ptr_base.hpp
62
include/libtorrent/invariant_check.hpp
85
include/libtorrent/invariant_check.hpp
63
include/libtorrent/io.hpp
86
include/libtorrent/io.hpp
64
include/libtorrent/io_service.hpp
87
include/libtorrent/io_service.hpp
Lines 66-113 Link Here
66
include/libtorrent/ip_filter.hpp
89
include/libtorrent/ip_filter.hpp
67
include/libtorrent/ip_voter.hpp
90
include/libtorrent/ip_voter.hpp
68
include/libtorrent/kademlia/dht_observer.hpp
91
include/libtorrent/kademlia/dht_observer.hpp
92
include/libtorrent/kademlia/dht_storage.hpp
69
include/libtorrent/kademlia/dht_tracker.hpp
93
include/libtorrent/kademlia/dht_tracker.hpp
94
include/libtorrent/kademlia/direct_request.hpp
95
include/libtorrent/kademlia/dos_blocker.hpp
70
include/libtorrent/kademlia/find_data.hpp
96
include/libtorrent/kademlia/find_data.hpp
71
include/libtorrent/kademlia/get_item.hpp
97
include/libtorrent/kademlia/get_item.hpp
72
include/libtorrent/kademlia/get_peers.hpp
98
include/libtorrent/kademlia/get_peers.hpp
73
include/libtorrent/kademlia/item.hpp
99
include/libtorrent/kademlia/item.hpp
74
include/libtorrent/kademlia/logging.hpp
75
include/libtorrent/kademlia/msg.hpp
100
include/libtorrent/kademlia/msg.hpp
76
include/libtorrent/kademlia/node.hpp
101
include/libtorrent/kademlia/node.hpp
77
include/libtorrent/kademlia/node_entry.hpp
102
include/libtorrent/kademlia/node_entry.hpp
78
include/libtorrent/kademlia/node_id.hpp
103
include/libtorrent/kademlia/node_id.hpp
79
include/libtorrent/kademlia/observer.hpp
104
include/libtorrent/kademlia/observer.hpp
105
include/libtorrent/kademlia/put_data.hpp
80
include/libtorrent/kademlia/refresh.hpp
106
include/libtorrent/kademlia/refresh.hpp
81
include/libtorrent/kademlia/routing_table.hpp
107
include/libtorrent/kademlia/routing_table.hpp
82
include/libtorrent/kademlia/rpc_manager.hpp
108
include/libtorrent/kademlia/rpc_manager.hpp
83
include/libtorrent/kademlia/traversal_algorithm.hpp
109
include/libtorrent/kademlia/traversal_algorithm.hpp
84
include/libtorrent/lazy_entry.hpp
110
include/libtorrent/lazy_entry.hpp
111
include/libtorrent/link.hpp
112
include/libtorrent/linked_list.hpp
85
include/libtorrent/lsd.hpp
113
include/libtorrent/lsd.hpp
86
include/libtorrent/magnet_uri.hpp
114
include/libtorrent/magnet_uri.hpp
87
include/libtorrent/max.hpp
115
include/libtorrent/max.hpp
88
include/libtorrent/natpmp.hpp
116
include/libtorrent/natpmp.hpp
117
include/libtorrent/network_thread_pool.hpp
118
include/libtorrent/operations.hpp
89
include/libtorrent/packet_buffer.hpp
119
include/libtorrent/packet_buffer.hpp
90
include/libtorrent/parse_url.hpp
120
include/libtorrent/parse_url.hpp
121
include/libtorrent/part_file.hpp
91
include/libtorrent/pe_crypto.hpp
122
include/libtorrent/pe_crypto.hpp
92
include/libtorrent/peer.hpp
123
include/libtorrent/peer.hpp
124
include/libtorrent/peer_class.hpp
125
include/libtorrent/peer_class_set.hpp
126
include/libtorrent/peer_class_type_filter.hpp
93
include/libtorrent/peer_connection.hpp
127
include/libtorrent/peer_connection.hpp
128
include/libtorrent/peer_connection_handle.hpp
129
include/libtorrent/peer_connection_interface.hpp
94
include/libtorrent/peer_id.hpp
130
include/libtorrent/peer_id.hpp
95
include/libtorrent/peer_info.hpp
131
include/libtorrent/peer_info.hpp
132
include/libtorrent/peer_list.hpp
96
include/libtorrent/peer_request.hpp
133
include/libtorrent/peer_request.hpp
134
include/libtorrent/performance_counters.hpp
97
include/libtorrent/piece_block_progress.hpp
135
include/libtorrent/piece_block_progress.hpp
98
include/libtorrent/piece_picker.hpp
136
include/libtorrent/piece_picker.hpp
99
include/libtorrent/policy.hpp
137
include/libtorrent/platform_util.hpp
100
include/libtorrent/proxy_base.hpp
138
include/libtorrent/proxy_base.hpp
101
include/libtorrent/ptime.hpp
102
include/libtorrent/puff.hpp
139
include/libtorrent/puff.hpp
103
include/libtorrent/random.hpp
140
include/libtorrent/random.hpp
141
include/libtorrent/receive_buffer.hpp
142
include/libtorrent/request_blocks.hpp
143
include/libtorrent/resolve_links.hpp
144
include/libtorrent/resolver.hpp
145
include/libtorrent/resolver_interface.hpp
104
include/libtorrent/rss.hpp
146
include/libtorrent/rss.hpp
105
include/libtorrent/session.hpp
147
include/libtorrent/session.hpp
148
include/libtorrent/session_handle.hpp
106
include/libtorrent/session_settings.hpp
149
include/libtorrent/session_settings.hpp
150
include/libtorrent/session_stats.hpp
107
include/libtorrent/session_status.hpp
151
include/libtorrent/session_status.hpp
108
include/libtorrent/settings.hpp
152
include/libtorrent/settings_pack.hpp
153
include/libtorrent/sha1.hpp
109
include/libtorrent/sha1_hash.hpp
154
include/libtorrent/sha1_hash.hpp
110
include/libtorrent/size_type.hpp
111
include/libtorrent/sliding_average.hpp
155
include/libtorrent/sliding_average.hpp
112
include/libtorrent/socket.hpp
156
include/libtorrent/socket.hpp
113
include/libtorrent/socket_io.hpp
157
include/libtorrent/socket_io.hpp
Lines 115-125 Link Here
115
include/libtorrent/socket_type_fwd.hpp
159
include/libtorrent/socket_type_fwd.hpp
116
include/libtorrent/socks5_stream.hpp
160
include/libtorrent/socks5_stream.hpp
117
include/libtorrent/ssl_stream.hpp
161
include/libtorrent/ssl_stream.hpp
162
include/libtorrent/stack_allocator.hpp
118
include/libtorrent/stat.hpp
163
include/libtorrent/stat.hpp
164
include/libtorrent/stat_cache.hpp
119
include/libtorrent/storage.hpp
165
include/libtorrent/storage.hpp
120
include/libtorrent/storage_defs.hpp
166
include/libtorrent/storage_defs.hpp
121
include/libtorrent/string_util.hpp
167
include/libtorrent/string_util.hpp
168
include/libtorrent/tailqueue.hpp
122
include/libtorrent/thread.hpp
169
include/libtorrent/thread.hpp
170
include/libtorrent/thread_pool.hpp
123
include/libtorrent/time.hpp
171
include/libtorrent/time.hpp
124
include/libtorrent/timestamp_history.hpp
172
include/libtorrent/timestamp_history.hpp
125
include/libtorrent/tommath.h
173
include/libtorrent/tommath.h
Lines 128-141 Link Here
128
include/libtorrent/torrent.hpp
176
include/libtorrent/torrent.hpp
129
include/libtorrent/torrent_handle.hpp
177
include/libtorrent/torrent_handle.hpp
130
include/libtorrent/torrent_info.hpp
178
include/libtorrent/torrent_info.hpp
179
include/libtorrent/torrent_peer.hpp
180
include/libtorrent/torrent_peer_allocator.hpp
181
include/libtorrent/torrent_status.hpp
131
include/libtorrent/tracker_manager.hpp
182
include/libtorrent/tracker_manager.hpp
132
include/libtorrent/udp_socket.hpp
183
include/libtorrent/udp_socket.hpp
133
include/libtorrent/udp_tracker_connection.hpp
184
include/libtorrent/udp_tracker_connection.hpp
185
include/libtorrent/uncork_interface.hpp
134
include/libtorrent/union_endpoint.hpp
186
include/libtorrent/union_endpoint.hpp
135
include/libtorrent/upnp.hpp
187
include/libtorrent/upnp.hpp
136
include/libtorrent/utf8.hpp
188
include/libtorrent/utf8.hpp
137
include/libtorrent/utp_socket_manager.hpp
189
include/libtorrent/utp_socket_manager.hpp
138
include/libtorrent/utp_stream.hpp
190
include/libtorrent/utp_stream.hpp
191
include/libtorrent/vector_utils.hpp
139
include/libtorrent/version.hpp
192
include/libtorrent/version.hpp
140
include/libtorrent/web_connection_base.hpp
193
include/libtorrent/web_connection_base.hpp
141
include/libtorrent/web_peer_connection.hpp
194
include/libtorrent/web_peer_connection.hpp
Lines 144-246 Link Here
144
lib/libtorrent-rasterbar.so.%%SHLIB_VER%%
197
lib/libtorrent-rasterbar.so.%%SHLIB_VER%%
145
lib/libtorrent-rasterbar.so.%%SHLIB_VER%%.0.0
198
lib/libtorrent-rasterbar.so.%%SHLIB_VER%%.0.0
146
libdata/pkgconfig/libtorrent-rasterbar.pc
199
libdata/pkgconfig/libtorrent-rasterbar.pc
147
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
148
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
149
%%PORTDOCS%%%%DOCSDIR%%/docs/building.html
150
%%PORTDOCS%%%%DOCSDIR%%/docs/building.rst
151
%%PORTDOCS%%%%DOCSDIR%%/docs/client_test.html
152
%%PORTDOCS%%%%DOCSDIR%%/docs/client_test.png
153
%%PORTDOCS%%%%DOCSDIR%%/docs/client_test.rst
154
%%PORTDOCS%%%%DOCSDIR%%/docs/complete_bit_prefixes.png
155
%%PORTDOCS%%%%DOCSDIR%%/docs/contributing.html
156
%%PORTDOCS%%%%DOCSDIR%%/docs/contributing.rst
157
%%PORTDOCS%%%%DOCSDIR%%/docs/cwnd.png
158
%%PORTDOCS%%%%DOCSDIR%%/docs/cwnd_thumb.png
159
%%PORTDOCS%%%%DOCSDIR%%/docs/delays.png
160
%%PORTDOCS%%%%DOCSDIR%%/docs/delays_thumb.png
161
%%PORTDOCS%%%%DOCSDIR%%/docs/dht_extensions.html
162
%%PORTDOCS%%%%DOCSDIR%%/docs/dht_extensions.rst
163
%%PORTDOCS%%%%DOCSDIR%%/docs/dht_rss.html
164
%%PORTDOCS%%%%DOCSDIR%%/docs/dht_rss.rst
165
%%PORTDOCS%%%%DOCSDIR%%/docs/dht_sec.html
166
%%PORTDOCS%%%%DOCSDIR%%/docs/dht_sec.rst
167
%%PORTDOCS%%%%DOCSDIR%%/docs/dht_store.html
168
%%PORTDOCS%%%%DOCSDIR%%/docs/dht_store.rst
169
%%PORTDOCS%%%%DOCSDIR%%/docs/disk_access.png
170
%%PORTDOCS%%%%DOCSDIR%%/docs/disk_access_elevator.png
171
%%PORTDOCS%%%%DOCSDIR%%/docs/disk_access_no_elevator.png
172
%%PORTDOCS%%%%DOCSDIR%%/docs/disk_buffer.png
173
%%PORTDOCS%%%%DOCSDIR%%/docs/disk_buffer_before_optimization.png
174
%%PORTDOCS%%%%DOCSDIR%%/docs/disk_buffer_sample.png
175
%%PORTDOCS%%%%DOCSDIR%%/docs/disk_io.png
176
%%PORTDOCS%%%%DOCSDIR%%/docs/examples.html
177
%%PORTDOCS%%%%DOCSDIR%%/docs/examples.rst
178
%%PORTDOCS%%%%DOCSDIR%%/docs/extension_protocol.html
179
%%PORTDOCS%%%%DOCSDIR%%/docs/extension_protocol.rst
180
%%PORTDOCS%%%%DOCSDIR%%/docs/features.html
181
%%PORTDOCS%%%%DOCSDIR%%/docs/features.rst
182
%%PORTDOCS%%%%DOCSDIR%%/docs/hacking.diagram
183
%%PORTDOCS%%%%DOCSDIR%%/docs/hacking.html
184
%%PORTDOCS%%%%DOCSDIR%%/docs/hacking.png
185
%%PORTDOCS%%%%DOCSDIR%%/docs/hash_distribution.png
186
%%PORTDOCS%%%%DOCSDIR%%/docs/im_thumb.jpg
187
%%PORTDOCS%%%%DOCSDIR%%/docs/img/bg.png
188
%%PORTDOCS%%%%DOCSDIR%%/docs/img/blue_bottom.png
189
%%PORTDOCS%%%%DOCSDIR%%/docs/img/blue_top.png
190
%%PORTDOCS%%%%DOCSDIR%%/docs/img/dotline.gif
191
%%PORTDOCS%%%%DOCSDIR%%/docs/img/minus.gif
192
%%PORTDOCS%%%%DOCSDIR%%/docs/img/orange.png
193
%%PORTDOCS%%%%DOCSDIR%%/docs/index.html
194
%%PORTDOCS%%%%DOCSDIR%%/docs/index.rst
195
%%PORTDOCS%%%%DOCSDIR%%/docs/ip_id_v4.png
196
%%PORTDOCS%%%%DOCSDIR%%/docs/ip_id_v6.png
197
%%PORTDOCS%%%%DOCSDIR%%/docs/manual-ref.html
198
%%PORTDOCS%%%%DOCSDIR%%/docs/manual-ref.rst
199
%%PORTDOCS%%%%DOCSDIR%%/docs/merkle_tree.png
200
%%PORTDOCS%%%%DOCSDIR%%/docs/our_delay_base.png
201
%%PORTDOCS%%%%DOCSDIR%%/docs/our_delay_base_thumb.png
202
%%PORTDOCS%%%%DOCSDIR%%/docs/projects.html
203
%%PORTDOCS%%%%DOCSDIR%%/docs/projects.rst
204
%%PORTDOCS%%%%DOCSDIR%%/docs/python_binding.html
205
%%PORTDOCS%%%%DOCSDIR%%/docs/python_binding.rst
206
%%PORTDOCS%%%%DOCSDIR%%/docs/read_disk_buffers.diagram
207
%%PORTDOCS%%%%DOCSDIR%%/docs/read_disk_buffers.png
208
%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Alerts.html
209
%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Bencoding.html
210
%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Core.html
211
%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Create_Torrents.html
212
%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Custom_Storage.html
213
%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Error_Codes.html
214
%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Filter.html
215
%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Plugins.html
216
%%PORTDOCS%%%%DOCSDIR%%/docs/reference-RSS.html
217
%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Session.html
218
%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Settings.html
219
%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Storage.html
220
%%PORTDOCS%%%%DOCSDIR%%/docs/reference-String.html
221
%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Time.html
222
%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Utility.html
223
%%PORTDOCS%%%%DOCSDIR%%/docs/reference.html
224
%%PORTDOCS%%%%DOCSDIR%%/docs/rst.css
225
%%PORTDOCS%%%%DOCSDIR%%/docs/session_stats_peers.png
226
%%PORTDOCS%%%%DOCSDIR%%/docs/storage.png
227
%%PORTDOCS%%%%DOCSDIR%%/docs/streaming.html
228
%%PORTDOCS%%%%DOCSDIR%%/docs/streaming.rst
229
%%PORTDOCS%%%%DOCSDIR%%/docs/style.css
230
%%PORTDOCS%%%%DOCSDIR%%/docs/todo.html
231
%%PORTDOCS%%%%DOCSDIR%%/docs/troubleshooting.dot
232
%%PORTDOCS%%%%DOCSDIR%%/docs/troubleshooting.html
233
%%PORTDOCS%%%%DOCSDIR%%/docs/troubleshooting.png
234
%%PORTDOCS%%%%DOCSDIR%%/docs/troubleshooting.rst
235
%%PORTDOCS%%%%DOCSDIR%%/docs/troubleshooting_thumb.png
236
%%PORTDOCS%%%%DOCSDIR%%/docs/tuning.html
237
%%PORTDOCS%%%%DOCSDIR%%/docs/tuning.rst
238
%%PORTDOCS%%%%DOCSDIR%%/docs/udp_tracker_protocol.html
239
%%PORTDOCS%%%%DOCSDIR%%/docs/udp_tracker_protocol.rst
240
%%PORTDOCS%%%%DOCSDIR%%/docs/utp.html
241
%%PORTDOCS%%%%DOCSDIR%%/docs/utp.rst
242
%%PORTDOCS%%%%DOCSDIR%%/docs/utp_stack.diagram
243
%%PORTDOCS%%%%DOCSDIR%%/docs/utp_stack.png
244
%%PORTDOCS%%%%DOCSDIR%%/docs/write_disk_buffers.diagram
245
%%PORTDOCS%%%%DOCSDIR%%/docs/write_disk_buffers.png
246
%%PORTDOCS%%%%DOCSDIR%%/docs/ziptorrent_thumb.gif
(-)net-p2p/libtorrent-rasterbar-python/Makefile (-2 / +4 lines)
Lines 6-11 Link Here
6
6
7
COMMENT=	Python bindings for libtorrent-rasterbar
7
COMMENT=	Python bindings for libtorrent-rasterbar
8
8
9
LICENSE=	BSD3CLAUSE
10
9
LIB_DEPENDS=	libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar \
11
LIB_DEPENDS=	libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar \
10
		libboost_python.so:devel/boost-python-libs
12
		libboost_python.so:devel/boost-python-libs
11
13
Lines 22-30 Link Here
22
PLIST=		${NONEXISTENT}
24
PLIST=		${NONEXISTENT}
23
PLIST_FILES=	%%PYTHON_SITELIBDIR%%/libtorrent.so
25
PLIST_FILES=	%%PYTHON_SITELIBDIR%%/libtorrent.so
24
26
25
OPTIONS_EXCLUDE=	DOCS EXAMPLES STRIP
27
OPTIONS_EXCLUDE=	DOCS EXAMPLES
26
28
27
# insure python paths are correctly identified
29
# ensure python paths are correctly identified
28
CONFIGURE_ENV=	PYTHON_INCLUDEDIR="${PYTHON_INCLUDEDIR}" \
30
CONFIGURE_ENV=	PYTHON_INCLUDEDIR="${PYTHON_INCLUDEDIR}" \
29
		PYTHON_VERSION="${PYTHON_VERSION}"
31
		PYTHON_VERSION="${PYTHON_VERSION}"
30
32

Return to bug 211963