diff options
Diffstat (limited to 'redis.spec')
-rw-r--r-- | redis.spec | 228 |
1 files changed, 190 insertions, 38 deletions
@@ -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 @@ -21,18 +24,15 @@ # Tests fail in mock, not in local build. %bcond_with tests -# Pre-version are only available in github -%global upstream_ver 6.2 -%global upstream_pre RC3 -%global gh_commit 2dba1e391d3772a8da182d95bde050ffa9d01e4d -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner redis -%global gh_project redis +%global upstream_ver 7.2.5 +#global upstream_pre rc3 # 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 89970b3057b9f9a0754c7adbcc92a80e7f568da0 +%global gh_owner redis +%global gh_project redis +%global doc_commit 3541d0e20cc4bb7873bdbf51a7717757b806577f %global short_doc_commit %(c=%{doc_commit}; echo ${c:0:7}) # %%{_rpmmacrodir} not usable on EL-6 - EL-7 (without epel-rpms-macros) @@ -42,18 +42,16 @@ Name: redis 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, lzf, linenoise: BSD-2-Clause +# lua: MIT +# fpconv: BSL-1.0 +License: BSD-3-Clause AND BSD-2-Clause AND MIT AND BSL-1.0 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 -%else -Source0: https://download.redis.io/releases/%{name}-%{version}.tar.gz -%endif +Source0: https://download.redis.io/releases/%{name}-%{upstream_ver}%{?upstream_pre:-%{upstream_pre}}.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/%{gh_owner}/%{gh_project}-doc/archive/%{doc_commit}/%{name}-doc-%{short_doc_commit}.tar.gz @@ -64,7 +62,7 @@ Source10: https://github.com/%{gh_owner}/%{gh_project}-doc/archive/%{do # Then refresh your patches # git format-patch HEAD~<number of expected patches> # Update configuration for Fedora -# https://github.com/antirez/redis/pull/3491 - man pages +# https://github.com/redis/redis/pull/3491 - man pages Patch0001: 0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch @@ -77,7 +75,7 @@ BuildRequires: devtoolset-8-libatomic-devel BuildRequires: jemalloc-devel %else # from deps/jemalloc/VERSION -Provides: bundled(jemalloc) = 5.1.0 +Provides: bundled(jemalloc) = 5.3.0 %endif %if %{with tests} BuildRequires: procps-ng @@ -91,20 +89,22 @@ BuildRequires: openssl-devel >= 1.0.2 Obsoletes: redis-trib < %{version}-%{release} %endif -# Required for redis-shutdown -Requires: /bin/awk Requires: logrotate Requires(pre): shadow-utils Requires(post): systemd Requires(preun): systemd Requires(postun): systemd # from deps/hiredis/hiredis.h -Provides: bundled(hiredis) = 1.0.0 +Provides: bundled(hiredis) = 1.0.3 # 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 +# no version +Provides: bundled(fpconv) %global redis_modules_abi 1 %global redis_modules_dir %{_libdir}/%{name}/modules @@ -146,7 +146,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" @@ -169,13 +169,9 @@ and removal, status checks, resharding, rebalancing, and other operations. %endif %prep -%if 0%{?upstream_pre:1} -%setup -q -n %{gh_project}-%{gh_commit} -b 10 -%else -%setup -q -b 10 -%endif +%setup -q -n %{name}-%{upstream_ver}%{?upstream_pre:-%{upstream_pre}} -b 10 mv ../%{name}-doc-%{doc_commit} doc -%patch0001 -p1 +%patch -P0001 -p1 %if %{with jemalloc} rm -frv deps/jemalloc @@ -186,14 +182,26 @@ sed -i -e 's|-I../deps/jemalloc.*|-DJEMALLOC_NO_DEMANGLE -I/usr/include/jemalloc %else mv deps/jemalloc/COPYING COPYING-jemalloc %endif -mv deps/lua/COPYRIGHT COPYRIGHT-lua -mv deps/hiredis/COPYING COPYING-hiredis +mv deps/lua/COPYRIGHT COPYRIGHT-lua +mv deps/hiredis/COPYING COPYING-hiredis +mv deps/hdr_histogram/LICENSE.txt LICENSE-hdrhistogram +mv deps/hdr_histogram/COPYING.txt COPYING-hdrhistogram +mv deps/fpconv/LICENSE.txt LICENSE-fpconv # Configuration file changes sed -i -e 's|^logfile .*$|logfile /var/log/redis/redis.log|g' redis.conf sed -i -e 's|^logfile .*$|logfile /var/log/redis/sentinel.log|g' sentinel.conf sed -i -e 's|^dir .*$|dir /var/lib/redis|g' redis.conf +# See https://bugzilla.redhat.com/2240293 +# See https://src.fedoraproject.org/rpms/jemalloc/blob/rawhide/f/jemalloc.spec#_34 +%ifarch %ix86 %arm x86_64 s390x +sed -e 's/--with-lg-quantum/--with-lg-page=12 --with-lg-quantum/' -i deps/Makefile +%endif +%ifarch ppc64 ppc64le aarch64 +sed -e 's/--with-lg-quantum/--with-lg-page=16 --with-lg-quantum/' -i deps/Makefile +%endif + # Module API version safety check api=`sed -n -e 's/#define REDISMODULE_APIVER_[0-9][0-9]* //p' src/redismodule.h` if test "$api" != "%{redis_modules_abi}"; then @@ -251,9 +259,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 @@ -272,7 +277,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 @@ -292,7 +297,7 @@ install -pDm644 %{S:9} %{buildroot}%{macrosdir}/macros.%{name} sed -e '/memefficiency/d' -i tests/test_helper.tcl %endif -# https://github.com/antirez/redis/issues/1417 (for "taskset -c 1") +# https://github.com/redis/redis/issues/1417 (for "taskset -c 1") taskset -c 1 make %{make_flags} test make %{make_flags} test-sentinel %else @@ -355,6 +360,9 @@ fi %license COPYING %license COPYRIGHT-lua %license COPYING-hiredis +%license LICENSE-hdrhistogram +%license COPYING-hdrhistogram +%license LICENSE-fpconv %if %{without jemalloc} %license COPYING-jemalloc %endif @@ -362,8 +370,8 @@ fi %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} %if %{with redistrib} @@ -373,7 +381,6 @@ fi %exclude %{_includedir} %exclude %{_docdir}/%{name}/* %{_bindir}/%{name}-* -%{_libexecdir}/%{name}-* %{_mandir}/man1/%{name}* %{_mandir}/man5/%{name}* %{_unitdir}/%{name}.service @@ -390,6 +397,7 @@ fi %{macrosdir}/* %files doc +%license doc/LICENSE %docdir %{_docdir}/%{name} %{_docdir}/%{name} @@ -401,6 +409,150 @@ fi %changelog +* Mon May 20 2024 Remi Collet <remi@remirepo.net> - 7.2.5-1 +- Redis 7.2.5 Released Thu 16 May 2024 12:00:00 IST +- Upgrade urgency MODERATE + +* Tue Jan 9 2024 Remi Collet <remi@remirepo.net> - 7.2.4-1 +- Redis 7.2.4 Released Tue 09 Jan 2024 10:45:52 IST +- Upgrade urgency SECURITY: CVE-2023-41056 + +* Thu Nov 2 2023 Remi Collet <remi@remirepo.net> - 7.2.3-1 +- Redis 7.2.3 Released Wed 01 Nov 2023 12:00:00 IST +- Upgrade urgency: HIGH, Fixes critical bugs affecting most users. + +* Wed Oct 18 2023 Remi Collet <remi@remirepo.net> - 7.2.2-1 +- Redis 7.2.2 Released Wed 18 Oct 2023 10:33:40 IDT +- Upgrade urgency SECURITY: CVE-2023-45145 + +* Mon Sep 25 2023 Remi Collet <remi@remirepo.net> - 7.2.1-2 +- set jemalloc page size #2240293 + +* Thu Sep 7 2023 Remi Collet <remi@remirepo.net> - 7.2.1-1 +- Redis 7.2.1 Released Wed 06 Sep 2023 15:00:00 IDT +- Upgrade urgency SECURITY: CVE-2023-41053 + +* Wed Aug 16 2023 Remi Collet <remi@remirepo.net> - 7.2.0-1 +- Redis 7.2.0 GA Released Mon Aug 15 12:00:00 IDT 2023 +- Upgrade urgency LOW: This is the first stable Release for Redis 7.2. + +* Mon Jul 10 2023 Remi Collet <remi@remirepo.net> - 7.2~rc3-1 +- Redis 7.2 RC3 (7.1.242) Released Mon July 10 12:00:00 IDT 2023 +- Upgrade urgency LOW: This is the third Release Candidate for Redis 7.2 +- Upgrade urgency SECURITY: If you're using a previous release candidate of 7.2 + +* Tue May 16 2023 Remi Collet <remi@remirepo.net> - 7.2~rc2-1 +- Redis 7.2 RC2 (7.1.241) Released Mon May 15 12:00:00 IST 2023 + +* Thu Mar 30 2023 Remi Collet <remi@remirepo.net> - 7.2~rc1-3 +- fix modules directory ownership and permissions #2176173 + +* Tue Mar 28 2023 Remi Collet <remi@remirepo.net> - 7.2~rc1-2 +- drop redis-shutdown helper and rely on systemd #2181181 + +* Thu Mar 23 2023 Remi Collet <remi@remirepo.net> - 7.2~rc1-1 +- rebuild with upstream sources instead of git snapshot +- refresh documentation + +* Thu Mar 23 2023 Remi Collet <remi@remirepo.net> - 7.2~RC1-1 +- Redis 7.2 RC1 (7.1.240) Released Wed Mar 22 12:00:00 IST 2023 + +* Tue Mar 21 2023 Remi Collet <remi@remirepo.net> - 7.0.10-1 +- Redis 7.0.10 Released Mon Mar 20 16:00:00 IST 2023 +- Upgrade urgency: SECURITY, contains fixes to security issues. + +* Wed Mar 1 2023 Remi Collet <remi@remirepo.net> - 7.0.9-1 +- Redis 7.0.9 Released Tue Feb 28 12:00:00 IST 2023 +- Upgrade urgency: SECURITY, contains fixes to security issues + +* Tue Jan 17 2023 Remi Collet <remi@remirepo.net> - 7.0.8-1 +- Redis 7.0.8 Released Mon Jan 16 12:00:00 IDT 2023 +- Upgrade urgency: SECURITY, contains fixes to security issues. + +* Fri Dec 16 2022 Remi Collet <remi@remirepo.net> - 7.0.7-1 +- Redis 7.0.7 Released Fri Dec 16 12:00:00 IST 2022 +- Upgrade urgency: MODERATE, Contains fix for a regression in Geo commands. + +* Tue Dec 13 2022 Remi Collet <remi@remirepo.net> - 7.0.6-1 +- Redis 7.0.6 - Released Mon Dec 12 12:00:00 IST 2022 +- Upgrade urgency: MODERATE, Contains fixes for a few non-critical or unlikely + bugs, and some dramatic optimizations to Geo, EVAL, and Sorted sets commands. + +* Thu Sep 22 2022 Remi Collet <remi@remirepo.net> - 7.0.5-2 +- Redis 7.0.5 - Released Wed Sep 21 20:00:00 IST 2022 +- Upgrade urgency: SECURITY, contains fixes to security issues. +- refresh documentation + +* Thu Sep 22 2022 Remi Collet <remi@remirepo.net> - 7.0.5-1 +- Redis 7.0.5 - Released Wed Sep 21 20:00:00 IST 2022 +- Upgrade urgency: SECURITY, contains fixes to security issues. + +* Mon Jul 18 2022 Remi Collet <remi@remirepo.net> - 7.0.4-1 +- Redis 7.0.4 - Released Monday Jul 18 12:00:00 IST 2022 +- Upgrade urgency: SECURITY, contains fixes to security issues. + +* Tue Jul 12 2022 Remi Collet <remi@remirepo.net> - 7.0.3-1 +- Redis 7.0.3 - Released Monday Jul 11 12:00:00 IST 2022 +- Upgrade urgency: MODERATE, specifically if you're using a previous release + of Redis 7.0, contains fixes for bugs in previous 7.0 releases. + +* Mon Jun 13 2022 Remi Collet <remi@remirepo.net> - 7.0.2-1 +- Redis 7.0.2 - Released Sunday Jun 12 12:00:00 IST 2022 +- Upgrade urgency: MODERATE, specifically if you're using a previous release of + Redis 7.0, contains fixes for bugs in previous 7.0 releases. + +* Wed Jun 8 2022 Remi Collet <remi@remirepo.net> - 7.0.1-1 +- Redis 7.0.1 - Released Wed Jun 8 12:00:00 IST 2022 +- Upgrade urgency: MODERATE, specifically if you're using a previous release of + Redis 7.0, contains some behavior changes for new 7.0 features and important + fixes for bugs in previous 7.0 releases. + +* Wed Apr 27 2022 Remi Collet <remi@remirepo.net> - 7.0.0-1 +- Redis 7.0.0 GA - Released Wed Apr 27 12:00:00 IST 2022 +- Upgrade urgency: SECURITY, contains fixes to security issues. + +* Tue Apr 5 2022 Remi Collet <remi@remirepo.net> - 7.0~RC3-1 +- update to 7.0-RC3 (6.9.242) - Released Tue Apr 5 12:00:00 IST 2022 + +* Tue Mar 1 2022 Remi Collet <remi@remirepo.net> - 7.0~RC2-1 +- update to 7.0-RC2 (6.9.241) - Released Mon Feb 28 12:00:00 IST 2022 + +* Mon Jan 31 2022 Remi Collet <remi@remirepo.net> - 7.0~RC1-1 +- update to 7.0-RC1 (6.9.240) - Released Mon Jan 31 12:00:00 IST 2022 + +* Mon Oct 4 2021 Remi Collet <remi@remirepo.net> - 6.2.6-1 +- Redis 6.2.6 - Released Mon Oct 4 12:00:00 IDT 2021 +- Upgrade urgency: SECURITY, contains fixes to security issues. + +* Thu Jul 22 2021 Remi Collet <remi@remirepo.net> - 6.2.5-1 +- Redis 6.2.5 - Released Wed Jul 21 16:32:19 IDT 2021 +- Upgrade urgency: SECURITY, contains fixes to security issues that affect + authenticated client connections on 32-bit versions. MODERATE otherwise. + +* Wed Jun 2 2021 Remi Collet <remi@remirepo.net> - 6.2.4-1 +- Redis 6.2.4 - Released Tue June 1 12:00:00 IST 2021 +- Upgrade urgency: SECURITY, Contains fixes to security issues that affect + authenticated client connections. MODERATE otherwise. + +* Tue May 4 2021 Remi Collet <remi@remirepo.net> - 6.2.3-1 +- Redis 6.2.3 - Released Mon May 3 19:00:00 IST 2021 +- Upgrade urgency: SECURITY, Contains fixes to security issues that affect + authenticated client connections. LOW otherwise. + +* Tue Apr 20 2021 Remi Collet <remi@remirepo.net> - 6.2.2-1 +- Redis 6.2.2 - Released Mon April 19 19:00:00 IST 2021 +- Upgrade urgency: HIGH, if you're using ACL and pub/sub, + CONFIG REWRITE, or suffering from performance regression. + +* Tue Mar 2 2021 Remi Collet <remi@remirepo.net> - 6.2.1-1 +- Redis 6.2.1 - Released Mon Mar 1 17:51:36 IST 2021 +- Upgrade urgency: LOW. + +* Tue Feb 23 2021 Remi Collet <remi@remirepo.net> - 6.2.0-1 +- Redis 6.2.0 GA - Released Tue Feb 22 14:00:00 IST 2021 +- Upgrade urgency: SECURITY if you use 32bit build of redis, + MODERATE if you used earlier versions of Redis 6.2, LOW otherwise + * Wed Feb 3 2021 Remi Collet <remi@remirepo.net> - 6.2~RC3-1 - update to 6.2-RC3 (6.1.242) |