[packages/redis] Up to 8.0.1
arekm
arekm at pld-linux.org
Tue May 20 14:11:18 CEST 2025
commit 83b17cb7a2c958c10fe4ac83d80fc5e119ce10c3
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue May 20 13:23:32 2025 +0200
Up to 8.0.1
arm-arch-check.patch | 23 -----------------------
redis-tcl.patch | 12 ++++++------
redis.spec | 19 +++++++++----------
system-jemalloc.patch | 8 ++++----
4 files changed, 19 insertions(+), 43 deletions(-)
---
diff --git a/redis.spec b/redis.spec
index bea9d53..2f09760 100644
--- a/redis.spec
+++ b/redis.spec
@@ -14,12 +14,12 @@
Summary: A persistent key-value database
Name: redis
-Version: 6.2.11
+Version: 8.0.1
Release: 1
-License: BSD
+License: AGPLv3
Group: Applications/Databases
Source0: http://download.redis.io/releases/%{name}-%{version}.tar.gz
-# Source0-md5: 63ed5185723511200f7c0e2a811730dc
+# Source0-md5: 065162870a195ac75c878c2e2e66f035
Source1: %{name}.logrotate
Source2: %{name}.init
Source3: %{name}.tmpfiles
@@ -84,11 +84,11 @@ disk.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%patch -P0 -p1
+%patch -P1 -p1
+%patch -P2 -p1
+%patch -P3 -p1
+%patch -P4 -p1
# Remove integration tests
%{__sed} -i -e '/ integration\/replication/d' tests/test_helper.tcl
@@ -101,7 +101,6 @@ sed -i -e "s/set ::port 21111/set ::port $port/" tests/test_helper.tcl
%{__rm} -r deps/jemalloc
%build
-%define specflags -std=c99 -pedantic
%define _make_opts \\\
CC="%{__cc}" \\\
CFLAGS="%{rpmcflags}" \\\
@@ -188,7 +187,7 @@ fi
%files
%defattr(644,root,root,755)
-%doc 00-RELEASENOTES BUGS CONTRIBUTING COPYING INSTALL MANIFESTO README.md
+%doc 00-RELEASENOTES BUGS CONTRIBUTING.md INSTALL LICENSE.txt MANIFESTO README.md
%attr(755,root,root) %{_bindir}/redis-benchmark
%attr(755,root,root) %{_bindir}/redis-cli
%{_mandir}/man1/redis-benchmark.1*
diff --git a/arm-arch-check.patch b/arm-arch-check.patch
index be45bc9..944fb1b 100644
--- a/arm-arch-check.patch
+++ b/arm-arch-check.patch
@@ -19,29 +19,6 @@ diff --git a/src/Makefile b/src/Makefile
index fdfef2b3c..7334ab9d8 100644
--- a/src/Makefile
+++ b/src/Makefile
-@@ -57,19 +57,17 @@ endif
-
- # Default allocator defaults to Jemalloc if it's not an ARM
- MALLOC=libc
--ifneq ($(uname_M),armv6l)
--ifneq ($(uname_M),armv7l)
-+ifeq (,$(filter armv%,$(uname_M)))
- ifeq ($(uname_S),Linux)
- MALLOC=jemalloc
- endif
- endif
--endif
-
- # To get ARM stack traces if Redis crashes we need a special C flag.
--ifneq (,$(filter aarch64 armv,$(uname_M)))
-+ifneq (,$(filter aarch64 armv%,$(uname_M)))
- CFLAGS+=-funwind-tables
- else
--ifneq (,$(findstring armv,$(uname_M)))
-+ifneq (,$(filter armv%,$(uname_M)))
- CFLAGS+=-funwind-tables
- endif
- endif
@@ -121,7 +119,7 @@ FINAL_LIBS=-lm
DEBUG=-g -ggdb
diff --git a/redis-tcl.patch b/redis-tcl.patch
index 00e9b67..29c4b1d 100644
--- a/redis-tcl.patch
+++ b/redis-tcl.patch
@@ -14,12 +14,12 @@ diff -ur redis-2.8.2.orig/runtest redis-2.8.2/runtest
if [ -z $TCLSH ]
then
-diff -ur redis-2.8.2.orig/utils/speed-regression.tcl redis-2.8.2/utils/speed-regression.tcl
---- redis-2.8.2.orig/utils/speed-regression.tcl 2013-12-02 16:07:46.000000000 +0100
-+++ redis-2.8.2/utils/speed-regression.tcl 2013-12-04 22:03:43.745711543 +0100
+--- redis-8.0.1/utils/speed-regression.tcl~ 2025-05-13 15:28:36.000000000 +0200
++++ redis-8.0.1/utils/speed-regression.tcl 2025-05-20 12:49:50.356129476 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env tclsh8.5
+#!/usr/bin/tclsh
- # Copyright (C) 2011 Salvatore Sanfilippo
- # Released under the BSD license like Redis itself
-
+ # Copyright (C) 2011-Present Redis Ltd. All rights reserved.
+ #
+ # Licensed under your choice of (a) the Redis Source Available License 2.0
+
diff --git a/system-jemalloc.patch b/system-jemalloc.patch
index 5121c88..67349e3 100644
--- a/system-jemalloc.patch
+++ b/system-jemalloc.patch
@@ -1,6 +1,6 @@
---- redis-6.2.5/src/Makefile.orig 2021-07-21 20:06:49.000000000 +0200
-+++ redis-6.2.5/src/Makefile 2022-09-03 18:49:53.269090855 +0200
-@@ -229,9 +227,8 @@
+--- redis-8.0.1/src/Makefile~ 2025-05-20 12:52:44.000000000 +0200
++++ redis-8.0.1/src/Makefile 2025-05-20 12:53:23.940397821 +0200
+@@ -278,9 +278,8 @@ ifeq ($(MALLOC),tcmalloc_minimal)
endif
ifeq ($(MALLOC),jemalloc)
@@ -11,4 +11,4 @@
+ FINAL_LIBS := $(FINAL_LIBS) $(shell $(PKG_CONFIG) --libs jemalloc)
endif
- ifeq ($(BUILD_TLS),yes)
+ # LIBSSL & LIBCRYPTO
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/redis.git/commitdiff/83b17cb7a2c958c10fe4ac83d80fc5e119ce10c3
More information about the pld-cvs-commit
mailing list