databases/memcached: update to 1.5.5

While here, re-generate patches.

5 files changed, 40 insertions, 17 deletions

diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile
index 14336526b0e4..d63d46c8d8f4 100644
--- a/databases/memcached/Makefile
+++ b/databases/memcached/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	memcached
-PORTVERSION=	1.5.4
-PORTREVISION=	1
+PORTVERSION=	1.5.5
 CATEGORIES=	databases
 MASTER_SITES=	http://www.memcached.org/files/ \
 		GENTOO
diff --git a/databases/memcached/distinfo b/databases/memcached/distinfo
index 037803d03791..e2cc9d7a7e61 100644
--- a/databases/memcached/distinfo
+++ b/databases/memcached/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1515467633
-SHA256 (memcached-1.5.4.tar.gz) = e0c3cfa89fa4c2ffd8aa45df7825c6d1a2423ac89ab1a7c4f42bb9803f7403d4
-SIZE (memcached-1.5.4.tar.gz) = 448831
+TIMESTAMP = 1518786272
+SHA256 (memcached-1.5.5.tar.gz) = e2c466222debe39ad8d451d4d691493a0c655b6b3f5d06c456b2c0d8e17e07ed
+SIZE (memcached-1.5.5.tar.gz) = 449297
diff --git a/databases/memcached/files/patch-configure.ac b/databases/memcached/files/patch-configure.ac
index 8612373f97c3..ede0ba9487ff 100644
--- a/databases/memcached/files/patch-configure.ac
+++ b/databases/memcached/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig	2016-12-04 13:19:07 UTC
+--- configure.ac.orig	2017-12-21 06:24:20 UTC
 +++ configure.ac
-@@ -137,8 +137,7 @@ if test "x$enable_dtrace" = "xyes"; then
+@@ -143,8 +143,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
@@ -10,7 +10,7 @@
      if test $? -eq 0
      then
          dtrace_instrument_obj=yes
-@@ -594,7 +593,7 @@ then
+@@ -627,7 +626,7 @@ then
  elif test "$GCC" = "yes"
  then
    GCC_VERSION=`$CC -dumpversion`
diff --git a/databases/memcached/files/patch-memcached.c b/databases/memcached/files/patch-memcached.c
index 52bca8697992..99756fc67fde 100644
--- a/databases/memcached/files/patch-memcached.c
+++ b/databases/memcached/files/patch-memcached.c
@@ -1,6 +1,6 @@
---- memcached.c.orig	2015-04-20 05:34:19 UTC
+--- memcached.c.orig	2018-02-13 05:09:37 UTC
 +++ memcached.c
-@@ -288,7 +288,7 @@ static int add_msghdr(conn *c)
+@@ -316,7 +316,7 @@ static int add_msghdr(conn *c)
      c->msgbytes = 0;
      c->msgused++;
  
@@ -9,7 +9,7 @@
          /* Leave room for the UDP header, which we'll fill in later. */
          return add_iov(c, NULL, UDP_HEADER_SIZE);
      }
-@@ -432,7 +432,7 @@ conn *conn_new(const int sfd, enum conn_
+@@ -582,7 +582,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 +18,7 @@
              fprintf(stderr, "<%d server listening (udp)\n", sfd);
          } else if (c->protocol == negotiating_prot) {
              fprintf(stderr, "<%d new auto-negotiating client connection\n",
-@@ -531,7 +531,7 @@ static void conn_cleanup(conn *c) {
+@@ -752,7 +752,7 @@ static void conn_cleanup(conn *c) {
          c->sasl_conn = NULL;
      }
  
@@ -27,7 +27,7 @@
          conn_set_state(c, conn_read);
      }
  }
-@@ -601,7 +601,7 @@ static void conn_close(conn *c) {
+@@ -822,7 +822,7 @@ static void conn_close(conn *c) {
  static void conn_shrink(conn *c) {
      assert(c != NULL);
  
@@ -36,7 +36,7 @@
          return;
  
      if (c->rsize > READ_BUFFER_HIGHWAT && c->rbytes < DATA_BUFFER_SIZE) {
-@@ -4022,7 +4022,7 @@ static enum transmit_result transmit(con
+@@ -5253,7 +5253,7 @@ static enum transmit_result transmit(conn *c) {
          if (settings.verbose > 0)
              perror("Failed to write, and not due to blocking");
  
@@ -45,7 +45,7 @@
              conn_set_state(c, conn_read);
          else
              conn_set_state(c, conn_closing);
-@@ -4346,7 +4346,7 @@ static void drive_machine(conn *c) {
+@@ -5694,7 +5694,7 @@ static void drive_machine(conn *c) {
              break;
  
          case conn_closing:
@@ -54,7 +54,7 @@
                  conn_cleanup(c);
              else
                  conn_close(c);
-@@ -4506,7 +4506,7 @@ static int server_socket(const char *int
+@@ -5858,7 +5858,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));
-@@ -4561,7 +4561,7 @@ static int server_socket(const char *int
+@@ -5913,7 +5913,7 @@ static int server_socket(const char *interface,
              }
          }
  
diff --git a/databases/memcached/files/patch-memcached_dtrace.d b/databases/memcached/files/patch-memcached_dtrace.d
new file mode 100644
index 000000000000..d8d41bd908f9
--- /dev/null
+++ b/databases/memcached/files/patch-memcached_dtrace.d
@@ -0,0 +1,24 @@
+--- memcached_dtrace.d.orig	2017-08-27 18:22:57 UTC
++++ memcached_dtrace.d
+@@ -111,19 +111,15 @@ provider memcached {
+     * Fired when a new item has been inserted.
+     * @param key the key just inserted
+     * @param keylen length of the key
+-    * @param nokeys the total number of keys currently stored,
+-    *               including the key for which insert was called.
+     */
+-   probe assoc__insert(const char *key, int keylen, int nokeys);
++   probe assoc__insert(const char *key, int keylen);
+ 
+    /**
+     * Fired when a new item has been removed.
+     * @param key the key just deleted
+     * @param keylen length of the key
+-    * @param nokeys the total number of keys currently stored,
+-    *               excluding the key for which delete was called.
+     */
+-   probe assoc__delete(const char *key, int keylen, int nokeys);
++   probe assoc__delete(const char *key, int keylen);
+ 
+    /**
+     * Fired when an item is linked into the cache.