mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-06 01:57:40 +00:00
Code Issues Releases Activity

Update from 6.0.11 to 6.0.12.

Browse Source 
Remove added to the upstream patch.

<ChangeLog>

================================================================================
Redis 6.0.12     Released Mon Mar  1 17:29:52 IST 2021
================================================================================

Upgrade urgency: LOW, fixes a compilation issue.

Bug fixes:
* Fix compilation error on non-glibc systems if jemalloc is not used (#8533)

</ChangeLog>
This commit is contained in:
Sergey A. Osokin 2021-03-02 15:14:00 +00:00
parent 65abb1b075
commit 71f8418a9c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=566964
3 changed files with 4 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
databases/redis/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= redis
PORTVERSION= 6.0.11
PORTVERSION= 6.0.12
CATEGORIES= databases
MASTER_SITES= https://download.redis.io/releases/

6
databases/redis/distinfo
View File

@ -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

30
databases/redis/files/patch-src-zmalloc.c
View File

@ -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 <assert.h>
#include <string.h>
#include <pthread.h>
#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. */