main/asterisk: upgrade to 14.6.0

2 files changed, 42 insertions, 42 deletions

diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD
index 5a40015d35..4d5be42d9e 100644
--- a/main/asterisk/APKBUILD
+++ b/main/asterisk/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Timo Teras <timo.teras@iki.fi>
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=asterisk
-pkgver=14.5.0
+pkgver=14.6.0
 pkgrel=0
 pkgdesc="Asterisk: A Module Open Source PBX System"
 pkgusers="asterisk"
@@ -227,9 +227,9 @@ sound_en() {
 	chown -R asterisk:asterisk "$subpkgdir"/var/*/asterisk
 }
 
-sha512sums="04dbea932900ecd3218629b2f19d20ad544cd7c02014fb4bd659e638e4a068ba179e6a4400bed788316fd337102ed8290c95823304567f378f9626361fd18c5e  asterisk-14.5.0.tar.gz
+sha512sums="4193cf85c4dd3258c5c561567674faa8698520afe4ae733824cd7c7e8265b0c70456fd260dee283228e6381ab9a72ba1968d1b5b209b3a82438fbb468a22afe4  asterisk-14.6.0.tar.gz
 aacef3f4796fb1abd33266998b53909cb4b36e7cc5ad2f7bac68bdc43e9a9072d9a4e2e7e681bddfa31f3d04575eb248afe6ea95da780c67e4829c1e22adfe1b  asterisk-addon-mp3-r201.patch.gz
-fedb0e422cd6acdff6a2ad60bebb174fcbac7a029b68b00116f64b2ecf3c0e577616174996b2fe22ed09061d3d6d917d8bf0b02ca9b6f3488b5958c99f127a6b  ASTERISK-24517.patch
+9230141ea4690db30cc1825d67f495a7357f13ee11da7e5a7c6696f3ae9edd599214c2d6915f6ad64f2bc68c754cda140db3f570ba051399ff894ab26b5db31c  ASTERISK-24517.patch
 f72c2e04de80d3ed9ce841308101383a1655e6da7a3c888ad31fffe63d1280993e08aefcf8e638316d439c68b38ee05362c87503fca1f36343976a01af9d6eb1  musl-mutex-init.patch
 935c25c7b1cdbd376056e20232a0e8c38dd32c344f50306d99930bf7cb37685c31329ead273b08ac9ab76daa9386adfb05b57440e46a39cb80e5542d65e8e3ed  restore-multihomed-module.patch
 cd5bd1c1d7db0a44b14eb10e6d098af0c6474c8fe1a57395090d6795ac00e9243d004b7d24eba2cfd5bd6d6407c271913e794551a8dfcf3cf93e89fc91349e12  asterisk.initd
diff --git a/main/asterisk/ASTERISK-24517.patch b/main/asterisk/ASTERISK-24517.patch
index ad3116639c..baf469497e 100644
--- a/main/asterisk/ASTERISK-24517.patch
+++ b/main/asterisk/ASTERISK-24517.patch
@@ -1,4 +1,4 @@
-From 6d511d7ff88ab6020dd5a5d5b02771fb3af9551a Mon Sep 17 00:00:00 2001
+From c479abfc489c42923ca7bb9afad11ad5ba84793e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
 Date: Thu, 2 Jun 2016 22:10:06 +0300
 Subject: [PATCH] Implement internal abstraction for iostreams
@@ -34,7 +34,7 @@ Change-Id: Id916aef418b665ced6a7489aef74908b6e376e85
  create mode 100644 main/iostream.c
 
 diff --git a/apps/app_externalivr.c b/apps/app_externalivr.c
-index 2bb1d8b535..129f29b924 100644
+index c824e91059..9848e5fb84 100644
 --- a/apps/app_externalivr.c
 +++ b/apps/app_externalivr.c
 @@ -152,10 +152,12 @@ struct gen_state {
@@ -168,8 +168,8 @@ index 2bb1d8b535..129f29b924 100644
 +	waitfds[0] = ast_iostream_get_fd(eivr_commands);
 +	waitfds[1] = eivr_errors ? ast_iostream_get_fd(eivr_errors) : -1;
  
-  	while (1) {
-  		if (ast_test_flag(ast_channel_flags(chan), AST_FLAG_ZOMBIE)) {
+ 	while (1) {
+ 		if (ast_test_flag(ast_channel_flags(chan), AST_FLAG_ZOMBIE)) {
 @@ -667,7 +666,7 @@ static int eivr_comm(struct ast_channel *chan, struct ivr_localuser *u,
   		errno = 0;
   		exception = 0;
@@ -255,7 +255,7 @@ index 2bb1d8b535..129f29b924 100644
  
  static int unload_module(void)
 diff --git a/channels/chan_sip.c b/channels/chan_sip.c
-index 5affee6ebc..50ab521f8d 100644
+index 679cc3dfce..4c7b78b4aa 100644
 --- a/channels/chan_sip.c
 +++ b/channels/chan_sip.c
 @@ -2546,7 +2546,7 @@ static struct sip_threadinfo *sip_threadinfo_create(struct ast_tcptls_session_in
@@ -455,7 +455,7 @@ index 5affee6ebc..50ab521f8d 100644
  	} else if (peer->socket.type == AST_TRANSPORT_UDP) {
  		res = ast_sendto(sipsock, keepalive, sizeof(keepalive), 0, &peer->addr);
 diff --git a/configure.ac b/configure.ac
-index 4c6c0f21b3..b2d678cc67 100644
+index ebf416cfca..cee352dac9 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -823,10 +823,6 @@ AC_ARG_ENABLE([asteriskssl],
@@ -1520,7 +1520,7 @@ index 0000000000..46abc18a5c
 +#endif
 +}
 diff --git a/main/manager.c b/main/manager.c
-index 6604f6f2bf..9d67f5e47b 100644
+index 80d9659ef8..4d864235bb 100644
 --- a/main/manager.c
 +++ b/main/manager.c
 @@ -1551,8 +1551,7 @@ static void acl_change_stasis_unsubscribe(void)
@@ -1628,7 +1628,7 @@ index 6604f6f2bf..9d67f5e47b 100644
  				break;
  			}
  		} else {	/* HTTP session */
-@@ -5940,7 +5936,7 @@ static int process_events(struct mansession *s)
+@@ -5936,7 +5932,7 @@ static int process_events(struct mansession *s)
  	int ret = 0;
  
  	ao2_lock(s->session);
@@ -1637,7 +1637,7 @@ index 6604f6f2bf..9d67f5e47b 100644
  		struct eventqent *eqe = s->session->last_ev;
  
  		while ((eqe = advance_event(eqe))) {
-@@ -6482,7 +6478,7 @@ static int get_input(struct mansession *s, char *output)
+@@ -6478,7 +6474,7 @@ static int get_input(struct mansession *s, char *output)
  		s->session->waiting_thread = pthread_self();
  		ao2_unlock(s->session);
  
@@ -1646,7 +1646,7 @@ index 6604f6f2bf..9d67f5e47b 100644
  
  		ao2_lock(s->session);
  		s->session->waiting_thread = AST_PTHREADT_NULL;
-@@ -6500,13 +6496,7 @@ static int get_input(struct mansession *s, char *output)
+@@ -6496,13 +6492,7 @@ static int get_input(struct mansession *s, char *output)
  	}
  
  	ao2_lock(s->session);
@@ -1661,7 +1661,7 @@ index 6604f6f2bf..9d67f5e47b 100644
  	if (res < 1) {
  		res = -1;	/* error return */
  	} else {
-@@ -6644,7 +6634,7 @@ static void *session_do(void *data)
+@@ -6640,7 +6630,7 @@ static void *session_do(void *data)
  	struct ast_sockaddr ser_remote_address_tmp;
  
  	if (ast_atomic_fetchadd_int(&unauth_sessions, +1) >= authlimit) {
@@ -1670,7 +1670,7 @@ index 6604f6f2bf..9d67f5e47b 100644
  		ast_atomic_fetchadd_int(&unauth_sessions, -1);
  		goto done;
  	}
-@@ -6653,7 +6643,7 @@ static void *session_do(void *data)
+@@ -6649,7 +6639,7 @@ static void *session_do(void *data)
  	session = build_mansession(&ser_remote_address_tmp);
  
  	if (session == NULL) {
@@ -1679,7 +1679,7 @@ index 6604f6f2bf..9d67f5e47b 100644
  		ast_atomic_fetchadd_int(&unauth_sessions, -1);
  		goto done;
  	}
-@@ -6661,14 +6651,10 @@ static void *session_do(void *data)
+@@ -6657,14 +6647,10 @@ static void *session_do(void *data)
  	/* here we set TCP_NODELAY on the socket to disable Nagle's algorithm.
  	 * This is necessary to prevent delays (caused by buffering) as we
  	 * write to the socket in bits and pieces. */
@@ -1696,7 +1696,7 @@ index 6604f6f2bf..9d67f5e47b 100644
  
  	ao2_lock(session);
  	/* Hook to the tail of the event queue */
-@@ -6677,8 +6663,7 @@ static void *session_do(void *data)
+@@ -6673,8 +6659,7 @@ static void *session_do(void *data)
  	ast_mutex_init(&s.lock);
  
  	/* these fields duplicate those in the 'ser' structure */
@@ -1706,7 +1706,7 @@ index 6604f6f2bf..9d67f5e47b 100644
  	ast_sockaddr_copy(&session->addr, &ser_remote_address_tmp);
  	s.session = session;
  
-@@ -6697,9 +6682,9 @@ static void *session_do(void *data)
+@@ -6693,9 +6678,9 @@ static void *session_do(void *data)
  	 * We cannot let the stream exclusively wait for data to arrive.
  	 * We have to wake up the task to send async events.
  	 */
@@ -1718,7 +1718,7 @@ index 6604f6f2bf..9d67f5e47b 100644
  		ast_tvnow(), authtimeout * 1000);
  
  	astman_append(&s, "Asterisk Call Manager/%s\r\n", AMI_VERSION);	/* welcome prompt */
-@@ -6708,7 +6693,7 @@ static void *session_do(void *data)
+@@ -6704,7 +6689,7 @@ static void *session_do(void *data)
  			break;
  		}
  		if (session->authenticated) {
@@ -1727,7 +1727,7 @@ index 6604f6f2bf..9d67f5e47b 100644
  		}
  	}
  	/* session is over, explain why and terminate */
-@@ -7568,23 +7553,9 @@ static void xml_translate(struct ast_str **out, char *in, struct ast_variable *g
+@@ -7564,23 +7549,9 @@ static void xml_translate(struct ast_str **out, char *in, struct ast_variable *g
  
  static void close_mansession_file(struct mansession *s)
  {
@@ -1754,7 +1754,7 @@ index 6604f6f2bf..9d67f5e47b 100644
  	} else {
  		ast_log(LOG_ERROR, "Attempted to close file/file descriptor on mansession without a valid file or file descriptor.\n");
  	}
-@@ -7593,17 +7564,20 @@ static void close_mansession_file(struct mansession *s)
+@@ -7589,17 +7560,20 @@ static void close_mansession_file(struct mansession *s)
  static void process_output(struct mansession *s, struct ast_str **out, struct ast_variable *params, enum output_format format)
  {
  	char *buf;
@@ -1781,7 +1781,7 @@ index 6604f6f2bf..9d67f5e47b 100644
  			ast_log(LOG_WARNING, "mmap failed.  Manager output was not processed\n");
  		} else {
  			if (format == FORMAT_XML || format == FORMAT_HTML) {
-@@ -7630,6 +7604,7 @@ static int generic_http_callback(struct ast_tcptls_session_instance *ser,
+@@ -7626,6 +7600,7 @@ static int generic_http_callback(struct ast_tcptls_session_instance *ser,
  	struct mansession s = { .session = NULL, .tcptls_session = ser };
  	struct mansession_session *session = NULL;
  	uint32_t ident;
@@ -1789,7 +1789,7 @@ index 6604f6f2bf..9d67f5e47b 100644
  	int blastaway = 0;
  	struct ast_variable *v;
  	struct ast_variable *params = get_params;
-@@ -7685,17 +7660,17 @@ static int generic_http_callback(struct ast_tcptls_session_instance *ser,
+@@ -7681,17 +7656,17 @@ static int generic_http_callback(struct ast_tcptls_session_instance *ser,
  	}
  
  	s.session = session;
@@ -1812,7 +1812,7 @@ index 6604f6f2bf..9d67f5e47b 100644
  		goto generic_callback_out;
  	}
  
-@@ -7835,9 +7810,9 @@ generic_callback_out:
+@@ -7831,9 +7806,9 @@ generic_callback_out:
  		if (blastaway) {
  			session_destroy(session);
  		} else {
@@ -1825,7 +1825,7 @@ index 6604f6f2bf..9d67f5e47b 100644
  			}
  			unref_mansession(session);
  		}
-@@ -7862,6 +7837,7 @@ static int auth_http_callback(struct ast_tcptls_session_instance *ser,
+@@ -7858,6 +7833,7 @@ static int auth_http_callback(struct ast_tcptls_session_instance *ser,
  	struct message m = { 0 };
  	unsigned int idx;
  	size_t hdrlen;
@@ -1833,7 +1833,7 @@ index 6604f6f2bf..9d67f5e47b 100644
  
  	time_t time_now = time(NULL);
  	unsigned long nonce = 0, nc;
-@@ -8040,17 +8016,17 @@ static int auth_http_callback(struct ast_tcptls_session_instance *ser,
+@@ -8036,17 +8012,17 @@ static int auth_http_callback(struct ast_tcptls_session_instance *ser,
  
  	ast_mutex_init(&s.lock);
  	s.session = session;
@@ -1856,7 +1856,7 @@ index 6604f6f2bf..9d67f5e47b 100644
  		goto auth_callback_out;
  	}
  
-@@ -8101,7 +8077,7 @@ static int auth_http_callback(struct ast_tcptls_session_instance *ser,
+@@ -8097,7 +8073,7 @@ static int auth_http_callback(struct ast_tcptls_session_instance *ser,
  		m.headers[idx] = NULL;
  	}
  
@@ -1865,7 +1865,7 @@ index 6604f6f2bf..9d67f5e47b 100644
  
  	http_header = ast_str_create(80);
  	out = ast_str_create(result_size * 2 + 512);
-@@ -8153,11 +8129,10 @@ auth_callback_out:
+@@ -8149,11 +8125,10 @@ auth_callback_out:
  	ast_free(out);
  
  	ao2_lock(session);
@@ -1881,7 +1881,7 @@ index 6604f6f2bf..9d67f5e47b 100644
  
  	if (session->needdestroy) {
 diff --git a/main/tcptls.c b/main/tcptls.c
-index 1f99d7b923..ca9a447868 100644
+index 8e50a0c8e9..ca9a447868 100644
 --- a/main/tcptls.c
 +++ b/main/tcptls.c
 @@ -51,559 +51,13 @@ ASTERISK_REGISTER_FILE()
@@ -2283,13 +2283,13 @@ index 1f99d7b923..ca9a447868 100644
 -					ERR_error_string(sslerr, err), ssl_error_to_string(sslerr, res));
 -			}
 -
--#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L
+-#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
 -			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_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
+-#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
 -#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER >= 0x10000000L
 -				ERR_remove_thread_state(NULL);
 -#else
@@ -3152,10 +3152,10 @@ index 2e4f873623..1b77b9f48b 100644
  			} else {
  				struct extension *exten_iter;
 -- 
-2.13.0
+2.13.2
 
 
-From 68e88eb869144be992ff3eec77271fc3d55481e5 Mon Sep 17 00:00:00 2001
+From 0a8fd8b669c3cf7d004cbdaff43294152b0f384c Mon Sep 17 00:00:00 2001
 From: Joshua Colp <jcolp@digium.com>
 Date: Mon, 28 Nov 2016 13:36:18 +0000
 Subject: [PATCH] iostream: Move include of asterisk.h
@@ -3188,10 +3188,10 @@ index 46abc18a5c..008888142b 100644
  #include "asterisk/astobj2.h"
  #include "asterisk/iostream.h"
 -- 
-2.13.0
+2.13.2
 
 
-From 16b1e62dd8ee8efba0dfe9ec561ff60914d0e3ff Mon Sep 17 00:00:00 2001
+From 4e8deff7298a73e6552bcdbe1ef7406806b70d20 Mon Sep 17 00:00:00 2001
 From: Mark Michelson <mmichelson@digium.com>
 Date: Tue, 6 Dec 2016 10:56:06 -0600
 Subject: [PATCH] Iostreams: Correct off-by-one error.
@@ -3254,10 +3254,10 @@ index 008888142b..9fa39cce59 100644
  		}
  	}
 -- 
-2.13.0
+2.13.2
 
 
-From 229fe7f6026aaf41f35c06afaa836225e4f9577d Mon Sep 17 00:00:00 2001
+From 318f540321dc7b4788f01a100440559f7f5c9792 Mon Sep 17 00:00:00 2001
 From: Mark Michelson <mmichelson@digium.com>
 Date: Thu, 1 Dec 2016 16:49:03 -0600
 Subject: [PATCH] http: Send headers and body in one write.
@@ -3352,10 +3352,10 @@ index 7a61249114..ddae0df2b7 100644
  		}
  	}
 -- 
-2.13.0
+2.13.2
 
 
-From b1af0a7d5d4bc05fcf13cd535a5959dbe63bd49b Mon Sep 17 00:00:00 2001
+From c17d3c0a7d79a3d81c727c437e52aa15c1e3db8e Mon Sep 17 00:00:00 2001
 From: Badalyan Vyacheslav <v.badalyan@open-bs.ru>
 Date: Thu, 8 Dec 2016 18:34:28 +0000
 Subject: [PATCH] Fix IO conversion bug
@@ -3382,10 +3382,10 @@ index 5f59c2c8cb..293685205f 100644
  	char *rbuf = buf;
  	int sanity = 10;
 -- 
-2.13.0
+2.13.2
 
 
-From 42cca2dfae6bddd946ab07221328eafdcc6c7534 Mon Sep 17 00:00:00 2001
+From cd1a94e58075f23ba98315765d7f71dd5509a4aa Mon Sep 17 00:00:00 2001
 From: Joshua Colp <jcolp@digium.com>
 Date: Tue, 9 May 2017 15:34:49 +0000
 Subject: [PATCH] tcptls: Improve error messages for TLS connections.
@@ -3542,5 +3542,5 @@ index 9fa39cce59..1013c6d9b9 100644
  		return -1;
  	}
 -- 
-2.13.0
+2.13.2