[Python-apps-commits] r13137 - in packages/sabnzbdplus/trunk/debian (5 files)
jcfp-guest at users.alioth.debian.org
jcfp-guest at users.alioth.debian.org
Wed Apr 27 16:59:44 UTC 2016
Date: Wednesday, April 27, 2016 @ 16:59:43
Author: jcfp-guest
Revision: 13137
Expand patch 09 to handle more external resources
Added:
packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resources.diff
Modified:
packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.diff
packages/sabnzbdplus/trunk/debian/patches/series
packages/sabnzbdplus/trunk/debian/sabnzbdplus.install
Deleted:
packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resource_from_wizard.diff
Modified: packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.diff
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.diff 2016-04-27 16:19:22 UTC (rev 13136)
+++ packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.diff 2016-04-27 16:59:43 UTC (rev 13137)
@@ -1,7 +1,7 @@
# Disable the builtin check for newer versions.
--- a/sabnzbd/misc.py
+++ b/sabnzbd/misc.py
-@@ -556,6 +556,8 @@
+@@ -568,6 +568,8 @@
they are already using an alpha/beta/rc.
RC's are valued higher than Beta's, which are valued higher than Alpha's.
"""
Deleted: packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resource_from_wizard.diff
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resource_from_wizard.diff 2016-04-27 16:19:22 UTC (rev 13136)
+++ packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resource_from_wizard.diff 2016-04-27 16:59:43 UTC (rev 13137)
@@ -1,18 +0,0 @@
-# remove an iframe from the setup wizard, link instead
-Index: SABnzbd-1.0.0/interfaces/wizard/one.html
-===================================================================
---- SABnzbd-1.0.0.orig/interfaces/wizard/one.html
-+++ SABnzbd-1.0.0/interfaces/wizard/one.html
-@@ -79,7 +79,11 @@
- </div>
- <div class="col-md-5">
- <div class="clearfix"></div>
-- <iframe style="float: right; width: 315px; height: 315px;" frameborder="0" src="https://resources.sabnzbd.org/wizard/ad/$language"></iframe>
-+ <div style="float: right; width: 300px; padding: 5px; border: 1px dotted #000; background-color: #F5F5F5; font-size: 14px; font-family: sans-serif;">
-+ <b>Help</b>
-+ <br/>In order to download from Usenet you will require access to a provider. Your ISP may provide you with access, however a premium provider is recommended.<br/>
-+ <br/>Don't have a Usenet provider? A recommendation (and affiliate link) from the developers of SABnzbd may be found at <a href="https://resources.sabnzbd.org/wizard/ad/$language" target="_blank">sabnzbd.org</a>.<br/>
-+ </div>
- </div>
- </div>
- <input type="hidden" name="session" value="$session" />
Added: packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resources.diff
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resources.diff (rev 0)
+++ packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resources.diff 2016-04-27 16:59:43 UTC (rev 13137)
@@ -0,0 +1,41 @@
+# eliminate potential privacy breaches:
+# - remove an iframe from the setup wizard, link instead
+# - use locally installed icon
+# - only run ipv6 test when debugging
+--- a/interfaces/wizard/one.html
++++ b/interfaces/wizard/one.html
+@@ -79,7 +79,11 @@
+ </div>
+ <div class="col-md-5">
+ <div class="clearfix"></div>
+- <iframe style="float: right; width: 315px; height: 315px;" frameborder="0" src="https://resources.sabnzbd.org/wizard/ad/$language"></iframe>
++ <div style="float: right; width: 300px; padding: 5px; border: 1px dotted #000; background-color: #F5F5F5; font-size: 14px; font-family: sans-serif;">
++ <b>Help</b>
++ <br/>In order to download from Usenet you will require access to a provider. Your ISP may provide you with access, however a premium provider is recommended.<br/>
++ <br/>Don't have a Usenet provider? A recommendation (and affiliate link) from the developers of SABnzbd may be found at <a href="https://resources.sabnzbd.org/wizard/ad/$language" target="_blank">sabnzbd.org</a>.<br/>
++ </div>
+ </div>
+ </div>
+ <input type="hidden" name="session" value="$session" />
+--- a/sabnzbd/growler.py
++++ b/sabnzbd/growler.py
+@@ -92,7 +92,7 @@
+ fp.close
+ else:
+ # Due to a bug in GNTP, need this work-around for Linux/Unix
+- icon = 'http://sabnzbdplus.sourceforge.net/version/sabnzbd.ico'
++ icon = '/usr/share/sabnzbdplus/icons/sabnzbd.ico'
+ else:
+ icon = None
+ return icon
+--- a/sabnzbd/__init__.py
++++ b/sabnzbd/__init__.py
+@@ -1159,7 +1159,7 @@
+
+ def test_ipv6():
+ """ Check if external IPv6 addresses are reachable """
+- if not cfg.selftest_host():
++ if not cfg.selftest_host() or sabnzbd.cfg.log_level() != 2:
+ # User disabled the test, assume active IPv6
+ return True
+ try:
Modified: packages/sabnzbdplus/trunk/debian/patches/series
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/series 2016-04-27 16:19:22 UTC (rev 13136)
+++ packages/sabnzbdplus/trunk/debian/patches/series 2016-04-27 16:59:43 UTC (rev 13137)
@@ -2,4 +2,4 @@
04_use_config_when_daemon.diff
06_use_packaged_modules.diff
08_disable_new_version_check.diff
-09_remove_external_resource_from_wizard.diff
+09_remove_external_resources.diff
Modified: packages/sabnzbdplus/trunk/debian/sabnzbdplus.install
===================================================================
--- packages/sabnzbdplus/trunk/debian/sabnzbdplus.install 2016-04-27 16:19:22 UTC (rev 13136)
+++ packages/sabnzbdplus/trunk/debian/sabnzbdplus.install 2016-04-27 16:59:43 UTC (rev 13137)
@@ -27,4 +27,4 @@
gntp /usr/share/sabnzbdplus
# systray icons
-icons/sabnzbd16* /usr/share/sabnzbdplus/icons
+icons/sabnzbd* /usr/share/sabnzbdplus/icons
More information about the Python-apps-commits
mailing list