gentoo resync : 14.07.2018 (2nd step)

4 files changed, 72 insertions, 24 deletions

diff --git a/app-admin/graylog2/Manifest b/app-admin/graylog2/Manifest
index b332dad8ce74..f8d77c8ec0ff 100644
--- a/app-admin/graylog2/Manifest
+++ b/app-admin/graylog2/Manifest
@@ -1,7 +1,9 @@
 AUX confd 391 BLAKE2B 35b7806d977b6cde07d4b8b9d6b41771110c5bbbe7037003392238850fcd8c36b5e561ef4e8d94dcc063c51b684650a932e3eb9b786f076bc2ba1bbb2c0d9842 SHA512 5adfb7b72488bd25e26fd7ddee90f50a244d2a90b3dff63fc9791fb213cf14da09e0ead75eeb33e540218b343564d7b56552414c090b517e4abdd8bc7cd58f68
 AUX confd-r1 521 BLAKE2B 4fa7105f843a4e2df8d610ece2601caef641c6a29026e89c0e6180dd0a47444fb73f4d17f3b811c624f02749703bed260757999fab2cdf534c75472a70e6fc39 SHA512 a1fc50cbab0960cea36bf77b052284d52ec7bdd23e56d90fcb1712dcee608c4c0555557c4cfaa5fb0ce6165f0cf1a88888e705e9c64104af79a18be525ec9725
+AUX confd-r2 542 BLAKE2B 83a8b2a3bf1fc60a2a9475d823efe39febb961d0aaee12b7b18f1d2752427e401fe2f68c83f777fba1d2f585540f4d9b422befcc959aa082a26eeef2be093b2b SHA512 fde38b6813f40633db5d5cbcb3d93fd17e8705d6f2c5805fdc900858fe2b0cf0c0c219345dc741cc2573b1f80b42fdf5714e71fa31938329355556503492bbb8
 AUX initd 1418 BLAKE2B 5075e527e83fbe50dae812b07f5b80a09936062ce4d51f2c2e287018b89adc392ee8839903e1ee11899176d39d67b7b8d526b26438243d70b9f5a6622361c98a SHA512 69017bc9679e710a100fa71f651d619c485954515883116287135a52c05335fb6f868eeda2bac4ea877ed8464a7cc2ac34df355189986aba172495aecc9a5379
 AUX initd-r1 1580 BLAKE2B 23b234ddc3bb2ab1e0f23795ab79fb82abda2b695c1f6fd2f1977999df51a8e4b998ca8d0e1e954c68d4c057eadec3cbe0b0309ec8b8898d7b005499675a743c SHA512 871085b5b50ca473451c42a39181ba4a626475abfc7160f7308e6fae9fe78b6bcdef397c0f5a44d9949adcbaacdb0c50fe236b54e95e1602896f4339c71c3b10
+AUX initd-r2 872 BLAKE2B 500a428a0f479dc79b1d8b7d6a1acfafe9a205a65adfacd10aa6f5e89c105c30e095e69799acd8739d9ed2b7dee0ed6d053497a74495a986b6d9b24122c29a75 SHA512 43632bd345bb3772018ce1fe32a97c85a1ad812dca2ae229dccb65302e686597dad4b62ecbc0cc5358c34761f354d51de2c9fe81bd3db71af5fdc0a6cbc0e95e
 DIST graylog-2.1.2.tgz 94284738 BLAKE2B d4971bb6fb073f575d20204b49e7edf24773f42e4c9b84f0e1d2a5834bf8d95120ef1fa6391b22714923fa1f62e623f02a6788c82b1f48fc86f4953d484de36f SHA512 df636143ff90b0aedcb6db78e20125c10da2428b6e474e925d6fc011fdc3a0b88414ec914981a71a0e08c4916cb5cd18a8eeda28e01d9edf3b3ae4a8fb0a90dc
 DIST graylog-2.2.2.tgz 99956086 BLAKE2B 55499d11d9f9a81df8670521f62a45323941f7acac1b87a4df96dfbe0f14a63640cd536ab1c8affa69fe1c774d37b75ca8d0d4bc6194622267a6f5640cf05cc7 SHA512 341548b5d48e3a2008a1264128a604320b566b8f0e8da4d2fca54a69e1412a69839d09698e13d97dd399652611a3e24dd54dc81f56bc4ca00278afbd61ba9c2c
 DIST graylog-2.2.3.tgz 99971278 BLAKE2B 981568151fa22b3b180a451075c9c66c1e9148d737e4683fdbeb505fccb54729619fce554ee3efd423f971081005e73e481f69d9b81676e80f1276b4a982cd6e SHA512 19ad14bdee733b4ceed526af7f446fc74a4ac5bc6a0b4784618edd84a84aa00378c203d4051a3232c17caaf47f3ffe684cb8b17ce88c8d98e7b29bc22c0058e8
@@ -9,5 +11,5 @@ DIST graylog-2.4.5.tgz 122974260 BLAKE2B 0f04713fcee112f1018a78bea7c39b456ae167e
 EBUILD graylog2-2.1.2.ebuild 1862 BLAKE2B a029af6558cb63476c97d6eebdc796145bdbc99dcbfbf428396bcb2d53a66cb04c01e890f47f7ee84c2ede0b5b04d77cdfb7cdda8e9f107baa0c6e5695381b99 SHA512 43efdd7b105a59ce897beda8d49c4797ccee133929df87903a47c4d22faea1e5bec8ba2e80519ea5d635afdd2f8933fc35dda022078ddc2c251c6db43f45f157
 EBUILD graylog2-2.2.2.ebuild 2199 BLAKE2B b923e54efdc27566bdb33115e97a924976022eb7c7d15420c599a0f2705cae5079dcaab64f339a6af3ced35a15bc3efe211b66da82a199ad1c067659c3211a49 SHA512 d8fc5fbd3a09adb4dc0904e501103e9e6da18f1ab80a19908190a91cf271fcf997f73fbfdecd6a28acafa763643335c76c653a2759fde581025e1af5ff77255f
 EBUILD graylog2-2.2.3.ebuild 2206 BLAKE2B 5cc4fd2c40d7f0548b47931e013d99650d2fdf33931c95e2132721bba7393f817f7f2ba0d58d1f5f9a752667ea2dcbcb632fa5d1309c3c3113b8d4ca2c75917f SHA512 a7e6ddf34c75c835cc85fc6b5b58aed0005f88b4e0488d35832930db11d57d7c7896ccf495e3b04dad9d9330f4c98da906916c0e0cdab96956b04f3b941a9016
-EBUILD graylog2-2.4.5.ebuild 2117 BLAKE2B 0b90692a5852a5970f8e91658e5aa214fe3a7db7b85b11c85f184fa861c1791efa36783c56c6e1fce34ca3db8efe0b9ac5b58a6817ea54f466fb04c7a3db0147 SHA512 934e417d8bafe1fca2ff5e45bb7f4795af23e4abd1dea8d224e0b206575d5a468f05185ef57fef56cff85e69357d5c854656389287386cbd693f3dde072ccfac
+EBUILD graylog2-2.4.5-r1.ebuild 2289 BLAKE2B c1b21ab668e1c0877b3cfcadf63538de1a3eaf9a85b043b34d56774f73e436454e499f22f8d7cc3f2262a01866d8e55ef9ea3be9195fe48755ebfb015fbb992d SHA512 864b58319a8ff84bd6a94490eea9d89de800dcad678302df1ea4f834f27b5b18a5f8c0ac8ae57bd0c23d3c0904e99a90a0d363abfc39442bef5b55a70783ec1e
 MISC metadata.xml 251 BLAKE2B d6cd51cc02ac1322483c5ab4655173de8b1c64bac285b55a47fa3a35d3995eef653829b7cb110488c156247cff12381888fcd3b1fe248c8f5e3feb059c490b9f SHA512 7ea734b9e52a4e36b11e004da4a8178aa529574adee2129ba57b1ce75fd5017431fdfffe7a4a536c798ae645497a44b07c748d77308325cf4d6af070ff167edd
diff --git a/app-admin/graylog2/files/confd-r2 b/app-admin/graylog2/files/confd-r2
new file mode 100644
index 000000000000..97eac6ac77fa
--- /dev/null
+++ b/app-admin/graylog2/files/confd-r2
@@ -0,0 +1,12 @@
+GRAYLOG_CONFIG_FILE="/etc/graylog2/graylog.conf"
+GRAYLOG_DATA_DIR="/var/lib/graylog2"
+GRAYLOG_GROUP="graylog"
+GRAYLOG_INSTALL_DIR="/usr/share/graylog2"
+GRAYLOG_LOG_DIR="/var/log/graylog2"
+GRAYLOG_OPTIONS=""
+GRAYLOG_USER="graylog"
+
+JAVA_OPTS="-Djava.library.path=$GRAYLOG_INSTALL_DIR/lib/sigar -Xms1g -Xmx1g -XX:NewRatio=1 -server -XX:+ResizeTLAB -XX:+UseConcMarkSweepGC -XX:+CMSConcurrentMTEnabled -XX:+CMSClassUnloadingEnabled -XX:+UseParNewGC -XX:-OmitStackTraceInFastThrow"
+
+# Please adjust according to your bind address
+rc_need="net.lo"
diff --git a/app-admin/graylog2/files/initd-r2 b/app-admin/graylog2/files/initd-r2
new file mode 100644
index 000000000000..c6177eef41d0
--- /dev/null
+++ b/app-admin/graylog2/files/initd-r2
@@ -0,0 +1,31 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/java"
+command_args="${JAVA_OPTS} -jar ${GRAYLOG_INSTALL_DIR}/graylog.jar server -f ${GRAYLOG_CONFIG_FILE} --no-pid-file ${GRAYLOG_OPTIONS}"
+command_background="true"
+command_user="${GRAYLOG_USER}:${GRAYLOG_GROUP}"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+output_log="${GRAYLOG_LOG_DIR}/graylog.stdout.log"
+error_log="${GRAYLOG_LOG_DIR}/graylog.stderr.log"
+directory="${GRAYLOG_INSTALL_DIR}"
+required_files="${GRAYLOG_CONFIG_FILE}"
+
+depend() {
+	use dns
+}
+
+start_pre() {
+	local d
+	for d in \
+		"${GRAYLOG_DATA_DIR}" \
+		"${GRAYLOG_DATA_DIR}/data" \
+		"${GRAYLOG_DATA_DIR}/data/contentpacks" \
+		"${GRAYLOG_DATA_DIR}/data/journal" \
+		"${GRAYLOG_LOG_DIR}"; do
+
+		checkpath -d -o "${GRAYLOG_USER}":"${GRAYLOG_GROUP}" -m750 "${d}"
+	done
+}
diff --git a/app-admin/graylog2/graylog2-2.4.5.ebuild b/app-admin/graylog2/graylog2-2.4.5-r1.ebuild
index 3e0e21b963fc..91ea75e61cb4 100644
--- a/app-admin/graylog2/graylog2-2.4.5.ebuild
+++ b/app-admin/graylog2/graylog2-2.4.5-r1.ebuild
@@ -12,17 +12,19 @@ SRC_URI="https://packages.graylog2.org/releases/graylog/graylog-${PV}.tgz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
+RESTRICT="strip"
 
-MY_PN="graylog"
-S="${WORKDIR}/${MY_PN}-${PV}"
+RDEPEND="virtual/jdk:1.8"
 
-INSTALL_DIR="/usr/share/graylog2"
-DATA_DIR="/var/lib/graylog2"
+DOCS=(
+	COPYING README.markdown UPGRADING.rst
+)
 
-QA_PREBUILT="${INSTALL_DIR}/lib/sigar/libsigar*"
-RESTRICT="strip"
+GRAYLOG_DATA_DIR="/var/lib/graylog2"
+GRAYLOG_INSTALL_DIR="/usr/share/graylog2"
+QA_PREBUILT="${GRAYLOG_INSTALL_DIR}/lib/sigar/libsigar*"
 
-RDEPEND="virtual/jdk:1.8"
+S="${WORKDIR}/graylog-${PV}"
 
 pkg_setup() {
 	enewgroup graylog
@@ -32,9 +34,6 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	# graylogctl is replaced by our own initd
-	rm -r bin || die
-
 	# Stick to architecture of build host
 	if ! use amd64; then
 		rm -r lib/sigar/libsigar-amd64-*.so || die "Failed in removing AMD64 support libraries"
@@ -57,28 +56,32 @@ src_prepare() {
 		lib/sigar/*winnt* || die "Failed in removing unsupported platform libraries"
 
 	# gentoo specific paths
-	sed -i "s@\(node_id_file = \).*@\1${DATA_DIR}/node-id@g; \
-		s@\(message_journal_dir = \).*@\1${DATA_DIR}/data/journal@g; \
-		s@#\(content_packs_dir = \).*@\1/${DATA_DIR}/data/contentpacks@g" \
+	sed -i "s@\(node_id_file = \).*@\1${GRAYLOG_DATA_DIR}/node-id@g; \
+		s@\(message_journal_dir = \).*@\1${GRAYLOG_DATA_DIR}/data/journal@g; \
+		s@#\(content_packs_dir = \).*@\1${GRAYLOG_DATA_DIR}/data/contentpacks@g" \
 		graylog.conf.example || die
 }
 
-src_compile() {
-	einfo "Nothing to compile; upstream supplies JAR only"
-}
-
 src_install() {
+	default
+
 	insinto /etc/graylog2
 	doins graylog.conf.example
 
-	insinto ${DATA_DIR}/data/contentpacks
+	insinto "${GRAYLOG_DATA_DIR}/data/contentpacks"
 	doins data/contentpacks/grok-patterns.json
 
-	insinto "${INSTALL_DIR}"
-	doins *
-
+	insinto "${GRAYLOG_INSTALL_DIR}"
+	doins graylog.jar
 	doins -r lib plugin
 
-	newinitd "${FILESDIR}/initd-r1" graylog2
-	newconfd "${FILESDIR}/confd-r1" graylog2
+	newconfd "${FILESDIR}/confd-r2" graylog2
+	newinitd "${FILESDIR}/initd-r2" graylog2
+}
+
+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/graylog2"
 }