[SCM] blender/master: debian/patches/: patchset updated

mfv at users.alioth.debian.org mfv at users.alioth.debian.org
Wed Dec 3 17:41:41 UTC 2014


The following commit has been merged in the master branch:
commit 52a829becb43e85379960379c9f5d00c84b94cb9
Author: Matteo F. Vescovi <mfv at debian.org>
Date:   Wed Dec 3 14:35:45 2014 +0100

    debian/patches/: patchset updated
    
    - 0011-set_SSL_version_to_v23.patch added
    
    Closes: #770447

diff --git a/debian/patches/0011-set_SSL_version_to_v23.patch b/debian/patches/0011-set_SSL_version_to_v23.patch
new file mode 100644
index 0000000..0041840
--- /dev/null
+++ b/debian/patches/0011-set_SSL_version_to_v23.patch
@@ -0,0 +1,22 @@
+From: "Matteo F. Vescovi" <mfv at debian.org>
+Date: Wed, 3 Dec 2014 14:34:55 +0100
+Subject: set_SSL_version_to_v23
+
+Closes: #770447
+---
+ release/scripts/addons/netrender/master.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/release/scripts/addons/netrender/master.py b/release/scripts/addons/netrender/master.py
+index 3c087e5..30f09a6 100644
+--- a/release/scripts/addons/netrender/master.py
++++ b/release/scripts/addons/netrender/master.py
+@@ -1158,7 +1158,7 @@ def runMaster(address, broadcast, clear, force, path, update_stats, test_break,u
+     httpd.stats = update_stats
+     if use_ssl:
+         import ssl
+-        httpd.socket=ssl.wrap_socket(httpd.socket,certfile=cert_path,server_side=True,keyfile=key_path,ciphers="ALL",ssl_version=ssl.PROTOCOL_SSLv3)
++        httpd.socket=ssl.wrap_socket(httpd.socket,certfile=cert_path,server_side=True,keyfile=key_path,ciphers="ALL",ssl_version=ssl.PROTOCOL_SSLv23)
+     if broadcast:
+         s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+         s.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
diff --git a/debian/patches/series b/debian/patches/series
index 8c4d798..85dec38 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
 0008-use_cuda_pointer_arithmetic_in_integers.patch
 0009-add_flag_disabling_SSE-SSE2_intrinsics.patch
 0010-fix_atomic_issue.patch
+0011-set_SSL_version_to_v23.patch

-- 
blender packaging



More information about the pkg-multimedia-commits mailing list