Module: kamailio Branch: master Commit: 37bff4588803a70873babdb483804e3734b42900 URL: https://github.com/kamailio/kamailio/commit/37bff4588803a70873babdb483804e3… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-09T17:38:21+01:00 pkg/docker: Alpine switched to use openssl. Updated rules for alpine docker container --- Modified: pkg/docker Modified: pkg/kamailio/alpine/APKBUILD Removed: pkg/kamailio/alpine/0004-src_core_tcp_read_c.patch --- Diff: https://github.com/kamailio/kamailio/commit/37bff4588803a70873babdb483804e3… Patch: https://github.com/kamailio/kamailio/commit/37bff4588803a70873babdb483804e3… --- diff --git a/pkg/docker b/pkg/docker index 3c8a156abe..6a18819230 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 3c8a156abef2a034d9a21df5bf73f4b5cc4d3e05 +Subproject commit 6a18819230742860f6db6996cda593f55f63cd8c diff --git a/pkg/kamailio/alpine/0004-src_core_tcp_read_c.patch b/pkg/kamailio/alpine/0004-src_core_tcp_read_c.patch deleted file mode 100644 index 08308f77b1..0000000000 --- a/pkg/kamailio/alpine/0004-src_core_tcp_read_c.patch +++ /dev/null @@ -1,20 +0,0 @@ -$OpenBSD: patch-src_core_tcp_read_c,v 1.1 2017/07/03 22:14:20 sthen Exp $ - -Index: a/src/core/tcp_read.c ---- a/src/core/tcp_read.c.orig -+++ a/src/core/tcp_read.c -@@ -1497,6 +1497,14 @@ void release_tcpconn(struct tcp_connection* c, long st - ip_addr2a(&c->rcv.src_ip), c->rcv.src_port, - ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port); - LM_DBG("extra_data %p\n", c->extra_data); -+ -+ /* experimental fix tls crash with libressl */ -+ /* add cleanup SSL structure in child process, in parent process SSL structure is empty */ -+ if ((c->type==PROTO_TLS || c->type==PROTO_WSS) && (c->extra_data) && c->fd != -1) { -+ tls_close(c, c->fd); -+ tls_tcpconn_clean(c); -+ } -+ - /* release req & signal the parent */ - c->reader_pid=0; /* reset it */ - if (c->fd!=-1){ diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 2b77da2a3d..96eb89c25e 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -27,7 +27,7 @@ depends="gawk" options="!check" makedepends="bison db-dev flex freeradius-client-dev expat-dev lksctp-tools-dev perl-dev postgresql-dev python2-dev pcre-dev mariadb-dev libxml2-dev curl-dev unixodbc-dev confuse-dev ncurses-dev sqlite-dev - lua-dev openldap-dev libressl-dev net-snmp-dev libuuid libev-dev + lua-dev openldap-dev openssl-dev net-snmp-dev libuuid libev-dev jansson-dev json-c-dev libevent-dev linux-headers libmemcached-dev rabbitmq-c-dev hiredis-dev libmaxminddb-dev libunistring-dev" install="$pkgname.pre-install $pkgname.pre-upgrade" @@ -251,7 +251,6 @@ done source="${pkgname}-${pkgver}${_suffix}.tar.gz::https://github.com/kama… 0001-kamdbctl.base.patch - 0004-src_core_tcp_read_c.patch kamailio.initd " @@ -551,5 +550,4 @@ sipdump() { sha512sums="51ea5fccd27a9d3d1783cfc5596eb28ab27e34faeec3268600363f43c48a3634c3c584c479ba874fdb53b85766a0ce8fe7df0e20954c9c6514b1d9d41d9237e6 kamailio-5.1.0.20171125-991fe9b.tar.gz 6badfb611c02ffcb4c2e9937731162ea1a4b737f042ed52120e2f96ebb80b5b7d240b5612c9ca565e693eec9b8c52c1ee5db04dfc47d204501021f984b4b11db 0001-kamdbctl.base.patch -af8362201957eae6b66baf7368c9ca884024209a396d77c5c52180c9aabe13772e9c6513e59721d39503e5bb7a8c1030f5c10301ea9055bddafb7f01ee2f3076 0004-src_core_tcp_read_c.patch 321b1b160434150bcde3c0ad7f47ddf259791b68d4ce74ba4c35034026421a2bc6f5e86f26f393f5fcdb523d8cd75f944709473065553ce860b0ea06b3dc2a1b kamailio.initd"