Date: Wed, 17 May 2023 04:53:17 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 5c77d2548047 - main - databases/memcached: Update version 1.6.14=>1.6.20 Message-ID: <202305170453.34H4rHWv044914@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=5c77d25480473e8fd9bd3a50b8a3e8c0cefead2b commit 5c77d25480473e8fd9bd3a50b8a3e8c0cefead2b Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2023-05-16 19:13:55 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2023-05-17 04:53:03 +0000 databases/memcached: Update version 1.6.14=>1.6.20 Changelog: https://github.com/memcached/memcached/wiki/ReleaseNotes1620 --- databases/memcached/Makefile | 31 ++++++++++++---------------- databases/memcached/distinfo | 6 +++--- databases/memcached/files/patch-configure.ac | 13 ++---------- databases/memcached/files/patch-memcached.c | 18 ++++++++-------- databases/memcached/files/patch-xxhash.h | 4 ++-- 5 files changed, 29 insertions(+), 43 deletions(-) diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile index 9e8a5f11f592..52eafa54592d 100644 --- a/databases/memcached/Makefile +++ b/databases/memcached/Makefile @@ -1,5 +1,5 @@ PORTNAME= memcached -PORTVERSION= 1.6.14 +PORTVERSION= 1.6.20 CATEGORIES= databases MASTER_SITES= http://www.memcached.org/files/ \ GENTOO @@ -13,50 +13,45 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libevent.so:devel/libevent -USES= autoreconf cpe shebangfix -SHEBANG_FILES= scripts/memcached-tool - +USES= autoreconf cpe pkgconfig shebangfix +USE_CSTD= c99 USE_RC_SUBR= memcached -SUB_LIST+= RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX} -USE_CSTD= c99 +SHEBANG_FILES= scripts/memcached-tool + GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-coverage \ --program-prefix= \ --with-libevent=${LOCALBASE} +MAKE_JOBS_UNSAFE= yes + +SUB_LIST+= RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX} + # Dtrace option disabled until it is fixed upstream OPTIONS_DEFINE= DOCS SASL -OPTIONS_DEFAULT= SASL OPTIONS_DEFINE_amd64= DTRACE -OPTIONS_DEFAULT_amd64= DTRACE OPTIONS_DEFINE_powerpc64= DTRACE +OPTIONS_DEFINE_powerpc64le= DTRACE +OPTIONS_DEFAULT= SASL +OPTIONS_DEFAULT_amd64= DTRACE OPTIONS_DEFAULT_powerpc64= DTRACE +OPTIONS_DEFAULT_powerpc64le= DTRACE OPTIONS_EXCLUDE_powerpc64= ${OPTIONS_EXCLUDE_${ARCH}_${OSREL:R}} OPTIONS_EXCLUDE_powerpc64_12= DTRACE -OPTIONS_DEFINE_powerpc64le= DTRACE -OPTIONS_DEFAULT_powerpc64le= DTRACE - -.if !exists(/usr/sbin/dtrace) -OPTIONS_EXCLUDE+= DTRACE -.endif DTRACE_DESC= Enable dtrace probes SASL_DESC= Enable SASL Authentication DOCS_BUILD_DEPENDS= xml2rfc:textproc/xml2rfc DOCS_CONFIGURE_ENABLE= docs - DTRACE_CONFIGURE_ENABLE= dtrace - SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASL_CONFIGURE_ENABLE= sasl SASL_CFLAGS= -I${LOCALBASE}/include SASL_CPPFLAGS+= ${CFLAGS} SASL_LDFLAGS= -L${LOCALBASE}/lib -MAKE_JOBS_UNSAFE= yes - .include <bsd.port.pre.mk> .if ${OPSYS} == FreeBSD diff --git a/databases/memcached/distinfo b/databases/memcached/distinfo index 8fea473f2146..ab803fe04a22 100644 --- a/databases/memcached/distinfo +++ b/databases/memcached/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1647126672 -SHA256 (memcached-1.6.14.tar.gz) = 54d63742c6886dcdc4e0c87f4439a2930a876cd9f2bfa01d699b0c6bad1707b3 -SIZE (memcached-1.6.14.tar.gz) = 1034514 +TIMESTAMP = 1684261463 +SHA256 (memcached-1.6.20.tar.gz) = 8f604f8e3a175637dc1f069de6fa2739116850c9f81e3764f2fac9a3b27be307 +SIZE (memcached-1.6.20.tar.gz) = 2615902 diff --git a/databases/memcached/files/patch-configure.ac b/databases/memcached/files/patch-configure.ac index 81b0024fee3a..bfe9ca6ef3d7 100644 --- a/databases/memcached/files/patch-configure.ac +++ b/databases/memcached/files/patch-configure.ac @@ -1,6 +1,6 @@ ---- configure.ac.orig 2020-11-21 00:10:41 UTC +--- configure.ac.orig 2023-03-08 21:34:27 UTC +++ configure.ac -@@ -182,7 +182,7 @@ if test "x$enable_dtrace" = "xyes"; then +@@ -201,7 +201,7 @@ if test "x$enable_dtrace" = "xyes"; then if test "x$DTRACE" != "xno"; then AC_DEFINE([ENABLE_DTRACE],1,[Set to nonzero if you want to include DTRACE]) build_dtrace=yes @@ -9,12 +9,3 @@ if test $? -eq 0 then dtrace_instrument_obj=yes -@@ -793,7 +793,7 @@ then - 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" - if test "x$enable_asan" = "xyes"; then - CFLAGS="$CFLAGS -fsanitize=address" - fi diff --git a/databases/memcached/files/patch-memcached.c b/databases/memcached/files/patch-memcached.c index daedd4c1c45c..7e248161d68f 100644 --- a/databases/memcached/files/patch-memcached.c +++ b/databases/memcached/files/patch-memcached.c @@ -1,6 +1,6 @@ ---- memcached.c.orig 2020-11-21 00:10:41 UTC +--- memcached.c.orig 2023-03-08 21:34:27 UTC +++ memcached.c -@@ -676,7 +676,7 @@ conn *conn_new(const int sfd, enum conn_states init_st +@@ -707,7 +707,7 @@ conn *conn_new(const int sfd, enum conn_states init_st if (init_state == conn_listening) { fprintf(stderr, "<%d server listening (%s)\n", sfd, prot_text(c->protocol)); @@ -9,7 +9,7 @@ fprintf(stderr, "<%d server listening (udp)\n", sfd); } else if (c->protocol == negotiating_prot) { fprintf(stderr, "<%d new auto-negotiating client connection\n", -@@ -736,7 +736,7 @@ conn *conn_new(const int sfd, enum conn_states init_st +@@ -772,7 +772,7 @@ conn *conn_new(const int sfd, enum conn_states init_st c->write = tcp_write; } @@ -18,7 +18,7 @@ c->try_read_command = try_read_command_udp; } else { switch (c->protocol) { -@@ -820,7 +820,7 @@ static void conn_cleanup(conn *c) { +@@ -871,7 +871,7 @@ static void conn_cleanup(conn *c) { c->sasl_conn = NULL; } @@ -27,7 +27,7 @@ conn_set_state(c, conn_read); } } -@@ -1116,7 +1116,7 @@ bool resp_start(conn *c) { +@@ -1171,7 +1171,7 @@ bool resp_start(conn *c) { c->resp->next = resp; c->resp = resp; } @@ -36,7 +36,7 @@ // need to hold on to some data for async responses. c->resp->request_id = c->request_id; c->resp->request_addr = c->request_addr; -@@ -2046,7 +2046,7 @@ void process_stats_conns(ADD_STAT add_stats, void *c) +@@ -2166,7 +2166,7 @@ void process_stats_conns(ADD_STAT add_stats, void *c) * output -- not worth the complexity of the locking that'd be * required to prevent it. */ @@ -45,7 +45,7 @@ APPEND_NUM_STAT(i, "UDP", "%s", "UDP"); } if (conns[i]->state != conn_closed) { -@@ -3242,7 +3242,7 @@ static void drive_machine(conn *c) { +@@ -3361,7 +3361,7 @@ static void drive_machine(conn *c) { break; case conn_closing: @@ -54,7 +54,7 @@ conn_cleanup(c); else conn_close(c); -@@ -3425,7 +3425,7 @@ static int server_socket(const char *interface, +@@ -3552,7 +3552,7 @@ static int server_socket(const char *interface, #endif setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, (void *)&flags, sizeof(flags)); @@ -63,7 +63,7 @@ maximize_sndbuf(sfd); } else { error = setsockopt(sfd, SOL_SOCKET, SO_KEEPALIVE, (void *)&flags, sizeof(flags)); -@@ -3480,7 +3480,7 @@ static int server_socket(const char *interface, +@@ -3607,7 +3607,7 @@ static int server_socket(const char *interface, } } diff --git a/databases/memcached/files/patch-xxhash.h b/databases/memcached/files/patch-xxhash.h index f62d8def3ef3..e82ee3f35f2e 100644 --- a/databases/memcached/files/patch-xxhash.h +++ b/databases/memcached/files/patch-xxhash.h @@ -1,6 +1,6 @@ ---- xxhash.h.orig 2021-03-31 12:18:19 UTC +--- xxhash.h.orig 2022-08-26 03:34:25 UTC +++ xxhash.h -@@ -2409,6 +2409,7 @@ XXH_PUBLIC_API XXH64_hash_t XXH64_hashFromCanonical(co +@@ -2931,6 +2931,7 @@ enum XXH_VECTOR_TYPE /* fake enum */ { # if defined(__GNUC__) && !defined(__APPLE_ALTIVEC__) # define __APPLE_ALTIVEC__ # endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305170453.34H4rHWv044914>