svn commit: r313995 - in head/databases: redis redis-devel redis-devel/files redis/files

[Sergey A. Osokin]

Author: osa
Date: Tue Mar 12 18:31:48 2013
New Revision: 313995
URL: http://svnweb.freebsd.org/changeset/ports/313995

Log:
  Update from 2.6.10 to 2.6.11.
  
  <ChangeLog>
  
  UPGRADE URGENCY: LOW, however updating is encouraged if you have many instances
                   per server and you want to lower the CPU / energy usage.
  
  * [BUGFIX]   Replication: more strict error checking for master PING reply.
  * [BUGFIX]   redis-cli: use keepalive socket option for improved reliability.
  * [BUGFIX]   Allow AUTH while loading the DB in memory.
  * [BUGFIX]   Don't segfault on unbalanced quotes while parsing config file.
  * [IMPROVED] serverCron() frequency is now a runtime parameter (was REDIS_HZ).
  * [IMPROVED] Use a lot less CPU when idle, even with many configured DBs.
  
  </ChangeLog>

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

Modified: head/databases/redis-devel/Makefile
==============================================================================
--- head/databases/redis-devel/Makefile	Tue Mar 12 18:29:33 2013	(r313994)
+++ head/databases/redis-devel/Makefile	Tue Mar 12 18:31:48 2013	(r313995)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	redis
-DISTVERSION=	2.6.10
+DISTVERSION=	2.6.11
 CATEGORIES=	databases
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMESUFFIX=	-devel

Modified: head/databases/redis-devel/distinfo
==============================================================================
--- head/databases/redis-devel/distinfo	Tue Mar 12 18:29:33 2013	(r313994)
+++ head/databases/redis-devel/distinfo	Tue Mar 12 18:31:48 2013	(r313995)
@@ -1,2 +1,2 @@
-SHA256 (redis-2.6.10.tar.gz) = 0b930976830afaad40274107a36f9aae0d8a8fbbdea4e566d20765ee502c2a22
-SIZE (redis-2.6.10.tar.gz) = 991437
+SHA256 (redis-2.6.11.tar.gz) = b0644669849a130659cf8dd48965cf116e4fe64a5bb86a239ea078d7464b6968
+SIZE (redis-2.6.11.tar.gz) = 993744

Modified: head/databases/redis-devel/files/patch-src-mkreleasehdr.sh
==============================================================================
--- head/databases/redis-devel/files/patch-src-mkreleasehdr.sh	Tue Mar 12 18:29:33 2013	(r313994)
+++ head/databases/redis-devel/files/patch-src-mkreleasehdr.sh	Tue Mar 12 18:31:48 2013	(r313995)
@@ -1,11 +1,11 @@
---- src/mkreleasehdr.sh.orig	2010-12-24 09:37:11.000000000 +0300
-+++ src/mkreleasehdr.sh	2010-12-24 09:37:16.000000000 +0300
+--- src/mkreleasehdr.sh.orig	2013-03-12 22:27:27.000000000 +0400
++++ src/mkreleasehdr.sh	2013-03-12 22:27:37.000000000 +0400
 @@ -1,6 +1,6 @@
  #!/bin/sh
 -GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1`
--GIT_DIRTY=`git diff 2> /dev/null | wc -l`
+-GIT_DIRTY=`git diff --no-ext-diff 2> /dev/null | wc -l`
 +GIT_SHA1="00000000"
 +GIT_DIRTY="0"
  test -f release.h || touch release.h
  (cat release.h | grep SHA1 | grep $GIT_SHA1) && \
- (cat release.h | grep DIRTY | grep $GIT_DIRTY) && exit 0 # Already uptodate
+ (cat release.h | grep DIRTY | grep $GIT_DIRTY) && exit 0 # Already up-to-date

Modified: head/databases/redis/Makefile
==============================================================================
--- head/databases/redis/Makefile	Tue Mar 12 18:29:33 2013	(r313994)
+++ head/databases/redis/Makefile	Tue Mar 12 18:31:48 2013	(r313995)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	redis
-DISTVERSION=	2.6.10
+DISTVERSION=	2.6.11
 CATEGORIES=	databases
 MASTER_SITES=	GOOGLE_CODE
 

Modified: head/databases/redis/distinfo
==============================================================================
--- head/databases/redis/distinfo	Tue Mar 12 18:29:33 2013	(r313994)
+++ head/databases/redis/distinfo	Tue Mar 12 18:31:48 2013	(r313995)
@@ -1,2 +1,2 @@
-SHA256 (redis-2.6.10.tar.gz) = 0b930976830afaad40274107a36f9aae0d8a8fbbdea4e566d20765ee502c2a22
-SIZE (redis-2.6.10.tar.gz) = 991437
+SHA256 (redis-2.6.11.tar.gz) = b0644669849a130659cf8dd48965cf116e4fe64a5bb86a239ea078d7464b6968
+SIZE (redis-2.6.11.tar.gz) = 993744

Modified: head/databases/redis/files/patch-src-mkreleasehdr.sh
==============================================================================
--- head/databases/redis/files/patch-src-mkreleasehdr.sh	Tue Mar 12 18:29:33 2013	(r313994)
+++ head/databases/redis/files/patch-src-mkreleasehdr.sh	Tue Mar 12 18:31:48 2013	(r313995)
@@ -1,11 +1,11 @@
---- src/mkreleasehdr.sh.orig	2010-12-24 09:37:11.000000000 +0300
-+++ src/mkreleasehdr.sh	2010-12-24 09:37:16.000000000 +0300
+--- src/mkreleasehdr.sh.orig	2013-03-12 22:27:27.000000000 +0400
++++ src/mkreleasehdr.sh	2013-03-12 22:27:37.000000000 +0400
 @@ -1,6 +1,6 @@
  #!/bin/sh
 -GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1`
--GIT_DIRTY=`git diff 2> /dev/null | wc -l`
+-GIT_DIRTY=`git diff --no-ext-diff 2> /dev/null | wc -l`
 +GIT_SHA1="00000000"
 +GIT_DIRTY="0"
  test -f release.h || touch release.h
  (cat release.h | grep SHA1 | grep $GIT_SHA1) && \
- (cat release.h | grep DIRTY | grep $GIT_DIRTY) && exit 0 # Already uptodate
+ (cat release.h | grep DIRTY | grep $GIT_DIRTY) && exit 0 # Already up-to-date