7 changed files with 134 additions and 78 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,2 @@
-SOURCES/redis-6.2.7.tar.gz
-SOURCES/redis-doc-3fdb6df.tar.gz
+SOURCES/redis-7.0.12.tar.gz
+SOURCES/redis-doc-c7880ba.tar.gz
--- a/.redis.metadata
+++ b/.redis.metadata
@ -1,2 +1,2 @@
-b01ef3f117c9815dea41bf2609e489a03c3a5ab1 SOURCES/redis-6.2.7.tar.gz
-1af2e3e6d240e8b87d21bbd4d81fef78e9af7090 SOURCES/redis-doc-3fdb6df.tar.gz
+cd8190d9289d46be2b3a30dda14ffba8a92abbc8 SOURCES/redis-7.0.12.tar.gz
+b2c7f2bee8e40fc6bd5385c25429fa537e2751c5 SOURCES/redis-doc-c7880ba.tar.gz
--- a/SOURCES/0002-deps-jemalloc-Do-not-force-building-in-gnu99-mode.patch
+++ b/SOURCES/0002-deps-jemalloc-Do-not-force-building-in-gnu99-mode.patch
@ -0,0 +1,33 @@
+From bbace21828d7e82f1c481f0e1caece31b661cbd9 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Mon, 5 Dec 2022 11:10:37 +0100
+Subject: [PATCH 2/2] deps/jemalloc: Do not force building in gnu99 mode
+Content-type: text/plain
+
+The jemalloc configure logic switches to gnu11 mode if available,
+and this explicit flags injection prevents that.  The main difference
+seems to be that in gnu99 mode, <stdatomic.h> is presumed to be
+unavailable and is not used.
+
+Submitted upstream: <https://github.com/redis/redis/pull/11583>
+
+---
+ deps/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/deps/Makefile b/deps/Makefile
+index 8592e17..d6cb06e 100644
+--- a/deps/Makefile
+++ b/deps/Makefile
+@@ -90,7 +90,7 @@ lua: .make-prerequisites
+ 
+ .PHONY: lua
+ 
+-JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -g3 -O3 -funroll-loops $(CFLAGS)
+JEMALLOC_CFLAGS= -Wall -pipe -g3 -O3 -funroll-loops $(CFLAGS)
+ JEMALLOC_LDFLAGS= $(LDFLAGS)
+ 
+ ifneq ($(DEB_HOST_GNU_TYPE),)
+-- 
+2.38.1
+
--- a/SOURCES/redis-sentinel.service
+++ b/SOURCES/redis-sentinel.service
@ -6,7 +6,6 @@ Wants=network-online.target

 [Service]
 ExecStart=/usr/bin/redis-sentinel /etc/redis/sentinel.conf --daemonize no --supervised systemd
-ExecStop=/usr/libexec/redis-shutdown sentinel
 Type=notify
 User=redis
 Group=redis
--- a/SOURCES/redis-shutdown
+++ b/SOURCES/redis-shutdown
@ -1,40 +0,0 @@
-#!/bin/bash
-#
-# Wrapper to close properly redis and sentinel
-test x"$REDIS_DEBUG" != x && set -x
-
-REDIS_CLI=/usr/bin/redis-cli
-
-# Retrieve service name
-SERVICE_NAME="$1"
-if [ -z "$SERVICE_NAME" ]; then
-   SERVICE_NAME=redis
-fi
-
-# Get the proper config file based on service name
-CONFIG_FILE="/etc/redis/$SERVICE_NAME.conf"
-
-# Use awk to retrieve host, port from config file
-HOST=`awk '/^[[:blank:]]*bind/ { print $2 }' $CONFIG_FILE | tail -n1`
-PORT=`awk '/^[[:blank:]]*port/ { print $2 }' $CONFIG_FILE | tail -n1`
-PASS=`awk '/^[[:blank:]]*requirepass/ { print $2 }' $CONFIG_FILE | tail -n1`
-SOCK=`awk '/^[[:blank:]]*unixsocket\s/ { print $2 }' $CONFIG_FILE | tail -n1`
-
-# Just in case, use default host, port
-HOST=${HOST:-127.0.0.1}
-if [ "$SERVICE_NAME" = redis ]; then
-    PORT=${PORT:-6379}
-else
-    PORT=${PORT:-26739}
-fi
-
-# Setup additional parameters
-# e.g password-protected redis instances
-[ -z "$PASS"  ] || ADDITIONAL_PARAMS="-a $PASS"
-
-# shutdown the service properly
-if [ -e "$SOCK" ] ; then
-	$REDIS_CLI -s $SOCK $ADDITIONAL_PARAMS shutdown
-else
-	$REDIS_CLI -h $HOST -p $PORT $ADDITIONAL_PARAMS shutdown
-fi
--- a/SOURCES/redis.service
+++ b/SOURCES/redis.service
@ -6,7 +6,6 @@ Wants=network-online.target

 [Service]
 ExecStart=/usr/bin/redis-server /etc/redis/redis.conf --daemonize no --supervised systemd
-ExecStop=/usr/libexec/redis-shutdown
 Type=notify
 User=redis
 Group=redis
--- a/SPECS/redis.spec
+++ b/SPECS/redis.spec
@ -7,30 +7,33 @@
 # Please preserve changelog entries
 #

+# temp workaround to https://bugzilla.redhat.com/2059488
+%undefine _package_note_file
+
 # Tests fail in mock, not in local build.
 %bcond_with    tests

 # Commit IDs for the (unversioned) redis-doc repository
 # https://fedoraproject.org/wiki/Packaging:SourceURL "Commit Revision"
-%global doc_commit 3fdb6df44ecd5c4d99ea52a0133177f5ebc24805
+%global doc_commit c7880ba85fd67cb09110a4be790da47d4a6cec80
 %global short_doc_commit %(c=%{doc_commit}; echo ${c:0:7})

 # %%{rpmmacrodir} not usable on EL-6
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)

 Name:              redis
-Version:           6.2.7
+Version:           7.0.12
 Release:           1%{?dist}
 Summary:           A persistent key-value database
-# redis, jemalloc, linenoise, lzf, hiredis are BSD
-# lua is MIT
-License:           BSD and MIT
+# redis, hiredis: BSD-3-Clause
+# hdrhistogram, jemalloc, lzf, linenoise: BSD-2-Clause
+# lua: MIT
+License:           BSD-3-Clause AND BSD-2-Clause AND MIT
 URL:               https://redis.io
 Source0:           https://download.redis.io/releases/%{name}-%{version}.tar.gz
 Source1:           %{name}.logrotate
 Source2:           %{name}-sentinel.service
 Source3:           %{name}.service
-Source6:           %{name}-shutdown
 Source7:           %{name}-limit-systemd
 Source9:           macros.%{name}
 Source10:          https://github.com/%{name}/%{name}-doc/archive/%{doc_commit}/%{name}-doc-%{short_doc_commit}.tar.gz
@ -43,6 +46,7 @@ Source10:          https://github.com/%{name}/%{name}-doc/archive/%{doc_commit}/
 # Update configuration for Fedora
 # https://github.com/redis/redis/pull/3491 - man pages
 Patch0001:         0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch
+Patch0002:         0002-deps-jemalloc-Do-not-force-building-in-gnu99-mode.patch

 BuildRequires: make
 BuildRequires:     gcc
@ -52,11 +56,10 @@ BuildRequires:     tcl
 %endif
 BuildRequires:     pkgconfig(libsystemd)
 BuildRequires:     systemd-devel
+BuildRequires:     systemd-rpm-macros
 BuildRequires:     openssl-devel
 # redis-trib functionality migrated to redis-cli
 Obsoletes:         redis-trib < 5
-# Required for redis-shutdown
-Requires:          /bin/awk
 Requires:          logrotate
 Requires(pre):     shadow-utils
 Requires(post):    systemd
@ -65,12 +68,14 @@ Requires(postun):  systemd
 # from deps/hiredis/hiredis.h
 Provides:          bundled(hiredis) = 0.14.0
 # from deps/jemalloc/VERSION
-Provides:          bundled(jemalloc) = 5.1.0
+Provides:          bundled(jemalloc) = 5.2.1
 # from deps/lua/src/lua.h
 Provides:          bundled(lua-libs) = 5.1.5
 # from deps/linenoise/linenoise.h
 Provides:          bundled(linenoise) = 1.0
 Provides:          bundled(lzf)
+# from deps/hdr_histogram/README.md
+Provides:          bundled(hdr_histogram) = 0.11.0

 %global redis_modules_abi 1
 %global redis_modules_dir %{_libdir}/%{name}/modules
@ -112,7 +117,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"
@ -127,11 +132,14 @@ administration and development.
 %setup -q -b 10
 %setup -q
 mv ../%{name}-doc-%{doc_commit} doc
-%patch0001 -p1
+%patch -P0001 -p1
+%patch -P0002 -p1

 mv deps/lua/COPYRIGHT    COPYRIGHT-lua
 mv deps/jemalloc/COPYING COPYING-jemalloc
 mv deps/hiredis/COPYING  COPYING-hiredis
+mv deps/hdr_histogram/LICENSE.txt LICENSE-hdrhistogram
+mv deps/hdr_histogram/COPYING.txt COPYING-hdrhistogram

 # Configuration file changes
 sed -i -e 's|^logfile .*$|logfile /var/log/redis/redis.log|g' redis.conf
@ -179,9 +187,6 @@ install -p -D -m 644 %{S:7} %{buildroot}%{_sysconfdir}/systemd/system/%{name}-se
 # Fix non-standard-executable-perm error.
 chmod 755 %{buildroot}%{_bindir}/%{name}-*

-# Install redis-shutdown
-install -pDm755 %{S:6} %{buildroot}%{_libexecdir}/%{name}-shutdown
-
 # Install redis module header
 install -pDm644 src/%{name}module.h %{buildroot}%{_includedir}/%{name}module.h

@ -195,7 +200,7 @@ ln -s redis.conf.5   %{buildroot}%{_mandir}/man5/redis-sentinel.conf.5

 # Install documentation and html pages
 doc=$(echo %{buildroot}/%{_docdir}/%{name})
-for page in 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO; do
+for page in 00-RELEASENOTES BUGS MANIFESTO *.md; do
    install -Dpm644 $page $doc/$page
 done
 for page in $(find doc -name \*.md | sed -e 's|.md$||g'); do
@ -259,19 +264,20 @@ fi
 %license COPYRIGHT-lua
 %license COPYING-jemalloc
 %license COPYING-hiredis
+%license LICENSE-hdrhistogram
+%license COPYING-hdrhistogram
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %attr(0750, redis, root) %dir %{_sysconfdir}/%{name}
 %attr(0640, redis, root) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %attr(0640, redis, root) %config(noreplace) %{_sysconfdir}/%{name}/sentinel.conf
-%dir %attr(0750, redis, redis) %{_libdir}/%{name}
-%dir %attr(0750, redis, redis) %{redis_modules_dir}
+%dir %{_libdir}/%{name}
+%dir %{redis_modules_dir}
 %dir %attr(0750, redis, redis) %{_sharedstatedir}/%{name}
 %dir %attr(0750, redis, redis) %{_localstatedir}/log/%{name}
 %exclude %{macrosdir}
 %exclude %{_includedir}
 %exclude %{_docdir}/%{name}/*
 %{_bindir}/%{name}-*
-%{_libexecdir}/%{name}-*
 %{_mandir}/man1/%{name}*
 %{_mandir}/man5/%{name}*
 %{_unitdir}/%{name}.service
@ -296,21 +302,83 @@ fi


 %changelog
-* Tue May 10 2022 Remi Collet <rcollet@redhat.com> - 6.2.7-1
- rebase to 6.2.7 #2083151
+* Tue Jul 11 2023 Remi Collet <rcollet@redhat.com> - 7.0.12-1
+- rebase to 7.0.12 #2221899
+
+* Thu May 25 2023 Remi Collet <rcollet@redhat.com> - 7.0.11-1
+- rebase to 7.0.11 for new redis:7 stream #2129826
+
+* Tue Apr 18 2023 Remi Collet <remi@remirepo.net> - 7.0.11-1
+- Upstream 7.0.11 release.
+
+* Thu Mar 30 2023 Remi Collet <remi@remirepo.net> - 7.0.10-2
+- fix modules directory ownership and permissions #2176173
+- drop redis-shutdown helper and rely on systemd #2181181
+
+* Tue Mar 21 2023 Remi Collet <remi@remirepo.net> - 7.0.10-1
+- Upstream 7.0.10 release.

-* Wed Nov  3 2021 Remi Collet <remi@remirepo.net> - 6.2.6-1
- rebase to 6.2.6 #2013992
+* Wed Feb  1 2023 Remi Collet <remi@remirepo.net> - 7.0.9-1
+- Upstream 7.0.9 release.
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Jan 17 2023 Remi Collet <remi@remirepo.net> - 7.0.8-1
+- Upstream 7.0.8 release.
+
+* Fri Dec 16 2022 Remi Collet <remi@remirepo.net> - 7.0.7-2
+- Upstream 7.0.7 release.
 - refresh documentation
- use proper license file for documentation

-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 6.2.3-3
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Tue Dec 13 2022 Remi Collet <remi@remirepo.net> - 7.0.6-1
+- Upstream 7.0.6 release.
+
+* Mon Dec  5 2022 Florian Weimer <fweimer@redhat.com> - 7.0.5-2
+- Port makefile to C99 mode
+
+* Thu Sep 22 2022 Remi Collet <remi@remirepo.net> - 7.0.5-1
+- Upstream 7.0.5 security release.
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

-* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 6.2.3-2
- Rebuilt for RHEL 9 BETA for openssl 3.0
-  Related: rhbz#1971065
+* Mon Jul 18 2022 Remi Collet <remi@remirepo.net> - 7.0.4-1
+- Upstream 7.0.4 release.
+
+* Tue Jul 12 2022 Remi Collet <remi@remirepo.net> - 7.0.3-1
+- Upstream 7.0.3 release.
+
+* Mon Jun 13 2022 Remi Collet <remi@remirepo.net> - 7.0.2-1
+- Upstream 7.0.2 release.
+
+* Wed Jun  8 2022 Remi Collet <remi@remirepo.net> - 7.0.1-1
+- Upstream 7.0.1 release.
+
+* Thu Apr 28 2022 Remi Collet <remi@remirepo.net> - 7.0.0-1
+- Upstream 7.0.0 release.
+
+* Thu Apr 28 2022 Remi Collet <remi@remirepo.net> - 6.2.7-1
+- Upstream 6.2.7 release.
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Nov  3 2021 Remi Collet <remi@remirepo.net> - 6.2.6-2
+- use proper license in dec/devel sub-packages
+
+* Mon Oct  4 2021 Remi Collet <remi@remirepo.net> - 6.2.6-1
+- Upstream 6.2.6 release.
+
+* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 6.2.5-2
+- Rebuilt with OpenSSL 3.0.0
+
+* Thu Jul 22 2021 Nathan Scott <nathans@redhat.com> - 6.2.5-1
+- Upstream 6.2.5 release (RHBZ #1984631).
+- Fix CVE-2021-32761: 32-bit systems BITFIELD command integer overflow.
+
+* Wed Jun  2 2021 Remi Collet <remi@remirepo.net> - 6.2.4-1
+- Upstream 6.2.4 release.

 * Tue May  4 2021 Remi Collet <remi@remirepo.net> - 6.2.3-1
 - Upstream 6.2.3 release
@ -318,9 +386,6 @@ fi
 * Tue Apr 20 2021 Remi Collet <remi@remirepo.net> - 6.2.2-1
 - Upstream 6.2.2 release

-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 6.2.1-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
 * Thu Apr 01 2021 Nathan Scott <nathans@redhat.com> - 6.2.1-1
 - Upstream 6.2.1 release
 - Merged make-macros spec change from Tom Stellard