[Python-apps-commits] r13676 - in packages/sabnzbdplus/trunk/debian (7 files)
jcfp-guest at users.alioth.debian.org
jcfp-guest at users.alioth.debian.org
Fri Nov 11 15:05:20 UTC 2016
Date: Friday, November 11, 2016 @ 15:05:18
Author: jcfp-guest
Revision: 13676
* New upstream release.
* Control: add recommend on python-cryptography, used for certificate
(re)generation and encrypted rarfile detection.
* Refresh all patches.
Modified:
packages/sabnzbdplus/trunk/debian/changelog
packages/sabnzbdplus/trunk/debian/control
packages/sabnzbdplus/trunk/debian/patches/02_find_parts_in_usr_share.diff
packages/sabnzbdplus/trunk/debian/patches/04_use_config_when_daemon.diff
packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.diff
packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.diff
packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resources.diff
Modified: packages/sabnzbdplus/trunk/debian/changelog
===================================================================
--- packages/sabnzbdplus/trunk/debian/changelog 2016-11-10 12:33:40 UTC (rev 13675)
+++ packages/sabnzbdplus/trunk/debian/changelog 2016-11-11 15:05:18 UTC (rev 13676)
@@ -1,3 +1,12 @@
+sabnzbdplus (1.1.1+dfsg-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ * Control: add recommend on python-cryptography, used for certificate
+ (re)generation and encrypted rarfile detection.
+ * Refresh all patches.
+
+ -- JCF Ploemen (jcfp) <linux at jcf.pm> Fri, 11 Nov 2016 14:52:10 +0000
+
sabnzbdplus (1.0.3+dfsg-2) unstable; urgency=medium
* Add dependency on lsb-base (>= 3.0-6), needed because the init
Modified: packages/sabnzbdplus/trunk/debian/control
===================================================================
--- packages/sabnzbdplus/trunk/debian/control 2016-11-10 12:33:40 UTC (rev 13675)
+++ packages/sabnzbdplus/trunk/debian/control 2016-11-11 15:05:18 UTC (rev 13676)
@@ -37,6 +37,7 @@
libavahi-compat-libdnssd1,
p7zip-full,
par2,
+ python-cryptography (>= 1.2),
python-dbus,
python-openssl,
python-yenc,
Modified: packages/sabnzbdplus/trunk/debian/patches/02_find_parts_in_usr_share.diff
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/02_find_parts_in_usr_share.diff 2016-11-10 12:33:40 UTC (rev 13675)
+++ packages/sabnzbdplus/trunk/debian/patches/02_find_parts_in_usr_share.diff 2016-11-11 15:05:18 UTC (rev 13676)
@@ -6,12 +6,12 @@
import sys
+sys.path.insert(0,'/usr/share/sabnzbdplus')
- if sys.version_info[:2] < (2, 6) or sys.version_info[:2] >= (3, 0):
- print "Sorry, requires Python 2.6 or 2.7."
+ if sys.version_info[:2] < (2, 7) or sys.version_info[:2] >= (3, 0):
+ print "Sorry, requires Python 2.7."
sys.exit(1)
--- a/sabnzbd/constants.py
+++ b/sabnzbd/constants.py
-@@ -82,10 +82,10 @@
+@@ -62,10 +62,10 @@
DEF_ADMIN_DIR = 'admin'
DEF_LOG_DIR = 'logs'
DEF_NZBBACK_DIR = ''
@@ -27,16 +27,16 @@
DEF_SKIN_COLORS = {'smpl': 'white', 'Glitter': 'Default', 'plush': 'gold'}
--- a/sabnzbd/sabtraylinux.py
+++ b/sabnzbd/sabtraylinux.py
-@@ -42,9 +42,9 @@
+@@ -39,9 +39,9 @@
class StatusIcon(Thread):
sabicons = {
-- 'default': 'icons/sabnzbd16.ico',
-- 'green': 'icons/sabnzbd16green.ico',
-- 'pause': 'icons/sabnzbd16paused.ico'
-+ 'default': '/usr/share/sabnzbdplus/icons/sabnzbd16.ico',
-+ 'green': '/usr/share/sabnzbdplus/icons/sabnzbd16green.ico',
-+ 'pause': '/usr/share/sabnzbdplus/icons/sabnzbd16paused.ico'
+- 'default': 'icons/sabnzbd16_32.ico',
+- 'green': 'icons/sabnzbd16_32green.ico',
+- 'pause': 'icons/sabnzbd16_32paused.ico'
++ 'default': '/usr/share/sabnzbdplus/icons/sabnzbd16_32.ico',
++ 'green': '/usr/share/sabnzbdplus/icons/sabnzbd16_32green.ico',
++ 'pause': '/usr/share/sabnzbdplus/icons/sabnzbd16_32paused.ico'
}
updatefreq = 1000 # ms
Modified: packages/sabnzbdplus/trunk/debian/patches/04_use_config_when_daemon.diff
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/04_use_config_when_daemon.diff 2016-11-10 12:33:40 UTC (rev 13675)
+++ packages/sabnzbdplus/trunk/debian/patches/04_use_config_when_daemon.diff 2016-11-11 15:05:18 UTC (rev 13676)
@@ -1,7 +1,7 @@
# Use the normal configuration when run as a daemon
--- a/SABnzbd.py
+++ b/SABnzbd.py
-@@ -404,20 +404,7 @@
+@@ -391,20 +391,7 @@
def GetProfileInfo(vista_plus):
""" Get the default data locations """
ok = False
Modified: packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.diff
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.diff 2016-11-10 12:33:40 UTC (rev 13675)
+++ packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.diff 2016-11-11 15:05:18 UTC (rev 13676)
@@ -12,7 +12,7 @@
CONFIG_LOCK = threading.Lock()
--- a/sabnzbd/rss.py
+++ b/sabnzbd/rss.py
-@@ -36,7 +36,7 @@
+@@ -34,7 +34,7 @@
import sabnzbd.emailer as emailer
from sabnzbd.encoding import unicoder, xml_name
Modified: packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.diff
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.diff 2016-11-10 12:33:40 UTC (rev 13675)
+++ packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.diff 2016-11-11 15:05:18 UTC (rev 13676)
@@ -12,11 +12,10 @@
return
--- a/interfaces/Config/templates/config_switches.tmpl
+++ b/interfaces/Config/templates/config_switches.tmpl
-@@ -16,15 +16,6 @@
- <input type="checkbox" name="auto_browser" id="auto_browser" value="1" <!--#if int($auto_browser) > 0 then 'checked="checked"' else ""#--> />
+@@ -17,15 +17,6 @@
<span class="desc">$T('explain-auto_browser')</span>
</div>
-- <div class="field-pair">
+ <div class="field-pair">
- <label class="config" for="check_new_rel">$T('opt-check_new_rel')</label>
- <select name="check_new_rel" id="check_new_rel">
- <option value="0" <!--#if $check_new_rel == 0 then 'selected="selected"' else ""#--> >$T('off')</option>
@@ -25,9 +24,10 @@
- </select>
- <span class="desc">$T('explain-check_new_rel')</span>
- </div>
- <div class="field-pair <!--#if not $have_ampm then "disabled" else "" #-->">
- <label class="config" for="ampm">$T('opt-ampm')</label>
- <input type="checkbox" name="ampm" id="ampm" value="1" <!--#if int($ampm) > 0 then 'checked="checked"' else ""#--> <!--#if not $have_ampm then 'readonly="readonly" disabled="disabled"' else "" #--> />
+- <div class="field-pair">
+ <label class="config" for="enable_https_verification">$T('opt-enable_https_verification')</label>
+ <input type="checkbox" name="enable_https_verification" id="enable_https_verification" value="1" <!--#if int($enable_https_verification) > 0 then 'checked="checked"' else ""#--> />
+ <span class="desc">$T('explain-enable_https_verification')</span>
--- a/sabnzbd/scheduler.py
+++ b/sabnzbd/scheduler.py
@@ -171,16 +171,6 @@
Modified: packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resources.diff
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resources.diff 2016-11-10 12:33:40 UTC (rev 13675)
+++ packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resources.diff 2016-11-11 15:05:18 UTC (rev 13676)
@@ -17,20 +17,9 @@
</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
-@@ -1168,6 +1168,8 @@
+@@ -1144,6 +1144,8 @@
logging.debug("Test IPv6: Disabling IPv6, because it looks like it's not available. Reason: %s", sys.exc_info()[0] )
return False
@@ -41,28 +30,54 @@
sock = socket.socket(af, socktype, proto)
--- a/sabnzbd/getipaddress.py
+++ b/sabnzbd/getipaddress.py
-@@ -36,6 +36,9 @@
+@@ -35,6 +35,9 @@
return ipv4
def publicipv4():
+ 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,
+ # Because of dual IPv4/IPv6 clients, finding the public ipv4 needs special attention,
# meaning forcing IPv4 connections, and not allowing IPv6 connections
try:
---- a/sabnzbd/interface.py
-+++ b/sabnzbd/interface.py
-@@ -2466,8 +2466,11 @@
- # Dashboard: Begin
- if not kwargs.get('skip_dashboard'):
- header['localipv4'] = localipv4()
-- header['publicipv4'] = publicipv4()
- header['ipv6'] = ipv6()
-+ if sabnzbd.cfg.log_level() < 2:
-+ header['publicipv4'] = 'for privacy reasons, lookup is disabled at log levels smaller than 2 (debug)'
-+ else:
-+ header['publicipv4'] = publicipv4()
- # Dashboard: DNS-check
- try:
- socket.gethostbyname(cfg.selftest_host())
+--- a/sabnzbd/notifier.py
++++ b/sabnzbd/notifier.py
+@@ -95,7 +95,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/interfaces/Glitter/templates/include_overlays.tmpl
++++ b/interfaces/Glitter/templates/include_overlays.tmpl
+@@ -96,7 +96,12 @@
+ </div>
+ <div class="row">
+ <div class="col-sm-6">$T('dashboard-publicIP4')</div>
++<!-- ko if: statusInfo.loglevel() >= 2 -->
+ <div class="col-sm-6" data-bind="visible: hasStatusInfo, text: !statusInfo.publicipv4() ? '$T('dashboard-connectionError')' : statusInfo.publicipv4(), css: { 'options-bad-status ' : !statusInfo.publicipv4() }"></div>
++<!-- /ko -->
++<!-- ko if: statusInfo.loglevel() < 2 -->
++ <div class="col-sm-6" data-bind="visible: hasStatusInfo, text: 'for privacy reasons, lookup is disabled at log levels lower than 2 (debug)', css: { 'options-bad-status ' : "" }"></div>
++<!-- /ko -->
+ <div class="col-sm-6 col-loading" data-bind="visible: !hasStatusInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
+ </div>
+ <div class="row">
+--- a/interfaces/Plush/templates/status.tmpl
++++ b/interfaces/Plush/templates/status.tmpl
+@@ -148,7 +148,11 @@
+ <!--#if $publicipv4#-->
+ $publicipv4
+ <!--#else#-->
+- <strong style="color: red;">$T('dashboard-connectionError')</strong>
++ <!--#if $loglevel == "2"#-->
++ <strong style="color: red;">$T('dashboard-connectionError')</strong>
++ <!--#else#-->
++ for privacy reasons, lookup is disabled at log levels lower than 2 (debug)
++ <!--#end if#-->
+ <!--#end if#-->
+ </td>
+ </tr>
More information about the Python-apps-commits
mailing list