From nobody Wed Sep 06 20:01:38 2023 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 4RgtYZ5Sp0z4sSdQ; Wed, 6 Sep 2023 20:01:38 +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 4RgtYZ53ktz4SN4; Wed, 6 Sep 2023 20:01:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694030498; 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=Xb1xZSbjCYGVxf+AQ65vLjjUb4ZbpUnsvhhCDU0IBt4=; b=x4X5ifMwkEOfY1Qrk+7L5+Yu+bkBiK4llD95eAgjPWM/2weu3KkNZ2TwnYzoK+MVFj4eK4 FYVfYb2qF2edvTPcBE1zt8MBcuyjI5QeKkz2EbgwjW74E29zz9JqOzIyELwdPEa3vCJwap vxUbCRf/JskDY4JNSFWgvWLUrmfjNYOwQQCpxNcd5u/G2ahx85vEtoU6YhrWkYoIvEobse UAVfVFFKjfNQ2k1FdvEkh/v628ioH6ZEVVFKl7z5DmTpVyG2aeEuBv0ExB3sWV6rTZzhBR IZNwkZMfOlY9FnQQ5y8UGHiJ7YjwIr4kngkinSLsUh6s4nrjVXZj/+iElOjTjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694030498; a=rsa-sha256; cv=none; b=ZZfPOe8po+cg9fmZnfKuiRU2HDAVmbviv9WZdzGHNLh8WTnPVMYmPv2pYK6pcQUU2T3lhv 8bQErQ6JoNRDSccX5eVfG4T5SB6kY06bAte2+0Fjnd8VSGMUwfQEDpeF8uMRFudxNnLwP6 CySW1saAkHhbVCNrdhR755+pyOs3GbWb81Frm/he0Y5PYIk8R/6gETkzxx77r7lakx34tX kWDpQOuQ3PYN4q/ry/pJlkSnugW4GrnrM6EqRJ6GA8WVFCaRIpir5rvT21oh5VQZlV4HN5 1ln3tZ44aPirKTT02yqoOb2ucWhfUxnohGd+GUICBqicqErs/P7vNnw+pAEshw== 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=1694030498; 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=Xb1xZSbjCYGVxf+AQ65vLjjUb4ZbpUnsvhhCDU0IBt4=; b=oCbZFvolzNZMInQloCpBGl526L15EZqHZZaEVBVYvS/jICUMXOKQF+aOQVwXA8yn6KyHsf Vrja+PC2RLl4W1UigD3CcNU6S446gFN3q7zuTKhJxy8llpfhamsZfw4c5EcVLT5ndp0Doa 1jlslZYtA5TTgAyRUBvWb9P03Wdq+FZQeHraUyRIiINcFH6uxogg/MFaXboEMnbcQrdsOI VBhO++QkYL0qNKvvPi6rP0r/fU3Fz90aRppgvwZ1dP2lnWRZauMHEui9t6VOdPF0txO84m MMVzml3QpIiwVy8saCj+eNSFL2/mt+Zxfsw57Sn2X3bSXbFrreKN5QIYrectww== 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 4RgtYZ49MxzWLy; Wed, 6 Sep 2023 20:01:38 +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 386K1cfw031053; Wed, 6 Sep 2023 20:01:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386K1cSt031050; Wed, 6 Sep 2023 20:01:38 GMT (envelope-from git) Date: Wed, 6 Sep 2023 20:01:38 GMT Message-Id: <202309062001.386K1cSt031050@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 40989fdf9b57 - 2023Q3 - databases/rocksdb: Update to 8.5.3 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: 40989fdf9b57507d77dbf470b6111250032e91f1 Auto-Submitted: auto-generated The branch 2023Q3 has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=40989fdf9b57507d77dbf470b6111250032e91f1 commit 40989fdf9b57507d77dbf470b6111250032e91f1 Author: Po-Chuan Hsieh AuthorDate: 2023-09-04 21:25:19 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-09-06 20:01:21 +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 (cherry picked from commit 65d51f736c81c048cda3ba44c8495f57050f117f) --- 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