<pre style='margin:0'>
Mohamed Akram (mohd-akram) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8710f8b50bb636b8b4248d7c72ca41ed24a8a371">https://github.com/macports/macports-ports/commit/8710f8b50bb636b8b4248d7c72ca41ed24a8a371</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 8710f8b50bb valkey: update to 8.0.1
</span>8710f8b50bb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8710f8b50bb636b8b4248d7c72ca41ed24a8a371
</span>Author: Mohamed Akram <makr@macports.org>
AuthorDate: Thu Oct 3 18:20:32 2024 +0400
<span style='display:block; white-space:pre;color:#404040;'> valkey: update to 8.0.1
</span>---
databases/valkey/Portfile | 44 +++++++---------------
.../d07c29791a4cecd8bce76b05d046981f39fe5fcd.patch | 32 ----------------
databases/valkey/files/patch-gh-12585.diff | 10 -----
databases/valkey/files/patch-hiredis.diff | 11 ------
databases/valkey/files/patch-remove-brewism.diff | 18 ---------
5 files changed, 13 insertions(+), 102 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/valkey/Portfile b/databases/valkey/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index beb0eaee6fc..9b8b9cb4b02 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/valkey/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/valkey/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,15 +4,14 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup legacysupport 1.1
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup xcode_workaround 1.0
</span> PortGroup makefile 1.0
# clock_gettime
legacysupport.newest_darwin_requires_legacy 15
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup valkey-io valkey 8.0.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup valkey-io valkey 8.0.1
</span> github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories databases
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,45 +24,27 @@ long_description Valkey is an open source (BSD) high-performance key/value \
</span>
homepage https://valkey.io
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 679a69e31bf83efda2de64abe00db5195fd06a05 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f87fef2ba81ae4bce891b874fba58cfde2d19370a3bcac20f0e17498b33c33c0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3624237
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 83a74e4f46ed8355994df46ad9ed09dddaa90d3a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1e1d6dfbed2f932a87afbc7402be050a73974a9b19a9116897e537a6638e5e1d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3625396
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-valkey.conf.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-hiredis.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-gh-12585.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-remove-brewism.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Backport of upstream fix, see: https://github.com/valkey-io/valkey/issues/1051
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/70794
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append d07c29791a4cecd8bce76b05d046981f39fe5fcd.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-valkey.conf.diff
</span>
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/valkey.conf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/deps/hiredis/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/valkey.conf
</span> }
# see ${worksrcpath}/deps/jemalloc/Makefile
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2014
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2014
</span> configure.cxxflags-append -std=c++14
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/59245
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-xcode_workaround.fixed_xcode_version 11.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # valkey and dep makefiles have their own optflags
configure.optflags
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# avoid build conflict with lua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -I${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -isystem${prefix}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string match *gcc* ${configure.compiler}] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && ${configure.build_arch} in [list i386 ppc]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *gcc* ${configure.compiler}] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${configure.build_arch} in [list i386 ppc]} {
</span> # https://github.com/valkey-io/valkey/issues/434
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -latomic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -latomic
</span> }
# valkey doesn't know about CPPFLAGS so pass it this way
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,7 +57,8 @@ build.args-append V=1
</span> build.args-append MALLOC=jemalloc
# enable TLS.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append BUILD_TLS=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append BUILD_TLS=yes OPENSSL_PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args-append OPENSSL_PREFIX=${prefix}
</span> depends_lib path:lib/libssl.dylib:openssl
# prevent conflict with redis
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/valkey/files/d07c29791a4cecd8bce76b05d046981f39fe5fcd.patch b/databases/valkey/files/d07c29791a4cecd8bce76b05d046981f39fe5fcd.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8ab2284b0ff..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/valkey/files/d07c29791a4cecd8bce76b05d046981f39fe5fcd.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,32 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From d07c29791a4cecd8bce76b05d046981f39fe5fcd Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Binbin <binloveplay1314@qq.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 22 Sep 2024 20:20:55 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Use _Thread_local to solve threads.h build issue (#1053)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Apparently this will fail to compile in some masOS version.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-And internet claims _Thread_local is portable.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fixes #1051.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Binbin <binloveplay1314@qq.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/zmalloc.c | 6 +-----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 5 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/zmalloc.c b/src/zmalloc.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7b19107b66..7f9d7f6888 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/zmalloc.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/zmalloc.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -88,11 +88,7 @@ void zlibc_free(void *ptr) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define dallocx(ptr, flags) je_dallocx(ptr, flags)
</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;'>--#if __STDC_NO_THREADS__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define thread_local __thread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <threads.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define thread_local _Thread_local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define MAX_THREADS_NUM (IO_THREADS_MAX_NUM + 3 + 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* A thread-local storage which keep the current thread's index in the used_memory_thread array. */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/valkey/files/patch-gh-12585.diff b/databases/valkey/files/patch-gh-12585.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 82760157fae..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/valkey/files/patch-gh-12585.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/config.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/config.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,6 +31,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define __CONFIG_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define _DARWIN_C_SOURCE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <fcntl.h> // for fcntl(fd, F_FULLFSYNC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/valkey/files/patch-hiredis.diff b/databases/valkey/files/patch-hiredis.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8779cda41fb..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/valkey/files/patch-hiredis.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ur valkey-7.0.0-orig/deps/hivalkey/Makefile valkey-7.0.0/deps/hivalkey/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- deps/hiredis/Makefile 2022-04-27 09:32:17.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ deps/hiredis/Makefile 2022-05-16 15:06:01.193307851 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,6 +22,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_INCLUDE_PATH= $(DESTDIR)$(PREFIX)/$(INCLUDE_PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_LIBRARY_PATH= $(DESTDIR)$(PREFIX)/$(LIBRARY_PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_PKGCONF_PATH= $(INSTALL_LIBRARY_PATH)/$(PKGCONF_PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+OPENSSL_PREFIX=@PREFIX@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # redis-server configuration used for testing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- REDIS_PORT=56379
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/valkey/files/patch-remove-brewism.diff b/databases/valkey/files/patch-remove-brewism.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e540f9c2c62..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/valkey/files/patch-remove-brewism.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ld: warning: directory '/usr/local/opt/openssl/lib' following -L not found
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile 2024-04-16 12:18:47.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile 2024-05-04 12:03:20.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -158,13 +158,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Homebrew's OpenSSL is not linked to /usr/local to avoid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # conflicts with the system's LibreSSL installation so it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # must be referenced explicitly during build.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ifeq ($(uname_M),arm64)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Homebrew arm64 uses /opt/homebrew as HOMEBREW_PREFIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OPENSSL_PREFIX?=/opt/homebrew/opt/openssl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Homebrew x86/ppc uses /usr/local as HOMEBREW_PREFIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OPENSSL_PREFIX?=/usr/local/opt/openssl
</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;'>- ifeq ($(uname_S),AIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # AIX
</span></pre><pre style='margin:0'>
</pre>