freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

devel/libddwaf: Update to 1.25.1

Browse Source 
Changes:	https://github.com/DataDog/libddwaf/releases
This commit is contained in:
Po-Chuan Hsieh
2025-07-04 16:59:09 +08:00
parent 18a22eb2fe
commit 06015aaf7e
5 changed files with 168 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
devel/libddwaf/Makefile
+2 -1
View File
@@ -1,5 +1,5 @@
PORTNAME= libddwaf
PORTVERSION= 1.24.1
PORTVERSION= 1.25.1
CATEGORIES= devel
MAINTAINER= sunpoet@FreeBSD.org
@@ -11,6 +11,7 @@ LICENSE_COMB= dual
LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE.Apache
LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSE.BSD3
BUILD_DEPENDS= rapidjson>=0:devel/rapidjson
LIB_DEPENDS= libac.so:devel/libac \
libinjection.so:devel/libinjection \
libre2.so:devel/re2 \
devel/libddwaf/distinfo
+3 -3
View File
@@ -1,3 +1,3 @@
TIMESTAMP = 1744288712
SHA256 (DataDog-libddwaf-1.24.1_GH0.tar.gz) = ef6ec2be8483e63887777b7e98aaa5921eb531057e4636c75cc877f9acc34125
SIZE (DataDog-libddwaf-1.24.1_GH0.tar.gz) = 1442946
TIMESTAMP = 1751375025
SHA256 (DataDog-libddwaf-1.25.1_GH0.tar.gz) = d66ec2f2db943a755d6b55dc91186f77262588421f5f5b7dace1c9c003a2a004
SIZE (DataDog-libddwaf-1.25.1_GH0.tar.gz) = 1495357
devel/libddwaf/files/patch-CMakeLists.txt
+10
View File
@@ -0,0 +1,10 @@
--- CMakeLists.txt.orig 2025-05-28 14:15:10 UTC
+++ CMakeLists.txt
@@ -99,7 +99,6 @@ add_subdirectory(third_party EXCLUDE_FROM_ALL)
add_subdirectory(third_party EXCLUDE_FROM_ALL)
-set(LIBDDWAF_PRIVATE_LIBRARIES lib_rapidjson)
if(NOT MSVC AND LIBDDWAF_TESTING AND LIBDDWAF_TEST_COVERAGE)
list(APPEND LIBDDWAF_PRIVATE_LIBRARIES gcov)
endif()
devel/libddwaf/files/patch-tests-CMakeLists.txt
+11
View File
@@ -0,0 +1,11 @@
--- tests/CMakeLists.txt.orig 2025-05-28 14:15:10 UTC
+++ tests/CMakeLists.txt
@@ -14,7 +14,7 @@ endif()
target_compile_definitions(waf_test PRIVATE LIBDDWAF_VECTORIZED_TRANSFORMERS)
endif()
-set(LIBDDWAF_TEST_LIBRARIES lib_gtest lib_gmock libddwaf_objects lib_yamlcpp lib_rapidjson)
+set(LIBDDWAF_TEST_LIBRARIES lib_gtest lib_gmock libddwaf_objects lib_yamlcpp)
if(NOT MSVC AND LIBDDWAF_TEST_COVERAGE)
target_compile_options(waf_test PRIVATE -ggdb --coverage)
list(APPEND LIBDDWAF_TEST_LIBRARIES gcov)
devel/libddwaf/files/patch-third_party-CMakeLists.txt
+142
View File
@@ -0,0 +1,142 @@
--- third_party/CMakeLists.txt.orig 2025-05-28 14:15:10 UTC
+++ third_party/CMakeLists.txt
@@ -1,5 +1,4 @@ project(third_party)
project(third_party)
-include(ExternalProject)
set(DOWNLOAD_SUBDIR downloads)
set(INSTALL_DIR ${CMAKE_BINARY_DIR}/third_party)
@@ -15,27 +14,7 @@ endif()
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wno-unused-parameter -Wno-shadow")
endif()
-set(RAPIDJSON_COMMIT 24b5e7a8b27f42fa16b96fc70aade9106cf7102f)
-ExternalProject_Add(proj_rapidjson
- URL https://github.com/Tencent/rapidjson/archive/${RAPIDJSON_COMMIT}.tar.gz
- INSTALL_DIR ${INSTALL_DIR}
- CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
- -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
- -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
- -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}
- -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}
- -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
- BUILD_COMMAND ""
- INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory "<SOURCE_DIR>/include/" "<INSTALL_DIR>/include/"
-)
-add_library(lib_rapidjson INTERFACE IMPORTED GLOBAL)
-target_include_directories(lib_rapidjson INTERFACE ${INSTALL_DIR}/include)
-add_dependencies(lib_rapidjson proj_rapidjson)
-target_compile_definitions(lib_rapidjson INTERFACE RAPIDJSON_HAS_STDSTRING=1)
-set_target_properties(proj_rapidjson PROPERTIES EXCLUDE_FROM_ALL TRUE)
+find_package(RapidJSON)
if(NOT MSVC)
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIC")
@@ -43,95 +22,20 @@ endif()
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fPIC")
endif()
-if(CMAKE_BUILD_TYPE MATCHES Debug)
- set(LIBGTEST_FILENAME ${CMAKE_STATIC_LIBRARY_PREFIX}gtestd${CMAKE_STATIC_LIBRARY_SUFFIX})
- set(LIBGMOCK_FILENAME ${CMAKE_STATIC_LIBRARY_PREFIX}gmockd${CMAKE_STATIC_LIBRARY_SUFFIX})
-else()
- set(LIBGTEST_FILENAME ${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX})
- set(LIBGMOCK_FILENAME ${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX})
+find_library(lib_gmock gmock)
+if(lib_gmock)
+ list(APPEND LIBDDWAF_INTERFACE_LIBRARIES lib_gmock)
endif()
-
-set(GOOGLETEST_COMMIT 955c7f837efad184ec63e771c42542d37545eaef)
-ExternalProject_Add(proj_gtest
- URL https://github.com/google/googletest/archive/${GOOGLETEST_COMMIT}.tar.gz
- INSTALL_DIR ${INSTALL_DIR}
- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
- -DCMAKE_INSTALL_LIBDIR=lib
- -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
- -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
- -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
- -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}
- -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}
- -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
- -DBUILD_SHARED_LIBS=0
- -DBUILD_GMOCK=ON
- BUILD_BYPRODUCTS ${INSTALL_DIR}/lib/${LIBGTEST_FILENAME} ${INSTALL_DIR}/lib/${LIBGMOCK_FILENAME}
-)
-
-add_library(lib_gtest STATIC IMPORTED GLOBAL)
-add_library(lib_gmock STATIC IMPORTED GLOBAL)
-set_property(TARGET lib_gtest PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/${LIBGTEST_FILENAME})
-set_property(TARGET lib_gmock PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/${LIBGMOCK_FILENAME})
-target_include_directories(lib_gtest INTERFACE ${INSTALL_DIR}/include)
-target_include_directories(lib_gmock INTERFACE ${INSTALL_DIR}/include)
-if(NOT MSVC)
- target_link_libraries(lib_gtest INTERFACE -lpthread)
- target_link_libraries(lib_gmock INTERFACE -lpthread)
+find_library(lib_gtest gtest)
+if(lib_gtest)
+ list(APPEND LIBDDWAF_INTERFACE_LIBRARIES lib_gtest)
endif()
-add_dependencies(lib_gtest proj_gtest)
-add_dependencies(lib_gmock proj_gtest)
-set_target_properties(lib_gtest lib_gmock proj_gtest PROPERTIES EXCLUDE_FROM_ALL TRUE)
-
# yaml-cpp
-if (NOT MSVC)
- if(CMAKE_BUILD_TYPE MATCHES Debug)
- set(LIBYAML_FILENAME libyaml-cppd${CMAKE_STATIC_LIBRARY_SUFFIX})
- else()
- set(LIBYAML_FILENAME libyaml-cpp${CMAKE_STATIC_LIBRARY_SUFFIX})
- endif()
-else()
- set(LIBYAML_FILENAME yaml-cpp${CMAKE_STATIC_LIBRARY_SUFFIX})
+find_library(lib_yamlcpp yamlcpp)
+if(lib_yamlcpp)
+ list(APPEND LIBDDWAF_INTERFACE_LIBRARIES lib_yamlcpp)
endif()
-ExternalProject_Add(proj_yamlcpp
- URL https://github.com/jbeder/yaml-cpp/archive/refs/tags/yaml-cpp-0.7.0.zip
- INSTALL_DIR ${INSTALL_DIR}
- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
- -DCMAKE_INSTALL_LIBDIR=lib
- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
- -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
- -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
- -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}
- -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}
- -DYAML_CPP_BUILD_TESTS=OFF
- -DYAML_CPP_BUILD_CONTRIB=OFF
- -DYAML_CPP_BUILD_TOOLS=OFF
- -DYAML_CPP_INSTALL=ON
- -DYAML_BUILD_SHARED_LIBS=OFF
- -DYAML_MSVC_SHARED_RT=OFF
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
- -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
- -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
- BUILD_BYPRODUCTS ${INSTALL_DIR}/lib/${LIBYAML_FILENAME}
-)
-add_library(lib_yamlcpp STATIC IMPORTED GLOBAL)
-set_target_properties(lib_yamlcpp PROPERTIES IMPORTED_LOCATION ${INSTALL_DIR}/lib/${LIBYAML_FILENAME})
-target_include_directories(lib_yamlcpp INTERFACE ${INSTALL_DIR}/include)
-add_dependencies(lib_yamlcpp proj_yamlcpp)
-set_target_properties(lib_yamlcpp proj_yamlcpp PROPERTIES EXCLUDE_FROM_ALL TRUE)
-
# Appsec event rules
-ExternalProject_Add(proj_event_rules
- GIT_REPOSITORY git@github.com:DataDog/appsec-event-rules.git
- GIT_TAG 1.9.0
- GIT_SHALLOW ON
- CONFIGURE_COMMAND ""
- BUILD_COMMAND ""
- INSTALL_COMMAND "")
-
-set_target_properties(proj_event_rules PROPERTIES EXCLUDE_FROM_ALL TRUE)
# vim: et