[Pkg-voip-commits] [asterisk] 02/05: ASTERISK-26606.patch: adapt patch and add

[tzafrir at debian.org]

This is an automated email from the git hooks/post-receive script.

tzafrir pushed a commit to branch stretch
in repository asterisk.

commit e2c61b709231a8736ca955dfe86c767c03eccf89
Author: Tzafrir Cohen <tzafrir at debian.org>
Date:   Sat Dec 16 07:39:58 2017 +0200

    ASTERISK-26606.patch: adapt patch and add
    
    Remove a white space hunk that was removed in a later commit.
---
 debian/patches/ASTERISK-26606.patch | 8 --------
 debian/patches/series               | 3 +++
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/debian/patches/ASTERISK-26606.patch b/debian/patches/ASTERISK-26606.patch
index d054fc7..ad778fc 100644
--- a/debian/patches/ASTERISK-26606.patch
+++ b/debian/patches/ASTERISK-26606.patch
@@ -131,14 +131,6 @@ index 3fd3c53122..7e09e66611 100644
  			}
  
  #if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L
-@@ -589,6 +636,7 @@ static int check_tcptls_cert_name(ASN1_STRING *cert_str, const char *hostname, c
- 
- 	return ret;
- }
-+
- #endif
- 
- /*! \brief
 @@ -604,7 +652,6 @@ static void *handle_tcptls_connection(void *data)
  #ifdef DO_SSL
  	int (*ssl_setup)(SSL *) = (tcptls_session->client) ? SSL_connect : SSL_accept;
diff --git a/debian/patches/series b/debian/patches/series
index 95446ac..cd5676a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -46,6 +46,9 @@ pjsip_unresolved_symbol.patch
 # Bug#875450 - chan_sip: One way audio when transcoding
 875450-chan_sip-oneway-audio.patch
 
+# Bug#8837 - backport correct and improved notification of TLS connection error:
+ASTERISK-26606.patch
+
 AST-2017-004.patch
 AST-2017-005-13.13.diff
 AST-2017-006-13.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/asterisk.git