From 107b78410ce0b58c2233e592a5d95bea7a4886cb Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Sat, 18 Jul 2015 09:08:11 +0200
Subject: [PATCH] elasticsearch: security update to 1.7.0.

---
 srcpkgs/elasticsearch/template | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/elasticsearch/template b/srcpkgs/elasticsearch/template
index 3d2d4c101a..eee6f161a9 100644
--- a/srcpkgs/elasticsearch/template
+++ b/srcpkgs/elasticsearch/template
@@ -1,24 +1,24 @@
 # Template file for 'elasticsearch'
 pkgname=elasticsearch
-version=1.6.0
+version=1.7.0
 revision=1
 only_for_archs="i686 x86_64"
 depends="virtual?java-runtime"
 short_desc="A distributed, open source search and analytics engine"
 maintainer="bougyman <bougyman@rubyists.com>"
-license="apache2"
+license="Apache-2.0"
 homepage="http://www.elastic.co"
 distfiles="https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-${version}.tar.gz"
-checksum=dc336c83394b2f2f72f362e0f959a4cfdec2109aa3de15668401afeab0b02d2e
+checksum=6fabed2db09e1b88587df15269df328ecef33e155b3c675a2a6d2299bda09c95
 system_accounts="elastic"
-system_groups="elastic"
 conf_files="/etc/elasticsearch/elasticsearch.yml /etc/elasticsearch/logging.yml"
 
 do_install() {
-	install -d -m0755 "${DESTDIR}"/usr/lib/elasticsearch/bin
-	install -d -m0755 "${DESTDIR}"/usr/lib/elasticsearch/lib/sigar
-	install -d -m0755 "${DESTDIR}"/usr/bin
-	install -d -m0750 "${DESTDIR}"/etc/elasticsearch
+	vmkdir usr/bin
+	vmkdir usr/lib/$pkgname/bin
+	vmkdir usr/lib/$pkgname/lib/sigar
+	vmkdir etc/$pkgname
+
 	vcopy bin/elasticsearch usr/lib/elasticsearch/bin
 	vcopy bin/elasticsearch.in.sh usr/lib/elasticsearch/bin
 	vcopy bin/plugin usr/lib/elasticsearch/bin
@@ -30,10 +30,10 @@ do_install() {
 		vcopy lib/sigar/libsigar-amd64-linux.so usr/lib/elasticsearch/lib/sigar
 	fi
 	vcopy config/*.yml etc/elasticsearch
-	ln -s /usr/lib/elasticsearch/bin/elasticsearch "${DESTDIR}"/usr/bin/elasticsearch
-	ln -s /etc/elasticsearch "${DESTDIR}"/usr/lib/elasticsearch/config
-	ln -s /var/lib/elasticsearch/data "${DESTDIR}"/usr/lib/elasticsearch/data
-	ln -s /var/log/elasticsearch "${DESTDIR}"/usr/lib/elasticsearch/logs
+	ln -s /usr/lib/elasticsearch/bin/elasticsearch ${DESTDIR}/usr/bin/elasticsearch
+	ln -s /etc/elasticsearch ${DESTDIR}/usr/lib/elasticsearch/config
+	ln -s /var/lib/elasticsearch/data ${DESTDIR}/usr/lib/elasticsearch/data
+	ln -s /var/log/elasticsearch ${DESTDIR}/usr/lib/elasticsearch/logs
 	vlicense LICENSE.txt
 	vlicense NOTICE.txt
 	vdoc README.textile