From owner-svn-ports-all@freebsd.org Sun Mar 29 15:56:49 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E9D152A3473; Sun, 29 Mar 2020 15:56:48 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48r0Zl2s57z3JxW; Sun, 29 Mar 2020 15:56:47 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 08A122F81; Sun, 29 Mar 2020 15:56:40 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02TFudjw027318; Sun, 29 Mar 2020 15:56:39 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02TFudSs027311; Sun, 29 Mar 2020 15:56:39 GMT (envelope-from swills@FreeBSD.org) Message-Id: <202003291556.02TFudSs027311@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Sun, 29 Mar 2020 15:56:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529811 - in head/databases/memcached: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/databases/memcached: . files X-SVN-Commit-Revision: 529811 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Mar 2020 15:56:49 -0000 Author: swills Date: Sun Mar 29 15:56:38 2020 New Revision: 529811 URL: https://svnweb.freebsd.org/changeset/ports/529811 Log: databases/memcached: update to 1.6.2 Modified: head/databases/memcached/Makefile (contents, props changed) head/databases/memcached/distinfo (contents, props changed) head/databases/memcached/files/patch-configure.ac (contents, props changed) head/databases/memcached/files/patch-memcached.c (contents, props changed) Modified: head/databases/memcached/Makefile ============================================================================== --- head/databases/memcached/Makefile Sun Mar 29 15:42:21 2020 (r529810) +++ head/databases/memcached/Makefile Sun Mar 29 15:56:38 2020 (r529811) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= memcached -PORTVERSION= 1.5.19 +PORTVERSION= 1.6.2 CATEGORIES= databases MASTER_SITES= http://www.memcached.org/files/ \ GENTOO Modified: head/databases/memcached/distinfo ============================================================================== --- head/databases/memcached/distinfo Sun Mar 29 15:42:21 2020 (r529810) +++ head/databases/memcached/distinfo Sun Mar 29 15:56:38 2020 (r529811) @@ -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 Modified: head/databases/memcached/files/patch-configure.ac ============================================================================== --- head/databases/memcached/files/patch-configure.ac Sun Mar 29 15:42:21 2020 (r529810) +++ head/databases/memcached/files/patch-configure.ac Sun Mar 29 15:56:38 2020 (r529811) @@ -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 Modified: head/databases/memcached/files/patch-memcached.c ============================================================================== --- head/databases/memcached/files/patch-memcached.c Sun Mar 29 15:42:21 2020 (r529810) +++ head/databases/memcached/files/patch-memcached.c Sun Mar 29 15:56:38 2020 (r529811) @@ -1,15 +1,6 @@ ---- 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)); @@ -18,7 +9,16 @@ 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; } @@ -27,25 +27,25 @@ 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: @@ -54,7 +54,7 @@ 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)); @@ -63,7 +63,7 @@ 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, } }