From c7446241534b32efde9898be66d52f67e2e5b462 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Mon, 11 Jan 2016 10:50:08 +0100
Subject: [PATCH] elasticsearch: do not force a specific log service.

---
 .../files/elasticsearch/log/conf              |  1 -
 .../elasticsearch/files/elasticsearch/log/run | 55 -------------------
 srcpkgs/elasticsearch/template                |  2 +-
 3 files changed, 1 insertion(+), 57 deletions(-)
 delete mode 100644 srcpkgs/elasticsearch/files/elasticsearch/log/conf
 delete mode 100755 srcpkgs/elasticsearch/files/elasticsearch/log/run

diff --git a/srcpkgs/elasticsearch/files/elasticsearch/log/conf b/srcpkgs/elasticsearch/files/elasticsearch/log/conf
deleted file mode 100644
index 1fb73816d0..0000000000
--- a/srcpkgs/elasticsearch/files/elasticsearch/log/conf
+++ /dev/null
@@ -1 +0,0 @@
-USERGROUP=elastic:elastic
diff --git a/srcpkgs/elasticsearch/files/elasticsearch/log/run b/srcpkgs/elasticsearch/files/elasticsearch/log/run
deleted file mode 100755
index 4e4d1d47e3..0000000000
--- a/srcpkgs/elasticsearch/files/elasticsearch/log/run
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-# Author: TJ Vanderpoel
-# Licence: MIT
-# This is a generic 'run' script meant to be linked in a log/ directory
-# of a runit, daemontools, s6, or similar service.
-# It requires svlogd available in the path.
-
-# If the file './conf' exists, it can modify the behavior
-# of the svlogd in these ways:
-
-# USERGROUP=user:group (default rsvlog:adm)
-# SV_LOGDIR=/path/to/log (default `basename $(dirname $PWD)`)
-# CURRENT_LOG_FILE=filename.log (default 'current')
-
-set -e
-if [ $0 != "./run" ];then
-  echo "This script meant to be linked as ./run in a service/log directory only!"
-  exit 1
-fi
-curdir=$(basename $(pwd))
-if [ "$curdir" != "log" ];then
-  echo "This script meant to be run from a service/log directory only!"
-  exit 1
-fi
-if [ -f ./conf ];then
-  . ./conf
-fi
-if [ "x$SV_LOGDIR" != "x" ];then
-  logdir=$SV_LOGDIR
-fi
-if [ -w /var/log ];then
-  user_group=${USERGROUP:-rsvlog:adm}
-  if [ "x$logdir" = "x" ];then
-    logdir=$(basename $(dirname $(pwd)))
-  fi
-  [ -d "/var/log/$logdir" ] || mkdir -p "/var/log/$logdir"
-  [ -L ./main ] || [ -d ./main ] || ln -s "/var/log/$logdir" ./main
-  [ -L ./current ] || ln -s main/current
-  if [ "x$CURRENT_LOG_FILE" != "x" ];then
-    [ -L "/var/log/$logdir/$CURRENT_LOG_FILE" ] || ln -s current "/var/log/$logdir/$CURRENT_LOG_FILE"
-  fi
-  usergroup=$(stat -c "%U:%G" "/var/log/$logdir")
-  if [ "$usergroup" != "$user_group" ];then
-    chown -R $user_group "/var/log/$logdir"
-  fi
-  echo Logging as $user_group to /var/log/$logdir
-  exec chpst -u $user_group svlogd -t ./main
-else
-  echo Logging in $PWD
-  if [ "x$CURRENT_LOG_FILE" != "x" ];then
-    [ -L "$CURRENT_LOG_FILE" ] || ln -s current "$CURRENT_LOG_FILE"
-  fi
-  exec svlogd -t ./
-fi
-
diff --git a/srcpkgs/elasticsearch/template b/srcpkgs/elasticsearch/template
index e26b5ea39f..cf524df372 100644
--- a/srcpkgs/elasticsearch/template
+++ b/srcpkgs/elasticsearch/template
@@ -1,7 +1,7 @@
 # Template file for 'elasticsearch'
 pkgname=elasticsearch
 version=1.7.3
-revision=1
+revision=2
 only_for_archs="i686 x86_64"
 depends="virtual?java-runtime"
 short_desc="A distributed, open source search and analytics engine"