- up to 2.6.2

- added patch for tcl tests
- modified config file

diff --git a/redis-tcl.patch b/redis-tcl.patch
new file mode 100644 (file)
index 0000000..f35ecd5
--- /dev/null
+++ b/redis-tcl.patch
@@ -0,0 +1,53 @@
+diff -ru redis-2.6.2/runtest redis-2.6.2-patch/runtest
+--- redis-2.6.2/runtest        2012-10-26 16:20:24.000000000 +0200
++++ redis-2.6.2-patch/runtest  2012-10-30 12:30:05.185145368 +0100
+@@ -1,5 +1,5 @@
+ #!/bin/sh
+-TCL=tclsh8.5
++TCL=tclsh
+ which $TCL
+ if [ "$?" != "0" ]
+ then
+diff -ru redis-2.6.2/tests/integration/replication-4.tcl redis-2.6.2-patch/tests/integration/replication-4.tcl
+--- redis-2.6.2/tests/integration/replication-4.tcl    2012-10-26 16:20:24.000000000 +0200
++++ redis-2.6.2-patch/tests/integration/replication-4.tcl      2012-10-30 12:29:23.092114119 +0100
+@@ -1,5 +1,5 @@
+ proc start_bg_complex_data {host port db ops} {
+-    exec tclsh8.5 tests/helpers/bg_complex_data.tcl $host $port $db $ops &
++    exec tclsh tests/helpers/bg_complex_data.tcl $host $port $db $ops &
+ }
+ 
+ proc stop_bg_complex_data {handle} {
+diff -ru redis-2.6.2/tests/integration/replication.tcl redis-2.6.2-patch/tests/integration/replication.tcl
+--- redis-2.6.2/tests/integration/replication.tcl      2012-10-26 16:20:24.000000000 +0200
++++ redis-2.6.2-patch/tests/integration/replication.tcl        2012-10-30 12:29:09.860477648 +0100
+@@ -78,7 +78,7 @@
+ }
+ 
+ proc start_write_load {host port seconds} {
+-    exec tclsh8.5 tests/helpers/gen_write_load.tcl $host $port $seconds &
++    exec tclsh tests/helpers/gen_write_load.tcl $host $port $seconds &
+ }
+ 
+ proc stop_write_load {handle} {
+diff -ru redis-2.6.2/tests/test_helper.tcl redis-2.6.2-patch/tests/test_helper.tcl
+--- redis-2.6.2/tests/test_helper.tcl  2012-10-26 16:20:24.000000000 +0200
++++ redis-2.6.2-patch/tests/test_helper.tcl    2012-10-30 12:29:38.411108195 +0100
+@@ -189,7 +189,7 @@
+     set start_port [expr {$::port+100}]
+     for {set j 0} {$j < $::numclients} {incr j} {
+         set start_port [find_available_port $start_port]
+-        set p [exec tclsh8.5 [info script] {*}$::argv \
++        set p [exec tclsh [info script] {*}$::argv \
+             --client $port --port $start_port &]
+         lappend ::clients_pids $p
+         incr start_port 10
+diff -ru redis-2.6.2/utils/speed-regression.tcl redis-2.6.2-patch/utils/speed-regression.tcl
+--- redis-2.6.2/utils/speed-regression.tcl     2012-10-26 16:20:24.000000000 +0200
++++ redis-2.6.2-patch/utils/speed-regression.tcl       2012-10-30 12:28:48.069340297 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env tclsh8.5
++#!/usr/bin/env tclsh
+ # Copyright (C) 2011 Salvatore Sanfilippo
+ # Released under the BSD license like Redis itself
+ 

diff --git a/redis.conf.patch b/redis.conf.patch
index 830cac853ede54d7d14d07a914cbb07f532458aa..e93af51261e59fcf16402743248e0569ee46754d 100644 (file)
--- a/redis.conf.patch
+++ b/redis.conf.patch
@@ -1,5 +1,6 @@
---- redis-2.4.2/redis.conf~    2011-10-26 17:16:33.000000000 +0300
-+++ redis-2.4.2/redis.conf     2012-06-26 18:50:51.478588041 +0300
+diff -ru redis-2.6.2/redis.conf redis-2.6.2-conf/redis.conf
+--- redis-2.6.2/redis.conf     2012-10-26 16:20:24.000000000 +0200
++++ redis-2.6.2-conf/redis.conf        2012-10-30 13:16:42.576170116 +0100
 @@ -14,11 +14,11 @@
  
  # By default Redis does not run as a daemon. Use 'yes' if you need it.
@@ -27,18 +28,12 @@
  # unixsocketperm 755
  
  # Close the connection after a client is idle for N seconds (0 to disable)
--timeout 300
+-timeout 0
 +timeout 10
  
  # Set server verbosity to 'debug'
  # it can be one of:
-@@ -45,12 +45,12 @@
- # verbose (many rarely useful info, but not a mess like the debug level)
- # notice (moderately verbose, what you want in production probably)
- # warning (only very important / critical messages are logged)
--loglevel verbose
-+loglevel notice
- 
+@@ -50,7 +50,7 @@
  # 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
@@ -56,7 +51,7 @@
  
  ################################ SNAPSHOTTING  #################################
  #
-@@ -104,7 +104,7 @@
+@@ -134,7 +134,7 @@
  # Also the Append Only File will be created inside this directory.
  # 
  # Note that you must specify a directory here, not a file name.
@@ -65,12 +60,3 @@
  
  ################################# REPLICATION #################################
  
-@@ -365,7 +365,7 @@
- # *** WARNING *** if you are using a shared hosting the default of putting
- # the swap file under /tmp is not secure. Create a dir with access granted
- # only to Redis user and configure Redis to create the swap file there.
--vm-swap-file /tmp/redis.swap
-+vm-swap-file /var/lib/redis/redis.swap
- 
- # vm-max-memory configures the VM to use at max the specified amount of
- # RAM. Everything that deos not fit will be swapped on disk *if* possible, that

diff --git a/redis.spec b/redis.spec
index 51d7ba00299009824643062e537e957474a0ab4c..0cd27403bf770beba0975fc2f97340bf9abf5475 100644 (file)
--- a/redis.spec
+++ b/redis.spec
@@ -18,17 +18,18 @@
 
 Summary:       A persistent key-value database
 Name:          redis
-Version:       2.4.2
+Version:       2.6.2
 Release:       6
 License:       BSD
 Group:         Applications/Databases
 URL:           http://www.redis.io/
 Source0:       http://redis.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5: c4b0b5e4953a11a503cb54cf6b09670e
+# Source0-md5: 4f788dfb3ee86c7e864dfe537870bb5a
 Source1:       %{name}.logrotate
 Source2:       %{name}.init
 Source3:       %{name}.tmpfiles
 Patch0:                %{name}.conf.patch
+Patch1:                %{name}-tcl.patch
 %{?with_perftools:BuildRequires:    google-perftools-devel}
 BuildRequires: jemalloc-static
 BuildRequires: rpm >= 4.4.9-56
@@ -75,6 +76,7 @@ disk.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 # Remove integration tests
 %{__sed} -i -e '/    execute_tests "integration\/replication"/d' tests/test_helper.tcl
 %{__sed} -i -e '/    execute_tests "integration\/aof"/d' tests/test_helper.tcl
@@ -146,7 +148,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING 00-RELEASENOTES BUGS Changelog README TODO
+%doc COPYING 00-RELEASENOTES BUGS Changelog README
 %attr(755,root,root) %{_bindir}/redis-benchmark
 %attr(755,root,root) %{_bindir}/redis-check-aof
 %attr(755,root,root) %{_bindir}/redis-check-dump