From f862e6000de1b207c263ba8387a7065bcc0709b6e146b16d887f313d9aa76a87 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 9 Oct 2017 07:34:28 +0000 Subject: [PATCH 1/2] Accepting request 532588 from home:13ilya:branches:server:database - Drop SLE 11 support. - Refresh spec-file. - Update to 4.0.2 * Release notes: https://raw.githubusercontent.com/antirez/redis/4.0/00-RELEASENOTES * Different replication fixes to PSYNC2, the new 4.0 replication engine. * Modules thread safe contexts were introduced. They are an experimental API right now, but the API is considered to be stable and usable when needed. * SLOWLOG now logs the offending client name and address. Note that this is a backward compatibility breakage in case old code assumes that the slowlog entry is composed of exactly three entries. * The modules native data types RDB format changed. * The AOF check utility is now able to deal with RDB preambles. * GEORADIUS_RO and GEORADIUSBYMEMBER_RO variants, not supporting the STORE option, were added in order to allow read-only scaling of such queries. * HSET is now variadic, and HMSET is considered deprecated (but will be supported for years to come). Please use HSET in new code. * GEORADIUS huge radius (>= ~6000 km) corner cases fixed, certain elements near the edges were not returned. * DEBUG DIGEST modules API added. * HyperLogLog commands no longer crash on certain input (non HLL) strings. * Fixed SLAVEOF inside MULTI/EXEC blocks. * Many other minor bug fixes and improvements. OBS-URL: https://build.opensuse.org/request/show/532588 OBS-URL: https://build.opensuse.org/package/show/server:database/redis?expand=0&rev=95 --- redis-3.2.9.tar.gz | 3 -- redis-4.0.2.tar.gz | 3 ++ redis.changes | 26 ++++++++++ redis.spec | 121 +++++++++++++-------------------------------- 4 files changed, 64 insertions(+), 89 deletions(-) delete mode 100644 redis-3.2.9.tar.gz create mode 100644 redis-4.0.2.tar.gz diff --git a/redis-3.2.9.tar.gz b/redis-3.2.9.tar.gz deleted file mode 100644 index b59657a..0000000 --- a/redis-3.2.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6eaacfa983b287e440d0839ead20c2231749d5d6b78bbe0e0ffa3a890c59ff26 -size 1547695 diff --git a/redis-4.0.2.tar.gz b/redis-4.0.2.tar.gz new file mode 100644 index 0000000..892fff4 --- /dev/null +++ b/redis-4.0.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1a0915dbc91b979d06df1977fe594c3fa9b189f1f3d38743a2948c9f7634813 +size 1713990 diff --git a/redis.changes b/redis.changes index 4274d72..b43fa55 100644 --- a/redis.changes +++ b/redis.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Sun Oct 8 15:22:54 UTC 2017 - ilya@ilya.pp.ua + +- Drop SLE 11 support. +- Refresh spec-file. +- Update to 4.0.2 + * Release notes: https://raw.githubusercontent.com/antirez/redis/4.0/00-RELEASENOTES + * Different replication fixes to PSYNC2, the new 4.0 replication engine. + * Modules thread safe contexts were introduced. They are an experimental + API right now, but the API is considered to be stable and usable when needed. + * SLOWLOG now logs the offending client name and address. Note that this is a + backward compatibility breakage in case old code assumes that the slowlog + entry is composed of exactly three entries. + * The modules native data types RDB format changed. + * The AOF check utility is now able to deal with RDB preambles. + * GEORADIUS_RO and GEORADIUSBYMEMBER_RO variants, not supporting the STORE option, + were added in order to allow read-only scaling of such queries. + * HSET is now variadic, and HMSET is considered deprecated + (but will be supported for years to come). Please use HSET in new code. + * GEORADIUS huge radius (>= ~6000 km) corner cases fixed, + certain elements near the edges were not returned. + * DEBUG DIGEST modules API added. + * HyperLogLog commands no longer crash on certain input (non HLL) strings. + * Fixed SLAVEOF inside MULTI/EXEC blocks. + * Many other minor bug fixes and improvements. + ------------------------------------------------------------------- Wed Jun 21 16:28:36 UTC 2017 - chris@computersalat.de diff --git a/redis.spec b/redis.spec index 578ec77..bbbb738 100644 --- a/redis.spec +++ b/redis.spec @@ -12,54 +12,41 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org # - %define _data_dir %{_localstatedir}/lib/%{name} %define _log_dir %{_localstatedir}/log/%{name} %define _conf_dir %{_sysconfdir}/%{name} -%if 0%{?suse_version} > 1230 -%bcond_without systemd -%else -%bcond_with systemd -%endif Name: redis -Version: 3.2.9 +Version: 4.0.2 Release: 0 Summary: Persistent key-value database License: BSD-3-Clause Group: Productivity/Databases/Servers -Url: http://redis.io/ -Source: http://download.redis.io/releases/redis-%{version}.tar.gz +Url: https://redis.io +Source0: https://download.redis.io/releases/%{name}-%{version}.tar.gz Source1: %{name}.logrotate -Source2: redis.target -Source3: redis@.service -Source4: redis.tmpfiles.d +Source2: %{name}.target +Source3: %{name}@.service +Source4: %{name}.tmpfiles.d Source5: README.SUSE Source6: %{name}.sysctl # PATCH-FIX-OPENSUSE -- openSUSE-style init script Patch0: %{name}-initscript.patch -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines +# PATCH-MISSING-TAG -- See https://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch1: %{name}-conf.patch -Patch2: redis-enable-bactrace-on-x86-and-ia64-only.patch +Patch2: %{name}-enable-bactrace-on-x86-and-ia64-only.patch BuildRequires: pkgconfig BuildRequires: procps BuildRequires: tcl Requires: logrotate Requires: sudo Requires(pre): shadow -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if %{with systemd} BuildRequires: pkgconfig(systemd) -%{?systemd_requires} -%else -# FIXME: use proper Requires(pre/post/preun/...) -PreReq: %insserv_prereq %fillup_prereq -%endif %description -Redis is an advanced key-value store. It is similar to memcached but the dataset +%{name} is an advanced key-value store. It is similar to memcached but the dataset is not volatile, and values can be strings, exactly like in memcached, but also lists, sets, and ordered sets. All this data types can be manipulated with atomic operations to push/pop elements, add/remove elements, perform server @@ -83,41 +70,26 @@ install -m 0750 -d \ %{buildroot}%{_log_dir}/default \ %{buildroot}%{_data_dir}/default -install -Dpm 0755 src/redis-benchmark %{buildroot}%{_bindir}/redis-benchmark -install -Dpm 0755 src/redis-cli %{buildroot}%{_bindir}/redis-cli -install -Dpm 0755 src/redis-check-aof %{buildroot}%{_bindir}/redis-check-aof -install -Dpm 0755 src/redis-check-rdb %{buildroot}%{_bindir}/redis-check-rdb -install -Dpm 0755 src/redis-trib.rb %{buildroot}%{_bindir}/redis-trib.rb -install -Dpm 0755 src/redis-server %{buildroot}%{_sbindir}/redis-server -ln -sfv redis-server %{buildroot}%{_sbindir}/redis-sentinel +install -Dpm 0755 src/%{name}-benchmark %{buildroot}%{_bindir}/%{name}-benchmark +install -Dpm 0755 src/%{name}-cli %{buildroot}%{_bindir}/%{name}-cli +install -Dpm 0755 src/%{name}-check-aof %{buildroot}%{_bindir}/%{name}-check-aof +install -Dpm 0755 src/%{name}-check-rdb %{buildroot}%{_bindir}/%{name}-check-rdb +install -Dpm 0755 src/%{name}-trib.rb %{buildroot}%{_bindir}/%{name}-trib.rb +install -Dpm 0755 src/%{name}-server %{buildroot}%{_sbindir}/%{name}-server +ln -sfv redis-server %{buildroot}%{_sbindir}/%{name}-sentinel -%if %{with systemd} -perl -p -i -e 's|daemonize yes|daemonize no|g' redis.conf -%endif -install -D -m 0640 redis.conf %{buildroot}%{_conf_dir}/default.conf.example -install -D -m 0640 sentinel.conf %{buildroot}%{_conf_dir}/sentinel.conf.example +perl -p -i -e 's|daemonize yes|daemonize no|g' %{name}.conf +install -Dm 0640 redis.conf %{buildroot}%{_conf_dir}/default.conf.example +install -Dm 0640 sentinel.conf %{buildroot}%{_conf_dir}/sentinel.conf.example # some sysctl stuff -install -D -m 0644 %{S:6} %{buildroot}%{_sysconfdir}/sysctl.d/00-redis.conf - -# -# init -# -%if %{with systemd} -install -D -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/redis.target -install -D -m 0644 %{SOURCE3} %{buildroot}%{_unitdir}/redis@.service -install -D -m 0644 %{SOURCE4} %{buildroot}%{_prefix}/lib/tmpfiles.d/%{name}.conf -ln -s -f %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} +install -Dm 0644 %{S:6} %{buildroot}%{_sysconfdir}/sysctl.d/00-%{name}.conf +install -Dm 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} +install -Dm 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.target +install -Dm 0644 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}@.service +install -Dm 0644 %{SOURCE4} %{buildroot}%{_prefix}/lib/tmpfiles.d/%{name}.conf +ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} cp %{SOURCE5} README.SUSE -%else -install -D -m 0755 utils/redis_init_script %{buildroot}%{_sysconfdir}/init.d/redis -ln -s %{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name} -%endif - -# -# logrotate -# -install -D -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} %check %ifnarch ppc ppc64 @@ -134,58 +106,35 @@ make %{?_smp_mflags} test && true getent group %{name} >/dev/null || %{_sbindir}/groupadd -r %{name} || : getent passwd %{name} >/dev/null || \ %{_sbindir}/useradd -g %{name} -s /bin/false -r \ - -c "User for Redis key-value store" -d %{_data_dir} %{name} || : -%if %{with systemd} + -c "User for %{name} key-value store" -d %{_data_dir} %{name} || : %service_add_pre %{name}.target -%endif %post -%if %{with systemd} systemd-tmpfiles --create %{_prefix}/lib/tmpfiles.d/%{name}.conf || true %service_add_post %{name}.target -echo "See %{_docdir}/redis/README.SUSE to continue" -%else -echo "To start the database server, create your configuration" -echo "starting from %{_sysconfdir}/redis/default.conf.example, place it" -echo "in %{_sysconfdir}/redis and do: " -echo " sudo rcredis start; sudo chkconfig redis on" -%endif +echo "See %{_docdir}/%{name}/README.SUSE to continue" %preun -%if %{with systemd} %service_del_preun %{name}.target -%else -%stop_on_removal %{name} -%endif %postun -%if %{with systemd} %service_del_postun %{name}.target -%else -%restart_on_update %{name} -%insserv_cleanup -%endif %files %defattr(-,root,root,-) %doc 00-RELEASENOTES BUGS CONTRIBUTING COPYING README.md %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} -%config(noreplace) %{_sysconfdir}/sysctl.d/00-redis.conf -%{_bindir}/redis-* -%{_sbindir}/redis-* +%config(noreplace) %{_sysconfdir}/sysctl.d/00-%{name}.conf +%{_bindir}/%{name}-* +%{_sbindir}/%{name}-* %{_sbindir}/rc%{name} -%if %{with systemd} %{_prefix}/lib/tmpfiles.d/%{name}.conf %{_unitdir}/%{name}@.service %{_unitdir}/%{name}.target %doc README.SUSE -%else -%config(noreplace) %{_sysconfdir}/init.d/%{name} -%endif -%config(noreplace) %attr(-, root, %{name}) %{_conf_dir}/ -# -%dir %attr(0750, %{name}, %{name}) %{_data_dir} -%dir %attr(0750, %{name}, %{name}) %{_data_dir}/default -%dir %attr(0750, %{name}, %{name}) %{_log_dir} +%config(noreplace) %attr(-,root,%{name}) %{_conf_dir}/ +%dir %attr(0750,%{name},%{name}) %{_data_dir} +%dir %attr(0750,%{name},%{name}) %{_data_dir}/default +%dir %attr(0750,%{name},%{name}) %{_log_dir} %changelog From 2fae05542cd21a6020f8e41b0c04de93f02916dffb41a5bd07e27cb54e0fc2e1 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 9 Oct 2017 07:56:09 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/server:database/redis?expand=0&rev=96 --- redis.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/redis.spec b/redis.spec index bbbb738..ba196e6 100644 --- a/redis.spec +++ b/redis.spec @@ -12,9 +12,10 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define _data_dir %{_localstatedir}/lib/%{name} %define _log_dir %{_localstatedir}/log/%{name} %define _conf_dir %{_sysconfdir}/%{name} @@ -25,7 +26,7 @@ Summary: Persistent key-value database License: BSD-3-Clause Group: Productivity/Databases/Servers Url: https://redis.io -Source0: https://download.redis.io/releases/%{name}-%{version}.tar.gz +Source0: http://download.redis.io/releases/redis-%{version}.tar.gz Source1: %{name}.logrotate Source2: %{name}.target Source3: %{name}@.service