Version bump redis to 2.6.15 (fixes 472968, 478536).

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x6B065BFB

4 files changed, 153 insertions, 16 deletions

diff --git a/dev-db/redis/ChangeLog b/dev-db/redis/ChangeLog
index fb6e21a2c886..89e379d97c6b 100644
--- a/dev-db/redis/ChangeLog
+++ b/dev-db/redis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/redis
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.66 2013/07/04 12:23:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.67 2013/08/26 11:47:13 djc Exp $
+
+*redis-2.6.15 (26 Aug 2013)
+
+  26 Aug 2013; Dirkjan Ochtman <djc@gentoo.org> +files/redis.initd-3,
+  +redis-2.6.15.ebuild:
+  Version bump redis to 2.6.15 (fixes 472968, 478536).
 
   04 Jul 2013; Agostino Sarubbo <ago@gentoo.org> redis-2.6.13.ebuild:
   Stable for x86, wrt bug #472854
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 86b4ba2af0a9..4b77c601074e 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX configure.ac-2.2 1522 SHA256 349b9f826578a886930bf395b59e6bdf1802c453ffd4cadbfcc3cca49c07313f SHA512 7a67bbd2f5fcfd7e1bfe18b739438342d40484c3f178ef5e2ddb617480715626e7f5a47d58660761489867ae460a58457a85a14bb2af90fe2e2ab3b8bd940b34 WHIRLPOOL a78a56a8e5963fee703b90d4eba112591693ded8ff8b780b049864be4fe712815ef0743d32b120edadca4e5909982d841cfa4ed1483b9eb91bc030ecdf3d7c70
 AUX redis-2.4.17-shared.patch 729 SHA256 acac1eb8a0f3d37ac1a86fcf054f3fc8a548471344f334825bc14caa268cb033 SHA512 8a4693db569ac168e527df162ec88dea1751b92632119908c01a5cd0b97c80bdd0e657d77fba08cb25f32156ebed01b0a581d6354442e50f74c12e4ed564f552 WHIRLPOOL 3a9f2f8a9f74cde4d7e7b382f3e375b6df2c588440bfca3280d79b4f1f53ff8c3c9f89cb086d37e27d9c4b65d0f6adc1e36488d46ca71d5e290d7e67a8c0bb36
@@ -11,30 +11,23 @@ AUX redis-2.6.9-tclsh86.patch 1904 SHA256 35b7a6bfb894d40d6d92202ce78cc6a63fbfe6
 AUX redis.confd 450 SHA256 8c68e29dc88c8ad99b9212a448d313d1406ef02c7638398b2e48ea1ca8aa937b SHA512 c6347cc6e17e9ce93fd081608b19c4977c3e1ffd58d2a417804ca3e647967800ac11859bd05d5437c36310dcd7552c11f35965e4521c5266c3414387d4796a6b WHIRLPOOL 72fb07431293f0e382af98c5a0b7eeca146cab84153befdd808328aa27404cd74d55d524b5442ad10de5989917351299bc7610e0be75d11d2e31fb5353beb45a
 AUX redis.initd 950 SHA256 af87676776b658db1ca1fe87fb4f8d2e2360bae3196543b19f42654d25f6b50d SHA512 159a4c622285c259b9379c4ccb328ddd401bb8822887723d1245e775d0681a0bbdab5d26f181a40a9145ebce7f7ac1b70a9c777d7722a44163b6c65cf0f9a839 WHIRLPOOL e196672386c90e540f61ef3718dd49091b543b104422efa93a3f6f705bdb2f93550aa1e29de6023dcd1f9cf147b403e15cc91a6c1973f4198ee624f97f21ddee
 AUX redis.initd-2 669 SHA256 c3d0dad8e5465b0af865ff04af3bf4610282b5efa5e5a59481c11d75c85b8500 SHA512 ed7c628a0ecd1e73e92883f1cb956183833a9abca0858aafb2ec80298ee41972ca7ed3073613b1daf2d7553ce0b7161614b2e0c320cc31cf8d8a8e22b92cc10b WHIRLPOOL b54a75ee1c40842bbc2c9d0bc2765ffe58b2252d0aa09c9cad589b549bdba1fdb6dfec2b26d0832d2f06456aa093553079276f67f668efd7cfbaebb069a9d510
+AUX redis.initd-3 801 SHA256 fd1f703d2099419ed2e0da18811ebce9b9580e83801b2c97e7b26d13b70895ef SHA512 0a3f01936cdd063596fa347e4064591dd252f532b48a62b08711b9c27d871c565f944517b9dfcb3e71326d6a569e811466fe93e4d2d381b66376a0e89103e1e6 WHIRLPOOL 510ce5e610a06342df7d0f773b99f7623a8f8f7e04e4286c3c628a6efa238d635872a19653641e9b46a70e622a4a8855461d37d5f6ba080f05509a2584713d75
 DIST redis-2.4.10.tar.gz 621824 SHA256 4d34482198cec272afd45d0390d4e1f32ee847094834133613a925012810ed21 SHA512 9f8d6b23ecef68660204dc77af4c4d101a21fe729c0f0985422f4aebb22b1da0054e67c48fdcd65bafa764539e83c3fd35f04d21e6826db5f2831e8706ab9fca WHIRLPOOL 2e4e048def205a4ddd99fab56cca2ecbe6f22aa6eaae4355e993876c2c7972c39ff6faac2dc3e9f954d7525c02965864a1c2b228c7e023e3a330597f6b0a7810
 DIST redis-2.4.18.tar.gz 657667 SHA256 d71b6372f42fcbdc77a9601f1dd6a029ed57f7f77ac3b18bfed8670fb8c74697 SHA512 8d612007ff392717c450ef5e8e2bb8adc710add6da6fc6bf3787ca941d300cd3a208e280fb83ff21aa3d0e322427f2a1c5438708171308b3e8cfffc4034eb34c WHIRLPOOL c3b961d0755161ac367f714a92a5dedcbb9e8c539b0481e812d8d56d3669c4849ff91a4d8912a25476fbf9434258c8d42e373a53411527092863e177fdd348d7
 DIST redis-2.6.13.tar.gz 994331 SHA256 3b9439636c58ca06bee538a0f7298e02a33fcf98b8fa845c0b0cf8567751e948 SHA512 2676b4afb688aac7b4bfdcd2e6b054ab8ea8b94294c948189ebbf4d29f019d07f5c764328b2fd148ae35627612887b7e7ab9037e5e370c6275a998d9d3a4262b WHIRLPOOL 2813a36e2550873d4201721018486cadc98ac9176919006d496a49f2e1c9266f38be91137f3c8e979c27717b3fff5eb379d60a71c75ccf1870705ad9ebb2523c
+DIST redis-2.6.15.tar.gz 998865 SHA256 b0105c6ec526d40e90a0a0bc9d070a5602d839b930776b8ecaeb9fa32493e3bc SHA512 8614b5531049f99a19e3ba87c7d632ab43d02e1c62b6287534ebec35e4a484e3eefabd94d7ca52eb31eb56675451aef94265514be78fdaebd50db5230a525563 WHIRLPOOL c1eba6bccb17c6733d3b5f6e06933ff7ea8689d4cb16e0005f002fda75bda1d730b815546e5d3b50fcd6f85a05a35585244a7a69263795e7bda53bd1a588db03
 DIST redis-2.6.9.tar.gz 989119 SHA256 4d967eff2038aebea33875d17e85ed67179df6505df68529a622f7836d1c7489 SHA512 5263bccd4e175dd00318436be3818c07b880ba6f2e2552e1811d909fddf1fbbff5addbd684e116bd7f8cca727c61f6f45cd264fff61d2ffad18d57f6ae0456e5 WHIRLPOOL 57828b815e3591bd4b4ce6b1812b8f594062b6e63055fc88f50498aa2605ee79f829350026ac7ebb946bd1207c34935768db2f270197a4b979f8cec9b6d3d6a8
 EBUILD redis-2.4.10.ebuild 3165 SHA256 389cdd67e6ea37b05005db96411cef297f6214af73e2c6b6e0f40b6997ff773c SHA512 e9b67c3dc88aaa1dae9ce20e12f4dd294279e5fb2717770b1c0dba0e03af206676374b52acb5ebaf44793c78bc76eab355b6af02c86abe5ff73e2aff89fcd14a WHIRLPOOL fe21368951e117c10386f413915374e77e1b628165d8b1ec569e42d0824dfe1038922e235129612a1e509a14970d85fa0c6be62289398f2efb8cef40d9c73e1a
 EBUILD redis-2.4.18.ebuild 3099 SHA256 fac26e447bc986d2725acbde498b2c001542fcb53e3a3463afba232e7d0d1168 SHA512 9946120e8a1be336abe02ee639911486bbf3a2b1930c072d035959f67a9606e8c390bbc8c0091737a6985b94b72ecbd0441c883bc30b9249bec63c1c7ff38906 WHIRLPOOL 6cd2e679340f20bf9b3447367cb6b227ddd458abb220828ea5759be797ce07e828016da42a3954c4fb6a3bf77e1e9b8cfc397d5eed4c3bea1f5bf7e1d9a2a9a1
 EBUILD redis-2.6.13.ebuild 2901 SHA256 3e2c780f5db88e5e17099f7dec4e1b9bfae50cb3ab453893d88595d828d2934d SHA512 05c902e6f3a1fdc0a813bbb4edfbcbc68c5a93444d73ea4341ecf9b6c371eddcc7c79f80af66cd601fa2d65ef517d0d4e4778c1a511d26dc4fc63af6ac682527 WHIRLPOOL b4a97b1461bf75e0bb2f38363ffb342a55c68f53625aa89ecba3fd184b1505517d9a25ac26fb5d7541934ce6a5df3161c31a7ba70574a87efdf2d66c482b2c29
+EBUILD redis-2.6.15.ebuild 2903 SHA256 588a2d85f3c42e75845597cfb4bb9bb603bed84c4a782c3f7deeb890a74bfe60 SHA512 2b05156d5056a8b68335722ffdb59532da57c4507c1b2d528b22816ce33a2e7a7c81311d2d81abbc72d1bfa463979d3d3f69b8f78c03f1f550e8a81707a7f282 WHIRLPOOL 01cae7687aa1ed69bd0e7ce3769b17c4b4156ce5fc03398f9a935bf855c960988861adf302e118097437554b1c44aa41042a2a579ddcdfc0945b5213c1aa8696
 EBUILD redis-2.6.9.ebuild 2737 SHA256 f80b5b31f7a0e1397ec88d028453c663f2b596d1f8e4ade460beb5e4d282c98c SHA512 b5fec0258e4493d4ab14112e5c5011305f79b094a6c7b692b7d2d4cbd19708fd2f9428c31671f2d6cbde9eb830a93497c49d4715bdf56edefebdca62345c0f8a WHIRLPOOL 00709a8c8db4af0ff802264dad962ce73062ed42c9f2f1e889fb2d9810af9c136f435dd93ba68708689501cb046190ae2764ef11f8a6ed692bc6ebaba8aa2741
-MISC ChangeLog 9702 SHA256 5912f6a6baf2de67da65aa1146839a44d304d44fae5c3b0f2f2a60e5e3b60414 SHA512 35203727605ada71181322a16df3a36b5da3a8e378d01f8feabafd9763a5d0135e739b6feafab169f4abb4959857bcec4098e4cf68f43e4aa9d45f65193af397 WHIRLPOOL 0a6a78c7c9cda42e86b1fc13629b1d89e7cde00e4a71f0903311c86a425f03e157fa06d66b0d6c12cbeed876312458a874fea09e82ebb75fc3cb17760c592c6a
+MISC ChangeLog 9881 SHA256 62353973d382350102df84a1d043290c7e92b00ce3a633f70558c8cde72e1a24 SHA512 eed091356f362b763c926c331b3b8e9e5fdaa1dd9bf9cb773585055ad95b205e420211ab842e3f6059bd86184ee76ece8e32eae449f31834066eaf6dbbcc735d WHIRLPOOL 66b82f9edd8c58d89ea0ef032b68eec6c836bbd69b36be2179110171c0e486d2240d8252705010d7c623d5201c5e48ef5366d17063a4c0323bd36aabe5d92d82
 MISC metadata.xml 768 SHA256 e7b1056e1c95dc38c4d182a55d07c50b7e460d8aba5d271f403f600a01394c1f SHA512 e0255ef12fbfd3c837e577a6c757589e330cd5435091c1ade3c50e7063f20d41ff66f45872178b987ca99a69bd939145985dfbaf413ecf447e72c140dd2f0d0f WHIRLPOOL aa46358f124e77c5bc1026d8cacce7bcca36b48396f94e0192bb192232012cfaf8530c67342f6c6227889157841fec47261718e4be0d6781ab695ad240557d4b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJR1WlUAAoJELp701BxlEWf+rAQAIT6+z1sys2Cgf0JCpBphif/
-9cAP02vBgfm8xq01Fu4U7YXpU2rGszyMRWXU0dvg6zx3YgfkbtAfz0D9D9j+8Sc8
-zdAJCb3bFL0vERz8CGl2JxedN/MMQyuoF/e2ATusZc70T0A1rDylk77Z/FcmZyM9
-hyJQudg/9g3KTGowGG6zsGHnSogC4y5iPfcXIGRHpqnAT4Dy6TdV9JRQ3spW3enb
-32SljtchW47m9Z9pHbE99C9+1oZZYruuR4Tw7araHRNKlKAIjmzQtnzzn81aOtK4
-9lksuv46bB2Dt9n8z7R48GahVx++L5rxWVL5B0BXRWpouzZLlZDJzASEE4CoNZL3
-oJIOQb15XmttVSqlrDV+OHxoegl9WVqzlNef6RsJRe2uFBDR+3DMLnIVmUD8wBhY
-CkFpmlZjfLia1g2OEdMZJHgoDCxc92DImuIPMn0cHojxe5qmFSOGFJDn6g9nPuSV
-kP6P+4kLR4Ax+xzBTz1hUsIpN8DzJJR5r1hVwA6fXRcyvipYDzT+UBcJvaXta0GD
-FAO9q9Wj6PlnpnJ9raINTQ7x0OiezSUz7/bmilvjOHrPWFl0PG6Tj98cLrtPDjph
-yCFlhymkeszZ36XXz8RB84oqG6Y+8shFhOaH8uQ04TVciYHr/a6/5C1hMaRFLkQ4
-wTeCqd0jTBhbbzFN8Uc0
-=f76J
+iEYEAREIAAYFAlIbQFwACgkQxeMuLWsGW/tmaQCgt6vipWJWxTKrGGnJXim5IJh9
+GPUAn2iHezQfdQ2OEc771i/feUnQ9IOG
+=SHT9
 -----END PGP SIGNATURE-----
diff --git a/dev-db/redis/files/redis.initd-3 b/dev-db/redis/files/redis.initd-3
new file mode 100644
index 000000000000..a7a7713fd665
--- /dev/null
+++ b/dev-db/redis/files/redis.initd-3
@@ -0,0 +1,32 @@
+#!/sbin/runscript
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/files/redis.initd-3,v 1.1 2013/08/26 11:47:13 djc Exp $
+
+REDIS_DIR=${REDIS_DIR:-/var/lib/redis}
+REDIS_CONF=${REDIS_CONF:-/etc/redis.conf}
+REDIS_OPTS=${REDIS_OPTS:-"${REDIS_CONF}"}
+REDIS_USER=${REDIS_USER:-redis}
+REDIS_GROUP=${REDIS_GROUP:-redis}
+
+command=/usr/sbin/redis-server
+start_stop_daemon_args="--chdir \"${REDIS_DIR}\"
+	--user ${REDIS_USER} --group ${REDIS_GROUP}"
+command_args="${REDIS_OPTS}"
+pidfile=${REDIS_PID:-/run/redis/redis.pid}
+
+depend() {
+	use net localmount logger
+	after keepalived
+}
+
+start_pre() {
+	checkpath -d -m 0775 -o ${REDIS_USER}:${REDIS_GROUP} $(dirname ${REDIS_PID})
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop \
+		--exec ${retries} \
+		--retry 30 \
+		--pidfile ${pidfile}
+	eend
+}
diff --git a/dev-db/redis/redis-2.6.15.ebuild b/dev-db/redis/redis-2.6.15.ebuild
new file mode 100644
index 000000000000..5c537d01cc99
--- /dev/null
+++ b/dev-db/redis/redis-2.6.15.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.6.15.ebuild,v 1.1 2013/08/26 11:47:13 djc Exp $
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic toolchain-funcs user
+
+DESCRIPTION="A persistent caching system, key-value and data structures database."
+HOMEPAGE="http://redis.io/"
+SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~x86-macos ~x86-solaris"
+IUSE="+jemalloc tcmalloc test"
+SLOT="0"
+
+RDEPEND="tcmalloc? ( dev-util/google-perftools )
+	jemalloc? ( >=dev-libs/jemalloc-3.2 )"
+DEPEND=">=sys-devel/autoconf-2.63
+	test? ( dev-lang/tcl )
+	${RDEPEND}"
+REQUIRED_USE="tcmalloc? ( !jemalloc )
+	jemalloc? ( !tcmalloc )"
+
+S="${WORKDIR}/${PN}-${PV/_/-}"
+
+pkg_setup() {
+	enewgroup redis 75
+	enewuser redis 75 -1 /var/lib/redis redis
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.6.7"-{shared,config}.patch
+
+	# bug 467172, 467174
+	sed -i -e 's:AR=:AR?=:g' -e 's:RANLIB=:RANLIB?=:g' "${S}/deps/lua/src/Makefile" || die
+
+	# now we will rewrite present Makefiles
+	local makefiles=""
+	for MKF in $(find -name 'Makefile' | cut -b 3-); do
+		mv "${MKF}" "${MKF}.in"
+		sed -i	-e 's:$(CC):@CC@:g' \
+			-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
+			-e 's: $(DEBUG)::g' \
+			-e 's:$(OBJARCH)::g' \
+			-e 's:ARCH:TARCH:g' \
+			-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
+			"${MKF}.in" \
+		|| die "Sed failed for ${MKF}"
+		makefiles+=" ${MKF}"
+	done
+	# autodetection of compiler and settings; generates the modified Makefiles
+	cp "${FILESDIR}"/configure.ac-2.2 configure.ac
+	sed -i	-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
+		configure.ac || die "Sed failed for configure.ac"
+	eautoconf
+}
+
+src_configure() {
+	econf
+
+	# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
+	# also, don't define ANSI/c99 for lua twice
+	sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
+}
+
+src_compile() {
+	tc-export CC AR RANLIB
+
+	local myconf=""
+
+	if use tcmalloc ; then
+		myconf="${myconf} USE_TCMALLOC=yes"
+	elif use jemalloc ; then
+		myconf="${myconf} JEMALLOC_SHARED=yes"
+	else
+		myconf="${myconf} MALLOC=yes"
+	fi
+
+	emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}"
+}
+
+src_install() {
+	insinto /etc/
+	doins redis.conf sentinel.conf
+	use prefix || fowners redis:redis /etc/{redis,sentinel}.conf
+	fperms 0644 /etc/{redis,sentinel}.conf
+
+	newconfd "${FILESDIR}/redis.confd" redis
+	newinitd "${FILESDIR}/redis.initd-3" redis
+
+	nonfatal dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README
+
+	dobin src/redis-cli
+	dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-dump
+	fperms 0750 /usr/sbin/redis-benchmark
+	dosym /usr/sbin/redis-server /usr/sbin/redis-sentinel
+
+	if use prefix; then
+		diropts -m0750
+	else
+		diropts -m0750 -o redis -g redis
+	fi
+	keepdir /var/{log,lib}/redis
+}