Index: head/databases/memcached/Makefile =================================================================== --- head/databases/memcached/Makefile (revision 529810) +++ head/databases/memcached/Makefile (revision 529811) @@ -1,92 +1,92 @@ # Created by: Sean Chittenden # $FreeBSD$ PORTNAME= memcached -PORTVERSION= 1.5.19 +PORTVERSION= 1.6.2 CATEGORIES= databases MASTER_SITES= http://www.memcached.org/files/ \ GENTOO MAINTAINER= swills@FreeBSD.org COMMENT= High-performance distributed memory object cache system LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_mips= fails to link: failed to merge target specific data of file /usr/lib/dtrace/drti.o BROKEN_mips64= fails to link: failed to merge target specific data of file /usr/lib/dtrace/drti.o LIB_DEPENDS= libevent.so:devel/libevent CONFLICTS= memcached-1.2* USES= cpe shebangfix autoreconf SHEBANG_FILES= scripts/memcached-tool USE_RC_SUBR= memcached SUB_LIST+= RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX} USE_CSTD= c99 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libevent=${LOCALBASE} \ --program-prefix= \ --disable-coverage # Dtrace option disabled until it is fixed upstream OPTIONS_DEFINE= SASL DOCS DTRACE OPTIONS_DEFAULT= SASL DTRACE .if !exists(/usr/sbin/dtrace) OPTIONS_EXCLUDE+= DTRACE .endif OPTIONS_EXCLUDE_i386= DTRACE # ld(1) fails to link probes: Relocations in generic ELF (EM: 0) OPTIONS_EXCLUDE_aarch64= DTRACE OPTIONS_EXCLUDE_armv6= DTRACE OPTIONS_EXCLUDE_armv7= DTRACE # /tmp/conftest-4d18ad.s:2: Error: unknown pseudo-op: `.abiversion' OPTIONS_EXCLUDE_powerpc64= DTRACE 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 .if ${ARCH} == amd64 CONFIGURE_ARGS+= --enable-64bit .endif # avoid triggering a bug in libdtrace, see illumos issue 6653 .if ${PORT_OPTIONS:MDTRACE} CFLAGS+= -no-integrated-as .endif post-install: ${INSTALL_SCRIPT} ${WRKSRC}/scripts/memcached-tool ${STAGEDIR}${PREFIX}/bin post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in protocol-binary-range.txt protocol-binary.txt protocol.txt \ readme.txt threads.txt ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR} .endfor regression-test: test test: build ${MAKE} -C ${WRKSRC} test .include Index: head/databases/memcached/distinfo =================================================================== --- head/databases/memcached/distinfo (revision 529810) +++ head/databases/memcached/distinfo (revision 529811) @@ -1,3 +1,3 @@ -TIMESTAMP = 1569926431 -SHA256 (memcached-1.5.19.tar.gz) = 3ddcdaa2d14d215f3111a7448b79c889c57618a26e97ad989581f1880a5a4be0 -SIZE (memcached-1.5.19.tar.gz) = 517380 +TIMESTAMP = 1585423128 +SHA256 (memcached-1.6.2.tar.gz) = 06720118c40689be0b85249b3dcb23c6e6d5e3ce53893aca9faced264145168b +SIZE (memcached-1.6.2.tar.gz) = 536527 Index: head/databases/memcached/files/patch-configure.ac =================================================================== --- head/databases/memcached/files/patch-configure.ac (revision 529810) +++ head/databases/memcached/files/patch-configure.ac (revision 529811) @@ -1,21 +1,20 @@ ---- configure.ac.orig 2017-12-21 06:24:20 UTC +--- configure.ac.orig 2020-03-08 23:05:43 UTC +++ configure.ac -@@ -143,8 +143,7 @@ if test "x$enable_dtrace" = "xyes"; then +@@ -175,7 +175,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 -- # DTrace on MacOSX does not use -G option -- $DTRACE -G -o conftest.$$ -s memcached_dtrace.d 2>/dev/zero +- $DTRACE -h -o conftest.h -s memcached_dtrace.d 2>/dev/zero + /usr/bin/true if test $? -eq 0 then dtrace_instrument_obj=yes -@@ -627,7 +626,7 @@ then +@@ -758,7 +758,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" - case $GCC_VERSION in - 4.4.*) - CFLAGS="$CFLAGS -fno-strict-aliasing" + if test "x$enable_asan" = "xyes"; then + CFLAGS="$CFLAGS -fsanitize=address" + fi Index: head/databases/memcached/files/patch-memcached.c =================================================================== --- head/databases/memcached/files/patch-memcached.c (revision 529810) +++ head/databases/memcached/files/patch-memcached.c (revision 529811) @@ -1,74 +1,74 @@ ---- memcached.c.orig 2018-02-13 05:09:37 UTC +--- memcached.c.orig 2020-03-23 17:30:29 UTC +++ memcached.c -@@ -316,7 +316,7 @@ static int add_msghdr(conn *c) - c->msgbytes = 0; - c->msgused++; - -- if (IS_UDP(c->transport)) { -+ if IS_UDP(c->transport) { - /* Leave room for the UDP header, which we'll fill in later. */ - return add_iov(c, NULL, UDP_HEADER_SIZE); - } -@@ -582,7 +582,7 @@ conn *conn_new(const int sfd, enum conn_states init_st +@@ -647,7 +647,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)); - } else if (IS_UDP(transport)) { + } else if IS_UDP(transport) { fprintf(stderr, "<%d server listening (udp)\n", sfd); } else if (c->protocol == negotiating_prot) { fprintf(stderr, "<%d new auto-negotiating client connection\n", -@@ -752,7 +752,7 @@ static void conn_cleanup(conn *c) { +@@ -708,7 +708,7 @@ conn *conn_new(const int sfd, enum conn_states init_st + c->write = tcp_write; + } + +- if (IS_UDP(transport)) { ++ if IS_UDP(transport) { + c->try_read_command = try_read_command_udp; + } else { + switch (c->protocol) { +@@ -876,7 +876,7 @@ static void conn_cleanup(conn *c) { c->sasl_conn = NULL; } - if (IS_UDP(c->transport)) { + if IS_UDP(c->transport) { conn_set_state(c, conn_read); } } -@@ -822,7 +822,7 @@ static void conn_close(conn *c) { - static void conn_shrink(conn *c) { - assert(c != NULL); - -- if (IS_UDP(c->transport)) -+ if IS_UDP(c->transport) - return; - - if (c->rsize > READ_BUFFER_HIGHWAT && c->rbytes < DATA_BUFFER_SIZE) { -@@ -5253,7 +5253,7 @@ static enum transmit_result transmit(conn *c) { - if (settings.verbose > 0) - perror("Failed to write, and not due to blocking"); - -- if (IS_UDP(c->transport)) -+ if IS_UDP(c->transport) - conn_set_state(c, conn_read); - else - conn_set_state(c, conn_closing); -@@ -5694,7 +5694,7 @@ static void drive_machine(conn *c) { +@@ -1038,7 +1038,7 @@ static bool resp_start(conn *c) { + c->resp->next = resp; + c->resp = resp; + } +- if (IS_UDP(c->transport)) { ++ if IS_UDP(c->transport) { + // need to hold on to some data for async responses. + c->resp->request_id = c->request_id; + c->resp->request_addr = c->request_addr; +@@ -3443,7 +3443,7 @@ static void process_stats_conns(ADD_STAT add_stats, vo + * output -- not worth the complexity of the locking that'd be + * required to prevent it. + */ +- if (IS_UDP(conns[i]->transport)) { ++ if IS_UDP(conns[i]->transport) { + APPEND_NUM_STAT(i, "UDP", "%s", "UDP"); + } + if (conns[i]->state != conn_closed) { +@@ -7315,7 +7315,7 @@ static void drive_machine(conn *c) { break; case conn_closing: - if (IS_UDP(c->transport)) + if IS_UDP(c->transport) conn_cleanup(c); else conn_close(c); -@@ -5858,7 +5858,7 @@ static int server_socket(const char *interface, +@@ -7479,7 +7479,7 @@ static int server_socket(const char *interface, #endif setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, (void *)&flags, sizeof(flags)); - if (IS_UDP(transport)) { + if IS_UDP(transport) { maximize_sndbuf(sfd); } else { error = setsockopt(sfd, SOL_SOCKET, SO_KEEPALIVE, (void *)&flags, sizeof(flags)); -@@ -5913,7 +5913,7 @@ static int server_socket(const char *interface, +@@ -7534,7 +7534,7 @@ static int server_socket(const char *interface, } } - if (IS_UDP(transport)) { + if IS_UDP(transport) { int c; for (c = 0; c < settings.num_threads_per_udp; c++) {