From f57cc26716e6a16f651a5dd9423c583e7e442b84cc4838085eaa1c4763a70484 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 18 Mar 2020 06:14:14 +0000 Subject: [PATCH 1/2] Accepting request 786036 from home:13ilya:branches:server:database - Refresh spec-file with spec-cleaner and manual optimizations * Remove Group tag. * Replace make by %make_build macros. - Update to 5.0.8 * https://raw.githubusercontent.com/antirez/redis/5.0.8/00-RELEASENOTES * Fix Pi building needing -latomic, backport. * Fix impl of aof-child whitelist SIGUSR1 feature. * Fix ThreadSafeContext lock/unlock function names. * XREADGROUP should propagate XCALIM/SETID in MULTI/EXEC. * Fix client flags to be int64 in module.c. * Fix small bugs related to replica and monitor ambiguity. * Fix lua related memory leak. * Simplify #6379 changes. * Free allocated sds in pfdebugCommand() to avoid memory leak. * Jump to right label on AOF parsing error. * Free fakeclient argv on AOF error. * Fix potential memory leak of rioWriteBulkStreamID(). * Fix potential memory leak of clusterLoadConfig(). * Fix bug on KEYS command where pattern starts with * followed by \x00. * Blocking XREAD[GROUP] should always reply with valid data. * XCLAIM: Create the consumer only on successful claims. * Stream: Handle streamID-related edge cases. * Fix ip and missing mode in RM_GetClusterNodeInfo(). * Inline protocol: handle empty strings well. * Mark extern definition of SDS_NOINIT in sds.h. * Fix revisit CVE-2015-8080 vulnerability. * Avoid sentinel changes promoted_slave to be its own replica. OBS-URL: https://build.opensuse.org/request/show/786036 OBS-URL: https://build.opensuse.org/package/show/server:database/redis?expand=0&rev=135 --- redis-5.0.7.tar.gz | 3 --- redis-5.0.8.tar.gz | 3 +++ redis.changes | 31 ++++++++++++++++++++++++++++++- redis.spec | 7 +++---- 4 files changed, 36 insertions(+), 8 deletions(-) delete mode 100644 redis-5.0.7.tar.gz create mode 100644 redis-5.0.8.tar.gz diff --git a/redis-5.0.7.tar.gz b/redis-5.0.7.tar.gz deleted file mode 100644 index 50a232c..0000000 --- a/redis-5.0.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:61db74eabf6801f057fd24b590232f2f337d422280fd19486eca03be87d3a82b -size 1984203 diff --git a/redis-5.0.8.tar.gz b/redis-5.0.8.tar.gz new file mode 100644 index 0000000..a00caf5 --- /dev/null +++ b/redis-5.0.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3c7eac42f433326a8d981b50dba0169fdfaf46abb23fcda2f933a7552ee4ed7 +size 1985757 diff --git a/redis.changes b/redis.changes index c2499be..b1829e5 100644 --- a/redis.changes +++ b/redis.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Wed Mar 18 02:18:24 UTC 2020 - Илья Индиго +- Refresh spec-file with spec-cleaner and manual optimizations + * Remove Group tag. + * Replace make by %make_build macros. +- Update to 5.0.8 + * https://raw.githubusercontent.com/antirez/redis/5.0.8/00-RELEASENOTES + * Fix Pi building needing -latomic, backport. + * Fix impl of aof-child whitelist SIGUSR1 feature. + * Fix ThreadSafeContext lock/unlock function names. + * XREADGROUP should propagate XCALIM/SETID in MULTI/EXEC. + * Fix client flags to be int64 in module.c. + * Fix small bugs related to replica and monitor ambiguity. + * Fix lua related memory leak. + * Simplify #6379 changes. + * Free allocated sds in pfdebugCommand() to avoid memory leak. + * Jump to right label on AOF parsing error. + * Free fakeclient argv on AOF error. + * Fix potential memory leak of rioWriteBulkStreamID(). + * Fix potential memory leak of clusterLoadConfig(). + * Fix bug on KEYS command where pattern starts with * followed by \x00. + * Blocking XREAD[GROUP] should always reply with valid data. + * XCLAIM: Create the consumer only on successful claims. + * Stream: Handle streamID-related edge cases. + * Fix ip and missing mode in RM_GetClusterNodeInfo(). + * Inline protocol: handle empty strings well. + * Mark extern definition of SDS_NOINIT in sds.h. + * Fix revisit CVE-2015-8080 vulnerability. + * Avoid sentinel changes promoted_slave to be its own replica. + ------------------------------------------------------------------- Sat Feb 8 15:40:07 UTC 2020 - Marcus Rueckert @@ -1249,4 +1279,3 @@ Fri Mar 5 06:12:24 EST 2010 - pzb@suse.de Thu Jan 21 16:32:45 UTC 2010 - prusnak@suse.cz - created package - diff --git a/redis.spec b/redis.spec index 6a26a41..3fa86de 100644 --- a/redis.spec +++ b/redis.spec @@ -20,11 +20,10 @@ %define _log_dir %{_localstatedir}/log/%{name} %define _conf_dir %{_sysconfdir}/%{name} Name: redis -Version: 5.0.7 +Version: 5.0.8 Release: 0 Summary: Persistent key-value database License: BSD-3-Clause -Group: Productivity/Databases/Servers URL: https://redis.io Source0: http://download.redis.io/releases/redis-%{version}.tar.gz Source1: %{name}.logrotate @@ -68,7 +67,7 @@ different kind of sorting abilities. %build export HOST=OBS # for reproducible builds -make %{?_smp_mflags} CFLAGS="%{optflags}" V=1 +%make_build CFLAGS="%{optflags}" %sysusers_generate_pre %{SOURCE9} redis %install @@ -118,7 +117,7 @@ The test suite often fails to start a server, with 'child process exited abnormally' -- sometimes it works. --------------------------------------------------- EOF -make %{?_smp_mflags} test || true +%make_build test || true %endif %pre -f redis.pre From 13bd5ed972ca4392887529f0a3a91546a076610c587e88ef36aa2d4a223da2dd Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 25 Mar 2020 07:11:31 +0000 Subject: [PATCH 2/2] Accepting request 787910 from home:kukuk:branches:server:database - Use the tmpfiles macros instead of calling systemd-tempfiles direct and build wrong macro paths. OBS-URL: https://build.opensuse.org/request/show/787910 OBS-URL: https://build.opensuse.org/package/show/server:database/redis?expand=0&rev=136 --- redis.changes | 6 ++++++ redis.spec | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/redis.changes b/redis.changes index b1829e5..abacf63 100644 --- a/redis.changes +++ b/redis.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 24 19:04:42 UTC 2020 - Thorsten Kukuk + +- Use the tmpfiles macros instead of calling systemd-tempfiles + direct and build wrong macro paths. + ------------------------------------------------------------------- Wed Mar 18 02:18:24 UTC 2020 - Илья Индиго - Refresh spec-file with spec-cleaner and manual optimizations diff --git a/redis.spec b/redis.spec index 3fa86de..f147d67 100644 --- a/redis.spec +++ b/redis.spec @@ -99,7 +99,7 @@ install -Dm 0644 %{SOURCE6} %{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}%{_libexecdir}/tmpfiles.d/%{name}.conf +install -Dm 0644 %{SOURCE4} %{buildroot}%{_tmpfilesdir}/%{name}.conf install -Dm 0644 %{SOURCE7} %{buildroot}%{_unitdir}/%{name}-sentinel@.service install -Dm 0644 %{SOURCE8} %{buildroot}%{_unitdir}/%{name}-sentinel.target @@ -124,7 +124,7 @@ EOF %service_add_pre redis.target redis@.service redis-sentinel.target redis-sentinel@.service %post -systemd-tmpfiles --create %{_libexecdir}/tmpfiles.d/%{name}.conf || true +%tmpfiles_create %{_tmpfilesdir}/%{name}.conf %service_add_post redis.target redis@.service redis-sentinel.target redis-sentinel@.service echo "See %{_docdir}/%{name}/README.SUSE to continue" @@ -142,7 +142,7 @@ echo "See %{_docdir}/%{name}/README.SUSE to continue" %{_bindir}/%{name}-* %{_sbindir}/%{name}-* %{_sbindir}/rc%{name} -%{_libexecdir}/tmpfiles.d/%{name}.conf +%{_tmpfilesdir}/%{name}.conf %{_sysusersdir}/redis-user.conf %{_unitdir}/%{name}@.service %{_unitdir}/%{name}.target