From nobody Mon Sep 04 21:31:17 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 4Rfhdx2dZgz4sNc0; Mon, 4 Sep 2023 21:31:17 +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 4Rfhdx1vVWz4s3T; Mon, 4 Sep 2023 21:31:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693863077; 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=ejUdT0LQX2sEPg3XSXjwEzvWMJ38q7szgI8lr3doS8A=; b=xsblDcQwMXjbpZzw+trcVNYvotlsUtyA5YH2hlgo3l45CX6F7xs7pOvXKboPo2o3fMCaO1 7QxShNJv5W9ADRxIWuSIHyXM36kMUsmT36qfUf0UZAnAbt6If7MZGsNucs4iKS4gHg2g8P ZInjhfub7iSLDtBC2PqzHOclhGdj3XWZWyD3N2KhMb/VGFaLt4afcMBU1Rr+KpcxJokHoh TzpfzCXBZzFwiYatAjFg3YFXpfoEUEg4/uEJI0XXfcb1kBdDkPBDJ9u64gIqVE1c0kKxRO w7lX8H4BKma5Zq9CdGfpqnuAFjulKjO9g/rdXR5937fbzWlKYkHMqhS9QRoYOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693863077; a=rsa-sha256; cv=none; b=TC7ze+3rQN+uZVzn5IScM/1I9RsS4c4oNia7OOKhH3psZElicIoJDPPTDiUBJgB00s7lAz jT97zXhhDMJvwTMZ3+P+VopP5JC/hgdusPiXCjg7FP2jYurNN+WQRIb9Hu9KTKkK8a4ZwU z4YPTosacTfTIYXNRMtnDqHHXzfe2kcsmiMFON42Jz9ds7oUTwv+EchFoNZ0dhWRZdQarw 06Wmsttvv/dn+e7gFjCBRDGjqef7mg5yxPiRRJdaZn4gf6ZTQRL0had3OzadlcJrQ0LFC4 mCL9CllvRjRS6pD7FcxJLf4DnJS1mhNdjQnqzmNFj9HzxBCSniCATS6pWzgKOQ== 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=1693863077; 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=ejUdT0LQX2sEPg3XSXjwEzvWMJ38q7szgI8lr3doS8A=; b=OuNPen/k8VjL9K8MaHSjhIsCgi5J/VcAVdB3oyonFa6RUVqPmL1G+WPtI2dRe9/to3QAfx wI9egP4GFHgEvYCuWu2cXUdOJ+y3myjTml3GAUEEWnRKvATihADpQVK3vN0GPCQSvnDybs P10Tmq/dkCG2iKkbu769OE4wEAQNJrIJujZp8GfQz7YyhInnX6u6bFb18Nf9M/hvfM1tWJ QFHTZCSim1l0fGWMrZLyvn8mQuWrbVPA5MRtKSV9KdaUq+tlU0c4r90ViDmedWWMdSwsk4 +GSr3qf4UiLZa2BZChcHdrajbkqOQc5e5iVYls9YGTLbXgPBCVcezvPeI61GKg== 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 4Rfhdx0k4xz1M1N; Mon, 4 Sep 2023 21:31:17 +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 384LVHxv090831; Mon, 4 Sep 2023 21:31:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 384LVHcX090828; Mon, 4 Sep 2023 21:31:17 GMT (envelope-from git) Date: Mon, 4 Sep 2023 21:31:17 GMT Message-Id: <202309042131.384LVHcX090828@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: 65d51f736c81 - main - databases/rocksdb: Update to 8.5.3 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: 65d51f736c81c048cda3ba44c8495f57050f117f Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=65d51f736c81c048cda3ba44c8495f57050f117f commit 65d51f736c81c048cda3ba44c8495f57050f117f Author: Po-Chuan Hsieh AuthorDate: 2023-09-04 21:25:19 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-09-04 21:30:04 +0000 databases/rocksdb: Update to 8.5.3 - Install librocksdb_test.so: it is required by table_reader_bench (rocksdb-8.5.3) /wrkdirs/usr/ports/databases/rocksdb/work/stage//usr/local/bin/table_reader_bench - required shared library librocksdb_test.so not found Changes: https://github.com/facebook/rocksdb/releases --- databases/rocksdb/Makefile | 4 ++-- databases/rocksdb/distinfo | 6 +++--- databases/rocksdb/files/patch-port-stack_trace.cc | 25 +++-------------------- databases/rocksdb/pkg-plist | 1 + 4 files changed, 9 insertions(+), 27 deletions(-) diff --git a/databases/rocksdb/Makefile b/databases/rocksdb/Makefile index a5346a0045c0..ccacf7047a5e 100644 --- a/databases/rocksdb/Makefile +++ b/databases/rocksdb/Makefile @@ -1,5 +1,5 @@ PORTNAME= rocksdb -PORTVERSION= 8.3.2 +PORTVERSION= 8.5.3 DISTVERSIONPREFIX= v CATEGORIES= databases @@ -77,7 +77,7 @@ post-install: # Locate all shared libraries. The STRIP_CMD below failed on our package building clusters. ${FIND} ${WRKSRC} ${STAGEDIR}${PREFIX} -name '*.so*' ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librocksdb.so - ${INSTALL_LIB} ${WRKSRC}/librocksdb_tools.so ${STAGEDIR}${PREFIX}/lib/ + ${INSTALL_LIB} ${WRKSRC}/librocksdb_test.so ${WRKSRC}/librocksdb_tools.so ${STAGEDIR}${PREFIX}/lib/ ${INSTALL_DATA} ${WRKSRC}/make_config.mk ${STAGEDIR}${DATADIR}/ .include diff --git a/databases/rocksdb/distinfo b/databases/rocksdb/distinfo index f560088908c1..50cf0cc20b47 100644 --- a/databases/rocksdb/distinfo +++ b/databases/rocksdb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688166048 -SHA256 (facebook-rocksdb-v8.3.2_GH0.tar.gz) = b55d6da6f562eb79bad7fdc9c368efc9ea4bfa239e69cead37923fc845a43fba -SIZE (facebook-rocksdb-v8.3.2_GH0.tar.gz) = 12713061 +TIMESTAMP = 1693823833 +SHA256 (facebook-rocksdb-v8.5.3_GH0.tar.gz) = ed4230500b9ca20bc7918c32166b2d0d46a8695c59991821daa586d55689d785 +SIZE (facebook-rocksdb-v8.5.3_GH0.tar.gz) = 12764827 diff --git a/databases/rocksdb/files/patch-port-stack_trace.cc b/databases/rocksdb/files/patch-port-stack_trace.cc index 38ed09cc340f..f3d3c09689ae 100644 --- a/databases/rocksdb/files/patch-port-stack_trace.cc +++ b/databases/rocksdb/files/patch-port-stack_trace.cc @@ -1,29 +1,10 @@ ---- port/stack_trace.cc.orig 2023-02-19 21:44:55 UTC +--- port/stack_trace.cc.orig 2023-09-01 20:58:39 UTC +++ port/stack_trace.cc -@@ -33,6 +33,8 @@ void* SaveStack(int* /*num_frames*/, int /*first_frame - +@@ -37,6 +37,7 @@ void* SaveStack(int* /*num_frames*/, int /*first_frame + #endif // OS_OPENBSD #ifdef OS_FREEBSD #include -+#include +#include #endif // OS_FREEBSD #ifdef OS_LINUX #include -@@ -219,7 +221,7 @@ void PrintStack(int first_frames_to_skip) { - void* frames[kMaxFrames]; - - auto num_frames = backtrace(frames, kMaxFrames); -- PrintStack(&frames[first_frames_to_skip], num_frames - first_frames_to_skip); -+ PrintStack(&frames[first_frames_to_skip], (int) (num_frames - first_frames_to_skip)); - } - - void PrintAndFreeStack(void* callstack, int num_frames) { -@@ -232,7 +234,7 @@ void* SaveStack(int* num_frames, int first_frames_to_s - void* frames[kMaxFrames]; - - auto count = backtrace(frames, kMaxFrames); -- *num_frames = count - first_frames_to_skip; -+ *num_frames = (int) (count - first_frames_to_skip); - void* callstack = malloc(sizeof(void*) * *num_frames); - memcpy(callstack, &frames[first_frames_to_skip], sizeof(void*) * *num_frames); - return callstack; diff --git a/databases/rocksdb/pkg-plist b/databases/rocksdb/pkg-plist index 9c8cfde165a7..dd085baa2b37 100644 --- a/databases/rocksdb/pkg-plist +++ b/databases/rocksdb/pkg-plist @@ -123,5 +123,6 @@ lib/librocksdb.so lib/librocksdb.so.8 lib/librocksdb.so.%%SHLIB_VER%% lib/librocksdb.so.%%PORTVERSION%% +lib/librocksdb_test.so lib/librocksdb_tools.so libdata/pkgconfig/rocksdb.pc