diff options
author | Nathan Angelacos <nangel@alpinelinux.org> | 2018-04-08 17:26:22 -0400 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-04-20 14:16:18 +0000 |
commit | 65bc9c288605bc9446348bd22d841599dc50fa26 (patch) | |
tree | ec1b30ca25db9921de771a20be21558228feb01a /main/kamailio/0003-src_modules_tls_tls_init_c.patch | |
parent | a474a886f71519b459a4af51c400a2ee4408f44f (diff) | |
download | aports-65bc9c288605bc9446348bd22d841599dc50fa26.tar.bz2 aports-65bc9c288605bc9446348bd22d841599dc50fa26.tar.xz |
main/kamailio: upgrade 5.1.2
Use slightly modified upstream(?!) APKBUILD
Diffstat (limited to 'main/kamailio/0003-src_modules_tls_tls_init_c.patch')
-rw-r--r-- | main/kamailio/0003-src_modules_tls_tls_init_c.patch | 111 |
1 files changed, 0 insertions, 111 deletions
diff --git a/main/kamailio/0003-src_modules_tls_tls_init_c.patch b/main/kamailio/0003-src_modules_tls_tls_init_c.patch deleted file mode 100644 index 485b01a6bb..0000000000 --- a/main/kamailio/0003-src_modules_tls_tls_init_c.patch +++ /dev/null @@ -1,111 +0,0 @@ -$OpenBSD: patch-src_modules_tls_tls_init_c,v 1.1 2017/07/03 22:14:20 sthen Exp $ - -Index: a/src/modules/tls/tls_init.c ---- a/src/modules/tls/tls_init.c -+++ b/src/modules/tls/tls_init.c -@@ -139,7 +139,7 @@ const SSL_METHOD* ssl_methods[TLS_METHOD_MAX]; - */ - - -- -+#ifndef LIBRESSL_VERSION_NUMBER - inline static char* buf_append(char* buf, char* end, char* str, int str_len) - { - if ( (buf+str_len)<end){ -@@ -317,6 +317,7 @@ static void ser_free(void *ptr, const char *fname, int - } - #endif - -+#endif /* LIBRESSL_VERSION_NUMBER */ - - /* - * Initialize TLS socket -@@ -360,7 +361,7 @@ static void init_ssl_methods(void) - ssl_methods[TLS_USE_SSLv23 - 1] = SSLv23_method(); - - /* only specific SSL or TLS version */ --#if OPENSSL_VERSION_NUMBER < 0x010100000L -+#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER) - #ifndef OPENSSL_NO_SSL2 - ssl_methods[TLS_USE_SSLv2_cli - 1] = SSLv2_client_method(); - ssl_methods[TLS_USE_SSLv2_srv - 1] = SSLv2_server_method(); -@@ -378,13 +379,13 @@ static void init_ssl_methods(void) - ssl_methods[TLS_USE_TLSv1_srv - 1] = TLSv1_server_method(); - ssl_methods[TLS_USE_TLSv1 - 1] = TLSv1_method(); - --#if OPENSSL_VERSION_NUMBER >= 0x1000100fL -+#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(LIBRESSL_VERSION_NUMBER) - ssl_methods[TLS_USE_TLSv1_1_cli - 1] = TLSv1_1_client_method(); - ssl_methods[TLS_USE_TLSv1_1_srv - 1] = TLSv1_1_server_method(); - ssl_methods[TLS_USE_TLSv1_1 - 1] = TLSv1_1_method(); - #endif - --#if OPENSSL_VERSION_NUMBER >= 0x1000105fL -+#if OPENSSL_VERSION_NUMBER >= 0x1000105fL && !defined(LIBRESSL_VERSION_NUMBER) - ssl_methods[TLS_USE_TLSv1_2_cli - 1] = TLSv1_2_client_method(); - ssl_methods[TLS_USE_TLSv1_2_srv - 1] = TLSv1_2_server_method(); - ssl_methods[TLS_USE_TLSv1_2 - 1] = TLSv1_2_method(); -@@ -393,11 +394,11 @@ static void init_ssl_methods(void) - /* ranges of TLS versions (require a minimum TLS version) */ - ssl_methods[TLS_USE_TLSv1_PLUS - 1] = (void*)TLS_OP_TLSv1_PLUS; - --#if OPENSSL_VERSION_NUMBER >= 0x1000100fL -+#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(LIBRESSL_VERSION_NUMBER) - ssl_methods[TLS_USE_TLSv1_1_PLUS - 1] = (void*)TLS_OP_TLSv1_1_PLUS; - #endif - --#if OPENSSL_VERSION_NUMBER >= 0x1000105fL -+#if OPENSSL_VERSION_NUMBER >= 0x1000105fL && !defined(LIBRESSL_VERSION_NUMBER) - ssl_methods[TLS_USE_TLSv1_2_PLUS - 1] = (void*)TLS_OP_TLSv1_2_PLUS; - #endif - } -@@ -408,6 +409,7 @@ static void init_ssl_methods(void) - */ - static int init_tls_compression(void) - { -+#ifndef LIBRESSL_VERSION_NUMBER - #if OPENSSL_VERSION_NUMBER < 0x010100000L - #if OPENSSL_VERSION_NUMBER >= 0x00908000L - int n, r; -@@ -494,6 +496,7 @@ static int init_tls_compression(void) - end: - #endif /* OPENSSL_VERSION_NUMBER >= 0.9.8 */ - #endif /* OPENSSL_VERSION_NUMBER < 1.1.0 */ -+#endif /* LIBRESSL_VERSION_NUMBER */ - return 0; - } - -@@ -504,6 +507,7 @@ end: - */ - int tls_pre_init(void) - { -+#ifndef LIBRESSL_VERSION_NUMBER - #if OPENSSL_VERSION_NUMBER < 0x010100000L - void *(*mf)(size_t) = NULL; - void *(*rf)(void *, size_t) = NULL; -@@ -530,6 +534,7 @@ int tls_pre_init(void) - " (can be loaded first to be safe)\n"); - return -1; - } -+#endif /* LIBRESSL_VERSION_NUMBER */ - - if (tls_init_locks()<0) - return -1; -@@ -563,7 +568,7 @@ int init_tls_h(void) - { - /*struct socket_info* si;*/ - long ssl_version; --#if OPENSSL_VERSION_NUMBER < 0x010100000L -+#if OPENSSL_VERSION_NUMBER < 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER) - int lib_kerberos; - int lib_zlib; - int kerberos_support; -@@ -607,7 +612,7 @@ int init_tls_h(void) - } - - /* check kerberos support using compile flags only for version < 1.1.0 */ --#if OPENSSL_VERSION_NUMBER < 0x010100000L -+#if OPENSSL_VERSION_NUMBER < 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER) - - #ifdef TLS_KERBEROS_SUPPORT - kerberos_support=1; |