aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Korzun <drtr0jan@yandex.ru>2025-01-10 16:11:37 +0000
committerRobert Clausecker <fuz@FreeBSD.org>2025-01-17 12:34:00 +0000
commitd01782846b8e7f4e3b601e34ba1481d7f32aee9c (patch)
tree2661820fa2e1beff7c01cc0bbc83217c33023c38
parent92111bdb7bb975fa2b51e7eb07470b6efc98db7d (diff)
net/kamailio: update to 5.8.4
- submitter becomes maintainer - added GCRYPT and MICROHTTPD options - small fixes Changelog: https://www.kamailio.org/pub/kamailio/5.8.4/ChangeLog Release notes: https://www.kamailio.org/w/kamailio-v5-8-0-release-notes/ PR: 283010 Reported by: p5B2EA84B3@t-online.de Approved by: dmitry.wagin@ya.ru (maintainer)
-rw-r--r--net/kamailio/Makefile26
-rw-r--r--net/kamailio/distinfo6
-rw-r--r--net/kamailio/files/patch-src_Makefile.defs13
-rw-r--r--net/kamailio/files/patch-src_modules_influxdbc_ic.c10
-rw-r--r--net/kamailio/files/patch-src_modules_tls_tls__bio.c14
-rw-r--r--net/kamailio/pkg-plist13
6 files changed, 48 insertions, 34 deletions
diff --git a/net/kamailio/Makefile b/net/kamailio/Makefile
index a87da25a2b41..fe7350f80fe7 100644
--- a/net/kamailio/Makefile
+++ b/net/kamailio/Makefile
@@ -1,11 +1,10 @@
PORTNAME= kamailio
-PORTVERSION= 5.7.3
-PORTREVISION= 1
+DISTVERSION= 5.8.4
CATEGORIES= net
MASTER_SITES= http://www.kamailio.org/pub/kamailio/${PORTVERSION}/src/
-DISTNAME= ${PORTNAME}-${PORTVERSION}_src
+DISTNAME= ${PORTNAME}-${DISTVERSION}_src
-MAINTAINER= dmitry.wagin@ya.ru
+MAINTAINER= drtr0jan@yandex.ru
COMMENT= Very fast and configurable open source SIP proxy
WWW= https://www.kamailio.org/
@@ -39,10 +38,11 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USERS= ${KAMAILIO_USER}
GROUPS= ${KAMAILIO_GROUP}
-OPTIONS_DEFINE= DATABASE DIALPLAN DLGS DOCS EVAPI HTTP_CLIENT \
- JWT KAFKA LOST LWSC MQTT OUTBOUND PERL \
- PHONENUM POSOPS PRESENCE RADIUS SCTP SECSIPID \
- SIPREPO SLACK SWORKER TLS WEBSOCKET
+OPTIONS_DEFINE= DATABASE DIALPLAN DLGS DOCS EVAPI GCRYPT \
+ HTTP_CLIENT JWT KAFKA LOST LWSC MICROHTTPD \
+ MQTT OUTBOUND PERL PHONENUM POSOPS PRESENCE \
+ RADIUS SCTP SECSIPID SIPREPO SLACK SWORKER \
+ TLS WEBSOCKET
OPTIONS_DEFAULT= MYSQL PRESENCE RADIUS SQLITE TLS
OPTIONS_GROUP= DATABASE_DRIVERS KEMI_LANGS
OPTIONS_GROUP_DATABASE_DRIVERS= MYSQL PGSQL SQLITE UNIXODBC
@@ -54,6 +54,7 @@ DATABASE_DRIVERS_DESC= Database drivers
DIALPLAN_DESC= String translations based on rules
DLGS_DESC= Lightweight, stateless dialog tracking and statistics
EVAPI_DESC= Network event broadcast API
+GCRYPT_DESC= Cryptography functions
HTTP_CLIENT_DESC= HTTP-client module
JWT_DESC= JSON Web Token generation and validation
KAFKA_DESC= Produces and sends messages to a Kafka server
@@ -61,6 +62,7 @@ KEMI_LANGS_DESC= Kamailio Embedded Interface Interpreters
LOST_DESC= HELD (RFC6155) and LOST (RFC5222) location-based routing
LUAJIT_DESC= Execute embedded Lua scripts
LWSC_DESC= Websocket client connector using libwebsockets
+MICROHTTPD_DESC= Simple HTTP server implementation
MQTT_DESC= MQTT connector for bi-directional publish-subscribe communication
OUTBOUND_DESC= SIP Outbound support
PHONENUM_DESC= Phone number lookup and normalization using libphonenumber
@@ -76,7 +78,7 @@ WEBSOCKET_DESC= WebSocket transport layer
DATABASE_VARS= EXTRA_GROUPS+=db
-DIALPLAN_LIB_DEPENDS= libpcre.so:devel/pcre
+DIALPLAN_LIB_DEPENDS= libpcre2-8.so:devel/pcre2
DIALPLAN_VARS= EXTRA_MODULES+=dialplan
DLGS_VARS= EXTRA_MODULES+=dlgs
@@ -84,6 +86,9 @@ DLGS_VARS= EXTRA_MODULES+=dlgs
EVAPI_LIB_DEPENDS= libev.so:devel/libev
EVAPI_VARS= EXTRA_MODULES+=evapi
+GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt
+GCRYPT_VARS= EXTRA_MODULES+=gcrypt
+
HTTP_CLIENT_LIB_DEPENDS= libcurl.so:ftp/curl
HTTP_CLIENT_VARS= EXTRA_MODULES+=http_client
@@ -104,6 +109,9 @@ LUAJIT_VARS= EXTRA_MODULES+=app_lua
LWSC_LIB_DEPENDS= libwebsockets.so:net/libwebsockets
LWSC_VARS= EXTRA_MODULES+=lwsc
+MICROHTTPD_LIB_DEPENDS= libmicrohttpd.so:www/libmicrohttpd
+MICROHTTPD_VARS= EXTRA_MODULES+=microhttpd
+
MQTT_LIB_DEPENDS= libev.so:devel/libev \
libmosquitto.so:net/mosquitto
MQTT_VARS= EXTRA_MODULES+=mqtt
diff --git a/net/kamailio/distinfo b/net/kamailio/distinfo
index 382d3440657e..744a6d79af09 100644
--- a/net/kamailio/distinfo
+++ b/net/kamailio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1702905644
-SHA256 (kamailio-5.7.3_src.tar.gz) = c7a620b03974e4e04d419e086a771fd0b7a8e269f3d69c19a1c66085a498fd8c
-SIZE (kamailio-5.7.3_src.tar.gz) = 13128905
+TIMESTAMP = 1736434974
+SHA256 (kamailio-5.8.4_src.tar.gz) = 666e8570f98491bcf4743248f1b2c13c5171dcdb8228796cfff40b9aeba9fe91
+SIZE (kamailio-5.8.4_src.tar.gz) = 13000021
diff --git a/net/kamailio/files/patch-src_Makefile.defs b/net/kamailio/files/patch-src_Makefile.defs
index b077fcac8e07..5bec96dff0b5 100644
--- a/net/kamailio/files/patch-src_Makefile.defs
+++ b/net/kamailio/files/patch-src_Makefile.defs
@@ -1,15 +1,6 @@
---- src/Makefile.defs.orig 2024-02-25 08:14:20 UTC
+--- src/Makefile.defs.orig 2024-11-12 10:25:56 UTC
+++ src/Makefile.defs
-@@ -107,7 +107,7 @@ SUBLEVEL = 3
- VERSION = 5
- PATCHLEVEL = 7
- SUBLEVEL = 3
--EXTRAVERSION =
-+EXTRAVERSION =
-
- # memory manager switcher
- # 0 - f_malloc (fast malloc)
-@@ -496,7 +496,7 @@ ifeq ($(OS), freebsd)
+@@ -492,7 +492,7 @@ ifeq ($(OS), freebsd)
ifeq ($(OS), freebsd)
doc_dir = share/doc/$(MAIN_NAME)/
diff --git a/net/kamailio/files/patch-src_modules_influxdbc_ic.c b/net/kamailio/files/patch-src_modules_influxdbc_ic.c
new file mode 100644
index 000000000000..2cfdc5532b38
--- /dev/null
+++ b/net/kamailio/files/patch-src_modules_influxdbc_ic.c
@@ -0,0 +1,10 @@
+--- src/modules/influxdbc/ic.c.orig 2024-11-12 10:25:55 UTC
++++ src/modules/influxdbc/ic.c
+@@ -26,6 +26,7 @@
+ #include <string.h>
+ #include <sys/errno.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <netdb.h>
+
diff --git a/net/kamailio/files/patch-src_modules_tls_tls__bio.c b/net/kamailio/files/patch-src_modules_tls_tls__bio.c
index 185f57312e9b..f780aa41c82a 100644
--- a/net/kamailio/files/patch-src_modules_tls_tls__bio.c
+++ b/net/kamailio/files/patch-src_modules_tls_tls__bio.c
@@ -1,17 +1,17 @@
---- src/modules/tls/tls_bio.c.orig 2019-08-14 09:43:03 UTC
+--- src/modules/tls/tls_bio.c.orig 2024-11-12 10:25:56 UTC
+++ src/modules/tls/tls_bio.c
-@@ -63,7 +63,7 @@ static int tls_bio_mbuf_puts(BIO* b, const char* s);
- static long tls_bio_mbuf_ctrl(BIO* b, int cmd, long arg1, void* arg2);
+@@ -63,7 +63,7 @@ static long tls_bio_mbuf_ctrl(BIO *b, int cmd, long ar
+ static long tls_bio_mbuf_ctrl(BIO *b, int cmd, long arg1, void *arg2);
-#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x010100000L || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL )
static BIO_METHOD tls_mbuf_method = {
- BIO_TYPE_TLS_MBUF, /* type */
- "sr_tls_mbuf", /* name */
-@@ -109,7 +109,7 @@ static BIO_METHOD *tls_mbuf_method = NULL;
+ BIO_TYPE_TLS_MBUF, /* type */
+ "sr_tls_mbuf", /* name */
+@@ -109,7 +109,7 @@ BIO_METHOD *tls_BIO_mbuf(void)
/** returns a custom tls_mbuf BIO. */
- BIO_METHOD* tls_BIO_mbuf(void)
+ BIO_METHOD *tls_BIO_mbuf(void)
{
-#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x010100000L || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL )
diff --git a/net/kamailio/pkg-plist b/net/kamailio/pkg-plist
index 165543c5c326..d8f64708b1b6 100644
--- a/net/kamailio/pkg-plist
+++ b/net/kamailio/pkg-plist
@@ -148,7 +148,9 @@
%%DLGS%%lib/kamailio/modules/dlgs.so
%%EVAPI%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.evapi
%%EVAPI%%lib/kamailio/modules/evapi.so
-%%HTTP_CLIENT%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.http_connect
+%%GCRYPT%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.gcrypt
+%%GCRYPT%%lib/kamailio/modules/gcrypt.so
+%%HTTP_CLIENT%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.http_client
%%HTTP_CLIENT%%lib/kamailio/modules/http_client.so
%%JWT%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.jwt
%%JWT%%lib/kamailio/modules/jwt.so
@@ -160,6 +162,8 @@
%%LUAJIT%%lib/kamailio/modules/app_lua.so
%%LWSC%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.lwsc
%%LWSC%%lib/kamailio/modules/lwsc.so
+%%MICROHTTPD%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.microhttpd
+%%MICROHTTPD%%lib/kamailio/modules/microhttpd.so
%%MQTT%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.mqtt
%%MQTT%%lib/kamailio/modules/mqtt.so
%%MYSQL%%%%DATADIR%%/mysql/acc-create.sql
@@ -292,7 +296,6 @@
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/modules/README.acc_diameter
%%PORTDOCS%%%%DOCSDIR%%/modules/README.app_jsdt
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.app_sqlang
%%PORTDOCS%%%%DOCSDIR%%/modules/README.async
%%PORTDOCS%%%%DOCSDIR%%/modules/README.auth
%%PORTDOCS%%%%DOCSDIR%%/modules/README.auth_diameter
@@ -317,6 +320,8 @@
%%PORTDOCS%%%%DOCSDIR%%/modules/README.enum
%%PORTDOCS%%%%DOCSDIR%%/modules/README.evrexec
%%PORTDOCS%%%%DOCSDIR%%/modules/README.exec
+%%PORTDOCS%%%%DOCSDIR%%/modules/README.file_out
+%%PORTDOCS%%%%DOCSDIR%%/modules/README.influxdbc
%%PORTDOCS%%%%DOCSDIR%%/modules/README.ipops
%%PORTDOCS%%%%DOCSDIR%%/modules/README.jsonrpcs
%%PORTDOCS%%%%DOCSDIR%%/modules/README.keepalive
@@ -489,7 +494,6 @@
%%TLS%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.tls
%%TLS%%@sample %%ETCDIR%%/tls.cfg.sample
%%TLS%%lib/kamailio/modules/tls.so
-%%TLS%%lib/kamailio/openssl_mutex_shared/openssl_mutex_shared.so
%%UNIXODBC%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.db_unixodbc
%%UNIXODBC%%lib/kamailio/modules/db_unixodbc.so
%%WEBSOCKET%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.websocket
@@ -510,7 +514,6 @@ lib/kamailio/libtrie.so
lib/kamailio/libtrie.so.1
lib/kamailio/modules/acc_diameter.so
lib/kamailio/modules/app_jsdt.so
-lib/kamailio/modules/app_sqlang.so
lib/kamailio/modules/async.so
lib/kamailio/modules/auth.so
lib/kamailio/modules/auth_diameter.so
@@ -535,6 +538,8 @@ lib/kamailio/modules/domainpolicy.so
lib/kamailio/modules/enum.so
lib/kamailio/modules/evrexec.so
lib/kamailio/modules/exec.so
+lib/kamailio/modules/file_out.so
+lib/kamailio/modules/influxdbc.so
lib/kamailio/modules/ipops.so
lib/kamailio/modules/jsonrpcs.so
lib/kamailio/modules/keepalive.so