Accepting request 802541 from server:database

OBS-URL: https://build.opensuse.org/request/show/802541
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/redis?expand=0&rev=56

getMcontextEip-return-value.patch

@@ -0,0 +1,13 @@
+Index: redis-6.0.1/src/debug.c
+===================================================================
+--- redis-6.0.1.orig/src/debug.c
++++ redis-6.0.1/src/debug.c
+@@ -919,6 +919,8 @@ static void *getMcontextEip(ucontext_t *
+     return (void*) uc->uc_mcontext.arm_pc;
+     #elif defined(__aarch64__) /* Linux AArch64 */
+     return (void*) uc->uc_mcontext.pc;
++    #else
++    return NULL;
+     #endif
+ #elif defined(__FreeBSD__)
+     /* FreeBSD */

redis-disable_integration_logging.patch

@@ -1,10 +0,0 @@
---- tests/test_helper.tcl.orig	2018-04-17 18:04:29.778303392 +0200
-+++ tests/test_helper.tcl	2018-04-17 18:04:46.688365379 +0200
-@@ -40,7 +40,6 @@ set ::all_tests {
-     integration/aof
-     integration/rdb
-     integration/convert-zipmap-hash-on-load
--    integration/logging
-     integration/psync2
-     integration/psync2-reg
-     unit/pubsub

redis-enable-bactrace-on-x86-ia64-and_arm32_only.patch

@@ -1,15 +0,0 @@
-Index: src/config.h
-===================================================================
---- src/config.h.orig
-+++ src/config.h
-@@ -65,8 +65,10 @@
- #if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__)) || \
-     defined(__FreeBSD__) || (defined(__OpenBSD__) && defined(USE_BACKTRACE))\
-  || defined(__DragonFly__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__ia64__) || defined (__arm__)
- #define HAVE_BACKTRACE 1
- #endif
-+#endif
- 
- /* MSG_NOSIGNAL. */
- #ifdef __linux__

redis.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat May  9 12:09:41 UTC 2020 - Andreas Schwab <schwab@suse.de>
+
+- redis-disable_integration_logging.patch: remove
+- redis-enable-bactrace-on-x86-ia64-and_arm32_only.patch: remove
+- getMcontextEip-return-value.patch: Add missing return value
+
 -------------------------------------------------------------------
 Mon May  4 12:51:43 UTC 2020 - Marcus Rueckert <mrueckert@suse.de>
 

redis.spec

@@ -40,8 +40,7 @@ Source9:        %{name}-user.conf
 Source10:       https://raw.githubusercontent.com/antirez/redis-hashes/%{redis_hashes_tree}/README#/redis.hashes
 # PATCH-MISSING-TAG -- See https://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch0:         %{name}-conf.patch
-Patch1:         %{name}-enable-bactrace-on-x86-ia64-and_arm32_only.patch
-Patch2:         %{name}-disable_integration_logging.patch
+Patch1:         getMcontextEip-return-value.patch
 Patch3:         reproducible.patch
 Patch4:         ppc-atomic.patch
 BuildRequires:  pkgconfig
@@ -64,11 +63,7 @@ different kind of sorting abilities.
 echo "`grep -F %{name}-%{version}.tar.gz %{SOURCE10} | cut -d' ' -f4`  %{SOURCE0}" | sha256sum -c
 %setup -q
 %patch0
-%patch1
-%ifnarch %{ix86} x86_64 ia64 %{arm}
-# We have no backtrace, so disable logging test
-%patch2
-%endif
+%patch1 -p1
 %patch3 -p1
 %patch4 -p1
 
@@ -117,7 +112,6 @@ mkdir -p %{buildroot}%{_sysusersdir}
 install -m 644 %{SOURCE9} %{buildroot}%{_sysusersdir}/
 
 %check
-%ifnarch ppc ppc64
 cat <<EOF
 ---------------------------------------------------
 The test suite often fails to start a server, with
@@ -125,7 +119,6 @@ The test suite often fails to start a server, with
 ---------------------------------------------------
 EOF
 %make_build test || true
-%endif
 
 %pre -f redis.pre
 %service_add_pre redis.target redis@.service redis-sentinel.target redis-sentinel@.service