[gentoo-commits] repo/gentoo:master commit in: app-admin/graylog/, app-admin/graylog/files/

2019-12-02 Thread Michał Górny
commit: 99b39d2510a7c24402c84100621e9f0d18d0bed9
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Dec  2 08:30:27 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Dec  2 08:30:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99b39d25

app-admin/graylog: Revert "add version 3.1.3"

Quick revert to make it into pkgmove before people install it.

Bug: https://bugs.gentoo.org/701728
Signed-off-by: Michał Górny  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 | 19 
 5 files changed, 145 deletions(-)

diff --git a/app-admin/graylog/Manifest b/app-admin/graylog/Manifest
deleted file mode 100644
index fa963deea87..000
--- a/app-admin/graylog/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index f9c2230c0a0..000
--- a/app-admin/graylog/files/graylog.confd
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index d17267e9df2..000
--- a/app-admin/graylog/files/graylog.initd
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/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
deleted file mode 100644
index 632bb8a67fb..000
--- 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/li

[gentoo-commits] repo/gentoo:master commit in: app-admin/graylog/, app-admin/graylog/files/

2019-12-01 Thread Joonas Niilola
commit: d148c65312bf443c4e7ad9b8686e3247ce0ee859
Author: Tomas Mozes  gmail  com>
AuthorDate: Thu Nov 21 14:24:13 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Dec  2 06:24:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d148c653

app-admin/graylog: add version 3.1.3

Package-Manager: Portage-2.3.79, Repoman-2.3.17
Signed-off-by: Tomáš Mózes  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13727
Signed-off-by: Joonas Niilola  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 | 19 
 5 files changed, 145 insertions(+)

diff --git a/app-admin/graylog/Manifest b/app-admin/graylog/Manifest
new file mode 100644
index 000..fa963deea87
--- /dev/null
+++ b/app-admin/graylog/Manifest
@@ -0,0 +1 @@
+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 000..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 000..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 000..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 \
+