Hello community, here is the log from the commit of package redis for openSUSE:Leap:15.2 checked in at 2020-05-13 03:54:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/redis (Old) and /work/SRC/openSUSE:Leap:15.2/.redis.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "redis" Wed May 13 03:54:11 2020 rev:46 rq:803701 version:6.0.1 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/redis/redis.changes 2020-05-07 19:38:22.774815387 +0200 +++ /work/SRC/openSUSE:Leap:15.2/.redis.new.2738/redis.changes 2020-05-13 03:54:15.608504826 +0200 @@ -1,0 +2,7 @@ +Sat May 9 12:09:41 UTC 2020 - Andreas Schwab <[email protected]> + +- 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 + +------------------------------------------------------------------- Old: ---- redis-disable_integration_logging.patch redis-enable-bactrace-on-x86-ia64-and_arm32_only.patch New: ---- getMcontextEip-return-value.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ redis.spec ++++++ --- /var/tmp/diff_new_pack.ys7KQj/_old 2020-05-13 03:54:16.236506143 +0200 +++ /var/tmp/diff_new_pack.ys7KQj/_new 2020-05-13 03:54:16.236506143 +0200 @@ -40,8 +40,7 @@ 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 @@ 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 @@ 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 @@ --------------------------------------------------- EOF %make_build test || true -%endif %pre -f redis.pre %service_add_pre redis.target [email protected] redis-sentinel.target [email protected] ++++++ getMcontextEip-return-value.patch ++++++ 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 */
