Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 17 Jan 2015 19:23:18 +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: r377245 - in head/databases/redis-devel: . files
Message-ID:  <201501171923.t0HJNI2X019296@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: osa
Date: Sat Jan 17 19:23:18 2015
New Revision: 377245
URL: https://svnweb.freebsd.org/changeset/ports/377245
QAT: https://qat.redports.org/buildarchive/r377245/

Log:
  Upgrade from 3.0.0-rc1 to 3.0.0-rc2.
  
  <ChangeLog>
  
  --[ Redis 3.0.0 RC2 (version 2.9.102) ] Release date: 13 jan 2014
  
  Upgrade urgency: LOW.
  
  This is the second release candidate of Redis Cluster. The major changes
  are back porting of things implemented into the unstable branch while
  this was still possible (with the new development model adopted only
  bug fixes will be merged in the future).
  
  RC2 also fixes a few Redis Cluster non critical bugs.
  
  >> General changes
  
  * [FIX] A number of minor bug fixes.
  
  * [NEW] Diskless replication backportede.
  * [NEW] Lua bitops and updated cmsgpack backported.
  * [NEW] Transparent Huge Pages warnings and reporting backported.
  
  >> Cluster changes
  
  * [FIX] Fix PUBLISH cluster bus message count field.
  * [FIX] It is no longer possible to write outside node hash slots using Lua.
  * [FIX] Valgrind warnings (no actual bugs).
  * [FIX] Less strict in acceptiong myself->ip if it's not populated.
  
  * [NEW] Better testing of Lua scripts.
  
  >> Sentinel changes
  
  No changes to Sentinel.
  
  </ChangeLog>

Added:
  head/databases/redis-devel/files/patch-deps-linenoise-Makefile   (contents, props changed)
Modified:
  head/databases/redis-devel/Makefile
  head/databases/redis-devel/distinfo
  head/databases/redis-devel/files/extra-patch-src-Makefile.lua
  head/databases/redis-devel/files/extra-patch-src-Makefile.luajit
  head/databases/redis-devel/files/patch-deps-Makefile

Modified: head/databases/redis-devel/Makefile
==============================================================================
--- head/databases/redis-devel/Makefile	Sat Jan 17 19:15:09 2015	(r377244)
+++ head/databases/redis-devel/Makefile	Sat Jan 17 19:23:18 2015	(r377245)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	redis
-DISTVERSION=	3.0.0-rc1
+DISTVERSION=	3.0.0-rc2
 CATEGORIES=	databases
 MASTER_SITES=	https://github.com/antirez/redis/archive/
 PKGNAMESUFFIX=	-devel
@@ -82,7 +82,7 @@ PLIST_SUB+=	REDIS_USER=${USERS} \
 
 .if ${PORT_OPTIONS:MLUAJIT} || ${PORT_OPTIONS:MLUA}
 post-patch:
-	@cd ${WRKSRC}/deps/lua/src && ${CP} lua_* strbuf.* ${WRKSRC}/src/
+	@cd ${WRKSRC}/deps/lua/src && ${CP} fpconv.* lua_* strbuf.* ${WRKSRC}/src/
 .endif
 
 post-build:

Modified: head/databases/redis-devel/distinfo
==============================================================================
--- head/databases/redis-devel/distinfo	Sat Jan 17 19:15:09 2015	(r377244)
+++ head/databases/redis-devel/distinfo	Sat Jan 17 19:23:18 2015	(r377245)
@@ -1,2 +1,2 @@
-SHA256 (redis/3.0.0-rc1.tar.gz) = c64c31527d93175e2a83010d69e0b83dc86c8b75b7cf8aa8b497213921418db4
-SIZE (redis/3.0.0-rc1.tar.gz) = 1335857
+SHA256 (redis/3.0.0-rc2.tar.gz) = 3713194850e1b75fa01f17249a69e67636c1ad3f148fd15950d08d7a87bcf463
+SIZE (redis/3.0.0-rc2.tar.gz) = 1356667

Modified: head/databases/redis-devel/files/extra-patch-src-Makefile.lua
==============================================================================
--- head/databases/redis-devel/files/extra-patch-src-Makefile.lua	Sat Jan 17 19:15:09 2015	(r377244)
+++ head/databases/redis-devel/files/extra-patch-src-Makefile.lua	Sat Jan 17 19:23:18 2015	(r377245)
@@ -32,7 +32,7 @@
  REDIS_SERVER_NAME=redis-server
  REDIS_SENTINEL_NAME=redis-sentinel
  REDIS_SERVER_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 pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o
-+REDIS_SERVER_OBJ+=lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
++REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
  REDIS_CLI_NAME=redis-cli
  REDIS_CLI_OBJ=anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o
  REDIS_BENCHMARK_NAME=redis-benchmark

Modified: head/databases/redis-devel/files/extra-patch-src-Makefile.luajit
==============================================================================
--- head/databases/redis-devel/files/extra-patch-src-Makefile.luajit	Sat Jan 17 19:15:09 2015	(r377244)
+++ head/databases/redis-devel/files/extra-patch-src-Makefile.luajit	Sat Jan 17 19:23:18 2015	(r377245)
@@ -32,7 +32,7 @@
  REDIS_SERVER_NAME=redis-server
  REDIS_SENTINEL_NAME=redis-sentinel
  REDIS_SERVER_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 pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o
-+REDIS_SERVER_OBJ+=lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
++REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
  REDIS_CLI_NAME=redis-cli
  REDIS_CLI_OBJ=anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o
  REDIS_BENCHMARK_NAME=redis-benchmark

Modified: head/databases/redis-devel/files/patch-deps-Makefile
==============================================================================
--- head/databases/redis-devel/files/patch-deps-Makefile	Sat Jan 17 19:15:09 2015	(r377244)
+++ head/databases/redis-devel/files/patch-deps-Makefile	Sat Jan 17 19:23:18 2015	(r377245)
@@ -1,11 +1,11 @@
---- deps/Makefile.orig	2014-10-11 01:02:23.000000000 +0400
-+++ deps/Makefile	2014-10-11 01:03:37.000000000 +0400
+--- deps/Makefile.orig	2015-01-17 22:09:21.000000000 +0300
++++ deps/Makefile	2015-01-17 22:10:37.000000000 +0300
 @@ -58,7 +58,7 @@
  	LUA_CFLAGS= -D__C99FEATURES__=1
  endif
  
--LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI $(CFLAGS)
-+LUA_CFLAGS+= -Wall -DLUA_ANSI $(CFLAGS)
+-LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL $(CFLAGS)
++LUA_CFLAGS+= -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL $(CFLAGS)
  LUA_LDFLAGS+= $(LDFLAGS)
  # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
  # challenging to cross-compile lua (and redis).  These defines make it easier

Added: head/databases/redis-devel/files/patch-deps-linenoise-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/redis-devel/files/patch-deps-linenoise-Makefile	Sat Jan 17 19:23:18 2015	(r377245)
@@ -0,0 +1,15 @@
+--- deps/linenoise/Makefile.orig	2015-01-17 22:13:25.000000000 +0300
++++ deps/linenoise/Makefile	2015-01-17 22:13:45.000000000 +0300
+@@ -1,10 +1,10 @@
+ STD=
+ WARN= -Wall
+-OPT= -Os
++#OPT= -Os
+ 
+ R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
+ R_LDFLAGS= $(LDFLAGS)
+-DEBUG= -g
++#DEBUG= -g
+ 
+ R_CC=$(CC) $(R_CFLAGS)
+ R_LD=$(CC) $(R_LDFLAGS)



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