diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2011-06-28 06:36:02 +0000 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2011-06-28 06:36:02 +0000 |
| commit | 764e2bc1019db7eeef53b16b93de1e79cd3f4332 (patch) | |
| tree | c4e14ccd90f3e1e86c6e367e22ad70586556aadb | |
| parent | . Update to tzupdater 1.3.39. (diff) | |
Update from 2.2.10 to 2.2.11.
Create/remove necessary directories in install/deinstall process.
Optimize SUB_LIST.
PRs: ports/158115, ports/158190
<ChangeLog>
* Solved a never reported but possibly critical bug in the AOF
and RDB persistence, introduced with the new version of the
iterator: In very rare circumstances the AOF (after rerwite)
or the rdb file may contain the same key more than one time.
</ChangeLog>
Notes
Notes:
svn path=/head/; revision=276553
| -rw-r--r-- | databases/redis/Makefile | 22 | ||||
| -rw-r--r-- | databases/redis/distinfo | 4 | ||||
| -rw-r--r-- | databases/redis/pkg-plist | 9 |
3 files changed, 26 insertions, 9 deletions
diff --git a/databases/redis/Makefile b/databases/redis/Makefile index 207b3c353570..4b607f203ed1 100644 --- a/databases/redis/Makefile +++ b/databases/redis/Makefile @@ -6,7 +6,7 @@ # PORTNAME= redis -PORTVERSION= 2.2.10 +PORTVERSION= 2.2.11 CATEGORIES= databases MASTER_SITES= GOOGLE_CODE @@ -32,12 +32,15 @@ REDIS_RUNDIR?= /var/run/redis REDIS_LOGDIR?= /var/log/redis SUB_FILES= pkg-message -SUB_LIST+= PORTNAME="${PORTNAME}" \ - REDIS_USER="${USERS}" \ - REDIS_GROUP="${GROUPS}" \ - REDIS_LOGDIR="${REDIS_LOGDIR}" \ - REDIS_DBDIR="${REDIS_DBDIR}" \ - REDIS_RUNDIR="${REDIS_RUNDIR}" +SUB_LIST+= PORTNAME=${PORTNAME} \ + REDIS_USER=${USERS} \ + REDIS_RUNDIR=${REDIS_RUNDIR} + +PLIST_SUB+= REDIS_USER=${USERS} \ + REDIS_GROUP=${GROUPS} \ + REDIS_LOGDIR=${REDIS_LOGDIR} \ + REDIS_DBDIR=${REDIS_DBDIR} \ + REDIS_RUNDIR=${REDIS_RUNDIR} post-build: ${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ @@ -47,4 +50,9 @@ do-install: ${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${PREFIX}/bin/ ${INSTALL_DATA} ${WRKDIR}/redis.conf ${PREFIX}/etc/redis.conf.sample +post-install: +.for d in ${REDIS_LOGDIR} ${REDIS_RUNDIR} ${REDIS_DBDIR} + [ -d ${d} ] || ${MKDIR} ${d} && ${CHOWN} ${USERS}:${GROUPS} ${d} +.endfor + .include <bsd.port.mk> diff --git a/databases/redis/distinfo b/databases/redis/distinfo index 9dcd98612227..dd733763d2ad 100644 --- a/databases/redis/distinfo +++ b/databases/redis/distinfo @@ -1,2 +1,2 @@ -SHA256 (redis-2.2.10.tar.gz) = 038b2b2eb84314b4be13401dad49cb91b6684b6acf6301c278732ade8ec548af -SIZE (redis-2.2.10.tar.gz) = 450768 +SHA256 (redis-2.2.11.tar.gz) = a94c1dd2573e19f1abd335507d5ea280753b092ddf16d014dcd3212f5a5bc0eb +SIZE (redis-2.2.11.tar.gz) = 450839 diff --git a/databases/redis/pkg-plist b/databases/redis/pkg-plist index 8391247fbe51..44ea4d80f6e5 100644 --- a/databases/redis/pkg-plist +++ b/databases/redis/pkg-plist @@ -6,3 +6,12 @@ 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 @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%% +@unexec if [ -z ${UPGRADE_PORT} ] ; then rmdir %%REDIS_DBDIR%% 2>/dev/null; fi +@exec [ -d %%REDIS_LOGDIR%% ] || mkdir -p %%REDIS_LOGDIR%% +@exec chown %%REDIS_USER%%:%%REDIS_GROUP%% %%REDIS_LOGDIR%% +@unexec if [ -z ${UPGRADE_PORT} ] ; then rmdir %%REDIS_LOGDIR%% 2>/dev/null; fi +@exec [ -d %%REDIS_RUNDIR%% ] || mkdir -p %%REDIS_RUNDIR%% +@exec chown %%REDIS_USER%%:%%REDIS_GROUP%% %%REDIS_RUNDIR%% +@unexec if [ -z ${UPGRADE_PORT} ] ; then rmdir %%REDIS_RUNDIR%% 2>/dev/null; fi |