Security fix relating to an unspecified arbitrary file modification vulnerability. Ebuild, init script and systemd service file by Ferenc Erki. Closes bug #537314 by Austin M. Matherne and bug #547964 by Tomas Mozes. Adding Ferenc Erki as proxy maintainer. Removing all vulnerable ebuilds for security bug #551776.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xB5058F9A

7 files changed, 129 insertions, 122 deletions

diff --git a/app-misc/elasticsearch/ChangeLog b/app-misc/elasticsearch/ChangeLog
index cf1403482511..481a5f501330 100644
--- a/app-misc/elasticsearch/ChangeLog
+++ b/app-misc/elasticsearch/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-misc/elasticsearch
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/elasticsearch/ChangeLog,v 1.12 2015/04/01 17:33:46 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/elasticsearch/ChangeLog,v 1.13 2015/06/11 15:36:30 chainsaw Exp $
+
+*elasticsearch-1.6.0 (11 Jun 2015)
+
+  11 Jun 2015; Tony Vroon <chainsaw@gentoo.org> -elasticsearch-1.4.4.ebuild,
+  -elasticsearch-1.5.0.ebuild, +elasticsearch-1.6.0.ebuild,
+  +files/elasticsearch.init4, +files/elasticsearch.service3, metadata.xml:
+  Security fix relating to an unspecified arbitrary file modification
+  vulnerability. Ebuild, init script and systemd service file by Ferenc Erki.
+  Closes bug #537314 by Austin M. Matherne and bug #547964 by Tomas Mozes.
+  Adding Ferenc Erki as proxy maintainer. Removing all vulnerable ebuilds for
+  security bug #551776.
 
 *elasticsearch-1.5.0 (01 Apr 2015)
 
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 7659e117fce1..89472bab49d2 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -6,28 +6,18 @@ AUX elasticsearch.conf 428 SHA256 cabfe972ef28b30d152c022e4a0510f6ce940687a452b8
 AUX elasticsearch.init 2276 SHA256 bc3941c26bd98f148b757200fad3bdd68776ebf0bdb4844b47a02ef82c2384fa SHA512 5d8cb832420fc2484dcb18f98adbb1359b7129b26485bd557c7ef3260ff38ca6a7064a07f91d4824cc045046b6eedd49f19001bcaf9ff6b409b810d0e723f97c WHIRLPOOL 994c63d4026e0288e42993bb8e7eca62c383c6854e96ca4f2e5f7fa41c8b83f7822f696c9cb2f37c696862fec77cca3ca511c5669a2de9267b168c14401c18bd
 AUX elasticsearch.init2 2296 SHA256 a2abd2f6423ebc382a130b6264114d2e4b28d1ec705939f6ccc818bb7a86b491 SHA512 2439482409908774e02726f81bcf8c9d80d0c3e00c468e4ae95dbb7ae9035fd27ae47aa08b1a705ba808a5222b95b37189b1e9ab7ec89797b9f90db572b5f89f WHIRLPOOL 37a1866079dbc0ec6624b2da2da2914752d76d02ebb4764d209a716ac90f1b29014be9930ba6b5999f513b6357c9088d24db3c2b14c763e792dc1c63d2f9fe34
 AUX elasticsearch.init3 2319 SHA256 cb00de8eb5d6f3ddfe48fed1fe20b527900ad79984e24c2c12b61c3aacad2732 SHA512 903b4014541d2793b70c0520c1e901ddc7fca133897b1b3c772859dffe16ec804fa89e254edc0c52800f8d0c929ba32cfadab359575bc76fe197679fe10b9e02 WHIRLPOOL 25465dfb52b2d8cfd3ad502470b43edabc086ac731d78b2e86043bae54c7926e73cc5d0ec54c036090a9f27cc1ac56e5e2942d1821e3063a72daf7e7df35a797
+AUX elasticsearch.init4 2344 SHA256 a82e709b1873a81eaf61cd03ee111c2fe41035374f6904ec9bf96c6f5cb7ae09 SHA512 5c6769f50e9d79e88ed0dd36a79b8fdc5a6f845d5d80767f979efac7d747b1ebdc21efc6fdd487db63ca770c565134a35c27d196ccfbbd0652e6d94279cea4ff WHIRLPOOL ee59d42238335c8c42f1efc6c72cd4131470ba72d6bca0bdf158a738d28d4dacbe0974d13a428dd8b8e38cfe4dc950c3fd8ce74b14257b6d481747d74da3282b
 AUX elasticsearch.service 274 SHA256 d8581135cb5f6b73245e571f0cd3cfa85c90d96474304214324958b9ee952f7e SHA512 14c0696ab1244e4afde34c0f6aaececbb5a80a75dc9ad23841adefde815c8c9a604858902bd87609d8191dfca7c4eb24f1ad2d041d50d22a789296bf43366a76 WHIRLPOOL 8df4eb48efac8353c21685bc17bd30ce8835f9f5f91f19acd3f69a42a780c69fc118f74d003429e1da9558ffad1a1e649c57521ba8219fcb262a2ffdb2e24e9c
 AUX elasticsearch.service2 279 SHA256 2a827cfa6331652e5a34bb975da52fec6d12ce0a80eacf810f62e22c5272349b SHA512 17994b7a5b0ef883034765d2b0e5c29daccb1e122b956f598d0c2b24085a0e66450fa143e3c656d75bf149a53ca497bc8c747b62ba47743aad17ae1a446d6d7d WHIRLPOOL 0c97253da7f75586c135568036f149f2465a1d73f5cb6e67b45a36832c2f54b61b0bcfd60db122c7e1ea6e7595e379dfe49a7e7bbad596840da6158a7d56dc46
-DIST elasticsearch-1.4.4.tar.gz 27900004 SHA256 a3158d474e68520664debaea304be22327fc7ee1f410e0bfd940747b413e8586 SHA512 afc24c5d778d346e24c656e040fb7d0036e16ae42b35ca4f97b2e4d31dc815467ae5462f922ea5222307acf0fa0579f6cd38c603bc996c1f4ba723aa6a2b01ed WHIRLPOOL 37a1a057539ae29525a78fa51f3d19f403e389129e54054edfa1bbd08d12bdbb88acb4e879b6795aa63d583fd70eedefcae5b13b6bf1a7c8314e3aafa49e2b33
-DIST elasticsearch-1.5.0.tar.gz 28182213 SHA256 acf572c606552bc446cceef3f8e93814a363ba0d215b323a2864682b3abfbe45 SHA512 c0529b0bbf6c610c1a9ee2eef0b0ce5f60b2ebc70abc4576089da0f82284059aa5e404da25a83e40c2975ef3ea63bacc3949ead67ead2f74694a6257328f3b3c WHIRLPOOL 99a3f2e6176993d3d965c01149873a3b4ab18eae7977e37dfb90f178f5d9cbba109569de2b45c44627cbe06f4b55e47849df0fe83c761be4b7374aa9acb19411
-EBUILD elasticsearch-1.4.4.ebuild 2194 SHA256 14e173ef1be56d6595628e7f584d0cc6bdd951dfcc95bc357fc071ae741cd87a SHA512 1c643441a1f2983932f32eedbf7647b56bc12c2051fdfcecb2e060b0e2d619964f349e80b0cdc15caed95e74ffc2306f636f94298387304c395618d8faf4dc44 WHIRLPOOL 6a16aee1cb7407d5600c947af75b04ea77a9915e95c9f564784c8e5a1bce3b0c7cb5b9f4bc95b5fac9d5b9017103fcea1c4d8e8b21fcc4539782d0579c9e08a3
-EBUILD elasticsearch-1.5.0.ebuild 2194 SHA256 5ba32641742a9f5b249f157dae788252ce330a0feceebdc60aba6759c78c56dc SHA512 90f36900f09c82d9e38d2cb677fc7458380fd060ca487e2a0b4b54a443980e7dd2b5240b153fe70c9eec3cd9703f6c564b8e827f930b05f93f6a24488ddffb21 WHIRLPOOL 9f862f880b38da44a52bbd0b26e7c4c3ca94f67f93aa56ce44ab83e9ba682efc4ba00d403a846f0b3344c78dbc892d9a521db17587203221efd18c96cd671785
-MISC ChangeLog 3344 SHA256 29cbd7c55c75e7d8757c4ad621bde7d62b2af5f0e25217d5e8ca29c365add33b SHA512 76b63367548c839025f885f41140d5948a9a5556f35c8eb52d1a76a3b7e6f5b99fb2d46c5e1311caf500609c884b808a788c962df6df28e5f39c76e7403d4302 WHIRLPOOL 16108f844e80d482c1784072a040a319241625d3978820ecc9a7dc121fdb560f50704306328be9ac402ea0ba4b210bbd091def7509626ec458659350ba07c43c
-MISC metadata.xml 237 SHA256 88d9092fd208599a8b524cca9633d9330223e45c34a44e54b2de05edb4738ac7 SHA512 11773ab2b5adaa81f3c8f73413d2f257ea1d1624df689154ee2697412ff14ea8f9851b805c4a474b486abb0a066cfc929f91eb852a208b9536885d467df36af1 WHIRLPOOL 324b778d3103d615af41fd6d1d978beeeeb08f4823a3c81fd453464b4df2ed59b56a481ddd65b4eb740dc75b4dc69133e761199abe6d27333b1fce97d5b5a1be
+AUX elasticsearch.service3 289 SHA256 090d18422b949d7a81d145362a667b96acd153aeff5dfe674703919170b7133b SHA512 767c0f40e79fe7bd66d1a51967d91cf27391ab51b65872025aae83721a12e7aecc1bb1eb7e097ecb0dea15c828d946a3f28686ca1360725dfdaa6c26a21f3179 WHIRLPOOL 4a96cc97e7b6a101e9807b62323f961818bec6db8a5c024eefacb4a3ddec2ca9c34e512badfd132ac770e305def850b3a45735b3b531880acb57b686d87d9fd2
+DIST elasticsearch-1.6.0.tar.gz 28401477 SHA256 dc336c83394b2f2f72f362e0f959a4cfdec2109aa3de15668401afeab0b02d2e SHA512 098b657702f568de43d516077231df42652fee2315d55caef1b6b26c9d36ff6373380b827810cdc88410cf33ca0d782ffebb760221efa6babd491ce6cc6f75e5 WHIRLPOOL aec4ec5e5042550e284db55092e18c1ae1f04960a314833b8092488afec938fce56493dbb65c7aabbdf3a4caedf3bac224370c962992ace1702e6c369dc74887
+EBUILD elasticsearch-1.6.0.ebuild 1821 SHA256 cdcc1144dcbdb1e24e5896779ee7dd214704870811d6050bdb159a7b51bcb095 SHA512 25236508f23be883f61290b1d61035cb0dca6d34b995c78a7a271d92f47283fa71f32d35bc1dc3723eff55335be7c03faf010e014e1eeeff3aa709c663c87024 WHIRLPOOL 4128e8e16cedcca83c82cd0010c48b0990d19f14f4b3cf530a51dac6dc7bb42e601f2b3364ac4270548cc9f7b18e47fadb36ba6a4f2b8a65ea8c50b3b72d39a2
+MISC ChangeLog 3918 SHA256 0dd92a0bf1c6fa8152cff2280aeb52e4914fe049d8112a2a21b7d540ffa6d71c SHA512 b5b0c84228ad3c2d3441015b1a18ff1013ef090b58bce37d9016c66a7d3bcfea8012e56dcf6611cc9d440cda6b09c1062e35c037fa778a29dc78217219e690dc WHIRLPOOL 62b2eaffb52d8965d990738a537566f6430fa0d7c887f965a7897dba74b0dfd00477b05b64df9b82fae4b119e52e4c53fd5f0625b394b436f221863e2f3c14e3
+MISC metadata.xml 403 SHA256 eda7f2bdadfadf6ecd01a2ca93f2b56eeb1e5b86613e540b069c9a496b3a4709 SHA512 b50840b1dd3d127c2ae25bef735d8cf0a9220a228512b4afc73958ddb48260a3e19b2ccc7161b647550c2e966c9ffd1d241a2b69628814226628d74a39a88e29 WHIRLPOOL 3c436d9dfd2dda003a31c58f0a9706482bf4a764e277d22f3aab8d35645f35e003b2edc7a41f5f7602692c92eb952dfe20621b182eba04ab4a5c7adaf9b1ecc6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVHCx3AAoJEJOE+m71LUu6w/0P/1+FvWgW9rMokAkTMbgXCZ1O
-zTO4sRE1T94cUCwRwDQ017iOalGFhg5cRlYIGLNGQs5sG3zYewmhW1CWwcPw6Y4i
-AjFFFY5fpy2qmpF7lKtllZsNzFVK+6iL+7MTnLIwkxh1tOeYIcYP8T6DJJN2ayLn
-HwQkIKhxBC2yQu9smSaF76siq3a3U5rz15xyYDU+ps6RcpqGUKHEj9VRCpxPQPck
-xLPYqxySIm12O8QeK7cqKJxSsKOjncMBXM1ENc4eKv4BhjNbFr8Y388VsYXY38d8
-Bfk/whOt0Q0HF0lpno0fMtTB3k0l129il1eS5TS4fEy3nPztwEGaa6B3EKXMlxYm
-TIQ5QiJIJfN6EDJHv7zhfPmIgZz5682HYxgqC2Mhq5nzu7xBbvhVQOVccdl6a6QP
-g8fBJWoixOm1PcMAySF/trihLe+THoUK/OSpiyiEKeSHMWEL+CRc+ubCjop5vWch
-dmtC2YSesZCA6y9J6FkF5MzkqKgcRo+oBKdcF366FrUuJRXxhGOoM5Gf58oVh09i
-oX5kXzt0L9G1exDn5c+mq74v5T0tnEkuGVawkY/ADhM0+md9EAFVxaohSSRpc3uT
-0sayvDEJ3qUE2FIbSXDyLnBp0ZxV8XRb9HZdKe4JhpvaeLnPBGRgNfI7KNoy3lby
-rSjrcNl+Xy/oTfWyKm6C
-=lXTU
+iEYEAREIAAYFAlV5qvsACgkQp5vW4rUFj5rfqgCff8+wulxFeOq1+U7h/4166tCa
+tc8Anid6RTJptxVKrmFalPBupu5WHPtv
+=2LBh
 -----END PGP SIGNATURE-----
diff --git a/app-misc/elasticsearch/elasticsearch-1.5.0.ebuild b/app-misc/elasticsearch/elasticsearch-1.5.0.ebuild
deleted file mode 100644
index b7da8703f71e..000000000000
--- a/app-misc/elasticsearch/elasticsearch-1.5.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/elasticsearch/elasticsearch-1.5.0.ebuild,v 1.1 2015/04/01 17:33:46 blueness Exp $
-
-EAPI=5
-
-inherit eutils systemd user
-
-MY_PN="${PN%-bin}"
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="http://www.elasticsearch.org/"
-SRC_URI="http://download.${MY_PN}.org/${MY_PN}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="strip"
-QA_PREBUILT="usr/share/elasticsearch/lib/sigar/libsigar-*.so"
-
-RDEPEND="virtual/jre:1.7"
-
-pkg_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 /bin/bash /var/lib/${MY_PN} ${MY_PN}
-}
-
-src_prepare() {
-	rm -rf lib/sigar/*{solaris,winnt,freebsd,macosx}*
-	rm -rf bin/*.{bat,exe}
-	rm lib/sigar/libsigar-ia64-linux.so
-	rm LICENSE.txt
-
-	use amd64 && {
-		rm lib/sigar/libsigar-x86-linux.so
-	}
-
-	use x86 && {
-		rm lib/sigar/libsigar-amd64-linux.so
-	}
-}
-
-src_install() {
-	dodir /etc/${MY_PN}
-
-	insinto /usr/share/doc/${P}/examples
-	doins bin/${MY_PN}.in.sh
-	doins config/*
-	rm bin/${MY_PN}.in.sh
-	rm -rf config
-
-	insinto /usr/share/${MY_PN}
-	doins -r ./*
-	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
-
-	keepdir /var/{lib,log}/${MY_PN}
-
-	local rcscript=elasticsearch.init3
-	local eshome="/usr/share/${MY_PN}"
-	local jarfile="${MY_PN}-${PV}.jar"
-	local esclasspath="${eshome}/lib/${jarfile}:${eshome}/lib/*:${eshome}/lib/sigar/*"
-
-	cp "${FILESDIR}/${rcscript}" "${T}" || die
-	sed -i \
-		-e "s|@ES_CLASS_PATH@|${esclasspath}|" \
-		"${T}/${rcscript}" \
-		|| die "failed to filter ${rcscript}"
-
-	newinitd "${T}/${rcscript}" "${MY_PN}"
-	newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
-	systemd_newunit "${FILESDIR}"/${PN}.service2 "${PN}.service"
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${MY_PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
-	elog
-	elog "Each of the example files in /usr/share/doc/${P}/examples"
-	elog "should be extracted to the proper configuration directory:"
-	elog "/etc/${MY_PN} (for standard init)"
-	elog "/etc/${MY_PN}/instance (for symlinked init)"
-	elog
-}
diff --git a/app-misc/elasticsearch/elasticsearch-1.4.4.ebuild b/app-misc/elasticsearch/elasticsearch-1.6.0.ebuild
index d545ec1903d1..9eb032f393a8 100644
--- a/app-misc/elasticsearch/elasticsearch-1.4.4.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/elasticsearch/elasticsearch-1.4.4.ebuild,v 1.1 2015/03/18 10:07:27 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/elasticsearch/elasticsearch-1.6.0.ebuild,v 1.1 2015/06/11 15:36:30 chainsaw Exp $
 
 EAPI=5
 
@@ -8,8 +8,8 @@ inherit eutils systemd user
 
 MY_PN="${PN%-bin}"
 DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="http://www.elasticsearch.org/"
-SRC_URI="http://download.${MY_PN}.org/${MY_PN}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+HOMEPAGE="https://www.elastic.co/products/elasticsearch"
+SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -43,9 +43,7 @@ src_install() {
 	dodir /etc/${MY_PN}
 
 	insinto /usr/share/doc/${P}/examples
-	doins bin/${MY_PN}.in.sh
 	doins config/*
-	rm bin/${MY_PN}.in.sh
 	rm -rf config
 
 	insinto /usr/share/${MY_PN}
@@ -54,20 +52,9 @@ src_install() {
 
 	keepdir /var/{lib,log}/${MY_PN}
 
-	local rcscript=elasticsearch.init3
-	local eshome="/usr/share/${MY_PN}"
-	local jarfile="${MY_PN}-${PV}.jar"
-	local esclasspath="${eshome}/lib/${jarfile}:${eshome}/lib/*:${eshome}/lib/sigar/*"
-
-	cp "${FILESDIR}/${rcscript}" "${T}" || die
-	sed -i \
-		-e "s|@ES_CLASS_PATH@|${esclasspath}|" \
-		"${T}/${rcscript}" \
-		|| die "failed to filter ${rcscript}"
-
-	newinitd "${T}/${rcscript}" "${MY_PN}"
+	newinitd "${FILESDIR}/elasticsearch.init4" "${MY_PN}"
 	newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
-	systemd_newunit "${FILESDIR}"/${PN}.service2 "${PN}.service"
+	systemd_newunit "${FILESDIR}"/${PN}.service3 "${PN}.service"
 }
 
 pkg_postinst() {
diff --git a/app-misc/elasticsearch/files/elasticsearch.init4 b/app-misc/elasticsearch/files/elasticsearch.init4
new file mode 100644
index 000000000000..7110e584196e
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch.init4
@@ -0,0 +1,87 @@
+#!/sbin/runscript
+
+name="Elasticsearch"
+description=""
+
+ES_USER=${ES_USER:="elasticsearch"}
+ES_INSTANCE=${SVCNAME#*.}
+
+if [ -n "${ES_INSTANCE}" ] && [ ${SVCNAME} != "elasticsearch" ]; then
+	PIDFILE="/run/elasticsearch/elasticsearch.${ES_INSTANCE}.pid"
+	ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
+	ES_CONF_PATH="/etc/elasticsearch/${ES_INSTANCE}"
+	ES_LOG_PATH="/var/log/elasticsearch/${ES_INSTANCE}"
+else
+	PIDFILE="/run/elasticsearch/elasticsearch.pid"
+	ES_BASE_PATH="/var/lib/elasticsearch/_default"
+	ES_CONF_PATH="/etc/elasticsearch"
+	ES_LOG_PATH="/var/log/elasticsearch/_default"
+fi
+
+ES_DATA_PATH="${ES_BASE_PATH}/data"
+ES_WORK_PATH="${ES_BASE_PATH}/work"
+
+export ES_INCLUDE="/usr/share/elasticsearch/bin/elasticsearch.in.sh"
+export JAVA_OPTS
+export ES_JAVA_OPTS
+export ES_HEAP_SIZE
+export ES_HEAP_NEWSIZE
+export ES_DIRECT_SIZE
+export ES_USE_IPV4
+
+server_command="/usr/share/elasticsearch/bin/elasticsearch"
+server_args=" -p ${PIDFILE} -Des.default.path.conf=\"${ES_CONF_PATH}\" -Des.default.path.data=\"${ES_DATA_PATH}\" -Des.default.path.work=\"${ES_WORK_PATH}\" -Des.default.path.logs=\"${ES_LOG_PATH}\""
+
+depend() {
+	use net
+}
+
+start() {
+	# elasticsearch -Des.config=/path/to/config/file
+	# elasticsearch -Des.network.host=10.0.0.4
+	
+	[ ! -f "${ES_INCLUDE}" ] && {
+		eerror "${ES_INCLUDE} must be copied into place"
+		return 1
+	}
+
+	local conf
+	local conf_file
+	for conf in elasticsearch.yml logging.yml; do
+		conf_file="${ES_CONF_PATH}/${conf}"
+		if [ ! -f "${conf_file}" ]; then
+			eerror "${conf_file} must be copied into place"
+			return 1
+		fi
+	done
+
+	ebegin "Starting ${SVCNAME}"
+
+	if [ -n "${ES_MAX_FD}" ]; then
+		ulimit -n ${ES_MAX_FD}
+		einfo "Max open filedescriptors  : ${ES_MAX_FD}"
+	fi
+
+	checkpath -d -o "${ES_USER}" -m750 "/var/lib/elasticsearch"
+	checkpath -d -o "${ES_USER}" -m750 "/var/log/elasticsearch"
+	checkpath -d -o "${ES_USER}" -m750 "$(dirname "${PIDFILE}")"
+	checkpath -d -o "${ES_USER}" -m750 "${ES_BASE_PATH}"
+	checkpath -d -o "${ES_USER}" -m750 "${ES_LOG_PATH}"
+	
+	start-stop-daemon --start \
+		--background \
+		--chdir "${ES_BASE_PATH}" \
+		--user="${ES_USER}" \
+		--pidfile="${PIDFILE}" \
+		--exec ${server_command} -- ${server_args}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop \
+		--pidfile=${PIDFILE} \
+		--user="${ES_USER}" \
+		--retry=TERM/20/KILL/5
+	eend $?
+}
diff --git a/app-misc/elasticsearch/files/elasticsearch.service3 b/app-misc/elasticsearch/files/elasticsearch.service3
new file mode 100644
index 000000000000..c5aa7179f73f
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch.service3
@@ -0,0 +1,11 @@
+[Unit]
+Description=Elasticsearch
+After=network.target
+
+[Service]
+User=elasticsearch
+Environment=ES_INCLUDE=/usr/share/elasticsaerch/bin/elasticsearch.in.sh
+ExecStart=/usr/share/elasticsearch/bin/elasticsearch -Des.default.path.conf=/etc/elasticsearch
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-misc/elasticsearch/metadata.xml b/app-misc/elasticsearch/metadata.xml
index 3ed4669f55a4..c3eb101d09bc 100644
--- a/app-misc/elasticsearch/metadata.xml
+++ b/app-misc/elasticsearch/metadata.xml
@@ -2,6 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
+    <email>erkiferenc@gmail.com</email>
+    <name>Ferenc Erki</name>
+    <description>Proxy maintaining through chainsaw</description>
+  </maintainer>
+  <maintainer>
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>