<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5c99dee1c2bbcafb4c209e1c5bdf2040657e7ecf">https://github.com/macports/macports-ports/commit/5c99dee1c2bbcafb4c209e1c5bdf2040657e7ecf</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5c99dee1c2bbcafb4c209e1c5bdf2040657e7ecf
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Apr 23 01:12:27 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> memcached: Update to 1.5.22
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> And add cyrus-sasl2 dependency to sasl variant.
</span>---
sysutils/memcached/Portfile | 14 +++++++-------
sysutils/memcached/files/patch-configure.diff | 13 +++++++------
sysutils/memcached/files/patch-util.h.diff | 11 +++++++++++
3 files changed, 25 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/memcached/Portfile b/sysutils/memcached/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b0dda4a3e82..d02e2806ba3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/memcached/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/memcached/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,11 +7,13 @@ name memcached
</span> conflicts memcached-devel
set my_name memcached
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.5.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.5.22
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f20cae2f82863ebbc83031d3bf5d00e8e1b361c1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c2b47e9d20575a2367087c229636ffc3fb699a6c3a7f3a22f44402f25f5f1f93 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 532713
</span>
categories sysutils
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license BSD
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,10 +29,6 @@ dist_subdir ${my_name}
</span>
installs_libs no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 4e08d75aa285daa57d5999a2624785c4734599b0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 494c060dbd96d546c74ab85a3cc3984d009b4423767ac33e05dd2340c01f1c4b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 465169
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args --with-libevent=${prefix} \
ac_cv_search_umem_cache_create=no \
ac_cv_header_umem_h=no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,11 +36,13 @@ configure.args --with-libevent=${prefix} \
</span> depends_lib port:libevent
patchfiles-append patch-configure.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-util.h.diff
</span>
startupitem.create yes
startupitem.executable ${prefix}/bin/memcached -u nobody -m 64 -c 10240 -p 11211
variant sasl description {enable SASL authentication} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:cyrus-sasl2
</span> configure.args-append --enable-sasl
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/memcached/files/patch-configure.diff b/sysutils/memcached/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 072ec4c7425..c41a30db52d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/memcached/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/memcached/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2018-05-25 09:35:49.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2018-06-04 04:30:00.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6640,7 +6640,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Do not use -Werror.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2020-02-01 23:03:31.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2022-04-23 00:44:36.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7245,7 +7245,7 @@
</span> elif test "$GCC" = "yes"
then
GCC_VERSION=`$CC -dumpversion`
- CFLAGS="$CFLAGS -Wall -Werror -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls"
+ CFLAGS="$CFLAGS -Wall -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- case $GCC_VERSION in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4.4.*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="$CFLAGS -fno-strict-aliasing"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$enable_asan" = "xyes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS="$CFLAGS -fsanitize=address"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/memcached/files/patch-util.h.diff b/sysutils/memcached/files/patch-util.h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7940650e280
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/memcached/files/patch-util.h.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;'>+Fix redefinition of htonll and consequent build failure on macOS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/memcached/memcached/issues/598
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/memcached/memcached/commit/95c67710aaf5cfe188d94b510faef8c66d6f5604
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- util.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ util.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "config.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* fast-enough functions for uriencoding strings. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void uriencode_init(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool uriencode(const char *src, char *dst, const size_t srclen, const size_t dstlen);
</span></pre><pre style='margin:0'>
</pre>