Control: tags 828395 + pending Dear maintainer,
I've prepared an NMU for libexosip2 (versioned as 4.1.0-2.1) and uploaded it to DELAYED/3. Please feel free to tell me if I should delay it longer. Regards. -- WBR, wRAR
diff -Nru libexosip2-4.1.0/debian/changelog libexosip2-4.1.0/debian/changelog
--- libexosip2-4.1.0/debian/changelog 2014-06-25 18:12:22.000000000 +0600
+++ libexosip2-4.1.0/debian/changelog 2016-12-15 23:31:29.000000000 +0500
@@ -1,3 +1,10 @@
+libexosip2 (4.1.0-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS with OpenSSL 1.1, patch by Andreas Henriksson (Closes: #828395).
+
+ -- Andrey Rahmatullin <w...@debian.org> Thu, 15 Dec 2016 23:31:29 +0500
+
libexosip2 (4.1.0-2) unstable; urgency=low
* Upload to unstable - coordinated through debian-release
diff -Nru libexosip2-4.1.0/debian/patches/openssl110.patch libexosip2-4.1.0/debian/patches/openssl110.patch
--- libexosip2-4.1.0/debian/patches/openssl110.patch 1970-01-01 05:00:00.000000000 +0500
+++ libexosip2-4.1.0/debian/patches/openssl110.patch 2016-12-15 23:31:29.000000000 +0500
@@ -0,0 +1,69 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+diff -urip libexosip2-4.1.0/src/eXtl_dtls.c libexosip2-4.1.0.openssl110/src/eXtl_dtls.c
+--- libexosip2-4.1.0/src/eXtl_dtls.c 2014-01-06 19:30:21.000000000 +0100
++++ libexosip2-4.1.0.openssl110/src/eXtl_dtls.c 2016-11-07 20:23:01.503943171 +0100
+@@ -233,7 +233,7 @@ shutdown_free_client_dtls (struct eXosip
+
+ BIO_ctrl (rbio, BIO_CTRL_DGRAM_SET_PEER, 0, (char *) &addr);
+
+- (reserved->socket_tab[pos].ssl_conn)->rbio = rbio;
++ SSL_set0_rbio((reserved->socket_tab[pos].ssl_conn), rbio);
+
+ i = SSL_shutdown (reserved->socket_tab[pos].ssl_conn);
+
+@@ -588,12 +588,11 @@ dtls_tl_read_message (struct eXosip_t *e
+ rbio = BIO_new_mem_buf (enc_buf, enc_buf_len);
+ BIO_set_mem_eof_return (rbio, -1);
+
+- reserved->socket_tab[pos].ssl_conn->rbio = rbio;
++ SSL_set0_rbio(reserved->socket_tab[pos].ssl_conn, rbio);
+
+ i = SSL_read (reserved->socket_tab[pos].ssl_conn, dec_buf, SIP_MESSAGE_MAX_LENGTH);
+ /* done with the rbio */
+- BIO_free (reserved->socket_tab[pos].ssl_conn->rbio);
+- reserved->socket_tab[pos].ssl_conn->rbio = BIO_new (BIO_s_mem ());
++ SSL_set0_rbio(reserved->socket_tab[pos].ssl_conn, BIO_new (BIO_s_mem ()));
+
+ if (i > 5) {
+ dec_buf[i] = '\0';
+@@ -904,7 +903,7 @@ dtls_tl_send_message (struct eXosip_t *e
+ _dtls_stream_used = &reserved->socket_tab[pos];
+ rbio = BIO_new_dgram (reserved->dtls_socket, BIO_NOCLOSE);
+ BIO_ctrl (rbio, BIO_CTRL_DGRAM_SET_PEER, 0, (char *) &addr);
+- reserved->socket_tab[pos].ssl_conn->rbio = rbio;
++ SSL_set0_rbio(reserved->socket_tab[pos].ssl_conn, rbio);
+ break;
+ }
+ }
+@@ -918,7 +917,7 @@ dtls_tl_send_message (struct eXosip_t *e
+ _dtls_stream_used = &reserved->socket_tab[pos];
+ rbio = BIO_new_dgram (reserved->dtls_socket, BIO_NOCLOSE);
+ BIO_ctrl (rbio, BIO_CTRL_DGRAM_SET_PEER, 0, (char *) &addr);
+- reserved->socket_tab[pos].ssl_conn->rbio = rbio;
++ SSL_set0_rbio(reserved->socket_tab[pos].ssl_conn, rbio);
+ break;
+ }
+ }
+diff -urip libexosip2-4.1.0/src/eXtl_tls.c libexosip2-4.1.0.openssl110/src/eXtl_tls.c
+--- libexosip2-4.1.0/src/eXtl_tls.c 2014-01-06 19:30:21.000000000 +0100
++++ libexosip2-4.1.0.openssl110/src/eXtl_tls.c 2016-11-07 20:27:51.568892332 +0100
+@@ -838,7 +838,7 @@ verify_cb (int preverify_ok, X509_STORE_
+ * it for something special
+ */
+ if (!preverify_ok && (err == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT)) {
+- X509_NAME_oneline (X509_get_issuer_name (store->current_cert), buf, 256);
++ X509_NAME_oneline (X509_get_issuer_name (X509_STORE_CTX_get_current_cert(store)), buf, 256);
+ OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, "issuer= %s\n", buf));
+ }
+
+@@ -1155,7 +1155,7 @@ initialize_client_ctx (struct eXosip_t *
+ }
+ else {
+ /* this is used to add a trusted certificate */
+- X509_STORE_add_cert (ctx->cert_store, cert);
++ X509_STORE_add_cert (SSL_CTX_get_cert_store(ctx), cert);
+ }
+ BIO_free (bio);
+ }
diff -Nru libexosip2-4.1.0/debian/patches/series libexosip2-4.1.0/debian/patches/series
--- libexosip2-4.1.0/debian/patches/series 2012-12-25 05:46:23.000000000 +0600
+++ libexosip2-4.1.0/debian/patches/series 2016-12-15 23:31:29.000000000 +0500
@@ -1,2 +1,3 @@
spelling-error-in-manpage.patch
spelling-error-in-binary.patch
+openssl110.patch
signature.asc
Description: PGP signature
