<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f847cb2e2d067560fb01d7a526abebf8a34399e3">https://github.com/macports/macports-ports/commit/f847cb2e2d067560fb01d7a526abebf8a34399e3</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 f847cb2e2d0 redis: update to 7.0.0
</span>f847cb2e2d0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f847cb2e2d067560fb01d7a526abebf8a34399e3
</span>Author: David Gilman <davidgilman1@gmail.com>
AuthorDate: Mon May 16 15:18:07 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> redis: update to 7.0.0
</span>---
databases/redis/Portfile | 46 +++++++++--------------------
databases/redis/files/patch-hiredis.diff | 11 +++++++
databases/redis/files/patch-redis.conf.diff | 11 +++----
3 files changed, 31 insertions(+), 37 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/redis/Portfile b/databases/redis/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 54ee136a1c2..03d3946c36d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/redis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/redis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,8 +10,8 @@ PortGroup makefile 1.0
</span> legacysupport.newest_darwin_requires_legacy 15
name redis
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.2.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.0.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories databases
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,14 +25,17 @@ set redis_domain redis.io
</span> homepage https://${redis_domain}
master_sites https://download.${redis_domain}/releases/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 98607041365692d7feb19bf861b4bb32e799047e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5b2b8b7a50111ef395bf1c1d5be11e6e167ac018125055daa8b5c2317ae131ab \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2476542
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e1f5848d301324f6b4acf52cd26e4f36ce6eecd1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 284d8bd1fd85d6a55a05ee4e7c31c31977ad56cbf344ed83790beeb148baa720 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2943054
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-redis.conf.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-redis.conf.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-hiredis.diff
</span>
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/redis.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/redis.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/deps/hiredis/Makefile
</span> }
# see ${worksrcpath}/deps/jemalloc/Makefile
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,26 +59,11 @@ build.args-append REDIS_CFLAGS="${configure.cppflags}"
</span> # disable silent rules
build.args-append V=1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/antirez/redis/issues/7254
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# We have to define environment variables in both
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# build and destroot to work around bugs in the Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# that would cause the destroot's make install to compile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# redis twice.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# use jemalloc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append MALLOC=jemalloc
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach mp_phase {build destroot} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # use jemalloc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${mp_phase}.args-append MALLOC=jemalloc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # enable TLS.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${mp_phase}.args-append BUILD_TLS=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # default values use /usr/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # OpenSSL found with CPATH and LIBRARY_PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${mp_phase}.args-append OPENSSL_CFLAGS= \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENSSL_LDFLAGS=
</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;'>-# more TLS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# enable TLS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append BUILD_TLS=yes
</span> depends_lib path:lib/libssl.dylib:openssl
destroot.keepdirs ${destroot}${prefix}/var/db/redis
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,12 +77,6 @@ post-destroot {
</span> xinstall -m 0644 ${worksrcpath}/${conffile} \
${destroot}${prefix}/etc/${conffile}.sample
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/antirez/redis/pull/3494
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dup_binary {redis-check-aof redis-check-rdb} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/bin/${dup_binary}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s redis-server ${destroot}${prefix}/bin/${dup_binary}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
post-activate {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/redis/files/patch-hiredis.diff b/databases/redis/files/patch-hiredis.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..41dd6cbf29e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/redis/files/patch-hiredis.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ur redis-7.0.0-orig/deps/hiredis/Makefile redis-7.0.0/deps/hiredis/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- deps/hiredis/Makefile 2022-04-27 09:32:17.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ deps/hiredis/Makefile 2022-05-16 15:06:01.193307851 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,6 +22,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALL_INCLUDE_PATH= $(DESTDIR)$(PREFIX)/$(INCLUDE_PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALL_LIBRARY_PATH= $(DESTDIR)$(PREFIX)/$(LIBRARY_PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALL_PKGCONF_PATH= $(INSTALL_LIBRARY_PATH)/$(PKGCONF_PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++OPENSSL_PREFIX=@PREFIX@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # redis-server configuration used for testing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ REDIS_PORT=56379
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/redis/files/patch-redis.conf.diff b/databases/redis/files/patch-redis.conf.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a292185961d..8286c017634 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/redis/files/patch-redis.conf.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/redis/files/patch-redis.conf.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- redis.conf 2021-05-08 18:55:50.641197856 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ redis.conf 2021-05-08 19:01:31.335128791 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -286,7 +286,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ur redis-7.0.0-orig/redis.conf redis-7.0.0/redis.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- redis.conf 2022-04-27 09:32:17.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ redis.conf 2022-05-16 14:17:18.104384198 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -338,7 +338,7 @@
</span> #
# Note that on modern Linux systems "/run/redis.pid" is more conforming
# and should be used instead.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +10,7 @@
</span>
# Specify the server verbosity level.
# This can be one of:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -299,7 +299,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -351,7 +351,7 @@
</span> # Specify the log file name. Also the empty string can be used to force
# Redis to log on the standard output. Note that if you use standard
# output for logging but daemonize, logs will be sent to /dev/null
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +19,7 @@
</span>
# To enable logging to the system logger, just set 'syslog-enabled' to yes,
# and optionally update the other syslog parameters to suit your needs.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -451,7 +451,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -501,7 +501,7 @@
</span> # The Append Only File will also be created inside this directory.
#
# Note that you must specify a directory here, not a file name.
</pre><pre style='margin:0'>
</pre>