From owner-svn-ports-all@freebsd.org Wed Mar 14 22:50:29 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F2E14F4F86A; Wed, 14 Mar 2018 22:50:28 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A66CF7AECF; Wed, 14 Mar 2018 22:50:28 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9CD8C5FE2; Wed, 14 Mar 2018 22:50:28 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2EMoSqC030356; Wed, 14 Mar 2018 22:50:28 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2EMoRjY030350; Wed, 14 Mar 2018 22:50:27 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201803142250.w2EMoRjY030350@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Wed, 14 Mar 2018 22:50:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464536 - in head/sysutils/logstash6: . files X-SVN-Group: ports-head X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in head/sysutils/logstash6: . files X-SVN-Commit-Revision: 464536 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 22:50:29 -0000 Author: feld Date: Wed Mar 14 22:50:27 2018 New Revision: 464536 URL: https://svnweb.freebsd.org/changeset/ports/464536 Log: sysutils/logstash6: Fix ability to install plugins - Backport fix for plugin *updates* that upstream hasn't released yet - Fix an expr syntax error which was really from upstream jruby; logstash doesn't ship with a new enough jruby that includes this fix yet Added: head/sysutils/logstash6/files/patch-Gemfile (contents, props changed) head/sysutils/logstash6/files/patch-Gemfile.lock (contents, props changed) head/sysutils/logstash6/files/patch-vendor_jruby_bin_jruby (contents, props changed) head/sysutils/logstash6/files/patch-vendor_jruby_bin_jruby.bash (contents, props changed) head/sysutils/logstash6/files/patch-vendor_jruby_bin_jruby.sh (contents, props changed) Modified: head/sysutils/logstash6/Makefile Modified: head/sysutils/logstash6/Makefile ============================================================================== --- head/sysutils/logstash6/Makefile Wed Mar 14 22:41:11 2018 (r464535) +++ head/sysutils/logstash6/Makefile Wed Mar 14 22:50:27 2018 (r464536) @@ -3,7 +3,7 @@ PORTNAME= logstash PORTVERSION= 6.2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils java MASTER_SITES= http://artifacts.elastic.co/downloads/logstash/ PKGNAMESUFFIX= 6 @@ -18,7 +18,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash CONFLICTS= logstash-[0-9]* logstash5-[0-9]* USES= cpe shebangfix -SHEBANG_FILES= bin/logstash +SHEBANG_FILES= bin/* CPE_VENDOR= elasticsearch USE_JAVA= yes JAVA_VERSION= 1.8+ @@ -34,7 +34,6 @@ LOGSTASH_HOME?= ${PREFIX}/${PORTNAME} SUB_LIST= JAVA_HOME=${JAVA_HOME} \ LOGSTASH_HOME=${LOGSTASH_HOME} -LOGSTASH_BIN_FILES= logstash LOGSTASH_CONF_FILES= jvm.options log4j2.properties logstash.yml pipelines.yml LOGSTASH_JRUBY_SUBDIR= vendor/jruby/bin LOGSTASH_JRUBY_BIN_FILES= ast irb jirb jruby jruby.sh rdoc testrb gem \ @@ -42,22 +41,22 @@ LOGSTASH_JRUBY_BIN_FILES= ast irb jirb jruby jruby.sh post-patch: ${REINPLACE_CMD} 's|%%ETCDIR%%|${ETCDIR}|g' ${WRKSRC}/config/logstash.yml + ${FIND} ${WRKSRC} -name '*.orig' -delete do-install: - @${FIND} ${WRKSRC} -name '*.bat' -delete + ${FIND} ${WRKSRC} -name '*.bat' -delete ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${FILESDIR}/logstash.conf.sample ${STAGEDIR}${ETCDIR} .for x in ${LOGSTASH_CONF_FILES} ${INSTALL_DATA} ${WRKSRC}/config/${x} ${STAGEDIR}${ETCDIR}/${x}.sample .endfor ${RM} -rf ${WRKSRC}/config - @(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${LOGSTASH_DIR}) -.for x in ${LOGSTASH_BIN_FILES} - @${CHMOD} ${BINMODE} ${STAGEDIR}${LOGSTASH_DIR}/bin/${x} -.endfor + (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${LOGSTASH_DIR}) + ${CHMOD} ${BINMODE} ${STAGEDIR}${LOGSTASH_DIR}/bin/* .for x in ${LOGSTASH_JRUBY_BIN_FILES} - @${CHMOD} ${BINMODE} ${STAGEDIR}${LOGSTASH_DIR}/${LOGSTASH_JRUBY_SUBDIR}/${x} + ${CHMOD} ${BINMODE} ${STAGEDIR}${LOGSTASH_DIR}/${LOGSTASH_JRUBY_SUBDIR}/${x} .endfor + ${INSTALL} -lrs ${STAGEDIR}${ETCDIR} ${STAGEDIR}${LOGSTASH_DIR}/config post-install: ${ECHO} "@sample ${ETCDIR}/logstash.conf.sample" >> ${TMPPLIST} Added: head/sysutils/logstash6/files/patch-Gemfile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/logstash6/files/patch-Gemfile Wed Mar 14 22:50:27 2018 (r464536) @@ -0,0 +1,10 @@ +--- Gemfile.orig 2018-03-14 22:38:33 UTC ++++ Gemfile +@@ -4,6 +4,7 @@ + source "https://rubygems.org" + gem "logstash-core", :path => "./logstash-core" + gem "logstash-core-plugin-api", :path => "./logstash-core-plugin-api" ++gem "atomic", "<= 1.1.99" + gem "paquet", "~> 0.2.0" + gem "ruby-progressbar", "~> 1.8.1" + gem "builder", "~> 3.2.2" Added: head/sysutils/logstash6/files/patch-Gemfile.lock ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/logstash6/files/patch-Gemfile.lock Wed Mar 14 22:50:27 2018 (r464536) @@ -0,0 +1,10 @@ +--- Gemfile.lock.orig 2018-03-14 22:30:17 UTC ++++ Gemfile.lock +@@ -604,6 +604,7 @@ PLATFORMS + java + + DEPENDENCIES ++ atomic (<= 1.1.99) + benchmark-ips + builder (~> 3.2.2) + ci_reporter_rspec (= 1.0.0) Added: head/sysutils/logstash6/files/patch-vendor_jruby_bin_jruby ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/logstash6/files/patch-vendor_jruby_bin_jruby Wed Mar 14 22:50:27 2018 (r464536) @@ -0,0 +1,11 @@ +--- vendor/jruby/bin/jruby.orig 2018-02-16 20:50:22 UTC ++++ vendor/jruby/bin/jruby +@@ -244,7 +244,7 @@ do + # Match -Xa.b.c=d to translate to -Da.b.c=d as a java option + -X*) + val=${1:2} +- if expr "$val" : '.*[.]' > /dev/null; then ++ if expr -- "$val" : '.*[.]' > /dev/null; then + java_args=("${java_args[@]}" "-Djruby.${val}") + else + ruby_args=("${ruby_args[@]}" "-X${val}") Added: head/sysutils/logstash6/files/patch-vendor_jruby_bin_jruby.bash ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/logstash6/files/patch-vendor_jruby_bin_jruby.bash Wed Mar 14 22:50:27 2018 (r464536) @@ -0,0 +1,11 @@ +--- vendor/jruby/bin/jruby.bash.orig 2018-02-16 20:50:22 UTC ++++ vendor/jruby/bin/jruby.bash +@@ -244,7 +244,7 @@ do + # Match -Xa.b.c=d to translate to -Da.b.c=d as a java option + -X*) + val=${1:2} +- if expr "$val" : '.*[.]' > /dev/null; then ++ if expr -- "$val" : '.*[.]' > /dev/null; then + java_args=("${java_args[@]}" "-Djruby.${val}") + else + ruby_args=("${ruby_args[@]}" "-X${val}") Added: head/sysutils/logstash6/files/patch-vendor_jruby_bin_jruby.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/logstash6/files/patch-vendor_jruby_bin_jruby.sh Wed Mar 14 22:50:27 2018 (r464536) @@ -0,0 +1,24 @@ +--- vendor/jruby/bin/jruby.sh.orig 2018-02-16 20:50:22 UTC ++++ vendor/jruby/bin/jruby.sh +@@ -26,9 +26,9 @@ progname=`basename "$0"` + + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` +- link=`expr "$ls" : '.*-> \(.*\)$'` +- if expr "$link" : '.*/.*' > /dev/null; then +- if expr "$link" : '/' > /dev/null; then ++ link=`expr -- "$ls" : '.*-> \(.*\)$'` ++ if expr -- "$link" : '.*/.*' > /dev/null; then ++ if expr -- "$link" : '/' > /dev/null; then + PRG="$link" + else + PRG="`dirname ${PRG}`/${link}" +@@ -202,7 +202,7 @@ do + # Match -Xa.b.c=d to translate to -Da.b.c=d as a java option + -X*) + val=${1:2} +- if expr "$val" : '.*[.]' > /dev/null; then ++ if expr -- "$val" : '.*[.]' > /dev/null; then + java_args="${java_args} -Djruby.${val}" + else + ruby_args="${ruby_args} -X${val}"