public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-admin/graylog/files/, app-admin/graylog/
@ 2019-12-02  8:39 Michał Górny
  0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2019-12-02  8:39 UTC (permalink / raw
  To: gentoo-commits

commit:     7812a333ffb5423ce132a5a70ac6d2ddfcac8d35
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Thu Nov 21 14:24:13 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Dec  2 08:39:17 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7812a333

app-admin/graylog: add version 3.1.3

Package-Manager: Portage-2.3.79, Repoman-2.3.17
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13727
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
[combined with moved app-admin/graylog2]
Closes: https://bugs.gentoo.org/701728
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-admin/graylog/Manifest             |  1 +
 app-admin/graylog/files/graylog.confd  | 12 +++++
 app-admin/graylog/files/graylog.initd  | 30 ++++++++++++
 app-admin/graylog/graylog-3.1.3.ebuild | 83 ++++++++++++++++++++++++++++++++++
 app-admin/graylog/metadata.xml         | 11 +++++
 5 files changed, 137 insertions(+)

diff --git a/app-admin/graylog/Manifest b/app-admin/graylog/Manifest
index 43cea02cad9..b1ce2538044 100644
--- a/app-admin/graylog/Manifest
+++ b/app-admin/graylog/Manifest
@@ -1 +1,2 @@
 DIST graylog-2.5.1.tgz 123878927 BLAKE2B d168579be4d20e3a8081d608247e7101fc5d99ddd2b5f063f94d7e91d4095c6bd016a4bc1be0f0e08b5043b771070312286404ece5eacc51e4a8730dfc13dab1 SHA512 44e2ca00e47a34708cea94b74fdc0f56f3a381f161d25633bdf7685fbcd989937163508f8b47b0869c7daacec6c8bd2c874f9381e196ffb3194eb6e3f96b3ce9
+DIST graylog-3.1.3.tgz 120983897 BLAKE2B 68e1dd7b8de7ab9fb12fd2035bcf6f0901d8d9f5083ff8efef09736819ccd70ae4dd6f466cf2fa1eaebb24b4098a26d72524f9b9a47e8dd62d0224bad189bb62 SHA512 8eec2339db474b89fc717e693ec23ca32d9a018f9bb924aab895d1a1f4e90afa9fe9547e432d13b9d0bf5831f8772763f19de41ac66f3e09ebf7e96ebd6cbccf

diff --git a/app-admin/graylog/files/graylog.confd b/app-admin/graylog/files/graylog.confd
new file mode 100644
index 00000000000..f9c2230c0a0
--- /dev/null
+++ b/app-admin/graylog/files/graylog.confd
@@ -0,0 +1,12 @@
+GRAYLOG_CONFIG_FILE="/etc/graylog/graylog.conf"
+GRAYLOG_DATA_DIR="/var/lib/graylog"
+GRAYLOG_GROUP="graylog"
+GRAYLOG_INSTALL_DIR="/usr/share/graylog"
+GRAYLOG_LOG_DIR="/var/log/graylog"
+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:-OmitStackTraceInFastThrow"
+
+# Please adjust according to your bind address
+rc_need="net.lo"

diff --git a/app-admin/graylog/files/graylog.initd b/app-admin/graylog/files/graylog.initd
new file mode 100644
index 00000000000..d17267e9df2
--- /dev/null
+++ b/app-admin/graylog/files/graylog.initd
@@ -0,0 +1,30 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# 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/journal" \
+		"${GRAYLOG_LOG_DIR}"; do
+
+		checkpath -d -o "${GRAYLOG_USER}":"${GRAYLOG_GROUP}" -m750 "${d}"
+	done
+}

diff --git a/app-admin/graylog/graylog-3.1.3.ebuild b/app-admin/graylog/graylog-3.1.3.ebuild
new file mode 100644
index 00000000000..632bb8a67fb
--- /dev/null
+++ b/app-admin/graylog/graylog-3.1.3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 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=(
+	COPYING 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"
+	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)"
+}

diff --git a/app-admin/graylog/metadata.xml b/app-admin/graylog/metadata.xml
index 5087760546f..84ba1f113f4 100644
--- a/app-admin/graylog/metadata.xml
+++ b/app-admin/graylog/metadata.xml
@@ -5,4 +5,15 @@
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>
+  <maintainer type="person">
+    <email>hydrapolic@gmail.com</email>
+    <name>Tomáš Mózes</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">graylog2/graylog2-server</remote-id>
+  </upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/graylog/files/, app-admin/graylog/
@ 2020-06-12 14:33 Thomas Deutschmann
  0 siblings, 0 replies; 3+ messages in thread
From: Thomas Deutschmann @ 2020-06-12 14:33 UTC (permalink / raw
  To: gentoo-commits

commit:     bb7cdc21763150c485c71185b95931b82d225d13
Author:     Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Thu Jun 11 07:12:39 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Jun 12 14:29:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb7cdc21

app-admin/graylog: security cleanup

https://docs.graylog.org/en/3.3/pages/changelog.html#graylog-3-3-0

Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16187
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 app-admin/graylog/Manifest             |  3 --
 app-admin/graylog/files/confd-r2       | 12 -----
 app-admin/graylog/files/initd-r2       | 31 ------------
 app-admin/graylog/graylog-2.5.1.ebuild | 87 ----------------------------------
 app-admin/graylog/graylog-3.1.3.ebuild | 83 --------------------------------
 app-admin/graylog/graylog-3.2.4.ebuild | 83 --------------------------------
 6 files changed, 299 deletions(-)

diff --git a/app-admin/graylog/Manifest b/app-admin/graylog/Manifest
index e17f484fca5..653c8795579 100644
--- a/app-admin/graylog/Manifest
+++ b/app-admin/graylog/Manifest
@@ -1,4 +1 @@
-DIST graylog-2.5.1.tgz 123878927 BLAKE2B d168579be4d20e3a8081d608247e7101fc5d99ddd2b5f063f94d7e91d4095c6bd016a4bc1be0f0e08b5043b771070312286404ece5eacc51e4a8730dfc13dab1 SHA512 44e2ca00e47a34708cea94b74fdc0f56f3a381f161d25633bdf7685fbcd989937163508f8b47b0869c7daacec6c8bd2c874f9381e196ffb3194eb6e3f96b3ce9
-DIST graylog-3.1.3.tgz 120983897 BLAKE2B 68e1dd7b8de7ab9fb12fd2035bcf6f0901d8d9f5083ff8efef09736819ccd70ae4dd6f466cf2fa1eaebb24b4098a26d72524f9b9a47e8dd62d0224bad189bb62 SHA512 8eec2339db474b89fc717e693ec23ca32d9a018f9bb924aab895d1a1f4e90afa9fe9547e432d13b9d0bf5831f8772763f19de41ac66f3e09ebf7e96ebd6cbccf
-DIST graylog-3.2.4.tgz 125543280 BLAKE2B 77e738fb140678af3e4aae80d71e58b15bfbd9b4ffd1d08381678869cf70cadc59d2d19a27d6cdd1634917da4da8a0144543a32ae88bc644effffa6d9d62099c SHA512 97e22516d50a7309d2eb8e608b19d6424eb72c54bdfe699bb996542235b99966cb28487cc11700d6a163d65c1465b9faf681940b9b85d427a5dfb94c42ce2a1d
 DIST graylog-3.3.1.tgz 129279195 BLAKE2B b3894a453d369f200951d260c0229cec7dbbeb01fcd5df1d8be354c0669c32c1ae3f435a7bad2fc92823f2408fd6e06eded19a56442d6eaa636bd8401f8573a9 SHA512 9e99784e4c349965aafae8c153bd843007dadf664febe7088cfa7561568841d6acb73592d5f57feaece683ea667a535124cdd49e6ed3a05bab13d07239c8b3dd

diff --git a/app-admin/graylog/files/confd-r2 b/app-admin/graylog/files/confd-r2
deleted file mode 100644
index 97eac6ac77f..00000000000
--- a/app-admin/graylog/files/confd-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-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/graylog/files/initd-r2 b/app-admin/graylog/files/initd-r2
deleted file mode 100644
index c6177eef41d..00000000000
--- a/app-admin/graylog/files/initd-r2
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/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/graylog/graylog-2.5.1.ebuild b/app-admin/graylog/graylog-2.5.1.ebuild
deleted file mode 100644
index b045b60179e..00000000000
--- a/app-admin/graylog/graylog-2.5.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit user
-
-DESCRIPTION="Free and open source log management"
-HOMEPAGE="https://www.graylog.org"
-SRC_URI="https://packages.graylog2.org/releases/graylog/graylog-${PV}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-RESTRICT="strip"
-
-RDEPEND="virtual/jdk:1.8"
-
-DOCS=(
-	COPYING README.markdown UPGRADING.rst
-)
-
-GRAYLOG_DATA_DIR="/var/lib/graylog2"
-GRAYLOG_INSTALL_DIR="/usr/share/graylog2"
-QA_PREBUILT="${GRAYLOG_INSTALL_DIR}/lib/sigar/libsigar*"
-
-S="${WORKDIR}/graylog-${PV}"
-
-pkg_setup() {
-	enewgroup graylog
-	enewuser graylog -1 -1 -1 graylog
-}
-
-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; \
-		s@#\(content_packs_dir = \).*@\1${GRAYLOG_DATA_DIR}/data/contentpacks@g" \
-		graylog.conf.example || die
-}
-
-src_install() {
-	default
-
-	insinto /etc/graylog2
-	doins graylog.conf.example
-
-	insinto "${GRAYLOG_DATA_DIR}/data/contentpacks"
-	doins data/contentpacks/grok-patterns.json
-
-	insinto "${GRAYLOG_INSTALL_DIR}"
-	doins graylog.jar
-	doins -r lib plugin
-
-	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"
-}

diff --git a/app-admin/graylog/graylog-3.1.3.ebuild b/app-admin/graylog/graylog-3.1.3.ebuild
deleted file mode 100644
index 632bb8a67fb..00000000000
--- a/app-admin/graylog/graylog-3.1.3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 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=(
-	COPYING 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"
-	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)"
-}

diff --git a/app-admin/graylog/graylog-3.2.4.ebuild b/app-admin/graylog/graylog-3.2.4.ebuild
deleted file mode 100644
index cda5c7e5b52..00000000000
--- a/app-admin/graylog/graylog-3.2.4.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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=(
-	COPYING 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"
-	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)"
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/graylog/files/, app-admin/graylog/
@ 2020-11-10 15:29 Thomas Deutschmann
  0 siblings, 0 replies; 3+ messages in thread
From: Thomas Deutschmann @ 2020-11-10 15:29 UTC (permalink / raw
  To: gentoo-commits

commit:     5b99a2ab95d2ec829366eb3a92c3469fe23b6e40
Author:     Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Mon Nov  9 06:14:29 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Nov 10 15:29:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b99a2ab

app-admin/graylog: bump to 3.3.8

Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 app-admin/graylog/Manifest             |  1 +
 app-admin/graylog/files/graylog.initd  |  3 +-
 app-admin/graylog/graylog-3.3.8.ebuild | 83 ++++++++++++++++++++++++++++++++++
 3 files changed, 86 insertions(+), 1 deletion(-)

diff --git a/app-admin/graylog/Manifest b/app-admin/graylog/Manifest
index 2bf48f496f5..2fe5bac40b2 100644
--- a/app-admin/graylog/Manifest
+++ b/app-admin/graylog/Manifest
@@ -1 +1,2 @@
 DIST graylog-3.3.3.tgz 129284019 BLAKE2B 35c8dec3becd0cd513e435fec38c296e40a0c330304effb40e40f656702cd791c68ca9c814baf45671d7494d16d4478f9a0b3e44812c4814bea8dc1213f06793 SHA512 6e7445d1bac5addfe4e09f22ba2425859b44720105ba61ec2d819d12a8d693789f717d6fc1bdacb0ef1fe2e4583c405689a60ddd250e4fa17d1d10e70020f75c
+DIST graylog-3.3.8.tgz 129314297 BLAKE2B 21eaf45b396b11ad5c42efad790390b643505ac7ecc24332813784443ba3b5aeed911fae07beb270f598341d577469f9a5fdbe92101e64939e6646884b7f7fc8 SHA512 feda3dafc3af249e54e8240ea20a8fd4e96c80901b45842cf8ec4ee7a5b33646a391a19a23a06b0e5fb4bf29c0d1c8d7cb87f2ee169ef17ac5b38fbd00682ead

diff --git a/app-admin/graylog/files/graylog.initd b/app-admin/graylog/files/graylog.initd
index d17267e9df2..2dc7024e28d 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.8.ebuild b/app-admin/graylog/graylog-3.3.8.ebuild
new file mode 100644
index 00000000000..d9a5d388357
--- /dev/null
+++ b/app-admin/graylog/graylog-3.3.8.ebuild
@@ -0,0 +1,83 @@
+# 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=(
+	COPYING 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"
+	ewarn
+	ewarn "Graylog requires Java >= 8"
+	ewarn "Elasticsearch 5.x or 6.x (does NOT work with 7.x)"
+	ewarn "and MongoDB 3.6, 4.0 or 4.2"
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-11-10 15:30 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-02  8:39 [gentoo-commits] repo/gentoo:master commit in: app-admin/graylog/files/, app-admin/graylog/ Michał Górny
  -- strict thread matches above, loose matches on Subject: below --
2020-06-12 14:33 Thomas Deutschmann
2020-11-10 15:29 Thomas Deutschmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox