Commit ae11ee32 authored by Sergey Safarov's avatar Sergey Safarov Committed by Timo Teräs
Browse files

main/kamailio: Updated package version to 5.0.2. Added kazoo module.

parent f53b0ced
--- a/utils/kamctl/kamdbctl.base
+++ b/utils/kamctl/kamdbctl.base
@@ -33,19 +33,19 @@
@@ -33,20 +33,20 @@
# Used by dbtext and db_berkeley to define tables to be created, used by
# postgres to do the grants
......@@ -15,20 +15,21 @@
+EXTRA_TABLES=${EXTRA_TABLES:-'imc_members imc_rooms cpl sip_trace domainpolicy
carrierroute carrier_name domain_name carrierfailureroute userblacklist
globalblacklist htable purplemap uacreg pl_pipes mtree mtrees
- sca_subscriptions mohqcalls mohqueues rtpproxy}
-PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap
sca_subscriptions mohqcalls mohqueues rtpproxy rtpengine
- dr_gateways dr_rules dr_gw_lists dr_groups}
-PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap
- pua rls_presentity rls_watchers}
-DBUID_TABLES=${UID_TABLES:-uid_credentials uid_domain uid_domain_attrs
- uid_global_attrs uid_uri uid_uri_attrs uid_user_attrs}
+ sca_subscriptions mohqcalls mohqueues rtpproxy'}
+PRESENCE_TABLES=${PRESENCE_TABLES:-'presentity active_watchers watchers xcap
+ dr_gateways dr_rules dr_gw_lists dr_groups'}
+PRESENCE_TABLES=${PRESENCE_TABLES:-'presentity active_watchers watchers xcap
+ pua rls_presentity rls_watchers'}
+DBUID_TABLES=${UID_TABLES:-'uid_credentials uid_domain uid_domain_attrs
+ uid_global_attrs uid_uri uid_uri_attrs uid_user_attrs'}
# SQL definitions
# If you change this definitions here, then you must change them
@@ -68,18 +68,18 @@
@@ -69,18 +69,18 @@
SED=${SED:-sed}
# define what modules should be installed
......@@ -43,9 +44,9 @@
-EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute
+EXTRA_MODULES=${EXTRA_MODULES:-'imc cpl siptrace domainpolicy carrierroute
userblacklist htable purple uac pipelimit mtree sca mohqueue
- rtpproxy}
+ rtpproxy'}
drouting userblacklist htable purple uac pipelimit mtree sca mohqueue
- rtpproxy rtpengine}
+ rtpproxy rtpengine'}
-DBUID_MODULES=${UID_MODULES:-uid_auth_db uid_avp_db uid_domain uid_gflags
- uid_uri_db}
......
diff --git a/src/core/tsend.c b/src/core/tsend.c
index 97463fc..60c70af 100644
--- a/src/core/tsend.c
+++ b/src/core/tsend.c
@@ -27,7 +27,7 @@
#include <string.h>
#include <errno.h>
-#include <sys/poll.h>
+#include <poll.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/src/modules/ldap/ld_session.h b/src/modules/ldap/ld_session.h
index 08a752c..0591f79 100644
--- a/src/modules/ldap/ld_session.h
+++ b/src/modules/ldap/ld_session.h
@@ -28,6 +28,7 @@
#ifndef LD_SESSION_H
#define LD_SESSION_H
+#include <sys/time.h>
#include <ldap.h>
#include "iniparser.h"
diff --git a/src/modules/seas/event_dispatcher.c b/src/modules/seas/event_dispatcher.c
index 05581d5..b9c720f 100644
--- a/src/modules/seas/event_dispatcher.c
+++ b/src/modules/seas/event_dispatcher.c
@@ -25,7 +25,7 @@
#include <string.h>/*strcmp,memset*/
#include <errno.h>/*errno*/
#include <unistd.h>/*close(),read(),pipe,fork,pid_t*/
-#include <sys/poll.h>/*poll*/
+#include <poll.h>/*poll*/
#include <signal.h>/*signal*/
#include <time.h>/*time*/
#include <string.h>/*memcmp*/
diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c
index da04f08..5b713ec 100644
--- a/src/modules/tls/tls_server.c
+++ b/src/modules/tls/tls_server.c
@@ -26,7 +26,7 @@
*/
-#include <sys/poll.h>
+#include <poll.h>
#include <openssl/err.h>
#include <openssl/ssl.h>
#include "../../core/dprint.h"
diff --git a/utils/kamcmd/kamcmd.c b/utils/kamcmd/kamcmd.c
index 56124ca..08fb3b2 100644
--- a/utils/kamcmd/kamcmd.c
+++ b/utils/kamcmd/kamcmd.c
@@ -41,6 +41,7 @@
#include <netdb.h> /* gethostbyname */
#include <fcntl.h>
#include <time.h> /* time */
+#include <sys/time.h>
#ifdef USE_READLINE
#include <readline/readline.h>
diff -ru kamailio-5.0.1.orig/src/modules/tls/tls_bio.c kamailio-5.0.1/src/modules/tls/tls_bio.c
--- kamailio-5.0.1.orig/src/modules/tls/tls_bio.c 2017-04-05 13:32:39.000000000 +0000
+++ kamailio-5.0.1/src/modules/tls/tls_bio.c 2017-04-27 10:16:48.389532400 +0000
@@ -63,7 +63,7 @@
static long tls_bio_mbuf_ctrl(BIO* b, int cmd, long arg1, void* arg2);
-#if OPENSSL_VERSION_NUMBER < 0x010100000L
+#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER)
static BIO_METHOD tls_mbuf_method = {
BIO_TYPE_TLS_MBUF, /* type */
"sr_tls_mbuf", /* name */
@@ -76,6 +76,27 @@
tls_bio_mbuf_free, /* destroy(free) function */
0 /* ctrl callback */
};
+
+static void *CRYPTO_zalloc(size_t num, const char *file, int line)
+{
+ void *ret = CRYPTO_malloc(num, file, line);
+ if (ret != NULL)
+ memset(ret, 0, num);
+ return ret;
+}
+# define OPENSSL_zalloc(num) CRYPTO_zalloc(num, __FILE__, __LINE__)
+static void *BIO_get_data(BIO *b)
+{
+ return b->ptr;
+}
+static void BIO_set_data(BIO *b, void *ptr)
+{
+ b->ptr = ptr;
+}
+static void BIO_set_init(BIO *b, int init)
+{
+ b->init = init;
+}
#else
static BIO_METHOD *tls_mbuf_method = NULL;
#endif
@@ -84,7 +105,7 @@
/** returns a custom tls_mbuf BIO. */
BIO_METHOD* tls_BIO_mbuf(void)
{
-#if OPENSSL_VERSION_NUMBER < 0x010100000L
+#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER)
return &tls_mbuf_method;
#else
if(tls_mbuf_method != NULL) {
@@ -137,22 +158,14 @@
struct tls_bio_mbuf_data* d;
TLS_BIO_DBG("tls_BIO_mbuf_set called (%p => %p, %p)\n", b, rd, wr);
-#if OPENSSL_VERSION_NUMBER < 0x010100000L
- d = b->ptr;
-#else
d = BIO_get_data(b);
-#endif
if (unlikely(d == 0)){
BUG("null BIO ptr data\n");
return 0;
}
d->rd = rd;
d->wr = wr;
-#if OPENSSL_VERSION_NUMBER < 0x010100000L
- b->init = 1;
-#else
BIO_set_init(b, 1);
-#endif
return 1;
}
@@ -167,25 +180,12 @@
struct tls_bio_mbuf_data* d;
TLS_BIO_DBG("tls_bio_mbuf_new called (%p)\n", b);
-#if OPENSSL_VERSION_NUMBER < 0x010100000L
- b->init = 0; /* not initialized yet */
- b->num = 0;
- b->ptr = 0;
- b->flags = 0;
- d = OPENSSL_malloc(sizeof(*d));
- if (unlikely(d == 0))
- return 0;
- d->rd = 0;
- d->wr = 0;
- b->ptr = d;
-#else
BIO_set_init(b, 0);
BIO_set_data(b, NULL);
d = OPENSSL_zalloc(sizeof(*d));
if (unlikely(d == 0))
return 0;
BIO_set_data(b, d);
-#endif
return 1;
}
@@ -200,13 +200,6 @@
TLS_BIO_DBG("tls_bio_mbuf_free called (%p)\n", b);
if (unlikely( b == 0))
return 0;
-#if OPENSSL_VERSION_NUMBER < 0x010100000L
- if (likely(b->ptr)){
- OPENSSL_free(b->ptr);
- b->ptr = 0;
- b->init = 0;
- }
-#else
do {
struct tls_bio_mbuf_data* d;
d = BIO_get_data(b);
@@ -216,7 +209,6 @@
BIO_set_init(b, 0);
}
} while(0);
-#endif
return 1;
}
@@ -235,11 +227,7 @@
ret = 0;
if (likely(dst)) {
-#if OPENSSL_VERSION_NUMBER < 0x010100000L
- d = b->ptr;
-#else
d = BIO_get_data(b);
-#endif
BIO_clear_retry_flags(b);
if (unlikely(d == 0 || d->rd->buf == 0)) {
if (d == 0)
@@ -291,11 +279,7 @@
int ret;
ret = 0;
-#if OPENSSL_VERSION_NUMBER < 0x010100000L
- d = b->ptr;
-#else
d = BIO_get_data(b);
-#endif
BIO_clear_retry_flags(b);
if (unlikely(d == 0 || d->wr->buf == 0)) {
if (d == 0)
diff -ru kamailio-5.0.1.orig/src/modules/tls/tls_domain.c kamailio-5.0.1/src/modules/tls/tls_domain.c
--- kamailio-5.0.1.orig/src/modules/tls/tls_domain.c 2017-04-05 13:32:39.000000000 +0000
+++ kamailio-5.0.1/src/modules/tls/tls_domain.c 2017-04-27 10:15:10.447718361 +0000
@@ -124,7 +124,7 @@
return;
}
-#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL)
+#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL) && !defined(LIBRESSL_VERSION_NUMBER)
/* libssl >= v1.1.0 */
DH_set0_pqg(dh, p, NULL, g);
#else
......@@ -12,8 +12,8 @@ _giturl="git://github.com/$pkgname/$pkgname.git"
_gittag=HEAD
pkgver=5.0.1
pkgrel=1
pkgver=5.0.2
pkgrel=0
[ -z "${_gitcommit}" ] && _suffix="_src" || _suffix="-${_gitcommit}"
pkgdesc="Open Source SIP Server"
......@@ -229,20 +229,17 @@ for _i in db postgres sqlite dbtext mysql \
ldap utils tls presence lua ims outbound debugger \
extras json websocket authephemeral \
uuid ev memcached redis geoip2 jansson \
jsdt http_async; do
jsdt http_async kazoo; do
subpackages="$subpackages $pkgname-$_i"
eval "_modules=\"\$_modules \$_mod_list_$_i\""
done
source="http://www.kamailio.org/pub/kamailio/$pkgver/src/${pkgname}-${pkgver}${_suffix}.tar.gz
0001-musl-fixes.patch
0002-fix-libressl.patch
0003-kamdbctl.base.patch
0004-remove-spurious-execinfo.patch
0001-kamdbctl.base.patch
0002-remove-spurious-execinfo.patch
kamailio.cfg
kamailio.initd
s390x-big-endian.patch
"
snapshot() {
......@@ -285,7 +282,7 @@ build() {
DESTDIR="$pkgdir" \
cfg_prefix="$pkgdir" \
cfg
make EMBEDDED_UTF8_DECODE=1 STUN=1 \
make EMBEDDED_UTF8_DECODE=1 STUN=1 \
all || return 1
}
......@@ -503,12 +500,14 @@ http_async() {
"$_mod_list_http_async"
}
kazoo() {
_generic_pkg "Kazoo VoIP platform support" \
"$_mod_list_kazoo"
}
sha512sums="8e30d2d615e435f51d99113823652403dd0fd874d325b7e5c0e2c6055f977ab16adc8ce9de9031c591150ee43fd1a1bfe5adb252890c14087ac1795f060fc478 kamailio-5.0.1_src.tar.gz
4371c04ffdbd876cbc8128a4ae42368be7e4783eff564bd424fd4cebba18c8841212837ce305557f4d0643f37711741d157feba8cd6d24be3e9dc6a436142110 0001-musl-fixes.patch
27150c5ef2b77e5944513a5e3a45ef550be3e3aaa6539ba4984624442940b8df1649b3269af1afd0f1019c5fd33029177ced2cd6011ab0d633cd64a69d38e9a2 0002-fix-libressl.patch
139fab275e7d01da85bf3422a16966165c72584122513d34b5fb3d9341c430eeb69ec5b86b82ff4acce709f5ab3f651de5954ae38ff9a256a19b22d88cfea830 0003-kamdbctl.base.patch
e60e8d41e55008f0473e4d645af3b43f2bc097e341bb3bb81daec8bc47abcd6d037cbb56082675c24ffb1c50b2eb93e3c4fc50b0dc2df9cdfe4f28ad7b9fbf9e 0004-remove-spurious-execinfo.patch
sha512sums="d2bd320edb9612006277979f96079c8a01b8fef3774af5847aab78529dbe61880be6a4e596af1ce6c67fa34142a0f200e7728ff3a725691f081fccd51cd11f16 kamailio-5.0.2_src.tar.gz
6badfb611c02ffcb4c2e9937731162ea1a4b737f042ed52120e2f96ebb80b5b7d240b5612c9ca565e693eec9b8c52c1ee5db04dfc47d204501021f984b4b11db 0001-kamdbctl.base.patch
e60e8d41e55008f0473e4d645af3b43f2bc097e341bb3bb81daec8bc47abcd6d037cbb56082675c24ffb1c50b2eb93e3c4fc50b0dc2df9cdfe4f28ad7b9fbf9e 0002-remove-spurious-execinfo.patch
c1abf69b48847dc8c7ab0d11ef9adb531aa4635f9d44db6933981edc5a47df374664fb24867b19aa64abbcc9777bf1cd0360d9aea54e27b081065928c61e0f0b kamailio.cfg
cd6e3b677d803cd78561ad14d9b2589fd35ad0096f48047fdcb4ddc7d9103871357efba3b350946844cb53dbb081210746421fc420c22ac845b90251168a628e kamailio.initd
54016ee9a9f729bab317807761580cf2ac5d8e5dde747377f4d66337af37733de504658aaef28e9432e642b87b79c4bb03bcbb1b2d9c67acd515a37080013d0f s390x-big-endian.patch"
cd6e3b677d803cd78561ad14d9b2589fd35ad0096f48047fdcb4ddc7d9103871357efba3b350946844cb53dbb081210746421fc420c22ac845b90251168a628e kamailio.initd"
diff --git a/src/modules/acc/diam_message.h b/src/modules/acc/diam_message.h
index 35ad2d9..e4faaf0 100644
--- a/src/modules/acc/diam_message.h
+++ b/src/modules/acc/diam_message.h
@@ -74,7 +74,6 @@
#define ST_MSG_CODE 0x13010000
#define MASK_MSG_CODE 0xffffff00
#else
- #error BIG endian detected!!
#define AS_MSG_CODE 0x00000112
#define AC_MSG_CODE 0x0000010f
#define CE_MSG_CODE 0x00000101
diff --git a/src/modules/cdp/diameter.h b/src/modules/cdp/diameter.h
index 38115a9..2be2525 100644
--- a/src/modules/cdp/diameter.h
+++ b/src/modules/cdp/diameter.h
@@ -115,7 +115,6 @@
#define ST_MSG_CODE 0x13010000
#define MASK_MSG_CODE 0xffffff00
#else
- #error BIG endian detected!!
#define AS_MSG_CODE 0x00000112
#define AC_MSG_CODE 0x0000010f
#define CE_MSG_CODE 0x00000101
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment