fix #529050

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13

5 files changed, 65 insertions, 13 deletions

diff --git a/dev-db/redis/ChangeLog b/dev-db/redis/ChangeLog
index ea9a7ee5541b..a9ee13b660d3 100644
--- a/dev-db/redis/ChangeLog
+++ b/dev-db/redis/ChangeLog
@@ -1,6 +1,10 @@
 # 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.85 2014/10/08 09:46:26 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.86 2014/12/02 15:33:37 ultrabug Exp $
+
+  02 Dec 2014; Ultrabug <ultrabug@gentoo.org> redis-2.8.17.ebuild,
+  +files/redis-2.8.17-config.patch, files/redis.initd-4:
+  fix daemonization wrt #529050
 
 *redis-2.8.17 (08 Oct 2014)
 
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 0dd2e9fbba05..a349aa5d7979 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -9,13 +9,14 @@ AUX redis-2.6.7-config.patch 2423 SHA256 f12a536dac364538e31de79fd58d2698e30b030
 AUX redis-2.6.7-shared.patch 920 SHA256 efc252edcb399183d62991130805d53e4566fcd4849c513055b4a21cb58a1331 SHA512 199763116264d3df9c0278d5afb17fa0f99438889f6ec8e0d9105d5ef9ae422b73a9bf22672962ac69dd7cb6250096a6374032560e2e3e6470bce3e0872814ff WHIRLPOOL 68c729678a222f945d85413b927f1790ac8fa97a204c121fdb3c65368e9ad9c5aa2f7d18ae0c7a9ca71b770d4916d0bf537349d7634704a7f4a79e262cac0cb4
 AUX redis-2.6.9-tclsh86.patch 1904 SHA256 35b7a6bfb894d40d6d92202ce78cc6a63fbfe625dac489f922c94af895e48edb SHA512 5d93c997c0e47928fc09a0ffeed96280e6155058bca7ba0371d8730a82e132ef7bc24061574c3db27bc589e585e785358fe0a345d8bd954aaf6b41d8c017b823 WHIRLPOOL 0d19a4f2f65f62451f4025d0f100b168e05739c786c36e3651a143b67e6b0f85c8abd4ad6f8701b20849b3a61dc8ca3288ee84541e78c26d878a39fd529cd5ae
 AUX redis-2.8.13-sharedlua.patch 1862 SHA256 5315506a8a21e06d817de98715ace8d98ff30105f1790b8f0ffcbfa771fd8ce1 SHA512 05103be7c02ec1ee75c399e8388d4bb6927b9c8227f437c5f3d2be547f443f5afbc35ea2866dba9daff1c5cca817bff49fec16100f2e68f223e0b92e693808fa WHIRLPOOL 4b05232d8850803584018998de8edb0a7cfe4d1e01590dcc17dc3e3353cc149cf6127a6f984e24e952cab4623f69682252b12880f0471f8e15055628f1200bde
+AUX redis-2.8.17-config.patch 1660 SHA256 2fe9ddae4bd1198850eabd1c2c34258cf0e089aa79575124a72e2333b634392a SHA512 4b7f88361ca33fb676d47e6e5e364cd33731031cf83d0cec34d6542e6e832a6b7187b847fde7c65b8c838b309feec7033e0d44f5a5690d6ed0e6694773d4195e WHIRLPOOL 9dde5a6b75a3d91d5ff785c4d4fa96ee0ccbc6c4d853e41073d957b11176265f1ded151f3a62a23228e28f1da604c9c64a5b0ae6b718b2f8d0e84221b048be74
 AUX redis-2.8.3-config.patch 2068 SHA256 803de8fca1b23235cabda03f8e4365b179334aca09de53de4fc63f4aa385f4af SHA512 a6a8257a48f9a8bfa759b94d7a1bc63d960d088ec10892d386d7642517122c0dea99d61383d910683e0c98ca0e0cdb8de2e06eccf297183113b40943ed07d468 WHIRLPOOL 1dd2ad9d9da977a223ada5f0667b6c023b3bcc9f3ce3bfe98a4b455b06b85e6b309bf5cbe21059e3f20f606f02fb6c3b605da6c6d29eb0be76df5a0f64a480ee
 AUX redis-2.8.3-shared.patch 909 SHA256 fe95148b87d4fe70b655638a3355865fdb5f52d344d07dfd60ae2350d04b7862 SHA512 1070d9d22654a0ee00ecb2536dd2644cc59917650aa56af10689302c3ac962c172bc24a0c493c17f78aa2632bfd3d924ceef221340622d46fd6bf7346e69f49d WHIRLPOOL eeedadd088bf9a2449406d62bfd386b2c8bf484d6b835948d879d6441e35ee20e80c489fc8d81b4c9cb23dd4ebfe1dc07217fed058bd4e5be44f9c6f17a9ac81
 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
-AUX redis.initd-4 855 SHA256 e49b609c90940d1af33f3786cdad484e5573b7608cb6a51b62553343a1584c0d SHA512 a1651bae250ee9a9ee44bbd9fa01b8931c65347b50a67ea04bffd9cdefe66161ba3fa4f039c46d4b2ce46fb6d880e14fde9b5140631e758e95d824a8868004da WHIRLPOOL 963689c384f7837d7bf5e67fb76c84444b874616c0f67b2a72a964366123ca35ba4c13cd5ccb7f41b1c456c8239226b7a1b200421076faa01090ba33de54341d
+AUX redis.initd-4 904 SHA256 aec1ae8ab95e0ad6b719f8c9fb201f297f266064dbb15c86746be3835f7c8733 SHA512 a7a38fa2302833bbe3c7df6edd84fee30d496cec05db73e50dff00da973db543fd72256d4829574771fc859beaa42272f5369861b3c3f7b14525bcfcadfda7d3 WHIRLPOOL 8910cf75371e6edc95cfc75f3ee0fb6af27e78f0a480294a3a96b078ccc8cbd2657be27678b3ef862a428b22e7936aa0815c6137ac4578640621275aa6fc9464
 AUX redis.service 254 SHA256 e4b1b282612bf496f92a9287c171227802d79a9aa7e58e77f1cdbefd5b13551b SHA512 a8735fb3d2fff552f0f0dc982224ac73a8b9ca3a5c633d64c5fc528dc1f5a965f693d7aa19801eebaf663992e3d4ef96aa65bdefab47fef98c94aeab2b165b87 WHIRLPOOL c39a75713dca525ff1c1fec9a8972184f19204e08054b3dc62ec265c42abca69d5cfa90fd19097e2e4a35b1829c0c3743f19301a6ba5c7765320a91ee68eb1b9
 AUX redis.tmpfiles 61 SHA256 68e4c7e3159068400cbc7d07e84b5618f9d829dc7a4f18253783c6256a53031a SHA512 741ff5a4df5b04e7af4e81357812bf5b6cf992bc18b6052074aef134401d0a92703a2e41f52966012c05ea80fac5636435c8d3e6ed55e62a5711526ba67ee738 WHIRLPOOL 2c6f4d9e5382c43e935db16bf120b24cd8de517bc067dcab91b3230a8ddced7ecc5ed37626464d3f1a7880d2d41efdf3cecfd1029a38aaa2edf3d20de74489b4
 DIST redis-2.6.15.tar.gz 998865 SHA256 b0105c6ec526d40e90a0a0bc9d070a5602d839b930776b8ecaeb9fa32493e3bc SHA512 8614b5531049f99a19e3ba87c7d632ab43d02e1c62b6287534ebec35e4a484e3eefabd94d7ca52eb31eb56675451aef94265514be78fdaebd50db5230a525563 WHIRLPOOL c1eba6bccb17c6733d3b5f6e06933ff7ea8689d4cb16e0005f002fda75bda1d730b815546e5d3b50fcd6f85a05a35585244a7a69263795e7bda53bd1a588db03
@@ -29,15 +30,15 @@ EBUILD redis-2.6.15-r1.ebuild 3021 SHA256 005d63168d6ec48211d9cd7ca680cf9fdadf45
 EBUILD redis-2.6.16.ebuild 3020 SHA256 06ba1bcba2a8ea671e7c71b0583b5d3110905c0ddd2f21c533abb0dd2227bfec SHA512 a2a9d6e1a7e1c063ac2151b96e7bfae9235ddbc92ff22a46dad1a9fd6005b292458f637bfc3ce40b1c0ea73e1e906acfd2e3bb5c1d2af5d2c9ce1e975dac69a5 WHIRLPOOL 7c71e957b27a511864f50065633114a99dcdf93e23b9051579c5ec6f4d799922bc37950f5e77cecef210299eb4608b5b8a590c1ea1bfc93c50bb0f75c7f3d23d
 EBUILD redis-2.8.11.ebuild 3050 SHA256 c4ddd5e2a0b19adb3da0913b1ce2385193076624d9ecdc3e3af8629863e769fa SHA512 041f817c53b931cfc1009eb1e8adb6717b3789b407d7a4565c88f85876ac1e7f0b936794c5472514e5c9a682426414b7cba8d47249b56c38ba9d20abee74d599 WHIRLPOOL 27ae7732ea307ce5f22ace3adaf66f4e659f61758739621f27c076f770ac2026482001a529a4dc38c34fb56ef2ab2f97024cad853042d200488a2c11b5640249
 EBUILD redis-2.8.13.ebuild 3122 SHA256 eafebacd0dfe5c9dfb32e26d922b6a829bdf259291dc0a046178e369ed5026ad SHA512 64dff6e84ac847d70d798d12cf44da5e38721e827ac76f287dc879e80751c69f036e63dc8abd2061a6b7c2f0266d9270033573888da5ac9034828695b8453a0e WHIRLPOOL b850cdf6277d128cb20c28afd3c9bc6982e1753ea72b462c07868a27ffa63c31272bc867812c223ba08f2c90331c4ccc4062f171552f3a6a75c6b3bcc4ce404f
-EBUILD redis-2.8.17.ebuild 3130 SHA256 8bfb12d154d0e337184d852c8c061901f6b367568dee039f9c28c3aaf8769d4e SHA512 d75a40cd3d0fbc960215839dc8cff76d8a8ceab23e4c5b0055caf1f46ca7c2caf7d5ec233b77451ea79722ce168bd9b24276742a0a77175b6a7cc5d34ab7f2ea WHIRLPOOL 4cce6582defd86cf227764b25f73c8e1cb492afb41ff9c9a72781370cb1f615a6e5e45840a389d42b41d2bcc09ce4c1851a4c5b0b7c5da4539c922131ca770f8
+EBUILD redis-2.8.17.ebuild 3169 SHA256 dd0719cec93fe7ec4e3b0bbaf24992f1534f8a04966d8c7719ddf63913d11ad1 SHA512 59289bae9c5fb3a16f6d35bcfe21d44cac78c53f94efb43c7c5dc3ae792109755610cfbeaef6c02f9556bb8fe7983c9bfa00b959e0cb8b74ab7759b3f43d964d WHIRLPOOL 191d6631554e8b5fbfd4e05222c91fa52036fd25a9f4015f8fb65c8d45ef152dff9068d932548143dc4300287671743af4fa114971e4b6bb66e5a07a38f4c184
 EBUILD redis-2.8.8.ebuild 3019 SHA256 ef7b94d42931f79754662bb00a8c40d57dd889bb41690c02a24eb153955e90a5 SHA512 c8793dfb30e952f67ee78a6de95c7fd85c690e5e5ee87b5b982f0dd5a73fdd45db19ea300509ae5aca6a42a34a91af65791a923a60d313981c18635ba2b913de WHIRLPOOL 819c859948a57e3d65cf6743268d90f3df84732d958a4c45da6fa9876841f15fbb933ed00604e8575673d76d7ed9ea7d9b83ab978a8eb5ac0ef8158885c4cead
 EBUILD redis-2.8.9.ebuild 3025 SHA256 cc8e8c337632b84320611969d8d8c00f9e1bf4076daeaf612dec96bf07c09693 SHA512 6e4150498a2350a75e70f6e5f22cd9bd07dd3125b526f5801330ddaef7104beea01738041667199bbf0538946ce5a1b12f141f764c0d023c1d2394cd2bed05c7 WHIRLPOOL 34418112432d7337342f508af71d1de8836c6a1bea4c6ed878e4d1463883b4e512dbd52c87d7b7ac1299c933c701a7cc4a842e7013a97c626b3f6a17e75e8b62
-MISC ChangeLog 12688 SHA256 8eeece0c20cad8410065dd057fab9ddd35444425969ab73ecdf206e32b2a0e05 SHA512 26295d895a4470ac1d4e364d74c7475c055dccf9c37ac3615cb3af37f809af236431426f9aa29ab9c2e32f8932550d83582f0704852b1f0d4b37f84328db5904 WHIRLPOOL 2c44208a6212aafcaac8116fe753aacbf26ffd711b1eefac221229a9487417174156c380bf464754ac8cb3ca671bc3d1626d98363d6a4076edc3cb2dd01e7387
+MISC ChangeLog 12845 SHA256 159830339f3dce3cf72a8e8f269bb4a81f66d53af14bf060b39d03464438c140 SHA512 4ac80789c1eddc3e53a3c33e4c13dc9aac93fde73ab78959c42bc5141696c7084491b600a88bd92e3a462d9b8c34afeb0042b0fd3c7066242d6c25d9dc347283 WHIRLPOOL 8fb0bad5bbb01d3431a76e0352bf9290212bf8988c8dc6f5af461ca127bb238f28e42802ad9915dbb652db1d676593c884822e682caf999166e1e87a0adfe76a
 MISC metadata.xml 773 SHA256 64379f983cadc83eb1c36c090ebad6286cf8de74699f64f8ba9139fb242e71e6 SHA512 63012de35c6766b34fabf024fd25df531c018b84053f7c84f01ca9eb9873bdcb60571178981e7d3ea7cfcded07ecb88e1f0e53d6b3af680ee4db688c86705382 WHIRLPOOL 144edd2a108637be8c1873a2088cf22dd749b041b6ff39eb2e4d15a161151b5331846387e13936ba9b2bd60b6134e5b0eb94c8b8d5c99037bc5821f16f2d8aa1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlQ1B/cACgkQKiQSS7ZY+hMPAQD/YzK0EYlOlxpFiQShSB3tFj4c
-T+p/vamwr7hWVwbIuekBANDCvNiw0iL1y+esU5rWNXeCTkzD7gZc3fGQtl68+Met
-=S7JI
+iF4EAREIAAYFAlR929YACgkQKiQSS7ZY+hNGOgD/arQjpntxKGI7d7iK1U2jk3xl
+qJvV54gzKub8Hwj4lSwA/iNf1CET7qmQHPyH36rGx7BmyobGAFdrn67ZJY4ErBxJ
+=XQ7S
 -----END PGP SIGNATURE-----
diff --git a/dev-db/redis/files/redis-2.8.17-config.patch b/dev-db/redis/files/redis-2.8.17-config.patch
new file mode 100644
index 000000000000..c9f6b2af172b
--- /dev/null
+++ b/dev-db/redis/files/redis-2.8.17-config.patch
@@ -0,0 +1,46 @@
+--- a/redis.conf	2014-12-02 16:22:38.722433643 +0100
++++ b/redis.conf	2014-12-02 16:22:16.252249350 +0100
+@@ -38,7 +38,7 @@
+ 
+ # When running daemonized, Redis writes a pid file in /var/run/redis.pid by
+ # default. You can specify a custom pid file location here.
+-pidfile /var/run/redis.pid
++pidfile /run/redis/redis.pid
+ 
+ # Accept connections on the specified port, default is 6379.
+ # If port 0 is specified Redis will not listen on a TCP socket.
+@@ -61,7 +61,7 @@
+ # Examples:
+ #
+ # bind 192.168.1.100 10.0.0.1
+-# bind 127.0.0.1
++bind 127.0.0.1
+ 
+ # Specify the path for the Unix socket that will be used to listen for
+ # incoming connections. There is no default, so Redis will not listen
+@@ -100,7 +100,7 @@
+ # Specify the log file name. Also the empty string can be used to force
+ # Redis to log on the standard output. Note that if you use standard
+ # output for logging but daemonize, logs will be sent to /dev/null
+-logfile ""
++logfile /var/log/redis/redis.log
+ 
+ # To enable logging to the system logger, just set 'syslog-enabled' to yes,
+ # and optionally update the other syslog parameters to suit your needs.
+@@ -184,7 +184,7 @@
+ # The Append Only File will also be created inside this directory.
+ # 
+ # Note that you must specify a directory here, not a file name.
+-dir ./
++dir /var/lib/redis/
+ 
+ ################################# REPLICATION #################################
+ 
+@@ -403,6 +403,7 @@
+ # output buffers (but this is not needed if the policy is 'noeviction').
+ #
+ # maxmemory <bytes>
++maxmemory 67108864
+ 
+ # MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
+ # is reached. You can select among five behaviors:
diff --git a/dev-db/redis/files/redis.initd-4 b/dev-db/redis/files/redis.initd-4
index f75867da79f2..38cbfd8f6575 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.1 2014/10/08 09:46:26 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/files/redis.initd-4,v 1.2 2014/12/02 15:33:37 ultrabug Exp $
 
 REDIS_DIR=${REDIS_DIR:-/var/lib/redis}
 REDIS_CONF=${REDIS_CONF:-/etc/redis.conf}
@@ -9,10 +9,10 @@ REDIS_GROUP=${REDIS_GROUP:-redis}
 REDIS_TIMEOUT=${REDIS_TIMEOUT:-30}
 
 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}
+start_stop_daemon_args="--background --make-pidfile --pidfile ${pidfile}
+	--chdir \"${REDIS_DIR}\" --user ${REDIS_USER} --group ${REDIS_GROUP}"
+command_args="${REDIS_OPTS}"
 
 depend() {
 	use net localmount logger
diff --git a/dev-db/redis/redis-2.8.17.ebuild b/dev-db/redis/redis-2.8.17.ebuild
index d14a6c8acb61..5719f1943647 100644
--- a/dev-db/redis/redis-2.8.17.ebuild
+++ b/dev-db/redis/redis-2.8.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.8.17.ebuild,v 1.1 2014/10/08 09:46:26 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.8.17.ebuild,v 1.2 2014/12/02 15:33:37 ultrabug Exp $
 
 EAPI=5
 
@@ -32,7 +32,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.8.3-{shared,config}.patch
+	epatch "${FILESDIR}"/${PN}-2.8.3-shared.patch
+	epatch "${FILESDIR}"/${PN}-2.8.17-config.patch
 	epatch "${FILESDIR}"/${PN}-2.8.13-sharedlua.patch
 
 	# Copy lua modules into build dir