diff options
| -rw-r--r-- | 0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch | 6 | ||||
| -rw-r--r-- | 0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch | 6 | ||||
| -rw-r--r-- | redis.spec | 24 |
3 files changed, 28 insertions, 8 deletions
diff --git a/0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch b/0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch index d18bbb0..f7e3dd1 100644 --- a/0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch +++ b/0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch @@ -1,7 +1,7 @@ -From ae2235dab50c86480ee37f50119af6668f312ba3 Mon Sep 17 00:00:00 2001 +From d68953c34d4d6987883ddf6158c3c69e7500667f Mon Sep 17 00:00:00 2001 From: Remi Collet <fedora@famillecollet.com> Date: Thu, 8 Sep 2016 14:51:15 +0200 -Subject: [PATCH 1/2] 1st man pageis for - redis-cli - redis-benchmark - +Subject: [PATCH 1/3] 1st man pageis for - redis-cli - redis-benchmark - redis-check-aof - redis-check-rdb - redis-server - redis.conf as redis-sentinel is a symlink to redis-server, same page can be used (also symlinked) @@ -648,5 +648,5 @@ index 0000000..1e0c9c9 +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- -2.20.1 +2.24.1 diff --git a/0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch b/0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch index 3d90660..d43be3b 100644 --- a/0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch +++ b/0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch @@ -1,7 +1,7 @@ -From 85d847361b519dca524178e3197dbb0ed24e0cb5 Mon Sep 17 00:00:00 2001 +From 79ed52edf84676786e5817cddb8914c5925144c7 Mon Sep 17 00:00:00 2001 From: Remi Collet <fedora@famillecollet.com> Date: Fri, 9 Sep 2016 17:23:27 +0200 -Subject: [PATCH 2/2] install redis-check-rdb as a symlink instead of +Subject: [PATCH 2/3] install redis-check-rdb as a symlink instead of duplicating the binary --- @@ -25,5 +25,5 @@ index 2a68649..585c95b 100644 uninstall: rm -f $(INSTALL_BIN)/{$(REDIS_SERVER_NAME),$(REDIS_BENCHMARK_NAME),$(REDIS_CLI_NAME),$(REDIS_CHECK_RDB_NAME),$(REDIS_CHECK_AOF_NAME),$(REDIS_SENTINEL_NAME)} -- -2.20.1 +2.24.1 @@ -27,6 +27,12 @@ %global with_systemd 0 %endif +%if 0%{?fedora} >= 23 || 0%{?rhel} >= 7 +%global with_tls 1 +%else +%global with_tls 0 +%endif + # Tests fail in mock, not in local build. %global with_tests %{?_with_tests:1}%{!?_with_tests:0} @@ -49,7 +55,7 @@ Name: redis Version: %{upstream_ver}%{?upstream_pre:~%{upstream_pre}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: A persistent key-value database Group: Applications/Databases License: BSD @@ -80,6 +86,8 @@ Source10: https://github.com/antirez/%{name}-doc/archive/%{doc_commit}/ Patch0001: 0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch # https://github.com/antirez/redis/pull/3494 - symlink Patch0002: 0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch +# https://github.com/antirez/redis/pull/6691 - gcc v10 +Patch0003: 0003-Mark-extern-definition-of-SDS_NOINIT-in-sds.h.patch BuildRequires: gcc %if 0%{?rhel} == 6 @@ -101,6 +109,9 @@ BuildRequires: tcl BuildRequires: pkgconfig(libsystemd) BuildRequires: systemd %endif +%if 0%{?with_tls} +BuildRequires: openssl-devel >= 1.0.2 +%endif %if ! %{?with_redistrib} Obsoletes: redis-trib < %{version}-%{release} @@ -196,6 +207,7 @@ and removal, status checks, resharding, rebalancing, and other operations. mv ../%{name}-doc-%{doc_commit} doc %patch0001 -p1 %patch0002 -p1 +%patch0003 -p1 %if %{?with_jemalloc} rm -frv deps/jemalloc @@ -228,7 +240,11 @@ sed -e '/GCC diagnostic/d' -i src/lzf_d.c %endif %global malloc_flags MALLOC=jemalloc +%if 0%{?with_tls} +%global make_flags DEBUG="" V="echo" LDFLAGS="%{?__global_ldflags}" CFLAGS+="%{optflags} -fPIC" %{malloc_flags} INSTALL="install -p" PREFIX=%{buildroot}%{_prefix} BUILD_TLS=yes +%else %global make_flags DEBUG="" V="echo" LDFLAGS="%{?__global_ldflags}" CFLAGS+="%{optflags} -fPIC" %{malloc_flags} INSTALL="install -p" PREFIX=%{buildroot}%{_prefix} +%endif %build %if 0%{?rhel} == 6 @@ -432,7 +448,11 @@ fi %changelog -* Fri Dec 20 2019 Remi Collet <remi@remirepo.net> - 5.0.0~RC1-1 +* Tue Mar 3 2020 Remi Collet <remi@remirepo.net> - 6.0.0~RC1-2 +- enable TLS support (EL-6 excepted) +- patch extern SDS_NOINIT definition for gcc 10 (F32) + +* Fri Dec 20 2019 Remi Collet <remi@remirepo.net> - 6.0.0~RC1-1 - update to 6.0-RC1 (5.9.101) - build using GCC 8 on EL-7, GCC 6 on EL-6 (devtoolset) |