summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-07-17 19:50:37 +0200
committerRemi Collet <remi@remirepo.net>2017-07-17 19:50:37 +0200
commit96033cb9eff1d4da902a3f4d51e4dd454430898f (patch)
tree7e4af1b1102504c8f722a1307a91bf2726a7c1e6
parent43a916d92fb43050addde691d64eb1f4df91f50a (diff)
v4.0.0 GA
-rw-r--r--0002-redis-3.2-deps-library-fPIC-performance-tuning.patch36
-rw-r--r--redis-dev.spec644
-rw-r--r--redis-sentinel.service2
-rw-r--r--redis.service2
-rw-r--r--redis.spec47
5 files changed, 24 insertions, 707 deletions
diff --git a/0002-redis-3.2-deps-library-fPIC-performance-tuning.patch b/0002-redis-3.2-deps-library-fPIC-performance-tuning.patch
deleted file mode 100644
index acac994..0000000
--- a/0002-redis-3.2-deps-library-fPIC-performance-tuning.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up ./deps/geohash-int/Makefile.pic ./deps/geohash-int/Makefile
---- ./deps/geohash-int/Makefile.pic 2016-01-15 16:47:38.818294577 +0100
-+++ ./deps/geohash-int/Makefile 2016-01-15 16:48:23.641486461 +0100
-@@ -2,7 +2,7 @@ STD=
- WARN= -Wall
- OPT= -O2
-
--R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
-+R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) -fPIC
- R_LDFLAGS= $(LDFLAGS)
- DEBUG= -g
-
-diff -up ./deps/linenoise/Makefile.pic ./deps/linenoise/Makefile
---- ./deps/linenoise/Makefile.pic 2015-12-23 13:35:32.000000000 +0100
-+++ ./deps/linenoise/Makefile 2016-01-15 16:44:52.561582851 +0100
-@@ -2,7 +2,7 @@ STD=
- WARN= -Wall
- OPT= -Os
-
--R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
-+R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) -fPIC
- R_LDFLAGS= $(LDFLAGS)
- DEBUG= -g
-
-diff -up ./deps/Makefile.pic ./deps/Makefile
---- ./deps/Makefile.pic 2015-12-23 13:35:32.000000000 +0100
-+++ ./deps/Makefile 2016-01-15 16:44:52.561582851 +0100
-@@ -59,7 +59,7 @@ ifeq ($(uname_S),SunOS)
- LUA_CFLAGS= -D__C99FEATURES__=1
- endif
-
--LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' $(CFLAGS)
-+LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' $(CFLAGS) -fPIC
- LUA_LDFLAGS+= $(LDFLAGS)
- # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
- # challenging to cross-compile lua (and redis). These defines make it easier
diff --git a/redis-dev.spec b/redis-dev.spec
deleted file mode 100644
index 39fed25..0000000
--- a/redis-dev.spec
+++ /dev/null
@@ -1,644 +0,0 @@
-# remirepo spec file for redis, from:
-#
-# Fedora spec file for redis
-#
-# License: MIT
-# http://opensource.org/licenses/MIT
-#
-# Please preserve changelog entries
-#
-%global _hardened_build 1
-
-# systemd >= 204 with additional service config
-%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
-%global with_systemd 1
-%else
-%global with_systemd 0
-%endif
-
-# Tests fail in mock, not in local build.
-%global with_tests %{?_with_tests:1}%{!?_with_tests:0}
-
-# Pre-version are only available in github
-%global prever RC3
-%global gh_commit 51b12ed1b5dccd6234e0dc1d3f76996420bcf5a9
-%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_owner antirez
-%global gh_project redis
-
-Name: redis
-Version: 4.0.0
-Release: 0.4.%{prever}%{?dist}
-Summary: A persistent key-value database
-
-Group: Applications/Databases
-License: BSD
-URL: http://redis.io
-%if 0%{?prever:1}
-Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}%{prever}-%{gh_short}.tar.gz
-%else
-Source0: http://download.redis.io/releases/%{name}-%{version}.tar.gz
-%endif
-Source1: %{name}.logrotate
-Source2: %{name}.init
-Source3: %{name}.service
-Source5: %{name}-sentinel.init
-Source6: %{name}-sentinel.service
-Source7: %{name}-shutdown
-Source8: %{name}-limit-systemd
-Source9: %{name}-limit-init
-
-# Update configuration for Fedora
-Patch0: 0001-redis-3.2-redis-conf.patch
-Patch1: 0002-redis-4.0-deps-library-fPIC-performance-tuning.patch
-Patch2: 0003-redis-3.2.5-use-system-jemalloc.patch
-
-# https://github.com/antirez/redis/pull/3491 - man pages
-Patch3: %{name}-pr3491.patch
-# https://github.com/antirez/redis/pull/3494 - symlink
-Patch4: %{name}-pr3494.patch
-
-BuildRequires: tcl >= 8.5
-BuildRequires: jemalloc-devel
-
-# Required for redis-shutdown
-Requires: /bin/awk
-Requires: logrotate
-Requires(pre): shadow-utils
-%if %{with_systemd}
-BuildRequires: systemd-units
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-%else
-Requires(post): chkconfig
-Requires(preun): chkconfig
-Requires(preun): initscripts
-Requires(postun): initscripts
-%endif
-
-
-%description
-Redis is an advanced key-value store. It is often referred to as a data
-structure server since keys can contain strings, hashes, lists, sets and
-sorted sets.
-
-You can run atomic operations on these types, like appending to a string;
-incrementing the value in a hash; pushing to a list; computing set
-intersection, union and difference; or getting the member with highest
-ranking in a sorted set.
-
-In order to achieve its outstanding performance, Redis works with an
-in-memory dataset. Depending on your use case, you can persist it either
-by dumping the dataset to disk every once in a while, or by appending
-each command to a log.
-
-Redis also supports trivial-to-setup master-slave replication, with very
-fast non-blocking first synchronization, auto-reconnection on net split
-and so forth.
-
-Other features include Transactions, Pub/Sub, Lua scripting, Keys with a
-limited time-to-live, and configuration settings to make Redis behave like
-a cache.
-
-You can use Redis from most programming languages also.
-
-Documentation: http://redis.io/documentation
-
-
-%prep
-%if 0%{?prever:1}
-%setup -q -n %{gh_project}-%{gh_commit}
-%else
-%setup -q -n %{name}-%{version}
-%endif
-
-%patch0 -p1 -b .rpmconf
-%patch1 -p1 -b .pic
-%patch2 -p0 -b .jem
-
-%patch3 -p1
-%patch4 -p1 -b .old
-
-# No hidden build.
-sed -i -e 's|\t@|\t|g' deps/lua/src/Makefile
-sed -i -e 's|$(QUIET_CC)||g' src/Makefile
-sed -i -e 's|$(QUIET_LINK)||g' src/Makefile
-sed -i -e 's|$(QUIET_INSTALL)||g' src/Makefile
-# Ensure deps are built with proper flags
-sed -i -e 's|$(CFLAGS)|%{optflags}|g' deps/Makefile
-sed -i -e 's|OPTIMIZATION?=-O3|OPTIMIZATION=%{optflags}|g' deps/hiredis/Makefile
-sed -i -e 's|$(LDFLAGS)|%{?__global_ldflags}|g' deps/hiredis/Makefile
-sed -i -e 's|$(CFLAGS)|%{optflags}|g' deps/linenoise/Makefile
-sed -i -e 's|$(LDFLAGS)|%{?__global_ldflags}|g' deps/linenoise/Makefile
-
-
-%build
-rm -rvf deps/jemalloc
-
-export CFLAGS="$RPM_OPT_FLAGS"
-make %{?_smp_mflags} V=1 \
- DEBUG="" \
- LDFLAGS="%{?__global_ldflags}" \
- CFLAGS="$RPM_OPT_FLAGS -fPIC" \
- LUA_CFLAGS="-fPIC" \
- MALLOC=jemalloc \
- all
-
-%check
-%if %{with_tests}
-# ERR Active defragmentation cannot be enabled: it requires a Redis server compiled
-# with a modified Jemalloc like the one shipped by default with the Redis source distribution
-sed -e '/memefficiency/d' -i tests/test_helper.tcl
-
-make test
-make test-sentinel
-%else
-: Test disabled, missing '--with tests' option.
-%endif
-
-%install
-make install PREFIX=%{buildroot}%{_prefix}
-# Install misc other
-install -p -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
-install -p -D -m 640 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf
-install -p -D -m 640 sentinel.conf %{buildroot}%{_sysconfdir}/%{name}-sentinel.conf
-install -d -m 750 %{buildroot}%{_localstatedir}/lib/%{name}
-install -d -m 750 %{buildroot}%{_localstatedir}/log/%{name}
-
-%if %{with_systemd}
-# Install systemd unit
-install -p -D -m 644 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}.service
-install -p -D -m 644 %{SOURCE6} %{buildroot}%{_unitdir}/%{name}-sentinel.service
-# this folder requires systemd >= 204
-install -p -D -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/systemd/system/%{name}.service.d/limit.conf
-install -p -D -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/systemd/system/%{name}-sentinel.service.d/limit.conf
-%else
-install -d -m 750 %{buildroot}%{_localstatedir}/run/%{name}
-install -p -D -m 755 %{SOURCE2} %{buildroot}%{_initrddir}/%{name}
-install -p -D -m 755 %{SOURCE5} %{buildroot}%{_initrddir}/%{name}-sentinel
-install -p -D -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/security/limits.d/95-%{name}.conf
-%endif
-
-# Fix non-standard-executable-perm error
-chmod 755 %{buildroot}%{_bindir}/%{name}-*
-
-# Install redis-shutdown
-install -pDm755 %{SOURCE7} %{buildroot}%{_libexecdir}/%{name}-shutdown
-
-# Install man pages
-man=$(dirname %{buildroot}%{_mandir})
-for page in man/man?/*; do
- install -Dpm644 $page $man/$page
-done
-ln -s redis-server.1 %{buildroot}%{_mandir}/man1/redis-sentinel.1
-ln -s redis.conf.5 %{buildroot}%{_mandir}/man5/redis-sentinel.conf.5
-
-
-%post
-%if 0%{?systemd_post:1}
-%systemd_post redis.service
-%systemd_post redis-sentinel.service
-%else
-# Initial installation (always, for new service)
-/sbin/chkconfig --add redis
-/sbin/chkconfig --add redis-sentinel
-%endif
-
-%pre
-getent group redis &> /dev/null || \
-groupadd -r redis &> /dev/null
-getent passwd redis &> /dev/null || \
-useradd -r -g redis -d %{_sharedstatedir}/redis -s /sbin/nologin \
- -c 'Redis Server' redis &> /dev/null
-exit 0
-
-%preun
-%if 0%{?systemd_preun:1}
-%systemd_preun redis.service
-%systemd_preun redis-sentinel.service
-%else
-if [ $1 = 0 ]; then
- # Package removal, not upgrade
- /sbin/service redis-sentinel stop &> /dev/null
- /sbin/chkconfig --del redis-sentinel &> /dev/null
-
- /sbin/service redis stop &> /dev/null
- /sbin/chkconfig --del redis &> /dev/null
-fi
-%endif
-
-%postun
-%if 0%{?systemd_postun_with_restart:1}
-%systemd_postun_with_restart redis.service
-%systemd_postun_with_restart redis-sentinel.service
-%else
-if [ $1 -ge 1 ]; then
- /sbin/service redis condrestart >/dev/null 2>&1 || :
- /sbin/service redis-sentinel condrestart >/dev/null 2>&1 || :
-fi
-%endif
-
-
-%files
-%{!?_licensedir:%global license %%doc}
-%license COPYING
-%doc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md
-%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
-%attr(0640, redis, root) %config(noreplace) %{_sysconfdir}/%{name}.conf
-%attr(0640, redis, root) %config(noreplace) %{_sysconfdir}/%{name}-sentinel.conf
-%dir %attr(0750, redis, redis) %{_localstatedir}/lib/%{name}
-%dir %attr(0750, redis, redis) %{_localstatedir}/log/%{name}
-%{_bindir}/%{name}-*
-%{_libexecdir}/%{name}-*
-%{_mandir}/man1/redis*
-%{_mandir}/man5/redis*
-%if %{with_systemd}
-%{_unitdir}/%{name}.service
-%{_unitdir}/%{name}-sentinel.service
-%dir %{_sysconfdir}/systemd/system/%{name}.service.d
-%config(noreplace) %{_sysconfdir}/systemd/system/%{name}.service.d/limit.conf
-%dir %{_sysconfdir}/systemd/system/%{name}-sentinel.service.d
-%config(noreplace) %{_sysconfdir}/systemd/system/%{name}-sentinel.service.d/limit.conf
-%else
-%{_initrddir}/%{name}
-%{_initrddir}/%{name}-sentinel
-%config(noreplace) %{_sysconfdir}/security/limits.d/95-%{name}.conf
-%dir %attr(0750, redis, redis) %{_localstatedir}/run/%{name}
-%endif
-
-
-%changelog
-* Sat Jun 24 2017 Remi Collet <remi@remirepo.net> - 4.0.0-0.4.RC3
-- rebuild with some fedora changes:
- - Add RuntimeDirectory=redis to systemd unit file (RHBZ #1454700)
- - Fix a shutdown failure with Unix domain sockets (RHBZ #1444988)
-
-* Mon Apr 24 2017 Remi Collet <remi@fedoraproject.org> - 4.0.0-0.3.RC3
-- update to 4.0.0-RC3 (3.9.103)
-
-* Tue Dec 6 2016 Remi Collet <remi@fedoraproject.org> - 4.0.0-0.2.RC2
-- update to 4.0.0-RC2 (3.9.102)
-
-* Mon Dec 5 2016 Remi Collet <remi@fedoraproject.org> - 4.0.0-0.1.RC1
-- update to 4.0.0-RC1 (3.9.101)
-
-* Thu Oct 27 2016 Remi Collet <remi@fedoraproject.org> - 3.2.5-1
-- Redis 3.2.5 - Released Wed Oct 26 09:16:40 CEST 2016
-- Upgrade urgency LOW: This release only fixes a compilation issue
-
-* Mon Sep 26 2016 Remi Collet <remi@fedoraproject.org> - 3.2.4-1
-- Redis 3.2.4 - Released Mon Sep 26 08:58:21 CEST 2016
-- Upgrade urgency CRITICAL: Redis 3.2 and unstable contained
- a security vulnerability fixed by this release.
-
-* Wed Sep 14 2016 Remi Collet <remi@fedoraproject.org> - 3.2.3-4
-- move redis-shutdown to libexec
-- add missing LSB headers to init scripts
-
-* Fri Sep 9 2016 Remi Collet <remi@fedoraproject.org> - 3.2.3-3
-- add patch from https://github.com/antirez/redis/pull/3494
-
-* Fri Sep 9 2016 Remi Collet <remi@fedoraproject.org> - 3.2.3-2
-- add man pages from https://github.com/antirez/redis/pull/3491
-- data and configuration should not be publicly readable
-- remove /var/run/redis with systemd
-- provide redis-check-rdb as a symlink to redis-server
-
-* Tue Aug 2 2016 Remi Collet <remi@fedoraproject.org> - 3.2.3-1
-- Redis 3.2.3 - Release date: Tue Aug 02 10:55:24 CEST 2016
-- Upgrade urgency MODERATE: Fix replication delay and redis-cli
- security issue.
-
-* Fri Jul 29 2016 Remi Collet <remi@fedoraproject.org> - 3.2.2-1
-- Redis 3.2.2 - Release date: Thu Jul 28 14:14:54 CEST 2016
-- Upgrade urgency MODERATE:
- A Redis server and a Sentinel crash are now fixed.
- GEORADIUS errors in reported entries are fixed.
-
-* Fri Jun 24 2016 Remi Collet <remi@fedoraproject.org> - 3.2.1-2
-- fix %%postun scriptlet, thanks Matthias
-
-* Mon Jun 20 2016 Remi Collet <remi@fedoraproject.org> - 3.2.1-1
-- Redis 3.2.1 - Release date: Fri Jun 17 15:01:56 CEST 2016
-- Upgrade urgency HIGH: Critical fix to Redis Sentinel,
- due to 3.2.0 regression compared to 3.0.
-
-* Tue May 10 2016 Remi Collet <remi@fedoraproject.org> - 3.2.0-1
-- update to 3.2.0
-
-* Mon Feb 8 2016 Haïkel Guémar <hguemar@fedoraproject.org> - 3.2-0.4.rc3
-- Fix redis-shutdown to handle password-protected instances shutdown
-
-* Thu Jan 28 2016 Remi Collet <remi@fedoraproject.org> - 3.2-0.3.rc3
-- update to 3.2-rc3 (version 3.1.103)
-
-* Tue Jan 26 2016 Remi Collet <remi@fedoraproject.org> - 3.2-0.2.rc2
-- update to 3.2-rc2 (version 3.1.102)
-
-* Fri Jan 15 2016 Remi Collet <remi@fedoraproject.org> - 3.2-0.1.rc1
-- update to 3.2-rc1 (version 3.1.101)
- This is the first release candidate of Redis 3.2
-
-* Sat Dec 26 2015 Remi Collet <remi@fedoraproject.org> - 3.0.6-1
-- Redis 3.0.6 - Release date: 18 Dec 2015
-- Upgrade urgency: MODERATE
-
-* Fri Oct 16 2015 Remi Collet <remi@fedoraproject.org> - 3.0.5-1
-- Redis 3.0.5 - Release date: 15 Oct 2015
-- Upgrade urgency: MODERATE
-
-* Thu Sep 10 2015 Remi Collet <remi@fedoraproject.org> - 3.0.4-1
-- Redis 3.0.4 - Release date: 8 Sep 2015
-- Upgrade urgency: HIGH for Redis and Sentinel.
-
-* Wed Aug 5 2015 Remi Collet <remi@fedoraproject.org> - 3.0.3-1.1
-- make redis-shutdown more robust, see #22
-
-* Fri Jul 17 2015 Remi Collet <remi@fedoraproject.org> - 3.0.3-1
-- Redis 3.0.3 - Release date: 17 Jul 2015
-- Upgrade urgency: LOW for Redis and Sentinel.
-
-* Tue Jun 9 2015 Remi Collet <remi@fedoraproject.org> - 3.0.2-1
-- Redis 3.0.2 - Release date: 4 Jun 2015
-- Upgrade urgency: HIGH for Redis because of a security issue.
- LOW for Sentinel.
-
-* Wed May 6 2015 Remi Collet <remi@fedoraproject.org> - 3.0.1-1
-- Redis 3.0.1 - Release date: 5 May 2015
-- Upgrade urgency: LOW for Redis and Cluster, MODERATE for Sentinel.
-
-* Tue Apr 14 2015 Remi Collet <remi@fedoraproject.org> - 3.0.0-2
-- rebuild with new redis-shutdown from rawhide
-- improved description from rawhide
-- use redis/redis owner for directories under /var
-
-* Mon Apr 6 2015 Remi Collet <remi@fedoraproject.org> - 3.0.0-1
-- Redis 3.0.0 - Release date: 1 Apr 2015
-
-* Thu Mar 26 2015 Haïkel Guémar <hguemar@fedoraproject.org> - 2.8.19-2
-- Fix redis-shutdown on multiple NIC setup (RHBZ #1201237)
-
-* Wed Dec 17 2014 Remi Collet <remi@fedoraproject.org> - 2.8.19-1
-- Redis 2.8.19 - Release date: 16 Dec 2014
- upgrade urgency: LOW for both Redis and Sentinel.
-
-* Sat Dec 13 2014 Remi Collet <remi@fedoraproject.org> - 2.8.18-2
-- provides /etc/systemd/system/redis.service.d/limit.conf
- and /etc/systemd/system/redis-sentinel.service.d/limit.conf
- or /etc/security/limits.d/95-redis.conf
-
-* Thu Dec 4 2014 Remi Collet <remi@fedoraproject.org> - 2.8.18-1.1
-- EL-5 rebuild with upstream patch
-
-* Thu Dec 4 2014 Remi Collet <remi@fedoraproject.org> - 2.8.18-1
-- Redis 2.8.18 - Release date: 4 Dec 2014
- upgrade urgency: LOW for both Redis and Sentinel.
-- fix isfinite missing on EL-5
-
-* Sun Sep 21 2014 Remi Collet <remi@fedoraproject.org> - 2.8.17-2
-- fix sentinel service unit file for systemd
-- also use redis-shutdown in init scripts
-
-* Sat Sep 20 2014 Remi Collet <remi@fedoraproject.org> - 2.8.17-1
-- Redis 2.8.17 - Release date: 19 Sep 2014
- upgrade urgency: HIGH for Redis Sentinel, LOW for Redis Server.
-
-* Wed Sep 17 2014 Remi Collet <remi@fedoraproject.org> - 2.8.16-1
-- Redis 2.8.16 - Release date: 16 Sep 2014
- upgrade urgency: HIGH for Redis, LOW for Sentinel.
-
-* Fri Sep 12 2014 Remi Collet <remi@fedoraproject.org> - 2.8.15-1
-- Redis 2.8.15 - Release date: 12 Sep 2014
- upgrade urgency: LOW for Redis, HIGH for Sentinel.
-- move commands from /usr/sbin to /usr/bin
-- add redis-shutdown command (systemd)
-
-* Thu Sep 4 2014 Remi Collet <remi@fedoraproject.org> - 2.8.14-1
-- Redis 2.8.14 - Release date: 1 Sep 2014
- upgrade urgency: HIGH for Lua scripting users, otherwise LOW.
-
-* Tue Jul 15 2014 Remi Collet <remi@fedoraproject.org> - 2.8.13-1
-- Redis 2.8.13 - Release date: 14 Jul 2014
- upgrade urgency: LOW for Redis and Sentinel
-
-* Tue Jun 24 2014 Remi Collet <remi@fedoraproject.org> - 2.8.12-1
-- Redis 2.8.12 - Release date: 23 Jun 2014
- upgrade urgency: HIGH for Redis, CRITICAL for Sentinel.
-- always use jemalloc (instead of tcmalloc)
-
-* Mon Jun 16 2014 Remi Collet <remi@fedoraproject.org> - 2.8.11-1
-- Redis 2.8.11 - Release date: 11 Jun 2014
- upgrade urgency: HIGH if you use Lua scripting, LOW otherwise.
-
-* Fri Jun 6 2014 Remi Collet <remi@fedoraproject.org> - 2.8.10-1
-- Redis 2.8.10 - Release date: 5 Jun 2014
- upgrade urgency: HIGH if you use min-slaves-to-write option.
-
-* Tue Apr 22 2014 Remi Collet <remi@fedoraproject.org> - 2.8.9-1
-- Redis 2.8.9 - Release date: 22 Apr 2014
- upgrade urgency: LOW, only new features introduced, no bugs fixed.
-
-* Thu Mar 27 2014 Remi Collet <remi@fedoraproject.org> - 2.8.8-1
-- Redis 2.8.8 - Release date: 25 Mar 2014
- upgrade urgency: HIGH for Redis, LOW for Sentinel.
-
-* Sat Mar 8 2014 Remi Collet <remi@fedoraproject.org> - 2.8.7-1
-- Redis 2.8.7 - Release date: 5 Mar 2014
- upgrade urgency: LOW for Redis, LOW for Sentinel.
-
-* Fri Feb 14 2014 Remi Collet <remi@fedoraproject.org> - 2.8.6-1
-- Redis 2.8.6 - Release date: 13 Feb 2014
- upgrade urgency: HIGH for Redis, LOW for Sentinel.
-
-* Thu Jan 16 2014 Remi Collet <remi@fedoraproject.org> - 2.8.4-1
-- Redis 2.8.4 - Release date: 13 Jan 2014
- upgrade urgency: MODERATE for Redis and Sentinel.
-
-* Mon Jan 6 2014 Remi Collet <remi@fedoraproject.org> - 2.8.3-2
-- add redis-sentinel command (link to redis-server)
-- don't rely on config for daemonize and pidfile
-- add redis-sentinel service
-
-* Sat Dec 14 2013 Remi Collet <remi@fedoraproject.org> - 2.8.3-1
-- Redis 2.8.3
- upgrade urgency: MODERATE for Redis, HIGH for Sentinel.
-- redis own /etc/redis.conf (needed CONFIG WRITE)
-- add sentinel.conf as documentation
-
-* Mon Dec 2 2013 Remi Collet <remi@fedoraproject.org> - 2.8.2-1
-- Redis 2.8.2, new major version
-- pull rawhide changes (add tmpfiles)
-
-* Sun Sep 8 2013 Remi Collet <remi@fedoraproject.org> - 2.6.16-1
-- Redis 2.6.16
- upgrade urgency: MODERATE
-
-* Fri Sep 06 2013 Fabian Deutsch <fabian.deutsch@gmx.de> - 2.6.16-1
-- Update to 2.6.16
-- Fix rhbz#973151
-- Fix rhbz#656683
-- Fix rhbz#977357 (Jan Vcelak <jvcelak@fedoraproject.org>)
-
-* Sat Aug 24 2013 Remi Collet <remi@fedoraproject.org> - 2.6.15-1
-- Redis 2.6.15
- upgrade urgency: MODERATE, upgrade ASAP only if you experience
- issues related to the expired keys collection algorithm,
- or if you use the ZUNIONSTORE command.
-
-* Sun Jul 28 2013 Remi Collet <remi@fedoraproject.org> - 2.6.14-1
-- Redis 2.6.14
- upgrade urgency: HIGH because of the following two issues:
- Lua scripting + Replication + AOF in slaves problem
- AOF + expires possible race condition
-- add option to run tests during build (not in mock)
-
-* Tue Jul 23 2013 Peter Robinson <pbrobinson@fedoraproject.org> 2.6.13-4
-- ARM has gperftools
-
-* Wed Jun 19 2013 Fabian Deutsch <fabiand@fedoraproject.org> - 2.6.13-3
-- Modify jemalloc patch for s390 compatibility (Thanks sharkcz)
-
-* Fri Jun 07 2013 Fabian Deutsch <fabiand@fedoraproject.org> - 2.6.13-2
-- Unbundle jemalloc
-
-* Fri Jun 07 2013 Fabian Deutsch <fabiand@fedoraproject.org> - 2.6.13-1
-- Add compile PIE flag (rhbz#955459)
-- Update to redis 2.6.13 (rhbz#820919)
-
-* Tue Apr 30 2013 Remi Collet <remi@fedoraproject.org> - 2.6.13-1
-- Redis 2.6.13
- upgrade urgency: MODERATE, nothing very critical
-
-* Sat Mar 30 2013 Remi Collet <remi@fedoraproject.org> - 2.6.12-1
-- Redis 2.6.12
- upgrade urgency: MODERATE, nothing very critical
- but a few non trivial bugs
-
-* Tue Mar 12 2013 Remi Collet <remi@fedoraproject.org> - 2.6.11-1
-- Redis 2.6.11
- upgrade urgency: LOW, however updating is encouraged
- if you have many instances per server and you want
- to lower the CPU / energy usage.
-
-* Mon Feb 11 2013 Remi Collet <remi@fedoraproject.org> - 2.6.10-1
-- Redis 2.6.10
- upgrade urgency: MODERATE, this release contains many non
- critical fixes and many small improvements.
-
-* Thu Jan 17 2013 Remi Collet <remi@fedoraproject.org> - 2.6.9-1
-- Redis 2.6.9
- upgrade urgency: MODERATE if you use replication.
-
-* Fri Jan 11 2013 Remi Collet <remi@fedoraproject.org> - 2.6.8-1
-- Redis 2.6.8
- upgrade urgency: MODERATE if you use Lua scripting. Otherwise LOW.
-
-* Tue Dec 4 2012 Remi Collet <remi@fedoraproject.org> - 2.6.7-1
-- Redis 2.6.7
- upgrade urgency: MODERATE (unless you BLPOP using the same
- key multiple times).
-
-* Fri Nov 23 2012 Remi Collet <remi@fedoraproject.org> - 2.6.5-1
-- Redis 2.6.5 (upgrade urgency: moderate)
-
-* Fri Nov 16 2012 Remi Collet <remi@fedoraproject.org> - 2.6.4-1
-- Redis 2.6.4 (upgrade urgency: low)
-
-* Sun Oct 28 2012 Remi Collet <remi@fedoraproject.org> - 2.6.2-1
-- Redis 2.6.2 (upgrade urgency: low)
-- fix typo in systemd macro
-
-* Wed Oct 24 2012 Remi Collet <remi@fedoraproject.org> - 2.6.0-1
-- Redis 2.6.0 is the latest stable version
-- add patch for old glibc on RHEL-5
-
-* Sat Oct 20 2012 Remi Collet <remi@fedoraproject.org> - 2.6.0-0.2.rc8
-- Update to redis 2.6.0-rc8
-- improve systemd integration
-
-* Thu Aug 30 2012 Remi Collet <remi@fedoraproject.org> - 2.6.0-0.1.rc6
-- Update to redis 2.6.0-rc6
-
-* Thu Aug 30 2012 Remi Collet <remi@fedoraproject.org> - 2.4.16-1
-- Update to redis 2.4.16
-
-* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.15-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sun Jul 08 2012 Silas Sewell <silas@sewell.org> - 2.4.15-2
-- Remove TODO from docs
-
-* Sun Jul 08 2012 Silas Sewell <silas@sewell.org> - 2.4.15-1
-- Update to redis 2.4.15
-
-* Sat May 19 2012 Silas Sewell <silas@sewell.org> - 2.4.13-1
-- Update to redis 2.4.13
-
-* Sat Mar 31 2012 Silas Sewell <silas@sewell.org> - 2.4.10-1
-- Update to redis 2.4.10
-
-* Fri Feb 24 2012 Silas Sewell <silas@sewell.org> - 2.4.8-1
-- Update to redis 2.4.8
-
-* Sat Feb 04 2012 Silas Sewell <silas@sewell.org> - 2.4.7-1
-- Update to redis 2.4.7
-
-* Wed Feb 01 2012 Fabian Deutsch <fabiand@fedoraproject.org> - 2.4.6-4
-- Fixed a typo in the spec
-
-* Tue Jan 31 2012 Fabian Deutsch <fabiand@fedoraproject.org> - 2.4.6-3
-- Fix .service file, to match config (Type=simple).
-
-* Tue Jan 31 2012 Fabian Deutsch <fabiand@fedoraproject.org> - 2.4.6-2
-- Fix .service file, credits go to Timon.
-
-* Thu Jan 12 2012 Fabian Deutsch <fabiand@fedoraproject.org> - 2.4.6-1
-- Update to 2.4.6
-- systemd unit file added
-- Compiler flags changed to compile 2.4.6
-- Remove doc/ and Changelog
-
-* Sun Jul 24 2011 Silas Sewell <silas@sewell.org> - 2.2.12-1
-- Update to redis 2.2.12
-
-* Fri May 06 2011 Dan Horák <dan[at]danny.cz> - 2.2.5-2
-- google-perftools exists only on selected architectures
-
-* Sat Apr 23 2011 Silas Sewell <silas@sewell.ch> - 2.2.5-1
-- Update to redis 2.2.5
-
-* Sat Mar 26 2011 Silas Sewell <silas@sewell.ch> - 2.2.2-1
-- Update to redis 2.2.2
-
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Sun Dec 19 2010 Silas Sewell <silas@sewell.ch> - 2.0.4-1
-- Update to redis 2.0.4
-
-* Tue Oct 19 2010 Silas Sewell <silas@sewell.ch> - 2.0.3-1
-- Update to redis 2.0.3
-
-* Fri Oct 08 2010 Silas Sewell <silas@sewell.ch> - 2.0.2-1
-- Update to redis 2.0.2
-- Disable checks section for el5
-
-* Sat Sep 11 2010 Silas Sewell <silas@sewell.ch> - 2.0.1-1
-- Update to redis 2.0.1
-
-* Sat Sep 04 2010 Silas Sewell <silas@sewell.ch> - 2.0.0-1
-- Update to redis 2.0.0
-
-* Thu Sep 02 2010 Silas Sewell <silas@sewell.ch> - 1.2.6-3
-- Add Fedora build flags
-- Send all scriplet output to /dev/null
-- Remove debugging flags
-- Add redis.conf check to init script
-
-* Mon Aug 16 2010 Silas Sewell <silas@sewell.ch> - 1.2.6-2
-- Don't compress man pages
-- Use patch to fix redis.conf
-
-* Tue Jul 06 2010 Silas Sewell <silas@sewell.ch> - 1.2.6-1
-- Initial package
diff --git a/redis-sentinel.service b/redis-sentinel.service
index 847a1ab..0c87ff7 100644
--- a/redis-sentinel.service
+++ b/redis-sentinel.service
@@ -8,7 +8,7 @@ ExecStop=/usr/libexec/redis-shutdown redis-sentinel
User=redis
Group=redis
RuntimeDirectory=redis
-RuntimeDirectoryMode=0750
+RuntimeDirectoryMode=0755
[Install]
WantedBy=multi-user.target
diff --git a/redis.service b/redis.service
index e01dbfe..6c19f81 100644
--- a/redis.service
+++ b/redis.service
@@ -8,7 +8,7 @@ ExecStop=/usr/libexec/redis-shutdown
User=redis
Group=redis
RuntimeDirectory=redis
-RuntimeDirectoryMode=0750
+RuntimeDirectoryMode=0755
[Install]
WantedBy=multi-user.target
diff --git a/redis.spec b/redis.spec
index d7a77b2..a566afd 100644
--- a/redis.spec
+++ b/redis.spec
@@ -20,22 +20,22 @@
%global with_tests %{?_with_tests:1}%{!?_with_tests:0}
# Pre-version are only available in github
-#global prever rc3
-%global gh_commit d5dab73127a3f02cf5c4964c66a6c7c7147b9dc0
+#global prever RC3
+%global gh_commit 51b12ed1b5dccd6234e0dc1d3f76996420bcf5a9
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner antirez
%global gh_project redis
Name: redis
-Version: 3.2.9
-Release: 2%{?dist}
+Version: 4.0.0
+Release: 1%{?dist}
Summary: A persistent key-value database
Group: Applications/Databases
License: BSD
URL: http://redis.io
%if 0%{?prever:1}
-Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz
+Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}%{prever}-%{gh_short}.tar.gz
%else
Source0: http://download.redis.io/releases/%{name}-%{version}.tar.gz
%endif
@@ -50,7 +50,7 @@ Source9: %{name}-limit-init
# Update configuration for Fedora
Patch0: 0001-redis-3.2-redis-conf.patch
-Patch1: 0002-redis-3.2-deps-library-fPIC-performance-tuning.patch
+Patch1: 0002-redis-4.0-deps-library-fPIC-performance-tuning.patch
Patch2: 0003-redis-3.2.5-use-system-jemalloc.patch
# https://github.com/antirez/redis/pull/3491 - man pages
@@ -147,6 +147,10 @@ make %{?_smp_mflags} V=1 \
%check
%if %{with_tests}
+# ERR Active defragmentation cannot be enabled: it requires a Redis server compiled
+# with a modified Jemalloc like the one shipped by default with the Redis source distribution
+sed -e '/memefficiency/d' -i tests/test_helper.tcl
+
make test
make test-sentinel
%else
@@ -260,34 +264,27 @@ fi
%{_initrddir}/%{name}
%{_initrddir}/%{name}-sentinel
%config(noreplace) %{_sysconfdir}/security/limits.d/95-%{name}.conf
-%dir %attr(0750, redis, redis) %{_localstatedir}/run/%{name}
+%dir %attr(0755, redis, redis) %{_localstatedir}/run/%{name}
%endif
%changelog
-* Sat Jun 24 2017 Remi Collet <remi@remirepo.net> - 3.2.9-2
-- rebuild with latest fedora changes
+* Mon Jul 17 2017 Remi Collet <remi@remirepo.net> - 4.0.0-1
+- update to 4.0.0 GA
+
+* Sat Jun 24 2017 Remi Collet <remi@remirepo.net> - 4.0.0-0.4.RC3
+- rebuild with some fedora changes:
- Add RuntimeDirectory=redis to systemd unit file (RHBZ #1454700)
- Fix a shutdown failure with Unix domain sockets (RHBZ #1444988)
-* Sun May 21 2017 Remi Collet <remi@remirepo.net> - 3.2.9-1
-- Redis 3.2.9 - Released Mon May 17 17:35:38 CEST 2017
-- Upgrade urgency LOW: A few rarely harmful bugs were fixed.
-
-* Mon Feb 13 2017 Remi Collet <remi@fedoraproject.org> - 3.2.8-1
-- Redis 3.2.8 - Released Sun Feb 12 16:11:18 CET 2017
-- Upgrade urgency CRITICAL: This release reverts back the Jemalloc upgrade
- that is believed to potentially cause a server deadlock. A MIGRATE crash
- is also fixed.
+* Mon Apr 24 2017 Remi Collet <remi@fedoraproject.org> - 4.0.0-0.3.RC3
+- update to 4.0.0-RC3 (3.9.103)
-* Wed Feb 1 2017 Remi Collet <remi@fedoraproject.org> - 3.2.7-1
-- Redis 3.2.7 - Released Tue Jan 31 16:21:41 CET 2017
-- Upgrade urgency HIGH: This release fixes important security and
- correctness issues.
+* Tue Dec 6 2016 Remi Collet <remi@fedoraproject.org> - 4.0.0-0.2.RC2
+- update to 4.0.0-RC2 (3.9.102)
-* Tue Dec 6 2016 Remi Collet <remi@fedoraproject.org> - 3.2.6-1
-- Redis 3.2.6 - Released Tue Dec 06 09:33:29 CET 2016
-- Upgrade urgency MODERATE: minor fixes.
+* Mon Dec 5 2016 Remi Collet <remi@fedoraproject.org> - 4.0.0-0.1.RC1
+- update to 4.0.0-RC1 (3.9.101)
* Thu Oct 27 2016 Remi Collet <remi@fedoraproject.org> - 3.2.5-1
- Redis 3.2.5 - Released Wed Oct 26 09:16:40 CEST 2016