net/kamailio: Update to 6.0.1

PR:		285005
Reported by:	maintainer

net/kamailio/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	kamailio
-DISTVERSION=	5.8.5
+DISTVERSION=	6.0.1
 CATEGORIES=	net
 MASTER_SITES=	http://www.kamailio.org/pub/kamailio/${PORTVERSION}/src/
 DISTNAME=	${PORTNAME}-${DISTVERSION}_src
@@ -11,9 +11,9 @@ WWW=		https://www.kamailio.org/
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
+BUILD_DEPENDS=	xsltproc:textproc/libxslt
 
-USES=		compiler:c11 cpe gmake ncurses pkgconfig python readline \
+USES=		bison cmake compiler:c11 cpe pkgconfig python:build readline \
 		shebangfix
 
 USE_LDCONFIG=	yes
@@ -22,6 +22,8 @@ USE_RC_SUBR=	kamailio
 SHEBANG_FILES=	utils/kamctl/dbtextdb/dbtextdb.py utils/kamctl/kamctl \
 		utils/kamctl/kamdbctl
 
+ALL_TARGET=	all dbschema man
+
 CFLAGS+=	-Wall
 
 KAMAILIO_USER?=		kamailio
@@ -38,9 +40,9 @@ USERS=		${KAMAILIO_USER}
 GROUPS=		${KAMAILIO_GROUP}
 
 OPTIONS_DEFINE=			DIALPLAN DOCS EVAPI GCRYPT HTTP_CLIENT JWT \
-				KAFKA LOST LWSC MICROHTTPD MQTT OUTBOUND PERL \
-				PHONENUM PRESENCE RADIUS SCTP SIPREPO SLACK TLS \
-				WEBSOCKET
+				KAFKA LOST LWSC MICROHTTPD MQTT NGHTTP2 \
+				OUTBOUND PERL PHONENUM PRESENCE RADIUS SCTP \
+				SIPREPO SLACK TLS WEBSOCKET
 OPTIONS_DEFAULT=		MYSQL PRESENCE RADIUS SQLITE TLS
 OPTIONS_GROUP=			DATABASE_DRIVERS KEMI_LANGS
 OPTIONS_GROUP_DATABASE_DRIVERS=	MYSQL PGSQL SQLITE UNIXODBC
@@ -60,6 +62,7 @@ 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
+NGHTTP2_DESC=		HTTP2 server module implementation
 OUTBOUND_DESC=		SIP Outbound support
 PHONENUM_DESC=		Phone number lookup and normalization using libphonenumber
 PRESENCE_DESC=		Presence support
@@ -72,6 +75,9 @@ WEBSOCKET_DESC=		WebSocket transport layer
 DIALPLAN_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
 DIALPLAN_VARS=		EXTRA_MODULES+=dialplan
 
+DOCS_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-cmake_modules-docs.cmake \
+			${PATCHDIR}/extra-patch-src_CMakeLists.txt
+
 EVAPI_LIB_DEPENDS=	libev.so:devel/libev
 EVAPI_VARS=		EXTRA_MODULES+=evapi
 
@@ -92,7 +98,7 @@ LOST_LIB_DEPENDS=	libcurl.so:ftp/curl \
 LOST_VARS=		EXTRA_MODULES+=lost
 
 LUAJIT_USES=		luajit
-LUAJIT_MAKE_ARGS=	LUAJIT=yes
+LUAJIT_CMAKE_BOOL=	LUAJIT
 LUAJIT_VARS=		EXTRA_MODULES+=app_lua
 
 LWSC_LIB_DEPENDS=	libwebsockets.so:net/libwebsockets
@@ -109,13 +115,17 @@ MYSQL_LIB_DEPENDS=	libunwind.so:devel/libunwind
 MYSQL_USES=		mysql
 MYSQL_VARS=		EXTRA_MODULES+=db_mysql
 
+NGHTTP2_LIB_DEPENDS=	libevent.so:devel/libevent \
+			libnghttp2.so:www/libnghttp2
+NGHTTP2_VARS=		EXTRA_MODULES+=nghttp2
+
 OUTBOUND_USES=	ssl
 OUTBOUND_VARS=	EXTRA_MODULES+=outbound
 
 PERL_USES=	perl5
-PERL_MAKE_ENV=	PERLCCOPTS="`perl -MExtUtils::Embed -e ccopts`" \
-		PERLLDOPTS="`perl -MExtUtils::Embed -e ldopts`" \
-		TYPEMAP="`perl -MConfig -e 'print $$Config{privlib}'`/ExtUtils/typemap"
+PERL_CMAKE_ON=	-DPERLCCOPTS="`perl -MExtUtils::Embed -e ccopts`" \
+		-DPERLLDOPTS="`perl -MExtUtils::Embed -e ldopts`" \
+		-DTYPEMAP="`perl -MConfig -e 'print $$Config{privlib}'`/ExtUtils/typemap"
 PERL_VARS=	EXTRA_MODULES+="app_perl db_perlvdb"
 
 PGSQL_USES=	pgsql
@@ -125,15 +135,15 @@ PHONENUM_LIB_DEPENDS=	libphonenumber.so:devel/libphonenumber
 PHONENUM_VARS=		EXTRA_MODULES+=phonenum
 
 PRESENCE_LIB_DEPENDS=	libcurl.so:ftp/curl \
+			libicuuc.so:devel/icu \
 			libxml2.so:textproc/libxml2
-PRESENCE_VARS=		EXTRA_GROUPS+=kpresence
+PRESENCE_VARS=		EXTRA_MODULES+="presence presence_conference presence_dfks presence_dialoginfo presence_mwi presence_profile presence_reginfo presence_xml pua pua_bla pua_dialoginfo pua_reginfo pua_rpc pua_usrloc pua_xmpp rls xcap_client xcap_server"
 
-PYTHON3_USES=		gettext-runtime
-PYTHON3_MAKE_ARGS=	PYTHON3=${PYTHON_CMD}
-PYTHON3_VARS=		EXTRA_MODULES+=app_python3
+PYTHON3_USES=	gettext-runtime python
+PYTHON3_VARS=	EXTRA_MODULES+=app_python3
 
-RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:net/radiusclient
-RADIUS_VARS=		EXTRA_GROUPS+=kradius
+RADIUS_LIB_DEPENDS=	libradcli.so:net/radcli
+RADIUS_VARS=		EXTRA_MODULES+="acc_radius auth_radius misc_radius peering"
 
 SCTP_VARS=	EXTRA_MODULES+=sctp
 
@@ -157,37 +167,11 @@ WEBSOCKET_VARS=		EXTRA_MODULES+=websocket
 
 .include <bsd.port.pre.mk>
 
-DEFAULT_GROUPS=	default
-
-CFG_ARGS+=	LIBDIR="lib" \
-		run_target="${KAMAILIO_RUNDIR}"
-
-.if !empty (EXTRA_GROUPS)
-CFG_ARGS+=	group_include="${DEFAULT_GROUPS} ${EXTRA_GROUPS}"
-.else
-CFG_ARGS+=	group_include="${DEFAULT_GROUPS}"
-.endif
-
 .if !empty (EXTRA_MODULES)
-CFG_ARGS+=	include_modules="${EXTRA_MODULES}"
+CMAKE_ARGS+=	-DINCLUDE_MODULES="${EXTRA_MODULES}"
 .endif
 
-post-patch-DOCS-off:
-	@${REINPLACE_CMD} 's|install-doc install-man|install-man|' \
-		${WRKSRC}/src/Makefile
-
-pre-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${CFG_ARGS} cfg
-
-do-install:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install
-	@(cd ${STAGEDIR}${ETCDIR}; for i in `${FIND} . -type f`; do ${MV} $$i $$i.sample; done)
-
 post-install:
-	@${RMDIR} ${STAGEDIR}${DATADIR} || true
-	@${FIND} ${STAGEDIR}${PREFIX} -type f -name '*.so' -exec ${STRIP_CMD} {} +
-	@${FIND} ${STAGEDIR}${PREFIX} -type f -name '*.so.1' -exec ${STRIP_CMD} {} +
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/kamailio
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/kamcmd
+	@(cd ${STAGEDIR}${ETCDIR}; for i in `${FIND} . -type f`; do ${MV} $$i $$i.sample; done)
 
 .include <bsd.port.post.mk>

net/kamailio/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1739275934
-SHA256 (kamailio-5.8.5_src.tar.gz) = 5bad042e14ff9b4704f4cd3a8fc1866a8de1d20d35cf3ddf442727fa442614ed
-SIZE (kamailio-5.8.5_src.tar.gz) = 13016473
+TIMESTAMP = 1741635451
+SHA256 (kamailio-6.0.1_src.tar.gz) = 8c1d61b4c14706dc2748d37b1ad4055397276205a94e0bd70e39fd98c4753d01
+SIZE (kamailio-6.0.1_src.tar.gz) = 13064707

net/kamailio/files/extra-patch-cmake_modules-docs.cmake

@@ -0,0 +1,15 @@
+--- cmake/modules-docs.cmake.orig	2025-01-29 11:36:50 UTC
++++ cmake/modules-docs.cmake
+@@ -171,12 +171,6 @@ function(docs_add_module module_name)
+       COMMENT "Processing target ${module_name}_man")
+ 
+     install(
+-      FILES ${CMAKE_CURRENT_SOURCE_DIR}/${module_name}/README
+-      RENAME README.${module_name}
+-      DESTINATION ${CMAKE_INSTALL_DOCDIR}/modules
+-      COMPONENT kamailio_docs)
+-
+-    install(
+       FILES ${CMAKE_CURRENT_SOURCE_DIR}/${module_name}/${module_name}.7
+       DESTINATION ${CMAKE_INSTALL_DATADIR}/man/man7
+       COMPONENT kamailio_docs

net/kamailio/files/extra-patch-src_CMakeLists.txt

@@ -0,0 +1,15 @@
+--- src/CMakeLists.txt.orig	2025-01-29 11:36:50 UTC
++++ src/CMakeLists.txt
+@@ -130,12 +130,6 @@ install(
+   COMPONENT kamailio-core
+ )
+ 
+-# Install the docs of core
+-install(
+-  FILES ${CMAKE_SOURCE_DIR}/README ${CMAKE_SOURCE_DIR}/INSTALL
+-  DESTINATION ${CMAKE_INSTALL_DOCDIR}
+-  COMPONENT kamailio-docs)
+-
+ # ----------
+ # Create and install the man pages for kamailio
+ add_custom_command(

net/kamailio/files/patch-src_modules_db__sqlite_dbase.c

@@ -1,24 +0,0 @@
---- src/modules/db_sqlite/dbase.c.orig	2025-01-23 09:07:51 UTC
-+++ src/modules/db_sqlite/dbase.c
-@@ -126,14 +126,17 @@ db1_con_t *db_sqlite_init(const str *_url)
-  * No function should be called after this
-  */
- 
--static void db_sqlite_free_connection(struct sqlite_connection *con)
-+static void db_sqlite_free_connection(struct pool_con *con)
- {
-+	struct sqlite_connection *_c;
-+
- 	if(!con)
- 		return;
-+	_c = (struct sqlite_connection *)con;
- 
--	sqlite3_close(con->conn);
--	free_db_id(con->hdr.id);
--	pkg_free(con);
-+	sqlite3_close(_c->conn);
-+	free_db_id(_c->hdr.id);
-+	pkg_free(_c);
- }
- 
- void db_sqlite_close(db1_con_t *_h)

net/kamailio/files/patch-src_modules_db__unixodbc_connection.c

@@ -1,25 +0,0 @@
---- src/modules/db_unixodbc/connection.c.orig	2025-01-23 09:07:51 UTC
-+++ src/modules/db_unixodbc/connection.c
-@@ -179,14 +179,17 @@ err2:
- /*
-  * Close the connection and release memory
-  */
--void db_unixodbc_free_connection(struct my_con *con)
-+void db_unixodbc_free_connection(struct pool_con *con)
- {
-+	struct my_con *_c;
-+
- 	if(!con)
- 		return;
--	SQLFreeHandle(SQL_HANDLE_ENV, con->env);
--	SQLDisconnect(con->dbc);
--	SQLFreeHandle(SQL_HANDLE_DBC, con->dbc);
--	pkg_free(con);
-+	_c = (struct my_con *)con;
-+	SQLFreeHandle(SQL_HANDLE_ENV, _c->env);
-+	SQLDisconnect(_c->dbc);
-+	SQLFreeHandle(SQL_HANDLE_DBC, _c->dbc);
-+	pkg_free(_c);
- }
- 
- 

net/kamailio/files/patch-src_modules_db__unixodbc_connection.h

@@ -1,11 +0,0 @@
---- src/modules/db_unixodbc/connection.h.orig	2025-01-23 09:07:51 UTC
-+++ src/modules/db_unixodbc/connection.h
-@@ -83,7 +83,7 @@ struct my_con *db_unixodbc_new_connection(struct db_id
- /*
-  * Close the connection and release memory
-  */
--void db_unixodbc_free_connection(struct my_con *con);
-+void db_unixodbc_free_connection(struct pool_con *con);
- 
- char *db_unixodbc_build_conn_str(const struct db_id *id, char *buf);
- 

net/kamailio/files/patch-src_modules_dialplan_CMakeLists.txt

@@ -0,0 +1,17 @@
+--- src/modules/dialplan/CMakeLists.txt.orig	2025-01-29 11:36:50 UTC
++++ src/modules/dialplan/CMakeLists.txt
+@@ -1,3 +1,14 @@ add_library(${module_name} SHARED ${MODULE_SOURCES})
+ file(GLOB MODULE_SOURCES "*.c")
+ 
+ add_library(${module_name} SHARED ${MODULE_SOURCES})
++
++find_package(pcre2 QUIET)
++if(NOT pcre2_FOUND)
++  message(STATUS "PCRE2 library not found... looking with pkg-config")
++  find_package(PkgConfig REQUIRED)
++  # TODO: verify we want 8-bit libpcre2
++  pkg_check_modules(pcre2 REQUIRED IMPORTED_TARGET libpcre2-8)
++  add_library(PCRE2::8BIT ALIAS PkgConfig::pcre2)
++endif()
++
++target_link_libraries(${module_name} PRIVATE PCRE2::8BIT)

net/kamailio/files/patch-src_modules_sctp_CMakeLists.txt

@@ -0,0 +1,19 @@
+--- src/modules/sctp/CMakeLists.txt.orig	2025-01-29 11:36:50 UTC
++++ src/modules/sctp/CMakeLists.txt
+@@ -14,11 +14,11 @@ target_include_directories(${module_name} PRIVATE ${SC
+ 
+ target_include_directories(${module_name} PRIVATE ${SCTP_INCLUDE_DIR})
+ 
+-find_library(
+-  SCTP_LIBRARY
+-  NAMES sctp
+-  PATHS /usr/lib /usr/local/lib)
++if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
++  find_library(
++    SCTP_LIBRARY
++    NAMES sctp
++    PATHS /usr/lib /usr/local/lib)
+ 
+-if(UNIX)
+   target_link_libraries(${module_name} PRIVATE ${SCTP_LIBRARY})
+ endif()

net/kamailio/files/patch-utils_kamcmd_CMakeLists.txt

@@ -0,0 +1,11 @@
+--- utils/kamcmd/CMakeLists.txt.orig	2025-01-29 11:36:50 UTC
++++ utils/kamcmd/CMakeLists.txt
+@@ -46,7 +46,7 @@ add_custom_command(
+     -e "s#/usr/sbin/#${CMAKE_INSTALL_FULL_SBINDIR}/#g" -e
+     "s#/usr/lib/${CFG_NAME}/modules/#${CMAKE_INSTALL_FULL_LIBDIR}/${MAIN_NAME}/#g"
+     -e "s#/usr/share/doc/${CFG_NAME}/#${CMAKE_INSTALL_FULL_DOCDIR}/#g" -e
+-    "s#$(SRC_NAME)#$(MAIN_NAME)#g" < ${CMAKE_CURRENT_SOURCE_DIR}/kamcmd.8 >
++    "s#${SRC_NAME}#${MAIN_NAME}#g" < ${CMAKE_CURRENT_SOURCE_DIR}/kamcmd.8 >
+     ${CMAKE_CURRENT_BINARY_DIR}/kamcmd.8
+   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/kamcmd.8)
+ 

net/kamailio/pkg-plist

@@ -6,9 +6,12 @@
 %%DATADIR%%/dbtext/kamailio/carrier_name
 %%DATADIR%%/dbtext/kamailio/carrierfailureroute
 %%DATADIR%%/dbtext/kamailio/carrierroute
+%%DATADIR%%/dbtext/kamailio/contact
 %%DATADIR%%/dbtext/kamailio/cpl
 %%DATADIR%%/dbtext/kamailio/dbaliases
 %%DATADIR%%/dbtext/kamailio/dialog
+%%DATADIR%%/dbtext/kamailio/dialog_in
+%%DATADIR%%/dbtext/kamailio/dialog_out
 %%DATADIR%%/dbtext/kamailio/dialog_vars
 %%DATADIR%%/dbtext/kamailio/dialplan
 %%DATADIR%%/dbtext/kamailio/dispatcher
@@ -25,6 +28,9 @@
 %%DATADIR%%/dbtext/kamailio/htable
 %%DATADIR%%/dbtext/kamailio/imc_members
 %%DATADIR%%/dbtext/kamailio/imc_rooms
+%%DATADIR%%/dbtext/kamailio/impu
+%%DATADIR%%/dbtext/kamailio/impu_contact
+%%DATADIR%%/dbtext/kamailio/impu_subscriber
 %%DATADIR%%/dbtext/kamailio/lcr_gw
 %%DATADIR%%/dbtext/kamailio/lcr_rule
 %%DATADIR%%/dbtext/kamailio/lcr_rule_target
@@ -36,6 +42,8 @@
 %%DATADIR%%/dbtext/kamailio/mohqueues
 %%DATADIR%%/dbtext/kamailio/mtree
 %%DATADIR%%/dbtext/kamailio/mtrees
+%%DATADIR%%/dbtext/kamailio/nds_trusted_domains
+%%DATADIR%%/dbtext/kamailio/pcscf_location
 %%DATADIR%%/dbtext/kamailio/pdt
 %%DATADIR%%/dbtext/kamailio/pl_pipes
 %%DATADIR%%/dbtext/kamailio/presentity
@@ -44,14 +52,18 @@
 %%DATADIR%%/dbtext/kamailio/re_grp
 %%DATADIR%%/dbtext/kamailio/rls_presentity
 %%DATADIR%%/dbtext/kamailio/rls_watchers
+%%DATADIR%%/dbtext/kamailio/ro_session
 %%DATADIR%%/dbtext/kamailio/rtpengine
 %%DATADIR%%/dbtext/kamailio/rtpproxy
+%%DATADIR%%/dbtext/kamailio/s_cscf
+%%DATADIR%%/dbtext/kamailio/s_cscf_capabilities
 %%DATADIR%%/dbtext/kamailio/sca_subscriptions
 %%DATADIR%%/dbtext/kamailio/secfilter
 %%DATADIR%%/dbtext/kamailio/silo
 %%DATADIR%%/dbtext/kamailio/sip_trace
 %%DATADIR%%/dbtext/kamailio/speed_dial
 %%DATADIR%%/dbtext/kamailio/subscriber
+%%DATADIR%%/dbtext/kamailio/subscriber_scscf
 %%DATADIR%%/dbtext/kamailio/topos_d
 %%DATADIR%%/dbtext/kamailio/topos_t
 %%DATADIR%%/dbtext/kamailio/trusted
@@ -108,6 +120,7 @@
 %%MYSQL%%%%DATADIR%%/mysql/imc-create.sql
 %%MYSQL%%%%DATADIR%%/mysql/ims_charging-create.sql
 %%MYSQL%%%%DATADIR%%/mysql/ims_dialog-create.sql
+%%MYSQL%%%%DATADIR%%/mysql/ims_icscf-create.sql
 %%MYSQL%%%%DATADIR%%/mysql/ims_usrloc_pcscf-create.sql
 %%MYSQL%%%%DATADIR%%/mysql/ims_usrloc_scscf-create.sql
 %%MYSQL%%%%DATADIR%%/mysql/lcr-create.sql
@@ -143,6 +156,8 @@
 %%MYSQL%%lib/kamailio/kamctl/kamctl.mysql
 %%MYSQL%%lib/kamailio/kamctl/kamdbctl.mysql
 %%MYSQL%%lib/kamailio/modules/db_mysql.so
+%%NGHTTP2%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.nghttp2
+%%NGHTTP2%%lib/kamailio/modules/nghttp2.so
 %%OUTBOUND%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.outbound
 %%OUTBOUND%%lib/kamailio/modules/outbound.so
 %%PERL%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.app_perl
@@ -184,6 +199,11 @@
 %%PGSQL%%%%DATADIR%%/postgres/group-create.sql
 %%PGSQL%%%%DATADIR%%/postgres/htable-create.sql
 %%PGSQL%%%%DATADIR%%/postgres/imc-create.sql
+%%PGSQL%%%%DATADIR%%/postgres/ims_charging-create.sql
+%%PGSQL%%%%DATADIR%%/postgres/ims_dialog-create.sql
+%%PGSQL%%%%DATADIR%%/postgres/ims_icscf-create.sql
+%%PGSQL%%%%DATADIR%%/postgres/ims_usrloc_pcscf-create.sql
+%%PGSQL%%%%DATADIR%%/postgres/ims_usrloc_scscf-create.sql
 %%PGSQL%%%%DATADIR%%/postgres/lcr-create.sql
 %%PGSQL%%%%DATADIR%%/postgres/matrix-create.sql
 %%PGSQL%%%%DATADIR%%/postgres/mohqueue-create.sql
@@ -296,8 +316,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.pipelimit
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.posops
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.prefix_route
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.print
-%%PORTDOCS%%%%DOCSDIR%%/modules/README.print_lib
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.pv
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.pv_headers
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.qos
@@ -340,6 +358,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.tmx
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.topoh
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.topos
+%%PORTDOCS%%%%DOCSDIR%%/modules/README.topos_htable
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.tsilo
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.uac
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.uac_redirect
@@ -358,6 +377,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/modules/README.xprint
 %%PRESENCE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.presence
 %%PRESENCE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.presence_conference
+%%PRESENCE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.presence_dfks
 %%PRESENCE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.presence_dialoginfo
 %%PRESENCE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.presence_mwi
 %%PRESENCE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.presence_profile
@@ -375,6 +395,7 @@
 %%PRESENCE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.xcap_server
 %%PRESENCE%%lib/kamailio/modules/presence.so
 %%PRESENCE%%lib/kamailio/modules/presence_conference.so
+%%PRESENCE%%lib/kamailio/modules/presence_dfks.so
 %%PRESENCE%%lib/kamailio/modules/presence_dialoginfo.so
 %%PRESENCE%%lib/kamailio/modules/presence_mwi.so
 %%PRESENCE%%lib/kamailio/modules/presence_profile.so
@@ -422,6 +443,11 @@
 %%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/ims_charging-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/ims_dialog-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/ims_icscf-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/ims_usrloc_pcscf-create.sql
+%%SQLITE%%%%DATADIR%%/db_sqlite/ims_usrloc_scscf-create.sql
 %%SQLITE%%%%DATADIR%%/db_sqlite/lcr-create.sql
 %%SQLITE%%%%DATADIR%%/db_sqlite/matrix-create.sql
 %%SQLITE%%%%DATADIR%%/db_sqlite/mohqueue-create.sql
@@ -473,14 +499,6 @@ lib/kamailio/kamctl/kamctl.ser
 lib/kamailio/kamctl/kamctl.sqlbase
 lib/kamailio/kamctl/kamdbctl.base
 lib/kamailio/kamctl/kamdbctl.dbtext
-lib/kamailio/libprint.so
-lib/kamailio/libprint.so.1
-lib/kamailio/libsrdb1.so
-lib/kamailio/libsrdb1.so.1
-lib/kamailio/libsrdb2.so
-lib/kamailio/libsrdb2.so.1
-lib/kamailio/libtrie.so
-lib/kamailio/libtrie.so.1
 lib/kamailio/modules/acc.so
 lib/kamailio/modules/acc_diameter.so
 lib/kamailio/modules/alias_db.so
@@ -556,8 +574,6 @@ lib/kamailio/modules/pike.so
 lib/kamailio/modules/pipelimit.so
 lib/kamailio/modules/posops.so
 lib/kamailio/modules/prefix_route.so
-lib/kamailio/modules/print.so
-lib/kamailio/modules/print_lib.so
 lib/kamailio/modules/pv.so
 lib/kamailio/modules/pv_headers.so
 lib/kamailio/modules/qos.so
@@ -600,6 +616,7 @@ lib/kamailio/modules/tmrec.so
 lib/kamailio/modules/tmx.so
 lib/kamailio/modules/topoh.so
 lib/kamailio/modules/topos.so
+lib/kamailio/modules/topos_htable.so
 lib/kamailio/modules/tsilo.so
 lib/kamailio/modules/uac.so
 lib/kamailio/modules/uac_redirect.so