[arch-commits] Commit in logstash/repos/community-x86_64 (15 files)
Massimiliano Torromeo
mtorromeo at gemini.archlinux.org
Sun Dec 12 16:09:01 UTC 2021
Date: Sunday, December 12, 2021 @ 16:09:01
Author: mtorromeo
Revision: 1069149
archrelease: copy trunk to community-x86_64
Added:
logstash/repos/community-x86_64/PKGBUILD
(from rev 1069148, logstash/trunk/PKGBUILD)
logstash/repos/community-x86_64/build.patch
(from rev 1069148, logstash/trunk/build.patch)
logstash/repos/community-x86_64/bundle.config
(from rev 1069148, logstash/trunk/bundle.config)
logstash/repos/community-x86_64/log4j.patch
(from rev 1069148, logstash/trunk/log4j.patch)
logstash/repos/community-x86_64/logstash-sysuser.conf
(from rev 1069148, logstash/trunk/logstash-sysuser.conf)
logstash/repos/community-x86_64/logstash-tmpfile.conf
(from rev 1069148, logstash/trunk/logstash-tmpfile.conf)
logstash/repos/community-x86_64/logstash.service
(from rev 1069148, logstash/trunk/logstash.service)
logstash/repos/community-x86_64/logstash at .service
(from rev 1069148, logstash/trunk/logstash at .service)
Deleted:
logstash/repos/community-x86_64/PKGBUILD
logstash/repos/community-x86_64/build.patch
logstash/repos/community-x86_64/bundle.config
logstash/repos/community-x86_64/logstash-sysuser.conf
logstash/repos/community-x86_64/logstash-tmpfile.conf
logstash/repos/community-x86_64/logstash.service
logstash/repos/community-x86_64/logstash at .service
-----------------------+
PKGBUILD | 226 ++++++++++++++++++++++++------------------------
build.patch | 144 +++++++++++++++---------------
bundle.config | 8 -
log4j.patch | 40 ++++++++
logstash-sysuser.conf | 2
logstash-tmpfile.conf | 12 +-
logstash.service | 46 ++++-----
logstash at .service | 14 +-
8 files changed, 268 insertions(+), 224 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-12-12 16:08:33 UTC (rev 1069148)
+++ PKGBUILD 2021-12-12 16:09:01 UTC (rev 1069149)
@@ -1,111 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
-
-pkgname=logstash
-pkgver=7.10.1
-_jrubyver=9.2.13.0
-pkgrel=1
-pkgdesc='Tool for managing events and logs'
-url='https://www.elastic.co/products/logstash/'
-arch=('x86_64')
-license=('Apache')
-depends=('java-runtime-headless>=8' 'ruby' 'ruby-bundler' 'coreutils' 'awk')
-makedepends=('java-environment<=14' 'git')
-backup=('etc/conf.d/logstash'
- 'etc/logstash/jvm.options'
- 'etc/logstash/log4j2.properties'
- 'etc/logstash/logstash.yml'
- 'etc/logstash/pipelines.yml')
-_jrubydist=jruby-dist-${_jrubyver}-bin.tar.gz
-source=(https://github.com/elastic/logstash/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz
- https://repo1.maven.org/maven2/org/jruby/jruby-dist/${_jrubyver}/${_jrubydist}
- build.patch
- logstash.service
- logstash at .service
- logstash-sysuser.conf
- logstash-tmpfile.conf
- bundle.config)
-noextract=(${_jrubydist})
-sha256sums=('9f4732d3c324d27ed348060eccf38840ec74f6baf155ef5f7347346b714a1c58'
- '73a8c241a162e644c87e864c3485c55adedeb82a6fd80fa3cb538fdacda7af58'
- '9ae56b463b465f16363f60670c7da4e84a9bf03c17324c4364c089d7a480cb4b'
- '2b8b29297202334c784fdd7f2eb8d7e776c24c783b3c9f8387b500ab0039335c'
- 'a01ea29d4f53d785f6eb926ebfe445e64ed5b3dab5d0418848589dd79502d876'
- '18a68a59ddb0ce19778e83b65e68dd568d65b7180bf45b4cf298fb332d69eb26'
- '346b630484f8a35b1a549e94e53e3e151527852a29c72cc6e529221215a7f533'
- 'fe05315345e4489458c3eecac43726800109c1e390e74a14584096f6c041fee1')
-sha512sums=('346c707fd60b82b414759b0f78d2e3c603e8341ae652940d37a0bc263ac313352033e8cfeb6727aa7275b2f5393d9aeb129fee0120d3b475059071ead329e1fa'
- '2cba016ad6a376252083122d51335610209d860c41de1902f5cd49ffc2f6b49c350b68df8fc4113c221255af4db7ec07980267b9888369811faf66db369e757c'
- 'f6ddf9cc70a2c0cabaacf39fa26953c15af0060711713b2de69caddd2b8f845edde535f002cd7a0d0f8fc01abf934d887278fb6617b2a3d640284bc16ea34927'
- '817097565519dc7c5eac7521339947c74c6148683ca594356dd2ceb3274a1e94f8e7318ce310e0fe5789d7ab0d4c23404f814bef31036a11ddfec08d16814c69'
- 'ce2cef4a784845b00d7c867273555811450bc459669abb5be944bfbbb02708129983e45376a9b308d6db22b2c7b4a7a212827a4826f2a27bc7e143cebc9abfe0'
- 'd811dc3b18d0032b79b4669c9f6aefca49963897c309d83cbf87616c7b8cb5944c17c8072980bcd115d0fb57ef1624d98259ff1082d402d308c33e766ee89699'
- '05ea8af97c4f6ac9ba5518b99dc3136859edd24d8376940b48b8c7a70586c8bc188deb1079a99e19d437c39e0eb17d68e7cc3f9af4aa3ad2bc6a87c08cae94a6'
- '5091aa34cc31acd50fd2865714080cf6e67c2d437424f27e001bb409c2885a0e82eabe4ce17461d60c181f460a16df0a03d53bac6015fb731b3e5225735fd4da')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- rm bin/*.bat
- sed -e 's|LS_SETTINGS_DIR=.*|LS_SETTINGS_DIR="/etc/logstash"|' -i config/startup.options
- sed -e '1i [ -f /etc/profile.d/jre.sh ] && . /etc/profile.d/jre.sh' -i bin/logstash.lib.sh
-
- # remove deprecated JVM options
- sed 's|"-XX:+UseParNewGC", ||g' -i logstash-core/benchmarks/build.gradle
- sed 's|-XX:+UseParNewGC||g' -i config/jvm.options
-
- # patch -p1 -i "$srcdir"/build.patch
-
- # Use system gradle (currently not working)
- # sed 's;./gradlew;gradle;g' -i rakelib/*.rake
-
- # Skip downloadAndInstallJRuby task in the bootstrap process
- sed /downloadAndInstallJRuby/d -i rakelib/vendor.rake
-
- mkdir -p vendor/_/
- cd vendor/_/
- ln -s "$srcdir"/${_jrubydist}
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- export PATH="/usr/lib/jvm/java-10-openjdk/bin:$PWD/vendor/jruby/bin:$PATH"
-
- # gradle -x :logstash-core:javadoc bootstrap (system gradle currently not working)
- RELEASE=1 OSS=1 ./gradlew -x :logstash-core:javadoc installDefaultGems
-
- rm -r build ci logstash-core/{build,src,spec} qa pkg spec rakelib tools .gradle \
- vendor/_ vendor/bundle/jruby/*/cache vendor/jruby/lib/ruby/gems/shared/cache
-
- cd vendor/jruby/lib
- mv jni jni-temp
- mkdir jni
- mv jni-temp/x86_64-Linux jni/
- rm -rf jni-temp
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- install -dm 755 "${pkgdir}/usr/share/logstash" "${pkgdir}/etc/conf.d"
- mv config/startup.options "${pkgdir}/etc/conf.d/logstash"
- mv config "${pkgdir}/etc/logstash"
- chmod 750 "${pkgdir}/etc/logstash"
-
- cp -a bin data lib logstash* modules vendor Gemfile* "${pkgdir}/usr/share/logstash"
- rm -rf "${pkgdir}/usr/share/logstash/logstash-core/"{.lock,benchmarks,*gradle*}
- chmod -R go-w "${pkgdir}/usr/share/logstash/"
-
- install -Dm 644 "${srcdir}"/{logstash.service,logstash at .service} -t "${pkgdir}/usr/lib/systemd/system"
- install -Dm 644 "${srcdir}/logstash-sysuser.conf" "${pkgdir}/usr/lib/sysusers.d/logstash.conf"
- install -Dm 644 "${srcdir}/logstash-tmpfile.conf" "${pkgdir}/usr/lib/tmpfiles.d/logstash.conf"
- install -Dm 644 "${srcdir}/bundle.config" "${pkgdir}/usr/share/logstash/.bundle/config"
-
- install -dm 755 "${pkgdir}/var/lib/logstash"
- install -dm 755 "${pkgdir}/var/log/logstash"
- install -dm 755 "${pkgdir}/etc/logstash/conf.d"
-
- install -d "${pkgdir}/usr/bin"
- ln -s /usr/share/logstash/bin/logstash "${pkgdir}/usr/bin/logstash"
-}
-
-# vim: ts=2 sw=2 et:
Copied: logstash/repos/community-x86_64/PKGBUILD (from rev 1069148, logstash/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-12-12 16:09:01 UTC (rev 1069149)
@@ -0,0 +1,115 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+
+pkgname=logstash
+pkgver=7.10.2
+_jrubyver=9.2.13.0
+pkgrel=1
+pkgdesc='Tool for managing events and logs'
+url='https://www.elastic.co/products/logstash/'
+arch=('x86_64')
+license=('Apache')
+depends=('java-runtime-headless>=8' 'ruby' 'ruby-bundler' 'coreutils' 'awk')
+makedepends=('jdk11-openjdk' 'git')
+backup=('etc/conf.d/logstash'
+ 'etc/logstash/jvm.options'
+ 'etc/logstash/log4j2.properties'
+ 'etc/logstash/logstash.yml'
+ 'etc/logstash/pipelines.yml')
+_jrubydist=jruby-dist-${_jrubyver}-bin.tar.gz
+source=(https://github.com/elastic/logstash/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz
+ https://repo1.maven.org/maven2/org/jruby/jruby-dist/${_jrubyver}/${_jrubydist}
+ build.patch
+ log4j.patch
+ logstash.service
+ logstash at .service
+ logstash-sysuser.conf
+ logstash-tmpfile.conf
+ bundle.config)
+noextract=(${_jrubydist})
+sha256sums=('52288699c9e14453e8655ac940c1d0ee51c8956f4b6356502b67c62abf228429'
+ '73a8c241a162e644c87e864c3485c55adedeb82a6fd80fa3cb538fdacda7af58'
+ '9ae56b463b465f16363f60670c7da4e84a9bf03c17324c4364c089d7a480cb4b'
+ '5e52cf3a4372c77dfcb1c5f48160f7a6da5d2f5fc9c84b22b63f91bef85c01dd'
+ '2b8b29297202334c784fdd7f2eb8d7e776c24c783b3c9f8387b500ab0039335c'
+ 'a01ea29d4f53d785f6eb926ebfe445e64ed5b3dab5d0418848589dd79502d876'
+ '18a68a59ddb0ce19778e83b65e68dd568d65b7180bf45b4cf298fb332d69eb26'
+ '346b630484f8a35b1a549e94e53e3e151527852a29c72cc6e529221215a7f533'
+ 'fe05315345e4489458c3eecac43726800109c1e390e74a14584096f6c041fee1')
+sha512sums=('0163dc6d0a4efda4b1e075e63145029931df73dc7633c2601b45cebe10978bcf6972fa46341aa1c12ce949ed193e80d6d33937b791c5c75ff9fd155cf6c7ace2'
+ '2cba016ad6a376252083122d51335610209d860c41de1902f5cd49ffc2f6b49c350b68df8fc4113c221255af4db7ec07980267b9888369811faf66db369e757c'
+ 'f6ddf9cc70a2c0cabaacf39fa26953c15af0060711713b2de69caddd2b8f845edde535f002cd7a0d0f8fc01abf934d887278fb6617b2a3d640284bc16ea34927'
+ 'fb166705f9e26e47c9b9219fcd814fef5cd602ad936600973132ad2c869a4091d727d5a76c2322ce5c871ac550478df0d502b2291fd54f04b9a32059ab6ea5b6'
+ '817097565519dc7c5eac7521339947c74c6148683ca594356dd2ceb3274a1e94f8e7318ce310e0fe5789d7ab0d4c23404f814bef31036a11ddfec08d16814c69'
+ 'ce2cef4a784845b00d7c867273555811450bc459669abb5be944bfbbb02708129983e45376a9b308d6db22b2c7b4a7a212827a4826f2a27bc7e143cebc9abfe0'
+ 'd811dc3b18d0032b79b4669c9f6aefca49963897c309d83cbf87616c7b8cb5944c17c8072980bcd115d0fb57ef1624d98259ff1082d402d308c33e766ee89699'
+ '05ea8af97c4f6ac9ba5518b99dc3136859edd24d8376940b48b8c7a70586c8bc188deb1079a99e19d437c39e0eb17d68e7cc3f9af4aa3ad2bc6a87c08cae94a6'
+ '5091aa34cc31acd50fd2865714080cf6e67c2d437424f27e001bb409c2885a0e82eabe4ce17461d60c181f460a16df0a03d53bac6015fb731b3e5225735fd4da')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ rm bin/*.bat
+ sed -e 's|LS_SETTINGS_DIR=.*|LS_SETTINGS_DIR="/etc/logstash"|' -i config/startup.options
+ sed -e '1i [ -f /etc/profile.d/jre.sh ] && . /etc/profile.d/jre.sh' -i bin/logstash.lib.sh
+
+ # remove deprecated JVM options
+ sed 's|"-XX:+UseParNewGC", ||g' -i logstash-core/benchmarks/build.gradle
+ sed 's|-XX:+UseParNewGC||g' -i config/jvm.options
+
+ # patch -p1 -i "$srcdir"/build.patch
+ patch -p1 -i "$srcdir"/log4j.patch
+
+ # Use system gradle (currently not working)
+ # sed 's;./gradlew;gradle;g' -i rakelib/*.rake
+
+ # Skip downloadAndInstallJRuby task in the bootstrap process
+ sed /downloadAndInstallJRuby/d -i rakelib/vendor.rake
+
+ mkdir -p vendor/_/
+ cd vendor/_/
+ ln -s "$srcdir"/${_jrubydist}
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ export PATH="/usr/lib/jvm/java-11-openjdk/bin:$PWD/vendor/jruby/bin:$PATH"
+
+ # gradle -x :logstash-core:javadoc bootstrap (system gradle currently not working)
+ RELEASE=1 OSS=1 ./gradlew -x :logstash-core:javadoc installDefaultGems
+
+ rm -r build ci logstash-core/{build,src,spec} qa pkg spec rakelib tools .gradle \
+ vendor/_ vendor/bundle/jruby/*/cache vendor/jruby/lib/ruby/gems/shared/cache
+
+ cd vendor/jruby/lib
+ mv jni jni-temp
+ mkdir jni
+ mv jni-temp/x86_64-Linux jni/
+ rm -rf jni-temp
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+
+ install -dm 755 "${pkgdir}/usr/share/logstash" "${pkgdir}/etc/conf.d"
+ mv config/startup.options "${pkgdir}/etc/conf.d/logstash"
+ mv config "${pkgdir}/etc/logstash"
+ chmod 750 "${pkgdir}/etc/logstash"
+
+ cp -a bin data lib logstash* modules vendor Gemfile* "${pkgdir}/usr/share/logstash"
+ rm -rf "${pkgdir}/usr/share/logstash/logstash-core/"{.lock,benchmarks,*gradle*}
+ chmod -R go-w "${pkgdir}/usr/share/logstash/"
+
+ install -Dm 644 "${srcdir}"/{logstash.service,logstash at .service} -t "${pkgdir}/usr/lib/systemd/system"
+ install -Dm 644 "${srcdir}/logstash-sysuser.conf" "${pkgdir}/usr/lib/sysusers.d/logstash.conf"
+ install -Dm 644 "${srcdir}/logstash-tmpfile.conf" "${pkgdir}/usr/lib/tmpfiles.d/logstash.conf"
+ install -Dm 644 "${srcdir}/bundle.config" "${pkgdir}/usr/share/logstash/.bundle/config"
+
+ install -dm 755 "${pkgdir}/var/lib/logstash"
+ install -dm 755 "${pkgdir}/var/log/logstash"
+ install -dm 755 "${pkgdir}/etc/logstash/conf.d"
+
+ install -d "${pkgdir}/usr/bin"
+ ln -s /usr/share/logstash/bin/logstash "${pkgdir}/usr/bin/logstash"
+}
+
+# vim: ts=2 sw=2 et:
Deleted: build.patch
===================================================================
--- build.patch 2021-12-12 16:08:33 UTC (rev 1069148)
+++ build.patch 2021-12-12 16:09:01 UTC (rev 1069149)
@@ -1,72 +0,0 @@
-diff --git a/build.gradle b/build.gradle
-index 5b2275e..67312d6 100644
---- a/build.gradle
-+++ b/build.gradle
-@@ -111,7 +111,6 @@ def isReleaseBuild = System.getenv('RELEASE') == "1" || versionQualifier
- clean {
- delete "${projectDir}/Gemfile"
- delete "${projectDir}/Gemfile.lock"
-- delete "${projectDir}/vendor"
- delete "${projectDir}/.bundle"
- delete "${projectDir}/qa/integration/Gemfile.lock"
- delete "${projectDir}/qa/integration/.bundle"
-@@ -346,7 +345,7 @@ task downloadEs(type: Download) {
- // in the normal PR type builds it is plain '7.0.0'
- // in the build invoked by the release manager it is '7.0.0-alpha1' etc.
- // the artifacts-api will return JSON like this: `{"versions":["5.6.13-SNAPSHOT","6.4.3-SNAPSHOT","6.5.0-SNAPSHOT","6.6.0-SNAPSHOT","7.0.0-alpha1-SNAPSHOT"]}`
--
-+
- String qualifiedVersion = dlVersions['versions'].grep(isReleaseBuild ? ~/^${version}$/ : ~/^${version}-SNAPSHOT/)[0]
-
- if (qualifiedVersion == null) {
-diff --git a/rubyUtils.gradle b/rubyUtils.gradle
-index 6f0eec4..08a35f6 100644
---- a/rubyUtils.gradle
-+++ b/rubyUtils.gradle
-@@ -190,7 +190,7 @@ task downloadJRuby(type: Download) {
-
- downloadJRuby.onlyIf { customJRubyDir == "" }
-
--task verifyFile(dependsOn: downloadJRuby, type: Verify) {
-+task verifyFile(type: Verify) {
- description "Verify the SHA1 of the download JRuby artifact"
- inputs.file(jrubyTarPath)
- outputs.file(jrubyTarPath)
-@@ -202,36 +202,7 @@ task verifyFile(dependsOn: downloadJRuby, type: Verify) {
- verifyFile.onlyIf { customJRubyDir == "" }
- verifyFile.onlyIf { doChecksum }
-
--task buildCustomJRuby(type: Exec) {
-- description "Build tar.gz and .jar artifacts from JRuby source directory"
-- workingDir (customJRubyDir == "" ? "./" : customJRubyDir)
-- commandLine './mvnw', 'clean', 'install', '-Pdist', '-Pcomplete'
-- standardOutput = new ByteArrayOutputStream()
-- errorOutput = new ByteArrayOutputStream()
-- ext.output = {
-- standardOutput.toString() + errorOutput.toString()
-- }
--}
--
--buildCustomJRuby.onlyIf { customJRubyDir != "" }
--
--task installCustomJRuby(dependsOn: buildCustomJRuby, type: Copy) {
-- description "Install custom built JRuby in the vendor directory"
-- inputs.file(customJRubyTar)
-- outputs.dir("${projectDir}/vendor/jruby")
-- from tarTree(customJRubyTar == "" ? jrubyTarPath : customJRubyTar)
-- eachFile { f ->
-- f.path = f.path.replaceFirst("^jruby-${customJRubyVersion}", '')
-- }
-- exclude "**/stdlib/rdoc/**"
-- includeEmptyDirs = false
-- into "${projectDir}/vendor/jruby"
--}
--
--installCustomJRuby.onlyIf { customJRubyDir != "" }
--
--
--task downloadAndInstallJRuby(dependsOn: [verifyFile, installCustomJRuby], type: Copy) {
-+task downloadAndInstallJRuby(dependsOn: [verifyFile], type: Copy) {
- description "Install JRuby in the vendor directory"
- inputs.file(jrubyTarPath)
- outputs.dir("${projectDir}/vendor/jruby")
Copied: logstash/repos/community-x86_64/build.patch (from rev 1069148, logstash/trunk/build.patch)
===================================================================
--- build.patch (rev 0)
+++ build.patch 2021-12-12 16:09:01 UTC (rev 1069149)
@@ -0,0 +1,72 @@
+diff --git a/build.gradle b/build.gradle
+index 5b2275e..67312d6 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -111,7 +111,6 @@ def isReleaseBuild = System.getenv('RELEASE') == "1" || versionQualifier
+ clean {
+ delete "${projectDir}/Gemfile"
+ delete "${projectDir}/Gemfile.lock"
+- delete "${projectDir}/vendor"
+ delete "${projectDir}/.bundle"
+ delete "${projectDir}/qa/integration/Gemfile.lock"
+ delete "${projectDir}/qa/integration/.bundle"
+@@ -346,7 +345,7 @@ task downloadEs(type: Download) {
+ // in the normal PR type builds it is plain '7.0.0'
+ // in the build invoked by the release manager it is '7.0.0-alpha1' etc.
+ // the artifacts-api will return JSON like this: `{"versions":["5.6.13-SNAPSHOT","6.4.3-SNAPSHOT","6.5.0-SNAPSHOT","6.6.0-SNAPSHOT","7.0.0-alpha1-SNAPSHOT"]}`
+-
++
+ String qualifiedVersion = dlVersions['versions'].grep(isReleaseBuild ? ~/^${version}$/ : ~/^${version}-SNAPSHOT/)[0]
+
+ if (qualifiedVersion == null) {
+diff --git a/rubyUtils.gradle b/rubyUtils.gradle
+index 6f0eec4..08a35f6 100644
+--- a/rubyUtils.gradle
++++ b/rubyUtils.gradle
+@@ -190,7 +190,7 @@ task downloadJRuby(type: Download) {
+
+ downloadJRuby.onlyIf { customJRubyDir == "" }
+
+-task verifyFile(dependsOn: downloadJRuby, type: Verify) {
++task verifyFile(type: Verify) {
+ description "Verify the SHA1 of the download JRuby artifact"
+ inputs.file(jrubyTarPath)
+ outputs.file(jrubyTarPath)
+@@ -202,36 +202,7 @@ task verifyFile(dependsOn: downloadJRuby, type: Verify) {
+ verifyFile.onlyIf { customJRubyDir == "" }
+ verifyFile.onlyIf { doChecksum }
+
+-task buildCustomJRuby(type: Exec) {
+- description "Build tar.gz and .jar artifacts from JRuby source directory"
+- workingDir (customJRubyDir == "" ? "./" : customJRubyDir)
+- commandLine './mvnw', 'clean', 'install', '-Pdist', '-Pcomplete'
+- standardOutput = new ByteArrayOutputStream()
+- errorOutput = new ByteArrayOutputStream()
+- ext.output = {
+- standardOutput.toString() + errorOutput.toString()
+- }
+-}
+-
+-buildCustomJRuby.onlyIf { customJRubyDir != "" }
+-
+-task installCustomJRuby(dependsOn: buildCustomJRuby, type: Copy) {
+- description "Install custom built JRuby in the vendor directory"
+- inputs.file(customJRubyTar)
+- outputs.dir("${projectDir}/vendor/jruby")
+- from tarTree(customJRubyTar == "" ? jrubyTarPath : customJRubyTar)
+- eachFile { f ->
+- f.path = f.path.replaceFirst("^jruby-${customJRubyVersion}", '')
+- }
+- exclude "**/stdlib/rdoc/**"
+- includeEmptyDirs = false
+- into "${projectDir}/vendor/jruby"
+-}
+-
+-installCustomJRuby.onlyIf { customJRubyDir != "" }
+-
+-
+-task downloadAndInstallJRuby(dependsOn: [verifyFile, installCustomJRuby], type: Copy) {
++task downloadAndInstallJRuby(dependsOn: [verifyFile], type: Copy) {
+ description "Install JRuby in the vendor directory"
+ inputs.file(jrubyTarPath)
+ outputs.dir("${projectDir}/vendor/jruby")
Deleted: bundle.config
===================================================================
--- bundle.config 2021-12-12 16:08:33 UTC (rev 1069148)
+++ bundle.config 2021-12-12 16:09:01 UTC (rev 1069149)
@@ -1,4 +0,0 @@
----
-BUNDLE_PATH: /usr/share/logstash/vendor/bundle
-BUNDLE_WITHOUT: build:development
-BUNDLE_GEMFILE: /usr/share/logstash/Gemfile
Copied: logstash/repos/community-x86_64/bundle.config (from rev 1069148, logstash/trunk/bundle.config)
===================================================================
--- bundle.config (rev 0)
+++ bundle.config 2021-12-12 16:09:01 UTC (rev 1069149)
@@ -0,0 +1,4 @@
+---
+BUNDLE_PATH: /usr/share/logstash/vendor/bundle
+BUNDLE_WITHOUT: build:development
+BUNDLE_GEMFILE: /usr/share/logstash/Gemfile
Copied: logstash/repos/community-x86_64/log4j.patch (from rev 1069148, logstash/trunk/log4j.patch)
===================================================================
--- log4j.patch (rev 0)
+++ log4j.patch 2021-12-12 16:09:01 UTC (rev 1069149)
@@ -0,0 +1,40 @@
+diff --git a/logstash-core/build.gradle b/logstash-core/build.gradle
+index 5c837b2..703538e 100644
+--- a/logstash-core/build.gradle
++++ b/logstash-core/build.gradle
+@@ -30,6 +30,8 @@ String jrubyVersion = versionMap['jruby']['version']
+ String jacksonVersion = versionMap['jackson']
+ String jacksonDatabindVersion = versionMap['jackson-databind']
+
++String log4jVersion = '2.15.0'
++
+ repositories {
+ mavenCentral()
+ }
+@@ -153,12 +155,12 @@ def customJRubyDir = project.hasProperty("custom.jruby.path") ? project.property
+ def customJRubyVersion = customJRubyDir == "" ? "" : Files.readAllLines(Paths.get(customJRubyDir, "VERSION")).get(0).trim()
+
+ dependencies {
+- implementation 'org.apache.logging.log4j:log4j-api:2.13.3'
+- annotationProcessor 'org.apache.logging.log4j:log4j-core:2.13.3'
+- api 'org.apache.logging.log4j:log4j-core:2.13.3'
+- runtimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl:2.13.3'
++ implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}"
++ annotationProcessor "org.apache.logging.log4j:log4j-core:${log4jVersion}"
++ api "org.apache.logging.log4j:log4j-core:${log4jVersion}"
++ runtimeOnly "org.apache.logging.log4j:log4j-slf4j-impl:${log4jVersion}"
+ // concerns libraries such as manticore's http-client 4.5 (using commons-logging)
+- runtimeOnly 'org.apache.logging.log4j:log4j-jcl:2.13.3'
++ runtimeOnly "org.apache.logging.log4j:log4j-jcl:${log4jVersion}"
+ // for the log4j-jcl bridge to work commons-logging needs to be on the same class-path
+ runtimeOnly 'commons-logging:commons-logging:1.2'
+ implementation('org.reflections:reflections:0.9.11') {
+@@ -184,7 +186,7 @@ dependencies {
+ exclude group: 'com.google.guava', module: 'guava'
+ }
+ implementation 'org.javassist:javassist:3.26.0-GA'
+- testImplementation 'org.apache.logging.log4j:log4j-core:2.13.3:tests'
++ testImplementation "org.apache.logging.log4j:log4j-core:${log4jVersion}:tests"
+ testImplementation 'junit:junit:4.12'
+ testImplementation 'net.javacrumbs.json-unit:json-unit:2.3.0'
+ testImplementation 'org.elasticsearch:securemock:1.2'
Deleted: logstash-sysuser.conf
===================================================================
--- logstash-sysuser.conf 2021-12-12 16:08:33 UTC (rev 1069148)
+++ logstash-sysuser.conf 2021-12-12 16:09:01 UTC (rev 1069149)
@@ -1 +0,0 @@
-u logstash - "Logstash user" /var/lib/logstash
Copied: logstash/repos/community-x86_64/logstash-sysuser.conf (from rev 1069148, logstash/trunk/logstash-sysuser.conf)
===================================================================
--- logstash-sysuser.conf (rev 0)
+++ logstash-sysuser.conf 2021-12-12 16:09:01 UTC (rev 1069149)
@@ -0,0 +1 @@
+u logstash - "Logstash user" /var/lib/logstash
Deleted: logstash-tmpfile.conf
===================================================================
--- logstash-tmpfile.conf 2021-12-12 16:08:33 UTC (rev 1069148)
+++ logstash-tmpfile.conf 2021-12-12 16:09:01 UTC (rev 1069149)
@@ -1,6 +0,0 @@
-d /var/log/logstash 0755 logstash logstash -
-d /var/lib/logstash 0755 logstash logstash -
-d /usr/share/logstash 0755 logstash logstash -
-Z /usr/share/logstash - logstash logstash -
-
-d /etc/logstash 0750 logstash logstash -
Copied: logstash/repos/community-x86_64/logstash-tmpfile.conf (from rev 1069148, logstash/trunk/logstash-tmpfile.conf)
===================================================================
--- logstash-tmpfile.conf (rev 0)
+++ logstash-tmpfile.conf 2021-12-12 16:09:01 UTC (rev 1069149)
@@ -0,0 +1,6 @@
+d /var/log/logstash 0755 logstash logstash -
+d /var/lib/logstash 0755 logstash logstash -
+d /usr/share/logstash 0755 logstash logstash -
+Z /usr/share/logstash - logstash logstash -
+
+d /etc/logstash 0750 logstash logstash -
Deleted: logstash.service
===================================================================
--- logstash.service 2021-12-12 16:08:33 UTC (rev 1069148)
+++ logstash.service 2021-12-12 16:09:01 UTC (rev 1069149)
@@ -1,23 +0,0 @@
-[Unit]
-Description=Logstash
-Documentation=http://www.elastic.co
-After=elasticsearch.service
-
-[Service]
-Environment=LS_HOME=/var/lib/logstash
-Environment=LS_HEAP_SIZE="500m"
-Environment=LS_CONF_DIR=/etc/logstash/conf.d
-Environment=LS_LOG_DIR=/var/log/logstash
-Environment=LS_SETTINGS_DIR=/etc/logstash
-User=logstash
-Group=logstash
-ExecStart=/usr/share/logstash/bin/logstash -f $LS_CONF_DIR --path.logs $LS_LOG_DIR --path.data $LS_HOME --path.settings $LS_SETTINGS_DIR
-StandardOutput=null
-StandardError=journal
-SuccessExitStatus=143
-LimitNOFILE=65535
-TimeoutStopSec=20
-LimitMEMLOCK=infinity
-
-[Install]
-WantedBy=multi-user.target
Copied: logstash/repos/community-x86_64/logstash.service (from rev 1069148, logstash/trunk/logstash.service)
===================================================================
--- logstash.service (rev 0)
+++ logstash.service 2021-12-12 16:09:01 UTC (rev 1069149)
@@ -0,0 +1,23 @@
+[Unit]
+Description=Logstash
+Documentation=http://www.elastic.co
+After=elasticsearch.service
+
+[Service]
+Environment=LS_HOME=/var/lib/logstash
+Environment=LS_HEAP_SIZE="500m"
+Environment=LS_CONF_DIR=/etc/logstash/conf.d
+Environment=LS_LOG_DIR=/var/log/logstash
+Environment=LS_SETTINGS_DIR=/etc/logstash
+User=logstash
+Group=logstash
+ExecStart=/usr/share/logstash/bin/logstash -f $LS_CONF_DIR --path.logs $LS_LOG_DIR --path.data $LS_HOME --path.settings $LS_SETTINGS_DIR
+StandardOutput=null
+StandardError=journal
+SuccessExitStatus=143
+LimitNOFILE=65535
+TimeoutStopSec=20
+LimitMEMLOCK=infinity
+
+[Install]
+WantedBy=multi-user.target
Deleted: logstash at .service
===================================================================
--- logstash at .service 2021-12-12 16:08:33 UTC (rev 1069148)
+++ logstash at .service 2021-12-12 16:09:01 UTC (rev 1069149)
@@ -1,7 +0,0 @@
-.include /usr/lib/systemd/system/logstash.service
-
-[Unit]
-Description=logstash (%I)
-
-[Service]
-Environment=LOGSTASH_CONF=/etc/logstash/%I.conf
Copied: logstash/repos/community-x86_64/logstash at .service (from rev 1069148, logstash/trunk/logstash at .service)
===================================================================
--- logstash at .service (rev 0)
+++ logstash at .service 2021-12-12 16:09:01 UTC (rev 1069149)
@@ -0,0 +1,7 @@
+.include /usr/lib/systemd/system/logstash.service
+
+[Unit]
+Description=logstash (%I)
+
+[Service]
+Environment=LOGSTASH_CONF=/etc/logstash/%I.conf
More information about the arch-commits
mailing list