fix bug #318683 and bump to 1.2.6

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 134 insertions, 6 deletions

diff --git a/dev-db/redis/ChangeLog b/dev-db/redis/ChangeLog
index 14aac6afbff7..784d7bb269fa 100644
--- a/dev-db/redis/ChangeLog
+++ b/dev-db/redis/ChangeLog
@@ -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.
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 838cab8c8285..68f0ab0005b5 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -3,6 +3,8 @@ AUX configure.ac-1.02 1496 RMD160 41e3f453f993020ce6477392fed18261c199a9a5 SHA1
 AUX redis.confd 450 RMD160 237a72f30b3ba5c77e7dd31d2dfebc2db2cea2ad SHA1 4c298810900f0e627cd3f7bf480feb639b6cc2d5 SHA256 8c68e29dc88c8ad99b9212a448d313d1406ef02c7638398b2e48ea1ca8aa937b
 AUX redis.initd 859 RMD160 a5718f3b4eab11450223c21bc98ab75d408e932e SHA1 ba3237364dba1da920ec4f14c13ff2cd45062144 SHA256 8b25b60bca695a8393e381078b2a42330c1b6cc2953bbe3c1b7cbd41ca36fe5d
 DIST redis-1.2.5.tar.gz 204039 RMD160 c2c6606a4d4607f897f673cf0e32f76e51794571 SHA1 f28d840d8100586796cab02ccd8e91545a92179d SHA256 43bbb937b530cf736c19110dae8cd71d3369b2a6129654396956e62683902025
-EBUILD redis-1.2.5.ebuild 3382 RMD160 59ad60e5b95b488d2e603993817d1aef4e9d8d15 SHA1 8d707e999466e15c3f6c39cb6c59a248b12161d4 SHA256 aad2446c8b9cb4bf66cc995f87de30783c8b5e6e6d6dca949cf293318beb8b17
-MISC ChangeLog 937 RMD160 0426eaebdffe6e0d607041e009d7050b25f7c79b SHA1 b093aa366f910320494a55269f4644b859e41741 SHA256 44fc045607fd49fa0f8ee91ac07dbf999167d9b97293d8be1646d5172667b04a
+DIST redis-1.2.6.tar.gz 213341 RMD160 a7195e4f9ba1f7b0b3466fad4ccc28a6659db8c0 SHA1 c71aef0b3f31acb66353d86ba57dd321b541043f SHA256 bed0641225f786f225a2c4897ffbec1e6573a3c31e9f899884ee3041eab96873
+EBUILD redis-1.2.5.ebuild 3388 RMD160 edc603a73058aff2a1af1db7b30a9a89b42657f8 SHA1 deb68e77c0f561121aee10b1065088b462314c79 SHA256 4a39dfb4878ca4f7bc1bece7efb156d284485a8d8d83e6b7f53b69a1d6c4eea4
+EBUILD redis-1.2.6.ebuild 3388 RMD160 1c7df6929fd90b1c33c13bf171b88816fe382501 SHA1 11933c613a1cf7e435d68ed1f4e8ea7b19d951e1 SHA256 14022edd642aee86eeb40dacdeab6fa7664a808ad78359fbf170ad5552fa43b3
+MISC ChangeLog 1181 RMD160 4c775abef9d2f76e7b2e71e7a1b7685d500ac372 SHA1 1b233b251a120704e9a498f0cf44a61c236dc37d SHA256 3a8e914d96195c9b6a1f4ac382d4c20a8f141a14f3d804894c2df558e3e8599c
 MISC metadata.xml 286 RMD160 796347dd794b46c810de136066b1c310e84e5c73 SHA1 8044d4fb86e7f0172aefb8ae554632a1a1a22210 SHA256 b32cc88172bf73d4e6d06b599b5f6cfde057fe487e5f285c081bd772711352d4
diff --git a/dev-db/redis/redis-1.2.5.ebuild b/dev-db/redis/redis-1.2.5.ebuild
index 2950a0fe64e0..53cd2693010d 100644
--- a/dev-db/redis/redis-1.2.5.ebuild
+++ b/dev-db/redis/redis-1.2.5.ebuild
@@ -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_PIDDIR=/var/run/redis/
 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 @@ src_install() {
 	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() {
diff --git a/dev-db/redis/redis-1.2.6.ebuild b/dev-db/redis/redis-1.2.6.ebuild
new file mode 100644
index 000000000000..9e3315431cd6
--- /dev/null
+++ b/dev-db/redis/redis-1.2.6.ebuild
@@ -0,0 +1,119 @@
+# 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"
+}