[Python-apps-commits] r13139 - in packages/sabnzbdplus/trunk/debian/patches (1 file)

[jcfp-guest at users.alioth.debian.org]

    Date: Wednesday, April 27, 2016 @ 20:15:38
  Author: jcfp-guest
Revision: 13139

Expand patch 09 to include ip addr discovery functions

Modified:
  packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resources.diff

Modified: packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resources.diff
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resources.diff	2016-04-27 18:15:47 UTC (rev 13138)
+++ packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resources.diff	2016-04-27 20:15:38 UTC (rev 13139)
@@ -1,7 +1,7 @@
 # eliminate potential privacy breaches:
 # - remove an iframe from the setup wizard, link instead
 # - use locally installed icon
-# - only run ipv6 test when debugging
+# - only run ipv6 test, ip address discovery functions when debugging
 --- a/interfaces/wizard/one.html
 +++ b/interfaces/wizard/one.html
 @@ -79,7 +79,11 @@
@@ -39,3 +39,27 @@
          # User disabled the test, assume active IPv6
          return True
      try:
+--- a/sabnzbd/getipaddress.py
++++ b/sabnzbd/getipaddress.py
+@@ -36,6 +36,10 @@
+     return ipv4
+ 
+ def publicipv4():
++    # Disabled by Debian packaging unless debugging
++    if sabnzbd.cfg.log_level() != 2:
++        public_ipv4 = None
++        return public_ipv4
+     # Because of dual IPv4/IPv6 clients, finding the public ipv4 needs special attention, 
+     # meaning forcing IPv4 connections, and not allowing IPv6 connections
+     try:
+@@ -73,6 +77,10 @@
+     return public_ipv4
+ 
+ def ipv6():
++    # Disabled by Debian packaging unless debugging
++    if sabnzbd.cfg.log_level() != 2:
++        ipv6 = None
++        return ipv6
+     try:
+         s_ipv6 = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM)
+         s_ipv6.connect(('2001:db8::8080', 80))    # IPv6 prefix for documentation purpose