From nobody Mon Jan 8 17:53:29 2024 X-Original-To: dev-commits-ports-all@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 4T81rT5Pckz56GF0; Mon, 8 Jan 2024 17:53:29 +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 4T81rT4Vtlz3y5v; Mon, 8 Jan 2024 17:53:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704736409; 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=QPKvU0hTlE8RlbC8c0Ln1RWHTdIbye5IqifqqtUSTsk=; b=g8JwFM/o6HvijXkc5mcCVKigV4iEXkglIUY+cbEDhbj5eNHHdz98wkMPN476q2MoGZK6a+ OvnaUJEFVinZHi89PKQIklEhdTkA5rpWiX8WnW+uDXqVbgyGSCb0Ta0mLERhJRKgxLyuAq gRoWD5wMjRFUmZwwM5O9YtG0V/JI96eYrsImZlyAMTB/nIci7bK1q1Epk9UID/3BjnWnz0 pccEYJ9jr8yC3s+J2EsDUDAtXWHvxDEWq3ch8LlxSoO6aRdCZ0bsZsM90LD3JZcWdtc7vf UEmxlPJ+5IiH0Shyqmeuiy9PR3MkqvguwBj0icX+8K7odNIwXrFsePkA5OiKOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704736409; 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=QPKvU0hTlE8RlbC8c0Ln1RWHTdIbye5IqifqqtUSTsk=; b=OnJZyULnNLLuLDXutCMF3SOJjNm3FuZQWdHvcEz3/qRg838aK1lajHuTSioXbGV5H8TNNB agWkYPPsy6RdIW3ltzWSfE5EznPU+GCx4Fx/grtO8fdfNA/7mrWoBJWdyCGlH2Yq6f2WLj rzGEL+6SY5lb+7ISH6NT0gWE8CTryxArcFcFJtCy/4BQLxRyuANxdSO8UvOs7ZsBzehVtp vD8S3h3PIDObu8NQ+rpaLmJMvMrRUIOIr9F4Uf4Ulan5bfOqOL0FYqsfiwpMAqRoC3tpfI KZ5WtiKhJ/hWBLsjhmEzS5satQSPMZHC3ZhfFo19Q9HP7ZFcGIVRJ/zbakf1+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704736409; a=rsa-sha256; cv=none; b=GlRXVWhc6XNFAkj0H/oFh2cLHaYMa9t5NSWwj/r7a0AYGLKF6iw3oB8HU946gzHOqzmlze sY3YceCMtq4ic7wtDJ4ZBxsOk8noL6gILNU64U1Xi508wt0YUvvXqj+d3TPwKYA7B3tKTH PyINIInHXteHLNo+ZoJkHLE73ogLR2u6QHQOuSRrD6QGLtyIKpDzvri4fFG3vTYH4qxptv dL3kO90LBemYB8WCERO9Wi5F890eotFPemyMlRDNI5FO+D+VOUZGM7suzsQbbCw9qbRjUS 4OawNtt0SfRC7jyg1FubksfJQF7WAeVR0OK/Uvf5qZIM8Z2j3m8CBwNZcAjfGg== 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 4T81rT3GJCzHWV; Mon, 8 Jan 2024 17:53:29 +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 408HrTPc055272; Mon, 8 Jan 2024 17:53:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 408HrTFQ055269; Mon, 8 Jan 2024 17:53:29 GMT (envelope-from git) Date: Mon, 8 Jan 2024 17:53:29 GMT Message-Id: <202401081753.408HrTFQ055269@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: 6cbfd8b1e7dc - main - devel/cpprestsdk: Fix include of json.h List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6cbfd8b1e7dc89a48a126867b180813df46c19e4 Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=6cbfd8b1e7dc89a48a126867b180813df46c19e4 commit 6cbfd8b1e7dc89a48a126867b180813df46c19e4 Author: Jan-Espen Oversand AuthorDate: 2024-01-08 08:33:05 +0000 Commit: Fernando Apesteguía CommitDate: 2024-01-08 17:53:11 +0000 devel/cpprestsdk: Fix include of json.h De-inlining the constructor and destructor makes the sizeof(_Value) available to std::unique_ptr. PR: 276187 Reported by: sigsegv@radiotube.org --- devel/cpprestsdk/Makefile | 1 + devel/cpprestsdk/files/patch-include_cpprest_json.h | 20 ++++++++++++++++++++ devel/cpprestsdk/files/patch-src_json_json.cpp | 19 +++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/devel/cpprestsdk/Makefile b/devel/cpprestsdk/Makefile index e93798effc69..f73e97728de1 100644 --- a/devel/cpprestsdk/Makefile +++ b/devel/cpprestsdk/Makefile @@ -1,5 +1,6 @@ PORTNAME= cpprestsdk PORTVERSION= 2.10.18 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= devel diff --git a/devel/cpprestsdk/files/patch-include_cpprest_json.h b/devel/cpprestsdk/files/patch-include_cpprest_json.h new file mode 100644 index 000000000000..befe51ab04d4 --- /dev/null +++ b/devel/cpprestsdk/files/patch-include_cpprest_json.h @@ -0,0 +1,20 @@ +--- include/cpprest/json.h.orig 2023-12-05 04:23:31 UTC ++++ include/cpprest/json.h +@@ -737,12 +737,13 @@ class value (private) + _ASYNCRTIMP void format(std::basic_string& string) const; + + #ifdef ENABLE_JSON_VALUE_VISUALIZER +- explicit value(std::unique_ptr v, value_type kind) : m_value(std::move(v)), m_kind(kind) ++ explicit value(std::unique_ptr v, value_type kind); + #else +- explicit value(std::unique_ptr v) : m_value(std::move(v)) ++ explicit value(std::unique_ptr v); + #endif +- { +- } ++public: ++ ~value() noexcept; ++private: + + std::unique_ptr m_value; + #ifdef ENABLE_JSON_VALUE_VISUALIZER diff --git a/devel/cpprestsdk/files/patch-src_json_json.cpp b/devel/cpprestsdk/files/patch-src_json_json.cpp new file mode 100644 index 000000000000..2663b990b4a6 --- /dev/null +++ b/devel/cpprestsdk/files/patch-src_json_json.cpp @@ -0,0 +1,19 @@ +--- src/json/json.cpp.orig 2023-12-05 04:23:31 UTC ++++ src/json/json.cpp +@@ -495,3 +495,16 @@ const web::json::details::json_error_category_impl& we + #endif + return instance; + } ++ ++#ifdef ENABLE_JSON_VALUE_VISUALIZER ++web::json::value::value(std::unique_ptr v, value_type kind) : m_value(std::move(v) ++), m_kind(kind) ++#else ++web::json::value::value(std::unique_ptr v) : m_value(std::move(v)) ++#endif ++{ ++} ++ ++web::json::value::~value() noexcept ++{ ++}