diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile index 45c79ba687fc..f83201fc339a 100644 --- a/databases/memcached/Makefile +++ b/databases/memcached/Makefile @@ -1,75 +1,75 @@ PORTNAME= memcached -DISTVERSION= 1.6.38 +DISTVERSION= 1.6.39 CATEGORIES= databases MASTER_SITES= http://www.memcached.org/files/ MAINTAINER= bofh@FreeBSD.org COMMENT= High-performance distributed memory object cache system WWW= https://memcached.org/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libevent.so:devel/libevent USES= autoreconf cpe pkgconfig shebangfix USE_CSTD= c99 USE_RC_SUBR= memcached SHEBANG_FILES= scripts/memcached-tool HAS_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_DEFINE_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 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_USES= localbase:ldflags SASL_CONFIGURE_ENABLE= sasl .include .if ${OPSYS} == FreeBSD CONFIGURE_ARGS+= --enable-tls USES+= ssl .endif .if ${ARCH} == amd64 || ${ARCH:Mpowerpc64*} CONFIGURE_ARGS+= --enable-64bit .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 diff --git a/databases/memcached/distinfo b/databases/memcached/distinfo index 12299c12dff9..1db70aceb31e 100644 --- a/databases/memcached/distinfo +++ b/databases/memcached/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1742448447 -SHA256 (memcached-1.6.38.tar.gz) = 334d792294e37738796b5b03375c47bb6db283b1152e2ea4ccb720152dd17c66 -SIZE (memcached-1.6.38.tar.gz) = 1282099 +TIMESTAMP = 1753828034 +SHA256 (memcached-1.6.39.tar.gz) = 23e5507e933b15463161d4c5d3921b0c5f340b542d6edd7f6c5e17c34f11a363 +SIZE (memcached-1.6.39.tar.gz) = 1284104 diff --git a/databases/memcached/files/patch-configure.ac b/databases/memcached/files/patch-configure.ac index bfe9ca6ef3d7..a11fbc82e289 100644 --- a/databases/memcached/files/patch-configure.ac +++ b/databases/memcached/files/patch-configure.ac @@ -1,11 +1,11 @@ ---- configure.ac.orig 2023-03-08 21:34:27 UTC +--- configure.ac.orig 2025-07-18 21:35:16 UTC +++ configure.ac -@@ -201,7 +201,7 @@ if test "x$enable_dtrace" = "xyes"; then +@@ -207,7 +207,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 diff --git a/databases/memcached/files/patch-memcached.c b/databases/memcached/files/patch-memcached.c index 7e248161d68f..547f0f611001 100644 --- a/databases/memcached/files/patch-memcached.c +++ b/databases/memcached/files/patch-memcached.c @@ -1,74 +1,74 @@ ---- memcached.c.orig 2023-03-08 21:34:27 UTC +--- memcached.c.orig 2025-07-29 01:17:34 UTC +++ memcached.c -@@ -707,7 +707,7 @@ conn *conn_new(const int sfd, enum conn_states init_st +@@ -686,7 +686,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", -@@ -772,7 +772,7 @@ conn *conn_new(const int sfd, enum conn_states init_st - c->write = tcp_write; +@@ -741,7 +741,7 @@ conn *conn_new(const int sfd, enum conn_states init_st + c->ssl_enabled = false; } - if (IS_UDP(transport)) { + if IS_UDP(transport) { c->try_read_command = try_read_command_udp; } else { switch (c->protocol) { -@@ -871,7 +871,7 @@ static void conn_cleanup(conn *c) { +@@ -839,7 +839,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); } } -@@ -1171,7 +1171,7 @@ bool resp_start(conn *c) { +@@ -1147,7 +1147,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; -@@ -2166,7 +2166,7 @@ void process_stats_conns(ADD_STAT add_stats, void *c) +@@ -2160,7 +2160,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) { -@@ -3361,7 +3361,7 @@ static void drive_machine(conn *c) { - break; +@@ -3322,7 +3322,7 @@ static void drive_machine(conn *c) { case conn_closing: -- if (IS_UDP(c->transport)) -+ if IS_UDP(c->transport) - conn_cleanup(c); - else - conn_close(c); -@@ -3552,7 +3552,7 @@ static int server_socket(const char *interface, + if (!c->resps_suspended) { +- if (IS_UDP(c->transport)) ++ if IS_UDP(c->transport) + conn_cleanup(c); + else + conn_close(c); +@@ -3524,7 +3524,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)); -@@ -3607,7 +3607,7 @@ static int server_socket(const char *interface, +@@ -3579,7 +3579,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++) {