[packages/redis] - updated to 2.8.2
baggins
baggins at pld-linux.org
Wed Dec 4 22:54:11 CET 2013
commit 190145c5bbe15061e56350448cd058065e35d0a4
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Wed Dec 4 22:54:03 2013 +0100
- updated to 2.8.2
redis-tcl.patch | 64 ++++++++++++++++----------------------------------------
redis.conf.patch | 6 +++---
redis.spec | 25 +++++++++++-----------
3 files changed, 33 insertions(+), 62 deletions(-)
---
diff --git a/redis.spec b/redis.spec
index 0cd2740..04336cd 100644
--- a/redis.spec
+++ b/redis.spec
@@ -18,19 +18,19 @@
Summary: A persistent key-value database
Name: redis
-Version: 2.6.2
-Release: 6
+Version: 2.8.2
+Release: 1
License: BSD
Group: Applications/Databases
URL: http://www.redis.io/
-Source0: http://redis.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5: 4f788dfb3ee86c7e864dfe537870bb5a
+Source0: http://download.redis.io/releases/%{name}-%{version}.tar.gz
+# Source0-md5: ee527b0c37e1e2cbceb497f5f6b8112b
Source1: %{name}.logrotate
Source2: %{name}.init
Source3: %{name}.tmpfiles
Patch0: %{name}.conf.patch
Patch1: %{name}-tcl.patch
-%{?with_perftools:BuildRequires: google-perftools-devel}
+%{?with_perftools:BuildRequires: gperftools-devel}
BuildRequires: jemalloc-static
BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.202
@@ -77,12 +77,10 @@ disk.
%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
-# use unversioned tclsh
-%{__sed} -i -e 's,tclsh8.5,tclsh', ./runtest tests/test_helper.tcl
+# Remove integration tests
+%{__sed} -i -e '/ integration\/replication/d' tests/test_helper.tcl
+%{__sed} -i -e '/ unit\/memefficiency/d' tests/test_helper.tcl
# use system jemalloc
mv deps/jemalloc{,-local}
@@ -91,13 +89,14 @@ ln -s %{_libdir} deps/jemalloc/lib
ln -s %{_includedir} deps/jemalloc/include
%build
-%{__make} all \
+%{__make} -j1 all \
CC="%{__cc}" \
CFLAGS="%{rpmcflags} -std=c99" \
DEBUG="" \
+ V=1
%if %{with tests}
-tclsh tests/test_helper.tcl
+%{__make} test
%endif
%install
@@ -148,7 +147,7 @@ fi
%files
%defattr(644,root,root,755)
-%doc COPYING 00-RELEASENOTES BUGS Changelog README
+%doc COPYING 00-RELEASENOTES BUGS README
%attr(755,root,root) %{_bindir}/redis-benchmark
%attr(755,root,root) %{_bindir}/redis-check-aof
%attr(755,root,root) %{_bindir}/redis-check-dump
diff --git a/redis-tcl.patch b/redis-tcl.patch
index f35ecd5..abca935 100644
--- a/redis-tcl.patch
+++ b/redis-tcl.patch
@@ -1,53 +1,25 @@
-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 @@
+diff -ur redis-2.8.2.orig/runtest redis-2.8.2/runtest
+--- redis-2.8.2.orig/runtest 2013-12-02 16:07:46.000000000 +0100
++++ redis-2.8.2/runtest 2013-12-04 21:57:48.613385391 +0100
+@@ -1,10 +1,6 @@
#!/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 @@
- }
+-TCL_VERSIONS="8.5 8.6"
+-TCLSH=""
+-
+-for VERSION in $TCL_VERSIONS; do
+- TCL=`which tclsh$VERSION 2>/dev/null` && TCLSH=$TCL
+-done
++TCLSH="tclsh"
++TCL="tclsh"
- 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
+ if [ -z $TCLSH ]
+ then
+diff -ur redis-2.8.2.orig/utils/speed-regression.tcl redis-2.8.2/utils/speed-regression.tcl
+--- redis-2.8.2.orig/utils/speed-regression.tcl 2013-12-02 16:07:46.000000000 +0100
++++ redis-2.8.2/utils/speed-regression.tcl 2013-12-04 22:03:43.745711543 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env tclsh8.5
-+#!/usr/bin/env tclsh
++#!/usr/bin/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 e93af51..3547cb1 100644
--- a/redis.conf.patch
+++ b/redis.conf.patch
@@ -16,9 +16,9 @@ diff -ru redis-2.6.2/redis.conf redis-2.6.2-conf/redis.conf
# 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 @@
- # If you want you can bind a single interface, if the bind option is not
- # specified all the interfaces will listen for incoming connections.
+ # Examples:
#
+ # bind 192.168.1.100 10.0.0.1
-# bind 127.0.0.1
+bind 127.0.0.1
@@ -37,7 +37,7 @@ diff -ru redis-2.6.2/redis.conf redis-2.6.2-conf/redis.conf
# 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
--logfile stdout
+-logfile ""
+logfile /var/log/redis/redis.log
# To enable logging to the system logger, just set 'syslog-enabled' to yes,
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/redis.git/commitdiff/190145c5bbe15061e56350448cd058065e35d0a4
More information about the pld-cvs-commit
mailing list