From nobody Wed Aug 16 18:30:41 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 4RQxXL6yvZz4qxZw; Wed, 16 Aug 2023 18:30:42 +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 4RQxXL0s3Dz4QDK; Wed, 16 Aug 2023 18:30:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692210642; 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=N6FoZEmjwEQysWyIbcptNFh0lSD0XG1LMwyqhIoRXg8=; b=EtQ8lTm1JWsy8/AL8ZLPHpgl085x3V11hXIldUqHX8jVMzptuSJ1UyoCZsPS24YzPOyxRR +hSKoLkcGuUVAGmHWKKs7uvCye39n6MANOjbLfzncK+aabQUj+qR9IlXAveuJ5Nmndeciu NFV6o0RFAEb7x2Y5zHusNmYLRYeWTXKdkFiVavBd/axT29ulfx6BKwHBuNtKcqbUDi3wD6 pW0hNE3qHqbxpc9wxUczYFjKy0XJaw19wXhAM1BfjUQsSSOmlVKXs10DfmXklWzb8sfuxV 2wu5u+7OXRjxciiTsc4Ot73qzXzZd5sOS36FN91c3ohdwTf6ECx6tBJlhu5R4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692210642; 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=N6FoZEmjwEQysWyIbcptNFh0lSD0XG1LMwyqhIoRXg8=; b=e3fhX1ExOScC7LxeZ9ieeOgZSFqsX8PqpYfh4W1Qyy7EaQAYUyMRrIU5H+mra6HwdGDRXv Z3NpRtidqd7fIEcsHOkAgEtHr/pc394ZS0qzmmxuZ2oCc+yrteCGi/unQ5c0qidEJwHKzq 0qeGi4SMqLSHZNspSZ/DHvABuc/9H3TWPhK/X0XZaUlw8dKUZWAzWyAV+Tce9es0PSJRSS lD987cVyPPqiHNVgcCm6tpBTNtmtJRl3+YnhXhD0qOhI+AtF+vTNc37DHYEOH469XKQmTX ZGbLI6YytAR2szfclamGrFWrn91tEhQJGOoSvaJ4mt5r1PtVqikC2swWHaJ+wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692210642; a=rsa-sha256; cv=none; b=YUzY7Ff08OZ3BrIqrPI/vUzUTfUWBj6LDJ6RnWVsJnq2md6yDQ8gTape6xTteQNulFlY/q 6wBAc16cqPl4MCL6tWyfIvWGopunyt3XAWshz3YY0AbumsK1BMZRIUv4zdMoMO/wbbO41X +/Hhuln6i0CF6EM0Sb3kIc9vUw2xY+TXI5wN3jUlZ5avP2FNL5WqABeAzz6SjDJj76c2w6 XxvGa1c7cJoshvePHA4Y9twL++hqMcLXVtVBlfN5oW8WNlGBZJJhzlmcLaNpBW3q+VraHd eHixFeQQnHpMWh3pvNNOjLC9Xxw8JcyPiXKGTDEIT+53vYECp/pmlSaTjd8PTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RQxXK6hzHz12ZN; Wed, 16 Aug 2023 18:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GIUfOP024793; Wed, 16 Aug 2023 18:30:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GIUfX0024790; Wed, 16 Aug 2023 18:30:41 GMT (envelope-from git) Date: Wed, 16 Aug 2023 18:30:41 GMT Message-Id: <202308161830.37GIUfX0024790@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: daaa4bf35620 - main - devel/libddwaf: Update to 1.12.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: daaa4bf356207a948c03e17efc9c4c1d47915a93 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=daaa4bf356207a948c03e17efc9c4c1d47915a93 commit daaa4bf356207a948c03e17efc9c4c1d47915a93 Author: Po-Chuan Hsieh AuthorDate: 2023-08-16 18:07:55 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-08-16 18:25:09 +0000 devel/libddwaf: Update to 1.12.0 Changes: https://github.com/DataDog/libddwaf/releases --- devel/libddwaf/Makefile | 6 +++--- devel/libddwaf/distinfo | 10 +++++----- devel/libddwaf/files/patch-CMakeLists.txt | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/devel/libddwaf/Makefile b/devel/libddwaf/Makefile index 55dd527244c8..447d0330c3f6 100644 --- a/devel/libddwaf/Makefile +++ b/devel/libddwaf/Makefile @@ -1,5 +1,5 @@ PORTNAME= libddwaf -PORTVERSION= 1.11.0 +PORTVERSION= 1.12.0 CATEGORIES= devel MAINTAINER= sunpoet@FreeBSD.org @@ -20,7 +20,7 @@ LIB_DEPENDS= libac.so:devel/libac \ libutf8proc.so:textproc/utf8proc \ libyaml-cpp.so:devel/yaml-cpp -USES= cmake compiler:c++17-lang localbase:ldflags +USES= cmake compiler:c++20-lang localbase:ldflags CMAKE_OFF= LIBDDWAF_KEEP_SYMBOL_FILE LIBDDWAF_TESTING CMAKE_ON= LIBDDWAF_BUILD_SHARED LIBDDWAF_BUILD_STATIC @@ -28,7 +28,7 @@ CMAKE_ON= LIBDDWAF_BUILD_SHARED LIBDDWAF_BUILD_STATIC USE_GITHUB= yes GH_ACCOUNT= DataDog 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 + Tencent:rapidjson:a95e013:Tencent_rapidjson/third_party/rapidjson post-patch: # Clean up bundled libraries diff --git a/devel/libddwaf/distinfo b/devel/libddwaf/distinfo index 71ed1a5ddf11..2251211e6500 100644 --- a/devel/libddwaf/distinfo +++ b/devel/libddwaf/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1685162032 -SHA256 (DataDog-libddwaf-1.11.0_GH0.tar.gz) = 5cf1b14fd9fe7e93bbfed8adbbbdfe4a9a14a54bcd278a95abe298768fcf3ad8 -SIZE (DataDog-libddwaf-1.11.0_GH0.tar.gz) = 733209 +TIMESTAMP = 1691069924 +SHA256 (DataDog-libddwaf-1.12.0_GH0.tar.gz) = 68000b76f44118fe726750df3a54effc987def5b368be002c495383df9437ac4 +SIZE (DataDog-libddwaf-1.12.0_GH0.tar.gz) = 745164 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 +SHA256 (Tencent-rapidjson-a95e013_GH0.tar.gz) = 44d777549051b4dabea4dd2290d6b63a340c103e819da0c85f658606f4e88b6a +SIZE (Tencent-rapidjson-a95e013_GH0.tar.gz) = 1115459 diff --git a/devel/libddwaf/files/patch-CMakeLists.txt b/devel/libddwaf/files/patch-CMakeLists.txt index d66eb36faad9..7409c74399cc 100644 --- a/devel/libddwaf/files/patch-CMakeLists.txt +++ b/devel/libddwaf/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2023-05-25 10:34:56 UTC +--- CMakeLists.txt.orig 2023-07-28 08:52:50 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) @@ -14,7 +14,7 @@ +#endif() set(CMAKE_C_STANDARD 99) - set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD 20) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) -set(LIBDDWAF_SHARED_LINKER_FLAGS "-static-libstdc++" CACHE STRING "Shared library extra linker flags") @@ -34,7 +34,7 @@ option(LIBDDWAF_BUILD_SHARED "Build shared library" ON) option(LIBDDWAF_BUILD_STATIC "Build shared library" ON) -@@ -59,7 +59,7 @@ endif() +@@ -57,7 +57,7 @@ endif() include(GNUInstallDirs) @@ -43,7 +43,7 @@ set(LIBDDWAF_SOURCE ${libddwaf_SOURCE_DIR}/src/ruleset_builder.cpp -@@ -123,7 +123,8 @@ install(FILES ${libddwaf_SOURCE_DIR}/include/ddwaf.h D +@@ -137,7 +137,8 @@ install(FILES ${libddwaf_SOURCE_DIR}/include/ddwaf.h D # System dependencies set(LIBDDWAF_INTERFACE_LIBRARIES "") @@ -53,7 +53,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") # needed for glibc <2.17. We compile with --as-needed so the library won't -@@ -151,6 +152,27 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") +@@ -165,6 +166,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} -@@ -175,66 +197,67 @@ if (LIBDDWAF_BUILD_STATIC) +@@ -189,66 +211,67 @@ if (LIBDDWAF_BUILD_STATIC) INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) # Post-processing on the static library