From 0cd10b27c4ae87ebf5c90486d110365fad9e5729 Mon Sep 17 00:00:00 2001 From: eholzbach Date: Sat, 12 Sep 2026 21:39:08 -0400 Subject: [PATCH] redis: update to 8.8.2 --- .../redis/patches/use-system-jemalloc.patch | 14 --------- srcpkgs/redis/template | 29 +++++++++++-------- 2 files changed, 17 insertions(+), 26 deletions(-) delete mode 100644 srcpkgs/redis/patches/use-system-jemalloc.patch diff --git a/srcpkgs/redis/patches/use-system-jemalloc.patch b/srcpkgs/redis/patches/use-system-jemalloc.patch deleted file mode 100644 index e3b8e555b9fca2..00000000000000 --- a/srcpkgs/redis/patches/use-system-jemalloc.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/src/Makefile 2018-11-23 20:32:03.881081556 +0200 -+++ b/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) -+ FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -+ FINAL_LIBS+= -ljemalloc - endif - - REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) diff --git a/srcpkgs/redis/template b/srcpkgs/redis/template index eb7c63364b0e42..02aa10535d1fe5 100644 --- a/srcpkgs/redis/template +++ b/srcpkgs/redis/template @@ -1,18 +1,20 @@ # Template file for 'redis' pkgname=redis -version=7.0.8 -revision=2 +version=8.8.2 +revision=1 build_style=gnu-makefile -make_build_args="V=1" +# redis makefile sets gcc to link, Void build points to ld +# https://github.com/redis/redis/blob/669b2a1316f5b35ecf964281b77c054ff28dc934/tests/modules/Makefile#L32 +make_build_args="V=1 LD=$CC" make_check_target="test" checkdepends="pkg-config procps-ng tcl-devel which" short_desc="Advanced key-value store" maintainer="Enno Boland " -license="BSD-3-Clause" +license="AGPL-3.0-only OR custom:RSALv2" homepage="https://redis.io" changelog="https://raw.githubusercontent.com/redis/redis/${version%.*}/00-RELEASENOTES" distfiles="http://download.redis.io/releases/redis-${version}.tar.gz" -checksum=06a339e491306783dcf55b97f15a5dbcbdc01ccbde6dc23027c475cab735e914 +checksum=328ccd441d5ef22e00c81cbcd088007887fdfd2fabb32c663998f29033acdb25 system_accounts="redis" redis_homedir="/var/lib/redis" @@ -22,11 +24,10 @@ make_dirs=" /var/lib/redis 0700 redis redis /etc/redis 0750 root redis" -if [ "$XBPS_TARGET_LIBC" = "musl" ]; then - make_build_args+=" MALLOC=libc" -else - makedepends+=" jemalloc-devel" - make_build_args+=" MALLOC=jemalloc" +# only passes --host to bundled jemalloc ./configure if DEB_HOST_GNU_TYPE is set +# https://github.com/redis/redis/blob/669b2a1316f5b35ecf964281b77c054ff28dc934/deps/Makefile#L143-L145 +if [ "$CROSS_BUILD" ]; then + make_build_args+=" JEMALLOC_CONFIGURE_OPTS=--host=$XBPS_CROSS_TRIPLET" fi post_patch() { @@ -34,11 +35,15 @@ post_patch() { -e "s|^# bind 127.0.0.1|bind 127.0.0.1|" \ -e "s|^dir .*|dir ${redis_homedir}|" \ -e "s|^pidfile .*|pidfile /run/redis/redis.pid|" redis.conf + + # no perms to write to /proc//oom_score_adj + rm -f tests/unit/oom-score-adj.tcl + vsed -i -e 's/^\(\s*set oom_adj_avail\).*/\1 0/' tests/unit/introspection.tcl } do_install() { - make INSTALL_BIN=${DESTDIR}/usr/bin PREFIX=/usr install - vlicense COPYING + make CC="$CC" LD="$CC" INSTALL_BIN=${DESTDIR}/usr/bin PREFIX=/usr install + vlicense LICENSE.txt vinstall redis.conf 644 etc/redis vsv redis