redis: 2.8.2

6 files changed, 47 insertions, 29 deletions

diff --git a/redis-2.6.10-conf.patch b/redis-2.8.2-conf.patch
index 0b6bad9..948cc47 100644
--- a/redis-2.6.10-conf.patch
+++ b/redis-2.8.2-conf.patch
@@ -1,5 +1,5 @@
---- redis-2.6.10/redis.conf.orig	2013-02-11 13:24:39.000000000 +0100
-+++ redis-2.6.10/redis.conf	2013-02-11 19:05:09.533275700 +0100
+--- redis-2.8.2/redis.conf.orig	2013-12-02 16:07:46.000000000 +0100
++++ redis-2.8.2/redis.conf	2013-12-02 17:42:33.303049978 +0100
 @@ -18,7 +18,7 @@
  
  # When running daemonized, Redis writes a pid file in /var/run/redis.pid by
@@ -9,25 +9,25 @@
  
  # 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.
+@@ -32,7 +32,7 @@
+ # Examples:
  #
+ # bind 192.168.1.100 10.0.0.1
 -# bind 127.0.0.1
 +bind 127.0.0.1
  
  # 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
-@@ -66,7 +66,7 @@
- # Specify the log file name. Also 'stdout' can be used to force
+@@ -71,7 +71,7 @@
+ # Specify the log file name. Also the emptry string 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,
  # and optionally update the other syslog parameters to suit your needs.
-@@ -150,7 +150,7 @@
+@@ -155,7 +155,7 @@
  # The Append Only File will also be created inside this directory.
  # 
  # Note that you must specify a directory here, not a file name.
diff --git a/redis-deps-PIC.patch b/redis-deps-PIC.patch
index 944fa35..4d9b958 100644
--- a/redis-deps-PIC.patch
+++ b/redis-deps-PIC.patch
@@ -1,7 +1,7 @@
 --- a/deps/Makefile	
 +++ a/deps/Makefile	
-@@ -58,7 +58,7 @@ ifeq ($(uname_S),SunOS)
-   LUA_CFLAGS= -D__C99FEATURES__=1
+@@ -58,7 +58,7 @@
+ 	LUA_CFLAGS= -D__C99FEATURES__=1
  endif
  
 -LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI $(CFLAGS)
diff --git a/redis-deps-unbundle-jemalloc.patch b/redis-deps-unbundle-jemalloc.patch
index c68c1f6..0ae0fc7 100644
--- a/redis-deps-unbundle-jemalloc.patch
+++ b/redis-deps-unbundle-jemalloc.patch
@@ -1,12 +1,12 @@
 --- a/src/Makefile	2013-04-30 15:15:56.000000000 +0200
 +++ b/src/Makefile	2013-06-19 12:58:12.345612310 +0200
-@@ -71,9 +71,8 @@ ifeq ($(MALLOC),tcmalloc_minimal)
+@@ -79,9 +79,8 @@ ifeq ($(MALLOC),tcmalloc_minimal)
  endif
  
  ifeq ($(MALLOC),jemalloc)
--  DEPENDENCY_TARGETS+= jemalloc
--  FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
--  FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl
+-	DEPENDENCY_TARGETS+= jemalloc
+-	FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
+-	FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl
 +  FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -I/usr/include/jemalloc
 +  FINAL_LIBS+= -ljemalloc -ldl
  endif
diff --git a/redis.service b/redis.service
index f6dc44e..3aaadb8 100644
--- a/redis.service
+++ b/redis.service
@@ -3,7 +3,6 @@ Description=A persistent key-value database
 After=syslog.target network.target
 
 [Service]
-PIDFile=/var/run/redis/redis.pid
 ExecStart=/usr/sbin/redis-server /etc/redis.conf
 User=redis
 Group=redis
diff --git a/redis.spec b/redis.spec
index 1b4d3f5..039464c 100644
--- a/redis.spec
+++ b/redis.spec
@@ -3,16 +3,10 @@
 
 %global _hardened_build 1
 
-%if 0%{?rhel} == 5
-%ifarch i386
-%global with_perftools 1
-%endif
-%else
 %ifarch %{ix86} x86_64 ppc %{arm}
 # available only on selected architectures
 %global with_perftools 1
 %endif
-%endif
 
 %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
 %global with_systemd 1
@@ -24,7 +18,7 @@
 %global with_tests   %{?_with_tests:1}%{!?_with_tests:0}
 
 Name:             redis
-Version:          2.6.16
+Version:          2.8.2
 Release:          %{?prever:0.}1%{?prever:.%{prever}}%{?dist}
 Summary:          A persistent key-value database
 
@@ -35,8 +29,9 @@ Source0:          http://download.redis.io/releases/%{name}-%{version}%{?prever:
 Source1:          %{name}.logrotate
 Source2:          %{name}.init
 Source3:          %{name}.service
+Source4:          %{name}.tmpfiles
 # Update configuration for Fedora
-Patch0:           %{name}-2.6.10-conf.patch
+Patch0:           %{name}-2.8.2-conf.patch
 Patch1:           %{name}-deps-PIC.patch
 Patch2:           %{name}-deps-unbundle-jemalloc.patch
 
@@ -78,9 +73,16 @@ different kind of sorting abilities.
 
 %prep
 %setup -q -n %{name}-%{version}%{?prever:-%{prever}}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%patch0 -p1 -b .conf
+%patch1 -p1 -b .pic
+%patch2 -p1 -b .jem
+
+%if 0%{?rhel} == 5
+%ifarch i386
+# Fix undefined reference to __sync_add_and_fetch_4
+sed -e '/HAVE_ATOMIC/d' -i ./src/config.h
+%endif
+%endif
 
 %build
 rm -rvf deps/jemalloc
@@ -92,7 +94,9 @@ make %{?_smp_mflags} V=1 \
   CFLAGS="$RPM_OPT_FLAGS -fPIC" \
   LUA_CFLAGS="-fPIC" \
 %if 0%{?with_perftools}
-  USE_TCMALLOC=yes \
+  MALLOC=tcmalloc \
+%else
+  MALLOC=jemalloc \
 %endif
   all
 
@@ -112,9 +116,11 @@ install -d -m 755 %{buildroot}%{_localstatedir}/lib/%{name}
 install -d -m 755 %{buildroot}%{_localstatedir}/log/%{name}
 install -d -m 755 %{buildroot}%{_localstatedir}/run/%{name}
 
-# Install systemd unit
 %if %{with_systemd}
+# Install systemd unit
 install -p -D -m 644 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}.service
+# Install systemd tmpfiles config, _tmpfilesdir only defined in fedora >= 18
+install -p -D -m 644 %{SOURCE4} %{buildroot}%{_prefix}/lib/tmpfiles.d/%{name}.conf
 %else
 sed -e '/^daemonize/s/no/yes/' \
     -i %{buildroot}%{_sysconfdir}/%{name}.conf
@@ -193,6 +199,7 @@ fi
 %{_bindir}/%{name}-*
 %{_sbindir}/%{name}-*
 %if %{with_systemd}
+%{_prefix}/lib/tmpfiles.d/%{name}.conf
 %{_unitdir}/%{name}.service
 %else
 %{_initrddir}/%{name}
@@ -200,10 +207,20 @@ fi
 
 
 %changelog
+* Mon Dec  2 2013 Remi Collet <remi@fedoraproject.org> - 2.8.2-1
+- Redis 2.8.2, new major version
+- pull rawhide changes (add tmpfiles)
+
 * Sun Sep  8 2013 Remi Collet <remi@fedoraproject.org> - 2.6.16-1
 - Redis 2.6.16
   upgrade urgency: MODERATE
 
+* Fri Sep 06 2013 Fabian Deutsch <fabian.deutsch@gmx.de> - 2.6.16-1
+- Update to 2.6.16
+- Fix rhbz#973151
+- Fix rhbz#656683
+- Fix rhbz#977357 (Jan Vcelak <jvcelak@fedoraproject.org>)
+
 * Sat Aug 24 2013 Remi Collet <remi@fedoraproject.org> - 2.6.15-1
 - Redis 2.6.15
   upgrade urgency: MODERATE, upgrade ASAP only if you experience
diff --git a/redis.tmpfiles b/redis.tmpfiles
new file mode 100644
index 0000000..657d8a5
--- /dev/null
+++ b/redis.tmpfiles
@@ -0,0 +1,2 @@
+# redis runtime directory
+d /var/run/redis 0755 redis root -