summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorSergey A. Osokin <osa@FreeBSD.org>2012-11-07 11:56:05 +0000
committerSergey A. Osokin <osa@FreeBSD.org>2012-11-07 11:56:05 +0000
commit3ceaee2a0c23fa90bc2037631ec0be201a33f6da (patch)
tree0536e56263dad70172b3dc8c9bdda3bcbc7d158c /databases
parent- Update to 1.489 (diff)
Update from 2.6.2 to 2.6.3.
Feature safe: yes <ChangeLog> * [BUGFIX] Fixed 32 bit build on Linux systems. * [BUGFIX] MONITOR and CLIENT LIST: propertly display unix socket clients. * [IMPROVED] redis-cli inline help updated. * [IMPROVED] Marginally more robust AOF child handling. * [IMPROVED] Fixed a few typos in comments. </ChangeLog>
Notes
Notes: svn path=/head/; revision=307130
Diffstat (limited to 'databases')
-rw-r--r--databases/redis-devel/Makefile5
-rw-r--r--databases/redis-devel/distinfo4
-rw-r--r--databases/redis-devel/pkg-plist2
-rw-r--r--databases/redis/Makefile6
-rw-r--r--databases/redis/distinfo4
-rw-r--r--databases/redis/pkg-plist2
6 files changed, 14 insertions, 9 deletions
diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile
index 808e5fe113a4..3afe809dc16f 100644
--- a/databases/redis-devel/Makefile
+++ b/databases/redis-devel/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= redis
-DISTVERSION= 2.6.2
+DISTVERSION= 2.6.3
CATEGORIES= databases
MASTER_SITES= GOOGLE_CODE
PKGNAMESUFFIX= -devel
@@ -32,7 +32,7 @@ USE_GMAKE= yes
MAKE_ENV= "V=yo"
USE_RC_SUBR= redis
BIN_FILES= redis-benchmark redis-check-aof redis-check-dump \
- redis-cli redis-server
+ redis-cli redis-sentinel redis-server
PKGMESSAGE= ${WRKDIR}/pkg-message
@@ -63,6 +63,7 @@ post-build:
do-install:
${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${PREFIX}/bin/
${INSTALL_DATA} ${WRKDIR}/redis.conf ${PREFIX}/etc/redis.conf.sample
+ ${INSTALL_DATA} ${WRKSRC}/sentinel.conf ${PREFIX}/etc/sentinel.conf.sample
post-install:
.for d in ${REDIS_LOGDIR} ${REDIS_RUNDIR} ${REDIS_DBDIR}
diff --git a/databases/redis-devel/distinfo b/databases/redis-devel/distinfo
index 908b8cb57e39..34a2bee49db8 100644
--- a/databases/redis-devel/distinfo
+++ b/databases/redis-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (redis-2.6.2.tar.gz) = b3b2e74ec8a13337e5e17cc24b0fecf5d612d6a0835d99bd1e337b391f20a46d
-SIZE (redis-2.6.2.tar.gz) = 1000600
+SHA256 (redis-2.6.3.tar.gz) = 4a6c7d32a3bb96900b13b64837e5921a6be011eee25c0ac7a8efe167b82f9af4
+SIZE (redis-2.6.3.tar.gz) = 1000954
diff --git a/databases/redis-devel/pkg-plist b/databases/redis-devel/pkg-plist
index 44ea4d80f6e5..4cca930a6d50 100644
--- a/databases/redis-devel/pkg-plist
+++ b/databases/redis-devel/pkg-plist
@@ -2,9 +2,11 @@ bin/redis-benchmark
bin/redis-check-aof
bin/redis-check-dump
bin/redis-cli
+bin/redis-sentinel
bin/redis-server
@unexec (cmp -s %D/etc/redis.conf %D/etc/redis.conf.sample && rm -f %D/etc/redis.conf) || true
etc/redis.conf.sample
+etc/sentinel.conf.sample
@exec [ -f %B/redis.conf ] || cp %B/%f %B/redis.conf
@exec [ -d %%REDIS_DBDIR%% ] || mkdir -p %%REDIS_DBDIR%%
@exec chown %%REDIS_USER%%:%%REDIS_GROUP%% %%REDIS_DBDIR%%
diff --git a/databases/redis/Makefile b/databases/redis/Makefile
index 8312e1f105b9..2852da1550e3 100644
--- a/databases/redis/Makefile
+++ b/databases/redis/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= redis
-DISTVERSION= 2.6.2
-PORTREVISION= 1
+DISTVERSION= 2.6.3
CATEGORIES= databases
MASTER_SITES= GOOGLE_CODE
@@ -32,7 +31,7 @@ USE_GMAKE= yes
MAKE_ENV= "V=yo"
USE_RC_SUBR= redis
BIN_FILES= redis-benchmark redis-check-aof redis-check-dump \
- redis-cli redis-server
+ redis-cli redis-sentinel redis-server
PKGMESSAGE= ${WRKDIR}/pkg-message
@@ -63,6 +62,7 @@ post-build:
do-install:
${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${PREFIX}/bin/
${INSTALL_DATA} ${WRKDIR}/redis.conf ${PREFIX}/etc/redis.conf.sample
+ ${INSTALL_DATA} ${WRKSRC}/sentinel.conf ${PREFIX}/etc/sentinel.conf.sample
post-install:
.for d in ${REDIS_LOGDIR} ${REDIS_RUNDIR} ${REDIS_DBDIR}
diff --git a/databases/redis/distinfo b/databases/redis/distinfo
index 908b8cb57e39..34a2bee49db8 100644
--- a/databases/redis/distinfo
+++ b/databases/redis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (redis-2.6.2.tar.gz) = b3b2e74ec8a13337e5e17cc24b0fecf5d612d6a0835d99bd1e337b391f20a46d
-SIZE (redis-2.6.2.tar.gz) = 1000600
+SHA256 (redis-2.6.3.tar.gz) = 4a6c7d32a3bb96900b13b64837e5921a6be011eee25c0ac7a8efe167b82f9af4
+SIZE (redis-2.6.3.tar.gz) = 1000954
diff --git a/databases/redis/pkg-plist b/databases/redis/pkg-plist
index 44ea4d80f6e5..4cca930a6d50 100644
--- a/databases/redis/pkg-plist
+++ b/databases/redis/pkg-plist
@@ -2,9 +2,11 @@ bin/redis-benchmark
bin/redis-check-aof
bin/redis-check-dump
bin/redis-cli
+bin/redis-sentinel
bin/redis-server
@unexec (cmp -s %D/etc/redis.conf %D/etc/redis.conf.sample && rm -f %D/etc/redis.conf) || true
etc/redis.conf.sample
+etc/sentinel.conf.sample
@exec [ -f %B/redis.conf ] || cp %B/%f %B/redis.conf
@exec [ -d %%REDIS_DBDIR%% ] || mkdir -p %%REDIS_DBDIR%%
@exec chown %%REDIS_USER%%:%%REDIS_GROUP%% %%REDIS_DBDIR%%