Index: head/databases/memcached/Makefile =================================================================== --- head/databases/memcached/Makefile (revision 462011) +++ head/databases/memcached/Makefile (revision 462012) @@ -1,87 +1,86 @@ # Created by: Sean Chittenden # $FreeBSD$ PORTNAME= memcached -PORTVERSION= 1.5.4 -PORTREVISION= 1 +PORTVERSION= 1.5.5 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 LIB_DEPENDS= libevent.so:devel/libevent CONFLICTS= memcached-1.2* USES= cpe shebangfix autoreconf 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= --with-libevent=${LOCALBASE} \ --program-prefix= \ --disable-coverage # Dtrace option disabled until it is fixed upstream OPTIONS_DEFINE= SASL DOCS DTRACE OPTIONS_DEFAULT= SASL DTRACE .if !exists(/usr/sbin/dtrace) OPTIONS_EXCLUDE+= DTRACE .endif OPTIONS_EXCLUDE_FreeBSD_10+= DTRACE OPTIONS_EXCLUDE_i386= DTRACE # ld(1) fails to link probes: Relocations in generic ELF (EM: 0) OPTIONS_EXCLUDE_aarch64= 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_CONFIGURE_ENABLE= sasl SASL_CFLAGS= -I${LOCALBASE}/include SASL_CPPFLAGS+= ${CFLAGS} SASL_LDFLAGS= -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE= yes .include .if ${ARCH} == amd64 CONFIGURE_ARGS+= --enable-64bit .endif # avoid triggering a bug in libdtrace, see illumos issue 6653 .if ${PORT_OPTIONS:MDTRACE} 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 462011) +++ head/databases/memcached/distinfo (revision 462012) @@ -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 Index: head/databases/memcached/files/patch-configure.ac =================================================================== --- head/databases/memcached/files/patch-configure.ac (revision 462011) +++ head/databases/memcached/files/patch-configure.ac (revision 462012) @@ -1,21 +1,21 @@ ---- 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 - # DTrace on MacOSX does not use -G option - $DTRACE -G -o conftest.$$ -s memcached_dtrace.d 2>/dev/zero + /usr/bin/true 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` - 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" Index: head/databases/memcached/files/patch-memcached.c =================================================================== --- head/databases/memcached/files/patch-memcached.c (revision 462011) +++ head/databases/memcached/files/patch-memcached.c (revision 462012) @@ -1,74 +1,74 @@ ---- 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++; - 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); } -@@ -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)); - } 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", -@@ -531,7 +531,7 @@ static void conn_cleanup(conn *c) { +@@ -752,7 +752,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); } } -@@ -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); - if (IS_UDP(c->transport)) + if IS_UDP(c->transport) 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"); - if (IS_UDP(c->transport)) + if IS_UDP(c->transport) 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: - if (IS_UDP(c->transport)) + if IS_UDP(c->transport) 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)); - if (IS_UDP(transport)) { + if IS_UDP(transport) { 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, } } - if (IS_UDP(transport)) { + if IS_UDP(transport) { int c; for (c = 0; c < settings.num_threads_per_udp; c++) { Index: head/databases/memcached/files/patch-memcached_dtrace.d =================================================================== --- head/databases/memcached/files/patch-memcached_dtrace.d (nonexistent) +++ head/databases/memcached/files/patch-memcached_dtrace.d (revision 462012) @@ -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. Property changes on: head/databases/memcached/files/patch-memcached_dtrace.d ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property