FreeBSD Bugzilla – Attachment 219475 Details for
Bug 250969
textproc/elasticsearch6: Fix messages in rc.d script (bug #234157)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
textproc/elasticsearch6: Fix for bug #234157
textproc_elasticsearch6-6.8.13_1.diff (text/plain), 9.34 KB, created by
Juraj Lutter
on 2020-11-09 00:22:55 UTC
(
hide
)
Description:
textproc/elasticsearch6: Fix for bug #234157
Filename:
MIME Type:
Creator:
Juraj Lutter
Created:
2020-11-09 00:22:55 UTC
Size:
9.34 KB
patch
obsolete
>diff --git a/textproc/elasticsearch6/Makefile b/textproc/elasticsearch6/Makefile >index 0d3904621408..86dde0ef5f73 100644 >--- a/textproc/elasticsearch6/Makefile >+++ b/textproc/elasticsearch6/Makefile >@@ -1,134 +1,135 @@ > # Created by: Tom Judge <tj@FreeBSD.org> > # $FreeBSD$ > > PORTNAME= elasticsearch > PORTVERSION= 6.8.13 >+PORTREVISION= 1 > CATEGORIES= textproc java devel > MASTER_SITES= https://artifacts.elastic.co/downloads/${PORTNAME}/ \ > https://ftp.sk.freebsd.org/pub/local/distfiles/ > PKGNAMESUFFIX= 6 > > MAINTAINER= elastic@FreeBSD.org > COMMENT= Full-text search engine for Java > > LICENSE= APACHE20 > > BUILD_DEPENDS= jna>0:devel/jna > RUN_DEPENDS= bash>0:shells/bash \ > jna>0:devel/jna > > USES= cpe shebangfix > > CONFLICTS= elasticsearch-[0-9]* elasticsearch2* elasticsearch5* elasticsearch7* > > NO_ARCH= yes > USE_JAVA= yes > NO_BUILD= yes > JAVA_VERSION= 8+ > USE_RC_SUBR= ${PORTNAME} > SHEBANG_FILES= bin/elasticsearch \ > bin/elasticsearch-certgen \ > bin/elasticsearch-certutil \ > bin/elasticsearch-cli \ > bin/elasticsearch-croneval \ > bin/elasticsearch-env \ > bin/elasticsearch-keystore \ > bin/elasticsearch-migrate \ > bin/elasticsearch-plugin \ > bin/elasticsearch-saml-metadata \ > bin/elasticsearch-setup-passwords \ > bin/elasticsearch-shard \ > bin/elasticsearch-sql-cli \ > bin/elasticsearch-syskeygen \ > bin/elasticsearch-translog \ > bin/elasticsearch-users \ > bin/x-pack-env \ > bin/x-pack-security-env \ > bin/x-pack-watcher-env > > OPTIONS_DEFINE= DOCS > > .include <bsd.port.options.mk> > > CONFIG_FILES= elasticsearch.yml \ > jvm.options \ > log4j2.properties \ > role_mapping.yml \ > roles.yml > BINS= elasticsearch \ > elasticsearch-certgen \ > elasticsearch-certutil \ > elasticsearch-cli \ > elasticsearch-croneval \ > elasticsearch-env \ > elasticsearch-keystore \ > elasticsearch-migrate \ > elasticsearch-plugin \ > elasticsearch-saml-metadata \ > elasticsearch-setup-passwords \ > elasticsearch-shard \ > elasticsearch-sql-cli \ > elasticsearch-sql-cli-${PORTVERSION}.jar \ > elasticsearch-syskeygen \ > elasticsearch-translog \ > elasticsearch-users \ > x-pack-env \ > x-pack-security-env \ > x-pack-watcher-env > > PORTDOCS= LICENSE.txt \ > NOTICE.txt \ > README.textile > > SIGAR_ARCH= ${ARCH:S|i386|x86|} > SEARCHUSER?= elasticsearch > SEARCHGROUP?= ${SEARCHUSER} > USERS= ${SEARCHUSER} > GROUPS= ${SEARCHGROUP} > > SUB_LIST= ETCDIR=${ETCDIR} JAVA_HOME=${JAVA_HOME} > SUB_FILES= pkg-message > > post-patch: > ${RM} ${WRKSRC}/lib/jna-*.jar > # ML plugin not supported on FreeBSD > ${RM} -rf ${WRKSRC}/modules/x-pack-ml > > do-install: > ${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch > .for f in ${CONFIG_FILES} > ${INSTALL} ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample > .endfor > ${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/bin > .for f in ${BINS} > ${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/lib/elasticsearch/bin > .endfor > ${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib > (cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib/ "-name *\.jar") > > ${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/modules > (cd ${WRKSRC}/modules && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/elasticsearch/modules/) > ${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins > ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/elasticsearch > ${INSTALL} -lrs ${STAGEDIR}${ETCDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/config > ${LN} -s ${JAVASHAREDIR}/classes/jna.jar ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib/jna.jar > > do-install-DOCS-on: > ${MKDIR} ${STAGEDIR}${DOCSDIR} > .for f in ${PORTDOCS} > ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} > .endfor > > post-install: > ${ECHO} "@sample ${ETCDIR}/elasticsearch.yml.sample" >> ${TMPPLIST} > ${ECHO} "@sample ${ETCDIR}/log4j2.properties.sample" >> ${TMPPLIST} > ${ECHO} "@sample ${ETCDIR}/jvm.options.sample" >> ${TMPPLIST} > ${ECHO} "@sample ${ETCDIR}/roles.yml.sample" >> ${TMPPLIST} > ${ECHO} "@sample ${ETCDIR}/role_mapping.yml.sample" >> ${TMPPLIST} > ${FIND} -s ${STAGEDIR}${PREFIX}/lib/elasticsearch -not -type d | ${SORT} | \ > ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} > ${ECHO} "@dir lib/elasticsearch/plugins" >> ${TMPPLIST} > ${ECHO} "@dir libexec/elasticsearch" >> ${TMPPLIST} > ${ECHO} "@dir(elasticsearch,elasticsearch,0755) ${ETCDIR}" >> ${TMPPLIST} > > .include <bsd.port.mk> >diff --git a/textproc/elasticsearch6/files/elasticsearch.in b/textproc/elasticsearch6/files/elasticsearch.in >index 00779163c412..eea1d22a44f8 100644 >--- a/textproc/elasticsearch6/files/elasticsearch.in >+++ b/textproc/elasticsearch6/files/elasticsearch.in >@@ -1,130 +1,130 @@ > #!/bin/sh > # > # $FreeBSD$ > # > # PROVIDE: elasticsearch > # REQUIRE: NETWORKING SERVERS > # BEFORE: DAEMON > # KEYWORD: shutdown > # > # Add the following line to /etc/rc.conf to enable elasticsearch: > # > # elasticsearch_enable="YES" > # > # elasticsearch_user (username): Set to elasticsearch by default. > # Set it to required username. > # elasticsearch_group (group): Set to elasticsearch by default. > # Set it to required group. > # elasticsearch_config (path): Set to %%PREFIX%%/etc/elasticsearch/elasticsearch.yml by default. > # Set it to the config file location. > # elasticsearch_java_home (path): Set to %%JAVA_HOME%% by default. > # Set it to the root of the JDK to use. > # > . /etc/rc.subr > > name=elasticsearch > rcvar=elasticsearch_enable > > load_rc_config ${name} > > : ${elasticsearch_enable:=NO} > : ${elasticsearch_user=elasticsearch} > : ${elasticsearch_group=elasticsearch} > : ${elasticsearch_config=%%PREFIX%%/etc/elasticsearch} > : ${elasticsearch_login_class=root} > : ${elasticsearch_java_home="%%JAVA_HOME%%"} > > required_files="${elasticsearch_config}/elasticsearch.yml" > _pidprefix=/var/run/elasticsearch/elasticsearch > pidfile=${_pidprefix}.pid > procname=${elasticsearch_java_home}/bin/java > > extra_commands="console status" > console_cmd=elasticsearch_console > start_precmd=elasticsearch_precmd > command=%%PREFIX%%/lib/elasticsearch/bin/elasticsearch > command_args="-d --pidfile=${pidfile}" > > export ES_PATH_CONF=${elasticsearch_config} > export JAVA_HOME=${elasticsearch_java_home} > > elasticsearch_precmd() > { > /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 755 ${pidfile%/*} > /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 755 /var/db/elasticsearch > /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 755 /var/log/elasticsearch > } > > elasticsearch_console() > { > command_args="" > run_rc_command "start" > } > > if [ -n "$2" ]; then > profile="$2" > if [ "x${elasticsearch_profiles}" != "x" ]; then > eval elasticsearch_config="\${elasticsearch_${profile}_config:-}" > if [ "x${elasticsearch_config}" = "x" ]; then > echo "You must define a configuration (elasticsearch_${profile}_config)" > exit 1 > fi > export ES_PATH_CONF=${elasticsearch_config} > required_files="${elasticsearch_config}/elasticsearch.yml" > required_files="${elasticsearch_config}/jvm.options" > eval elasticsearch_enable="\${elasticsearch_${profile}_enable:-${elasticsearch_enable}}" > pidfile="${_pidprefix}.${profile}.pid" > command_args="-d --pidfile=${pidfile}" > echo "===> elasticsearch profile: ${profile}" > else > echo "$0: extra argument ignored" > fi > else > if [ "x${elasticsearch_profiles}" != "x" -a "x$1" != "x" ]; then > for profile in ${elasticsearch_profiles}; do > eval _enable="\${elasticsearch_${profile}_enable}" > case "x${_enable:-${elasticsearch_enable}}" in > x|x[Nn][Oo]|x[Nn][Oo][Nn][Ee]) > continue > ;; > x[Yy][Ee][Ss]) > ;; > *) > if test -z "$_enable"; then > _var=elasticsearch_enable > else > _var=elasticsearch_"${profile}"_enable > fi > echo "Bad value" \ > "'${_enable:-${elasticsearch_enable}}'" \ > "for ${_var}. " \ > "Profile ${profile} skipped." > continue > ;; > esac > %%PREFIX%%/etc/rc.d/elasticsearch $1 ${profile} > retcode="$?" > if [ "0${retcode}" -ne 0 ]; then > failed="${profile} (${retcode}) ${failed:-}" > else > success="${profile} ${success:-}" > fi > done > exit 0 > fi > fi > > if [ "x${elasticsearch_mem_min}" != "x" ]; then >- echo "The elasticsearch_mem_min variable is no longer supported please set this in %%PREFIX%%/etc/jvm.options" >+ echo "The elasticsearch_mem_min variable is no longer supported please set this in ${elasticsearch_config}/jvm.options" > exit 1; > fi > if [ "x${elasticsearch_mem_max}" != "x" ]; then >- echo "The elasticsearch_mem_max variable is no longer supported please set this in %%PREFIX%%/etc/jvm.options" >+ echo "The elasticsearch_mem_max variable is no longer supported please set this in ${elasticsearch_config}/jvm.options" > exit 1; > fi > if [ "x${elasticsearch_props}" != "x" ]; then >- echo "The elasticsearch_props variable is no longer supported please set this in %%PREFIX%%/etc/jvm.options" >+ echo "The elasticsearch_props variable is no longer supported please set this in ${elasticsearch_config}/jvm.options" > exit 1; > fi > > run_rc_command "$1"
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=219475">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Flags:
otis
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 250969
: 219475