[Pkg-voip-commits] [asterisk] 03/09: New upstream release: 13.17.0
tzafrir at debian.org
tzafrir at debian.org
Thu Aug 17 16:50:42 UTC 2017
This is an automated email from the git hooks/post-receive script.
tzafrir pushed a commit to branch master
in repository asterisk.
commit 692375706ded2f068f5e61ec8af222183c808a1e
Author: Tzafrir Cohen <tzafrir at debian.org>
Date: Wed Aug 2 23:24:58 2017 -0400
New upstream release: 13.17.0
Dropped a bunch of upstream patches:
- openssl 1.1
- 859911-pjsip-set-rtp-source-address
- AST-2017-004
- pjsip_unresolved_symbol
- checksum calculation method changed
New build checksum: da6642af068ee5e6490c5b1d2cc1d238
---
debian/changelog | 10 ++
...859911-pjsip-set-rtp-source-address-part2.patch | 62 -------
.../859911-pjsip-set-rtp-source-address.patch | 47 -----
debian/patches/AST-2017-004.patch | 189 ---------------------
debian/patches/OpenSSL-1.1.0-support-2.patch | 54 ------
debian/patches/OpenSSL-1.1.0-support-3.patch | 37 ----
debian/patches/OpenSSL-1.1.0-support.patch | 64 -------
debian/patches/pjsip_unresolved_symbol.patch | 9 +-
debian/patches/series | 9 -
debian/rules | 2 +-
10 files changed, 14 insertions(+), 469 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index dd208d7..5adeb64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+asterisk (1:13.17.0~dfsg-1) UNRELEASED; urgency=medium
+
+ * New upstream version 13.17.0
+ - Dropped OpenSSL 1.0 patches: merged upstream.
+ - Dropped 859911-pjsip-set-rtp-source-address patches: merged upstream.
+ - Dropped pjsip_unresolved_symbol.patch: merged upstream.
+ - Dropped AST-2017-004.patch: merged upstream.
+
+ -- Tzafrir Cohen <tzafrir at debian.org> Wed, 02 Aug 2017 23:22:16 -0400
+
asterisk (1:13.14.1~dfsg-2) unstable; urgency=high
[ Tzafrir Cohen ]
diff --git a/debian/patches/859911-pjsip-set-rtp-source-address-part2.patch b/debian/patches/859911-pjsip-set-rtp-source-address-part2.patch
deleted file mode 100644
index cc5c674..0000000
--- a/debian/patches/859911-pjsip-set-rtp-source-address-part2.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 2634f48fb57e1358ad1de0683e9779cc05efe2c4 Mon Sep 17 00:00:00 2001
-From: Richard Mudgett <rmudgett at digium.com>
-Date: Mon, 3 Apr 2017 15:38:06 -0500
-Subject: [PATCH] res_pjsip_sdp_rtp.c: Don't alter global addr variable.
-
-* create_rtp(): Fix unexpected alteration of global address_rtp if a
-transport is bound to an address.
-
-* create_rtp(): Fix use of uninitialized memory if the endpoint RTP media
-address is invalid or the transport has an invalid address.
-
-ASTERISK-26851
-
-Change-Id: Icde42e65164a88913cb5c2601b285eebcff397b7
----
- res/res_pjsip_sdp_rtp.c | 23 ++++++++++++++++++-----
- 1 file changed, 18 insertions(+), 5 deletions(-)
-
-diff --git a/res/res_pjsip_sdp_rtp.c b/res/res_pjsip_sdp_rtp.c
-index d44171cf8f..4cfd4d5b4a 100644
---- a/res/res_pjsip_sdp_rtp.c
-+++ b/res/res_pjsip_sdp_rtp.c
-@@ -194,8 +194,16 @@ static int create_rtp(struct ast_sip_session *session, struct ast_sip_session_me
- struct ast_sockaddr *media_address = &address_rtp;
-
- if (session->endpoint->media.bind_rtp_to_media_address && !ast_strlen_zero(session->endpoint->media.address)) {
-- ast_sockaddr_parse(&temp_media_address, session->endpoint->media.address, 0);
-- media_address = &temp_media_address;
-+ if (ast_sockaddr_parse(&temp_media_address, session->endpoint->media.address, 0)) {
-+ ast_debug(1, "Endpoint %s: Binding RTP media to %s\n",
-+ ast_sorcery_object_get_id(session->endpoint),
-+ session->endpoint->media.address);
-+ media_address = &temp_media_address;
-+ } else {
-+ ast_debug(1, "Endpoint %s: RTP media address invalid: %s\n",
-+ ast_sorcery_object_get_id(session->endpoint),
-+ session->endpoint->media.address);
-+ }
- } else {
- struct ast_sip_transport *transport =
- ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "transport",
-@@ -205,9 +213,14 @@ static int create_rtp(struct ast_sip_session *session, struct ast_sip_session_me
- char hoststr[PJ_INET6_ADDRSTRLEN];
-
- pj_sockaddr_print(&transport->state->host, hoststr, sizeof(hoststr), 0);
-- ast_debug(1, "Transport: %s bound to host: %s, using this for media.\n",
-- session->endpoint->transport, hoststr);
-- ast_sockaddr_parse(media_address, hoststr, 0);
-+ if (ast_sockaddr_parse(&temp_media_address, hoststr, 0)) {
-+ ast_debug(1, "Transport %s bound to %s: Using it for RTP media.\n",
-+ session->endpoint->transport, hoststr);
-+ media_address = &temp_media_address;
-+ } else {
-+ ast_debug(1, "Transport %s bound to %s: Invalid for RTP media.\n",
-+ session->endpoint->transport, hoststr);
-+ }
- }
- ao2_cleanup(transport);
- }
---
-2.11.0
-
diff --git a/debian/patches/859911-pjsip-set-rtp-source-address.patch b/debian/patches/859911-pjsip-set-rtp-source-address.patch
deleted file mode 100644
index 6ca3884..0000000
--- a/debian/patches/859911-pjsip-set-rtp-source-address.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 139bc3495f8f46201b4aac6c84a5f0d04822f9da Mon Sep 17 00:00:00 2001
-From: Richard Begg <asterisk at meric.id.au>
-Date: Wed, 15 Mar 2017 08:22:42 +1100
-Subject: [PATCH] res_pjsip_sdp_rtp: RTP instance does not use same IP as
- explicit transport
-
-Currently a wildcard address is used for the local RTP socket, which
-will not always result in the same address as used by the SIP socket
-(e.g. if explicit transport addresses are configured).
-Use the transport's host address when binding new local RTP sockets if
-available.
-
-ASTERISK-26851
-
-Change-Id: I098c29c9d1f79a4f970d72ba894874ac75954f1a
----
- res/res_pjsip_sdp_rtp.c | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/res/res_pjsip_sdp_rtp.c b/res/res_pjsip_sdp_rtp.c
-index b27050ed86..2b31d146ea 100644
---- a/res/res_pjsip_sdp_rtp.c
-+++ b/res/res_pjsip_sdp_rtp.c
-@@ -179,6 +179,20 @@ static int create_rtp(struct ast_sip_session *session, struct ast_sip_session_me
- if (session->endpoint->media.bind_rtp_to_media_address && !ast_strlen_zero(session->endpoint->media.address)) {
- ast_sockaddr_parse(&temp_media_address, session->endpoint->media.address, 0);
- media_address = &temp_media_address;
-+ } else {
-+ struct ast_sip_transport *transport =
-+ ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "transport",
-+ session->endpoint->transport);
-+
-+ if (transport && transport->state) {
-+ char hoststr[PJ_INET6_ADDRSTRLEN];
-+
-+ pj_sockaddr_print(&transport->state->host, hoststr, sizeof(hoststr), 0);
-+ ast_debug(1, "Transport: %s bound to host: %s, using this for media.\n",
-+ session->endpoint->transport, hoststr);
-+ ast_sockaddr_parse(media_address, hoststr, 0);
-+ }
-+ ao2_cleanup(transport);
- }
-
- if (!(session_media->rtp = ast_rtp_instance_new(session->endpoint->media.rtp.engine, sched, media_address, NULL))) {
---
-2.11.0
-
diff --git a/debian/patches/AST-2017-004.patch b/debian/patches/AST-2017-004.patch
deleted file mode 100644
index 99195c9..0000000
--- a/debian/patches/AST-2017-004.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-From 1cc18d40252834a967b74d87323bca4d59d6c693 Mon Sep 17 00:00:00 2001
-From: George Joseph <gjoseph at digium.com>
-Date: Thu, 13 Apr 2017 10:14:48 -0600
-Subject: [PATCH] AST-2017-004: chan_skinny: Add EOF check in skinny_session
-
-The while(1) loop in skinny_session wasn't checking for EOF so
-a packet that was longer than a header but still truncated
-would spin the while loop infinitely. Not only does this
-permanently tie up a thread and drive a core to 100% utilization,
-the call of ast_log() in such a tight loop eats all available
-process memory.
-
-Added poll with timeout to top of read loop
-
-ASTERISK-26940 #close
-Reported-by: Sandro Gauci
-
-Change-Id: I2ce65f3c5cb24b4943a9f75b64d545a1e2cd2898
----
- channels/chan_skinny.c | 122 ++++++++++++++++++++++++++-----------------------
- 1 file changed, 66 insertions(+), 56 deletions(-)
-
-diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
-index 2c40748a1f..ad7351df3a 100644
---- a/channels/chan_skinny.c
-+++ b/channels/chan_skinny.c
-@@ -6661,7 +6661,7 @@ static int handle_capabilities_res_message(struct skinny_req *req, struct skinny
- #ifdef AST_DEVMODE
- struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
- #endif
--
-+
-
- if (!codecs) {
- return 0;
-@@ -7502,6 +7502,8 @@ static void skinny_session_cleanup(void *data)
- destroy_session(s);
- }
-
-+#define PACKET_TIMEOUT 10000
-+
- static void *skinny_session(void *data)
- {
- int res;
-@@ -7548,78 +7550,86 @@ static void *skinny_session(void *data)
- }
- }
-
-- if (fds[0].revents) {
-+ if (!fds[0].revents) {
-+ continue;
-+ }
-+ ast_debug(1, "Reading header\n");
-
-- if (!(req = ast_calloc(1, SKINNY_MAX_PACKET))) {
-- ast_log(LOG_WARNING, "Unable to allocated memorey for skinny_req.\n");
-- break;
-- }
-+ if (!(req = ast_calloc(1, SKINNY_MAX_PACKET))) {
-+ ast_log(LOG_WARNING, "Unable to allocated memorey for skinny_req.\n");
-+ break;
-+ }
-
-- ast_mutex_lock(&s->lock);
-- s->lockstate = 1;
-+ ast_mutex_lock(&s->lock);
-+ s->lockstate = 1;
-
-- if ((res = read(s->fd, req, skinny_header_size)) != skinny_header_size) {
-- if (res < 0) {
-- ast_log(LOG_WARNING, "Header read() returned error: %s\n", strerror(errno));
-- } else {
-- ast_log(LOG_WARNING, "Unable to read header. Only found %d bytes.\n", res);
-- }
-- break;
-+ if ((res = read(s->fd, req, skinny_header_size)) != skinny_header_size) {
-+ if (res < 0) {
-+ ast_log(LOG_WARNING, "Header read() returned error: %s\n", strerror(errno));
-+ } else {
-+ ast_log(LOG_WARNING, "Unable to read header. Only found %d bytes.\n", res);
- }
-+ break;
-+ }
-
-- eventmessage = letohl(req->e);
-- if (eventmessage < 0) {
-- ast_log(LOG_ERROR, "Event Message is NULL from socket %d, This is bad\n", s->fd);
-- break;
-- }
-+ eventmessage = letohl(req->e);
-+ if (eventmessage < 0) {
-+ ast_log(LOG_ERROR, "Event Message is NULL from socket %d, This is bad\n", s->fd);
-+ break;
-+ }
-
-- dlen = letohl(req->len) - 4;
-- if (dlen < 0) {
-- ast_log(LOG_WARNING, "Skinny Client sent invalid data.\n");
-- break;
-- }
-- if (dlen > (SKINNY_MAX_PACKET - skinny_header_size)) {
-- ast_log(LOG_WARNING, "Skinny packet too large (%d bytes), max length(%d bytes)\n", dlen+8, SKINNY_MAX_PACKET);
-- break;
-- }
-+ dlen = letohl(req->len) - 4;
-+ if (dlen < 0) {
-+ ast_log(LOG_WARNING, "Skinny Client sent invalid data.\n");
-+ break;
-+ }
-+ if (dlen > (SKINNY_MAX_PACKET - skinny_header_size)) {
-+ ast_log(LOG_WARNING, "Skinny packet too large (%d bytes), max length(%d bytes)\n", dlen+8, SKINNY_MAX_PACKET);
-+ break;
-+ }
-
-- bytesread = 0;
-- while (1) {
-- if ((res = read(s->fd, ((char*)&req->data)+bytesread, dlen-bytesread)) < 0) {
-- ast_log(LOG_WARNING, "Data read() returned error: %s\n", strerror(errno));
-- break;
-- }
-- bytesread += res;
-- if (bytesread >= dlen) {
-- if (res < bytesread) {
-- ast_log(LOG_WARNING, "Rest of partial data received.\n");
-- }
-- if (bytesread > dlen) {
-- ast_log(LOG_WARNING, "Client sent wrong amount of data (%d), expected (%d).\n", bytesread, dlen);
-- res = -1;
-- }
-- break;
-- }
-+ ast_debug(1, "Read header: Message ID: 0x%04x, %d bytes in packet\n", eventmessage, dlen);
-
-- ast_log(LOG_WARNING, "Partial data received, waiting (%d bytes read of %d)\n", bytesread, dlen);
-- if (sched_yield() < 0) {
-- ast_log(LOG_WARNING, "Data yield() returned error: %s\n", strerror(errno));
-- res = -1;
-- break;
-+ bytesread = 0;
-+ while (bytesread < dlen) {
-+ ast_debug(1, "Waiting %dms for %d bytes of %d\n", PACKET_TIMEOUT, dlen - bytesread, dlen);
-+ fds[0].revents = 0;
-+ res = ast_poll(fds, 1, PACKET_TIMEOUT);
-+ if (res <= 0) {
-+ if (res == 0) {
-+ ast_debug(1, "Poll timed out waiting for %d bytes\n", dlen - bytesread);
-+ } else {
-+ ast_log(LOG_WARNING, "Poll failed waiting for %d bytes: %s\n",
-+ dlen - bytesread, strerror(errno));
- }
-+ ast_verb(3, "Ending Skinny session from %s (bad input)\n", ast_inet_ntoa(s->sin.sin_addr));
-+ res = -1;
-+
-+ break;
-+ }
-+ if (!fds[0].revents) {
-+ continue;
- }
-
-- s->lockstate = 0;
-- ast_mutex_unlock(&s->lock);
-+ res = read(s->fd, ((char*)&req->data)+bytesread, dlen-bytesread);
- if (res < 0) {
-+ ast_log(LOG_WARNING, "Data read() returned error: %s\n", strerror(errno));
- break;
- }
-+ bytesread += res;
-+ ast_debug(1, "Read %d bytes. %d of %d now read\n", res, bytesread, dlen);
-+ }
-
-- pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
-- res = handle_message(req, s);
-- pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
-+ s->lockstate = 0;
-+ ast_mutex_unlock(&s->lock);
-+ if (res < 0) {
-+ break;
- }
-
-+ pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
-+ res = handle_message(req, s);
-+ pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
-+
- if (req) {
- ast_free(req);
- req = NULL;
---
-2.11.0
-
diff --git a/debian/patches/OpenSSL-1.1.0-support-2.patch b/debian/patches/OpenSSL-1.1.0-support-2.patch
deleted file mode 100644
index 32dac51..0000000
--- a/debian/patches/OpenSSL-1.1.0-support-2.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 99b40e72ae347d7047547836f7f897d3ea2bc8dc Mon Sep 17 00:00:00 2001
-From: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-Date: Fri, 03 Feb 2017 10:25:33 +0200
-Subject: [PATCH] libasteriskssl: do nothing with OpenSSL >= 1.1
-
-OpenSSL 1.1 requires no explicit initialization. The hacks in the
-library are not needed. They also happen to fail running Asterisk.
-
-ASTERISK-26109 #close
-
-Change-Id: I3b3efd5d80234a4c45a8ee58dcfe25b15d9ad100
----
-
-diff --git a/main/libasteriskssl.c b/main/libasteriskssl.c
-index bf5ecc1..9dea3df 100644
---- a/main/libasteriskssl.c
-+++ b/main/libasteriskssl.c
-@@ -123,10 +123,13 @@
- /*!
- * \internal
- * \brief Common OpenSSL initialization for all of Asterisk.
-+ *
-+ * Not needed for OpenSSL versions >= 1.1.0
- */
- int ast_ssl_init(void)
- {
--#ifdef HAVE_OPENSSL
-+#if defined(HAVE_OPENSSL) && defined(OPENSSL_VERSION_NUMBER) && \
-+ OPENSSL_VERSION_NUMBER < 0x10100000L
- unsigned int i;
- int (*real_SSL_library_init)(void);
- void (*real_CRYPTO_set_id_callback)(unsigned long (*)(void));
-@@ -191,7 +194,7 @@
-
- startup_complete = 1;
-
--#endif /* HAVE_OPENSSL */
-+#endif /* HAVE_OPENSSL and its version < 1.1 */
- return 0;
- }
-
-diff --git a/main/tcptls.c b/main/tcptls.c
-index 36a6c96..4d110cd 100644
---- a/main/tcptls.c
-+++ b/main/tcptls.c
-@@ -412,7 +412,7 @@
- #else
- ERR_remove_state(0);
- #endif /* openssl == 1.0 */
--#endif /* openssl >= 1.1 */
-+#endif /* openssl < 1.1 */
- }
-
- SSL_free(stream->ssl);
diff --git a/debian/patches/OpenSSL-1.1.0-support-3.patch b/debian/patches/OpenSSL-1.1.0-support-3.patch
deleted file mode 100644
index 29c40db..0000000
--- a/debian/patches/OpenSSL-1.1.0-support-3.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e97e50b68b0497f906a73a1acc26c3a97d9c9d7f Mon Sep 17 00:00:00 2001
-From: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-Date: Sat, 21 Jan 2017 07:59:15 +0200
-Subject: [PATCH] tcptls: use TLS_client_method with OpenSSL 1.1
-
-OpenSSL 1.1 introduced TLS_client_method() and deprecated the previous
-version-specific methods (such as TLSv1_client_method(). Other than
-being simpler to use and more correct (gain support for TLS newer that
-TLS1, in our case), the older ones produce a deprecation warning that
-fails the build in dev-mode.
-
-ASTERISK-26109 #close
-
-Change-Id: I257b1c8afd09dcb0d96cda3a41cb9f7a15d0ba07
----
-
-diff --git a/main/tcptls.c b/main/tcptls.c
-index 71bd92e..36a6c96 100644
---- a/main/tcptls.c
-+++ b/main/tcptls.c
-@@ -833,12 +833,16 @@
- cfg->ssl_ctx = SSL_CTX_new(SSLv3_client_method());
- } else
- #endif
-+#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+ cfg->ssl_ctx = SSL_CTX_new(TLS_client_method());
-+#else
- if (ast_test_flag(&cfg->flags, AST_SSL_TLSV1_CLIENT)) {
- cfg->ssl_ctx = SSL_CTX_new(TLSv1_client_method());
- } else {
- disable_ssl = 1;
- cfg->ssl_ctx = SSL_CTX_new(SSLv23_client_method());
- }
-+#endif
- } else {
- disable_ssl = 1;
- cfg->ssl_ctx = SSL_CTX_new(SSLv23_server_method());
diff --git a/debian/patches/OpenSSL-1.1.0-support.patch b/debian/patches/OpenSSL-1.1.0-support.patch
deleted file mode 100644
index 92f4bde..0000000
--- a/debian/patches/OpenSSL-1.1.0-support.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 0d555f0d81d3b04366a64c91acb89d24b90aead9 Mon Sep 17 00:00:00 2001
-From: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-Date: Sat, 21 Jan 2017 07:57:33 +0200
-Subject: [PATCH] openssl 1.1 support: use OPENSSL_VERSION_NUMBER
-
-Use OPENSSL_VERSION_NUMBER instead of OPENSSL_API_COMPAT to detect
-the openssl 1.1 API.
-
-ASTERISK-26109 #close
-
-Change-Id: I4e448f55ef516aedf6ad154037c35577a421a458
----
-
-diff --git a/main/libasteriskssl.c b/main/libasteriskssl.c
-index c4d4c56..bf5ecc1 100644
---- a/main/libasteriskssl.c
-+++ b/main/libasteriskssl.c
-@@ -74,7 +74,7 @@
- }
- }
-
--#if !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < 0x10100000L
-+#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
- int SSL_library_init(void)
- {
- #if defined(AST_DEVMODE)
-@@ -116,7 +116,7 @@
- {
- /* we can't allow this to be called, ever */
- }
--#endif /* !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < 0x10100000L */
-+#endif /* !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L */
-
- #endif /* HAVE_OPENSSL */
-
-diff --git a/main/tcptls.c b/main/tcptls.c
-index 21abd26..71bd92e 100644
---- a/main/tcptls.c
-+++ b/main/tcptls.c
-@@ -400,19 +400,19 @@
- SSL_get_error(stream->ssl, res));
- }
-
--#if defined(OPENSSL_API_COMPAT) && OPENSSL_API_COMPAT >= 0x10100000L
-+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L
- if (!SSL_is_server(stream->ssl)) {
- #else
- if (!stream->ssl->server) {
- #endif
- /* For client threads, ensure that the error stack is cleared */
--#if !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < 0x10100000L
--#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
- ERR_remove_thread_state(NULL);
- #else
- ERR_remove_state(0);
--#endif /* OPENSSL_VERSION_NUMBER >= 0x10000000L */
--#endif /* !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < 0x10100000L */
-+#endif /* openssl == 1.0 */
-+#endif /* openssl >= 1.1 */
- }
-
- SSL_free(stream->ssl);
diff --git a/debian/patches/pjsip_unresolved_symbol.patch b/debian/patches/pjsip_unresolved_symbol.patch
index 0701b3f..2afc651 100644
--- a/debian/patches/pjsip_unresolved_symbol.patch
+++ b/debian/patches/pjsip_unresolved_symbol.patch
@@ -4,22 +4,19 @@ Bug: https://issues.asterisk.org/jira/browse/ASTERISK-26518
--- a/res/res_pjsip/pjsip_message_ip_updater.c
+++ b/res/res_pjsip/pjsip_message_ip_updater.c
-@@ -277,15 +277,15 @@
+@@ -277,15 +277,10 @@
{
ast_sip_unregister_service(&multihomed_module);
ast_sip_unregister_supplement(&multihomed_supplement);
- ast_sip_session_unregister_supplement(&multihomed_session_supplement);
-+ //ast_sip_session_unregister_supplement(&multihomed_session_supplement);
}
int ast_res_pjsip_init_message_ip_updater(void)
{
- if (ast_sip_session_register_supplement(&multihomed_session_supplement)) {
-+ /*if (ast_sip_session_register_supplement(&multihomed_session_supplement)) {
- ast_log(LOG_ERROR, "Could not register multihomed session supplement for outgoing requests\n");
- return -1;
+- ast_log(LOG_ERROR, "Could not register multihomed session supplement for outgoing requests\n");
+- return -1;
- }
-+ }*/
if (ast_sip_register_supplement(&multihomed_supplement)) {
ast_log(LOG_ERROR, "Could not register multihomed supplement for outgoing requests\n");
diff --git a/debian/patches/series b/debian/patches/series
index 96fa174..6f11096 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -33,14 +33,5 @@ ffmpeg-detection.patch
ffmpeg-includes.patch
radcli-detection.patch
-OpenSSL-1.1.0-support.patch
-OpenSSL-1.1.0-support-2.patch
-OpenSSL-1.1.0-support-3.patch
pjsip_unresolved_symbol.patch
-
-# Bug#859911 - res_pjsip_sdp_rtp: RTP instance does not use same IP as explicit transport
-859911-pjsip-set-rtp-source-address.patch
-859911-pjsip-set-rtp-source-address-part2.patch
-
-AST-2017-004.patch
diff --git a/debian/rules b/debian/rules
index b80b8f3..14ea5d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
# Sanity check for a stable release:
-SAVED_ABI_HASH = fa819827cbff2ea35341af5458859233
+SAVED_ABI_HASH = da6642af068ee5e6490c5b1d2cc1d238
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/asterisk.git
More information about the Pkg-voip-commits
mailing list