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

Update to redis-2.6.0

Browse Source 
https://raw.github.com/antirez/redis/2.6/00-RELEASENOTES

All tests passed without errors on sparc64: yay!
This commit is contained in:
dcoppa 2012-10-23 10:41:23 +00:00
parent 1a2dab7526
commit 1537eed6aa
8 changed files with 103 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
databases/redis/Makefile
View File

@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.34 2012/10/15 07:17:12 dcoppa Exp $
# $OpenBSD: Makefile,v 1.35 2012/10/23 10:41:23 dcoppa Exp $
COMMENT = persistent key-value database
DISTNAME = redis-2.4.17
REVISION = 0
DISTNAME = redis-2.6.0
CATEGORIES = databases
HOMEPAGE = http://redis.io/
@ -14,14 +13,12 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB += c execinfo m pthread
WANTLIB += c m pthread
MASTER_SITES = http://redis.googlecode.com/files/
MODULES = lang/tcl
LIB_DEPENDS = devel/libexecinfo
MAKE_FLAGS = CC=${CC} \
DEBUG="" \
OPTIMIZATION="" \
@ -44,6 +41,9 @@ REGRESS_TARGET = test
DBDIR = /var/redis
SUBST_VARS += DBDIR
pre-configure:
${SUBST_CMD} ${WRKSRC}/src/redis.c
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/redis
${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c \

4
databases/redis/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (redis-2.4.17.tar.gz) = P658R++EiG/2UHNZPJFYa7Z1urr3AutvOzeFWrMGbr0=
SIZE (redis-2.4.17.tar.gz) = 656155
SHA256 (redis-2.6.0.tar.gz) = v03oKz9s3eIWxA8QZnoA5lrg+4rcicizYKwWyQCylj8=
SIZE (redis-2.6.0.tar.gz) = 1000239

33
databases/redis/patches/patch-deps_Makefile Normal file
View File

@ -0,0 +1,33 @@
$OpenBSD: patch-deps_Makefile,v 1.1 2012/10/23 10:41:23 dcoppa Exp $
--- deps/Makefile.orig Tue Oct 23 10:56:16 2012
+++ deps/Makefile Tue Oct 23 10:56:41 2012
@@ -42,13 +42,11 @@ distclean:
.PHONY: distclean
hiredis: .make-prerequisites
- @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
cd hiredis && $(MAKE) static
.PHONY: hiredis
linenoise: .make-prerequisites
- @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
cd linenoise && $(MAKE)
.PHONY: linenoise
@@ -62,7 +60,6 @@ LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI $(CFLAGS)
LUA_LDFLAGS+= $(LDFLAGS)
lua: .make-prerequisites
- @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)"
.PHONY: lua
@@ -71,7 +68,6 @@ JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -g3 -O3 -funro
JEMALLOC_LDFLAGS= $(LDFLAGS)
jemalloc: .make-prerequisites
- @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
cd jemalloc && ./configure --with-jemalloc-prefix=je_ --enable-cc-silence CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
cd jemalloc && $(MAKE) lib/libjemalloc.a

27
databases/redis/patches/patch-deps_linenoise_Makefile
View File

@ -1,16 +1,17 @@
$OpenBSD: patch-deps_linenoise_Makefile,v 1.2 2011/07/28 08:57:32 dcoppa Exp $
--- deps/linenoise/Makefile.orig Fri Jul 22 12:22:26 2011
+++ deps/linenoise/Makefile Wed Jul 27 09:22:55 2011
$OpenBSD: patch-deps_linenoise_Makefile,v 1.3 2012/10/23 10:41:23 dcoppa Exp $
--- deps/linenoise/Makefile.orig Mon Oct 22 23:27:18 2012
+++ deps/linenoise/Makefile Tue Oct 23 10:30:11 2012
@@ -1,10 +1,10 @@
linenoise_example: linenoise.h linenoise.c
STD=
-WARN= -Wall
-OPT= -Os
+WARN=
+OPT=
linenoise_example: linenoise.o example.o
- $(CC) $(ARCH) -Wall -W -Os -g -o linenoise_example linenoise.o example.o
+ $(CC) $(CFLAGS) $(ARCH) -o linenoise_example linenoise.o example.o
R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
R_LDFLAGS= $(LDFLAGS)
-DEBUG= -g
+DEBUG?= -g
.c.o:
- $(CC) $(ARCH) -c -Wall -W -Os -g $<
+ $(CC) $(CFLAGS) $(ARCH) -c $<
clean:
rm -f linenoise_example *.o
R_CC=$(CC) $(R_CFLAGS)
R_LD=$(CC) $(R_LDFLAGS)

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

@ -1,6 +1,6 @@
$OpenBSD: patch-redis_conf,v 1.4 2012/10/15 07:17:12 dcoppa Exp $
--- redis.conf.orig Thu Aug 30 17:42:47 2012
+++ redis.conf Mon Oct 15 09:11:40 2012
$OpenBSD: patch-redis_conf,v 1.5 2012/10/23 10:41:23 dcoppa Exp $
--- redis.conf.orig Mon Oct 22 23:27:18 2012
+++ redis.conf Tue Oct 23 10:44:49 2012
@@ -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.4 2012/10/15 07:17:12 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 verbose
@@ -50,17 +51,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
@ -39,7 +39,7 @@ $OpenBSD: patch-redis_conf,v 1.4 2012/10/15 07:17:12 dcoppa Exp $
# To enable logging to the system logger, just set 'syslog-enabled' to yes,
# and optionally update the other syslog parameters to suit your needs.
-# syslog-enabled no
+syslog-enabled yes
+syslog-enabled no
# Specify the syslog identity.
-# syslog-ident redis
@ -51,7 +51,7 @@ $OpenBSD: patch-redis_conf,v 1.4 2012/10/15 07:17:12 dcoppa Exp $
# 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
@@ -104,7 +105,7 @@ dbfilename dump.rdb
@@ -134,7 +135,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.
@ -60,7 +60,7 @@ $OpenBSD: patch-redis_conf,v 1.4 2012/10/15 07:17:12 dcoppa Exp $
################################# REPLICATION #################################
@@ -178,7 +179,7 @@ slave-priority 100
@@ -224,7 +225,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.
#
@ -69,12 +69,3 @@ $OpenBSD: patch-redis_conf,v 1.4 2012/10/15 07:17:12 dcoppa Exp $
# Command renaming.
#
@@ -401,7 +402,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.
-vm-swap-file /tmp/redis.swap
+vm-swap-file ${DBDIR}/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

75
databases/redis/patches/patch-src_Makefile
View File

@ -1,61 +1,44 @@
$OpenBSD: patch-src_Makefile,v 1.10 2012/05/31 08:25:50 dcoppa Exp $
--- src/Makefile.orig Wed May 23 11:32:58 2012
+++ src/Makefile Thu May 31 10:03:16 2012
@@ -58,7 +58,11 @@ PREFIX?=/usr/local
$OpenBSD: patch-src_Makefile,v 1.11 2012/10/23 10:41:23 dcoppa Exp $
--- src/Makefile.orig Mon Oct 22 23:27:18 2012
+++ src/Makefile Tue Oct 23 11:08:06 2012
@@ -52,9 +52,9 @@ ifeq ($(uname_S),SunOS)
DEBUG= -g -ggdb
else
FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
- FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) -g -rdynamic -ggdb
+ FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS)
FINAL_LIBS= -lm -pthread
- DEBUG= -g -rdynamic -ggdb
+ DEBUG?= -g -rdynamic -ggdb
endif
# Include paths to dependencies
@@ -84,6 +84,10 @@ 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
+ifndef INSTALL_DIR
+ INSTALL_DIR= mkdir -p
+endif
+
+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 endian.o slowlog.o bio.o memtest.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
@@ -149,9 +153,7 @@ zmalloc.o: zmalloc.c config.h zmalloc.h
.PHONY: dependencies
CCCOLOR="\033[34m"
LINKCOLOR="\033[34;1m"
SRCCOLOR="\033[33m"
@@ -194,7 +198,7 @@ distclean: clean
.PHONY: distclean
dependencies:
- @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)hiredis$(ENDCOLOR)
@cd ../deps/hiredis && $(MAKE) static ARCH="$(ARCH)"
- @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)linenoise$(ENDCOLOR)
@cd ../deps/linenoise && $(MAKE) ARCH="$(ARCH)"
../deps/jemalloc/lib/libjemalloc.a:
@@ -162,7 +164,6 @@ redis-benchmark.o:
$(QUIET_CC)$(CC) -c $(CFLAGS) -I../deps/hiredis $(DEBUG) $(COMPILE_TIME) $<
redis-benchmark: dependencies $(BENCHOBJ)
- @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)hiredis$(ENDCOLOR)
@cd ../deps/hiredis && $(MAKE) static ARCH="$(ARCH)"
$(QUIET_LINK)$(CC) -o $(BENCHPRGNAME) $(CCOPT) $(DEBUG) $(BENCHOBJ) ../deps/hiredis/libhiredis.a $(CCLINK) $(ALLOC_LINK)
@@ -185,7 +186,7 @@ redis-check-aof: $(CHECKAOFOBJ)
$(QUIET_LINK)$(CC) -o $(CHECKAOFPRGNAME) $(CCOPT) $(DEBUG) $(CHECKAOFOBJ) $(CCLINK)
redis-server: $(OBJ)
- $(QUIET_LINK)$(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ) $(CCLINK) $(ALLOC_LINK)
+ $(QUIET_LINK)$(CC) -Wl,--export-dynamic -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ) $(CCLINK) -L${LOCALBASE}/lib -lexecinfo $(ALLOC_LINK)
# Because the jemalloc.h header is generated as a part of the jemalloc build
# process, building it should complete before building any other object.
@@ -202,7 +203,7 @@ dep:
$(CC) -MM *.c -I ../deps/hiredis -I ../deps/linenoise
test: redis-server redis-check-aof
test: $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME)
- @(cd ..; ./runtest)
+ @(cd ..; ulimit -Sn 192; ${TCL_BIN} tests/test_helper.tcl)
bench:
./redis-benchmark
@@ -229,7 +230,7 @@ noopt:
$(MAKE) PROF="-pg" ARCH="-arch i386"
lcov:
$(MAKE) gcov
@@ -223,7 +227,7 @@ src/help.h:
@../utils/generate-command-help.rb > help.h
install: all
- mkdir -p $(INSTALL_BIN)
+ $(INSTALL_DIR) $(INSTALL_BIN)
$(INSTALL) $(PRGNAME) $(INSTALL_BIN)
$(INSTALL) $(BENCHPRGNAME) $(INSTALL_BIN)
$(INSTALL) $(CLIPRGNAME) $(INSTALL_BIN)
$(REDIS_INSTALL) $(REDIS_SERVER_NAME) $(INSTALL_BIN)
$(REDIS_INSTALL) $(REDIS_BENCHMARK_NAME) $(INSTALL_BIN)
$(REDIS_INSTALL) $(REDIS_CLI_NAME) $(INSTALL_BIN)

12
databases/redis/patches/patch-src_config_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_config_h,v 1.2 2012/02/28 11:57:11 dcoppa Exp $
--- src/config.h.orig Wed Feb 22 14:23:43 2012
+++ src/config.h Tue Feb 28 12:36:22 2012
@@ -25,7 +25,7 @@
#endif
/* Test for backtrace() */
-#if defined(__APPLE__) || defined(__linux__) || defined(__sun)
+#if defined(__APPLE__) || defined(__linux__) || defined(__sun) || defined(__OpenBSD__)
#define HAVE_BACKTRACE 1
#endif

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

@ -1,63 +1,12 @@
$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
#include <execinfo.h>
+ #ifndef __OpenBSD__
#include <ucontext.h>
+ #endif
#endif /* HAVE_BACKTRACE */
#include <time.h>
@@ -1816,7 +1818,9 @@ int main(int argc, char **argv) {
#ifdef HAVE_BACKTRACE
static void *getMcontextEip(ucontext_t *uc) {
-#if defined(__FreeBSD__)
+#if defined(__OpenBSD__)
+ return NULL;
+#elif defined(__FreeBSD__)
return (void*) uc->uc_mcontext.mc_eip;
#elif defined(__dietlibc__)
return (void*) uc->uc_mcontext.eip;
@@ -1845,14 +1849,6 @@ static void *getMcontextEip(ucontext_t *uc) {
#endif
}
-void bugReportStart(void) {
- if (server.bug_report_start == 0) {
- redisLog(REDIS_WARNING,
- "=== REDIS BUG REPORT START: Cut & paste starting from here ===");
- server.bug_report_start = 1;
- }
-}
-
static void sigsegvHandler(int sig, siginfo_t *info, void *secret) {
void *trace[100];
char **messages = NULL;
@@ -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"
-" Suspect RAM error? Use redis-server --test-memory to veryfy it.\n\n"
+" Suspect RAM error? Use redis-server --test-memory to verify it.\n\n"
);
/* free(messages); Don't call free() with possibly corrupted memory. */
if (server.daemonize) unlink(server.pidfile);
@@ -1944,6 +1940,14 @@ static void sigsegvHandler(int sig, siginfo_t *info, v
kill(getpid(),sig);
}
#endif /* HAVE_BACKTRACE */
+
+void bugReportStart(void) {
+ if (server.bug_report_start == 0) {
+ redisLog(REDIS_WARNING,
+ "=== REDIS BUG REPORT START: Cut & paste starting from here ===");
+ server.bug_report_start = 1;
+ }
+}
static void sigtermHandler(int sig) {
REDIS_NOTUSED(sig);
$OpenBSD: patch-src_redis_c,v 1.14 2012/10/23 10:41:23 dcoppa Exp $
--- src/redis.c.orig Tue Oct 23 11:15:16 2012
+++ src/redis.c Tue Oct 23 11:16:09 2012
@@ -1099,7 +1099,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;
- server.pidfile = zstrdup("/var/run/redis.pid");
+ server.pidfile = zstrdup("${DBDIR}/redis.pid");
server.rdb_filename = zstrdup("dump.rdb");
server.aof_filename = zstrdup("appendonly.aof");
server.requirepass = NULL;