Set version to 2.3.8

#1238

PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 1.0
 Name: SABnzbd
-Version: 2.3.8Beta1
-Summary: SABnzbd-2.3.8Beta1
+Version: 2.3.8
+Summary: SABnzbd-2.3.8
 Home-page: https://sabnzbd.org
 Author: The SABnzbd Team
 Author-email: team@sabnzbd.org

README.mkd

@@ -1,12 +1,16 @@
-Release Notes - SABnzbd 2.3.8 Beta 1
+Release Notes - SABnzbd 2.3.8
 =========================================================
 
 ## Improvements and bug fixes since 2.3.7
 - Changes to newsserver configuration could be delayed
-- Filnames would not be sanitized when using "Make Windows compatible"
+- Filenames would not be sanitized when using "Make Windows compatible"
 - Sorting could fail on root-folders
 - 7z-files were not listed as supported NZB archives
-- Windows: update 7zip to 18.06
+- SSL cipher settings were ignored during server test
+- Windows: update 7zip to 19.00
+- Windows: update MultiPar to v1.3.0.4
+- Windows and macOS: update Python to 2.7.16
+- Windows and macOS: update UnRar to 5.70
 
 ## Upgrading from 2.2.x and older
 - Finish queue

interfaces/Glitter/templates/include_overlays.tmpl

@@ -1,5 +1,5 @@
 <!--#from sabnzbd.constants import VALID_ARCHIVES, VALID_NZB_FILES#-->
-<!--#set $file_exts = ','.join(VALID_NZB_FILES + VALID_ARCHIVES)#-->
+<!--#set $file_exts = ', '.join(VALID_NZB_FILES + VALID_ARCHIVES)#-->
 <!-- Notifcation box -->
 <div class="main-notification-box" style="display: none">
     <div class="main-notification-box-uploading">
@@ -435,7 +435,7 @@
                     <form data-bind="submit: addNZBFromURL" class="col-sm-6">
                         <fieldset>
                             <legend class="row-wrap-text">$T('Glitter-addFromURL')</legend>
-                            <div class="input-group" data-tooltip="true" data-placement="bottom" title="$T('Glitter-nzbFormats')">
+                            <div class="input-group" data-tooltip="true" data-placement="bottom" title="$file_exts">
                                 <input type="text" name="nzbURL" class="form-control" placeholder="$T('enterURL')" />
                                 <span class="input-group-btn">
                                     <input type="submit" name="Add" value="$T('add')" class="btn btn-default" />
@@ -446,7 +446,7 @@
                     <form data-bind="submit: addNZBFromFileForm" class="col-sm-6">
                         <fieldset>
                             <legend class="row-wrap-text">$T('Glitter-addFromFile')</legend>
-                            <div class="input-group" data-tooltip="true" data-placement="bottom" title="$T('Glitter-nzbFormats')">
+                            <div class="input-group" data-tooltip="true" data-placement="bottom" title="$file_exts">
                                 <label class="btn btn-default btn-file">
                                     <span class="glyphicon glyphicon-file"></span> <em>$T('Glitter-chooseFile')&hellip;</em>
                                     <input type="file" multiple name="nzbFile" class="form-control" accept="$file_exts" data-bind="event : { change: updateBrowseLabel }" />
@@ -571,7 +571,7 @@
                     <input type="hidden" name="retry_job_id" />
                     <fieldset>
                         <legend>$T('opt-extra-NZB')</legend>
-                        <div class="input-group input-group-addfile" data-tooltip="true" data-placement="bottom" title="$T('Glitter-nzbFormats')">
+                        <div class="input-group input-group-addfile" data-tooltip="true" data-placement="bottom" title="$file_exts">
                             <label class="btn btn-default btn-file">
                                 <span class="glyphicon glyphicon-file"></span> <em>$T('Glitter-chooseFile')&hellip;</em>
                                 <input type="file" name="nzbFile" class="form-control" accept="$file_exts" data-bind="event : { change: updateBrowseLabel }" />

sabnzbd/skintext.py

@@ -829,7 +829,6 @@ SKIN_TEXT = {
     'Glitter-addFromFile' : TT('Upload NZB'),
     'Glitter-chooseFile' : TT('Browse'),
     'Glitter-addnzbFilename' : TT('Optionally specify a filename'),
-    'Glitter-nzbFormats' : TT('Formats: .nzb, .rar, .zip, .gz, .bz2'),
     'Glitter-submit' : TT('Submit'),
     'Glitter-openInfoURL' : TT('Open Informational URL'),
     'Glitter-sendThanks' : TT('Submitted. Thank you!'),

sabnzbd/utils/servertests.py

@@ -32,28 +32,33 @@ from sabnzbd.misc import int_conv
 def test_nntp_server_dict(kwargs):
     # Grab the host/port/user/pass/connections/ssl
     host = kwargs.get('host', '').strip()
+
     if not host:
         return False, T('The hostname is not set.')
+
     username = kwargs.get('username', '').strip()
     password = kwargs.get('password', '').strip()
     server = kwargs.get('server', '').strip()
     connections = int_conv(kwargs.get('connections', 0))
-    if not connections:
-        return False, T('There are no connections set. Please set at least one connection.')
     ssl = int_conv(kwargs.get('ssl', 0))
     ssl_verify = int_conv(kwargs.get('ssl_verify', 1))
+    ssl_ciphers = kwargs.get('ssl_ciphers')
     port = int_conv(kwargs.get('port', 0))
+
+    if not connections:
+        return False, T('There are no connections set. Please set at least one connection.')
+
     if not port:
         if ssl:
             port = 563
         else:
             port = 119
 
-    return test_nntp_server(host, port, server, username=username,
-                        password=password, ssl=ssl, ssl_verify=ssl_verify)
+    return test_nntp_server(host, port, server, username=username, password=password,
+                            ssl=ssl, ssl_verify=ssl_verify, ssl_ciphers=ssl_ciphers)
 
 
-def test_nntp_server(host, port, server=None, username=None, password=None, ssl=None, ssl_verify=1):
+def test_nntp_server(host, port, server=None, username=None, password=None, ssl=None, ssl_verify=1, ssl_ciphers=None):
     """ Will connect (blocking) to the nttp server and report back any errors """
     timeout = 4.0
     if '*' in password and not password.strip('*'):
@@ -74,7 +79,7 @@ def test_nntp_server(host, port, server=None, username=None, password=None, ssl=
         if not got_pass:
             return False, T('Password masked in ******, please re-enter')
     try:
-        s = Server(-1, '', host, port, timeout, 0, 0, ssl, ssl_verify, None, False, username, password)
+        s = Server(-1, '', host, port, timeout, 0, 0, ssl, ssl_verify, ssl_ciphers, False, username, password)
     except:
         return False, T('Invalid server details')
 

sabnzbd/version.py

@@ -4,5 +4,5 @@
 
 # You MUST use double quotes (so " and not ')
 
-__version__ = "2.3.8Beta1"
-__baseline__ = "7a8df5ee916455f17a2c5841f87a7641bb123859"
+__version__ = "2.3.8"
+__baseline__ = "0dd1f647d8b672c8a992fc986f9b2ab5000dbbea"

win/7zip/license.txt

@@ -3,7 +3,7 @@
       License for use and distribution
       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-      Copyright (C) 1999-2018 Igor Pavlov.
+      Copyright (C) 1999-2019 Igor Pavlov.
 
       7-Zip Extra files are under the GNU LGPL license.
 

win/par2/multipar/README_MultiPar.txt

@@ -25,7 +25,7 @@ Be careful to use those special features.
 
 [ System requirement ]
 
- MultiPar requires a PC with Windows XP or later (Windows Vista, 7, 8, etc).
+ MultiPar requires a PC with Windows XP or later (Windows Vista, 7, 8, 10, etc).
 
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -71,10 +71,11 @@ Don't send current PAR3 files to others, who may not have the same version.
 
 [ How to install or uninstall with installer package ]
 
- Double click setup file ( MultiPar126_setup.exe or something like this name ),
+ Double click setup file ( MultiPar129_setup.exe or something like this name ),
 and follow the installer dialog.
 At version up, if you want to use previous setting, overwrite install is possible.
-You may need to re-start OS after over write install or uninstall rarely.
+Before overwrite install, you should un-check "Integrate MultiPar into Shell".
+You may need to re-start OS after overwrite install or uninstall rarely.
 To install under "Program Files" directory on Windows Vista/7/8,
 you must start the installer with administrative privileges by selecting
 "Run as administrator" on right-click menu.
@@ -99,7 +100,7 @@ In either case, user made icons and association are available for the user only.
 
 [ How to install with archive version ]
 
- Unpack compressed file ( MultiPar126.zip or something like this name ) in a folder.
+ Unpack compressed file ( MultiPar129.zip or something like this name ) in a folder.
 MultiPar.exe is the interface of MultiPar.
 
  You can create short-cut icon or send-to link at Option window later.