commit: b418ef3efc844001381e04b3a7b75de3703386fe Author: Matt Jolly <kangie <AT> gentoo <DOT> org> AuthorDate: Wed Apr 16 07:52:34 2025 +0000 Commit: Matt Jolly <kangie <AT> gentoo <DOT> org> CommitDate: Wed Apr 16 07:56:59 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b418ef3e
app-misc/elasticsearch: add 8.17.4, 8.18.0, 9.0.0 >From this commit we explicitly depend on a JDK at runtime, rather than the JRE that we were previously using. While this was fine when the package was initially tested, a simultaneously installed JDK masked the fact that this no longer works, and has not for an indeterminate period. Closes: https://bugs.gentoo.org/950962 Signed-off-by: Matt Jolly <kangie <AT> gentoo.org> app-misc/elasticsearch/Manifest | 3 + app-misc/elasticsearch/elasticsearch-8.17.4.ebuild | 109 +++++++++++++++++++++ app-misc/elasticsearch/elasticsearch-8.18.0.ebuild | 109 +++++++++++++++++++++ app-misc/elasticsearch/elasticsearch-9.0.0.ebuild | 109 +++++++++++++++++++++ .../elasticsearch/files/elasticsearch-env-2.patch | 24 +++++ .../elasticsearch/files/elasticsearch-env-3.patch | 24 +++++ 6 files changed, 378 insertions(+) diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest index d0446b76a375..3bb2306c2dd8 100644 --- a/app-misc/elasticsearch/Manifest +++ b/app-misc/elasticsearch/Manifest @@ -1,3 +1,6 @@ DIST elasticsearch-7.17.25-no-jdk-linux-x86_64.tar.gz 173127285 BLAKE2B c68b7fdd84c860c04eff7aad75fadf20ab97a9baef606a1a3c9cfa195f7d39591b9a35884f180a9509bdc4a04a68bc8ceba8d9ead03c1d5b684d85597ad9eb23 SHA512 dc0c68f2ee87d6445bd28ed60e3d615eefc106b0d28f648af01cf79a639661769d958fe3da04e20e81437e4a0385e3788fe785b494ce5320fba0f074d2c1ea49 DIST elasticsearch-8.15.1-linux-x86_64.tar.gz 605974468 BLAKE2B 8fc2476cd2629cf8bcd9c2183763aba1880f76357809f661da9c3df6538bdf7bc21e897356cb4e35084ef1333120539e494893177fffe0aaa1e7ea4cc3f52fcd SHA512 3eced0f59446f60170b7ab3372f58bbda713e2166bb936ef0f74a027e579565b469d3f8888715638e6dfc3e98f88e1b73f7de8a6fc37be236ade4a099f9cc808 DIST elasticsearch-8.17.3-linux-x86_64.tar.gz 636275047 BLAKE2B 61ede1d0e51bdfcde0b9f11c3416034adc62e80d3000be2ecd239be1c1674c2df947d4940b6a4b2f2ea5a2e69a3398541cf10c2a98d40cd8dd56063c57fcf153 SHA512 6aef4fc84ebbfc98e6662418c734ea89cae8e53a8d6c1fbd5352807bc427e040e62be568b502abdceb7a2f57534eae60e31712d0583d3752fd39b7b8a3632d3b +DIST elasticsearch-8.17.4-linux-x86_64.tar.gz 636389207 BLAKE2B 567aa02c454e270befd2d28a7fefc674232b894476c2409f42faa7122272e1db7ccd6bc6ee6a3593987dccc22ce43ec75a7a476b26fe8e6b769adc74aa2a5bff SHA512 02e44da0cca804ba5593d63d90c20b0a8affedcd2d69a32303c6863f391bbcb31cc6b5dba6dfc53c7682b5c36825089f399a5d6cb8649fc829cfc6f1a7de02f1 +DIST elasticsearch-8.18.0-linux-x86_64.tar.gz 647601341 BLAKE2B 95ef3a4df917f065932c2bf8a6be9bc59dd7a6b229a48388779985cc3fda7134dc287fb8bb89062fbdd9c72d17926a3398a9ecb45fbba03f784a0330d711d4cb SHA512 ac3a17ab28450bcf1a9686f7e59913343c0a8c9079df6898e7691d420b981ac71ffd24bb05a1da795af4aa5678c3db45fc1da7801f8db53399af7fb579d77923 +DIST elasticsearch-9.0.0-linux-x86_64.tar.gz 649811730 BLAKE2B 746034dfd95a831a6c5d387030ff9a1517fd6194629fbe5ed53c0ff154f0be4e3a121cc19207c56d688ca370f1858808e65756cda0b270f79887041788b91141 SHA512 4a463db7351eeb6429d5a36eb05042c7585d12461d9122016b54cd0465828c5cefd643c113d0119dbabd850d22a992f1704f437bf2825a8aa61b5788c8116142 diff --git a/app-misc/elasticsearch/elasticsearch-8.17.4.ebuild b/app-misc/elasticsearch/elasticsearch-8.17.4.ebuild new file mode 100644 index 000000000000..54da0aa05bd7 --- /dev/null +++ b/app-misc/elasticsearch/elasticsearch-8.17.4.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd tmpfiles + +DESCRIPTION="Free and Open, Distributed, RESTful Search Engine" +HOMEPAGE="https://www.elastic.co/elasticsearch/"; +SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${P}-linux-x86_64.tar.gz"; + +LICENSE="Apache-2.0 BSD-2 Elastic-2.0 LGPL-3 MIT public-domain" +SLOT="0/8" +KEYWORDS="~amd64" + +DEPEND="acct-group/elasticsearch + acct-user/elasticsearch" +# This package _actually does depend_ on JDK at runtime. #950962 +RDEPEND="acct-group/elasticsearch + acct-user/elasticsearch + sys-libs/zlib + virtual/jdk:17" + +QA_FLAGS_IGNORED="usr/share/elasticsearch/lib/platform/linux-x64/*.so" +QA_PREBUILT=" + usr/share/elasticsearch/lib/platform/linux-x64/*.so + usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.* +" +QA_PRESTRIPPED=" + usr/share/elasticsearch/lib/platform/linux-x64/*.so + usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.* +" + +PATCHES=( + "${FILESDIR}/${PN}-env-2.patch" +) + +src_prepare() { + default + + rm -rf jdk || die + sed -i -e "s:logs/:${EPREFIX}/var/log/${PN}/:g" config/jvm.options || die "Unable to set Elasticsearch log location" + # elasticsearch-env sets the envvar for the config location if not specified elsewhere; + # certain utilities try and source this. Although we patch ES_JAVA_HOME for Gentoo slightly earlier, + # it's easier to respect EPREFIX for the config location using sed. + sed -i "s:ES_PATH_CONF=\"\$ES_HOME\"/config:ES_PATH_CONF=\"${EPREFIX}/etc/${PN}\":" bin/elasticsearch-env \ + || die "Unable to set Elasticsearch config directory" + rm LICENSE.txt NOTICE.txt || die + rmdir logs || die +} + +src_install() { + keepdir /etc/${PN} + keepdir /etc/${PN}/scripts + + insinto /etc/${PN} + doins -r config/. + rm -r config || die + + fowners -R root:${PN} /etc/${PN} + fperms -R 2750 /etc/${PN} + + insinto /usr/share/${PN} + doins -r . + + exeinto /usr/share/${PN}/bin + doexe "${FILESDIR}"/elasticsearch-systemd-pre-exec + + fperms -R +x /usr/share/${PN}/bin + fperms -R +x /usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin + + keepdir /var/{lib,log}/${PN} + fowners ${PN}:${PN} /var/{lib,log}/${PN} + fperms 0750 /var/{lib,log}/${PN} + + insinto /etc/sysctl.d + newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf + + newconfd "${FILESDIR}/${PN}.conf.4" ${PN} + newinitd "${FILESDIR}/${PN}.init.8" ${PN} + + systemd_install_serviced "${FILESDIR}/${PN}.service.conf" + systemd_newunit "${FILESDIR}"/${PN}.service.4 ${PN}.service + + newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.d ${PN}.conf +} + +pkg_postinst() { + # Elasticsearch will choke on our keep file and dodir will not preserve the empty dir + # `equery check` complains that the keep file doesn't exist if we simply remove it + if [[ ! -d "${EROOT}/usr/share/${PN}/plugins" ]] ; then + mkdir "${EROOT}/usr/share/${PN}/plugins" || die + fi + tmpfiles_process /usr/lib/tmpfiles.d/${PN}.conf + if ! systemd_is_booted ; then + elog "You may create multiple instances of ${PN} by" + elog "symlinking the init script:" + elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance" + elog + elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts" + elog "from /etc/${PN} into the configuration directory of the instance:" + elog "/etc/${PN}/instance" + elog + fi + ewarn "Please make sure you have proper permissions on /etc/${PN}" + ewarn "prior to keystore generation or you may experience startup failures." + ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}" + ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore" +} diff --git a/app-misc/elasticsearch/elasticsearch-8.18.0.ebuild b/app-misc/elasticsearch/elasticsearch-8.18.0.ebuild new file mode 100644 index 000000000000..54da0aa05bd7 --- /dev/null +++ b/app-misc/elasticsearch/elasticsearch-8.18.0.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd tmpfiles + +DESCRIPTION="Free and Open, Distributed, RESTful Search Engine" +HOMEPAGE="https://www.elastic.co/elasticsearch/"; +SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${P}-linux-x86_64.tar.gz"; + +LICENSE="Apache-2.0 BSD-2 Elastic-2.0 LGPL-3 MIT public-domain" +SLOT="0/8" +KEYWORDS="~amd64" + +DEPEND="acct-group/elasticsearch + acct-user/elasticsearch" +# This package _actually does depend_ on JDK at runtime. #950962 +RDEPEND="acct-group/elasticsearch + acct-user/elasticsearch + sys-libs/zlib + virtual/jdk:17" + +QA_FLAGS_IGNORED="usr/share/elasticsearch/lib/platform/linux-x64/*.so" +QA_PREBUILT=" + usr/share/elasticsearch/lib/platform/linux-x64/*.so + usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.* +" +QA_PRESTRIPPED=" + usr/share/elasticsearch/lib/platform/linux-x64/*.so + usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.* +" + +PATCHES=( + "${FILESDIR}/${PN}-env-2.patch" +) + +src_prepare() { + default + + rm -rf jdk || die + sed -i -e "s:logs/:${EPREFIX}/var/log/${PN}/:g" config/jvm.options || die "Unable to set Elasticsearch log location" + # elasticsearch-env sets the envvar for the config location if not specified elsewhere; + # certain utilities try and source this. Although we patch ES_JAVA_HOME for Gentoo slightly earlier, + # it's easier to respect EPREFIX for the config location using sed. + sed -i "s:ES_PATH_CONF=\"\$ES_HOME\"/config:ES_PATH_CONF=\"${EPREFIX}/etc/${PN}\":" bin/elasticsearch-env \ + || die "Unable to set Elasticsearch config directory" + rm LICENSE.txt NOTICE.txt || die + rmdir logs || die +} + +src_install() { + keepdir /etc/${PN} + keepdir /etc/${PN}/scripts + + insinto /etc/${PN} + doins -r config/. + rm -r config || die + + fowners -R root:${PN} /etc/${PN} + fperms -R 2750 /etc/${PN} + + insinto /usr/share/${PN} + doins -r . + + exeinto /usr/share/${PN}/bin + doexe "${FILESDIR}"/elasticsearch-systemd-pre-exec + + fperms -R +x /usr/share/${PN}/bin + fperms -R +x /usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin + + keepdir /var/{lib,log}/${PN} + fowners ${PN}:${PN} /var/{lib,log}/${PN} + fperms 0750 /var/{lib,log}/${PN} + + insinto /etc/sysctl.d + newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf + + newconfd "${FILESDIR}/${PN}.conf.4" ${PN} + newinitd "${FILESDIR}/${PN}.init.8" ${PN} + + systemd_install_serviced "${FILESDIR}/${PN}.service.conf" + systemd_newunit "${FILESDIR}"/${PN}.service.4 ${PN}.service + + newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.d ${PN}.conf +} + +pkg_postinst() { + # Elasticsearch will choke on our keep file and dodir will not preserve the empty dir + # `equery check` complains that the keep file doesn't exist if we simply remove it + if [[ ! -d "${EROOT}/usr/share/${PN}/plugins" ]] ; then + mkdir "${EROOT}/usr/share/${PN}/plugins" || die + fi + tmpfiles_process /usr/lib/tmpfiles.d/${PN}.conf + if ! systemd_is_booted ; then + elog "You may create multiple instances of ${PN} by" + elog "symlinking the init script:" + elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance" + elog + elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts" + elog "from /etc/${PN} into the configuration directory of the instance:" + elog "/etc/${PN}/instance" + elog + fi + ewarn "Please make sure you have proper permissions on /etc/${PN}" + ewarn "prior to keystore generation or you may experience startup failures." + ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}" + ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore" +} diff --git a/app-misc/elasticsearch/elasticsearch-9.0.0.ebuild b/app-misc/elasticsearch/elasticsearch-9.0.0.ebuild new file mode 100644 index 000000000000..f7484448b012 --- /dev/null +++ b/app-misc/elasticsearch/elasticsearch-9.0.0.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd tmpfiles + +DESCRIPTION="Free and Open, Distributed, RESTful Search Engine" +HOMEPAGE="https://www.elastic.co/elasticsearch/"; +SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${P}-linux-x86_64.tar.gz"; + +LICENSE="Apache-2.0 BSD-2 Elastic-2.0 LGPL-3 MIT public-domain" +SLOT="0/9" +KEYWORDS="~amd64" + +DEPEND="acct-group/elasticsearch + acct-user/elasticsearch" +# This package _actually does depend_ on JDK at runtime. #950962 +RDEPEND="acct-group/elasticsearch + acct-user/elasticsearch + sys-libs/zlib + virtual/jdk:21" + +QA_FLAGS_IGNORED="usr/share/elasticsearch/lib/platform/linux-x64/*.so" +QA_PREBUILT=" + usr/share/elasticsearch/lib/platform/linux-x64/*.so + usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.* +" +QA_PRESTRIPPED=" + usr/share/elasticsearch/lib/platform/linux-x64/*.so + usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.* +" + +PATCHES=( + "${FILESDIR}/${PN}-env-3.patch" +) + +src_prepare() { + default + + rm -rf jdk || die + sed -i -e "s:logs/:${EPREFIX}/var/log/${PN}/:g" config/jvm.options || die "Unable to set Elasticsearch log location" + # elasticsearch-env sets the envvar for the config location if not specified elsewhere; + # certain utilities try and source this. Although we patch ES_JAVA_HOME for Gentoo slightly earlier, + # it's easier to respect EPREFIX for the config location using sed. + sed -i "s:ES_PATH_CONF=\"\$ES_HOME\"/config:ES_PATH_CONF=\"${EPREFIX}/etc/${PN}\":" bin/elasticsearch-env \ + || die "Unable to set Elasticsearch config directory" + rm LICENSE.txt NOTICE.txt || die + rmdir logs || die +} + +src_install() { + keepdir /etc/${PN} + keepdir /etc/${PN}/scripts + + insinto /etc/${PN} + doins -r config/. + rm -r config || die + + fowners -R root:${PN} /etc/${PN} + fperms -R 2750 /etc/${PN} + + insinto /usr/share/${PN} + doins -r . + + exeinto /usr/share/${PN}/bin + doexe "${FILESDIR}"/elasticsearch-systemd-pre-exec + + fperms -R +x /usr/share/${PN}/bin + fperms -R +x /usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin + + keepdir /var/{lib,log}/${PN} + fowners ${PN}:${PN} /var/{lib,log}/${PN} + fperms 0750 /var/{lib,log}/${PN} + + insinto /etc/sysctl.d + newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf + + newconfd "${FILESDIR}/${PN}.conf.4" ${PN} + newinitd "${FILESDIR}/${PN}.init.8" ${PN} + + systemd_install_serviced "${FILESDIR}/${PN}.service.conf" + systemd_newunit "${FILESDIR}"/${PN}.service.4 ${PN}.service + + newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.d ${PN}.conf +} + +pkg_postinst() { + # Elasticsearch will choke on our keep file and dodir will not preserve the empty dir + # `equery check` complains that the keep file doesn't exist if we simply remove it + if [[ ! -d "${EROOT}/usr/share/${PN}/plugins" ]] ; then + mkdir "${EROOT}/usr/share/${PN}/plugins" || die + fi + tmpfiles_process /usr/lib/tmpfiles.d/${PN}.conf + if ! systemd_is_booted ; then + elog "You may create multiple instances of ${PN} by" + elog "symlinking the init script:" + elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance" + elog + elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts" + elog "from /etc/${PN} into the configuration directory of the instance:" + elog "/etc/${PN}/instance" + elog + fi + ewarn "Please make sure you have proper permissions on /etc/${PN}" + ewarn "prior to keystore generation or you may experience startup failures." + ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}" + ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore" +} diff --git a/app-misc/elasticsearch/files/elasticsearch-env-2.patch b/app-misc/elasticsearch/files/elasticsearch-env-2.patch new file mode 100644 index 000000000000..f0d6ce0e3e4a --- /dev/null +++ b/app-misc/elasticsearch/files/elasticsearch-env-2.patch @@ -0,0 +1,24 @@ +Since ES 8.0.0 upstream stopped distributing a 'no-JDK' package. +This requires us to set `ES_JAVA_HOME` else it fails to find the +JDK that we unbundled and will not start. +--- a/bin/elasticsearch-env ++++ b/bin/elasticsearch-env +@@ -36,6 +36,18 @@ ES_HOME=`dirname "$ES_HOME"` + ES_CLASSPATH="$ES_HOME/lib/*" + LAUNCHERS_CLASSPATH="$ES_CLASSPATH:$ES_HOME/lib/launchers/*" + ++# Set our JVM in a Gentoo-specific manner ++if [ -z "$ES_JAVA_HOME" ]; then ++ GENTOO_VM=$(depend-java-query --get-vm virtual/jdk:17) ++ if [ ! -z "$GENTOO_VM" ]; then ++ ES_JAVA_HOME=$(java-config-2 --select-vm=${GENTOO_VM} --jre-home) ++ else ++ echo "Unable to automatically detect a supported Java 17 VM. Elasticsearch is unlikely to launch." ++ echo "Please ensure that you have installed an appropriate Java VM using portage" ++ echo "OR pass the ES_JAVA_HOME environment variable." ++ fi ++fi ++ + # now set the path to java + if [ ! -z "$ES_JAVA_HOME" ]; then + JAVA="$ES_JAVA_HOME/bin/java" diff --git a/app-misc/elasticsearch/files/elasticsearch-env-3.patch b/app-misc/elasticsearch/files/elasticsearch-env-3.patch new file mode 100644 index 000000000000..d459029c9958 --- /dev/null +++ b/app-misc/elasticsearch/files/elasticsearch-env-3.patch @@ -0,0 +1,24 @@ +Since ES 8.0.0 upstream stopped distributing a 'no-JDK' package. +This requires us to set `ES_JAVA_HOME` else it fails to find the +JDK that we unbundled and will not start. +--- a/bin/elasticsearch-env ++++ b/bin/elasticsearch-env +@@ -36,6 +36,18 @@ ES_HOME=`dirname "$ES_HOME"` + ES_CLASSPATH="$ES_HOME/lib/*" + LAUNCHERS_CLASSPATH="$ES_CLASSPATH:$ES_HOME/lib/launchers/*" + ++# Set our JVM in a Gentoo-specific manner ++if [ -z "$ES_JAVA_HOME" ]; then ++ GENTOO_VM=$(depend-java-query --get-vm virtual/jdk:21) ++ if [ ! -z "$GENTOO_VM" ]; then ++ ES_JAVA_HOME=$(java-config-2 --select-vm=${GENTOO_VM} --jre-home) ++ else ++ echo "Unable to automatically detect a supported Java 21 VM. Elasticsearch is unlikely to launch." ++ echo "Please ensure that you have installed an appropriate Java VM using portage" ++ echo "OR pass the ES_JAVA_HOME environment variable." ++ fi ++fi ++ + # now set the path to java + if [ ! -z "$ES_JAVA_HOME" ]; then + JAVA="$ES_JAVA_HOME/bin/java"
