Import from CS git

This commit is contained in:
eabdullin 2025-01-22 10:29:23 +00:00
parent a48937d889
commit 97be83b033
3 changed files with 11 additions and 5 deletions

2
.gitignore vendored
View File

@ -1,2 +1,2 @@
SOURCES/redis-6.2.7.tar.gz
SOURCES/redis-6.2.17.tar.gz
SOURCES/redis-doc-8d4bf9b.tar.gz

View File

@ -1,2 +1,2 @@
b01ef3f117c9815dea41bf2609e489a03c3a5ab1 SOURCES/redis-6.2.7.tar.gz
8406690e53c15d103862bb9dd25efca586835cbd SOURCES/redis-6.2.17.tar.gz
45ec7c3b4a034891252507febace7e25ee64b4d9 SOURCES/redis-doc-8d4bf9b.tar.gz

View File

@ -19,7 +19,7 @@
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
Name: redis
Version: 6.2.7
Version: 6.2.17
Release: 1%{?dist}
Summary: A persistent key-value database
# redis, jemalloc, linenoise, lzf, hiredis are BSD
@ -131,8 +131,8 @@ administration and development.
%setup -q -b 10
%setup -q
mv ../%{name}-doc-%{doc_commit} doc
%patch0001 -p1
%patch0003 -p1 -b .rev
%patch -P0001 -p1
%patch -P0003 -p1 -b .rev
mv deps/lua/COPYRIGHT COPYRIGHT-lua
mv deps/jemalloc/COPYING COPYING-jemalloc
@ -281,6 +281,12 @@ exit 0
%changelog
* Mon Jan 13 2025 Remi Collet <rcollet@redhat.com> - 6.2.17-1
- rebase to 6.2.17 for CVE-2024-46981
* Thu Nov 7 2024 Remi Collet <rcollet@redhat.com> - 6.2.16-1
- rebase to 6.2.16 RHEL-66165
* Mon May 9 2022 Remi Collet <rcollet@redhat.com> - 6.2.7-1
- rebase to 6.2.7 #1999873