mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-05 06:27:37 +00:00
Code Issues Releases Activity

- Update net/asterisk13 to 13.17.0

Browse Source 
- Remove patches accepted upstream
This commit is contained in:
Guido Falsi 2017-07-12 16:19:38 +00:00
parent ed9dc710f6
commit 41fe0f9d8e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=445592
5 changed files with 4 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/asterisk13/Makefile
View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= asterisk
PORTVERSION= 13.16.0
PORTVERSION= 13.17.0
CATEGORIES= net
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
MASTER_SITE_SUBDIR= asterisk/ \

6
net/asterisk13/distinfo
View File

@ -1,6 +1,6 @@
TIMESTAMP = 1496177063
SHA256 (asterisk-13.16.0.tar.gz) = bcc81856ef5c624b591d5c11beeb68587cc7b3872cf41f728663b623a28cf865
SIZE (asterisk-13.16.0.tar.gz) = 32886977
TIMESTAMP = 1499871944
SHA256 (asterisk-13.17.0.tar.gz) = c4a89386d7db58520391fcbd3202902584b4434289094ca2e4a6b8dada1e90a4
SIZE (asterisk-13.17.0.tar.gz) = 32908945
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

11
net/asterisk13/files/patch-main_crypt.c
View File

@ -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

20
net/asterisk13/files/patch-main_libasteriskssl.c
View File

@ -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));

18
net/asterisk13/files/patch-main_tcptls.c
View File

@ -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