New patch 0130_openssl.patch

5 files changed, 27 insertions, 7 deletions

diff --git a/debian/changelog b/debian/changelog
index f111366..a6775df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,15 +2,14 @@ argyll (1.9.2+repack-2) UNRELEASED; urgency=medium
 
   * New README.source to explain the branching model used.
   * Declare compliance with Debian Policy 4.0.0. (No changes needed).
-  * debian/changelog:
-    - Add 2017 to debian/*.
   * debian/copyright:
+    - Add 2017 to debian/*.
+  * debian/control:
     - Remove dh-autoreconf.
       + Not longer needed since debhelper compatibility level > 10.
-    - Remove libssl-dev from build depends to use the upstream ssl
-      implemantiton.
-      + Openssl provides only TLS1.2. TLS1.0 / TLS1.1 is using to connect some
-        devices (Closes: #871427).
+  * New patch 0130_openssl.patch:
+    - Enable all ssl connections since openssl provides only connetions with 
+      TLS1.2 or greater (Closes: #871427).
   * Use the automatic debug symbol packages:
     - Remove argyll-dbg section from debian/control.
     - Remove override_dh_strip from debian/rules.
diff --git a/debian/control b/debian/control
index 4c34a52..3d0157d 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends:
  jam,
  libjpeg-dev,
  libpng-dev,
+ libssl-dev,
  libtiff5-dev,
  libtool,
  libusb-1.0-0-dev,
diff --git a/debian/patches/0100_spelling.patch b/debian/patches/0100_spelling.patch
index 2705f6b..c65916b 100644
--- a/debian/patches/0100_spelling.patch
+++ b/debian/patches/0100_spelling.patch
@@ -1,6 +1,6 @@
 Description: correct some typos
 Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Last-Update: 2016-10-11
+Last-Update: 2017-08-26
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: trunk/spectro/dispcal.c
diff --git a/debian/patches/0130_openssl.patch b/debian/patches/0130_openssl.patch
new file mode 100644
index 0000000..b938ddc
--- /dev/null
+++ b/debian/patches/0130_openssl.patch
@@ -0,0 +1,19 @@
+Description: Enable all ssl connections
+Author: Jörg Frings-Fürst
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=871427
+Last-Update: 2017-08-26
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/ccast/ccpacket.c
+===================================================================
+--- trunk.orig/ccast/ccpacket.c
++++ trunk/ccast/ccpacket.c
+@@ -157,7 +157,7 @@ static ccpacket_err connect_ccpacket_imp
+ 	if ((p->ctx = ssl_ctx_new(SSL_SERVER_VERIFY_LATER, 1)) == NULL)
+ #else
+ 	// Want to use TLS_client_method(), but older OpenSSL doesn't have it...
+-	if ((p->ctx = SSL_CTX_new(TLSv1_client_method())) == NULL)
++	if ((p->ctx = SSL_CTX_new(SSLv23_client_method())) == NULL)
+ #endif
+ 	{
+ 		DBG((g_log,0, "connect ssl_ctx_new failed\n"))
diff --git a/debian/patches/series b/debian/patches/series
index c9ba163..47582dd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 #0110_usb-db_new.patch
 #0120_kfreebsd.patch
 0125_gcc5.patch
+0130_openssl.patch