diff --git a/srcpkgs/redis/patches/use-system-jemalloc.patch b/srcpkgs/redis/patches/use-system-jemalloc.patch index ccb12a34508..9f75299b336 100644 --- a/srcpkgs/redis/patches/use-system-jemalloc.patch +++ b/srcpkgs/redis/patches/use-system-jemalloc.patch @@ -1,12 +1,12 @@ ---- src/Makefile.orig 2016-10-28 16:14:53.422637642 +0200 -+++ src/Makefile 2016-10-28 16:15:15.284841414 +0200 -@@ -103,9 +103,8 @@ ifeq ($(MALLOC),tcmalloc_minimal) +--- src/Makefile 2018-11-23 20:32:03.881081556 +0200 ++++ src/Makefile 2018-11-23 23:55:55.800219510 +0200 +@@ -134,9 +134,8 @@ ifeq ($(MALLOC),tcmalloc_minimal) endif ifeq ($(MALLOC),jemalloc) - DEPENDENCY_TARGETS+= jemalloc - FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include -- FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a +- FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS) + FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE + FINAL_LIBS+= -ljemalloc -ldl endif diff --git a/srcpkgs/redis/template b/srcpkgs/redis/template index 11c491fb4f6..f49acd9acd4 100644 --- a/srcpkgs/redis/template +++ b/srcpkgs/redis/template @@ -1,6 +1,6 @@ # Template file for 'redis' pkgname=redis -version=4.0.11 +version=5.0.2 revision=1 makedepends="jemalloc-devel libatomic-devel" checkdepends="tcl-devel" @@ -8,9 +8,9 @@ short_desc="Advanced key-value store" maintainer="Enno Boland " license="BSD-3-Clause" homepage="https://redis.io" -changelog="https://raw.githubusercontent.com/antirez/redis/4.0/00-RELEASENOTES" +changelog="https://raw.githubusercontent.com/antirez/redis/5.0/00-RELEASENOTES" distfiles="http://download.redis.io/releases/${pkgname}-${version}.tar.gz" -checksum=fc53e73ae7586bcdacb4b63875d1ff04f68c5474c1ddeda78f00e5ae2eed1bbb +checksum=937dde6164001c083e87316aa20dad2f8542af089dfcb1cbb64f9c8300cd00ed system_accounts="redis" redis_homedir=/var/lib/redis