Import of pkgsrc-2016Q3

This commit is contained in:
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions

View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.11 2015/08/03 11:57:43 fhajny Exp $
# $NetBSD: Makefile,v 1.18 2016/09/19 12:28:31 fhajny Exp $
DISTNAME= elasticsearch-1.7.1
DISTNAME= elasticsearch-2.4.0
CATEGORIES= textproc
MASTER_SITES= https://download.elasticsearch.org/elasticsearch/elasticsearch/
@@ -15,48 +15,17 @@ USE_JAVA2= yes
NO_BUILD= yes
PKG_SYSCONFSUBDIR= elasticsearch
EXDIR= ${PREFIX}/share/examples/elasticsearch
EGDIR= ${PREFIX}/share/elasticsearch
EGDIR= ${PREFIX}/share/examples/elasticsearch
CONFS= elasticsearch.yml logging.yml
.for f in ${CONFS}
CONF_FILES+= ${EXDIR}/${f} ${PKG_SYSCONFDIR}/${f}
CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
.endfor
DOCS= LICENSE.txt NOTICE.txt README.textile
BINS= elasticsearch elasticsearch.in.sh plugin
.include "../../mk/bsd.prefs.mk"
.if !empty(MACHINE_PLATFORM:MDarwin-*-i386)
SIGAR_PLATFORM= universal-macosx
.elif !empty(MACHINE_PLATFORM:MDarwin-*-x86_64)
SIGAR_PLATFORM= universal64-macosx
.elif !empty(MACHINE_PLATFORM:MFreeBSD-5*-i386)
SIGAR_PLATFORM= x86-freebsd-5
.elif !empty(MACHINE_PLATFORM:MFreeBSD-6*-i386)
SIGAR_PLATFORM= x86-freebsd-6
.elif !empty(MACHINE_PLATFORM:MFreeBSD-6*-x86_64)
SIGAR_PLATFORM= amd64-freebsd-6
.elif !empty(MACHINE_PLATFORM:MLinux-*-i386)
SIGAR_PLATFORM= x86-linux
.elif !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
SIGAR_PLATFORM= amd64-linux
.elif !empty(MACHINE_PLATFORM:MSunOS-*-i386)
SIGAR_PLATFORM= x86-solaris
.elif !empty(MACHINE_PLATFORM:MSunOS-*-sparc)
SIGAR_PLATFORM= sparc-solaris
.elif !empty(MACHINE_PLATFORM:MSunOS-*-sparc64)
SIGAR_PLATFORM= sparc64-solaris
.elif !empty(MACHINE_PLATFORM:MSunOS-*-x86_64)
SIGAR_PLATFORM= amd64-solaris
.endif
.if ${_OPSYS_SHLIB_TYPE} == "dylib"
SHLIB_EXT= dylib
.else
SHLIB_EXT= so
.endif
BUILD_DEFS+= ES_USER ES_GROUP ES_DBDIR ES_LOGDIR ES_PIDDIR ES_TMPDIR
ES_USER?= elasticsearch
@@ -80,28 +49,22 @@ FILES_SUBST+= JAVA_HOME=${PKG_JAVA_HOME} ES_USER=${ES_USER} \
RCD_SCRIPTS= elasticsearch
OWN_DIRS+= ${ES_LIBDIR}/plugins
OWN_DIRS_PERMS+= ${ES_LOGDIR} ${ES_USER} ${ES_GROUP} 0700
OWN_DIRS_PERMS+= ${ES_DBDIR} ${ES_USER} ${ES_GROUP} 0700
OWN_DIRS_PERMS+= ${ES_TMPDIR} ${ES_USER} ${ES_GROUP} 0700
INSTALLATION_DIRS+= ${EXDIR} ${ES_LIBDIR} ${PREFIX}/share/doc/elasticsearch
INSTALLATION_DIRS+= ${ES_LIBDIR}/plugins ${EGDIR}
PLIST_VARS+= sigar
.if !empty(SIGAR_PLATFORM)
PLIST.sigar= yes
PLIST_SUBST+= SIGAR_FILE=libsigar-${SIGAR_PLATFORM}.${SHLIB_EXT}
PRINT_PLIST_AWK+= {gsub(/libsigar-$(SIGAR_PLATFORM).$(SHLIB_EXT)/,"$${SIGAR_FILE}", $$0);}
INSTALLATION_DIRS+= ${ES_LIBDIR}/sigar
.endif
MAKE_DIRS+= ${PKG_SYSCONFDIR}/scripts
INSTALLATION_DIRS+= ${ES_LIBDIR} ${PREFIX}/libexec/elasticsearch
INSTALLATION_DIRS+= ${EGDIR} ${PREFIX}/share/doc/elasticsearch
SUBST_CLASSES+= paths
SUBST_STAGE.paths= post-patch
SUBST_FILES.paths= config/elasticsearch.yml
SUBST_VARS.paths= PKG_SYSCONFDIR ES_DBDIR ES_LIBDIR ES_LOGDIR ES_TMPDIR
SUBST_STAGE.paths= pre-configure
SUBST_FILES.paths= bin/plugin config/elasticsearch.yml
SUBST_VARS.paths= PKG_JAVA_HOME PKG_SYSCONFDIR PREFIX ES_DBDIR ES_LIBDIR ES_LOGDIR ES_TMPDIR
do-install:
.for f in ${CONFS}
${INSTALL_DATA} ${WRKSRC}/config/${f} ${DESTDIR}${EXDIR}
${INSTALL_DATA} ${WRKSRC}/config/${f} ${DESTDIR}${EGDIR}
.endfor
.for f in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/${f} \
@@ -109,13 +72,9 @@ do-install:
.endfor
.for f in ${BINS}
${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} \
${DESTDIR}${PREFIX}/share/elasticsearch
${DESTDIR}${PREFIX}/libexec/elasticsearch
.endfor
${INSTALL_DATA} ${WRKSRC}/lib/*.jar ${DESTDIR}${ES_LIBDIR}
.if !empty(SIGAR_PLATFORM)
${INSTALL_DATA} ${WRKSRC}/lib/sigar/sigar-*.jar ${DESTDIR}${ES_LIBDIR}/sigar/
${INSTALL_LIB} ${WRKSRC}/lib/sigar/libsigar-${SIGAR_PLATFORM}.${SHLIB_EXT} ${DESTDIR}${ES_LIBDIR}/sigar/
.endif
.include "../../mk/java-vm.mk"
.include "../../mk/bsd.pkg.mk"

View File

@@ -1,34 +1,46 @@
@comment $NetBSD: PLIST,v 1.6 2015/08/03 11:57:43 fhajny Exp $
lib/elasticsearch/antlr-runtime-3.5.jar
@comment $NetBSD: PLIST,v 1.12 2016/09/19 12:28:31 fhajny Exp $
lib/elasticsearch/HdrHistogram-2.1.6.jar
lib/elasticsearch/apache-log4j-extras-1.2.17.jar
lib/elasticsearch/asm-4.1.jar
lib/elasticsearch/asm-commons-4.1.jar
lib/elasticsearch/commons-cli-1.3.1.jar
lib/elasticsearch/compiler-0.8.13.jar
lib/elasticsearch/compress-lzf-1.0.2.jar
lib/elasticsearch/${PKGNAME}.jar
lib/elasticsearch/groovy-all-2.4.4.jar
lib/elasticsearch/guava-18.0.jar
lib/elasticsearch/hppc-0.7.1.jar
lib/elasticsearch/jackson-core-2.8.1.jar
lib/elasticsearch/jackson-dataformat-cbor-2.8.1.jar
lib/elasticsearch/jackson-dataformat-smile-2.8.1.jar
lib/elasticsearch/jackson-dataformat-yaml-2.8.1.jar
lib/elasticsearch/jna-4.1.0.jar
lib/elasticsearch/joda-convert-1.2.jar
lib/elasticsearch/joda-time-2.9.4.jar
lib/elasticsearch/jsr166e-1.1.0.jar
lib/elasticsearch/jts-1.13.jar
lib/elasticsearch/log4j-1.2.17.jar
lib/elasticsearch/lucene-analyzers-common-4.10.4.jar
lib/elasticsearch/lucene-core-4.10.4.jar
lib/elasticsearch/lucene-expressions-4.10.4.jar
lib/elasticsearch/lucene-grouping-4.10.4.jar
lib/elasticsearch/lucene-highlighter-4.10.4.jar
lib/elasticsearch/lucene-join-4.10.4.jar
lib/elasticsearch/lucene-memory-4.10.4.jar
lib/elasticsearch/lucene-misc-4.10.4.jar
lib/elasticsearch/lucene-queries-4.10.4.jar
lib/elasticsearch/lucene-queryparser-4.10.4.jar
lib/elasticsearch/lucene-sandbox-4.10.4.jar
lib/elasticsearch/lucene-spatial-4.10.4.jar
lib/elasticsearch/lucene-suggest-4.10.4.jar
${PLIST.sigar}lib/elasticsearch/sigar/${SIGAR_FILE}
${PLIST.sigar}lib/elasticsearch/sigar/sigar-1.6.4.jar
lib/elasticsearch/spatial4j-0.4.1.jar
lib/elasticsearch/lucene-analyzers-common-5.5.2.jar
lib/elasticsearch/lucene-backward-codecs-5.5.2.jar
lib/elasticsearch/lucene-core-5.5.2.jar
lib/elasticsearch/lucene-grouping-5.5.2.jar
lib/elasticsearch/lucene-highlighter-5.5.2.jar
lib/elasticsearch/lucene-join-5.5.2.jar
lib/elasticsearch/lucene-memory-5.5.2.jar
lib/elasticsearch/lucene-misc-5.5.2.jar
lib/elasticsearch/lucene-queries-5.5.2.jar
lib/elasticsearch/lucene-queryparser-5.5.2.jar
lib/elasticsearch/lucene-sandbox-5.5.2.jar
lib/elasticsearch/lucene-spatial-5.5.2.jar
lib/elasticsearch/lucene-spatial3d-5.5.2.jar
lib/elasticsearch/lucene-suggest-5.5.2.jar
lib/elasticsearch/netty-3.10.6.Final.jar
lib/elasticsearch/securesm-1.0.jar
lib/elasticsearch/snakeyaml-1.15.jar
lib/elasticsearch/spatial4j-0.5.jar
lib/elasticsearch/t-digest-3.0.jar
libexec/elasticsearch/elasticsearch
libexec/elasticsearch/elasticsearch.in.sh
libexec/elasticsearch/plugin
share/doc/elasticsearch/LICENSE.txt
share/doc/elasticsearch/NOTICE.txt
share/doc/elasticsearch/README.textile
share/elasticsearch/elasticsearch
share/elasticsearch/elasticsearch.in.sh
share/elasticsearch/plugin
share/examples/elasticsearch/elasticsearch.yml
share/examples/elasticsearch/logging.yml

View File

@@ -1,6 +1,9 @@
$NetBSD: distinfo,v 1.10 2015/08/03 11:57:43 fhajny Exp $
$NetBSD: distinfo,v 1.19 2016/09/19 12:28:31 fhajny Exp $
SHA1 (elasticsearch-1.7.1.tar.gz) = 0984ae27624e57c12c33d4a559c3ebae25e74508
RMD160 (elasticsearch-1.7.1.tar.gz) = 56ff82b4f53b3244da69befdd762553666d1b8a2
Size (elasticsearch-1.7.1.tar.gz) = 28500556 bytes
SHA1 (patch-config_elasticsearch.yml) = 769fdd62aacdc4743979edbc986e983a5c42a7f8
SHA1 (elasticsearch-2.4.0.tar.gz) = 5150c33ccd104a9ce8b7040eeb5b68cb9ee32a70
RMD160 (elasticsearch-2.4.0.tar.gz) = 291398c95235b966147ee7114ad4b7af39bef0df
SHA512 (elasticsearch-2.4.0.tar.gz) = 931f4d42cba43131718ec7480439b5fda0b9222a51cf9639d99ab4c00bdbedbe7e8da7a6016d88b848772cd416bc49fe7af09202160cecf839e39d803b45e869
Size (elasticsearch-2.4.0.tar.gz) = 27364449 bytes
SHA1 (patch-bin_elasticsearch.in.sh) = 0d2b864361902126ba0a66aff2be614d0723012b
SHA1 (patch-bin_plugin) = 5ddd9b55797305c2c1e77b174ae410c00ecb7b89
SHA1 (patch-config_elasticsearch.yml) = 7729dfb1ed106f0a34e6daaf7a46d0352d42f1f1

View File

@@ -1,6 +1,6 @@
#! @RCD_SCRIPTS_SHELL@
#
# $NetBSD: elasticsearch.sh,v 1.2 2014/04/25 08:47:52 imil Exp $
# $NetBSD: elasticsearch.sh,v 1.3 2015/11/12 15:37:07 fhajny Exp $
#
# PROVIDE: elasticsearch
# REQUIRE: DAEMON
@@ -27,22 +27,25 @@ ES_CLASSPATH="@ES_LIBDIR@/@DISTNAME@.jar:@ES_LIBDIR@/*"
command="@PKG_JAVA_HOME@/bin/java"
# flags taken from bin/elasticsearch and bin/elasticsearch.in.sh
command_args=" -Delasticsearch \
-Des.path.home=@PREFIX@ \
-Des.path.conf=@PKG_SYSCONFDIR@ \
-Des.pidfile=${pidfile} \
-Des.config=${elasticsearch_config} \
-Dfile.encoding=UTF-8 \
-Djava.awt.headless=true \
-Xms${elasticsearch_min_mem} \
-Xmx${elasticsearch_max_mem} \
-Xss256k \
-Djava.awt.headless=true \
-XX:+UseParNewGC \
-XX:+UseConcMarkSweepGC \
-XX:CMSInitiatingOccupancyFraction=75 \
-XX:+UseCMSInitiatingOccupancyOnly \
-XX:+DisableExplicitGC \
-XX:+HeapDumpOnOutOfMemoryError \
-XX:+UseCMSInitiatingOccupancyOnly \
-XX:+UseCMSInitiatingOccupancyOnly \
-XX:+UseConcMarkSweepGC \
-XX:+UseParNewGC \
-XX:CMSInitiatingOccupancyFraction=75 \
-cp ${ES_CLASSPATH} \
${elasticsearch_props} \
org.elasticsearch.bootstrap.Elasticsearch \
>/dev/null &"
start >/dev/null &"
# ElasticSearch is fd hungry, default limit leads to write locks
SOFT_FDLIMIT=`ulimit -S -n`

View File

@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
<service_bundle type='manifest' name='elasticsearch'>
<service_bundle type='manifest' name='export'>
<service name='@SMF_PREFIX@/@SMF_NAME@' type='service' version='0'>
<create_default_instance enabled='false' />
<single_instance />
@@ -20,21 +20,31 @@
<envvar name='JAVA_HOME' value='@PKG_JAVA_HOME@' />
</method_environment>
</method_context>
<exec_method name="start" type="method" exec="@PKG_JAVA_HOME@/bin/java -Delasticsearch -Des.index.store.type=%{store_type} -Des.pidfile=@ES_PIDDIR@/elasticsearch.pid -Des.config=%{config_file} %{java_opts} -Xms%{min_heap} -Xmx%{max_heap} -cp %{class_path} org.elasticsearch.bootstrap.Elasticsearch" timeout_seconds="3600" />
<exec_method type="method" name="stop" exec=":kill" timeout_seconds="60" />
<exec_method type="method" name="refresh" exec=":kill -HUP" timeout_seconds="60" />
<property_group name="application" type="application">
<propval name="min_heap" type="astring" value="256m" />
<propval name="max_heap" type="astring" value="1g" />
<propval name="store_type" type="astring" value="niofs" />
<propval name="class_path" type="astring" value="@ES_LIBDIR@/@DISTNAME@.jar:@ES_LIBDIR@/*:@ES_LIBDIR@/sigar/*.jar" />
<propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/elasticsearch.yml" />
<propval name="java_opts" type="astring" value="-Djava.awt.headless=true -Xss256k -XX:+DisableExplicitGC -XX:+HeapDumpOnOutOfMemoryError -XX:+UseCMSInitiatingOccupancyOnly -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:CMSInitiatingOccupancyFraction=75" />
<exec_method name='start' type='method' exec='@PKG_JAVA_HOME@/bin/java -Delasticsearch -Des.path.home=@PREFIX@ -Des.path.conf=@PKG_SYSCONFDIR@ -Des.pidfile=@ES_PIDDIR@/elasticsearch.pid -Des.index.store.type=%{store_type} %{java_opts} -Xms%{min_heap} -Xmx%{max_heap} -cp %{class_path} org.elasticsearch.bootstrap.Elasticsearch start' timeout_seconds='3600' />
<exec_method type='method' name='stop' exec=':kill' timeout_seconds='60' />
<exec_method type='method' name='refresh' exec=':kill -HUP' timeout_seconds='60' />
<property_group name='application' type='application'>
<propval name='min_heap' type='astring' value='256m' />
<propval name='max_heap' type='astring' value='1g' />
<propval name='store_type' type='astring' value='niofs' />
<propval name='class_path' type='astring' value='@ES_LIBDIR@/@DISTNAME@.jar:@ES_LIBDIR@/*' />
<property name='java_opts' type='astring'>
<astring_list>
<value_node value='-Dfile.encoding=UTF-8'/>
<value_node value='-Djava.awt.headless=true'/>
<value_node value='-XX:+DisableExplicitGC'/>
<value_node value='-XX:+HeapDumpOnOutOfMemoryError'/>
<value_node value='-XX:+UseCMSInitiatingOccupancyOnly'/>
<value_node value='-XX:+UseConcMarkSweepGC'/>
<value_node value='-XX:+UseParNewGC'/>
<value_node value='-XX:CMSInitiatingOccupancyFraction=75'/>
<value_node value='-Xss256k'/>
</astring_list>
</property>
</property_group>
<property_group name='startd' type='framework'>
<propval name='duration' type='astring' value='child' />
</property_group>
<stability value='Evolving' />
<template>
<common_name>
<loctext xml:lang='C'>ElasticSearch: A Distributed RESTful Search Engine</loctext>

View File

@@ -0,0 +1,15 @@
$NetBSD: patch-bin_elasticsearch.in.sh,v 1.6 2016/09/19 12:28:31 fhajny Exp $
Fix paths.
--- bin/elasticsearch.in.sh.orig 2015-10-21 08:41:12.000000000 +0000
+++ bin/elasticsearch.in.sh
@@ -10,7 +10,7 @@ EOF
exit 1
fi
-ES_CLASSPATH="$ES_HOME/lib/elasticsearch-2.4.0.jar:$ES_HOME/lib/*"
+ES_CLASSPATH="@ES_LIBDIR@/elasticsearch-2.4.0.jar:@ES_LIBDIR@/*"
if [ "x$ES_MIN_MEM" = "x" ]; then
ES_MIN_MEM=256m

View File

@@ -0,0 +1,36 @@
$NetBSD: patch-bin_plugin,v 1.2 2015/11/12 15:37:08 fhajny Exp $
Fix paths and improve portability.
--- bin/plugin.orig 2015-10-21 13:32:03.000000000 +0000
+++ bin/plugin
@@ -16,8 +16,13 @@ while [ -h "$SCRIPT" ] ; do
fi
done
+#set default JAVA_HOME
+if [ -z "$JAVA_HOME" ]; then
+ JAVA_HOME="@PKG_JAVA_HOME@"
+fi
+
# determine elasticsearch home
-ES_HOME=`dirname "$SCRIPT"`/..
+ES_HOME="@PREFIX@"
# make ELASTICSEARCH_HOME absolute
ES_HOME=`cd "$ES_HOME"; pwd`
@@ -25,7 +30,7 @@ ES_HOME=`cd "$ES_HOME"; pwd`
# Sets the default values for elasticsearch variables used in this script
if [ -z "$CONF_DIR" ]; then
- CONF_DIR="$ES_HOME/config"
+ CONF_DIR="@PKG_SYSCONFDIR@"
fi
# The default env file is defined at building/packaging time.
@@ -105,4 +110,4 @@ fi
HOSTNAME=`hostname | cut -d. -f1`
export HOSTNAME
-eval "$JAVA" -client -Delasticsearch -Des.path.home="\"$ES_HOME\"" $properties -cp "\"$ES_HOME/lib/*\"" org.elasticsearch.plugins.PluginManagerCliParser $args
+eval "$JAVA" -client -Delasticsearch -Des.path.home="\"$ES_HOME\"" $properties -cp "\"@ES_LIBDIR@/*\"" org.elasticsearch.plugins.PluginManagerCliParser $args

View File

@@ -1,37 +1,23 @@
$NetBSD: patch-config_elasticsearch.yml,v 1.3 2014/07/29 16:57:23 fhajny Exp $
$NetBSD: patch-config_elasticsearch.yml,v 1.4 2015/11/12 15:37:08 fhajny Exp $
Define various paths
--- config/elasticsearch.yml.orig 2014-07-23 13:43:31.000000000 +0000
--- config/elasticsearch.yml.orig 2015-10-21 08:41:12.000000000 +0000
+++ config/elasticsearch.yml
@@ -143,10 +143,12 @@
# Path to directory containing configuration (this file and logging.yml):
@@ -31,10 +31,16 @@
# Path to directory where to store the data (separate multiple locations by comma):
#
#path.conf: /path/to/conf
+path.conf: @PKG_SYSCONFDIR@
# Path to directory where to store index data allocated for this node.
#
#path.data: /path/to/data
# path.data: /path/to/data
+path.data: @ES_DBDIR@
#
# Can optionally include more than one location, causing data to be striped across
# the locations (a la RAID 0) on a file level, favouring locations with most free
@@ -157,14 +159,17 @@
# Path to temporary files:
#
#path.work: /path/to/work
+path.work: @ES_TMPDIR@
# Path to log files:
#
#path.logs: /path/to/logs
# path.logs: /path/to/logs
+path.logs: @ES_LOGDIR@
# Path to where plugins are installed:
#
#path.plugins: /path/to/plugins
+
+path.conf: @PKG_SYSCONFDIR@
+path.plugins: @ES_LIBDIR@/plugins
#################################### Plugin ###################################
+path.work: @ES_TMPDIR@
#
# ----------------------------------- Memory -----------------------------------
#