From f1b5b9fff4f3b384535780208e6ae41633277505 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 17 Jan 2023 08:06:56 +0100
Subject: Redis 6.2.9 - Released Mon Jan 16 12:00:00 IDT 2023

Upgrade urgency: SECURITY, contains fixes to security issues.
---
 redis.spec | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'redis.spec')

diff --git a/redis.spec b/redis.spec
index 9cfb294..a4a0c33 100644
--- a/redis.spec
+++ b/redis.spec
@@ -25,7 +25,7 @@
 %bcond_with    tests
 
 # Pre-version are only available in github
-%global upstream_ver 6.2.8
+%global upstream_ver 6.2.9
 #global upstream_pre RC3
 %global gh_commit    2dba1e391d3772a8da182d95bde050ffa9d01e4d
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
@@ -35,7 +35,7 @@
 # Commit IDs for the (unversioned) redis-doc repository
 # https://fedoraproject.org/wiki/Packaging:SourceURL "Commit Revision"
 # https://github.com/redis/redis-doc/commits/master
-%global doc_commit bc8218eb481cc5d095ee7c274388a44dc09942e9
+%global doc_commit 281af38767956c125d237ff4015485516bcfaf23
 %global short_doc_commit %(c=%{doc_commit}; echo ${c:0:7})
 
 # %%{_rpmmacrodir} not usable on EL-6 - EL-7 (without epel-rpms-macros)
@@ -46,7 +46,10 @@ Version:           %{upstream_ver}%{?upstream_pre:~%{upstream_pre}}
 Release:           1%{?dist}
 Summary:           A persistent key-value database
 Group:             Applications/Databases
-License:           BSD
+# redis, hiredis: BSD-3-Clause
+# hdrhistogram, jemalloc: BSD-2-Clause
+# lua: MIT
+License:           BSD-3-Clause AND BSD-2-Clause AND MIT
 URL:               http://redis.io
 %if 0%{?upstream_pre:1}
 Source0:           https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{upstream_ver}%{upstream_pre}-%{gh_short}.tar.gz
@@ -149,7 +152,7 @@ API documentation is available in the redis-doc package.
 
 %package           doc
 Summary:           Documentation for Redis including man pages
-License:           CC-BY-SA
+License:           CC-BY-SA-4.0
 BuildArch:         noarch
 
 # http://fedoraproject.org/wiki/Packaging:Conflicts "Splitting Packages"
@@ -405,6 +408,10 @@ fi
 
 
 %changelog
+* Tue Jan 17 2023 Remi Collet <remi@remirepo.net> - 6.2.9-1
+- Redis 6.2.9 - Released Mon Jan 16 12:00:00 IDT 2023
+- Upgrade urgency: SECURITY, contains fixes to security issues.
+
 * Tue Dec 13 2022 Remi Collet <remi@remirepo.net> - 6.2.8-1
 - Redis 6.2.8 - Released Mon 12 Dec 2022 12:00:00 IST
 - Upgrade urgency: MODERATE, Contains fixes for a few non-critical or
-- 
cgit