CVS commit: pkgsrc/devel/memcached

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jan 22 18:53:13 UTC 2020

Modified Files:
        pkgsrc/devel/memcached: Makefile distinfo
        pkgsrc/devel/memcached/patches: patch-configure
Added Files:
        pkgsrc/devel/memcached/patches: patch-util.h

Log Message:
memcached: updated to 1.5.21

Memcached 1.5.21

Overview
Bugfixes and smaller changes. Thanks to all the external contributors!

Fixes
Adding missing defaults to the --help output
stats: Fix stats delimiter unit tests
Allow compilation with ASAN
restart: add error handling if mmap fails
For text auth token mode, use alternative bcmp implementation
memcached-tool: Fix up tabular output for the 'stats' command.
linux_priv.c: add termios.h include to fix powerpc(64) builds
Update the build documentation in BUILD file
Update documentation for --max-item-size
Fix build issue due to improper pthread_t comparison
Ensure t/whitespace.t test is skipped when outside a memcached git checkout
Allocating large chunk of slabs for FreeBSD.

New Features
configuration option to disable watch commands (-W)


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 pkgsrc/devel/memcached/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/devel/memcached/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/memcached/patches/patch-configure
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/memcached/patches/patch-util.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/memcached/Makefile
diff -u pkgsrc/devel/memcached/Makefile:1.69 pkgsrc/devel/memcached/Makefile:1.70
--- pkgsrc/devel/memcached/Makefile:1.69        Sat Jan 18 21:49:12 2020
+++ pkgsrc/devel/memcached/Makefile     Wed Jan 22 18:53:13 2020
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.69 2020/01/18 21:49:12 jperkin Exp $
+# $NetBSD: Makefile,v 1.70 2020/01/22 18:53:13 adam Exp $
 
-DISTNAME=      memcached-1.5.20
-PKGREVISION=   1
+DISTNAME=      memcached-1.5.21
 CATEGORIES=    devel
 MASTER_SITES=  http://www.memcached.org/files/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://www.memcached.org/
+HOMEPAGE=      https://memcached.org/
 COMMENT=       High-performance distributed memory object caching system
 LICENSE=       2-clause-bsd
 

Index: pkgsrc/devel/memcached/distinfo
diff -u pkgsrc/devel/memcached/distinfo:1.39 pkgsrc/devel/memcached/distinfo:1.40
--- pkgsrc/devel/memcached/distinfo:1.39        Mon Nov 11 17:29:50 2019
+++ pkgsrc/devel/memcached/distinfo     Wed Jan 22 18:53:13 2020
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.39 2019/11/11 17:29:50 adam Exp $
+$NetBSD: distinfo,v 1.40 2020/01/22 18:53:13 adam Exp $
 
-SHA1 (memcached-1.5.20.tar.gz) = 5d3b5af3ce0a1483d655017db7228bcaeff10d47
-RMD160 (memcached-1.5.20.tar.gz) = fd150833ca05ec5712fc030a3450510f0a8ae760
-SHA512 (memcached-1.5.20.tar.gz) = 07b125971fcec2cd06797fe16e9825e18b9d3446f6b91583f82f1b50920cd0e55c65506ebdf5fcef7b08d92f9641a20859ba67b3dd3986ba5624d0d6f494293d
-Size (memcached-1.5.20.tar.gz) = 531035 bytes
+SHA1 (memcached-1.5.21.tar.gz) = 536842bc4cf4807dca391039d3acb2cc47e4bdd5
+RMD160 (memcached-1.5.21.tar.gz) = d1346b4f9b1903def3c3e8dab1468efca1b50eda
+SHA512 (memcached-1.5.21.tar.gz) = 4ade3e15e6821b76f086b4933f5599248f8de7e7b2ae106dc8ecbc8a5073a1966e4c3956413fd57387bb88fca2c0e95b9a3ce7bfce19c42bec584a3268f06998
+Size (memcached-1.5.21.tar.gz) = 532631 bytes
 SHA1 (patch-Makefile.in) = d0dce85040734a2532d4dced9daed0032433e80f
-SHA1 (patch-configure) = d2234d7270837c2c192d4ca3b485de9d4b6ac3ee
+SHA1 (patch-configure) = af14c5bbbd0db296bb100f70761ac60ee71c70f4
 SHA1 (patch-items.c) = 33e9ff564f755fa2ef201978cb509800ea400fa0
 SHA1 (patch-logger.h) = 130c573e07b7d9b6caff1c98e40b36a96cb3c064
 SHA1 (patch-memcached.c) = ce42a0b1aea95b1e4126b08310ac7276cadcdaef
+SHA1 (patch-util.h) = a927b75d76181573a508c8d8330e700eb1af0b52

Index: pkgsrc/devel/memcached/patches/patch-configure
diff -u pkgsrc/devel/memcached/patches/patch-configure:1.5 pkgsrc/devel/memcached/patches/patch-configure:1.6
--- pkgsrc/devel/memcached/patches/patch-configure:1.5  Mon Nov 11 17:29:50 2019
+++ pkgsrc/devel/memcached/patches/patch-configure      Wed Jan 22 18:53:13 2020
@@ -1,16 +1,16 @@
-$NetBSD: patch-configure,v 1.5 2019/11/11 17:29:50 adam Exp $
+$NetBSD: patch-configure,v 1.6 2020/01/22 18:53:13 adam Exp $
 
 Remove -Werror from default flags since different compilers
 have very different warnings.
 
---- configure.orig     2019-11-11 09:22:25.000000000 +0000
+--- configure.orig     2020-01-21 22:09:10.000000000 +0000
 +++ configure
-@@ -7221,7 +7221,7 @@ $as_echo "#define _GNU_SOURCE 1" >>confd
+@@ -7245,7 +7245,7 @@ $as_echo "#define _GNU_SOURCE 1" >>confd
  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

Added files:

Index: pkgsrc/devel/memcached/patches/patch-util.h
diff -u /dev/null pkgsrc/devel/memcached/patches/patch-util.h:1.1
--- /dev/null   Wed Jan 22 18:53:13 2020
+++ pkgsrc/devel/memcached/patches/patch-util.h Wed Jan 22 18:53:13 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-util.h,v 1.1 2020/01/22 18:53:13 adam Exp $
+
+Include config.h before using HAVE_HTONLL.
+https://github.com/memcached/memcached/issues/598
+
+--- util.h.orig        2020-01-22 14:55:21.000000000 +0000
++++ util.h
+@@ -20,6 +20,7 @@ bool safe_strtod(const char *str, double
+ bool safe_strcpy(char *dst, const char *src, const size_t dstmax);
+ bool safe_memcmp(const void *a, const void *b, size_t len);
+ 
++#include "config.h"
+ #ifndef HAVE_HTONLL
+ extern uint64_t htonll(uint64_t);
+ extern uint64_t ntohll(uint64_t);