Skip to content

Commit

Permalink
Update Redis to the latest versions
Browse files Browse the repository at this point in the history
  • Loading branch information
andyone committed Aug 20, 2024
1 parent 882ed7b commit be4eeb0
Show file tree
Hide file tree
Showing 18 changed files with 87 additions and 864 deletions.
20 changes: 6 additions & 14 deletions specs/ninja-build/ninja-build.spec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

Summary: Small build system with a focus on speed
Name: ninja-build
Version: 1.12.0
Version: 1.12.1
Release: 0%{?dist}
License: ASL 2.0
Group: Development/Tools
Expand All @@ -23,13 +23,7 @@ Source100: checksum.sha512

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: gcc-c++ asciidoc

%if 0%{?rhel} <= 7
BuildRequires: cmake3
%else
BuildRequires: cmake
%endif
BuildRequires: cmake gcc-c++ asciidoc

Provides: %{name} = %{version}-%{release}

Expand All @@ -49,13 +43,8 @@ fast as possible.
%setup -qn ninja-%{version}

%build
%if 0%{?rhel} <= 7
cmake3 -B build
cmake3 --build build
%else
cmake -B build
cmake --build build
%endif

%install
rm -rf %{buildroot}
Expand Down Expand Up @@ -83,8 +72,11 @@ rm -rf %{buildroot}
################################################################################

%changelog
* Tue Aug 20 2024 Anton Novojilov <andy@essentialkaos.com> - 1.12.1-0
- https://github.com/ninja-build/ninja/releases/tag/v1.12.1

* Tue Apr 16 2024 Anton Novojilov <andy@essentialkaos.com> - 1.12.0-0
- https://github.com/ninja-build/ninja/milestone/6?closed=1
- https://github.com/ninja-build/ninja/releases/tag/v1.12.0

* Fri Dec 09 2022 Anton Novojilov <andy@essentialkaos.com> - 1.11.1-0
- Initial build
57 changes: 0 additions & 57 deletions specs/redis/SOURCES/redis-50-config.patch

This file was deleted.

57 changes: 0 additions & 57 deletions specs/redis/SOURCES/redis-60-config.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
diff --color -urN redis-6.2.13-orig/redis.conf redis-6.2.13-config/redis.conf
--- redis-6.2.13-orig/redis.conf 2023-07-10 14:37:59.000000000 +0300
+++ redis-6.2.13-config/redis.conf 2023-08-16 11:12:41.000000000 +0300
@@ -72,7 +72,7 @@
# IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES
# JUST COMMENT OUT THE FOLLOWING LINE.
diff --color -urN redis-7.4.0-orig/redis.conf redis-7.4.0-config/redis.conf
--- redis-7.4.0-orig/redis.conf 2024-07-29 08:31:59.000000000 +0300
+++ redis-7.4.0-config/redis.conf 2024-08-20 17:13:57.000000000 +0300
@@ -85,7 +85,7 @@
# You will also need to set a password unless you explicitly disable protected
# mode.
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-bind 127.0.0.1 -::1
+# bind 127.0.0.1 -::1
+#bind 127.0.0.1 -::1

# Protected mode is a layer of security protection, in order to avoid that
# Redis instances left open on the internet are accessed and exploited.
@@ -288,7 +288,7 @@
# By default, outgoing connections (from replica to master, from Sentinel to
# instances, cluster bus, etc.) are not bound to a specific local address. In
@@ -339,7 +339,7 @@
#
# Note that on modern Linux systems "/run/redis.pid" is more conforming
# and should be used instead.
Expand All @@ -19,7 +19,7 @@ diff --color -urN redis-6.2.13-orig/redis.conf redis-6.2.13-config/redis.conf

# Specify the server verbosity level.
# This can be one of:
@@ -301,7 +301,7 @@
@@ -353,7 +353,7 @@
# Specify the log file name. Also the empty 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
Expand All @@ -28,7 +28,7 @@ diff --color -urN redis-6.2.13-orig/redis.conf redis-6.2.13-config/redis.conf

# To enable logging to the system logger, just set 'syslog-enabled' to yes,
# and optionally update the other syslog parameters to suit your needs.
@@ -326,7 +326,7 @@
@@ -378,7 +378,7 @@
# Set the number of databases. The default database is DB 0, you can select
# a different one on a per-connection basis using SELECT <dbid> where
# dbid is a number between 0 and 'databases'-1
Expand All @@ -37,20 +37,16 @@ diff --color -urN redis-6.2.13-orig/redis.conf redis-6.2.13-config/redis.conf

# By default Redis shows an ASCII art logo only when started to log to the
# standard output and if the standard output is a TTY and syslog logging is
@@ -380,9 +380,9 @@
@@ -442,7 +442,7 @@
#
# You can set these explicitly by uncommenting the three following lines.
# You can set these explicitly by uncommenting the following line.
#
-# save 3600 1
-# save 300 100
-# save 60 10000
+save 3600 1
+save 300 100
+save 60 10000
-# save 3600 1 300 100 60 10000
+save 3600 1 300 100 60 10000

# By default Redis will stop accepting writes if RDB snapshots are enabled
# (at least one save point) and the latest background save failed.
@@ -453,7 +453,7 @@
@@ -513,7 +513,7 @@
# The Append Only File will also be created inside this directory.
#
# Note that you must specify a directory here, not a file name.
Expand Down
18 changes: 0 additions & 18 deletions specs/redis/SOURCES/sentinel-50-config.patch

This file was deleted.

18 changes: 0 additions & 18 deletions specs/redis/SOURCES/sentinel-60-config.patch

This file was deleted.

18 changes: 0 additions & 18 deletions specs/redis/SOURCES/sentinel-62-config.patch

This file was deleted.

11 changes: 10 additions & 1 deletion specs/redis/SOURCES/sentinel-72-config.patch
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
diff --color -urN redis-7.2.0-orig/sentinel.conf redis-7.2.0-sentinel/sentinel.conf
--- redis-7.2.0-orig/sentinel.conf 2023-08-15 12:38:36.000000000 +0300
+++ redis-7.2.0-sentinel/sentinel.conf 2023-08-16 11:20:45.000000000 +0300
+++ redis-7.2.0-sentinel/sentinel.conf 2024-08-20 17:15:54.000000000 +0300
@@ -1,5 +1,3 @@
-# Example sentinel.conf
-
# By default protected mode is disabled in sentinel mode. Sentinel is reachable
# from interfaces different than localhost. Make sure the sentinel instance is
# protected from the outside world via firewalling or other means.
@@ -17,7 +15,7 @@
# When running daemonized, Redis Sentinel writes a pid file in
# /var/run/redis-sentinel.pid by default. You can specify a custom pid file
# location here.
-pidfile /var/run/redis-sentinel.pid
+pidfile /var/run/redis/sentinel.pid

# Specify the server verbosity level.
# This can be one of:
@@ -31,7 +29,7 @@
# Specify the log file name. Also the empty string can be used to force
# Sentinel to log on the standard output. Note that if you use standard
Expand Down
27 changes: 27 additions & 0 deletions specs/redis/SOURCES/sentinel-74-config.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
diff --color -urN redis-7.4.0-orig/sentinel.conf redis-7.4.0-sentinel/sentinel.conf
--- redis-7.4.0-orig/sentinel.conf 2024-07-29 08:31:59.000000000 +0300
+++ redis-7.4.0-sentinel/sentinel.conf 2024-08-20 17:15:01.000000000 +0300
@@ -1,5 +1,3 @@
-# Example sentinel.conf
-
# By default protected mode is disabled in sentinel mode. Sentinel is reachable
# from interfaces different than localhost. Make sure the sentinel instance is
# protected from the outside world via firewalling or other means.
@@ -17,7 +15,7 @@
# When running daemonized, Redis Sentinel writes a pid file in
# /var/run/redis-sentinel.pid by default. You can specify a custom pid file
# location here.
-pidfile /var/run/redis-sentinel.pid
+pidfile /var/run/redis/sentinel.pid

# Specify the server verbosity level.
# This can be one of:
@@ -31,7 +29,7 @@
# Specify the log file name. Also the empty string can be used to force
# Sentinel 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 ""
+logfile /var/log/redis/sentinel.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.
Loading

0 comments on commit be4eeb0

Please sign in to comment.