* [gentoo-commits] gentoo-x86 commit in dev-db/redis: ChangeLog redis-1.2.5.ebuild redis-1.2.6.ebuild
@ 2010-05-17 21:32 Luca Barbato (lu_zero)
0 siblings, 0 replies; only message in thread
From: Luca Barbato (lu_zero) @ 2010-05-17 21:32 UTC (permalink / raw
To: gentoo-commits
lu_zero 10/05/17 21:32:23
Modified: ChangeLog redis-1.2.5.ebuild
Added: redis-1.2.6.ebuild
Log:
fix bug #318683 and bump to 1.2.6
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Revision Changes Path
1.5 dev-db/redis/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/ChangeLog?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/ChangeLog?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/ChangeLog?r1=1.4&r2=1.5
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ChangeLog 2 May 2010 22:30:19 -0000 1.4
+++ ChangeLog 17 May 2010 21:32:23 -0000 1.5
@@ -1,6 +1,13 @@
# ChangeLog for dev-db/redis
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.4 2010/05/02 22:30:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.5 2010/05/17 21:32:23 lu_zero Exp $
+
+*redis-1.2.6 (17 May 2010)
+
+ 17 May 2010; Luca Barbato <lu_zero@gentoo.org> redis-1.2.5.ebuild,
+ +redis-1.2.6.ebuild:
+ fix bug #318683, thanks to Mark Lewandowski <mark.e.lewandowski@gmail.com>
+ for reporting the issue and the new version
02 May 2010; Robin H. Johnson <robbat2@gentoo.org> redis-1.2.5.ebuild:
Bug #316767: implement a full src_test that does server setup first.
1.4 dev-db/redis/redis-1.2.5.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/redis-1.2.5.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/redis-1.2.5.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/redis-1.2.5.ebuild?r1=1.3&r2=1.4
Index: redis-1.2.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/redis/redis-1.2.5.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- redis-1.2.5.ebuild 2 May 2010 22:30:19 -0000 1.3
+++ redis-1.2.5.ebuild 17 May 2010 21:32:23 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-1.2.5.ebuild,v 1.3 2010/05/02 22:30:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-1.2.5.ebuild,v 1.4 2010/05/17 21:32:23 lu_zero Exp $
EAPI=2
@@ -22,7 +22,7 @@
REDIS_PIDFILE=${REDIS_PIDDIR}/redis.pid
REDIS_DATAPATH=/var/lib/redis
REDIS_LOGPATH=/var/log/redis
-REDIS_LOGFILE=${LOGPATH}/redis.log
+REDIS_LOGFILE=${REDIS_LOGPATH}/redis.log
pkg_setup() {
enewgroup redis 75 || die "problem adding 'redis' group"
@@ -77,7 +77,7 @@
dosbin redis-server
diropts -m0750 -o redis -g redis
- keepdir ${REDIS_DATAPATH} ${REDIS_LOGFILE} ${REDIS_PIDDIR}
+ keepdir ${REDIS_DATAPATH} ${REDIS_LOGPATH} ${REDIS_PIDDIR}
}
src_test() {
1.1 dev-db/redis/redis-1.2.6.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/redis-1.2.6.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/redis-1.2.6.ebuild?rev=1.1&content-type=text/plain
Index: redis-1.2.6.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-1.2.6.ebuild,v 1.1 2010/05/17 21:32:23 lu_zero Exp $
EAPI=2
inherit autotools eutils
DESCRIPTION="Persistent distributed key-value data caching system."
HOMEPAGE="http://code.google.com/p/redis/"
SRC_URI="http://redis.googlecode.com/files/${P}.tar.gz"
LICENSE="BSD"
KEYWORDS="~amd64 ~x86"
IUSE="test"
SLOT="0"
RDEPEND=""
DEPEND="test? ( dev-lang/tcl )"
REDIS_PIDDIR=/var/run/redis/
REDIS_PIDFILE=${REDIS_PIDDIR}/redis.pid
REDIS_DATAPATH=/var/lib/redis
REDIS_LOGPATH=/var/log/redis
REDIS_LOGFILE=${REDIS_LOGPATH}/redis.log
pkg_setup() {
enewgroup redis 75 || die "problem adding 'redis' group"
enewuser redis 75 -1 ${REDIS_DATAPATH} redis || die "problem adding 'redis' user"
}
src_prepare() {
# Borrowed from debian
epatch "${FILESDIR}"/01-dont-print-pid-on-startup.diff
# Now autotoolize this
cp "${FILESDIR}"/configure.ac-1.02 configure.ac
mv Makefile Makefile.in
sed -i \
-e 's:$(CC):@CC@:g' \
-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
-e 's: $(DEBUG)::g' \
-e 's:ARCH:GCC_ARCH_FLAG:g' \
-e 's:PROF:GCC_PROF_FLAG:g' \
Makefile.in \
|| die "sed failed!"
eautoreconf
}
src_install() {
# configuration file rewrites
insinto /etc/
sed -r \
-e "/^pidfile\>/s,/var.*,${REDIS_PIDFILE}," \
-e '/^daemonize\>/s,no,yes,' \
-e '/^# bind/s,^# ,,' \
-e '/^# maxmemory\>/s,^# ,,' \
-e '/^maxmemory\>/s,<bytes>,67108864,' \
-e "/^dbfilename\>/s,dump.rdb,${REDIS_DATAPATH}/dump.rdb," \
-e "/^dir\>/s, .*, ${REDIS_DATAPATH}/," \
-e '/^loglevel\>/s:debug:notice:' \
-e "/^logfile\>/s:stdout:${REDIS_LOGFILE}:" \
<redis.conf \
>redis.conf.gentoo
newins redis.conf.gentoo redis.conf
fowners root:redis /etc/redis.conf
fperms 0640 /etc/redis.conf
newconfd "${FILESDIR}/redis.confd" redis
newinitd "${FILESDIR}/redis.initd" redis
dodoc 00-RELEASENOTES BETATESTING.txt BUGS Changelog README TODO
newdoc client-libraries/README README.client-libraries
dohtml doc/*
dobin redis-benchmark redis-cli
dosbin redis-server
diropts -m0750 -o redis -g redis
keepdir ${REDIS_DATAPATH} ${REDIS_LOGPATH} ${REDIS_PIDDIR}
}
src_test() {
local PORT=$(((RANDOM % 32767)+32768))
local PIDFILE=redis-test.pid
einfo "Preparing redis test config"
# The port number is hardcoded in lots of places
sed -r <redis.conf >redis-test.conf \
-e "/^pidfile/s~ .*~ ${PIDFILE}~" \
-e '/^daemonize/s~ no~ yes~' \
-e "/^port/s~ [0-9]+~ ${PORT}~" \
-e '/^(# )?bind/s,^,#,g' \
-e '/\<bind\>/abind 127.0.0.1' \
|| die "Failed to build test server config"
# The port number is hardcoded in lots of places
for i in test-redis.tcl redis.tcl ; do
sed -r <$i >${i/.tcl/-${PORT}.tcl} \
-e "/^source redis.tcl/s,redis.tcl,redis-${PORT}.tcl,g" \
-e "/6379/s~6379~${PORT}~" \
|| die "Failed to build test client config ($i)"
done
einfo "Starting test server"
./redis-server redis-test.conf
rc1=$?
sleep 2
[[ $rc1 -ne 0 ]] && die "Failed to start redis server!"
pidof redis-server | fgrep -f ${PIDFILE}
rc1=$?
[[ $rc1 -ne 0 ]] && die "Could not find started redis server!"
unset rc1
einfo "Starting redis tests"
tclsh test-redis-$PORT.tcl
rc1=$?
kill -9 $(<${PIDFILE})
rc2=$?
[[ $rc1 -ne 0 ]] && die "Failed testsuite"
[[ $rc2 -ne 0 ]] && die "Failed to shut down redis server"
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-05-17 21:32 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-17 21:32 [gentoo-commits] gentoo-x86 commit in dev-db/redis: ChangeLog redis-1.2.5.ebuild redis-1.2.6.ebuild Luca Barbato (lu_zero)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox