From nobody Sat May 27 23:51:28 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QTJTr33X9z4WyMD; Sat, 27 May 2023 23:51:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QTJTr2Nrbz3P0b; Sat, 27 May 2023 23:51:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685231488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FSr3C3djsYAwlJw3qs7pUknVpJ5x+v0X6spcPmOIUdA=; b=FD36foCc9V8dtmacqFcRa+9ynoSCtguD6P6HU/zcGQUiJVWqpruVkXC4RNpIpd+Gd72EE8 ALF5KfLf9jLnpUGldo5M5AlF5t9VwVmerU1xFNxySBOMuV5+kuZn5LugguEzTgqoD6dXNN JTS0xl3Wur5X1PVJxkhVImXmYuNBqs3D1K3fwBS2ExIsCKgBjz0Zyx5Ex+Ez65tERK89r3 DOtMFk1d1Q6CZYzzPy/znSFiMFmoGrp9TFSiMfn0ghtvcDX+tyg4PsqUy5+g5ebjrUicll ZjEuNAs8eXpYlP5S/GBMNTpFO/dAl89FNcCNXr1SQFbr9UQZpeGq3po/KVkVNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685231488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FSr3C3djsYAwlJw3qs7pUknVpJ5x+v0X6spcPmOIUdA=; b=tnO9h1M7rp6Xfr25zKoY0XU60siNPkOKz/6GazlRh2AnxGq354lO4KYtfkFS8MbTvGSiE4 /dBpgtD+eKq6i70dpC3PIkcFLWf87xaRva+22Gd4iNyqPEJCqHiQyOJaco/NaeyZUqP/3M hMm8oWBwmm3dW6S1rVbobTpLEhxMV4pPSSOKl8qb94VN7CrL8yaqdcHGgmNmkhY55QetJP xaaagX9tfxzEZ/Y0es/5X22tZbmNEUe8HIoMjXksxV8Br+cmyK6XQAeW6/hmTpzl8HQVlE i4GOz4xe6Gy05307MIy7l3aqkFnUipLZ4D0B49BYb+H3cBaZ6PnaFYypfFwTDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685231488; a=rsa-sha256; cv=none; b=D7VXkUcgNC9fRBbgMGIG6MsDe+7WxMIPuJ5c+5GoiD6AiQ3yhsIcGw11YzWgNfQc6G+Mx4 M2nplYXmxnoYPBqdkM8VpMuqpmyt4tMuHllfI3woCS6RcERv4IkSCVi0oIepm1HgNJcdCw dmosAtaw/wVugrusNjn2sklg0LQf+SN1ck+qZROcfN6F9qozLfB0TKBpDTEey94xxmNyCs nlzzijXy6uOjaCEqH7XmYBp2eW/DdlxKB/mD0XXTqNYyZU6RQaSReQAQ7Akn/nO2nlAkmp rCR0W1BbHkmjvP7pL3IayHzkCZveNM5wAvl5rFULNhaYwNeG9JronDIDgh9w2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QTJTr1S9bz17DZ; Sat, 27 May 2023 23:51:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34RNpS6q055801; Sat, 27 May 2023 23:51:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34RNpSMv055800; Sat, 27 May 2023 23:51:28 GMT (envelope-from git) Date: Sat, 27 May 2023 23:51:28 GMT Message-Id: <202305272351.34RNpSMv055800@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 35f40735a0ff - main - devel/libddwaf: Update to 1.11.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35f40735a0ff47e89355d3a081816f4d35689688 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=35f40735a0ff47e89355d3a081816f4d35689688 commit 35f40735a0ff47e89355d3a081816f4d35689688 Author: Po-Chuan Hsieh AuthorDate: 2023-05-27 23:22:13 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-05-27 23:43:42 +0000 devel/libddwaf: Update to 1.11.0 Changes: https://github.com/DataDog/libddwaf/releases --- devel/libddwaf/Makefile | 6 +++--- devel/libddwaf/distinfo | 14 +++++++------- devel/libddwaf/files/patch-CMakeLists.txt | 18 +++++++++--------- devel/libddwaf/files/patch-perf-CMakeLists.txt | 10 +++++----- devel/libddwaf/files/patch-third_party-CMakeLists.txt | 16 ++++++++-------- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/devel/libddwaf/Makefile b/devel/libddwaf/Makefile index 47a687d5e76d..b6a6ae11ea31 100644 --- a/devel/libddwaf/Makefile +++ b/devel/libddwaf/Makefile @@ -1,5 +1,5 @@ PORTNAME= libddwaf -PORTVERSION= 1.10.0 +PORTVERSION= 1.11.0 CATEGORIES= devel MAINTAINER= sunpoet@FreeBSD.org @@ -27,8 +27,8 @@ CMAEK_ON= LIBDDWAF_BUILD_SHARED LIBDDWAF_BUILD_STATIC USE_GITHUB= yes GH_ACCOUNT= DataDog -GH_TUPLE= DataDog:appsec-event-rules:1.7.0:DataDog_appsec_event_rules/third_party/proj_event_rules \ - Tencent:rapidjson:949c771:Tencent_rapidjson/third_party/rapidjson +GH_TUPLE= DataDog:appsec-event-rules:1.7.1:DataDog_appsec_event_rules/third_party/proj_event_rules \ + Tencent:rapidjson:973dc9c:Tencent_rapidjson/third_party/rapidjson post-patch: # Clean up bundled libraries diff --git a/devel/libddwaf/distinfo b/devel/libddwaf/distinfo index 715a93b64c8a..71ed1a5ddf11 100644 --- a/devel/libddwaf/distinfo +++ b/devel/libddwaf/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1683227579 -SHA256 (DataDog-libddwaf-1.10.0_GH0.tar.gz) = d7beda292924f15be73b94ec88fe3b452c5c2a1595661803c7f846e0e77c54c3 -SIZE (DataDog-libddwaf-1.10.0_GH0.tar.gz) = 718790 -SHA256 (DataDog-appsec-event-rules-1.7.0_GH0.tar.gz) = 4252d4024c0eb4447af2c3058a25728d755173c646bfc0d48c6cdc23deea87c4 -SIZE (DataDog-appsec-event-rules-1.7.0_GH0.tar.gz) = 134313 -SHA256 (Tencent-rapidjson-949c771_GH0.tar.gz) = 5de5997ba44900edede6160772de8d001f18ac66cef97ce68226bb6966ebe976 -SIZE (Tencent-rapidjson-949c771_GH0.tar.gz) = 1115264 +TIMESTAMP = 1685162032 +SHA256 (DataDog-libddwaf-1.11.0_GH0.tar.gz) = 5cf1b14fd9fe7e93bbfed8adbbbdfe4a9a14a54bcd278a95abe298768fcf3ad8 +SIZE (DataDog-libddwaf-1.11.0_GH0.tar.gz) = 733209 +SHA256 (DataDog-appsec-event-rules-1.7.1_GH0.tar.gz) = df0e72ec448f66f7752c0f6c411b8172751524eaae66b9219a477668e1e65f91 +SIZE (DataDog-appsec-event-rules-1.7.1_GH0.tar.gz) = 134403 +SHA256 (Tencent-rapidjson-973dc9c_GH0.tar.gz) = f69cec879316045c53e7a54518e126348e2c029a775d7e4f65ea88f43c6a4d01 +SIZE (Tencent-rapidjson-973dc9c_GH0.tar.gz) = 1115411 diff --git a/devel/libddwaf/files/patch-CMakeLists.txt b/devel/libddwaf/files/patch-CMakeLists.txt index d57eba89f9e0..d66eb36faad9 100644 --- a/devel/libddwaf/files/patch-CMakeLists.txt +++ b/devel/libddwaf/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2023-01-17 18:39:22 UTC +--- CMakeLists.txt.orig 2023-05-25 10:34:56 UTC +++ CMakeLists.txt @@ -8,23 +8,23 @@ set(CMAKE_PROJECT_VERSION ${version}) configure_file(src/version.hpp.in ${CMAKE_CURRENT_SOURCE_DIR}/src/version.hpp) @@ -42,18 +42,18 @@ +#add_subdirectory(third_party) set(LIBDDWAF_SOURCE - ${libddwaf_SOURCE_DIR}/src/clock.cpp -@@ -121,7 +121,8 @@ install(FILES ${libddwaf_SOURCE_DIR}/include/ddwaf.h D + ${libddwaf_SOURCE_DIR}/src/ruleset_builder.cpp +@@ -123,7 +123,8 @@ install(FILES ${libddwaf_SOURCE_DIR}/include/ddwaf.h D + # System dependencies set(LIBDDWAF_INTERFACE_LIBRARIES "") - set(LIBDDWAF_PRIVATE_LIBRARIES -- lib_re2 lib_rapidjson lib_ac lib_injection lib_radix lib_utf8proc) -+# lib_re2 lib_rapidjson lib_ac lib_injection lib_radix lib_utf8proc) -+ lib_radix) +-set(LIBDDWAF_PRIVATE_LIBRARIES lib_re2 lib_ac lib_injection lib_radix lib_utf8proc) ++#set(LIBDDWAF_PRIVATE_LIBRARIES lib_re2 lib_ac lib_injection lib_radix lib_utf8proc) ++set(LIBDDWAF_PRIVATE_LIBRARIES lib_radix) if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") # needed for glibc <2.17. We compile with --as-needed so the library won't -@@ -149,6 +150,27 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") +@@ -151,6 +152,27 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") elseif(WIN32) list(APPEND LIBDDWAF_INTERFACE_LIBRARIES ws2_32) endif() @@ -81,7 +81,7 @@ target_link_libraries(libddwaf_objects PRIVATE ${LIBDDWAF_PRIVATE_LIBRARIES} -@@ -173,66 +195,67 @@ if (LIBDDWAF_BUILD_STATIC) +@@ -175,66 +197,67 @@ if (LIBDDWAF_BUILD_STATIC) INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) # Post-processing on the static library diff --git a/devel/libddwaf/files/patch-perf-CMakeLists.txt b/devel/libddwaf/files/patch-perf-CMakeLists.txt index 2a537f2ef704..9289108a65a6 100644 --- a/devel/libddwaf/files/patch-perf-CMakeLists.txt +++ b/devel/libddwaf/files/patch-perf-CMakeLists.txt @@ -1,8 +1,8 @@ ---- perf/CMakeLists.txt.orig 2022-09-22 09:00:38 UTC +--- perf/CMakeLists.txt.orig 2023-05-25 10:34:56 UTC +++ perf/CMakeLists.txt -@@ -13,8 +13,8 @@ target_link_libraries(benchcmp PRIVATE lib_yamlcpp m) - add_executable(benchmerge benchmerge.cpp) - target_link_libraries(benchmerge PRIVATE lib_yamlcpp m) +@@ -29,8 +29,8 @@ set_target_properties(benchmerge PROPERTIES + CXX_EXTENSIONS NO) + -ExternalProject_Get_property(proj_event_rules SOURCE_DIR) -set(EVENT_RULES_SOURCE_DIR ${SOURCE_DIR}) @@ -11,7 +11,7 @@ add_custom_target(run_benchmark COMMAND ${CMAKE_BINARY_DIR}/perf/benchmark -@@ -27,4 +27,4 @@ add_custom_target(run_benchmark +@@ -43,4 +43,4 @@ add_custom_target(run_benchmark WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ) diff --git a/devel/libddwaf/files/patch-third_party-CMakeLists.txt b/devel/libddwaf/files/patch-third_party-CMakeLists.txt index ae2315a1b211..bebea8992a61 100644 --- a/devel/libddwaf/files/patch-third_party-CMakeLists.txt +++ b/devel/libddwaf/files/patch-third_party-CMakeLists.txt @@ -1,8 +1,8 @@ ---- third_party/CMakeLists.txt.orig 2022-09-22 09:00:38 UTC +--- third_party/CMakeLists.txt.orig 2023-05-25 10:34:56 UTC +++ third_party/CMakeLists.txt -@@ -9,24 +9,24 @@ set(INSTALL_DIR ${CMAKE_BINARY_DIR}/third_party) - # workaround for using it in target_include_directories - file(MAKE_DIRECTORY ${INSTALL_DIR}/include) +@@ -15,24 +15,24 @@ if(NOT MSVC) + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wno-unused-parameter") + endif() -set(RAPIDJSON_COMMIT 22a62fcc2c2fa2418f5d358cdf65c1df73b418ae) -ExternalProject_Add(proj_rapidjson @@ -40,9 +40,9 @@ +target_include_directories(lib_rapidjson INTERFACE ${INSTALL_DIR}/rapidjson/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) - if(NOT MSVC) -@@ -38,153 +38,153 @@ endif() +@@ -45,153 +45,153 @@ endif() # To avoid building everything for re2, including test binvaries: # BUILD_COMMAND cmake --build --target re2 # But this is not enough, because the install target run afterwards insists on building everything @@ -310,14 +310,14 @@ # Appsec event rules -ExternalProject_Add(proj_event_rules - GIT_REPOSITORY https://github.com/DataDog/appsec-event-rules.git -- GIT_TAG 1.3.2 +- GIT_TAG 1.7.1 - GIT_SHALLOW ON - CONFIGURE_COMMAND "" - BUILD_COMMAND "" - INSTALL_COMMAND "") +#ExternalProject_Add(proj_event_rules +# GIT_REPOSITORY https://github.com/DataDog/appsec-event-rules.git -+# GIT_TAG 1.3.2 ++# GIT_TAG 1.7.1 +# GIT_SHALLOW ON +# CONFIGURE_COMMAND "" +# BUILD_COMMAND ""