git: 981ee3f931b4 - main - net/kamailio: update to 5.5.3

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Fernando Apesteguía <fernape_at_FreeBSD.org>
Date: Sat, 08 Jan 2022 20:03:43 UTC
The branch main has been updated by fernape:

URL: https://cgit.FreeBSD.org/ports/commit/?id=981ee3f931b42baa9391a8b7b264f3e05e7a0535

commit 981ee3f931b42baa9391a8b7b264f3e05e7a0535
Author:     Dmitry Wagin <dmitry.wagin@ya.ru>
AuthorDate: 2022-01-06 12:54:38 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2022-01-08 20:02:00 +0000

    net/kamailio: update to 5.5.3
    
    ChangeLog: https://www.kamailio.org/pub/kamailio/5.5.3/ChangeLog
    
    Added multiple options and option KEMIX removed.
    
    PR:     260486
    Reported by:    jailbird@fdf.net
---
 net/kamailio/Makefile                        | 52 +++++++++++++------
 net/kamailio/distinfo                        |  6 +--
 net/kamailio/files/patch-src_Makefile.defs   |  2 +-
 net/kamailio/files/patch-src_core_ip__addr.h |  6 +--
 net/kamailio/pkg-plist                       | 78 +++++++++++++++++++++++++---
 5 files changed, 114 insertions(+), 30 deletions(-)

diff --git a/net/kamailio/Makefile b/net/kamailio/Makefile
index 7584c95bc20f..c912129000e3 100644
--- a/net/kamailio/Makefile
+++ b/net/kamailio/Makefile
@@ -1,7 +1,7 @@
 # Created by: Oliver Mahmoudi <olivermahmoudi@gmail.com>
 
 PORTNAME=	kamailio
-PORTVERSION=	5.4.5
+PORTVERSION=	5.5.3
 CATEGORIES=	net
 MASTER_SITES=	http://www.kamailio.org/pub/kamailio/${PORTVERSION}/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}_src
@@ -42,36 +42,55 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USERS=		${KAMAILIO_USER}
 GROUPS=		${KAMAILIO_GROUP}
 
-OPTIONS_DEFINE=			DATABASE DIALPLAN DOCS KEMIX PERL PRESENCE \
-				RADIUS SCTP TLS WEBSOCKET
-OPTIONS_DEFAULT=		MYSQL PRESENCE RADIUS TLS
+OPTIONS_DEFINE=			DATABASE DIALPLAN DOCS EVAPI JWT KAFKA LWSC \
+				MQTT PERL PRESENCE RADIUS SCTP SECSIPID TLS WEBSOCKET
+OPTIONS_DEFAULT=		MYSQL PRESENCE RADIUS SQLITE TLS
 OPTIONS_GROUP=			DATABASE_DRIVERS KEMI_LANGS
-OPTIONS_GROUP_DATABASE_DRIVERS=	MYSQL PGSQL UNIXODBC
+OPTIONS_GROUP_DATABASE_DRIVERS=	MYSQL PGSQL SQLITE UNIXODBC
 OPTIONS_GROUP_KEMI_LANGS=	LUAJIT PYTHON3
 OPTIONS_SUB=			YES
 
 DATABASE_DESC=		Database support
 DATABASE_DRIVERS_DESC=	Database drivers
 DIALPLAN_DESC=		String translations based on rules
-KEMIX_DESC=		Core KEMI Functions
+EVAPI_DESC=		Network event broadcast API
+JWT_DESC=		JSON Web Token generation and validation
+KAFKA_DESC=		Produces and sends messages to a Kafka server
 KEMI_LANGS_DESC=	Kamailio Embedded Interface Interpreters
 LUAJIT_DESC=		Execute embedded Lua scripts
+LWSC_DESC=		Websocket client connector using libwebsockets
+MQTT_DESC=		MQTT connector for bi-directional publish-subscribe communication
 PRESENCE_DESC=		Presence support
 PYTHON3_DESC=		Execute embedded Python3 scripts
 SCTP_DESC=		SCTP support
-WEBSOCKET_DESC=		Websocket support
+SECSIPID_DESC=		Secure SIP/Telephony Identity (STIR/SHAKEN) extensions
+WEBSOCKET_DESC=		WebSocket transport layer
+
+DATABASE_VARS=	EXTRA_GROUPS+=db
 
-DATABASE_VARS=		EXTRA_GROUPS+=db
 DIALPLAN_LIB_DEPENDS=	libpcre.so:devel/pcre
 DIALPLAN_VARS=		EXTRA_MODULES+=dialplan
 
-KEMIX_VARS=	EXTRA_MODULES+=kemix
+EVAPI_LIB_DEPENDS=	libev.so:devel/libev
+EVAPI_VARS=		EXTRA_MODULES+=evapi
+
+JWT_LIB_DEPENDS=	libjwt.so:www/libjwt
+JWT_VARS=		EXTRA_MODULES+=jwt
+
+KAFKA_LIB_DEPENDS=	librdkafka.so:net/librdkafka
+KAFKA_VARS=		EXTRA_MODULES+=kafka
 
-LUAJIT_IMPLIES=		KEMIX
 LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
 LUAJIT_MAKE_ARGS=	LUAJIT=yes
 LUAJIT_VARS=		EXTRA_MODULES+=app_lua
 
+LWSC_LIB_DEPENDS=	libwebsockets.so:net/libwebsockets
+LWSC_VARS=		EXTRA_MODULES+=lwsc
+
+MQTT_LIB_DEPENDS=	libev.so:devel/libev \
+			libmosquitto.so:net/mosquitto
+MQTT_VARS=		EXTRA_MODULES+=mqtt
+
 MYSQL_IMPLIES=	DATABASE
 MYSQL_USES=	mysql
 MYSQL_VARS=	EXTRA_GROUPS+=mysql
@@ -88,7 +107,6 @@ PGSQL_VARS=	EXTRA_GROUPS+=postgres
 
 PRESENCE_VARS=	EXTRA_GROUPS+=presence
 
-PYTHON3_IMPLIES=	KEMIX
 PYTHON3_USES=		gettext-runtime
 PYTHON3_MAKE_ARGS=	PYTHON3=${PYTHON_CMD}
 PYTHON3_VARS=		EXTRA_MODULES+=app_python3
@@ -98,6 +116,12 @@ RADIUS_VARS=		EXTRA_GROUPS+=radius
 
 SCTP_VARS=	EXTRA_MODULES+=sctp
 
+SECSIPID_VARS=	EXTRA_MODULES+=secsipid
+
+SQLITE_IMPLIES=	DATABASE
+SQLITE_USES=	sqlite
+SQLITE_VARS=	EXTRA_MODULES+=db_sqlite
+
 TLS_USES=	ssl
 TLS_VARS=	EXTRA_MODULES+=tls
 
@@ -112,6 +136,8 @@ WEBSOCKET_VARS=		EXTRA_MODULES+=websocket
 
 DEFAULT_GROUPS=	standard
 
+CFG_ARGS+=	run_target="${KAMAILIO_RUNDIR}"
+
 .if !empty (EXTRA_GROUPS)
 CFG_ARGS+=	group_include="${DEFAULT_GROUPS} ${EXTRA_GROUPS}"
 .else
@@ -122,10 +148,6 @@ CFG_ARGS+=	group_include="${DEFAULT_GROUPS}"
 CFG_ARGS+=	include_modules="${EXTRA_MODULES}"
 .endif
 
-post-patch:
-	${REINPLACE_CMD} '565s|run_target = $$(run_prefix)/$$(run_dir)|run_target = ${KAMAILIO_RUNDIR}|' \
-		${WRKSRC}/src/Makefile.defs
-
 post-patch-DOCS-off:
 	@${REINPLACE_CMD} 's|install-doc install-man|install-man|' \
 		${WRKSRC}/src/Makefile
diff --git a/net/kamailio/distinfo b/net/kamailio/distinfo
index f9d87d573003..7cf6abc1c8d6 100644
--- a/net/kamailio/distinfo
+++ b/net/kamailio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1618831304
-SHA256 (kamailio-5.4.5_src.tar.gz) = d7203228e75fb6250f79e28ff79ac2aff5b2907d5b5cd94c3407c7099bef0551
-SIZE (kamailio-5.4.5_src.tar.gz) = 12659887
+TIMESTAMP = 1639646808
+SHA256 (kamailio-5.5.3_src.tar.gz) = 6af30eabdbaa79dbbf7c21b1201f350a39c816010fca60e27cbb9de4589a4324
+SIZE (kamailio-5.5.3_src.tar.gz) = 12782163
diff --git a/net/kamailio/files/patch-src_Makefile.defs b/net/kamailio/files/patch-src_Makefile.defs
index f67638f63b3a..3ead40a4c385 100644
--- a/net/kamailio/files/patch-src_Makefile.defs
+++ b/net/kamailio/files/patch-src_Makefile.defs
@@ -1,4 +1,4 @@
---- src/Makefile.defs.orig	2020-09-01 08:11:08 UTC
+--- src/Makefile.defs.orig	2021-05-05 13:55:36 UTC
 +++ src/Makefile.defs
 @@ -257,7 +257,7 @@ YACC := $(shell echo "$${YACC}")
  
diff --git a/net/kamailio/files/patch-src_core_ip__addr.h b/net/kamailio/files/patch-src_core_ip__addr.h
index d9b796726f15..a03e884d3476 100644
--- a/net/kamailio/files/patch-src_core_ip__addr.h
+++ b/net/kamailio/files/patch-src_core_ip__addr.h
@@ -1,7 +1,7 @@
---- src/core/ip_addr.h.orig	2018-08-22 09:38:42 UTC
+--- src/core/ip_addr.h.orig	2021-05-05 13:55:35 UTC
 +++ src/core/ip_addr.h
-@@ -49,6 +49,10 @@ enum sip_protos { PROTO_NONE, PROTO_UDP, PROTO_TCP, PR
- enum comp_methods { COMP_NONE, COMP_SIGCOMP, COMP_SERGZ };
+@@ -51,6 +51,10 @@ typedef enum sip_protos { PROTO_NONE, PROTO_UDP, PROTO
+ typedef enum comp_methods { COMP_NONE, COMP_SIGCOMP, COMP_SERGZ } comp_methods_t;
  #endif
  
 +#ifndef INADDR_LOOPBACK
diff --git a/net/kamailio/pkg-plist b/net/kamailio/pkg-plist
index b5747a23aef1..ba321642f519 100644
--- a/net/kamailio/pkg-plist
+++ b/net/kamailio/pkg-plist
@@ -20,7 +20,7 @@
 %%DATABASE%%%%DATADIR%%/dbtext/kamailio/dr_groups
 %%DATABASE%%%%DATADIR%%/dbtext/kamailio/dr_gw_lists
 %%DATABASE%%%%DATADIR%%/dbtext/kamailio/dr_rules
-%%DATABASE%%%%DATADIR%%/dbtext/kamailio/globalblacklist
+%%DATABASE%%%%DATADIR%%/dbtext/kamailio/globalblocklist
 %%DATABASE%%%%DATADIR%%/dbtext/kamailio/grp
 %%DATABASE%%%%DATADIR%%/dbtext/kamailio/htable
 %%DATABASE%%%%DATADIR%%/dbtext/kamailio/imc_members
@@ -64,7 +64,7 @@
 %%DATABASE%%%%DATADIR%%/dbtext/kamailio/uid_uri_attrs
 %%DATABASE%%%%DATADIR%%/dbtext/kamailio/uid_user_attrs
 %%DATABASE%%%%DATADIR%%/dbtext/kamailio/uri
-%%DATABASE%%%%DATADIR%%/dbtext/kamailio/userblacklist
+%%DATABASE%%%%DATADIR%%/dbtext/kamailio/userblocklist
 %%DATABASE%%%%DATADIR%%/dbtext/kamailio/usr_preferences
 %%DATABASE%%%%DATADIR%%/dbtext/kamailio/version
 %%DATABASE%%%%DATADIR%%/dbtext/kamailio/watchers
@@ -101,7 +101,7 @@
 %%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.sqlops
 %%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.uac
 %%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.uri_db
-%%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.userblacklist
+%%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.userblocklist
 %%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.usrloc
 %%DATABASE%%lib/kamailio/kamctl/dbtextdb/dbtextdb.py
 %%DATABASE%%lib/kamailio/kamctl/kamctl.dbtext
@@ -140,14 +140,22 @@
 %%DATABASE%%lib/kamailio/modules/sqlops.so
 %%DATABASE%%lib/kamailio/modules/uac.so
 %%DATABASE%%lib/kamailio/modules/uri_db.so
-%%DATABASE%%lib/kamailio/modules/userblacklist.so
+%%DATABASE%%lib/kamailio/modules/userblocklist.so
 %%DATABASE%%lib/kamailio/modules/usrloc.so
 %%DIALPLAN%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.dialplan
 %%DIALPLAN%%lib/kamailio/modules/dialplan.so
-%%KEMIX%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.kemix
-%%KEMIX%%lib/kamailio/modules/kemix.so
+%%EVAPI%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.evapi
+%%EVAPI%%lib/kamailio/modules/evapi.so
+%%JWT%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.jwt
+%%JWT%%lib/kamailio/modules/jwt.so
+%%KAFKA%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.kafka
+%%KAFKA%%lib/kamailio/modules/kafka.so
 %%LUAJIT%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.app_lua
 %%LUAJIT%%lib/kamailio/modules/app_lua.so
+%%LWSC%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.lwsc
+%%LWSC%%lib/kamailio/modules/lwsc.so
+%%MQTT%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.mqtt
+%%MQTT%%lib/kamailio/modules/mqtt.so
 %%MYSQL%%%%DATADIR%%/mysql/acc-create.sql
 %%MYSQL%%%%DATADIR%%/mysql/alias_db-create.sql
 %%MYSQL%%%%DATADIR%%/mysql/auth_db-create.sql
@@ -194,7 +202,7 @@
 %%MYSQL%%%%DATADIR%%/mysql/uid_gflags-create.sql
 %%MYSQL%%%%DATADIR%%/mysql/uid_uri_db-create.sql
 %%MYSQL%%%%DATADIR%%/mysql/uri_db-create.sql
-%%MYSQL%%%%DATADIR%%/mysql/userblacklist-create.sql
+%%MYSQL%%%%DATADIR%%/mysql/userblocklist-create.sql
 %%MYSQL%%%%DATADIR%%/mysql/usrloc-create.sql
 %%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.db_mysql
 %%MYSQL%%lib/kamailio/kamctl/kamctl.mysql
@@ -264,7 +272,7 @@
 %%PGSQL%%%%DATADIR%%/postgres/uid_gflags-create.sql
 %%PGSQL%%%%DATADIR%%/postgres/uid_uri_db-create.sql
 %%PGSQL%%%%DATADIR%%/postgres/uri_db-create.sql
-%%PGSQL%%%%DATADIR%%/postgres/userblacklist-create.sql
+%%PGSQL%%%%DATADIR%%/postgres/userblocklist-create.sql
 %%PGSQL%%%%DATADIR%%/postgres/usrloc-create.sql
 %%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.db_postgres
 %%PGSQL%%lib/kamailio/kamctl/kamctl.pgsql
@@ -302,8 +310,10 @@
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.ipops
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.jsonrpcs
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.keepalive
+%%PORTDOCS%%%%DOCSDIR%%/modules/README.kemix
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.kex
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.log_custom
+%%PORTDOCS%%%%DOCSDIR%%/modules/README.lrkproxy
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.malloc_test
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.mangler
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.maxfwd
@@ -407,6 +417,56 @@
 %%RADIUS%%lib/kamailio/modules/peering.so
 %%SCTP%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.sctp
 %%SCTP%%lib/kamailio/modules/sctp.so
+%%SECSIPID%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.secsipid
+%%SECSIPID%%lib/kamailio/modules/secsipid.so
+%%SQLITE%%%%DATADIR%%/db_sqlite/acc-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/alias_db-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/auth_db-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/avpops-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/carrierroute-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/cpl-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/dialog-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/dialplan-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/dispatcher-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/domain-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/domainpolicy-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/drouting-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/group-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/htable-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/imc-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/lcr-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/matrix-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/mohqueue-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/msilo-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/mtree-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/pdt-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/permissions-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/pipelimit-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/presence-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/purple-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/registrar-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/rls-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/rtpengine-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/rtpproxy-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/sca-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/secfilter-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/siptrace-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/speeddial-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/standard-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/topos-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/uac-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/uid_auth_db-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/uid_avp_db-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/uid_domain-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/uid_gflags-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/uid_uri_db-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/uri_db-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/userblocklist-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/usrloc-create.sql
+%%SQLITE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.db_sqlite
+%%SQLITE%%lib/kamailio/kamctl/kamctl.sqlite
+%%SQLITE%%lib/kamailio/kamctl/kamdbctl.sqlite
+%%SQLITE%%lib/kamailio/modules/db_sqlite.so
 %%TLS%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.tls
 %%TLS%%@sample %%ETCDIR%%/tls.cfg.sample
 %%TLS%%lib/kamailio/modules/tls.so
@@ -459,8 +519,10 @@ lib/kamailio/modules/exec.so
 lib/kamailio/modules/ipops.so
 lib/kamailio/modules/jsonrpcs.so
 lib/kamailio/modules/keepalive.so
+lib/kamailio/modules/kemix.so
 lib/kamailio/modules/kex.so
 lib/kamailio/modules/log_custom.so
+lib/kamailio/modules/lrkproxy.so
 lib/kamailio/modules/malloc_test.so
 lib/kamailio/modules/mangler.so
 lib/kamailio/modules/maxfwd.so