Update to redis-2.6.11
This commit is contained in:
parent
fcb2c923f6
commit
7a992387fb
@ -1,7 +1,7 @@
|
||||
# $OpenBSD: Makefile,v 1.51 2013/03/11 02:52:08 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.52 2013/03/14 09:00:39 dcoppa Exp $
|
||||
|
||||
COMMENT = persistent key-value database
|
||||
DISTNAME = redis-2.6.9
|
||||
DISTNAME = redis-2.6.11
|
||||
CATEGORIES = databases
|
||||
HOMEPAGE = http://redis.io/
|
||||
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (redis-2.6.9.tar.gz) = TZZ+/yA4rr6jOHXRfoXtZxed9lBd9oUppiL3g20cdIk=
|
||||
SIZE (redis-2.6.9.tar.gz) = 989119
|
||||
SHA256 (redis-2.6.11.tar.gz) = sGRGaYSaEwZZz43UiWXPEW5P5kpbuGojnqB410ZLaWg=
|
||||
SIZE (redis-2.6.11.tar.gz) = 993744
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-deps_lua_src_lua_struct_c,v 1.1 2013/01/16 13:13:03 dcoppa Exp $
|
||||
--- deps/lua/src/lua_struct.c.orig Tue Jan 15 15:08:57 2013
|
||||
+++ deps/lua/src/lua_struct.c Tue Jan 15 15:09:52 2013
|
||||
@@ -5,8 +5,8 @@
|
||||
$OpenBSD: patch-deps_lua_src_lua_struct_c,v 1.2 2013/03/14 09:00:39 dcoppa Exp $
|
||||
--- deps/lua/src/lua_struct.c.orig Mon Mar 11 19:51:10 2013
|
||||
+++ deps/lua/src/lua_struct.c Thu Mar 14 09:28:12 2013
|
||||
@@ -33,8 +33,8 @@
|
||||
#include <string.h>
|
||||
|
||||
|
||||
@ -11,4 +11,4 @@ $OpenBSD: patch-deps_lua_src_lua_struct_c,v 1.1 2013/01/16 13:13:03 dcoppa Exp $
|
||||
+#include <lauxlib.h>
|
||||
|
||||
|
||||
/*
|
||||
#if (LUA_VERSION_NUM >= 502)
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-redis_conf,v 1.6 2012/11/26 15:24:13 dcoppa Exp $
|
||||
--- redis.conf.orig Mon Oct 22 23:27:18 2012
|
||||
+++ redis.conf Tue Oct 23 10:44:49 2012
|
||||
$OpenBSD: patch-redis_conf,v 1.7 2013/03/14 09:00:39 dcoppa Exp $
|
||||
--- redis.conf.orig Mon Mar 11 19:51:10 2013
|
||||
+++ redis.conf Thu Mar 14 09:51:54 2013
|
||||
@@ -13,12 +13,13 @@
|
||||
# units are case insensitive so 1GB 1Gb 1gB are all the same.
|
||||
|
||||
@ -29,7 +29,7 @@ $OpenBSD: patch-redis_conf,v 1.6 2012/11/26 15:24:13 dcoppa Exp $
|
||||
|
||||
# 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
|
||||
@@ -50,17 +51,17 @@ loglevel notice
|
||||
@@ -66,17 +67,17 @@ 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
|
||||
@ -45,14 +45,14 @@ $OpenBSD: patch-redis_conf,v 1.6 2012/11/26 15:24:13 dcoppa Exp $
|
||||
-# syslog-ident redis
|
||||
+syslog-ident redis
|
||||
|
||||
# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7.
|
||||
# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7.
|
||||
-# syslog-facility local0
|
||||
+syslog-facility user
|
||||
|
||||
# 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
|
||||
@@ -134,7 +135,7 @@ dbfilename dump.rdb
|
||||
# Also the Append Only File will be created inside this directory.
|
||||
@@ -150,7 +151,7 @@ dbfilename dump.rdb
|
||||
# The Append Only File will also be created inside this directory.
|
||||
#
|
||||
# Note that you must specify a directory here, not a file name.
|
||||
-dir ./
|
||||
@ -60,7 +60,7 @@ $OpenBSD: patch-redis_conf,v 1.6 2012/11/26 15:24:13 dcoppa Exp $
|
||||
|
||||
################################# REPLICATION #################################
|
||||
|
||||
@@ -224,7 +225,7 @@ slave-priority 100
|
||||
@@ -255,7 +256,7 @@ slave-priority 100
|
||||
# 150k passwords per second against a good box. This means that you should
|
||||
# use a very strong password otherwise it will be very easy to break.
|
||||
#
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-src_Makefile,v 1.12 2013/01/16 13:13:03 dcoppa Exp $
|
||||
--- src/Makefile.orig Thu Jan 10 17:15:16 2013
|
||||
+++ src/Makefile Wed Jan 16 13:20:46 2013
|
||||
$OpenBSD: patch-src_Makefile,v 1.13 2013/03/14 09:00:39 dcoppa Exp $
|
||||
--- src/Makefile.orig Mon Mar 11 19:51:10 2013
|
||||
+++ src/Makefile Thu Mar 14 09:28:12 2013
|
||||
@@ -14,12 +14,12 @@
|
||||
|
||||
release_hdr := $(shell sh -c './mkreleasehdr.sh')
|
||||
@ -72,7 +72,7 @@ $OpenBSD: patch-src_Makefile,v 1.12 2013/01/16 13:13:03 dcoppa Exp $
|
||||
|
||||
lcov:
|
||||
$(MAKE) gcov
|
||||
@@ -223,7 +227,7 @@ src/help.h:
|
||||
@@ -226,7 +230,7 @@ src/help.h:
|
||||
@../utils/generate-command-help.rb > help.h
|
||||
|
||||
install: all
|
||||
|
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-src_mkreleasehdr_sh,v 1.1 2011/07/28 08:57:32 dcoppa Exp $
|
||||
--- src/mkreleasehdr.sh.orig Wed Jul 27 09:33:10 2011
|
||||
+++ src/mkreleasehdr.sh Wed Jul 27 09:34:31 2011
|
||||
$OpenBSD: patch-src_mkreleasehdr_sh,v 1.2 2013/03/14 09:00:39 dcoppa Exp $
|
||||
--- src/mkreleasehdr.sh.orig Mon Mar 11 19:51:10 2013
|
||||
+++ src/mkreleasehdr.sh Thu Mar 14 09:31:02 2013
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
-GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1`
|
||||
-GIT_DIRTY=`git diff 2> /dev/null | wc -l`
|
||||
-GIT_DIRTY=`git diff --no-ext-diff 2> /dev/null | wc -l`
|
||||
+GIT_SHA1=00000000
|
||||
+GIT_DIRTY=0
|
||||
test -f release.h || touch release.h
|
||||
(cat release.h | grep SHA1 | grep $GIT_SHA1) && \
|
||||
(cat release.h | grep DIRTY | grep $GIT_DIRTY) && exit 0 # Already uptodate
|
||||
(cat release.h | grep DIRTY | grep $GIT_DIRTY) && exit 0 # Already up-to-date
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_redis_c,v 1.16 2012/11/23 08:29:42 dcoppa Exp $
|
||||
--- src/redis.c.orig Thu Nov 22 17:03:27 2012
|
||||
+++ src/redis.c Fri Nov 23 08:48:05 2012
|
||||
@@ -1116,7 +1116,7 @@ void initServerConfig() {
|
||||
$OpenBSD: patch-src_redis_c,v 1.17 2013/03/14 09:00:39 dcoppa Exp $
|
||||
--- src/redis.c.orig Mon Mar 11 19:51:10 2013
|
||||
+++ src/redis.c Thu Mar 14 09:28:12 2013
|
||||
@@ -1179,7 +1179,7 @@ void initServerConfig() {
|
||||
server.aof_fd = -1;
|
||||
server.aof_selected_db = -1; /* Make sure the first time will not match */
|
||||
server.aof_flush_postponed_start = 0;
|
||||
|
Loading…
x
Reference in New Issue
Block a user