Index: head/databases/redis/Makefile =================================================================== --- head/databases/redis/Makefile (revision 566963) +++ head/databases/redis/Makefile (revision 566964) @@ -1,124 +1,124 @@ # Created by: Sergey Skvortsov # $FreeBSD$ PORTNAME= redis -PORTVERSION= 6.0.11 +PORTVERSION= 6.0.12 CATEGORIES= databases MASTER_SITES= https://download.redis.io/releases/ MAINTAINER= osa@FreeBSD.org COMMENT= Persistent key-value database with built-in net interface LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING USES+= compiler:c11 gmake OPTIONS_DEFINE= JEMALLOC TESTS TLS TRIB OPTIONS_RADIO= EXTLUA OPTIONS_RADIO_EXTLUA= LUA LUAJIT LUAJITOR OPTIONS_SUB= yes JEMALLOC_DESC= Use jemalloc LUA_DESC= Use lang/lua instead of builtin lua LUAJIT_DESC= Use lang/luajit instead of builtin lua LUAJITOR_DESC= Use lang/luajit-openresty instead of builtin lua TLS_DESC= Use TLS (openssl req.) TESTS_DESC= Install lang/tcl for redis unit tests TRIB_DESC= Install redis-trib.rb (lang/ruby req.) MAKE_ENV= V=yo OPTIMIZATION= JEMALLOC_MAKE_ENV= USE_JEMALLOC=yes LUA_USES= lua:51 LUA_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.lua LUA_VARS= _addflags=true LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit LUAJIT_BUILD_DEPENDS= ${LOCALBASE}/include/luajit-2.0/lua.h:lang/luajit LUAJIT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit LUAJIT_VARS= _addflags=true LUAJITOR_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty LUAJITOR_BUILD_DEPENDS= ${LOCALBASE}/include/luajit-2.1/lua.h:lang/luajit-openresty LUAJITOR_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit-or \ ${PATCHDIR}/extra-patch-deps_lua_src_lua__cjson.c LUAJITOR_VARS= _addflags=true TESTS_USES= tcl:build TLS_USES= ssl TLS_MAKE_ENV= BUILD_TLS=yes TRIB_CATEGORIES= ruby TRIB_USE= ruby=yes TRIB_RUN_DEPENDS= rubygem-redis>=2.2:databases/rubygem-redis .include .if ${ARCH} == i386 && ! ${CFLAGS:M-march=*} # Needed for __atomic_fetch_add_8 USE_GCC= yes CFLAGS+= -march=i586 .endif .if defined(_addflags) CFLAGS= -fPIC LDFLAGS= -Wl,-E .endif LDFLAGS+= -lpthread -lm -lexecinfo CONFLICTS?= redis4-4.* redis5-5.* redis-devel-6.* USE_RC_SUBR= redis sentinel BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb \ redis-cli redis-sentinel redis-server USERS= redis GROUPS= redis REDIS_DBDIR?= /var/db/redis REDIS_RUNDIR?= /var/run/redis REDIS_LOGDIR?= /var/log/redis SUB_FILES= pkg-message SUB_LIST+= PORTNAME=${PORTNAME} \ REDIS_USER=${USERS} \ REDIS_DBDIR=${REDIS_DBDIR} \ REDIS_LOGDIR=${REDIS_LOGDIR} \ REDIS_RUNDIR=${REDIS_RUNDIR} PLIST_SUB+= REDIS_USER=${USERS} \ REDIS_GROUP=${GROUPS} \ REDIS_LOGDIR=${REDIS_LOGDIR} \ REDIS_DBDIR=${REDIS_DBDIR} \ REDIS_RUNDIR=${REDIS_RUNDIR} post-patch-JEMALLOC-on: @${REINPLACE_CMD} '35s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile post-patch-LUA-on: @cd ${WRKSRC}/deps/lua/src && ${CP} fpconv.* lua_* strbuf.* ${WRKSRC}/src/ post-patch-LUAJIT-on: post-patch-LUA-on post-patch-LUAJITOR-on: post-patch-LUA-on post-build: ${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${WRKSRC}/redis.conf > ${WRKDIR}/redis.conf do-install: ${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_DATA} ${WRKDIR}/redis.conf ${STAGEDIR}${PREFIX}/etc/redis.conf.sample ${INSTALL_DATA} ${WRKSRC}/sentinel.conf ${STAGEDIR}${PREFIX}/etc/sentinel.conf.sample ${MKDIR} ${STAGEDIR}${REDIS_LOGDIR} \ ${STAGEDIR}${REDIS_DBDIR} \ ${STAGEDIR}${REDIS_RUNDIR} do-install-TRIB-on: ${INSTALL_SCRIPT} ${WRKSRC}/src/redis-trib.rb ${STAGEDIR}${PREFIX}/bin/ do-test: @cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl .include Index: head/databases/redis/distinfo =================================================================== --- head/databases/redis/distinfo (revision 566963) +++ head/databases/redis/distinfo (revision 566964) @@ -1,3 +1,3 @@ -TIMESTAMP = 1614088806 -SHA256 (redis-6.0.11.tar.gz) = c927f2d110e88fda308526a1809a4d7dfcd004319f0de66d40a58a42aec23c5f -SIZE (redis-6.0.11.tar.gz) = 2276154 +TIMESTAMP = 1614697781 +SHA256 (redis-6.0.12.tar.gz) = f16ad973d19f80f121e53794d5eb48a997e2c6a85b5be41bb3b66750cc17bf6b +SIZE (redis-6.0.12.tar.gz) = 2276349 Index: head/databases/redis/files/patch-src-zmalloc.c =================================================================== --- head/databases/redis/files/patch-src-zmalloc.c (revision 566963) +++ head/databases/redis/files/patch-src-zmalloc.c (nonexistent) @@ -1,30 +0,0 @@ ---- src/zmalloc.c.orig 2021-02-23 11:09:32.095861000 -0500 -+++ src/zmalloc.c 2021-02-23 11:20:04.491174000 -0500 -@@ -40,6 +40,7 @@ - free(ptr); - } - -+#include - #include - #include - #include "config.h" -@@ -48,18 +49,14 @@ - - #ifdef HAVE_MALLOC_SIZE - #define PREFIX_SIZE (0) -+#define ASSERT_NO_SIZE_OVERFLOW(sz) - #else - #if defined(__sun) || defined(__sparc) || defined(__sparc__) - #define PREFIX_SIZE (sizeof(long long)) - #else - #define PREFIX_SIZE (sizeof(size_t)) - #endif --#endif -- --#if PREFIX_SIZE > 0 - #define ASSERT_NO_SIZE_OVERFLOW(sz) assert((sz) + PREFIX_SIZE > (sz)) --#else --#define ASSERT_NO_SIZE_OVERFLOW(sz) - #endif - - /* Explicitly override malloc/free etc when using tcmalloc. */ Property changes on: head/databases/redis/files/patch-src-zmalloc.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property