Accepting request 186264 from server:database

- build require procps to get "ps" which is needed for the cleanup
  of the redis processes launched by the testsuite.

- update to 2.6.14
  UPGRADE URGENCY: HIGH because of the following two issues:
      * Lua scripting + Replication + AOF in slaves problem (see Issue #1164).
      * AOF + expires possible race condition (see Issue #1079).
  * [FIX] AOF bug: expire could be removed from key on AOF rewrite.
  * [FIX] Allow writes from scripts called by AOF loading in read-only slaves.
  * [FIX] Sentinel: parse new verison of INFO replication output correctly.
  * [NEW] Reset masterauth if an empty string is configured.
  
  For the changes from 2.6.10-2.6.13 see
  /usr/share/doc/packages/redis/00-RELEASENOTES
- refreshed patches:
  - redis-conf.patch:
  - redis-enable-bactrace-on-x86-and-ia64-only.patch:
    just to get rid of fuzz
  - skip-aof-test.patch:
    can not comment in the array like that. rather remove the
    line.

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

redis-2.6.14.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fdf61c693e5c4908b4bb44c428d4a2b7568f05566c144c58fdf19c5cb12a9caf
+size 995036

redis-2.6.9.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4d967eff2038aebea33875d17e85ed67179df6505df68529a622f7836d1c7489
-size 989119

redis-conf.patch

@@ -25,7 +25,7 @@ Index: redis.conf
  
  # Specify the path for the unix socket that will be used to listen for
  # incoming connections. There is no default, so Redis will not listen
-@@ -50,7 +50,7 @@ loglevel notice
+@@ -66,7 +66,7 @@ loglevel notice
  # Specify the log file name. Also 'stdout' can be used to force
  # Redis to log on the standard output. Note that if you use standard
  # output for logging but daemonize, logs will be sent to /dev/null
@@ -34,8 +34,8 @@ Index: redis.conf
  
  # To enable logging to the system logger, just set 'syslog-enabled' to yes,
  # and optionally update the other syslog parameters to suit your needs.
-@@ -134,7 +134,7 @@ dbfilename dump.rdb
- # Also the Append Only File will be created inside this directory.
+@@ -150,7 +150,7 @@ dbfilename dump.rdb
+ # The Append Only File will also be created inside this directory.
  # 
  # Note that you must specify a directory here, not a file name.
 -dir ./

redis-enable-bactrace-on-x86-and-ia64-only.patch

@@ -1,13 +1,13 @@
-Index: redis-2.6.9/src/config.h
+Index: src/config.h
 ===================================================================
---- redis-2.6.9.orig/src/config.h
-+++ redis-2.6.9/src/config.h
+--- src/config.h.orig
++++ src/config.h
 @@ -54,9 +54,11 @@
  #endif
  
  /* Test for backtrace() */
 +#if defined(__i386__) || defined(__x86_64__) || defined(__ia64__)
- #if defined(__APPLE__) || defined(__linux__) || defined(__sun)
+ #if defined(__APPLE__) || defined(__linux__)
  #define HAVE_BACKTRACE 1
  #endif
 +#endif

redis.changes

@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Wed Aug  7 14:37:30 UTC 2013 - mrueckert@suse.de
+
+- build require procps to get "ps" which is needed for the cleanup
+  of the redis processes launched by the testsuite.
+
+-------------------------------------------------------------------
+Wed Aug  7 14:31:17 UTC 2013 - mrueckert@suse.de
+
+- update to 2.6.14
+  UPGRADE URGENCY: HIGH because of the following two issues:
+      * Lua scripting + Replication + AOF in slaves problem (see Issue #1164).
+      * AOF + expires possible race condition (see Issue #1079).
+
+  * [FIX] AOF bug: expire could be removed from key on AOF rewrite.
+  * [FIX] Allow writes from scripts called by AOF loading in read-only slaves.
+  * [FIX] Sentinel: parse new verison of INFO replication output correctly.
+  * [NEW] Reset masterauth if an empty string is configured.
+  
+  For the changes from 2.6.10-2.6.13 see
+  /usr/share/doc/packages/redis/00-RELEASENOTES
+- refreshed patches:
+  - redis-conf.patch:
+  - redis-enable-bactrace-on-x86-and-ia64-only.patch:
+    just to get rid of fuzz
+  - skip-aof-test.patch:
+    can not comment in the array like that. rather remove the
+    line.
+
 -------------------------------------------------------------------
 Thu Jul  4 16:10:47 UTC 2013 - dvaleev@suse.com
 

redis.spec

@@ -21,7 +21,7 @@
 %define _conf_dir       %{_sysconfdir}/%{name}
 
 Name:           redis
-Version:        2.6.9
+Version:        2.6.14
 Release:        0
 Summary:        Persistent key-value database
 License:        BSD-3-Clause
@@ -39,6 +39,7 @@ Patch2:         skip-aof-test.patch
 # for make test
 Patch3:         redis-enable-bactrace-on-x86-and-ia64-only.patch 
 BuildRequires:  tcl
+BuildRequires:  procps
 Requires:       logrotate
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -55,7 +56,7 @@ different kind of sorting abilities.
 %patch0
 %patch1
 %patch2
-%patch3 -p1
+%patch3
 
 %build
 make %{?_smp_mflags} CFLAGS="%{optflags}" V=1

skip-aof-test.patch

@@ -2,12 +2,11 @@ Index: tests/test_helper.tcl
 ===================================================================
 --- tests/test_helper.tcl.orig
 +++ tests/test_helper.tcl
-@@ -30,7 +30,7 @@ set ::all_tests {
+@@ -32,7 +32,6 @@ set ::all_tests {
      integration/replication-2
      integration/replication-3
      integration/replication-4
 -    integration/aof
-+#   integration/aof
      integration/rdb
      integration/convert-zipmap-hash-on-load
      unit/pubsub