Index: head/databases/memcached/Makefile =================================================================== --- head/databases/memcached/Makefile (revision 557100) +++ head/databases/memcached/Makefile (revision 557101) @@ -1,95 +1,94 @@ # Created by: Sean Chittenden # $FreeBSD$ PORTNAME= memcached -PORTVERSION= 1.6.8 -PORTREVISION= 1 +PORTVERSION= 1.6.9 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 BUILD_DEPENDS= as:devel/binutils LIB_DEPENDS= libevent.so:devel/libevent USES= autoreconf cpe shebangfix 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= --disable-coverage \ --program-prefix= \ --with-libevent=${LOCALBASE} # 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_DEFAULT_powerpc64= DTRACE OPTIONS_EXCLUDE_powerpc64= ${OPTIONS_EXCLUDE_${ARCH}_${OSREL:R}} OPTIONS_EXCLUDE_powerpc64_11= DTRACE 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 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 CONFIGURE_ARGS+= --enable-tls USES+= ssl .endif .if ${ARCH} == amd64 || ${ARCH:Mpowerpc64*} CONFIGURE_ARGS+= --enable-64bit .endif # avoid triggering a bug in libdtrace, see illumos issue 6653 .if ${PORT_OPTIONS:MDTRACE} && ${ARCH} == amd64 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 557100) +++ head/databases/memcached/distinfo (revision 557101) @@ -1,3 +1,3 @@ -TIMESTAMP = 1604329305 -SHA256 (memcached-1.6.8.tar.gz) = e23b3a11f6ff52ac04ae5ea2e287052ce58fd1eadd394622eb65c3598fcd7939 -SIZE (memcached-1.6.8.tar.gz) = 548024 +TIMESTAMP = 1607216606 +SHA256 (memcached-1.6.9.tar.gz) = d5a62ce377314dbffdb37c4467e7763e3abae376a16171e613cbe69956f092d1 +SIZE (memcached-1.6.9.tar.gz) = 556137 Index: head/databases/memcached/files/patch-configure.ac =================================================================== --- head/databases/memcached/files/patch-configure.ac (revision 557100) +++ head/databases/memcached/files/patch-configure.ac (revision 557101) @@ -1,20 +1,20 @@ ---- configure.ac.orig 2020-03-08 23:05:43 UTC +--- configure.ac.orig 2020-11-21 00:10:41 UTC +++ configure.ac -@@ -175,7 +175,7 @@ if test "x$enable_dtrace" = "xyes"; then +@@ -182,7 +182,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 -h -o conftest.h -s memcached_dtrace.d 2>/dev/zero + /usr/bin/true if test $? -eq 0 then dtrace_instrument_obj=yes -@@ -758,7 +758,7 @@ then +@@ -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 Index: head/databases/memcached/files/patch-memcached.c =================================================================== --- head/databases/memcached/files/patch-memcached.c (revision 557100) +++ head/databases/memcached/files/patch-memcached.c (revision 557101) @@ -1,74 +1,74 @@ ---- memcached.c.orig 2020-03-23 17:30:29 UTC +--- memcached.c.orig 2020-11-21 00:10:41 UTC +++ memcached.c -@@ -647,7 +647,7 @@ conn *conn_new(const int sfd, enum conn_states init_st +@@ -676,7 +676,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", -@@ -708,7 +708,7 @@ conn *conn_new(const int sfd, enum conn_states init_st +@@ -736,7 +736,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) { +@@ -820,7 +820,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); } } -@@ -1038,7 +1038,7 @@ static bool resp_start(conn *c) { +@@ -1116,7 +1116,7 @@ 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 +@@ -2046,7 +2046,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. */ - 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) { +@@ -3242,7 +3242,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); -@@ -7479,7 +7479,7 @@ static int server_socket(const char *interface, +@@ -3425,7 +3425,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)); -@@ -7534,7 +7534,7 @@ static int server_socket(const char *interface, +@@ -3480,7 +3480,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++) {