From a79ff485af96773ef1ae97c91363197d72f2be42e95c5add0ad2e979b8d67472 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Fri, 15 Apr 2011 18:35:16 +0000 Subject: [PATCH] - update to 2.2.4 * Return value of OBJECT DEBUG against sorted sets fixed, now is "skiplist". - additional changes from 2.2.3 * Fixed issue #503. MONITOR + QUIT (and other combinations) could crash the server. * OBJECT command implemented. See http://redis.io/commands/object * Fixed a problem in redis-cli related to escapes in the form "\x..". * Fixed a minor memory leak in redis-cli * Saved RDB on SIGTERM on archs where it was not working properly. - additional changes from 2.2.2 * AOF file descriptor leak after the first rewrite fixed. * Return value of GETRANGE / SUBSTR is now an empty string if the interval specified is not valid, or the key does not exist. Was a null bulk reply before, but this is against the Redis way. - fix the path to the log file in the conf patch to match the rest of the package - created log dir - changed home dir of the redis user from /var/run/redis to /var/lib/redis. the old home dir wasnt created anyway. OBS-URL: https://build.opensuse.org/package/show/server:database/redis?expand=0&rev=19 --- redis-2.2.1.tar.bz2 | 3 --- redis-2.2.4.tar.bz2 | 3 +++ redis-conf.patch | 2 +- redis.changes | 25 +++++++++++++++++++++++++ redis.spec | 12 +++++++----- 5 files changed, 36 insertions(+), 9 deletions(-) delete mode 100644 redis-2.2.1.tar.bz2 create mode 100644 redis-2.2.4.tar.bz2 diff --git a/redis-2.2.1.tar.bz2 b/redis-2.2.1.tar.bz2 deleted file mode 100644 index 241851d..0000000 --- a/redis-2.2.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2c097aada352d774a0faa36a502c76cd838b2c7074cf707efd0d21d010e5881e -size 335734 diff --git a/redis-2.2.4.tar.bz2 b/redis-2.2.4.tar.bz2 new file mode 100644 index 0000000..ca776d6 --- /dev/null +++ b/redis-2.2.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c41d5f8113cc582fd2560036fb66a59a2156710032a996cf7ecddc64fe4a2743 +size 336211 diff --git a/redis-conf.patch b/redis-conf.patch index 8386f4b..f3d3b4e 100644 --- a/redis-conf.patch +++ b/redis-conf.patch @@ -35,7 +35,7 @@ Index: redis.conf # 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 /var/log/redis.log ++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. diff --git a/redis.changes b/redis.changes index 73b7ff2..d7d308a 100644 --- a/redis.changes +++ b/redis.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Fri Apr 15 18:18:56 UTC 2011 - mrueckert@suse.de + +- update to 2.2.4 + * Return value of OBJECT DEBUG against sorted sets fixed, now is + "skiplist". +- additional changes from 2.2.3 + * Fixed issue #503. MONITOR + QUIT (and other combinations) could + crash the server. + * OBJECT command implemented. See http://redis.io/commands/object + * Fixed a problem in redis-cli related to escapes in the form + "\x..". + * Fixed a minor memory leak in redis-cli + * Saved RDB on SIGTERM on archs where it was not working properly. +- additional changes from 2.2.2 + * AOF file descriptor leak after the first rewrite fixed. + * Return value of GETRANGE / SUBSTR is now an empty string if the + interval specified is not valid, or the key does not exist. Was + a null bulk reply before, but this is against the Redis way. +- fix the path to the log file in the conf patch to match the rest + of the package +- created log dir +- changed home dir of the redis user from /var/run/redis to + /var/lib/redis. the old home dir wasnt created anyway. + ------------------------------------------------------------------- Wed Feb 23 18:10:17 UTC 2011 - jw@novell.com diff --git a/redis.spec b/redis.spec index b7bab0d..7105559 100644 --- a/redis.spec +++ b/redis.spec @@ -14,11 +14,11 @@ # norootforbuild -%define _home_dir %{_var}/run/%{name} %define _data_dir %{_var}/lib/%{name} +%define _log_dir %{_var}/log/%{name} Name: redis -Version: 2.2.1 +Version: 2.2.4 Release: 1 # License: BSD License @@ -28,7 +28,7 @@ Url: http://redis.io/ # Source: http://redis.googlecode.com/files/%{name}-%{version}.tar.bz2 Source1: %{name}.logrotate -Source4: redis.sysconfig +Source4: redis.sysconfig # Patch0: %{name}-initscript.patch Patch1: %{name}-conf.patch @@ -81,6 +81,7 @@ make PROF="%{optflags}" %{?jobs:-j%jobs} %{buildroot}%{_bindir} \ %{buildroot}%{_libdir} \ %{buildroot}%{_sbindir} \ + %{buildroot}%{_log_dir} \ %{buildroot}%{_data_dir} %{__install} -m 0755 src/redis-benchmark %{buildroot}%{_bindir}/redis-benchmark @@ -88,7 +89,7 @@ make PROF="%{optflags}" %{?jobs:-j%jobs} %{__install} -m 0755 src/redis-check-dump %{buildroot}%{_bindir}/redis-check-dump %{__install} -m 0755 src/redis-check-aof %{buildroot}%{_bindir}/redis-check-aof %{__install} -m 0755 src/redis-server %{buildroot}%{_sbindir}/redis-server -%{__install} -m 0644 redis.conf %{buildroot}%{_sysconfdir}/redis.conf +%{__install} -m 0640 redis.conf %{buildroot}%{_sysconfdir}/redis.conf ## %{__install} -Dp -m 0755 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/redis # @@ -118,7 +119,7 @@ rm -rf %{buildroot} %pre /usr/sbin/groupadd -r %{name} &>/dev/null || : -/usr/sbin/useradd -o -g %{name} -s /bin/false -r -c "User for Redis key-value store" -d %{_home_dir} %{name} &>/dev/null || : +/usr/sbin/useradd -o -g %{name} -s /bin/false -r -c "User for Redis key-value store" -d %{_data_dir} %{name} &>/dev/null || : %post %fillup_and_insserv %{name} @@ -142,6 +143,7 @@ echo " sudo rcredis start; insserv redis" %config(noreplace) %{_sysconfdir}/init.d/redis %config(noreplace) %attr(0640, %{name}, %{name}) %{_sysconfdir}/redis.conf %dir %attr(0750, %{name}, %{name}) %{_data_dir} +%dir %attr(0750, %{name}, %{name}) %{_log_dir} %files doc %defattr(-,root,root)