Merge branch '7.0.5' into 'master'

Update to 7.0.5

See merge request packaging/rpm-icingadb-redis!9

.gitignore

@@ -103,3 +103,9 @@ clog
 /redis-doc-775eccb.tar.gz
 /redis-7.0.2.tar.gz
 /redis-doc-af2e6f8.tar.gz
+/redis-7.0.3.tar.gz
+/redis-doc-dd4aa50.tar.gz
+/redis-7.0.4.tar.gz
+/redis-doc-7fa685e.tar.gz
+/redis-7.0.5.tar.gz
+/redis-doc-e50ea18.tar.gz

.gitlab-ci.yml

@@ -5,8 +5,8 @@ stages:
 
 variables:
   DOCKER_IMAGE_BASE: registry.icinga.com/build-docker
-  ICINGA_BUILD_TYPE: snapshot
-  ICINGA_BUILD_UPSTREAM_BRANCH: 7.0.2
+  #ICINGA_BUILD_TYPE: snapshot
+  #ICINGA_BUILD_UPSTREAM_BRANCH: 7.0.5
 
 .build: &build
   stage: build

icinga-src.patch

@@ -67,15 +67,6 @@ diff --git a/src/server.c b/src/server.c
      server.master = NULL;
      server.cached_master = NULL;
      server.master_initial_offset = -1;
-@@ -6097,7 +6097,7 @@ void usage(void) {
-     fprintf(stderr,"       ./redis-server --test-memory <megabytes>\n\n");
-     fprintf(stderr,"Examples:\n");
-     fprintf(stderr,"       ./redis-server (run the server with default conf)\n");
--    fprintf(stderr,"       ./redis-server /etc/redis/6379.conf\n");
-+    fprintf(stderr,"       ./redis-server /etc/redis/6380.conf\n");
-     fprintf(stderr,"       ./redis-server --port 7777\n");
-     fprintf(stderr,"       ./redis-server --port 7777 --replicaof 127.0.0.1 8888\n");
-     fprintf(stderr,"       ./redis-server /etc/myredis.conf --loglevel verbose -\n");
 
 diff --git a/src/Makefile b/src/Makefile
 --- a/src/Makefile

redis.spec

@@ -15,7 +15,7 @@
 
 # Commit IDs for the (unversioned) redis-doc repository
 # https://fedoraproject.org/wiki/Packaging:SourceURL "Commit Revision"
-%global doc_commit af2e6f814be4cadd9b619001b0acf0754f8dd057
+%global doc_commit e50ea1872e4efaf2a7174700050b7ce1c47dc2a8
 %global short_doc_commit %(c=%{doc_commit}; echo ${c:0:7})
 
 # %%{rpmmacrodir} not usable on EL-6
@@ -26,7 +26,7 @@
 %global redis_port 6380
 
 Name:              %{?pkg_prefix}redis
-Version:           7.0.2
+Version:           7.0.5
 Release:           1%{?dist}
 Summary:           A persistent key-value database
 # redis, jemalloc, linenoise, lzf, hiredis are BSD
@@ -64,6 +64,7 @@ BuildRequires:     tcl
 %endif
 BuildRequires:     pkgconfig(libsystemd)
 BuildRequires:     systemd-devel
+BuildRequires:     systemd-rpm-macros
 BuildRequires:     openssl-devel
 # redis-trib functionality migrated to redis-cli
 Obsoletes:         redis-trib < 5
@@ -247,7 +248,7 @@ ln -s redis.conf.5   %{buildroot}%{_mandir}/man5/%{pkg_prefix}redis-sentinel.con
 
 # Install documentation and html pages
 doc=$(echo %{buildroot}/%{_docdir}/%{name})
-for page in 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO; do
+for page in 00-RELEASENOTES BUGS MANIFESTO *.md; do
     install -Dpm644 $page $doc/$page
 done
 for page in $(find doc -name \*.md | sed -e 's|.md$||g'); do
@@ -350,6 +351,9 @@ fi
 
 
 %changelog
+* Fri Oct 14 2022 Henrik Triem <henrik.triem@icinga.com> - 7.0.5-1
+- Update to 7.0.5-1
+
 * Mon Jun 20 2022 Henrik Triem <henrik.triem@icinga.com> - 7.0.2-1
 - Update to 7.0.2-1
 

sources

@@ -1,2 +1,2 @@
-SHA512 (redis-7.0.2.tar.gz) = bc8d679ecaad0220318b87be70476653f42b76815af61ff6f4e8885f5a5d17d41cea754fbf448f9e18e9a9f90227c5ac198fa9bc523370752f590ba01418a1b0
-SHA512 (redis-doc-af2e6f8.tar.gz) = 63b723013919e903ad02f2b7288edf48d33901d12fd86316dfbb00d72aaf1599c3441d0b6733ede733d84caedfae6cd93cc5f7fc1530f324753e036961b3eae6
+SHA512 (redis-7.0.5.tar.gz) = 16ff920cb8df4d82e78ef34209285024aa98189be8acbca86b10fb3064dcc70eac60206aadece6af08406860ed01a004ce3aaa86be896ea36c7f486686646753
+SHA512 (redis-doc-e50ea18.tar.gz) = adb9f06b85dcea9356c9cc0befde2e0a6eec8f2f886a746eecd8c6cd46d12a0f3434e061384385132fb40f178349effb8a26f0ad3f0a601ec847a91bf4e886ae