rpm/redis
SHA256
1
0
Fork 0
forked from pool/redis
Code Pull Requests Activity

Accepting request 181569 from server:database

Browse Source 
Make the logrotate script setuid/setgid to the redis user/group, to silence logrotate warnings in the logs. (forwarded request 180755 from vjt)

OBS-URL: https://build.opensuse.org/request/show/181569
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/redis?expand=0&rev=8
This commit is contained in:
Stephan Kulow 2013-07-02 05:42:45 +00:00 committed by Git OBS Bridge
commit b8ff842a94
9 changed files with 42 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
redis-2.4.15-linenoise-cflags.patch
View File

@ -1,17 +0,0 @@
Index: deps/linenoise/Makefile
===================================================================
--- deps/linenoise/Makefile.orig
+++ deps/linenoise/Makefile
@@ -1,10 +1,10 @@
linenoise_example: linenoise.h linenoise.c
linenoise_example: linenoise.o example.o
- $(CC) $(ARCH) -Wall -W -Os -g -o linenoise_example linenoise.o example.o
+ $(CC) $(ARCH) $(CFLAGS) -o linenoise_example linenoise.o example.o
.c.o:
- $(CC) $(ARCH) -c -Wall -W -Os -g $<
+ $(CC) $(ARCH) -c $(CFLAGS) $<
clean:
rm -f linenoise_example *.o

3
redis-2.4.15.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2e5467079aa130d9e968dd7b35411940f012d322bf68d287c7af6f4d40e393c4
size 653949

3
redis-2.6.9.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4d967eff2038aebea33875d17e85ed67179df6505df68529a622f7836d1c7489
size 989119

27
redis-conf.patch
View File

@ -1,5 +1,7 @@
--- redis.conf.orig 2012-07-31 16:56:02.000000000 +0200
+++ redis.conf 2012-07-31 16:59:31.000000000 +0200
Index: redis.conf
===================================================================
--- redis.conf.orig
+++ redis.conf
@@ -14,11 +14,11 @@
# By default Redis does not run as a daemon. Use 'yes' if you need it.
@ -14,7 +16,7 @@
# Accept connections on the specified port, default is 6379.
# If port 0 is specified Redis will not listen on a TCP socket.
@@ -27,7 +27,7 @@
@@ -27,7 +27,7 @@ port 6379
# If you want you can bind a single interface, if the bind option is not
# specified all the interfaces will listen for incoming connections.
#
@ -23,13 +25,7 @@
# Specify the path for the unix socket that will be used to listen for
# incoming connections. There is no default, so Redis will not listen
@@ -45,12 +45,12 @@
# verbose (many rarely useful info, but not a mess like the debug level)
# notice (moderately verbose, what you want in production probably)
# warning (only very important / critical messages are logged)
-loglevel verbose
+loglevel notice
@@ -50,7 +50,7 @@ loglevel notice
# Specify the log file name. Also 'stdout' 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
@ -38,7 +34,7 @@
# To enable logging to the system logger, just set 'syslog-enabled' to yes,
# and optionally update the other syslog parameters to suit your needs.
@@ -104,7 +104,7 @@
@@ -134,7 +134,7 @@ dbfilename dump.rdb
# Also the Append Only File will be created inside this directory.
#
# Note that you must specify a directory here, not a file name.
@ -47,12 +43,3 @@
################################# REPLICATION #################################
@@ -386,7 +386,7 @@
# *** WARNING *** if you are using a shared hosting the default of putting
# the swap file under /tmp is not secure. Create a dir with access granted
# only to Redis user and configure Redis to create the swap file there.
-vm-swap-file /tmp/redis.swap
+vm-swap-file /var/lib/redis/default/redis.swap
# vm-max-memory configures the VM to use at max the specified amount of
# RAM. Everything that deos not fit will be swapped on disk *if* possible, that

13
redis-endian.patch
View File

@ -1,13 +0,0 @@
Index: src/Makefile
===================================================================
--- src/Makefile.orig
+++ src/Makefile
@@ -58,7 +58,7 @@ PREFIX?=/usr/local
INSTALL_BIN= $(PREFIX)/bin
INSTALL= cp -pf
-OBJ = adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o vm.o pubsub.o multi.o debug.o sort.o intset.o syncio.o slowlog.o bio.o memtest.o
+OBJ = adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o vm.o pubsub.o multi.o debug.o sort.o intset.o syncio.o slowlog.o bio.o memtest.o endian.o
BENCHOBJ = ae.o anet.o redis-benchmark.o sds.o adlist.o zmalloc.o
CLIOBJ = anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o ae.o
CHECKDUMPOBJ = redis-check-dump.o lzf_c.o lzf_d.o

18
redis.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Mon Jun 24 14:15:49 UTC 2013 - vjt@openssl.it
- Make the logrotate script setuid/setgid to the redis user/group
-------------------------------------------------------------------
Tue Jan 22 10:47:17 UTC 2013 - mrueckert@suse.de
- update to 2.6.9 (bnc#798455)
Too many changes to list them here, please refer to
/usr/share/doc/packages/redis/00-RELEASENOTES
- refreshed patches:
redis-conf.patch
skip-aof-test.patch
- dropped patches:
redis-endian.patch
redis-2.4.15-linenoise-cflags.patch
-------------------------------------------------------------------
Tue Nov 20 07:40:52 UTC 2012 - dimstar@opensuse.org

1
redis.logrotate
View File

@ -6,4 +6,5 @@
compress
notifempty
missingok
su redis redis
}

19
redis.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package redis
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -21,7 +21,7 @@
%define _conf_dir %{_sysconfdir}/%{name}
Name: redis
Version: 2.4.15
Version: 2.6.9
Release: 0
Summary: Persistent key-value database
License: BSD-3-Clause
@ -36,8 +36,6 @@ Patch0: %{name}-initscript.patch
Patch1: %{name}-conf.patch
# PATCH-FIX-UPSTREAM -- Fixed AOF: Server should have been started: Expected '1' to equal or match '0'
Patch2: skip-aof-test.patch
Patch3: redis-endian.patch
Patch4: redis-2.4.15-linenoise-cflags.patch
# for make test
BuildRequires: tcl
Requires: logrotate
@ -55,17 +53,9 @@ different kind of sorting abilities.
%setup -q
%patch0
%patch1
%patch2 -p1
%patch3 -p0
%patch4 -p0
%patch2
%build
# pushd deps/linenoise
# make CFLAGS="%{optflags}"
# popd
# pushd deps/hiredis
# make CFLAGS="%{optflags}"
# popd
make %{?_smp_mflags} CFLAGS="%{optflags}" V=1
%install
@ -79,7 +69,6 @@ install -m 0755 src/redis-check-aof %{buildroot}%{_bindir}/redis-check-aof
install -D -m 0755 src/redis-server %{buildroot}%{_sbindir}/redis-server
install -D -m 0640 redis.conf %{buildroot}%{_conf_dir}/default.conf.example
## install -Dp -m 0755 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/redis
#
# init
@ -113,7 +102,7 @@ make test && true
echo "To start the database server, create your configuration"
echo "starting from /etc/redis/default.conf.example, place it"
echo "in /etc/redis and do: "
echo " sudo rcredis start; sudo insserv redis"
echo " sudo rcredis start; sudo chkconfig redis on"
%preun
%stop_on_removal %{name}

16
skip-aof-test.patch
View File

@ -1,11 +1,13 @@
--- redis-2.4.1/tests/test_helper.tcl.orig 2011-10-11 10:49:53.526776515 +0300
+++ redis-2.4.1/tests/test_helper.tcl 2011-10-11 10:50:30.166776516 +0300
@@ -28,7 +28,7 @@
integration/replication
Index: tests/test_helper.tcl
===================================================================
--- tests/test_helper.tcl.orig
+++ tests/test_helper.tcl
@@ -30,7 +30,7 @@ set ::all_tests {
integration/replication-2
integration/replication-3
integration/replication-4
- integration/aof
+ # integration/aof
+# integration/aof
integration/rdb
integration/convert-zipmap-hash-on-load
unit/pubsub
unit/slowlog
unit/maxmemory