<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8209fd0cfb7db46c4efb61ce73544b78f35842b5">https://github.com/macports/macports-ports/commit/8209fd0cfb7db46c4efb61ce73544b78f35842b5</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 8209fd0 redis: update to 6.0.1
</span>8209fd0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8209fd0cfb7db46c4efb61ce73544b78f35842b5
</span>Author: David Gilman <davidgilman1@gmail.com>
AuthorDate: Fri May 15 11:22:46 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> redis: update to 6.0.1
</span>---
databases/redis/Portfile | 63 ++++++++++++++++++-----------
databases/redis/files/patch-redis.conf.diff | 38 ++++++++++++-----
2 files changed, 68 insertions(+), 33 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 544219f..0877233 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;'>@@ -3,9 +3,10 @@
</span> PortSystem 1.0
PortGroup muniversal 1.0
PortGroup xcode_workaround 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup makefile 1.0
</span>
name redis
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.0.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.0.1
</span> categories databases
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,9 +19,9 @@ long_description {*}${description}
</span> homepage https://redis.io/
master_sites http://download.redis.io/releases/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 91bb5a283b0a040aeb67dcab954a7c1b85490e3b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f3c7eac42f433326a8d981b50dba0169fdfaf46abb23fcda2f933a7552ee4ed7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1985757
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b6b3c04aa80bf8df6ff0476482c3cb929bc102c2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b8756e430479edc162ba9c44dc89ac394316cd482f2dc6b91bcd5fe12593f273 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2204138
</span>
patchfiles patch-redis.conf.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,27 +43,31 @@ if {[string match *clang* ${configure.cxx}]} {
</span> configure.cxx-append -stdlib=${configure.cxx_stdlib}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cc-append -isysroot${configure.sdkroot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxx-append -isysroot${configure.sdkroot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# redis and dep makefiles have their own optflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.optflags
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC="${configure.cc} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX="${configure.cxx} [get_canonical_archflags cxx]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch ${configure.universal_archs} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_build_args(${arch}) CC='${configure.cc} -arch ${arch}' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX='${configure.cxx} -arch ${arch}'
</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:#e0ffe0;'>+# redis doesn't know about CPPFLAGS so pass it this way
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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;'>-# use jemalloc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append MALLOC=jemalloc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/antirez/redis/issues/7254
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# We have to define environment variables in both
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# build and destroot to work around bugs in the Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# that would cause the destroot's make install to compile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# redis twice.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach mp_phase {build destroot} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use jemalloc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${mp_phase}.args-append MALLOC=jemalloc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # enable TLS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${mp_phase}.args-append BUILD_TLS=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# more TLS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:openssl
</span>
destroot.keepdirs ${destroot}${prefix}/var/db/redis
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,13 +80,23 @@ if {![variant_isset universal]} {
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 ${worksrcpath}/redis.conf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/etc/redis.conf.sample
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach conffile {redis.conf sentinel.conf} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${worksrcpath}/${conffile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/etc/${conffile}.sample
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/antirez/redis/pull/3494
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dup_binary {redis-check-aof redis-check-rdb} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/bin/${dup_binary}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s redis-server ${destroot}${prefix}/bin/${dup_binary}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists ${prefix}/etc/redis.conf]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${prefix}/etc/redis.conf.sample ${prefix}/etc/redis.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach conffile {redis.conf sentinel.conf} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${prefix}/etc/${conffile}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${prefix}/etc/${conffile}.sample ${prefix}/etc/${conffile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
xinstall -d ${prefix}/var/log
touch ${prefix}/var/log/redis.log
<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 2d1c59b..0bfbec6 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,29 +1,49 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- redis.conf.orig 2017-07-14 11:28:42.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ redis.conf 2017-07-14 15:43:39.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -155,7 +155,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- redis.conf.orig 2020-05-14 09:42:51.094603573 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ redis.conf 2020-05-14 09:50:15.671701491 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -224,7 +224,7 @@
</span> #
# Creating a pid file is best effort: if Redis is not able to create it
# nothing bad happens, the server will start and run normally.
-pidfile /var/run/redis_6379.pid
+pidfile @PREFIX@/var/run/redis_6379.pid
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Specify the server verbosity level.
# This can be one of:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -168,7 +168,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -237,7 +237,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
-logfile ""
+logfile @PREFIX@/var/log/redis.log
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>-@@ -260,7 +260,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -342,7 +342,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.
-dir ./
+dir @PREFIX@/var/db/redis
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> ################################# REPLICATION #################################
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.orig 2020-05-14 12:03:25.183608552 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile 2020-05-14 12:03:51.752513404 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -103,8 +103,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(uname_S),Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FINAL_LIBS+= -ldl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- OPENSSL_CFLAGS=-I/usr/local/opt/openssl/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- OPENSSL_LDFLAGS=-L/usr/local/opt/openssl/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(uname_S),AIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # AIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -182,8 +180,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(BUILD_TLS),yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FINAL_CFLAGS+=-DUSE_OPENSSL $(OPENSSL_CFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FINAL_LDFLAGS+=$(OPENSSL_LDFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FINAL_CFLAGS+=-DUSE_OPENSSL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a -lssl -lcrypto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span></pre><pre style='margin:0'>
</pre>