gentoo resync : 25.11.2020

4 files changed, 87 insertions, 5 deletions

diff --git a/app-admin/graylog/Manifest b/app-admin/graylog/Manifest
index c56c05802879..ba1f25f6ca4b 100644
--- a/app-admin/graylog/Manifest
+++ b/app-admin/graylog/Manifest
@@ -1,5 +1,7 @@
 AUX graylog.confd 521 BLAKE2B b776c8c834358a426aab6e67b894ab3fc8e07b5d6d24f506312f41e76ea36bd39398d1eb424cf9f3fff633a26acb8af54dccd4a19642b55bf18d91fe92aff31c SHA512 3d8c3b6128f839809f14c7a1f2683ed5ac273efbabb1e0f50a2e9e90ef6c7cdc481bd84ef3372bf10f288b08f2b850a80d917838e057545851d3113c8f877512
-AUX graylog.initd 825 BLAKE2B bfcd79f71d996ca1761a79119f8ca29e531dbd9a40411c0c13b0628ebb8caea6c69e72adb3102369ffe41721acfef5ba2656689fd10ee0cae591291e9d20cd1e SHA512 e55477329fe5045b85451abd695d13cb6d67cf0b75f0f786503c6fba850d0cae9e853fb976dae35e65f570fda625bc8984714a0cdd6c23801c917184dc5a32f2
-DIST graylog-3.3.3.tgz 129284019 BLAKE2B 35c8dec3becd0cd513e435fec38c296e40a0c330304effb40e40f656702cd791c68ca9c814baf45671d7494d16d4478f9a0b3e44812c4814bea8dc1213f06793 SHA512 6e7445d1bac5addfe4e09f22ba2425859b44720105ba61ec2d819d12a8d693789f717d6fc1bdacb0ef1fe2e4583c405689a60ddd250e4fa17d1d10e70020f75c
-EBUILD graylog-3.3.3.ebuild 2255 BLAKE2B a8e39a5ba451672d598fa6317231e411e0127855252272d67fd90433b16801356cb08683fe0e709d331301251402822c9d22c8e5589f93dfcaabf8e31106a2c1 SHA512 7207cc432927cef54445fc5af8626fecb8679efb26d09dc7fa05149fec3c10e66799458f003069ed99ce65ee7a75c3d4b0427115b33701f2c47ba3ccb6c7f254
+AUX graylog.initd 836 BLAKE2B 936e5e3c811fb01bc80dde2bf8bf67dd75b6a4a20fdc7fabd53789fca977dccd7aa2664225d848e4b63819d15666e6913058ce0a769413c58784e891366bdc36 SHA512 a6d63077aac5d35621f355811bd6380b34eee952f34446faa26250c0e83a6649673550e51169103a6735fb0002f808fed0e8764459e129027700c3849b3cb0e5
+DIST graylog-3.3.8.tgz 129314297 BLAKE2B 21eaf45b396b11ad5c42efad790390b643505ac7ecc24332813784443ba3b5aeed911fae07beb270f598341d577469f9a5fdbe92101e64939e6646884b7f7fc8 SHA512 feda3dafc3af249e54e8240ea20a8fd4e96c80901b45842cf8ec4ee7a5b33646a391a19a23a06b0e5fb4bf29c0d1c8d7cb87f2ee169ef17ac5b38fbd00682ead
+DIST graylog-4.0.0.tgz 163267939 BLAKE2B 354cb24d4a0ac87378d94eeb2ed0f770a8d2acea9678677f795484edaa329cc0072d0151a0a53e5242a8e334ed6de81eedc8f17d0c61741729cabb96f62bf0c3 SHA512 426dc3ca393308b9d173f9956799f74b46bdb845f74f400555d388c4090777c7862d16bfd6c701a1fdec7a76a901fdd801f18fd19a73db80e855dd1fb44de4d4
+EBUILD graylog-3.3.8.ebuild 2235 BLAKE2B 3c5282354b4c1cd5281640baecbe4031ebc90e4abe2f2f6640964cb353bc19e4985d4f1657c1b1fc38cba18201de98120de1bda93c208e8bbad9e35a7375be0c SHA512 121c473f1039cc0010e0bda3624f366b49f7741424d57c983077b044fd2bf0895bb125cc97ee97fe4313dc1736a5c6714532705a5053e8e9c1bc5beb038e566a
+EBUILD graylog-4.0.0.ebuild 2088 BLAKE2B 2d49f39cce74b6afb1073f34d310687f8bca88f22fa09b9ff438f6cae5a14768f26ab725200c960407ad82972e3efc9ecf85ad1d2c896961cab4ed849ff7361c SHA512 8ac4ed61c0804ae112955ca94a9f32149b76872e9a736d8195db32384a4c21391fd28162240c69413702f7d06c36668e2d408a4e2a328d2e6806d3d0cd2e24df
 MISC metadata.xml 584 BLAKE2B d19e09582932c7986c85059766f2a845c0e85d214b9af6c61d9c26005e31c208a8ab59e6d82e5870162314c2cb4a9d3e852f12c02551d399c1eb3063449501bb SHA512 c32525442e20550c7e3b0ac8b74d896f35b2de1e87d57befb152047840bf4811c8df135f828b1c95505b4a348f25478cd7b2b186c36f93c6055086437f257505
diff --git a/app-admin/graylog/files/graylog.initd b/app-admin/graylog/files/graylog.initd
index d17267e9df22..2dc7024e28dd 100644
--- a/app-admin/graylog/files/graylog.initd
+++ b/app-admin/graylog/files/graylog.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 command="/usr/bin/java"
@@ -7,6 +7,7 @@ command_args="${JAVA_OPTS} -jar ${GRAYLOG_INSTALL_DIR}/graylog.jar server -f ${G
 command_background="true"
 command_user="${GRAYLOG_USER}:${GRAYLOG_GROUP}"
 pidfile="/run/${RC_SVCNAME}.pid"
+retry="30"
 
 output_log="${GRAYLOG_LOG_DIR}/graylog.stdout.log"
 error_log="${GRAYLOG_LOG_DIR}/graylog.stderr.log"
diff --git a/app-admin/graylog/graylog-3.3.3.ebuild b/app-admin/graylog/graylog-3.3.8.ebuild
index cda5c7e5b52d..d9a5d3883577 100644
--- a/app-admin/graylog/graylog-3.3.3.ebuild
+++ b/app-admin/graylog/graylog-3.3.8.ebuild
@@ -79,5 +79,5 @@ pkg_postinst() {
 	ewarn
 	ewarn "Graylog requires Java >= 8"
 	ewarn "Elasticsearch 5.x or 6.x (does NOT work with 7.x)"
-	ewarn "and MongoDB 3.6 or 4.0 (does NOT work with 4.2)"
+	ewarn "and MongoDB 3.6, 4.0 or 4.2"
 }
diff --git a/app-admin/graylog/graylog-4.0.0.ebuild b/app-admin/graylog/graylog-4.0.0.ebuild
new file mode 100644
index 000000000000..4112c68bb70e
--- /dev/null
+++ b/app-admin/graylog/graylog-4.0.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Free and open source log management"
+HOMEPAGE="https://www.graylog.org"
+SRC_URI="https://downloads.graylog.org/releases/graylog/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+RESTRICT="strip"
+
+RDEPEND="!app-admin/graylog2
+	acct-group/graylog
+	acct-user/graylog
+	>=virtual/jdk-1.8:*"
+
+DOCS=(
+	README.markdown UPGRADING.rst
+)
+
+GRAYLOG_DATA_DIR="/var/lib/graylog"
+GRAYLOG_INSTALL_DIR="/usr/share/graylog"
+QA_PREBUILT="${GRAYLOG_INSTALL_DIR}/lib/sigar/libsigar*"
+
+src_prepare() {
+	default
+
+	# Stick to architecture of build host
+	if ! use amd64; then
+		rm -r lib/sigar/libsigar-amd64-*.so || die "Failed in removing AMD64 support libraries"
+	fi
+	if ! use ppc64; then
+		rm -r lib/sigar/libsigar-ppc64-*.so || die "Failed in removing PPC64 support libraries"
+	fi
+	if ! use x86; then
+		rm -r lib/sigar/libsigar-x86-*.so || die "Failed in removing X86 support libraries"
+	fi
+	# Currently unsupported platforms
+	# QA warning galore but testing/patches welcome
+	rm lib/sigar/libsigar-*freebsd*so \
+		lib/sigar/libsigar-*solaris*so \
+		lib/sigar/libsigar-*hpux*.sl \
+		lib/sigar/libsigar-*macosx*.dylib \
+		lib/sigar/libsigar-ia64-*.so \
+		lib/sigar/libsigar-ppc-*.so \
+		lib/sigar/libsigar-s390x*.so \
+		lib/sigar/*winnt* || die "Failed in removing unsupported platform libraries"
+
+	# gentoo specific paths
+	sed -i "s@\(node_id_file = \).*@\1${GRAYLOG_DATA_DIR}/node-id@g; \
+		s@\(message_journal_dir = \).*@\1${GRAYLOG_DATA_DIR}/data/journal@g;" \
+		graylog.conf.example || die
+}
+
+src_install() {
+	default
+
+	insinto /etc/graylog
+	doins graylog.conf.example
+
+	insinto "${GRAYLOG_INSTALL_DIR}"
+	doins graylog.jar
+	doins -r lib plugin
+
+	keepdir "${GRAYLOG_DATA_DIR}"
+
+	newconfd "${FILESDIR}/graylog.confd" graylog
+	newinitd "${FILESDIR}/graylog.initd" graylog
+}
+
+pkg_postinst() {
+	ewarn "Graylog does not depend on need.net any more (#439092)."
+	ewarn
+	ewarn "Please configure rc_need according to your binding address in:"
+	ewarn "/etc/conf.d/graylog"
+}