svn commit: r400169 - in head/databases: redis redis-devel
Sergey A. Osokin
osa at FreeBSD.org
Sun Oct 25 23:39:51 UTC 2015
Author: osa
Date: Sun Oct 25 23:39:49 2015
New Revision: 400169
URL: https://svnweb.freebsd.org/changeset/ports/400169
Log:
Upgrade from 3.0.4 to 3.0.5.
<ChangeLog>
--[ Redis 3.0.5 ] Release date: 15 Oct 2015
Upgrade urgency: MODERATE, the most important thing is a fix in the replication
code that may make the slave hanging forever if the master
remains with an open socket even if it is no longer able to
reply.
* [FIX] MOVE now moves the TTL as well. A bug lasting forever... finally
fixed thanks to Andy Grunwald that reported it.
(reported by Andy Grunwald, fixed by Salvatore Sanfilippo)
* [FIX] Fix a false positive in HSTRLEN test.
* [FIX] Fix a bug in redis-cli --pipe mode that was not able to read back
replies from the server incrementally. Now a mass import will use
a lot less memory, and you can use --pipe to do incremental streaming.
(reported by Twitter user @fsaintjacques, fixed by Salvatore
Sanfilippo)
* [FIX] Slave detection of master timeout. (fixed by Kevin McGehee, refactoring
and regression test by Salvatore Sanfilippo)
* [NEW] Cluster: redis-trib fix can fix an additional case for opens lots.
(Salvatore Sanfilippo)
* [NEW] Cluster: redis-trib import support for --copy and --replace options
(David Thomson)
</ChangeLog>
Modified:
head/databases/redis-devel/Makefile
head/databases/redis-devel/distinfo
head/databases/redis-devel/pkg-plist
head/databases/redis/Makefile
head/databases/redis/distinfo
head/databases/redis/pkg-plist
Modified: head/databases/redis-devel/Makefile
==============================================================================
--- head/databases/redis-devel/Makefile Sun Oct 25 23:05:44 2015 (r400168)
+++ head/databases/redis-devel/Makefile Sun Oct 25 23:39:49 2015 (r400169)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= redis
-DISTVERSION= 3.0.4
+DISTVERSION= 3.0.5
CATEGORIES= databases
MASTER_SITES= http://download.redis.io/releases/
PKGNAMESUFFIX= -devel
@@ -14,15 +14,23 @@ LICENSE= BSD3CLAUSE
USES= execinfo
-OPTIONS_DEFINE= TESTS
+OPTIONS_DEFINE= TESTS TRIB
OPTIONS_RADIO= EXTLUA
OPTIONS_RADIO_EXTLUA= LUA LUAJIT
+OPTIONS_SUB= yes
LUA_DESC= Use lang/lua instead of builtin lua
LUAJIT_DESC= Use lang/luajit instead of builtin lua
TESTS_DESC= Install lang/tcl for redis unit tests
+TRIB_DESC= Install redis-trib.rb (lang/ruby req.)
.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MTRIB}
+CATEGORIES+= ruby
+USE_RUBY= yes
+RUN_DEPENDS= rubygem-redis>=2.2:${PORTSDIR}/databases/rubygem-redis
+.endif
+
.if ${PORT_OPTIONS:MLUA}
USES+= lua:51
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-Makefile.lua
@@ -86,6 +94,9 @@ post-build:
do-install:
${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${STAGEDIR}${PREFIX}/bin/
+.if ${PORT_OPTIONS:MTRIB}
+ ${INSTALL_SCRIPT} ${WRKSRC}/src/redis-trib.rb ${STAGEDIR}${PREFIX}/bin/
+.endif
${INSTALL_DATA} ${WRKDIR}/redis.conf ${STAGEDIR}${PREFIX}/etc/redis.conf.sample
${INSTALL_DATA} ${WRKSRC}/sentinel.conf ${STAGEDIR}${PREFIX}/etc/sentinel.conf.sample
${MKDIR} ${STAGEDIR}${REDIS_LOGDIR} \
Modified: head/databases/redis-devel/distinfo
==============================================================================
--- head/databases/redis-devel/distinfo Sun Oct 25 23:05:44 2015 (r400168)
+++ head/databases/redis-devel/distinfo Sun Oct 25 23:39:49 2015 (r400169)
@@ -1,2 +1,2 @@
-SHA256 (redis-3.0.4.tar.gz) = a35e90ad581925134aa0fc92e969cc825f5cdee8e13c36a87d4d6995316112cf
-SIZE (redis-3.0.4.tar.gz) = 1364993
+SHA256 (redis-3.0.5.tar.gz) = 4c176826eee909fbdc63db1c15adc22aab42d758043829e556f4331e6a5bd480
+SIZE (redis-3.0.5.tar.gz) = 1366160
Modified: head/databases/redis-devel/pkg-plist
==============================================================================
--- head/databases/redis-devel/pkg-plist Sun Oct 25 23:05:44 2015 (r400168)
+++ head/databases/redis-devel/pkg-plist Sun Oct 25 23:39:49 2015 (r400169)
@@ -4,6 +4,7 @@ bin/redis-check-dump
bin/redis-cli
bin/redis-sentinel
bin/redis-server
+%%TRIB%%bin/redis-trib.rb
@sample etc/redis.conf.sample
@sample etc/sentinel.conf.sample
@dir(%%REDIS_USER%%,%%REDIS_GROUP%%,) %%REDIS_DBDIR%%
Modified: head/databases/redis/Makefile
==============================================================================
--- head/databases/redis/Makefile Sun Oct 25 23:05:44 2015 (r400168)
+++ head/databases/redis/Makefile Sun Oct 25 23:39:49 2015 (r400169)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= redis
-DISTVERSION= 3.0.4
+DISTVERSION= 3.0.5
CATEGORIES= databases
MASTER_SITES= http://download.redis.io/releases/
@@ -13,15 +13,23 @@ LICENSE= BSD3CLAUSE
USES= execinfo
-OPTIONS_DEFINE= TESTS
+OPTIONS_DEFINE= TESTS TRIB
OPTIONS_RADIO= EXTLUA
OPTIONS_RADIO_EXTLUA= LUA LUAJIT
+OPTIONS_SUB= yes
LUA_DESC= Use lang/lua instead of builtin lua
LUAJIT_DESC= Use lang/luajit instead of builtin lua
TESTS_DESC= Install lang/tcl for redis unit tests
+TRIB_DESC= Install redis-trib.rb (lang/ruby req.)
.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MTRIB}
+CATEGORIES+= ruby
+USE_RUBY= yes
+RUN_DEPENDS= rubygem-redis>=2.2:${PORTSDIR}/databases/rubygem-redis
+.endif
+
.if ${PORT_OPTIONS:MLUA}
USES+= lua:51
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-Makefile.lua
@@ -85,6 +93,9 @@ post-build:
do-install:
${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${STAGEDIR}${PREFIX}/bin/
+.if ${PORT_OPTIONS:MTRIB}
+ ${INSTALL_SCRIPT} ${WRKSRC}/src/redis-trib.rb ${STAGEDIR}${PREFIX}/bin/
+.endif
${INSTALL_DATA} ${WRKDIR}/redis.conf ${STAGEDIR}${PREFIX}/etc/redis.conf.sample
${INSTALL_DATA} ${WRKSRC}/sentinel.conf ${STAGEDIR}${PREFIX}/etc/sentinel.conf.sample
${MKDIR} ${STAGEDIR}${REDIS_LOGDIR} \
Modified: head/databases/redis/distinfo
==============================================================================
--- head/databases/redis/distinfo Sun Oct 25 23:05:44 2015 (r400168)
+++ head/databases/redis/distinfo Sun Oct 25 23:39:49 2015 (r400169)
@@ -1,2 +1,2 @@
-SHA256 (redis-3.0.4.tar.gz) = a35e90ad581925134aa0fc92e969cc825f5cdee8e13c36a87d4d6995316112cf
-SIZE (redis-3.0.4.tar.gz) = 1364993
+SHA256 (redis-3.0.5.tar.gz) = 4c176826eee909fbdc63db1c15adc22aab42d758043829e556f4331e6a5bd480
+SIZE (redis-3.0.5.tar.gz) = 1366160
Modified: head/databases/redis/pkg-plist
==============================================================================
--- head/databases/redis/pkg-plist Sun Oct 25 23:05:44 2015 (r400168)
+++ head/databases/redis/pkg-plist Sun Oct 25 23:39:49 2015 (r400169)
@@ -4,6 +4,7 @@ bin/redis-check-dump
bin/redis-cli
bin/redis-sentinel
bin/redis-server
+%%TRIB%%bin/redis-trib.rb
@sample etc/redis.conf.sample
@sample etc/sentinel.conf.sample
@dir(%%REDIS_USER%%,%%REDIS_GROUP%%,) %%REDIS_DBDIR%%
More information about the svn-ports-all
mailing list