1 |
commit: 99b39d2510a7c24402c84100621e9f0d18d0bed9 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 2 08:30:27 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 2 08:30:27 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99b39d25 |
7 |
|
8 |
app-admin/graylog: Revert "add version 3.1.3" |
9 |
|
10 |
Quick revert to make it into pkgmove before people install it. |
11 |
|
12 |
Bug: https://bugs.gentoo.org/701728 |
13 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
14 |
|
15 |
app-admin/graylog/Manifest | 1 - |
16 |
app-admin/graylog/files/graylog.confd | 12 ----- |
17 |
app-admin/graylog/files/graylog.initd | 30 ------------ |
18 |
app-admin/graylog/graylog-3.1.3.ebuild | 83 ---------------------------------- |
19 |
app-admin/graylog/metadata.xml | 19 -------- |
20 |
5 files changed, 145 deletions(-) |
21 |
|
22 |
diff --git a/app-admin/graylog/Manifest b/app-admin/graylog/Manifest |
23 |
deleted file mode 100644 |
24 |
index fa963deea87..00000000000 |
25 |
--- a/app-admin/graylog/Manifest |
26 |
+++ /dev/null |
27 |
@@ -1 +0,0 @@ |
28 |
-DIST graylog-3.1.3.tgz 120983897 BLAKE2B 68e1dd7b8de7ab9fb12fd2035bcf6f0901d8d9f5083ff8efef09736819ccd70ae4dd6f466cf2fa1eaebb24b4098a26d72524f9b9a47e8dd62d0224bad189bb62 SHA512 8eec2339db474b89fc717e693ec23ca32d9a018f9bb924aab895d1a1f4e90afa9fe9547e432d13b9d0bf5831f8772763f19de41ac66f3e09ebf7e96ebd6cbccf |
29 |
|
30 |
diff --git a/app-admin/graylog/files/graylog.confd b/app-admin/graylog/files/graylog.confd |
31 |
deleted file mode 100644 |
32 |
index f9c2230c0a0..00000000000 |
33 |
--- a/app-admin/graylog/files/graylog.confd |
34 |
+++ /dev/null |
35 |
@@ -1,12 +0,0 @@ |
36 |
-GRAYLOG_CONFIG_FILE="/etc/graylog/graylog.conf" |
37 |
-GRAYLOG_DATA_DIR="/var/lib/graylog" |
38 |
-GRAYLOG_GROUP="graylog" |
39 |
-GRAYLOG_INSTALL_DIR="/usr/share/graylog" |
40 |
-GRAYLOG_LOG_DIR="/var/log/graylog" |
41 |
-GRAYLOG_OPTIONS="" |
42 |
-GRAYLOG_USER="graylog" |
43 |
- |
44 |
-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" |
45 |
- |
46 |
-# Please adjust according to your bind address |
47 |
-rc_need="net.lo" |
48 |
|
49 |
diff --git a/app-admin/graylog/files/graylog.initd b/app-admin/graylog/files/graylog.initd |
50 |
deleted file mode 100644 |
51 |
index d17267e9df2..00000000000 |
52 |
--- a/app-admin/graylog/files/graylog.initd |
53 |
+++ /dev/null |
54 |
@@ -1,30 +0,0 @@ |
55 |
-#!/sbin/openrc-run |
56 |
-# Copyright 1999-2019 Gentoo Authors |
57 |
-# Distributed under the terms of the GNU General Public License v2 |
58 |
- |
59 |
-command="/usr/bin/java" |
60 |
-command_args="${JAVA_OPTS} -jar ${GRAYLOG_INSTALL_DIR}/graylog.jar server -f ${GRAYLOG_CONFIG_FILE} --no-pid-file ${GRAYLOG_OPTIONS}" |
61 |
-command_background="true" |
62 |
-command_user="${GRAYLOG_USER}:${GRAYLOG_GROUP}" |
63 |
-pidfile="/run/${RC_SVCNAME}.pid" |
64 |
- |
65 |
-output_log="${GRAYLOG_LOG_DIR}/graylog.stdout.log" |
66 |
-error_log="${GRAYLOG_LOG_DIR}/graylog.stderr.log" |
67 |
-directory="${GRAYLOG_INSTALL_DIR}" |
68 |
-required_files="${GRAYLOG_CONFIG_FILE}" |
69 |
- |
70 |
-depend() { |
71 |
- use dns |
72 |
-} |
73 |
- |
74 |
-start_pre() { |
75 |
- local d |
76 |
- for d in \ |
77 |
- "${GRAYLOG_DATA_DIR}" \ |
78 |
- "${GRAYLOG_DATA_DIR}/data" \ |
79 |
- "${GRAYLOG_DATA_DIR}/data/journal" \ |
80 |
- "${GRAYLOG_LOG_DIR}"; do |
81 |
- |
82 |
- checkpath -d -o "${GRAYLOG_USER}":"${GRAYLOG_GROUP}" -m750 "${d}" |
83 |
- done |
84 |
-} |
85 |
|
86 |
diff --git a/app-admin/graylog/graylog-3.1.3.ebuild b/app-admin/graylog/graylog-3.1.3.ebuild |
87 |
deleted file mode 100644 |
88 |
index 632bb8a67fb..00000000000 |
89 |
--- a/app-admin/graylog/graylog-3.1.3.ebuild |
90 |
+++ /dev/null |
91 |
@@ -1,83 +0,0 @@ |
92 |
-# Copyright 1999-2019 Gentoo Authors |
93 |
-# Distributed under the terms of the GNU General Public License v2 |
94 |
- |
95 |
-EAPI=7 |
96 |
- |
97 |
-DESCRIPTION="Free and open source log management" |
98 |
-HOMEPAGE="https://www.graylog.org" |
99 |
-SRC_URI="https://downloads.graylog.org/releases/graylog/${P}.tgz" |
100 |
- |
101 |
-LICENSE="GPL-3" |
102 |
-SLOT="0" |
103 |
-KEYWORDS="~amd64 ~ppc64 ~x86" |
104 |
-RESTRICT="strip" |
105 |
- |
106 |
-RDEPEND="!app-admin/graylog2 |
107 |
- acct-group/graylog |
108 |
- acct-user/graylog |
109 |
- >=virtual/jdk-1.8" |
110 |
- |
111 |
-DOCS=( |
112 |
- COPYING README.markdown UPGRADING.rst |
113 |
-) |
114 |
- |
115 |
-GRAYLOG_DATA_DIR="/var/lib/graylog" |
116 |
-GRAYLOG_INSTALL_DIR="/usr/share/graylog" |
117 |
-QA_PREBUILT="${GRAYLOG_INSTALL_DIR}/lib/sigar/libsigar*" |
118 |
- |
119 |
-src_prepare() { |
120 |
- default |
121 |
- |
122 |
- # Stick to architecture of build host |
123 |
- if ! use amd64; then |
124 |
- rm -r lib/sigar/libsigar-amd64-*.so || die "Failed in removing AMD64 support libraries" |
125 |
- fi |
126 |
- if ! use ppc64; then |
127 |
- rm -r lib/sigar/libsigar-ppc64-*.so || die "Failed in removing PPC64 support libraries" |
128 |
- fi |
129 |
- if ! use x86; then |
130 |
- rm -r lib/sigar/libsigar-x86-*.so || die "Failed in removing X86 support libraries" |
131 |
- fi |
132 |
- # Currently unsupported platforms |
133 |
- # QA warning galore but testing/patches welcome |
134 |
- rm lib/sigar/libsigar-*freebsd*so \ |
135 |
- lib/sigar/libsigar-*solaris*so \ |
136 |
- lib/sigar/libsigar-*hpux*.sl \ |
137 |
- lib/sigar/libsigar-*macosx*.dylib \ |
138 |
- lib/sigar/libsigar-ia64-*.so \ |
139 |
- lib/sigar/libsigar-ppc-*.so \ |
140 |
- lib/sigar/libsigar-s390x*.so \ |
141 |
- lib/sigar/*winnt* || die "Failed in removing unsupported platform libraries" |
142 |
- |
143 |
- # gentoo specific paths |
144 |
- sed -i "s@\(node_id_file = \).*@\1${GRAYLOG_DATA_DIR}/node-id@g; \ |
145 |
- s@\(message_journal_dir = \).*@\1${GRAYLOG_DATA_DIR}/data/journal@g;" \ |
146 |
- graylog.conf.example || die |
147 |
-} |
148 |
- |
149 |
-src_install() { |
150 |
- default |
151 |
- |
152 |
- insinto /etc/graylog |
153 |
- doins graylog.conf.example |
154 |
- |
155 |
- insinto "${GRAYLOG_INSTALL_DIR}" |
156 |
- doins graylog.jar |
157 |
- doins -r lib plugin |
158 |
- |
159 |
- keepdir "${GRAYLOG_DATA_DIR}" |
160 |
- |
161 |
- newconfd "${FILESDIR}/graylog.confd" graylog |
162 |
- newinitd "${FILESDIR}/graylog.initd" graylog |
163 |
-} |
164 |
- |
165 |
-pkg_postinst() { |
166 |
- ewarn "Graylog does not depend on need.net any more (#439092)." |
167 |
- ewarn |
168 |
- ewarn "Please configure rc_need according to your binding address in:" |
169 |
- ewarn "/etc/conf.d/graylog" |
170 |
- ewarn |
171 |
- ewarn "Graylog requires Java >= 8" |
172 |
- ewarn "Elasticsearch 5.x or 6.x (does NOT work with 7.x)" |
173 |
- ewarn "and MongoDB 3.6 or 4.0 (does NOT work with 4.2)" |
174 |
-} |
175 |
|
176 |
diff --git a/app-admin/graylog/metadata.xml b/app-admin/graylog/metadata.xml |
177 |
deleted file mode 100644 |
178 |
index 84ba1f113f4..00000000000 |
179 |
--- a/app-admin/graylog/metadata.xml |
180 |
+++ /dev/null |
181 |
@@ -1,19 +0,0 @@ |
182 |
-<?xml version="1.0" encoding="UTF-8"?> |
183 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
184 |
-<pkgmetadata> |
185 |
- <maintainer type="person"> |
186 |
- <email>chainsaw@g.o</email> |
187 |
- <name>Tony Vroon</name> |
188 |
- </maintainer> |
189 |
- <maintainer type="person"> |
190 |
- <email>hydrapolic@×××××.com</email> |
191 |
- <name>Tomáš Mózes</name> |
192 |
- </maintainer> |
193 |
- <maintainer type="project"> |
194 |
- <email>proxy-maint@g.o</email> |
195 |
- <name>Proxy Maintainers</name> |
196 |
- </maintainer> |
197 |
- <upstream> |
198 |
- <remote-id type="github">graylog2/graylog2-server</remote-id> |
199 |
- </upstream> |
200 |
-</pkgmetadata> |