From nobody Tue Jan 24 09:32:25 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 4P1MFP4Hyhz312Yw; Tue, 24 Jan 2023 09:32:25 +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 4P1MFP3nTpz3qcy; Tue, 24 Jan 2023 09:32:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674552745; 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=78RVcB7bE5lg+SwIZWB6TCTP4tMdSHsy1BVwvP+9nW8=; b=WW9nO4AEX5KY1pCBOgL3uXco/KRqIfHTJWLOWF75rJt00Zi2cJffs4nH1DdjehwU8SWFrp aZ4WG2/Xx49e/7Ua0FwkrJBOk9P56Cz8TQFUBqQPxXJzHIBNBg4MR7NcvSZzcrpwKRyvjS 5k5HBed0H21xth8DEKdSYc09YOL1TjF2FqwJGQ6TosWvtY4v2zW/t33c4aAht7HrFrclOZ dYTG+1FZLBUPn59W6LFc55WdtajuAluLKSQiF85FQw3xASHBBxisyDB781oFg+41D29LX3 1SO07bptSzRWmEzOtUUVprHfy/uHBaERmX88k3gyq2du6ppXvmShJX9JpFFSuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674552745; 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=78RVcB7bE5lg+SwIZWB6TCTP4tMdSHsy1BVwvP+9nW8=; b=KlVh/jrXZhyq101u6WnabX5zHaxPgF0La7dHztDhSzZ+bJEe9Qm9yQyq2O7y402L6qSqkd jFbpBlqs9OILdv/PSMjlxfznUuA9uL+aOq2LuUZG1xJtj9A9lkQaN0tLjuZVhVR08P00D7 zjtDr8jBajQvtzYKBxVW1O6Z3buL2JbpA3bQWATeCeCkicHA3RIP0ce1YLGokCDbIdmBeF snCuzI3u1uxto6bFqrbwhXvD8DJfY122IlIj6nm43bgRaxZ/FLI6nUqvwX+PO8qSQlHLE1 Wm1ShSWUN96P9InRWHcIe5zHx2djsDSJ8n6IrYR5joII60UMPNt/9WJZt3tP0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674552745; a=rsa-sha256; cv=none; b=HqHFzcCWpnkdUfsTw4+76nWEsVqQITmtUjdG81bRwWsRq7cW+V9UZND+8NxBwqDbIh7mEH TT7zeE4uuzy4R4hwVdxGV/K+Y/Tvm29gezNDFUyfuMqo5EBijbOwqfNofp9x/7TIPEp8VH jbetx/0GZDLjwX3XNftmKo2wP6WCynUlqJrhbyO9oIKBG+IHR9id6NlajRADLCl+03T9bl dRESfNVrQQwRvrST6ESLL9ibB6NnP+G52iXdmIpAVuXg+h2UA4YhGl3aevHgFb+zAUNKKt iIEe2+ILcFnvwTPjTjWj5vc9AnuNKZqvODCWUi/yVBmy/jfD951nrFKGSO4Aiw== 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 4P1MFP2sBRz14VH; Tue, 24 Jan 2023 09:32:25 +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 30O9WP4K093410; Tue, 24 Jan 2023 09:32:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30O9WPJI093409; Tue, 24 Jan 2023 09:32:25 GMT (envelope-from git) Date: Tue, 24 Jan 2023 09:32:25 GMT Message-Id: <202301240932.30O9WPJI093409@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 0abe5fe20a27 - main - net/ceph14: fix build with Boost-1.81 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: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0abe5fe20a2752a08e737b73d70335d752b3e310 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=0abe5fe20a2752a08e737b73d70335d752b3e310 commit 0abe5fe20a2752a08e737b73d70335d752b3e310 Author: Dima Panov AuthorDate: 2023-01-24 09:31:45 +0000 Commit: Dima Panov CommitDate: 2023-01-24 09:32:17 +0000 net/ceph14: fix build with Boost-1.81 --- net/ceph14/Makefile | 4 +- net/ceph14/files/patch-src_rgw_rgw_asio_client.cc | 47 +++++++++++++++++++++++ 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/net/ceph14/Makefile b/net/ceph14/Makefile index d23cce34450f..ecc4bf269f0a 100644 --- a/net/ceph14/Makefile +++ b/net/ceph14/Makefile @@ -1,7 +1,7 @@ PORTNAME= ceph DISTVERSIONPREFIX= v DISTVERSION= 14.2.22 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= net PKGNAMESUFFIX= 14 @@ -12,8 +12,6 @@ WWW= https://ceph.com/ LICENSE= GPLv2 LGPL3 LICENSE_COMB= dual -BROKEN= Not compatible with Boost-1.81 - # even though i386 will build, it is not really advised. ONLY_FOR_ARCHS= amd64 powerpc64 powerpc64le diff --git a/net/ceph14/files/patch-src_rgw_rgw_asio_client.cc b/net/ceph14/files/patch-src_rgw_rgw_asio_client.cc new file mode 100644 index 000000000000..66169dadb329 --- /dev/null +++ b/net/ceph14/files/patch-src_rgw_rgw_asio_client.cc @@ -0,0 +1,47 @@ +--- src/rgw/rgw_asio_client.cc.orig 2021-06-29 22:09:10 UTC ++++ src/rgw/rgw_asio_client.cc +@@ -39,11 +39,11 @@ int ClientIO::init_env(CephContext *cct) + const auto& value = header->value(); + + if (field == beast::http::field::content_length) { +- env.set("CONTENT_LENGTH", value.to_string()); ++ env.set("CONTENT_LENGTH", value); + continue; + } + if (field == beast::http::field::content_type) { +- env.set("CONTENT_TYPE", value.to_string()); ++ env.set("CONTENT_TYPE", value); + continue; + } + +@@ -60,25 +60,25 @@ int ClientIO::init_env(CephContext *cct) + } + *dest = '\0'; + +- env.set(buf, value.to_string()); ++ env.set(buf, value); + } + + int major = request.version() / 10; + int minor = request.version() % 10; + env.set("HTTP_VERSION", std::to_string(major) + '.' + std::to_string(minor)); + +- env.set("REQUEST_METHOD", request.method_string().to_string()); ++ env.set("REQUEST_METHOD", request.method_string()); + + // split uri from query + auto url = request.target(); + auto pos = url.find('?'); + if (pos != url.npos) { + auto query = url.substr(pos + 1); +- env.set("QUERY_STRING", query.to_string()); ++ env.set("QUERY_STRING", query); + url = url.substr(0, pos); + } +- env.set("REQUEST_URI", url.to_string()); +- env.set("SCRIPT_URI", url.to_string()); /* FIXME */ ++ env.set("REQUEST_URI", url); ++ env.set("SCRIPT_URI", url); /* FIXME */ + + char port_buf[16]; + snprintf(port_buf, sizeof(port_buf), "%d", local_endpoint.port());