aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDima Panov <fluffy@FreeBSD.org>2023-01-24 09:31:45 +0000
committerDima Panov <fluffy@FreeBSD.org>2023-01-24 09:32:17 +0000
commit0abe5fe20a2752a08e737b73d70335d752b3e310 (patch)
treefbf67183955a42f75c688c626b7386fcb493aafa
parent6d9ce49d9243982d78c3004be9e72a0b0e565096 (diff)
downloadports-0abe5fe20a2752a08e737b73d70335d752b3e310.tar.gz
ports-0abe5fe20a2752a08e737b73d70335d752b3e310.zip
net/ceph14: fix build with Boost-1.81
-rw-r--r--net/ceph14/Makefile4
-rw-r--r--net/ceph14/files/patch-src_rgw_rgw_asio_client.cc47
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());