MFH: r445592 r449063

- Update net/asterisk13 to 13.17.0
- Remove patches accepted upstream

- Update net/asterisk11 to 11.25.2
- Update net/asterisk13 to 13.17.1

Security:	ec1df2a1-8ee6-11e7-8be8-001999f8d30b,
		c599f95c-8ee5-11e7-8be8-001999f8d30b

Approved by:	ports-secteam (feld)

7 files changed, 8 insertions, 59 deletions

diff --git a/net/asterisk11/Makefile b/net/asterisk11/Makefile
index 09dbf4bdb5d0..0cf392bbf59c 100644
--- a/net/asterisk11/Makefile
+++ b/net/asterisk11/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	asterisk
-PORTVERSION=	11.25.1
-PORTREVISION=	3
+PORTVERSION=	11.25.2
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
 MASTER_SITE_SUBDIR=	asterisk/ \
diff --git a/net/asterisk11/distinfo b/net/asterisk11/distinfo
index e431884a9702..4900e61e205c 100644
--- a/net/asterisk11/distinfo
+++ b/net/asterisk11/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1481311749
-SHA256 (asterisk-11.25.1.tar.gz) = dc9c282ca1142b286e5a5c391647d6be73f35524c8def37718de866e8384a57c
-SIZE (asterisk-11.25.1.tar.gz) = 35125897
+TIMESTAMP = 1504251297
+SHA256 (asterisk-11.25.2.tar.gz) = 59fd3735546cb56bda15f39caf34636c113e68b79019554a007ad63cb6fc2d33
+SIZE (asterisk-11.25.2.tar.gz) = 35130400
 SHA256 (asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
 SIZE (asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
 SHA256 (asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
diff --git a/net/asterisk13/Makefile b/net/asterisk13/Makefile
index be54c50003b3..9045ed010332 100644
--- a/net/asterisk13/Makefile
+++ b/net/asterisk13/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	asterisk
-PORTVERSION=	13.16.0
-PORTREVISION=	1
+PORTVERSION=	13.17.1
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
 MASTER_SITE_SUBDIR=	asterisk/ \
diff --git a/net/asterisk13/distinfo b/net/asterisk13/distinfo
index dd689ecfd84e..ec29ceadd08e 100644
--- a/net/asterisk13/distinfo
+++ b/net/asterisk13/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1496177063
-SHA256 (asterisk-13.16.0.tar.gz) = bcc81856ef5c624b591d5c11beeb68587cc7b3872cf41f728663b623a28cf865
-SIZE (asterisk-13.16.0.tar.gz) = 32886977
+TIMESTAMP = 1504251584
+SHA256 (asterisk-13.17.1.tar.gz) = aee15699a4100ca0360e8168802c711caf7664d21d9fb84f686873f0e7c5fb34
+SIZE (asterisk-13.17.1.tar.gz) = 32897834
 SHA256 (asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
 SIZE (asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
 SHA256 (asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
diff --git a/net/asterisk13/files/patch-main_crypt.c b/net/asterisk13/files/patch-main_crypt.c
deleted file mode 100644
index 78f49c83510a..000000000000
--- a/net/asterisk13/files/patch-main_crypt.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- main/crypt.c.orig	2016-07-21 14:54:02 UTC
-+++ main/crypt.c
-@@ -31,7 +31,7 @@
- ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
- 
- #include <unistd.h>
--#if defined(HAVE_CRYPT_R)
-+#if defined(HAVE_CRYPT_R) && !defined(__FreeBSD__)
- #include <crypt.h>
- #endif
- 
diff --git a/net/asterisk13/files/patch-main_libasteriskssl.c b/net/asterisk13/files/patch-main_libasteriskssl.c
deleted file mode 100644
index 083eb6365a0a..000000000000
--- a/net/asterisk13/files/patch-main_libasteriskssl.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- main/libasteriskssl.c.orig	2017-04-12 21:07:31 UTC
-+++ main/libasteriskssl.c
-@@ -74,7 +74,7 @@ static void ssl_lock(int mode, int n, const char *file
- 	}
- }
- 
--#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- int SSL_library_init(void)
- {
- #if defined(AST_DEVMODE)
-@@ -129,7 +129,7 @@ void ERR_free_strings(void)
- int ast_ssl_init(void)
- {
- #if defined(HAVE_OPENSSL) && defined(OPENSSL_VERSION_NUMBER) && \
--	OPENSSL_VERSION_NUMBER < 0x10100000L
-+	(OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
- 	unsigned int i;
- 	int (*real_SSL_library_init)(void);
- 	void (*real_CRYPTO_set_id_callback)(unsigned long (*)(void));
diff --git a/net/asterisk13/files/patch-main_tcptls.c b/net/asterisk13/files/patch-main_tcptls.c
deleted file mode 100644
index 77fe09c0c272..000000000000
--- a/net/asterisk13/files/patch-main_tcptls.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- main/tcptls.c.orig	2017-04-12 21:06:16 UTC
-+++ main/tcptls.c
-@@ -400,13 +400,13 @@ static int tcptls_stream_close(void *cookie)
- 					SSL_get_error(stream->ssl, 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