diff options
| author |   Marc Schiffbauer <mschiff@gentoo.org> | 2015-03-07 03:21:25 +0000 |
|---|---|---|
| committer | Marc Schiffbauer <mschiff@gentoo.org> | 2015-03-07 03:21:25 +0000 |
| commit | 38331d80d0feaf6fc553f08a76d521b6ed15dc3a (patch) | |
| tree | 045a97084788d6103c067618e7326b9be8942e00 /dev-db/redis | |
| parent | bindist is now a RESTRICT flag, not a USE flag (bug #541456, thanks to Ulrich... (diff) | |
| download | gentoo-2-38331d80d0feaf6fc553f08a76d521b6ed15dc3a.tar.gz gentoo-2-38331d80d0feaf6fc553f08a76d521b6ed15dc3a.tar.bz2 gentoo-2-38331d80d0feaf6fc553f08a76d521b6ed15dc3a.zip | |
Fix init script pid file handling (Fixes #541856) and minor RDEPEND slot error.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x296C6CCA35A64134)
Diffstat (limited to 'dev-db/redis')
| -rw-r--r-- | dev-db/redis/ChangeLog | 11 | ||||
| -rw-r--r-- | dev-db/redis/files/redis.initd-4 | 4 | ||||
| -rw-r--r-- | dev-db/redis/redis-2.8.19-r1.ebuild (renamed from dev-db/redis/redis-2.8.19.ebuild) | 6 |
3 files changed, 14 insertions, 7 deletions
diff --git a/dev-db/redis/ChangeLog b/dev-db/redis/ChangeLog index 109c1097fd37..0a1616a2bbfc 100644 --- a/dev-db/redis/ChangeLog +++ b/dev-db/redis/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-db/redis -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.90 2014/12/28 12:05:57 ago Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.91 2015/03/07 03:21:24 mschiff Exp $ + +*redis-2.8.19-r1 (07 Mar 2015) + + 07 Mar 2015; Marc Schiffbauer <mschiff@gentoo.org> +redis-2.8.19-r1.ebuild, + -redis-2.8.19.ebuild, files/redis.initd-4: + Fix init script pid file handling (Fixes #541856) and minor RDEPEND slot + error. 28 Dec 2014; Agostino Sarubbo <ago@gentoo.org> redis-2.8.17-r1.ebuild: Stable for x86, wrt bug #528312 diff --git a/dev-db/redis/files/redis.initd-4 b/dev-db/redis/files/redis.initd-4 index 38cbfd8f6575..088319f82618 100644 --- a/dev-db/redis/files/redis.initd-4 +++ b/dev-db/redis/files/redis.initd-4 @@ -1,5 +1,5 @@ #!/sbin/runscript -# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/files/redis.initd-4,v 1.2 2014/12/02 15:33:37 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/files/redis.initd-4,v 1.3 2015/03/07 03:21:25 mschiff Exp $ REDIS_DIR=${REDIS_DIR:-/var/lib/redis} REDIS_CONF=${REDIS_CONF:-/etc/redis.conf} @@ -10,7 +10,7 @@ REDIS_TIMEOUT=${REDIS_TIMEOUT:-30} command=/usr/sbin/redis-server pidfile=${REDIS_PID:-/run/redis/redis.pid} -start_stop_daemon_args="--background --make-pidfile --pidfile ${pidfile} +start_stop_daemon_args="--background --pidfile ${pidfile} --chdir \"${REDIS_DIR}\" --user ${REDIS_USER} --group ${REDIS_GROUP}" command_args="${REDIS_OPTS}" diff --git a/dev-db/redis/redis-2.8.19.ebuild b/dev-db/redis/redis-2.8.19-r1.ebuild index 02297b2b7db0..308e68d3fb75 100644 --- a/dev-db/redis/redis-2.8.19.ebuild +++ b/dev-db/redis/redis-2.8.19-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.8.19.ebuild,v 1.1 2014/12/21 09:48:39 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.8.19-r1.ebuild,v 1.1 2015/03/07 03:21:24 mschiff Exp $ EAPI=5 @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~amd64-linux ~hppa ~x86 ~x86-linux ~x86-macos ~x86-solaris" IUSE="+jemalloc tcmalloc test" SLOT="0" -RDEPEND=">=dev-lang/lua-5.1 +RDEPEND=">=dev-lang/lua-5.1:* tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-3.2 )" DEPEND="virtual/pkgconfig |