Attachment #78852 for bug #113352

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

Lines 6-13 Link Here

(-)rblibtorrent/Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= libtorrent	8	PORTNAME= libtorrent
9	PORTVERSION= 0.11	9	PORTVERSION= 0.12
10	PORTREVISION= 1
11	CATEGORIES= net-p2p	10	CATEGORIES= net-p2p
12	MASTER_SITES= SF	11	MASTER_SITES= SF
13	PKGNAMEPREFIX= rb	12	PKGNAMEPREFIX= rb

Lines 1-3 Link Here

(-)rblibtorrent/distinfo (-3 / +3 lines)
1	MD5 (libtorrent-0.11.tar.gz) = 56e9071b95a6e3f9377121f2fead3499	1	MD5 (libtorrent-0.12.tar.gz) = a09a37e6fc74d152821c00c3cb15d248
2	SHA256 (libtorrent-0.11.tar.gz) = f350e0af6b42c2cdb1f19008b00fe5f0b70236817f532a94bcb1e3ef6ebba0d7	2	SHA256 (libtorrent-0.12.tar.gz) = 0663f9adaa9d90334ebf78eb6f5b31074ff533d7bec5d3325ff98baad5b7df07
3	SIZE (libtorrent-0.11.tar.gz) = 1130537	3	SIZE (libtorrent-0.12.tar.gz) = 1176469

Lines 1-11 Link Here

(-)rblibtorrent/files/patch-Makefile.in (-5 / +5 lines)
1	--- Makefile.in.orig Wed Nov 29 13:16:17 2006	1	--- ./Makefile.in.orig Fri May 4 03:03:26 2007
2	+++ Makefile.in Wed Nov 29 13:16:22 2006	2	+++ ./Makefile.in Tue Jun 5 00:27:17 2007
3	@@ -235,7 +235,7 @@	3	@@ -258,7 +258,7 @@
4	debian/libtorrent0.install \	4	debian/libtorrent0.install \
5	debian/rules	5	debian/rules
6		6
7	-pkgconfigdir = $(libdir)/pkgconfig	7	-pkgconfigdir = $(libdir)/pkgconfig
8	+pkgconfigdir = $(prefix)/libdata/pkgconfig	8	+pkgconfigdir = $(prefix)/libdata/pkgconfig
9	pkgconfig_DATA = libtorrent.pc	9	pkgconfig_DATA = libtorrent.pc
10	all: config.h	10	all: all-recursive
11	$(MAKE) $(AM_MAKEFLAGS) all-recursive	11




--- include/libtorrent/asio/detail/socket_ops.hpp.original	Tue Oct 24 00:50:21 2006
+++ include/libtorrent/asio/detail/socket_ops.hpp	Wed Nov 29 14:40:02 2006
@@ -66,7 +66,7 @@
     socket_addr_len_type* addrlen)
 {
   set_error(0);
-#if defined(__MACH__) && defined(__APPLE__)
+#if defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__)
   socket_type new_s = error_wrapper(::accept(s, addr, addrlen));
   if (new_s == invalid_socket)
     return new_s;
@@ -279,7 +279,7 @@
 #if defined(BOOST_WINDOWS) || defined(__CYGWIN__)
   return error_wrapper(::WSASocket(af, type, protocol, 0, 0,
         WSA_FLAG_OVERLAPPED));
-#elif defined(__MACH__) && defined(__APPLE__)
+#elif defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__)
   socket_type s = error_wrapper(::socket(af, type, protocol));
   if (s == invalid_socket)
     return s;
@@ -561,7 +561,7 @@
 }
 
 #if defined(BOOST_WINDOWS) || defined(__CYGWIN__) \
-  || defined(__MACH__) && defined(__APPLE__)
+  || defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__)
 
 // The following functions are only needed for emulation of getaddrinfo and
 // getnameinfo.
@@ -604,7 +604,7 @@
         buffer, buflength, error));
   *error = translate_netdb_error(*error);
   return retval;
-#elif defined(__MACH__) && defined(__APPLE__)
+#elif defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__)
   (void)(buffer);
   (void)(buflength);
   hostent* retval = error_wrapper(::getipnodebyaddr(addr, length, af, error));
@@ -652,7 +652,7 @@
         buflength, error));
   *error = translate_netdb_error(*error);
   return retval;
-#elif defined(__MACH__) && defined(__APPLE__)
+#elif defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__)
   (void)(buffer);
   (void)(buflength);
   hostent* retval = error_wrapper(::getipnodebyname(
@@ -679,7 +679,7 @@
 
 inline void freehostent(hostent* h)
 {
-#if defined(__MACH__) && defined(__APPLE__)
+#if defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__)
   if (h)
     ::freehostent(h);
 #else
@@ -1372,7 +1372,7 @@
 }
 
 #endif // defined(BOOST_WINDOWS) || defined(__CYGWIN__)
-       //   || defined(__MACH__) && defined(__APPLE__)
+       //   || defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__)
 
 inline int translate_addrinfo_error(int error)
 {
@@ -1425,7 +1425,7 @@
   int error = getaddrinfo_emulation(host, service, hints, result);
   return translate_addrinfo_error(error);
 # endif
-#elif defined(__MACH__) && defined(__APPLE__)
+#elif defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__)
   int error = getaddrinfo_emulation(host, service, hints, result);
   return translate_addrinfo_error(error);
 #else
@@ -1453,7 +1453,7 @@
   }
   freeaddrinfo_emulation(ai);
 # endif
-#elif defined(__MACH__) && defined(__APPLE__)
+#elif defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__)
   freeaddrinfo_emulation(ai);
 #else
   ::freeaddrinfo(ai);
@@ -1488,7 +1488,7 @@
       host, hostlen, serv, servlen, flags);
   return translate_addrinfo_error(error);
 # endif
-#elif defined(__MACH__) && defined(__APPLE__)
+#elif defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__)
   using namespace std; // For memcpy.
   sockaddr_storage_type tmp_addr;
   memcpy(&tmp_addr, addr, addrlen);

Return to bug 113352

Lines 5-11 Link Here

(-)rblibtorrent/pkg-plist (-5 / +17 lines)
5	include/libtorrent/asio/basic_datagram_socket.hpp	5	include/libtorrent/asio/basic_datagram_socket.hpp
6	include/libtorrent/asio/basic_deadline_timer.hpp	6	include/libtorrent/asio/basic_deadline_timer.hpp
7	include/libtorrent/asio/basic_io_object.hpp	7	include/libtorrent/asio/basic_io_object.hpp
8	include/libtorrent/asio/basic_resolver.hpp
9	include/libtorrent/asio/basic_socket.hpp	8	include/libtorrent/asio/basic_socket.hpp
10	include/libtorrent/asio/basic_socket_acceptor.hpp	9	include/libtorrent/asio/basic_socket_acceptor.hpp
11	include/libtorrent/asio/basic_socket_iostream.hpp	10	include/libtorrent/asio/basic_socket_iostream.hpp
Lines 40-45 Link Here
40	include/libtorrent/asio/detail/io_control.hpp	39	include/libtorrent/asio/detail/io_control.hpp
41	include/libtorrent/asio/detail/kqueue_reactor.hpp	40	include/libtorrent/asio/detail/kqueue_reactor.hpp
42	include/libtorrent/asio/detail/kqueue_reactor_fwd.hpp	41	include/libtorrent/asio/detail/kqueue_reactor_fwd.hpp
		42	include/libtorrent/asio/detail/local_free_on_block_exit.hpp
43	include/libtorrent/asio/detail/mutex.hpp	43	include/libtorrent/asio/detail/mutex.hpp
44	include/libtorrent/asio/detail/noncopyable.hpp	44	include/libtorrent/asio/detail/noncopyable.hpp
45	include/libtorrent/asio/detail/null_event.hpp	45	include/libtorrent/asio/detail/null_event.hpp
Lines 64-70 Link Here
64	include/libtorrent/asio/detail/select_interrupter.hpp	64	include/libtorrent/asio/detail/select_interrupter.hpp
65	include/libtorrent/asio/detail/select_reactor.hpp	65	include/libtorrent/asio/detail/select_reactor.hpp
66	include/libtorrent/asio/detail/select_reactor_fwd.hpp	66	include/libtorrent/asio/detail/select_reactor_fwd.hpp
		67	include/libtorrent/asio/detail/service_base.hpp
		68	include/libtorrent/asio/detail/service_id.hpp
67	include/libtorrent/asio/detail/service_registry.hpp	69	include/libtorrent/asio/detail/service_registry.hpp
		70	include/libtorrent/asio/detail/service_registry_fwd.hpp
68	include/libtorrent/asio/detail/signal_blocker.hpp	71	include/libtorrent/asio/detail/signal_blocker.hpp
69	include/libtorrent/asio/detail/signal_init.hpp	72	include/libtorrent/asio/detail/signal_init.hpp
70	include/libtorrent/asio/detail/socket_holder.hpp	73	include/libtorrent/asio/detail/socket_holder.hpp
Lines 76-81 Link Here
76	include/libtorrent/asio/detail/task_io_service.hpp	79	include/libtorrent/asio/detail/task_io_service.hpp
77	include/libtorrent/asio/detail/task_io_service_fwd.hpp	80	include/libtorrent/asio/detail/task_io_service_fwd.hpp
78	include/libtorrent/asio/detail/thread.hpp	81	include/libtorrent/asio/detail/thread.hpp
		82	include/libtorrent/asio/detail/throw_error.hpp
79	include/libtorrent/asio/detail/timer_queue.hpp	83	include/libtorrent/asio/detail/timer_queue.hpp
80	include/libtorrent/asio/detail/timer_queue_base.hpp	84	include/libtorrent/asio/detail/timer_queue_base.hpp
81	include/libtorrent/asio/detail/tss_ptr.hpp	85	include/libtorrent/asio/detail/tss_ptr.hpp
Lines 85-91 Link Here
85	include/libtorrent/asio/detail/win_iocp_io_service_fwd.hpp	89	include/libtorrent/asio/detail/win_iocp_io_service_fwd.hpp
86	include/libtorrent/asio/detail/win_iocp_operation.hpp	90	include/libtorrent/asio/detail/win_iocp_operation.hpp
87	include/libtorrent/asio/detail/win_iocp_socket_service.hpp	91	include/libtorrent/asio/detail/win_iocp_socket_service.hpp
88	include/libtorrent/asio/detail/win_local_free_on_block_exit.hpp
89	include/libtorrent/asio/detail/win_mutex.hpp	92	include/libtorrent/asio/detail/win_mutex.hpp
90	include/libtorrent/asio/detail/win_signal_blocker.hpp	93	include/libtorrent/asio/detail/win_signal_blocker.hpp
91	include/libtorrent/asio/detail/win_thread.hpp	94	include/libtorrent/asio/detail/win_thread.hpp
Lines 93-101 Link Here
93	include/libtorrent/asio/detail/winsock_init.hpp	96	include/libtorrent/asio/detail/winsock_init.hpp
94	include/libtorrent/asio/detail/wrapped_handler.hpp	97	include/libtorrent/asio/detail/wrapped_handler.hpp
95	include/libtorrent/asio/error.hpp	98	include/libtorrent/asio/error.hpp
96	include/libtorrent/asio/error_handler.hpp	99	include/libtorrent/asio/error_code.hpp
97	include/libtorrent/asio/handler_alloc_hook.hpp	100	include/libtorrent/asio/handler_alloc_hook.hpp
98	include/libtorrent/asio/handler_invoke_hook.hpp	101	include/libtorrent/asio/handler_invoke_hook.hpp
		102	include/libtorrent/asio/impl/error_code.ipp
99	include/libtorrent/asio/impl/io_service.ipp	103	include/libtorrent/asio/impl/io_service.ipp
100	include/libtorrent/asio/impl/read.ipp	104	include/libtorrent/asio/impl/read.ipp
101	include/libtorrent/asio/impl/read_until.ipp	105	include/libtorrent/asio/impl/read_until.ipp
Lines 105-110 Link Here
105	include/libtorrent/asio/ip/address_v4.hpp	109	include/libtorrent/asio/ip/address_v4.hpp
106	include/libtorrent/asio/ip/address_v6.hpp	110	include/libtorrent/asio/ip/address_v6.hpp
107	include/libtorrent/asio/ip/basic_endpoint.hpp	111	include/libtorrent/asio/ip/basic_endpoint.hpp
		112	include/libtorrent/asio/ip/basic_resolver.hpp
108	include/libtorrent/asio/ip/basic_resolver_entry.hpp	113	include/libtorrent/asio/ip/basic_resolver_entry.hpp
109	include/libtorrent/asio/ip/basic_resolver_iterator.hpp	114	include/libtorrent/asio/ip/basic_resolver_iterator.hpp
110	include/libtorrent/asio/ip/basic_resolver_query.hpp	115	include/libtorrent/asio/ip/basic_resolver_query.hpp
Lines 112-117 Link Here
112	include/libtorrent/asio/ip/host_name.hpp	117	include/libtorrent/asio/ip/host_name.hpp
113	include/libtorrent/asio/ip/multicast.hpp	118	include/libtorrent/asio/ip/multicast.hpp
114	include/libtorrent/asio/ip/resolver_query_base.hpp	119	include/libtorrent/asio/ip/resolver_query_base.hpp
		120	include/libtorrent/asio/ip/resolver_service.hpp
115	include/libtorrent/asio/ip/tcp.hpp	121	include/libtorrent/asio/ip/tcp.hpp
116	include/libtorrent/asio/ip/udp.hpp	122	include/libtorrent/asio/ip/udp.hpp
117	include/libtorrent/asio/is_read_buffered.hpp	123	include/libtorrent/asio/is_read_buffered.hpp
Lines 119-125 Link Here
119	include/libtorrent/asio/placeholders.hpp	125	include/libtorrent/asio/placeholders.hpp
120	include/libtorrent/asio/read.hpp	126	include/libtorrent/asio/read.hpp
121	include/libtorrent/asio/read_until.hpp	127	include/libtorrent/asio/read_until.hpp
122	include/libtorrent/asio/resolver_service.hpp
123	include/libtorrent/asio/socket_acceptor_service.hpp	128	include/libtorrent/asio/socket_acceptor_service.hpp
124	include/libtorrent/asio/socket_base.hpp	129	include/libtorrent/asio/socket_base.hpp
125	include/libtorrent/asio/ssl.hpp	130	include/libtorrent/asio/ssl.hpp
Lines 138-149 Link Here
138	include/libtorrent/asio/strand.hpp	143	include/libtorrent/asio/strand.hpp
139	include/libtorrent/asio/stream_socket_service.hpp	144	include/libtorrent/asio/stream_socket_service.hpp
140	include/libtorrent/asio/streambuf.hpp	145	include/libtorrent/asio/streambuf.hpp
141	include/libtorrent/asio/system_exception.hpp	146	include/libtorrent/asio/system_error.hpp
142	include/libtorrent/asio/thread.hpp	147	include/libtorrent/asio/thread.hpp
143	include/libtorrent/asio/time_traits.hpp	148	include/libtorrent/asio/time_traits.hpp
144	include/libtorrent/asio/write.hpp	149	include/libtorrent/asio/write.hpp
145	include/libtorrent/aux_/allocate_resources_impl.hpp	150	include/libtorrent/aux_/allocate_resources_impl.hpp
146	include/libtorrent/aux_/session_impl.hpp	151	include/libtorrent/aux_/session_impl.hpp
		152	include/libtorrent/bandwidth_manager.hpp
147	include/libtorrent/bencode.hpp	153	include/libtorrent/bencode.hpp
148	include/libtorrent/bt_peer_connection.hpp	154	include/libtorrent/bt_peer_connection.hpp
149	include/libtorrent/buffer.hpp	155	include/libtorrent/buffer.hpp
Lines 151-157 Link Here
151	include/libtorrent/debug.hpp	157	include/libtorrent/debug.hpp
152	include/libtorrent/entry.hpp	158	include/libtorrent/entry.hpp
153	include/libtorrent/escape_string.hpp	159	include/libtorrent/escape_string.hpp
		160	include/libtorrent/extensions.hpp
		161	include/libtorrent/extensions/logger.hpp
		162	include/libtorrent/extensions/metadata_transfer.hpp
		163	include/libtorrent/extensions/ut_pex.hpp
154	include/libtorrent/file.hpp	164	include/libtorrent/file.hpp
		165	include/libtorrent/file_pool.hpp
155	include/libtorrent/fingerprint.hpp	166	include/libtorrent/fingerprint.hpp
156	include/libtorrent/hasher.hpp	167	include/libtorrent/hasher.hpp
157	include/libtorrent/http_tracker_connection.hpp	168	include/libtorrent/http_tracker_connection.hpp
Lines 202-207 Link Here
202	lib/libtorrent.so.1	213	lib/libtorrent.so.1
203	libdata/pkgconfig/libtorrent.pc	214	libdata/pkgconfig/libtorrent.pc
204	@dirrm include/libtorrent/kademlia	215	@dirrm include/libtorrent/kademlia
		216	@dirrm include/libtorrent/extensions
205	@dirrm include/libtorrent/aux_	217	@dirrm include/libtorrent/aux_
206	@dirrm include/libtorrent/asio/ssl/detail	218	@dirrm include/libtorrent/asio/ssl/detail
207	@dirrm include/libtorrent/asio/ssl	219	@dirrm include/libtorrent/asio/ssl

Removed Link Here

(-)rblibtorrent/files/patch-include_libtorrent_asio_detail_socket_ops.hpp (-92 lines)
1	--- include/libtorrent/asio/detail/socket_ops.hpp.original Tue Oct 24 00:50:21 2006
2	+++ include/libtorrent/asio/detail/socket_ops.hpp Wed Nov 29 14:40:02 2006
3	@@ -66,7 +66,7 @@
4	socket_addr_len_type* addrlen)
5	{
6	set_error(0);
7	-#if defined(__MACH__) && defined(__APPLE__)
8	+#if defined(__MACH__) && defined(__APPLE__) \|\| defined(__FreeBSD__)
9	socket_type new_s = error_wrapper(::accept(s, addr, addrlen));
10	if (new_s == invalid_socket)
11	return new_s;
12	@@ -279,7 +279,7 @@
13	#if defined(BOOST_WINDOWS) \|\| defined(__CYGWIN__)
14	return error_wrapper(::WSASocket(af, type, protocol, 0, 0,
15	WSA_FLAG_OVERLAPPED));
16	-#elif defined(__MACH__) && defined(__APPLE__)
17	+#elif defined(__MACH__) && defined(__APPLE__) \|\| defined(__FreeBSD__)
18	socket_type s = error_wrapper(::socket(af, type, protocol));
19	if (s == invalid_socket)
20	return s;
21	@@ -561,7 +561,7 @@
22	}
23
24	#if defined(BOOST_WINDOWS) \|\| defined(__CYGWIN__) \
25	- \|\| defined(__MACH__) && defined(__APPLE__)
26	+ \|\| defined(__MACH__) && defined(__APPLE__) \|\| defined(__FreeBSD__)
27
28	// The following functions are only needed for emulation of getaddrinfo and
29	// getnameinfo.
30	@@ -604,7 +604,7 @@
31	buffer, buflength, error));
32	error = translate_netdb_error(error);
33	return retval;
34	-#elif defined(__MACH__) && defined(__APPLE__)
35	+#elif defined(__MACH__) && defined(__APPLE__) \|\| defined(__FreeBSD__)
36	(void)(buffer);
37	(void)(buflength);
38	hostent* retval = error_wrapper(::getipnodebyaddr(addr, length, af, error));
39	@@ -652,7 +652,7 @@
40	buflength, error));
41	error = translate_netdb_error(error);
42	return retval;
43	-#elif defined(__MACH__) && defined(__APPLE__)
44	+#elif defined(__MACH__) && defined(__APPLE__) \|\| defined(__FreeBSD__)
45	(void)(buffer);
46	(void)(buflength);
47	hostent* retval = error_wrapper(::getipnodebyname(
48	@@ -679,7 +679,7 @@
49
50	inline void freehostent(hostent* h)
51	{
52	-#if defined(__MACH__) && defined(__APPLE__)
53	+#if defined(__MACH__) && defined(__APPLE__) \|\| defined(__FreeBSD__)
54	if (h)
55	::freehostent(h);
56	#else
57	@@ -1372,7 +1372,7 @@
58	}
59
60	#endif // defined(BOOST_WINDOWS) \|\| defined(__CYGWIN__)
61	- // \|\| defined(__MACH__) && defined(__APPLE__)
62	+ // \|\| defined(__MACH__) && defined(__APPLE__) \|\| defined(__FreeBSD__)
63
64	inline int translate_addrinfo_error(int error)
65	{
66	@@ -1425,7 +1425,7 @@
67	int error = getaddrinfo_emulation(host, service, hints, result);
68	return translate_addrinfo_error(error);
69	# endif
70	-#elif defined(__MACH__) && defined(__APPLE__)
71	+#elif defined(__MACH__) && defined(__APPLE__) \|\| defined(__FreeBSD__)
72	int error = getaddrinfo_emulation(host, service, hints, result);
73	return translate_addrinfo_error(error);
74	#else
75	@@ -1453,7 +1453,7 @@
76	}
77	freeaddrinfo_emulation(ai);
78	# endif
79	-#elif defined(__MACH__) && defined(__APPLE__)
80	+#elif defined(__MACH__) && defined(__APPLE__) \|\| defined(__FreeBSD__)
81	freeaddrinfo_emulation(ai);
82	#else
83	::freeaddrinfo(ai);
84	@@ -1488,7 +1488,7 @@
85	host, hostlen, serv, servlen, flags);
86	return translate_addrinfo_error(error);
87	# endif
88	-#elif defined(__MACH__) && defined(__APPLE__)
89	+#elif defined(__MACH__) && defined(__APPLE__) \|\| defined(__FreeBSD__)
90	using namespace std; // For memcpy.
91	sockaddr_storage_type tmp_addr;
92	memcpy(&tmp_addr, addr, addrlen);