Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 14 Jan 2014 10:28:35 +0000 (UTC)
From:      "Sergey A. Osokin" <osa@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r339674 - in head/databases: redis redis-devel redis-devel/files redis/files
Message-ID:  <201401141028.s0EASZs7003003@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: osa
Date: Tue Jan 14 10:28:34 2014
New Revision: 339674
URL: http://svnweb.freebsd.org/changeset/ports/339674

Log:
  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>

Modified:
  head/databases/redis-devel/Makefile
  head/databases/redis-devel/distinfo
  head/databases/redis-devel/files/patch-src-Makefile
  head/databases/redis/Makefile
  head/databases/redis/distinfo
  head/databases/redis/files/patch-src-Makefile

Modified: head/databases/redis-devel/Makefile
==============================================================================
--- head/databases/redis-devel/Makefile	Tue Jan 14 10:06:44 2014	(r339673)
+++ head/databases/redis-devel/Makefile	Tue Jan 14 10:28:34 2014	(r339674)
@@ -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

Modified: head/databases/redis-devel/distinfo
==============================================================================
--- head/databases/redis-devel/distinfo	Tue Jan 14 10:06:44 2014	(r339673)
+++ head/databases/redis-devel/distinfo	Tue Jan 14 10:28:34 2014	(r339674)
@@ -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

Modified: head/databases/redis-devel/files/patch-src-Makefile
==============================================================================
--- head/databases/redis-devel/files/patch-src-Makefile	Tue Jan 14 10:06:44 2014	(r339673)
+++ head/databases/redis-devel/files/patch-src-Makefile	Tue Jan 14 10:28:34 2014	(r339674)
@@ -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

Modified: head/databases/redis/Makefile
==============================================================================
--- head/databases/redis/Makefile	Tue Jan 14 10:06:44 2014	(r339673)
+++ head/databases/redis/Makefile	Tue Jan 14 10:28:34 2014	(r339674)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	redis
-DISTVERSION=	2.8.3
+DISTVERSION=	2.8.4
 CATEGORIES=	databases
 MASTER_SITES=	http://download.redis.io/releases/
 

Modified: head/databases/redis/distinfo
==============================================================================
--- head/databases/redis/distinfo	Tue Jan 14 10:06:44 2014	(r339673)
+++ head/databases/redis/distinfo	Tue Jan 14 10:28:34 2014	(r339674)
@@ -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

Modified: head/databases/redis/files/patch-src-Makefile
==============================================================================
--- head/databases/redis/files/patch-src-Makefile	Tue Jan 14 10:06:44 2014	(r339673)
+++ head/databases/redis/files/patch-src-Makefile	Tue Jan 14 10:28:34 2014	(r339674)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401141028.s0EASZs7003003>