Update to redis 2.2.5

.gitignore

@@ -1 +1,2 @@
 /redis-2.0.3.tar.gz
+/redis-2.2.5.tar.gz

redis-2.2.2-redis.conf.patch

@@ -1,6 +1,6 @@
-diff -up redis-2.0.0/redis.conf.orig redis-2.0.0/redis.conf
---- redis-2.0.0/redis.conf.orig	2010-09-04 15:59:16.599206633 -0400
-+++ redis-2.0.0/redis.conf	2010-09-04 16:01:59.234209087 -0400
+diff -up redis-2.2.2/redis.conf.orig redis-2.2.2/redis.conf
+--- redis-2.2.2/redis.conf.orig	2011-03-26 09:25:58.447039591 -0400
++++ redis-2.2.2/redis.conf	2011-03-26 09:28:09.116651574 -0400
 @@ -14,11 +14,11 @@
  
  # By default Redis does not run as a daemon. Use 'yes' if you need it.
@@ -13,18 +13,18 @@ diff -up redis-2.0.0/redis.conf.orig redis-2.0.0/redis.conf
 -pidfile /var/run/redis.pid
 +pidfile /var/run/redis/redis.pid
  
- # Accept connections on the specified port, default is 6379
- port 6379
-@@ -26,7 +26,7 @@ port 6379
+ # Accept connections on the specified port, default is 6379.
+ # If port 0 is specified Redis will not listen on a TCP socket.
+@@ -27,7 +27,7 @@ port 6379
  # If you want you can bind a single interface, if the bind option is not
  # specified all the interfaces will listen for incoming connections.
  #
 -# bind 127.0.0.1
 +bind 127.0.0.1
  
- # Close the connection after a client is idle for N seconds (0 to disable)
- timeout 300
-@@ -37,12 +37,12 @@ timeout 300
+ # 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
+@@ -44,12 +44,12 @@ timeout 300
  # 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)
@@ -37,9 +37,9 @@ diff -up redis-2.0.0/redis.conf.orig redis-2.0.0/redis.conf
 -logfile stdout
 +logfile /var/log/redis/redis.log
  
- # Set the number of databases. The default database is DB 0, you can select
- # a different one on a per-connection basis using SELECT <dbid> where
-@@ -86,7 +86,7 @@ dbfilename dump.rdb
+ # To enable logging to the system logger, just set 'syslog-enabled' to yes,
+ # and optionally update the other syslog parameters to suit your needs.
+@@ -103,7 +103,7 @@ dbfilename dump.rdb
  # Also the Append Only File will be created inside this directory.
  # 
  # Note that you must specify a directory here, not a file name.

redis.spec

@@ -2,7 +2,7 @@
 # http://code.google.com/p/redis/issues/detail?id=202
 
 Name:             redis
-Version:          2.0.3
+Version:          2.2.5
 Release:          1%{?dist}
 Summary:          A persistent key-value database
 
@@ -13,12 +13,11 @@ Source0:          http://redis.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:          %{name}.logrotate
 Source2:          %{name}.init
 # Update configuration for Fedora
-Patch0:           %{name}-2.0.0-redis.conf.patch
+Patch0:           %{name}-2.2.2-redis.conf.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if !0%{?el5}
 BuildRequires:    tcl >= 8.5
-%endif
+BuildRequires:    google-perftools-devel
 
 Requires:         logrotate
 Requires(post):   chkconfig
@@ -38,26 +37,20 @@ different kind of sorting abilities.
 %prep
 %setup -q
 %patch0 -p1
-# Remove integration tests
-sed -i '/    execute_tests "integration\/replication"/d' tests/test_helper.tcl
-sed -i '/    execute_tests "integration\/aof"/d' tests/test_helper.tcl
 
 %build
-make %{?_smp_mflags} DEBUG="" CFLAGS='%{optflags} -std=c99' all
+make %{?_smp_mflags} \
+  DEBUG="" \
+  CFLAGS='%{optflags} -std=c99' \
+  USE_TCMALLOC=yes \
+  all
 
 %check
-%if !0%{?el5}
-tclsh tests/test_helper.tcl
-%endif
+# make test
 
 %install
 rm -fr %{buildroot}
-# Install binaries
-install -p -D -m 755 %{name}-benchmark %{buildroot}%{_bindir}/%{name}-benchmark
-install -p -D -m 755 %{name}-cli %{buildroot}%{_bindir}/%{name}-cli
-install -p -D -m 755 %{name}-check-aof %{buildroot}%{_bindir}/%{name}-check-aof
-install -p -D -m 755 %{name}-check-dump %{buildroot}%{_bindir}/%{name}-check-dump
-install -p -D -m 755 %{name}-server %{buildroot}%{_sbindir}/%{name}-server
+make install PREFIX=%{buildroot}%{_prefix}
 # Install misc other
 install -p -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 install -p -D -m 755 %{SOURCE2} %{buildroot}%{_initrddir}/%{name}
@@ -66,6 +59,13 @@ install -d -m 755 %{buildroot}%{_localstatedir}/lib/%{name}
 install -d -m 755 %{buildroot}%{_localstatedir}/log/%{name}
 install -d -m 755 %{buildroot}%{_localstatedir}/run/%{name}
 
+# Fix non-standard-executable-perm error
+chmod 755 %{buildroot}%{_bindir}/%{name}-*
+
+# Ensure redis-server location doesn't change
+mkdir -p %{buildroot}%{_sbindir}
+mv %{buildroot}%{_bindir}/%{name}-server %{buildroot}%{_sbindir}/%{name}-server
+
 %clean
 rm -fr %{buildroot}
 
@@ -87,7 +87,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc 00-RELEASENOTES BUGS COPYING Changelog README TODO doc/
+%doc 00-RELEASENOTES BUGS COPYING Changelog README doc/
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %dir %attr(0755, redis, root) %{_localstatedir}/lib/%{name}
@@ -98,6 +98,9 @@ fi
 %{_initrddir}/%{name}
 
 %changelog
+* Sat Apr 23 2011 Silas Sewell <silas@sewell.ch> - 2.2.5-1
+- Update to redis 2.2.5
+
 * Tue Oct 19 2010 Silas Sewell <silas@sewell.ch> - 2.0.3-1
 - Update to redis 2.0.3
 

sources

@@ -1 +1,2 @@
 7799de79f36ebdb73bcb8f09816d1ac3  redis-2.0.3.tar.gz
+fe6395bbd2cadc45f4f20f6bbe05ed09  redis-2.2.5.tar.gz