cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfixing update to redis-2.4.17

Browse Source
This commit is contained in:
dcoppa 2012-09-18 13:20:43 +00:00
parent f3d9095951
commit ff4f936759
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
databases/redis/Makefile
View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.32 2012/08/08 11:24:05 dcoppa Exp $
# $OpenBSD: Makefile,v 1.33 2012/09/18 13:20:43 dcoppa Exp $
COMMENT = persistent key-value database
DISTNAME = redis-2.4.16
DISTNAME = redis-2.4.17
CATEGORIES = databases
HOMEPAGE = http://redis.io/

4
databases/redis/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (redis-2.4.16.tar.gz) = 01zInXOqH/Ba9fE4CkQRyCiXmztEb1yvi1cgIls44Vs=
SIZE (redis-2.4.16.tar.gz) = 649908
SHA256 (redis-2.4.17.tar.gz) = P658R++EiG/2UHNZPJFYa7Z1urr3AutvOzeFWrMGbr0=
SIZE (redis-2.4.17.tar.gz) = 656155

10
databases/redis/patches/patch-redis_conf
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-redis_conf,v 1.2 2012/02/28 11:57:11 dcoppa Exp $
--- redis.conf.orig Wed Feb 22 14:23:43 2012
+++ redis.conf Tue Feb 28 12:29:39 2012
$OpenBSD: patch-redis_conf,v 1.3 2012/09/18 13:20:43 dcoppa Exp $
--- redis.conf.orig Thu Aug 30 17:42:47 2012
+++ redis.conf Tue Sep 18 15:08:20 2012
@@ -13,12 +13,13 @@
# units are case insensitive so 1GB 1Gb 1gB are all the same.
@ -60,7 +60,7 @@ $OpenBSD: patch-redis_conf,v 1.2 2012/02/28 11:57:11 dcoppa Exp $
################################# REPLICATION #################################
@@ -164,6 +165,7 @@ slave-serve-stale-data yes
@@ -179,6 +180,7 @@ slave-priority 100
# use a very strong password otherwise it will be very easy to break.
#
# requirepass foobared
@ -68,7 +68,7 @@ $OpenBSD: patch-redis_conf,v 1.2 2012/02/28 11:57:11 dcoppa Exp $
# Command renaming.
#
@@ -386,7 +388,7 @@ vm-enabled no
@@ -401,7 +403,7 @@ vm-enabled no
# *** 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.

14
databases/redis/patches/patch-src_redis_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_redis_c,v 1.12 2012/08/08 11:24:05 dcoppa Exp $
--- src/redis.c.orig Wed Aug 1 11:59:08 2012
+++ src/redis.c Wed Aug 8 13:10:58 2012
$OpenBSD: patch-src_redis_c,v 1.13 2012/09/18 13:20:43 dcoppa Exp $
--- src/redis.c.orig Thu Aug 30 17:42:47 2012
+++ src/redis.c Tue Sep 18 15:08:20 2012
@@ -33,7 +33,9 @@
#ifdef HAVE_BACKTRACE
@ -11,7 +11,7 @@ $OpenBSD: patch-src_redis_c,v 1.12 2012/08/08 11:24:05 dcoppa Exp $
#endif /* HAVE_BACKTRACE */
#include <time.h>
@@ -1809,7 +1811,9 @@ int main(int argc, char **argv) {
@@ -1816,7 +1818,9 @@ int main(int argc, char **argv) {
#ifdef HAVE_BACKTRACE
static void *getMcontextEip(ucontext_t *uc) {
@ -22,7 +22,7 @@ $OpenBSD: patch-src_redis_c,v 1.12 2012/08/08 11:24:05 dcoppa Exp $
return (void*) uc->uc_mcontext.mc_eip;
#elif defined(__dietlibc__)
return (void*) uc->uc_mcontext.eip;
@@ -1838,14 +1842,6 @@ static void *getMcontextEip(ucontext_t *uc) {
@@ -1845,14 +1849,6 @@ static void *getMcontextEip(ucontext_t *uc) {
#endif
}
@ -37,7 +37,7 @@ $OpenBSD: patch-src_redis_c,v 1.12 2012/08/08 11:24:05 dcoppa Exp $
static void sigsegvHandler(int sig, siginfo_t *info, void *secret) {
void *trace[100];
char **messages = NULL;
@@ -1921,7 +1917,7 @@ static void sigsegvHandler(int sig, siginfo_t *info, v
@@ -1928,7 +1924,7 @@ static void sigsegvHandler(int sig, siginfo_t *info, v
"=== REDIS BUG REPORT END. Make sure to include from START to END. ===\n\n"
" Please report the crash opening an issue on github:\n\n"
" http://github.com/antirez/redis/issues\n\n"
@ -46,7 +46,7 @@ $OpenBSD: patch-src_redis_c,v 1.12 2012/08/08 11:24:05 dcoppa Exp $
);
/* free(messages); Don't call free() with possibly corrupted memory. */
if (server.daemonize) unlink(server.pidfile);
@@ -1937,6 +1933,14 @@ static void sigsegvHandler(int sig, siginfo_t *info, v
@@ -1944,6 +1940,14 @@ static void sigsegvHandler(int sig, siginfo_t *info, v
kill(getpid(),sig);
}
#endif /* HAVE_BACKTRACE */