diff --git a/net/kamailio/Makefile b/net/kamailio/Makefile index 943bc9e89929..edf10148a05a 100644 --- a/net/kamailio/Makefile +++ b/net/kamailio/Makefile @@ -1,176 +1,176 @@ PORTNAME= kamailio -DISTVERSION= 6.0.3 +DISTVERSION= 6.0.4 CATEGORIES= net MASTER_SITES= http://www.kamailio.org/pub/kamailio/${DISTVERSION}/src/ DISTNAME= ${PORTNAME}-${DISTVERSION}_src MAINTAINER= drtr0jan@yandex.ru COMMENT= Very fast and configurable open source SIP proxy WWW= https://www.kamailio.org/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= xsltproc:textproc/libxslt USES= bison cmake compiler:c11 cpe pkgconfig python:build readline \ shebangfix USE_LDCONFIG= yes 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 KAMAILIO_GROUP?= kamailio KAMAILIO_RUNDIR?= /var/run/${PORTNAME} SUB_LIST= KAMAILIO_GROUP=${KAMAILIO_GROUP} \ KAMAILIO_RUNDIR=${KAMAILIO_RUNDIR} \ KAMAILIO_USER=${KAMAILIO_USER} WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} USERS= ${KAMAILIO_USER} GROUPS= ${KAMAILIO_GROUP} 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_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 DATABASE_DRIVERS_DESC= Database drivers DIALPLAN_DESC= String translations based on rules 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 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 NGHTTP2_DESC= HTTP2 server module implementation OUTBOUND_DESC= SIP Outbound support PHONENUM_DESC= Phone number lookup and normalization using libphonenumber PRESENCE_DESC= Presence support PYTHON3_DESC= Execute embedded Python3 scripts SCTP_DESC= SCTP support SIPREPO_DESC= In-memory SIP message storage SLACK_DESC= Connector to Slack channels 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 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 JWT_LIB_DEPENDS= libjwt.so:www/libjwt JWT_VARS= EXTRA_MODULES+=jwt KAFKA_LIB_DEPENDS= librdkafka.so:net/librdkafka KAFKA_VARS= EXTRA_MODULES+=kafka LOST_LIB_DEPENDS= libcurl.so:ftp/curl \ libxml2.so:textproc/libxml2 LOST_VARS= EXTRA_MODULES+=lost LUAJIT_USES= luajit LUAJIT_CMAKE_BOOL= LUAJIT 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 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_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 PGSQL_VARS= EXTRA_MODULES+=db_postgres 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_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 python PYTHON3_VARS= EXTRA_MODULES+=app_python3 RADIUS_LIB_DEPENDS= libradcli.so:net/radcli RADIUS_VARS= EXTRA_MODULES+="acc_radius auth_radius misc_radius peering" SCTP_VARS= EXTRA_MODULES+=sctp SIPREPO_VARS= EXTRA_MODULES+=siprepo SLACK_LIB_DEPENDS= libcurl.so:ftp/curl SLACK_VARS= EXTRA_MODULES+=slack SQLITE_USES= sqlite SQLITE_VARS= EXTRA_MODULES+=db_sqlite TLS_USES= ssl TLS_VARS= EXTRA_MODULES+=tls 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 .if !empty (EXTRA_MODULES) CMAKE_ARGS+= -DINCLUDE_MODULES="${EXTRA_MODULES}" .endif post-install: @(cd ${STAGEDIR}${ETCDIR}; for i in `${FIND} . -type f`; do ${MV} $$i $$i.sample; done) .include diff --git a/net/kamailio/distinfo b/net/kamailio/distinfo index 94cd408d90cf..c88844c373f2 100644 --- a/net/kamailio/distinfo +++ b/net/kamailio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1758364827 -SHA256 (kamailio-6.0.3_src.tar.gz) = 963c70b2ca64f0801c8549cc51b4e2f1b7f4e73ae9d4a70145c5c4d5b4da1184 -SIZE (kamailio-6.0.3_src.tar.gz) = 13105571 +TIMESTAMP = 1763303549 +SHA256 (kamailio-6.0.4_src.tar.gz) = df83ecde2d6d9d255cfc92c18d2457198f19452997846a8dcb7bfe7376aeb6e6 +SIZE (kamailio-6.0.4_src.tar.gz) = 13130282 diff --git a/net/kamailio/files/extra-patch-cmake_modules-docs.cmake b/net/kamailio/files/extra-patch-cmake_modules-docs.cmake index fb390732209c..b16479e767fd 100644 --- a/net/kamailio/files/extra-patch-cmake_modules-docs.cmake +++ b/net/kamailio/files/extra-patch-cmake_modules-docs.cmake @@ -1,15 +1,16 @@ ---- cmake/modules-docs.cmake.orig 2025-01-29 11:36:50 UTC +--- cmake/modules-docs.cmake.orig 2025-11-06 09:29:38 UTC +++ cmake/modules-docs.cmake -@@ -171,12 +171,6 @@ function(docs_add_module module_name) - COMMENT "Processing target ${module_name}_man") +@@ -157,13 +157,6 @@ function(docs_add_module group_name module_name) + ) - 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}/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 kamailio_docs +- install( + FILES ${CMAKE_CURRENT_SOURCE_DIR}/${module_name}/${module_name}.7 + DESTINATION ${CMAKE_INSTALL_DATADIR}/man/man7 + COMPONENT ${group_name} diff --git a/net/kamailio/files/extra-patch-src_CMakeLists.txt b/net/kamailio/files/extra-patch-src_CMakeLists.txt index 263c00e82a04..0abf7da63473 100644 --- a/net/kamailio/files/extra-patch-src_CMakeLists.txt +++ b/net/kamailio/files/extra-patch-src_CMakeLists.txt @@ -1,15 +1,16 @@ ---- src/CMakeLists.txt.orig 2025-01-29 11:36:50 UTC +--- src/CMakeLists.txt.orig 2025-11-06 09:29:38 UTC +++ src/CMakeLists.txt -@@ -130,12 +130,6 @@ install( +@@ -157,13 +157,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) +- COMPONENT kamailio-core +-) - # ---------- # Create and install the man pages for kamailio add_custom_command( diff --git a/net/kamailio/files/patch-cmake_compiler-specific.cmake b/net/kamailio/files/patch-cmake_compiler-specific.cmake new file mode 100644 index 000000000000..77a208674511 --- /dev/null +++ b/net/kamailio/files/patch-cmake_compiler-specific.cmake @@ -0,0 +1,51 @@ +--- 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_defs.cmake b/net/kamailio/files/patch-cmake_defs.cmake deleted file mode 100644 index 7f4b532cf9d1..000000000000 --- a/net/kamailio/files/patch-cmake_defs.cmake +++ /dev/null @@ -1,11 +0,0 @@ ---- cmake/defs.cmake.orig 2025-11-07 10:31:49 UTC -+++ cmake/defs.cmake -@@ -25,6 +25,8 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64") - set(TARGET_ARCH "i386") - elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64") - set(TARGET_ARCH "x86_64") -+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "armv7") -+ set(TARGET_ARCH "arm7") - else() - set(TARGET_ARCH "${CMAKE_SYSTEM_PROCESSOR}") - endif()