Compare commits

...

4 Commits
master ... f22

Author SHA1 Message Date
Haikel Guemar 3fba070990 Upstream 2.8.23
- Fix slave/master replication hanging forever in certain case
2015-10-16 18:17:00 +02:00
Christopher Meng 6b047b85ae Update to 2.8.22 2015-09-09 17:31:13 +08:00
Haikel Guemar 392893304e Upstream 2.8.21
- Fix Lua sandbox escape and arbitrary code execution (RHBZ #1228331)
2015-06-05 02:05:07 +02:00
Haikel Guemar 2b2efee572 Fix redis-shutdown on multiple NIC setup (RHBZ #1201237) 2015-03-27 00:09:00 +01:00
4 changed files with 25 additions and 6 deletions

3
.gitignore vendored
View File

@ -20,3 +20,6 @@
/redis-2.8.17.tar.gz /redis-2.8.17.tar.gz
/redis-2.8.18.tar.gz /redis-2.8.18.tar.gz
/redis-2.8.19.tar.gz /redis-2.8.19.tar.gz
/redis-2.8.21.tar.gz
/redis-2.8.22.tar.gz
/redis-2.8.23.tar.gz

View File

@ -14,10 +14,12 @@ fi
# Get the proper config file based on service name # Get the proper config file based on service name
CONFIG_FILE="/etc/$SERVICE_NAME.conf" CONFIG_FILE="/etc/$SERVICE_NAME.conf"
# Use awk to retrieve port from config file # Use awk to retrieve host, port from config file
HOST=`awk '/^[[:blank:]]*bind/ { print $2 }' $CONFIG_FILE`
PORT=`awk '/^[[:blank:]]*port/ { print $2 }' $CONFIG_FILE` PORT=`awk '/^[[:blank:]]*port/ { print $2 }' $CONFIG_FILE`
# Just in case, use default port # Just in case, use default host, port
HOST=${HOST:-127.0.0.1}
if [ "$SERVICE_NAME" = redis ]; then if [ "$SERVICE_NAME" = redis ]; then
PORT=${PORT:-6379} PORT=${PORT:-6379}
else else
@ -25,4 +27,4 @@ else
fi fi
# shutdown the service properly # shutdown the service properly
$REDIS_CLI -p $PORT shutdown $REDIS_CLI -h $HOST -p $PORT shutdown

View File

@ -11,8 +11,8 @@
%global with_tests %{?_with_tests:1}%{!?_with_tests:0} %global with_tests %{?_with_tests:1}%{!?_with_tests:0}
Name: redis Name: redis
Version: 2.8.19 Version: 2.8.23
Release: 1%{?dist}.1 Release: 1%{?dist}
Summary: A persistent key-value database Summary: A persistent key-value database
License: BSD License: BSD
URL: http://redis.io URL: http://redis.io
@ -242,6 +242,20 @@ fi
%changelog %changelog
* Fri Oct 16 2015 Haïkel Guémar <hguemar@fedoraproject.org> - 2.8.23-1
- Upstream 2.8.23
- Fix slave/master replication hanging forever in certain case
* Tue Sep 08 2015 Christopher Meng <rpm@cicku.me> - 2.8.22-1
- Update to 2.8.22
* Thu Jun 04 2015 Haïkel Guémar <hguemar@fedoraproject.org> - 2.8.21-1
- Upstream 2.8.21
- Fix Lua sandbox escape and arbitrary code execution (RHBZ #1228331)
* Thu Mar 26 2015 Haïkel Guémar <hguemar@fedoraproject.org> - 2.8.19-2
- Fix redis-shutdown on multiple NIC setup (RHBZ #1201237)
* Fri Feb 27 2015 Haïkel Guémar <hguemar@fedoraproject.org> - 2.8.19-1 * Fri Feb 27 2015 Haïkel Guémar <hguemar@fedoraproject.org> - 2.8.19-1
- Upstream 2.8.19 (RHBZ #1175232) - Upstream 2.8.19 (RHBZ #1175232)
- Fix permissions for tmpfiles (RHBZ #1182913) - Fix permissions for tmpfiles (RHBZ #1182913)

View File

@ -1 +1 @@
3794107224043465603f48941f5c86a7 redis-2.8.19.tar.gz ac7f43f845d0eedb8ae3e5e217b34c61 redis-2.8.23.tar.gz