diff --git a/pkg/kamailio/alpine/0002-remove-spurious-execinfo.patch b/pkg/kamailio/alpine/0002-remove-spurious-execinfo.patch deleted file mode 100644 index d9403bb4c48..00000000000 --- a/pkg/kamailio/alpine/0002-remove-spurious-execinfo.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/src/modules/ims_dialog/dlg_hash.c b/src/modules/ims_dialog/dlg_hash.c -index 999ae01..4fe4aae 100644 ---- a/src/modules/ims_dialog/dlg_hash.c -+++ b/src/modules/ims_dialog/dlg_hash.c -@@ -17,7 +17,8 @@ - #include "dlg_profile.h" - #include "dlg_handlers.h" - #include "dlg_db_handler.h" --#include -+ -+// #include - - #define MAX_LDG_LOCKS 2048 - #define MIN_LDG_LOCKS 2 -@@ -70,6 +71,7 @@ static int dlg_hash_size_out = 4096; - }\ - }while(0) - -+#ifdef ALPINE_SUPPORTS_BACKTRACE - inline static int backtrace2str(char* buf, int size) - { - void* bt[32]; -@@ -87,6 +89,7 @@ inline static int backtrace2str(char* buf, int size) - } - return 0; - } -+#endif - - /*! - * \brief Initialize the global dialog table diff --git a/pkg/kamailio/alpine/0003-src_modules_tls_tls_init_c.patch b/pkg/kamailio/alpine/0003-src_modules_tls_tls_init_c.patch deleted file mode 100644 index 9b70c21c2eb..00000000000 --- a/pkg/kamailio/alpine/0003-src_modules_tls_tls_init_c.patch +++ /dev/null @@ -1,131 +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_locking.c -+++ b/src/modules/tls/tls_locking.c -@@ -33,7 +33,7 @@ - static gen_lock_set_t* static_locks=0; - - /* OpenSSL is thread-safe since 1.1.0 */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - - /* "dynamic" locks */ - -@@ -118,7 +118,7 @@ - } - } - --#endif /* openssl < 0x10100000L (1.1.0) */ -+#endif /* openssl < 0x10100000L (1.1.0) or LibreSSL */ - - - void tls_destroy_locks() ---- 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)= 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; diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index a687c8fd9fc..259a0f1021f 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -8,7 +8,7 @@ pkgrel=0 # If building from a git snapshot, specify the gitcommit # If building a proper release, leave gitcommit blank -#_gitcommit=65ed9b065c497266a4ecd9760e7c168c69b4c6e8 +_gitcommit=1fe5970917f21e9d69127635e04ba8ae585e2da4 [ ! -z "${_gitcommit}" ] && pkgver="${pkgver}.$(date +%Y%m%d)" [ ! -z "${_gitcommit}" ] && _suffix="-${_gitcommit:0:7}" @@ -236,7 +236,6 @@ done source="${pkgname}-${pkgver}${_suffix}.tar.gz::https://github.com/kamailio/$pkgname/archive/$_gitcommit.tar.gz 0001-kamdbctl.base.patch - 0003-src_modules_tls_tls_init_c.patch 0004-src_core_tcp_read_c.patch kamailio.cfg kamailio.initd @@ -498,9 +497,8 @@ kazoo() { } -sha512sums="e31c99c4300c2db6d324ca4253161bd55d634ec854809e75c3058bdea91caea789ff4b7022bfc60c1c38212d359d960b00908c6e257ce3de379082bc430d7794 kamailio-5.1.0.20170920-65ed9b0.tar.gz +sha512sums="6b4c58fe628270f8927721813607ce080b5e257cca8ace8c7b286c77c7880be258c07f1c7fb5711449cfc1f8841468e6ca647cf2e28be7a8d3dbb316527b7198 kamailio-5.1.0.20170922-1fe5970.tar.gz 6badfb611c02ffcb4c2e9937731162ea1a4b737f042ed52120e2f96ebb80b5b7d240b5612c9ca565e693eec9b8c52c1ee5db04dfc47d204501021f984b4b11db 0001-kamdbctl.base.patch -384216758a9c95f019cbf9b548533ae88e2069a9f1f1730c51a36d1b8fe6b7c41ec51196eccaaaf8a70fcb74443a5cf94ee62cfe39772d7b4cda2aecce25e128 0003-src_modules_tls_tls_init_c.patch af8362201957eae6b66baf7368c9ca884024209a396d77c5c52180c9aabe13772e9c6513e59721d39503e5bb7a8c1030f5c10301ea9055bddafb7f01ee2f3076 0004-src_core_tcp_read_c.patch c1abf69b48847dc8c7ab0d11ef9adb531aa4635f9d44db6933981edc5a47df374664fb24867b19aa64abbcc9777bf1cd0360d9aea54e27b081065928c61e0f0b kamailio.cfg cd6e3b677d803cd78561ad14d9b2589fd35ad0096f48047fdcb4ddc7d9103871357efba3b350946844cb53dbb081210746421fc420c22ac845b90251168a628e kamailio.initd"