Date: Sat, 22 Nov 2025 16:01:55 +0000 From: Robert Clausecker <fuz@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: 7b519a594063 - main - net/kamailio: update to 6.0.4 Message-ID: <6921de73.38e23.46b83e94@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=7b519a5940632147ff073292dd182c52fa834edd commit 7b519a5940632147ff073292dd182c52fa834edd Author: Boris Korzun <drtr0jan@yandex.ru> AuthorDate: 2025-11-16 23:20:50 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2025-11-22 16:01:29 +0000 net/kamailio: update to 6.0.4 - add a patch to fix the build on armv7 Changelog: https://www.kamailio.org/pub/kamailio/6.0.4/ChangeLog PR: 291047 --- net/kamailio/Makefile | 2 +- net/kamailio/distinfo | 6 +-- .../files/extra-patch-cmake_modules-docs.cmake | 25 ++++++----- net/kamailio/files/extra-patch-src_CMakeLists.txt | 7 +-- .../files/patch-cmake_compiler-specific.cmake | 51 ++++++++++++++++++++++ net/kamailio/files/patch-cmake_defs.cmake | 11 ----- 6 files changed, 72 insertions(+), 30 deletions(-) diff --git a/net/kamailio/Makefile b/net/kamailio/Makefile index 943bc9e89929..edf10148a05a 100644 --- a/net/kamailio/Makefile +++ b/net/kamailio/Makefile @@ -1,5 +1,5 @@ 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 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,6 +1,6 @@ ---- 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 ) @@ -8,7 +8,8 @@ -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 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()home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6921de73.38e23.46b83e94>