summaryrefslogtreecommitdiff
path: root/databases/redis-devel
diff options
context:
space:
mode:
authorSergey A. Osokin <osa@FreeBSD.org>2014-01-14 10:28:34 +0000
committerSergey A. Osokin <osa@FreeBSD.org>2014-01-14 10:28:34 +0000
commit771437151f14233a5e4c09c64f0ece974335c52e (patch)
treea4dce38f56339b23f7cf67f0e209607746d115ea /databases/redis-devel
parentUpdate to 6.7.0 (diff)
Upgrade from 2.8.3 to 2.8.4.
<ChangeLog> # UPGRADE URGENCY: MODERATE for Redis and Sentinel. * [FIX] Makefile compatibility with non common make variants improved. * [FIX] SDIFF crash in very unlikely to trigger state fixed. * [FIX] Config rewriting fixed: don't wipe options unknown to the rewrite process. * [FIX] Set TCP port to 0 works again to disable TCP networking. * [FIX] Fixed replication with old Redis instances as masters by not sending REPLCONF ACK to them. * [FIX] Fix keyspace notifications rewrite and CONFIG GET output. * [FIX] Fix RESTORE TTL handling in 32 bit systems (32 bit overflow). * [NEW] Sentinel now has a run time configuration API. * [NEW] Log when we lost connection with master or slave. * [NEW] When instance is turned from slave to master now inherits the old master replication offset when possible. This improves the Sentinel failover procedure. </ChangeLog>
Notes
Notes: svn path=/head/; revision=339674
Diffstat (limited to 'databases/redis-devel')
-rw-r--r--databases/redis-devel/Makefile2
-rw-r--r--databases/redis-devel/distinfo4
-rw-r--r--databases/redis-devel/files/patch-src-Makefile21
3 files changed, 14 insertions, 13 deletions
diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile
index 43e59537321a..ddcecaf33643 100644
--- a/databases/redis-devel/Makefile
+++ b/databases/redis-devel/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= redis
-DISTVERSION= 2.8.3
+DISTVERSION= 2.8.4
CATEGORIES= databases
MASTER_SITES= http://download.redis.io/releases/
PKGNAMESUFFIX= -devel
diff --git a/databases/redis-devel/distinfo b/databases/redis-devel/distinfo
index fc261103c4c4..59ab5943f49f 100644
--- a/databases/redis-devel/distinfo
+++ b/databases/redis-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (redis-2.8.3.tar.gz) = c0aa8065c230f9df1b77d1dd1e8840655e7846e23fe23f8e339d6246aec3e63f
-SIZE (redis-2.8.3.tar.gz) = 1046106
+SHA256 (redis-2.8.4.tar.gz) = 6b6602321536401b8b46aa05ec509141506b689b420675685ffe147ae08c0c86
+SIZE (redis-2.8.4.tar.gz) = 1048914
diff --git a/databases/redis-devel/files/patch-src-Makefile b/databases/redis-devel/files/patch-src-Makefile
index 701d4fab774f..8846533cdd23 100644
--- a/databases/redis-devel/files/patch-src-Makefile
+++ b/databases/redis-devel/files/patch-src-Makefile
@@ -1,5 +1,5 @@
---- src/Makefile.orig 2013-07-30 22:20:02.000000000 +0400
-+++ src/Makefile 2013-08-13 22:36:30.000000000 +0400
+--- src/Makefile.orig 2014-01-14 14:17:43.000000000 +0400
++++ src/Makefile 2014-01-14 14:19:31.000000000 +0400
@@ -22,7 +22,7 @@
WARN=-Wall
OPT=$(OPTIMIZATION)
@@ -9,7 +9,7 @@
INSTALL_BIN=$(PREFIX)/bin
INSTALL=install
-@@ -52,14 +52,15 @@
+@@ -52,7 +52,7 @@
FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
FINAL_LIBS=-lm
@@ -17,14 +17,15 @@
+#DEBUG=-g -ggdb
ifeq ($(uname_S),SunOS)
- INSTALL=cp -pf
- FINAL_CFLAGS+= -D__EXTENSIONS__ -D_XPG6
- FINAL_LIBS+= -ldl -lnsl -lsocket -lpthread
--else ifeq ($(uname_S),Darwin)
--
-+else ifeq ($(uname_S),FreeBSD)
+ # SunOS
+@@ -63,6 +63,7 @@
+-ifeq ($(uname_S),Darwin)
+- # Darwin (nothing to do)
+-else
++ifeq ($(uname_S),FreeBSD)
+ FINAL_CFLAGS?= $(CFLAGS) $(REDIS_CFLAGS) -I${PREFIX}/include
+ FINAL_LDFLAGS= $(LDFLAGS)
- else
++else
+ # All the other OSes (notably Linux)
FINAL_LDFLAGS+= -rdynamic
FINAL_LIBS+= -pthread