summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorSergey A. Osokin <osa@FreeBSD.org>2021-03-02 15:23:53 +0000
committerSergey A. Osokin <osa@FreeBSD.org>2021-03-02 15:23:53 +0000
commit4ae51c87706957b80757084a6e13e5352bcd4ab0 (patch)
treecf4201455faffb5d8b70e89874eaf4ca3a07c3e7 /databases
parent1: update to 4.6.3. (diff)
Update from 5.0.11 to 5.0.12.
Remove added to the upstream patch. <ChangeLog> ================================================================================ Redis 5.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>
Diffstat (limited to 'databases')
-rw-r--r--databases/redis5/Makefile2
-rw-r--r--databases/redis5/distinfo6
-rw-r--r--databases/redis5/files/patch-src-zmalloc.c30
3 files changed, 4 insertions, 34 deletions
diff --git a/databases/redis5/Makefile b/databases/redis5/Makefile
index 1195dabeb4d1..618e7b9032d4 100644
--- a/databases/redis5/Makefile
+++ b/databases/redis5/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= redis5
-PORTVERSION= 5.0.11
+PORTVERSION= 5.0.12
CATEGORIES= databases
MASTER_SITES= https://download.redis.io/releases/
DISTNAME= redis-${PORTVERSION}
diff --git a/databases/redis5/distinfo b/databases/redis5/distinfo
index db067fe4d982..a6ee78f485e1 100644
--- a/databases/redis5/distinfo
+++ b/databases/redis5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614087571
-SHA256 (redis-5.0.11.tar.gz) = 418135c453a94aac24c24243b041fb978fcc3ea4e1e1f996c1d64b16ae6ac1aa
-SIZE (redis-5.0.11.tar.gz) = 1995013
+TIMESTAMP = 1614698306
+SHA256 (redis-5.0.12.tar.gz) = 7040eba5910f7c3d38f05ea5a1d88b480488215bdbd2e10ec70d18380108e31e
+SIZE (redis-5.0.12.tar.gz) = 1995069
diff --git a/databases/redis5/files/patch-src-zmalloc.c b/databases/redis5/files/patch-src-zmalloc.c
deleted file mode 100644
index 20ac72c2e621..000000000000
--- a/databases/redis5/files/patch-src-zmalloc.c
+++ /dev/null
@@ -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. */