From 7c2103cfccdc265cf590ea37cd2e6982aa74ff30 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 17 Jan 2023 15:37:54 +0100
Subject: Redis 6.0.17 - Released Tue Jan 17 12:00:00 IDT 2023

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

diff --git a/redis.spec b/redis.spec
index 837a923..f0cdf9c 100644
--- a/redis.spec
+++ b/redis.spec
@@ -9,6 +9,9 @@
 #
 %global _hardened_build 1
 
+# temp workaround to https://bugzilla.redhat.com/2059488
+%undefine _package_note_file
+
 # to use system libjemalloc
 %bcond_with    jemalloc
 
@@ -34,9 +37,9 @@
 %bcond_with    tests
 
 # Pre-version are only available in github
-%global upstream_ver 6.0.16
+%global upstream_ver 6.0.17
 #global upstream_pre RC4
-%global gh_commit    f092dd3227cc74978853e379c0a7731bdaa324af
+%global gh_commit    281af38767956c125d237ff4015485516bcfaf23
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     redis
 %global gh_project   redis
@@ -55,7 +58,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
+# jemalloc, lzf, linenoise: 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
@@ -179,7 +185,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"
@@ -458,6 +464,10 @@ fi
 
 
 %changelog
+* Tue Jan 17 2023 Remi Collet <remi@remirepo.net> - 6.0.17-1
+- Redis 6.0.17 - Released Tue Jan 17 12:00:00 IDT 2023
+- Upgrade urgency: SECURITY, contains fixes to security issues.
+
 * Mon Oct  4 2021 Remi Collet <remi@remirepo.net> - 6.0.16-1
 - Redis 6.0.16 - Released Mon Oct 4 12:00:00 IDT 2021
 - Upgrade urgency: SECURITY, contains fixes to security issues.
-- 
cgit