<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/20541af0165b5b696a5930fedbc53d85b1343f7b">https://github.com/macports/macports-ports/commit/20541af0165b5b696a5930fedbc53d85b1343f7b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 20541af0165 duckdb: update to 0.10.1
</span>20541af0165 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 20541af0165b5b696a5930fedbc53d85b1343f7b
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Tue Mar 19 14:50:28 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> duckdb: update to 0.10.1
</span>---
databases/duckdb/Portfile | 12 +++---
.../duckdb/files/fix-libproc-for-older-macOS.patch | 48 ----------------------
.../duckdb/files/no-default-tarball-version.patch | 16 --------
3 files changed, 5 insertions(+), 71 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/duckdb/Portfile b/databases/duckdb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index eb826ccf4cb..4602efcf2c1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/duckdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/duckdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup github 1.0
</span> PortGroup legacysupport 1.0
PortGroup openssl 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup cwida duckdb 0.10.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup cwida duckdb 0.10.1 v
</span> github.tarball_from archive
revision 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,13 +27,11 @@ license MIT
</span> maintainers {gmail.com:herby.gillot @herbygillot} \
openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 692c7857b78c53486dc06d1327c5a00b9ea44dbb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5a925b8607d00a97c1a3ffe6df05c0a62a4df063abd022ada82ac1e917792013 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 79037968
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 32448c6f570da3e43e048214894771895f789f52 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 83bd4944c070fd0bd287fbe62919fa887f35d7422ba0fa66e13d4ed098f3791a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 79870693
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append no-ccache.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- no-default-tarball-version.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fix-libproc-for-older-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append no-ccache.patch
</span>
configure.args-append \
-DBUILD_PARQUET_EXTENSION=TRUE \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/duckdb/files/fix-libproc-for-older-macOS.patch b/databases/duckdb/files/fix-libproc-for-older-macOS.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0c25186e549..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/duckdb/files/fix-libproc-for-older-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,48 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 16acae07aebc8259dd21551f19d355f15c61dd99 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 20 Feb 2024 06:50:32 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] local_file_system.cpp: minor fix for macOS libproc code
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Content-Type: text/plain; charset=UTF-8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Recent commit has broken duckdb build on macOS < 10.7: https://github.com/duckdb/duckdb/commit/23112e9aa344905c2d2a0d1cb696c5f73c329534
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Add a fallback to fix it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-See also get_ppid_of.c in gettext’s libtextstyle.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/common/local_file_system.cpp | 15 +++++++++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 15 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/common/local_file_system.cpp src/common/local_file_system.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index bbca902a28..14903303e6 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/common/local_file_system.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/common/local_file_system.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -188,6 +188,8 @@ static string AdditionalProcessInfo(FileSystem &fs, pid_t pid) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- string process_name, process_owner;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// macOS >= 10.7 has PROC_PIDT_SHORTBSDINFO
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined PROC_PIDT_SHORTBSDINFO
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // try to find out more about the process holding the lock
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct proc_bsdshortinfo proc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (proc_pidinfo(pid, PROC_PIDT_SHORTBSDINFO, 0, &proc, PROC_PIDT_SHORTBSDINFO_SIZE) ==
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -199,6 +201,19 @@ static string AdditionalProcessInfo(FileSystem &fs, pid_t pid) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- process_owner = pw->pw_name;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Fallback code for older versions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // try to find out more about the process holding the lock
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct proc_bsdinfo proc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (proc_pidinfo(pid, PROC_PIDTBSDINFO, 0, &proc, 128) == 128) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ process_name = proc.pbi_comm; // only a short version however, let's take it in case proc_pidpath() below fails
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // try to get actual name of conflicting process owner
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ auto pw = getpwuid(proc.pbi_uid);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (pw) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ process_owner = pw->pw_name;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // try to get a better process name (full path)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char full_exec_path[PROC_PIDPATHINFO_MAXSIZE];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (proc_pidpath(pid, full_exec_path, PROC_PIDPATHINFO_MAXSIZE) > 0) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/duckdb/files/no-default-tarball-version.patch b/databases/duckdb/files/no-default-tarball-version.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3d5f3fcaf94..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/duckdb/files/no-default-tarball-version.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./CMakeLists.txt 2023-10-11 07:39:00
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./CMakeLists.txt 2023-10-11 07:39:39
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -282,13 +282,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- math(EXPR DUCKDB_PATCH_VERSION "${DUCKDB_PATCH_VERSION}+1")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(DUCKDB_VERSION "v${DUCKDB_MAJOR_VERSION}.${DUCKDB_MINOR_VERSION}.${DUCKDB_PATCH_VERSION}-dev${DUCKDB_DEV_ITERATION}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # fallback for when building from tarball
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(DUCKDB_MAJOR_VERSION 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(DUCKDB_MINOR_VERSION 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(DUCKDB_PATCH_VERSION 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(DUCKDB_DEV_ITERATION 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(DUCKDB_VERSION "v${DUCKDB_MAJOR_VERSION}.${DUCKDB_MINOR_VERSION}.${DUCKDB_PATCH_VERSION}-dev${DUCKDB_DEV_ITERATION}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- message(STATUS "git hash ${GIT_COMMIT_HASH}, version ${DUCKDB_VERSION}")
</span></pre><pre style='margin:0'>
</pre>