Date: Tue, 24 Mar 2026 20:02:10 +0000 From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Cc: Boris Korzun <drtr0jan@yandex.ru> Subject: git: 4f43e129709a - main - net/kamailio: Update 6.0.4 => 6.1.1 Message-ID: <69c2edc2.46143.18f0e32f@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=4f43e129709a874d111cfdf4ce321500abb6bf27 commit 4f43e129709a874d111cfdf4ce321500abb6bf27 Author: Boris Korzun <drtr0jan@yandex.ru> AuthorDate: 2026-03-24 19:56:00 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2026-03-24 20:00:53 +0000 net/kamailio: Update 6.0.4 => 6.1.1 Changelog: https://www.kamailio.org/pub/kamailio/6.1.1/ChangeLog Release Notes: https://www.kamailio.org/w/kamailio-v6-1-0-release-notes/ https://www.kamailio.org/w/2026/03/kamailio-v6-1-1-released/ PR: 293745 --- net/kamailio/Makefile | 22 +++++++--- net/kamailio/distinfo | 6 +-- .../files/extra-patch-cmake_modules-docs.cmake | 17 ++++---- .../files/patch-cmake_compiler-specific.cmake | 51 ---------------------- .../files/patch-cmake_modules_FindUnistring.cmake | 34 +++++++++++++++ .../patch-src_modules_phonenum_CMakeLists.txt | 15 +++++++ .../patch-src_modules_websocket_CMakeLists.txt | 14 ++++++ net/kamailio/pkg-plist | 12 ++++- 8 files changed, 99 insertions(+), 72 deletions(-) diff --git a/net/kamailio/Makefile b/net/kamailio/Makefile index edf10148a05a..055ea6ff9257 100644 --- a/net/kamailio/Makefile +++ b/net/kamailio/Makefile @@ -1,5 +1,5 @@ PORTNAME= kamailio -DISTVERSION= 6.0.4 +DISTVERSION= 6.1.1 CATEGORIES= net MASTER_SITES= http://www.kamailio.org/pub/kamailio/${DISTVERSION}/src/ DISTNAME= ${PORTNAME}-${DISTVERSION}_src @@ -36,19 +36,24 @@ SUB_LIST= KAMAILIO_GROUP=${KAMAILIO_GROUP} \ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} +.if ${KAMAILIO_USER} == kamailio USERS= ${KAMAILIO_USER} +.endif +.if ${KAMAILIO_GROUP} == kamailio GROUPS= ${KAMAILIO_GROUP} +.endif -OPTIONS_DEFINE= DIALPLAN DOCS EVAPI GCRYPT HTTP_CLIENT JWT \ - KAFKA LOST LWSC MICROHTTPD MQTT NGHTTP2 \ - OUTBOUND PERL PHONENUM PRESENCE RADIUS SCTP \ - SIPREPO SLACK TLS WEBSOCKET +OPTIONS_DEFINE= BLOCKCHAIN DIALPLAN DOCS EVAPI GCRYPT \ + HTTP_CLIENT JWT 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 OPTIONS_GROUP_KEMI_LANGS= LUAJIT PYTHON3 OPTIONS_SUB= YES +BLOCKCHAIN_DESC= Blockchain modules DATABASE_DRIVERS_DESC= Database drivers DIALPLAN_DESC= String translations based on rules EVAPI_DESC= Network event broadcast API @@ -71,6 +76,10 @@ SCTP_DESC= SCTP support SIPREPO_DESC= In-memory SIP message storage SLACK_DESC= Connector to Slack channels +BLOCKCHAIN_LIB_DEPENDS= libcurl.so:ftp/curl \ + libsecp256k1.so:math/secp256k1 +BLOCKCHAIN_VARS= EXTRA_MODULES+="auth_web3 auth_arnacon" + DIALPLAN_LIB_DEPENDS= libpcre2-8.so:devel/pcre2 DIALPLAN_VARS= EXTRA_MODULES+=dialplan @@ -125,7 +134,7 @@ PERL_USES= perl5 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" +PERL_VARS= EXTRA_MODULES+=app_perl PGSQL_USES= pgsql PGSQL_VARS= EXTRA_MODULES+=db_postgres @@ -161,7 +170,6 @@ UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC UNIXODBC_VARS= EXTRA_MODULES+=db_unixodbc WEBSOCKET_LIB_DEPENDS= libunistring.so:devel/libunistring -WEBSOCKET_USES= ssl WEBSOCKET_VARS= EXTRA_MODULES+=websocket .include <bsd.port.pre.mk> diff --git a/net/kamailio/distinfo b/net/kamailio/distinfo index c88844c373f2..aaf04a48d047 100644 --- a/net/kamailio/distinfo +++ b/net/kamailio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1763303549 -SHA256 (kamailio-6.0.4_src.tar.gz) = df83ecde2d6d9d255cfc92c18d2457198f19452997846a8dcb7bfe7376aeb6e6 -SIZE (kamailio-6.0.4_src.tar.gz) = 13130282 +TIMESTAMP = 1772797474 +SHA256 (kamailio-6.1.1_src.tar.gz) = ea26f117449bb9bd806d033c1eb90b9f625bc15319140bb3ca3d40afeed81f9a +SIZE (kamailio-6.1.1_src.tar.gz) = 13016380 diff --git a/net/kamailio/files/extra-patch-cmake_modules-docs.cmake b/net/kamailio/files/extra-patch-cmake_modules-docs.cmake index b16479e767fd..e370c9d1ccb1 100644 --- a/net/kamailio/files/extra-patch-cmake_modules-docs.cmake +++ b/net/kamailio/files/extra-patch-cmake_modules-docs.cmake @@ -1,16 +1,15 @@ ---- cmake/modules-docs.cmake.orig 2025-11-06 09:29:38 UTC +--- cmake/modules-docs.cmake.orig 2026-02-18 10:18:48 UTC +++ cmake/modules-docs.cmake -@@ -157,13 +157,6 @@ function(docs_add_module group_name module_name) +@@ -130,12 +130,5 @@ function(docs_add_module group_name module_name) + COMMENT "Generating html documentation for ${module_name}" ) - - install( + # endif() +- +- install( - FILES ${CMAKE_CURRENT_SOURCE_DIR}/${module_name}/README - RENAME README.${module_name} - DESTINATION ${CMAKE_INSTALL_DOCDIR}/modules - COMPONENT ${group_name} - ) -- -- install( - FILES ${CMAKE_CURRENT_SOURCE_DIR}/${module_name}/${module_name}.7 - DESTINATION ${CMAKE_INSTALL_DATADIR}/man/man7 - COMPONENT ${group_name} + # endif() + endfunction() diff --git a/net/kamailio/files/patch-cmake_compiler-specific.cmake b/net/kamailio/files/patch-cmake_compiler-specific.cmake deleted file mode 100644 index 77a208674511..000000000000 --- a/net/kamailio/files/patch-cmake_compiler-specific.cmake +++ /dev/null @@ -1,51 +0,0 @@ ---- cmake/compiler-specific.cmake.orig 2025-11-06 09:29:38 UTC -+++ cmake/compiler-specific.cmake -@@ -149,8 +149,8 @@ elseif(TARGET_ARCH MATCHES "ppc64$") - "GCC version ${CMAKE_C_COMPILER_VERSION} is too old for ppc64. Try GCC 3.0 or newer." - ) - endif() -- # else() -- # message(FATAL_ERROR "Unsupported compiler (${CMAKE_C_COMPILER_ID}) for ppc64. Try GCC.") -+ else() -+ message(WARNING "Unsupported compiler (${CMAKE_C_COMPILER_ID}) for ppc64. Try GCC.") - endif() - elseif(TARGET_ARCH STREQUAL "ppc") - # PowerPC 32-bit specific flags -@@ -197,7 +197,7 @@ elseif(TARGET_ARCH STREQUAL "arm7") - ) - endif() - else() -- message(FATAL_ERROR "Unsupported compiler (${CMAKE_C_COMPILER_ID}) for arm7. Try GCC.") -+ message(WARNING "Unsupported compiler (${CMAKE_C_COMPILER_ID}) for arm7. Try GCC.") - endif() - elseif(TARGET_ARCH STREQUAL "arm6") - if(CMAKE_C_COMPILER_ID STREQUAL "GNU") -@@ -235,7 +235,7 @@ elseif(TARGET_ARCH STREQUAL "arm") - ) - endif() - else() -- message(FATAL_ERROR "Unsupported compiler (${CMAKE_C_COMPILER_ID}) for arm. Try GCC.") -+ message(WARNING "Unsupported compiler (${CMAKE_C_COMPILER_ID}) for arm. Try GCC.") - endif() - elseif(TARGET_ARCH STREQUAL "sparc64") - if(CMAKE_C_COMPILER_ID STREQUAL "GNU") -@@ -269,9 +269,7 @@ elseif(TARGET_ARCH STREQUAL "sparc64") - -xc99 - ) - else() -- message( -- FATAL_ERROR "Unsupported compiler (${CMAKE_C_COMPILER_ID}) for sparc64. Try GCC or Sun." -- ) -+ message(WARNING "Unsupported compiler (${CMAKE_C_COMPILER_ID}) for sparc64. Try GCC or Sun.") - endif() - elseif(TARGET_ARCH STREQUAL "sparc") - if(CMAKE_C_COMPILER_ID STREQUAL "GNU") -@@ -294,7 +292,7 @@ elseif(TARGET_ARCH STREQUAL "sparc") - common_compiler_flags INTERFACE -xO3 -xtarget=native -xmemalign=4i -fma=fused -fns=yes -xc99 - ) - else() -- message(FATAL_ERROR "Unsupported compiler (${CMAKE_C_COMPILER_ID}) for sparc. Try GCC or Sun.") -+ message(WARNING "Unsupported compiler (${CMAKE_C_COMPILER_ID}) for sparc. Try GCC or Sun.") - endif() - elseif(TARGET_ARCH STREQUAL "mips") - if(CMAKE_C_COMPILER_ID STREQUAL "GNU") diff --git a/net/kamailio/files/patch-cmake_modules_FindUnistring.cmake b/net/kamailio/files/patch-cmake_modules_FindUnistring.cmake new file mode 100644 index 000000000000..f16dab98e21f --- /dev/null +++ b/net/kamailio/files/patch-cmake_modules_FindUnistring.cmake @@ -0,0 +1,34 @@ +--- cmake/modules/FindUnistring.cmake.orig 2026-03-07 11:32:50 UTC ++++ cmake/modules/FindUnistring.cmake +@@ -0,0 +1,31 @@ ++# https://github.com/fsaric/libsentences/blob/master/cmake/FindUnistring.cmake ++# - Find UNISTRING ++# Find the unistring includes and library ++# ++# Unistring_INCLUDE_DIRS - where to find unistr.h, etc. ++# Unistring_LIBRARIES - unistring library. ++# Unistring_FOUND - True if unistring found. ++# ++# Hints: ++# Unistring_ROOT=/path/to/unistring/installation ++ ++find_path(Unistring_INCLUDE_DIRS unistr.h DOC "Path to unistring include directory") ++ ++find_library( ++ Unistring_LIBRARIES ++ NAMES unistring libunistring ++ DOC "Path to unistring library" ++) ++ ++include(FindPackageHandleStandardArgs) ++find_package_handle_standard_args(Unistring DEFAULT_MSG Unistring_LIBRARIES Unistring_INCLUDE_DIRS) ++ ++# Create the Unistring::Unistring imported target ++if(Unistring_FOUND) ++ add_library(Unistring::Unistring UNKNOWN IMPORTED) ++ set_target_properties( ++ Unistring::Unistring PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${Unistring_INCLUDE_DIRS}" ++ IMPORTED_LOCATION "${Unistring_LIBRARIES}" ++ ) ++endif() ++mark_as_advanced(Unistring_LIBRARIES Unistring_INCLUDE_DIRS) diff --git a/net/kamailio/files/patch-src_modules_phonenum_CMakeLists.txt b/net/kamailio/files/patch-src_modules_phonenum_CMakeLists.txt new file mode 100644 index 000000000000..7b2e5d3d45ed --- /dev/null +++ b/net/kamailio/files/patch-src_modules_phonenum_CMakeLists.txt @@ -0,0 +1,15 @@ +--- src/modules/phonenum/CMakeLists.txt.orig 2026-03-04 19:17:24 UTC ++++ src/modules/phonenum/CMakeLists.txt +@@ -21,10 +21,10 @@ else() + + if(libphonenumber_LIBRARY AND libgeocoding_LIBRARY) + set(libphonenum_LIBRARY ${libphonenumber_LIBRARY} ${libgeocoding_LIBRARY}) +- find_path(libphonenumber_INCLUDE_DIR phonenumbers/geocoding/phonenumber_offline_geocoder.h ++ find_path(libphonenumber_INCLUDE_DIRS phonenumbers/geocoding/phonenumber_offline_geocoder.h + phonenumbers/phonenumberutil.h + ) +- message(STATUS "Found libphonenumber include directory: ${libphonenumber_INCLUDE_DIR}") ++ message(STATUS "Found libphonenumber include directory: ${libphonenumber_INCLUDE_DIRS}") + message(STATUS "Found libphonenumber library: ${libphonenum_LIBRARY}") + else() + message(FATAL_ERROR "libphonenumber library not found") diff --git a/net/kamailio/files/patch-src_modules_websocket_CMakeLists.txt b/net/kamailio/files/patch-src_modules_websocket_CMakeLists.txt new file mode 100644 index 000000000000..1a1ff2faee8a --- /dev/null +++ b/net/kamailio/files/patch-src_modules_websocket_CMakeLists.txt @@ -0,0 +1,14 @@ +--- src/modules/websocket/CMakeLists.txt.orig 2026-03-04 19:17:24 UTC ++++ src/modules/websocket/CMakeLists.txt +@@ -7,9 +7,6 @@ else() + if(EMBEDDED_UTF8_DECODE) + target_compile_definitions(${module_name} PRIVATE EMBEDDED_UTF8_DECODE) + else() +- if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +- target_include_directories(${module_name} PRIVATE /opt/local/include) +- target_link_directories(${module_name} PRIVATE /opt/local/lib) +- endif() +- target_link_libraries(${module_name} PRIVATE unistring) ++ find_package(Unistring REQUIRED) ++ target_link_libraries(${module_name} PRIVATE Unistring::Unistring) + endif() diff --git a/net/kamailio/pkg-plist b/net/kamailio/pkg-plist index 3d61f70a58e1..d470a3fcaf58 100644 --- a/net/kamailio/pkg-plist +++ b/net/kamailio/pkg-plist @@ -1,3 +1,7 @@ +%%BLOCKCHAIN%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.auth_arnacon +%%BLOCKCHAIN%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.auth_web3 +%%BLOCKCHAIN%%lib/kamailio/modules/auth_arnacon.so +%%BLOCKCHAIN%%lib/kamailio/modules/auth_web3.so %%DATADIR%%/dbtext/kamailio/acc %%DATADIR%%/dbtext/kamailio/acc_cdrs %%DATADIR%%/dbtext/kamailio/active_watchers @@ -161,9 +165,7 @@ %%OUTBOUND%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.outbound %%OUTBOUND%%lib/kamailio/modules/outbound.so %%PERL%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.app_perl -%%PERL%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.db_perlvdb %%PERL%%lib/kamailio/modules/app_perl.so -%%PERL%%lib/kamailio/modules/db_perlvdb.so %%PERL%%lib/kamailio/perl/Kamailio.pm %%PERL%%lib/kamailio/perl/Kamailio/Constants.pm %%PERL%%lib/kamailio/perl/Kamailio/LDAPUtils/LDAPConf.pm @@ -311,13 +313,16 @@ %%PORTDOCS%%%%DOCSDIR%%/modules/README.path %%PORTDOCS%%%%DOCSDIR%%/modules/README.pdb %%PORTDOCS%%%%DOCSDIR%%/modules/README.pdt +%%PORTDOCS%%%%DOCSDIR%%/modules/README.peerstate %%PORTDOCS%%%%DOCSDIR%%/modules/README.permissions %%PORTDOCS%%%%DOCSDIR%%/modules/README.pike %%PORTDOCS%%%%DOCSDIR%%/modules/README.pipelimit %%PORTDOCS%%%%DOCSDIR%%/modules/README.posops %%PORTDOCS%%%%DOCSDIR%%/modules/README.prefix_route +%%PORTDOCS%%%%DOCSDIR%%/modules/README.ptimer %%PORTDOCS%%%%DOCSDIR%%/modules/README.pv %%PORTDOCS%%%%DOCSDIR%%/modules/README.pv_headers +%%PORTDOCS%%%%DOCSDIR%%/modules/README.pvtpl %%PORTDOCS%%%%DOCSDIR%%/modules/README.qos %%PORTDOCS%%%%DOCSDIR%%/modules/README.ratelimit %%PORTDOCS%%%%DOCSDIR%%/modules/README.registrar @@ -569,13 +574,16 @@ lib/kamailio/modules/p_usrloc.so lib/kamailio/modules/path.so lib/kamailio/modules/pdb.so lib/kamailio/modules/pdt.so +lib/kamailio/modules/peerstate.so lib/kamailio/modules/permissions.so lib/kamailio/modules/pike.so lib/kamailio/modules/pipelimit.so lib/kamailio/modules/posops.so lib/kamailio/modules/prefix_route.so +lib/kamailio/modules/ptimer.so lib/kamailio/modules/pv.so lib/kamailio/modules/pv_headers.so +lib/kamailio/modules/pvtpl.so lib/kamailio/modules/qos.so lib/kamailio/modules/ratelimit.so lib/kamailio/modules/registrar.sohome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69c2edc2.46143.18f0e32f>