~ubuntu-branches/ubuntu/oneiric/libtorrent/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/561232.patch

  • Committer: Bazaar Package Importer
  • Author(s): Rogério Brito
  • Date: 2011-03-20 01:06:18 UTC
  • mfrom: (1.1.13 upstream) (4.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20110320010618-g3wyylccqzqko73c
Tags: 0.12.7-5
* Use Steinar's "real" patch for IPv6. Addresses #490277, #618275,
  and Closes: #617791.
* Adapt libtorrent-0.12.6-ipv6-07.patch. It FTBFS otherwise.
* Add proper attibution to the IPv6 patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
--- build-tree/libtorrent-0.12.6/src/protocol/handshake_manager.cc
2
 
+++ build-tree/libtorrent-0.12.6/src/protocol/handshake_manager.cc
 
1
--- a/src/protocol/handshake_manager.cc
 
2
+++ b/src/protocol/handshake_manager.cc
3
3
@@ -134,8 +134,12 @@
4
4
 
5
5
 void
22
22
     create_outgoing(*sa, download, retry_options);
23
23
   }
24
24
 
25
 
--- build-tree/libtorrent-0.12.6/src/torrent/connection_manager.h
26
 
+++ build-tree/libtorrent-0.12.6/src/torrent/connection_manager.h
 
25
--- a/src/torrent/connection_manager.h
 
26
+++ b/src/torrent/connection_manager.h
27
27
@@ -86,6 +86,7 @@
28
28
 
29
29
   // Internal to libtorrent.
32
32
 
33
33
   enum {
34
34
     handshake_incoming           = 1,
35
 
 
36