From nobody Wed Oct 11 13:00:23 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 4S5CYM4D4Gz4xM45; Wed, 11 Oct 2023 13:00:23 +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 4S5CYM3PsSz4cph; Wed, 11 Oct 2023 13:00:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697029223; 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=B9z7mfNttxY1kXOeZOEtbqxGw1EHWv5MOf0EPE7UVFo=; b=PcqPd2drF4N+LkhAljYTZ4DsyEkuTsff9dFumlhqLzFpa53ETnKagn8Fh3h7NWD+BrchGf mb0bE6i1jdA2x07EbRHepD+mYF08sP7YWjTrc0sXvX3guoElvDlUvjda++nwIfh8z72s3v gq8/LD257AxV+VRl+iAp9KvjVrY5YANbzwuXTGjz/J3VY25bnwYXojZU2UZT7ysaLnWU4B rP7vCS6TMvPx++C0OKIDHaGzQI9GPeAHyPJ2i8KY+De8CM9YQCFFxFlYUWHdKAnSJRl98j u9wQqIOCt/Cx2/PyKJuuO8S2RO/UpXKJPu7bFY4KvRI2HhNFqoNGoZV/r2Q12w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697029223; a=rsa-sha256; cv=none; b=KDXWOb1Z+uK/UxIpncEBcGuKI51gqdwXxwx/qGYkiN4XcmT1312/zmi+1kZx/WdkTjGq7C h2JvG5LRSohHusz6rYwkQZIRxd6tsjaE0dMeWiazbXEtVc/qtE/u8LpXmrdddkPDGjcoVb T26+t9p4/AbPuoXxx8WYx+EXFXJjJ9ZIT6JCTyKOn/XPQ0h4bQA3234ttu6M4kXWWCWoXa vPY4P7bUE0KksYW2HXT7EVBKYPdgLfIIx4dDB3q+JC81uoBahZ61eGetO2CEvAoC3Xd+KM QZuTYCEH9HRPNoVB0nMYLV0vGQXfvWNSfnyZmFXRs3D+C18PmA8L819d8jPAJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697029223; 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=B9z7mfNttxY1kXOeZOEtbqxGw1EHWv5MOf0EPE7UVFo=; b=M/kk3394LX2lebb830wKptexmKhG4XJ9TcsV/ls9P6PdLIKPhqyDLqJTIBfZOnKpfax3PN nErfC6O5zmwEaWmwv1LzcneysLOdgJbXZ3OFJojq4mgGLhkAWbVM7AEGXqDbveGx+1Iruy NAfoQCyjpZmoSSVdy8TY0n5SYh11T6XKM5SALGenG04660ejKKiIFGnSx21NzmPJXme5Gn jPaG7RM4L0wHbbJo9Uokip7nbStkXGxrsyxKl6/74onbDTjHySWhTOLoArVsrfvKKPdlzb KQj3LSOhhf1xscN6ndqOwpmKe2lO71X/ij4Yw/Gvct+2+mqyNrRvHlqObVvc0g== 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 4S5CYM2PLTz6xJ; Wed, 11 Oct 2023 13:00:23 +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 39BD0NcF047451; Wed, 11 Oct 2023 13:00:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39BD0Nm8047448; Wed, 11 Oct 2023 13:00:23 GMT (envelope-from git) Date: Wed, 11 Oct 2023 13:00:23 GMT Message-Id: <202310111300.39BD0Nm8047448@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: dde9e6cece9d - main - devel/rubygem-ddtrace: Update to 1.15.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: dde9e6cece9d2f9bc6a1b243e7a530089811dd7b Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=dde9e6cece9d2f9bc6a1b243e7a530089811dd7b commit dde9e6cece9d2f9bc6a1b243e7a530089811dd7b Author: Po-Chuan Hsieh AuthorDate: 2023-10-11 12:58:28 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-10-11 12:58:28 +0000 devel/rubygem-ddtrace: Update to 1.15.0 Changes: https://github.com/DataDog/dd-trace-rb/releases --- devel/rubygem-ddtrace/Makefile | 10 ++-- devel/rubygem-ddtrace/distinfo | 6 +-- devel/rubygem-ddtrace/files/patch-libddwaf | 84 ------------------------------ 3 files changed, 8 insertions(+), 92 deletions(-) diff --git a/devel/rubygem-ddtrace/Makefile b/devel/rubygem-ddtrace/Makefile index 8d2da3663c84..3f0aba9e165f 100644 --- a/devel/rubygem-ddtrace/Makefile +++ b/devel/rubygem-ddtrace/Makefile @@ -1,6 +1,5 @@ PORTNAME= ddtrace -PORTVERSION= 1.14.0 -PORTREVISION= 1 +PORTVERSION= 1.15.0 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -13,9 +12,10 @@ LICENSE_COMB= dual LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE.Apache LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSE.BSD3 -RUN_DEPENDS= rubygem-debase-ruby_core_source>=3.2.1<3.2.1_99:devel/rubygem-debase-ruby_core_source \ - rubygem-libdatadog>=3.0.0.1.0<3.0.0.2:devel/rubygem-libdatadog \ - rubygem-libddwaf>=1.11.0.0.0<1.11.0.1:devel/rubygem-libddwaf \ +RUN_DEPENDS= rubygem-datadog-ci>=0.2.0<0.3:devel/rubygem-datadog-ci \ + rubygem-debase-ruby_core_source>=3.2.2<3.2.2_99:devel/rubygem-debase-ruby_core_source \ + rubygem-libdatadog>=5.0.0.1.0<5.0.0.2:devel/rubygem-libdatadog \ + rubygem-libddwaf>=1.14.0.0.0<1.14.0.1:devel/rubygem-libddwaf \ rubygem-msgpack>=0:devel/rubygem-msgpack USES= gem diff --git a/devel/rubygem-ddtrace/distinfo b/devel/rubygem-ddtrace/distinfo index f454efcb821a..f35c20a03b7a 100644 --- a/devel/rubygem-ddtrace/distinfo +++ b/devel/rubygem-ddtrace/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1693056879 -SHA256 (rubygem/ddtrace-1.14.0.gem) = 8e511b93ba89cd76b40ecfcd27acf0aa7a7d87845fa0af04dfba65f10381d89b -SIZE (rubygem/ddtrace-1.14.0.gem) = 515584 +TIMESTAMP = 1696915397 +SHA256 (rubygem/ddtrace-1.15.0.gem) = c3a7498703578d2c3ef1b3ee5767101dc96d3bc1928fe744e0c0a9ac076baeba +SIZE (rubygem/ddtrace-1.15.0.gem) = 503808 diff --git a/devel/rubygem-ddtrace/files/patch-libddwaf b/devel/rubygem-ddtrace/files/patch-libddwaf deleted file mode 100644 index 6c5e6e3032f8..000000000000 --- a/devel/rubygem-ddtrace/files/patch-libddwaf +++ /dev/null @@ -1,84 +0,0 @@ -Obtained from: https://github.com/DataDog/dd-trace-rb/commit/eb5ddedf18cf9129bab06b4f3063437fc0aabfd9 - ---- ddtrace.gemspec.orig 2023-08-30 13:30:50 UTC -+++ ddtrace.gemspec -@@ -26,7 +26,7 @@ Gem::Specification.new do |s| - - s.add_runtime_dependency(%q.freeze, [">= 0"]) - s.add_runtime_dependency(%q.freeze, ["= 3.2.1"]) -- s.add_runtime_dependency(%q.freeze, ["~> 1.9.0.0.0"]) -+ s.add_runtime_dependency(%q.freeze, ["~> 1.11.0.0.0"]) - s.add_runtime_dependency(%q.freeze, ["~> 3.0.0.1.0"]) - end - ---- lib/datadog/appsec/contrib/rack/request_middleware.rb.orig 2023-08-30 13:30:50 UTC -+++ lib/datadog/appsec/contrib/rack/request_middleware.rb -@@ -137,17 +137,19 @@ module Datadog - ) - end - -- if processor.ruleset_info -- span.set_tag('_dd.appsec.event_rules.version', processor.ruleset_info[:version]) -+ if processor.diagnostics -+ diagnostics = processor.diagnostics - -+ span.set_tag('_dd.appsec.event_rules.version', diagnostics['ruleset_version']) -+ - unless @oneshot_tags_sent - # Small race condition, but it's inoccuous: worst case the tags - # are sent a couple of times more than expected - @oneshot_tags_sent = true - -- span.set_tag('_dd.appsec.event_rules.loaded', processor.ruleset_info[:loaded].to_f) -- span.set_tag('_dd.appsec.event_rules.error_count', processor.ruleset_info[:failed].to_f) -- span.set_tag('_dd.appsec.event_rules.errors', JSON.dump(processor.ruleset_info[:errors])) -+ span.set_tag('_dd.appsec.event_rules.loaded', diagnostics['rules']['loaded'].size.to_f) -+ span.set_tag('_dd.appsec.event_rules.error_count', diagnostics['rules']['loaded'].size.to_f) -+ span.set_tag('_dd.appsec.event_rules.errors', JSON.dump(diagnostics['rules']['errors'])) - span.set_tag('_dd.appsec.event_rules.addresses', JSON.dump(processor.addresses)) - - # Ensure these tags reach the backend ---- lib/datadog/appsec/event.rb.orig 2023-08-30 13:30:50 UTC -+++ lib/datadog/appsec/event.rb -@@ -105,7 +105,7 @@ module Datadog - - # accumulate triggers - tags['_dd.appsec.triggers'] ||= [] -- tags['_dd.appsec.triggers'] += event[:waf_result].data -+ tags['_dd.appsec.triggers'] += event[:waf_result].events - end - end - end ---- lib/datadog/appsec/processor.rb.orig 2023-08-30 13:30:50 UTC -+++ lib/datadog/appsec/processor.rb -@@ -43,10 +43,10 @@ module Datadog - end - end - -- attr_reader :ruleset_info, :addresses -+ attr_reader :diagnostics, :addresses - - def initialize(ruleset:) -- @ruleset_info = nil -+ @diagnostics = nil - @addresses = [] - settings = Datadog.configuration.appsec - -@@ -83,7 +83,7 @@ module Datadog - } - - @handle = Datadog::AppSec::WAF::Handle.new(ruleset, obfuscator: obfuscator_config) -- @ruleset_info = @handle.ruleset_info -+ @diagnostics = @handle.diagnostics - @addresses = @handle.required_addresses - - true -@@ -92,7 +92,7 @@ module Datadog - "libddwaf failed to initialize, error: #{e.inspect}" - end - -- @ruleset_info = e.ruleset_info if e.ruleset_info -+ @diagnostics = e.diagnostics if e.diagnostics - - false - rescue StandardError => e