← Back to branch summary

~ubuntu-branches/ubuntu/utopic/bittornado/utopic

« back to all changes in this revision

Viewing changes to debian/patches/23_remove_UPnP_options.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Cameron Dale
  • Date: 2008-07-19 16:08:44 UTC
  • mfrom: (0.1.14 intrepid)
  • Revision ID: james.westby@ubuntu.com-20080719160844-nnmp02ar9pri55v1
Tags: 0.3.18-7
http://bugs.debian.org/485320
* Refresh all the quilt patches (Closes: #485320)
* Update standards version to 3.8.0
  - Add a README.source file pointing to the quilt documentation
* medium urgency to get it into lenny

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/23_remove_UPnP_options.dpatch
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## 23_remove_UPnP_options.dpatch by Cameron Dale <camrdale@gmail.com>
 
3
##
 
4
## All lines beginning with `## DP:' are a description of the patch.
 
5
## DP: Remove the UPnP options which only work on Windows.
 
6
 
 
7
@DPATCH@
 
8
--- bittornado.orig/BitTornado/download_bt1.py
 
9
+++ bittornado/BitTornado/download_bt1.py
 
10
@@ -95,9 +95,6 @@
 
11
          'allow the client to connect to peers via IPv6'),
 
12
     ('ipv6_binds_v4', autodetect_socket_style(),
 
13
         "set if an IPv6 server socket won't also field IPv4 connections"),
 
14
-    ('upnp_nat_access', 1,
 
15
-        'attempt to autoconfigure a UPnP router to forward a server port ' +
 
16
-        '(0 = disabled, 1 = mode 1 [fast], 2 = mode 2 [slow])'),
 
17
     ('upload_rate_fudge', 5.0, 
 
18
         'time equivalent of writing to kernel-level TCP buffer, for rate adjustment'),
 
19
     ('tcp_ack_fudge', 0.03,
 
20
@@ -194,7 +191,7 @@
 
21
                           config['timeout'], ipv6_enable = config['ipv6_enabled'],
 
22
                           failfunc = failed, errorfunc = exchandler)
 
23
 
 
24
-    upnp_type = UPnP_test(config['upnp_nat_access'])
 
25
+    upnp_type = 0
 
26
     try:
 
27
         listen_port = rawserver.find_and_bind(config['minport'], config['maxport'],
 
28
                         config['bind'], ipv6_socket_style = config['ipv6_binds_v4'],
 
29
--- bittornado.orig/BitTornado/launchmanycore.py
 
30
+++ bittornado/BitTornado/launchmanycore.py
 
31
@@ -169,7 +169,7 @@
 
32
             self.rawserver = RawServer(self.doneflag, config['timeout_check_interval'],
 
33
                               config['timeout'], ipv6_enable = config['ipv6_enabled'],
 
34
                               failfunc = self.failed, errorfunc = self.exchandler)
 
35
-            upnp_type = UPnP_test(config['upnp_nat_access'])
 
36
+            upnp_type = 0
 
37
             while True:
 
38
                 try:
 
39
                     self.listen_port = self.rawserver.find_and_bind(
 
40
--- bittornado.orig/btdownloadcurses.py
 
41
+++ bittornado/btdownloadcurses.py
 
42
@@ -334,7 +334,7 @@
 
43
                                   config['timeout'], ipv6_enable = config['ipv6_enabled'],
 
44
                                   failfunc = d.failed, errorfunc = d.error)
 
45
 
 
46
-            upnp_type = UPnP_test(config['upnp_nat_access'])
 
47
+            upnp_type = 0
 
48
             while True:
 
49
                 try:
 
50
                     listen_port = rawserver.find_and_bind(config['minport'], config['maxport'],
 
51
--- bittornado.orig/btdownloadgui.py
 
52
+++ bittornado/btdownloadgui.py
 
53
@@ -2253,7 +2253,7 @@
 
54
                                   config['timeout'], ipv6_enable = config['ipv6_enabled'],
 
55
                                   failfunc = d.error, errorfunc = d.errorwindow)
 
56
 
 
57
-            upnp_type = UPnP_test(config['upnp_nat_access'])
 
58
+            upnp_type = 0
 
59
             while True:
 
60
                 try:
 
61
                     listen_port = rawserver.find_and_bind(config['minport'], config['maxport'],
 
62
--- bittornado.orig/btdownloadheadless.py
 
63
+++ bittornado/btdownloadheadless.py
 
64
@@ -175,7 +175,7 @@
 
65
         rawserver = RawServer(doneflag, config['timeout_check_interval'],
 
66
                               config['timeout'], ipv6_enable = config['ipv6_enabled'],
 
67
                               failfunc = h.failed, errorfunc = disp_exception)
 
68
-        upnp_type = UPnP_test(config['upnp_nat_access'])
 
69
+        upnp_type = 0
 
70
         while True:
 
71
             try:
 
72
                 listen_port = rawserver.find_and_bind(config['minport'], config['maxport'],