1 |
commit: 2a41ffc2dde836eb1a293eebb1891146fa69f094 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jul 4 02:58:07 2018 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jul 4 02:59:07 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a41ffc2 |
7 |
|
8 |
app-admin/rsyslog: bump to v8.36.0 |
9 |
|
10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
11 |
|
12 |
app-admin/rsyslog/Manifest | 2 + |
13 |
app-admin/rsyslog/metadata.xml | 5 +- |
14 |
app-admin/rsyslog/rsyslog-8.36.0.ebuild | 476 ++++++++++++++++++++++++++++++++ |
15 |
profiles/arch/arm/package.use.mask | 4 + |
16 |
profiles/arch/arm64/package.use.mask | 4 + |
17 |
profiles/arch/hppa/package.use.mask | 4 + |
18 |
6 files changed, 494 insertions(+), 1 deletion(-) |
19 |
|
20 |
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest |
21 |
index fe8ef0c9003..47c54f0481e 100644 |
22 |
--- a/app-admin/rsyslog/Manifest |
23 |
+++ b/app-admin/rsyslog/Manifest |
24 |
@@ -3,8 +3,10 @@ DIST rsyslog-8.32.0.tar.gz 2478990 BLAKE2B 21bfc93b55da107bec2eddb89cb42d76990ce |
25 |
DIST rsyslog-8.33.1.tar.gz 2494338 BLAKE2B 680ad2c062386e4e3e6c6e1a83cf0001d63da305edae9df527d1079a2fa13b8715e3cbfa211ca908e0005f1762becfd88369a7cd1488134564980137f0e98d86 SHA512 c4b426409e89463a8e8f7f9d0267f2fa1df1a84e947ce7bf91255db88b4cad5b7e607c476ba2db0543af069c44cdbb35330e0839696bf83668200e8ac009c6a0 |
26 |
DIST rsyslog-8.34.0.tar.gz 2545544 BLAKE2B 66caf277a814563027183ecf267d76067c384adf8d6d7b8543203df9a7c37242722dd35445e4446aacf1e680f5f3957cea40ece8a284ef2a393b4a71e3a2b49c SHA512 69eaececa2f8b98799deac8e6cb2cf635a5117da7a21cbb0b880b7df1d83c6ccf16133dab099a6e5fb865f34c2dad164a1bf1952d16ca116af3b1dd35d15065e |
27 |
DIST rsyslog-8.35.0.tar.gz 2590108 BLAKE2B e201c1366b8ab96c070829d51de079212e82216a793eb7622aa91c66e2330981de8be547b1ee7f102ed7d8c8de054d58ba151e95238146a61fba8fe908c5f929 SHA512 3b8845fc057147c2dd740b3bb432e7fb101ad60be5c6bc86a2c2796bcd3f3526c617d45b9e8301388d51047a125ca18ba4ac54f8be2a13eabbbe8fb9361beecc |
28 |
+DIST rsyslog-8.36.0.tar.gz 2639477 BLAKE2B 9c7343d853f79e2955a8999e2871a2a9b008cb3ef75b94e2381a3a0ff3e49445593d852d7de3819851dc0d4c17a91d966ca2fbfd52e8215ebdbaf6b7ccd68bdf SHA512 b0c8689374b5b0fb5ad9675ad8983ce67bd04d34ad07d39cf8f91498fd2fd21a173f1077e5fa1b66a89a9d93ab011fc6345ac1a3be9961f4794fc9e152c32a50 |
29 |
DIST rsyslog-docs-8.28.0.tar.gz 4424901 BLAKE2B 9753b1a48b9d3bb045f2d088de5df0bbe5bc9045a82a5cab98b27c2df7648ac312929a173ec34c81ced46cb0eba336d708204b73b57413686769afa882dceaa5 SHA512 c085e09149cfc27ce0cd22edf9ad3f81b111f491fbea79afbc3172882065bd8324e366e3b5d09c885c1a3aa63fe8fbbe154d66488319d4ffc0867f938e1ab07d |
30 |
DIST rsyslog-docs-8.32.0.tar.gz 5368254 BLAKE2B 6d1efb191698bb1cfb03660167e5dcf9eea8f2fd2e459c350cd55aa24afcc5fb44d2bc0ef5590c6951326fbd0215aecbd59a6122e88ff449f566b37d1ee00d56 SHA512 e64eba3c40eab35e266826fb7e183418f38eb008f2a21ddf2c523d1e42aacaa20f882a561e5df67a979463048b58232fa82759645a21dc6962f6836ac8f57bce |
31 |
DIST rsyslog-docs-8.33.1.tar.gz 6770438 BLAKE2B e076688d7559c16986241149c00f6df603e2c90771222f4f91dc944fbdeace3dbc6e47fc82602f852a7407e064fe31df0a1c2940d521ae6ae21f5663518bfeb7 SHA512 fcc8ffee372c0b0dc2ab1b76dcf68a66ce820996cf2d46a2b5c6fd40e6fad5ef3c33da97a2e88956751597c20cf0c4a9b6537c22db0b3b46d1a734a9d9f95df5 |
32 |
DIST rsyslog-docs-8.34.0.tar.gz 7419160 BLAKE2B 928e6a4044d6d2161483f934e6c2cd5e489a3ec95b823419d7d57b98a7dd6c73f4d28d17c238471592fe1c692b626b57c7bf647e926c1c38ff5a774e5d2defd5 SHA512 edf9aa63c777624c3dc27dfd64b38893b9b4c9b56941df1d7a8c6bc3cb4cbbfb83e8c356cbefeab7c688ecb6017b66ed99931cb71b69b7c927b4743548dd40d4 |
33 |
DIST rsyslog-docs-8.35.0.tar.gz 7427270 BLAKE2B 5441080c07a8398cd5d513ba6abe0335f62762f105354105549f0440c0429c62a4f28a4cc84a71d049bc8134cd64bda2c2210a2f30fd5b94f53e0bc783e7c8d1 SHA512 f78d0451eef789d60f7c5ae1eed46c4a9f7a6ade73b829f65aa2373aa786b00e84e8957089532b1b652838bd9f62b41d92530276a0d27e21b8e94d5f0e4728a6 |
34 |
+DIST rsyslog-docs-8.36.0.tar.gz 7570338 BLAKE2B 031f94b88fb97e6c8b01d224279138c371a5f54ecc5d7a9298b4ec6351c5d380065877888ab1969386b76b9e715937b7335bee59c3d5b8ddd4910392a58d08cb SHA512 a93f56c9c9464a9ca87f61169c6fcfaa94608f31210eaac77e882e64bf5f514c887765db6bb57e4defafeb2a6e552506f0274c1ed275306efc1656f5520b5efa |
35 |
|
36 |
diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml |
37 |
index d785e232e0a..5075171a370 100644 |
38 |
--- a/app-admin/rsyslog/metadata.xml |
39 |
+++ b/app-admin/rsyslog/metadata.xml |
40 |
@@ -10,18 +10,20 @@ |
41 |
<flag name="dbi">Build the general database output module (requires <pkg>dev-db/libdbi</pkg>)</flag> |
42 |
<flag name="elasticsearch">Build the Elasticsearch output module (requires <pkg>net-misc/curl</pkg>)</flag> |
43 |
<flag name="gcrypt">Add support for encrypted log files using <pkg>dev-libs/libgcrypt</pkg></flag> |
44 |
+ <flag name="gnutls">Build the GnuTLS network stream driver (requires <pkg>net-libs/gnutls</pkg>)</flag> |
45 |
<flag name="grok">Build the grok modify module (requires <pkg>dev-libs/grok</pkg>)</flag> |
46 |
<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag> |
47 |
<flag name="kafka">Build the Apache Kafka input/output module (requires <pkg>dev-libs/librdkafka</pkg>)</flag> |
48 |
<flag name="kerberos">Build the GSSAPI input and output module (requires <pkg>virtual/krb5</pkg>)</flag> |
49 |
<flag name="kubernetes">Build the kubernetes modify plugin (requires <pkg>net-misc/curl</pkg>)</flag> |
50 |
- <flag name="libressl">Use <pkg>dev-libs/libressl</pkg> for building the rfc5424hmac modify module (requires rfc5424hmac USE flag)</flag> |
51 |
+ <flag name="libressl">Use <pkg>dev-libs/libressl</pkg> instead of <pkg>dev-libs/openssl</pkg> (you still need to enable functionality which requires OpenSSL)</flag> |
52 |
<flag name="mdblookup">Build the MaxMind DB lookup message modify plugin using <pkg>dev-libs/libmaxminddb</pkg></flag> |
53 |
<flag name="mongodb">Build the MongoDB output module (requires <pkg>dev-libs/libmongo-client</pkg>)</flag> |
54 |
<flag name="mysql">Build the MySQL database output module (requires <pkg>virtual/mysql</pkg>)</flag> |
55 |
<flag name="normalize">Build the normalize modify module (requires <pkg>dev-libs/libee</pkg> and <pkg>dev-libs/liblognorm</pkg>)</flag> |
56 |
<flag name="omhttpfs">Build the httpfs output module (requires <pkg>net-misc/curl</pkg>)</flag> |
57 |
<flag name="omudpspoof">Build the udpspoof output module (requires <pkg>net-libs/libnet</pkg>)</flag> |
58 |
+ <flag name="openssl">Build the OpenSSL network stream driver (requires <pkg>dev-libs/openssl</pkg>)</flag> |
59 |
<flag name="postgres">Build the PostgreSQL database output module (requires <pkg>dev-db/postgresql</pkg>)</flag> |
60 |
<flag name="rabbitmq">Build the RabbitMQ output module (requires <pkg>net-libs/rabbitmq-c</pkg>)</flag> |
61 |
<flag name="redis">Build the Redis output module using (requires <pkg>dev-libs/hiredis</pkg>)</flag> |
62 |
@@ -33,6 +35,7 @@ |
63 |
<flag name="systemd">Build the journal input and output module (requires <pkg>sys-apps/systemd</pkg>)</flag> |
64 |
<flag name="uuid">Include UUIDs in messages (requires <pkg>sys-apps/util-linux</pkg>)</flag> |
65 |
<flag name="usertools">Installs the user tools (rsgtutil, rscryutil...) corresponding to the set USE flags</flag> |
66 |
+ <flag name="xxhash">Enable xxHash support in fmhash module (requires <pkg>dev-libs/xxhash</pkg>)</flag> |
67 |
<flag name="zeromq">Build the ZeroMQ input and output modules (requires <pkg>net-libs/czmq</pkg>)</flag> |
68 |
</use> |
69 |
<upstream> |
70 |
|
71 |
diff --git a/app-admin/rsyslog/rsyslog-8.36.0.ebuild b/app-admin/rsyslog/rsyslog-8.36.0.ebuild |
72 |
new file mode 100644 |
73 |
index 00000000000..023b88252ce |
74 |
--- /dev/null |
75 |
+++ b/app-admin/rsyslog/rsyslog-8.36.0.ebuild |
76 |
@@ -0,0 +1,476 @@ |
77 |
+# Copyright 1999-2018 Gentoo Foundation |
78 |
+# Distributed under the terms of the GNU General Public License v2 |
79 |
+ |
80 |
+EAPI="6" |
81 |
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
82 |
+ |
83 |
+inherit autotools eutils linux-info python-any-r1 systemd |
84 |
+ |
85 |
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" |
86 |
+HOMEPAGE="https://www.rsyslog.com/" |
87 |
+ |
88 |
+BRANCH="8-stable" |
89 |
+ |
90 |
+if [[ ${PV} == "9999" ]]; then |
91 |
+ EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" |
92 |
+ |
93 |
+ DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" |
94 |
+ |
95 |
+ inherit git-r3 |
96 |
+else |
97 |
+ MY_PV=${PV%_rc*} |
98 |
+ MY_FILENAME="${PN}-${PV}.tar.gz" |
99 |
+ MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz" |
100 |
+ S="${WORKDIR}/${PN}-${MY_PV}" |
101 |
+ |
102 |
+ # Upstream URL schema: |
103 |
+ # RC: https://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz |
104 |
+ # https://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz |
105 |
+ # Release: https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz |
106 |
+ |
107 |
+ MY_URL_PREFIX= |
108 |
+ if [[ ${PV} = *_rc* ]]; then |
109 |
+ _tmp_last_index=$(($(get_last_version_component_index ${PV})+1)) |
110 |
+ _tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV}) |
111 |
+ if [[ ${_tmp_suffix} = *rc* ]]; then |
112 |
+ MY_URL_PREFIX="${_tmp_suffix}/" |
113 |
+ fi |
114 |
+ |
115 |
+ # Cleaning up temporary variables |
116 |
+ unset _tmp_last_index |
117 |
+ unset _tmp_suffix |
118 |
+ else |
119 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" |
120 |
+ fi |
121 |
+ |
122 |
+ SRC_URI=" |
123 |
+ https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME} |
124 |
+ doc? ( https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} ) |
125 |
+ " |
126 |
+ |
127 |
+ PATCHES=() |
128 |
+fi |
129 |
+ |
130 |
+LICENSE="GPL-3 LGPL-3 Apache-2.0" |
131 |
+SLOT="0" |
132 |
+IUSE="curl dbi debug doc elasticsearch +gcrypt grok gnutls jemalloc kafka kerberos kubernetes libressl mdblookup" |
133 |
+IUSE+=" mongodb mysql normalize omhttpfs omudpspoof openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac" |
134 |
+IUSE+=" snmp ssl systemd test usertools +uuid xxhash zeromq" |
135 |
+ |
136 |
+RDEPEND=" |
137 |
+ >=dev-libs/libfastjson-0.99.8:= |
138 |
+ >=dev-libs/libestr-0.1.9 |
139 |
+ >=sys-libs/zlib-1.2.5 |
140 |
+ curl? ( >=net-misc/curl-7.35.0 ) |
141 |
+ dbi? ( >=dev-db/libdbi-0.8.3 ) |
142 |
+ elasticsearch? ( >=net-misc/curl-7.35.0 ) |
143 |
+ gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) |
144 |
+ grok? ( >=dev-libs/grok-0.9.2 ) |
145 |
+ jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) |
146 |
+ kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) |
147 |
+ kerberos? ( virtual/krb5 ) |
148 |
+ kubernetes? ( >=net-misc/curl-7.35.0 ) |
149 |
+ mdblookup? ( dev-libs/libmaxminddb:= ) |
150 |
+ mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) |
151 |
+ mysql? ( virtual/libmysqlclient:= ) |
152 |
+ normalize? ( |
153 |
+ >=dev-libs/libee-0.4.0 |
154 |
+ >=dev-libs/liblognorm-2.0.3:= |
155 |
+ ) |
156 |
+ omhttpfs? ( >=net-misc/curl-7.35.0 ) |
157 |
+ omudpspoof? ( >=net-libs/libnet-1.1.6 ) |
158 |
+ postgres? ( >=dev-db/postgresql-8.4.20:= ) |
159 |
+ rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) |
160 |
+ redis? ( >=dev-libs/hiredis-0.11.0:= ) |
161 |
+ relp? ( >=dev-libs/librelp-1.2.14:= ) |
162 |
+ rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) |
163 |
+ rfc5424hmac? ( |
164 |
+ !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) |
165 |
+ libressl? ( dev-libs/libressl:= ) |
166 |
+ ) |
167 |
+ snmp? ( >=net-analyzer/net-snmp-5.7.2 ) |
168 |
+ ssl? ( |
169 |
+ gnutls? ( >=net-libs/gnutls-2.12.23:0= ) |
170 |
+ openssl? ( |
171 |
+ !libressl? ( dev-libs/openssl:0= ) |
172 |
+ libressl? ( dev-libs/libressl:0= ) |
173 |
+ ) |
174 |
+ ) |
175 |
+ systemd? ( >=sys-apps/systemd-234 ) |
176 |
+ uuid? ( sys-apps/util-linux:0= ) |
177 |
+ xxhash? ( dev-libs/xxhash:= ) |
178 |
+ zeromq? ( |
179 |
+ >=net-libs/czmq-3.0.2 |
180 |
+ )" |
181 |
+DEPEND="${RDEPEND} |
182 |
+ >=sys-devel/autoconf-archive-2015.02.24 |
183 |
+ virtual/pkgconfig |
184 |
+ test? ( |
185 |
+ jemalloc? ( <sys-libs/libfaketime-0.9.7 ) |
186 |
+ !jemalloc? ( sys-libs/libfaketime ) |
187 |
+ ${PYTHON_DEPS} |
188 |
+ )" |
189 |
+ |
190 |
+REQUIRED_USE=" |
191 |
+ kubernetes? ( normalize ) |
192 |
+ ssl ( || ( gnutls openssl ) ) |
193 |
+" |
194 |
+ |
195 |
+if [[ ${PV} == "9999" ]]; then |
196 |
+ DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" |
197 |
+ DEPEND+=" >=sys-devel/flex-2.5.39-r1" |
198 |
+ DEPEND+=" >=sys-devel/bison-2.4.3" |
199 |
+ DEPEND+=" >=dev-python/docutils-0.12" |
200 |
+fi |
201 |
+ |
202 |
+CONFIG_CHECK="~INOTIFY_USER" |
203 |
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" |
204 |
+ |
205 |
+pkg_setup() { |
206 |
+ use test && python-any-r1_pkg_setup |
207 |
+} |
208 |
+ |
209 |
+src_unpack() { |
210 |
+ if [[ ${PV} == "9999" ]]; then |
211 |
+ git-r3_fetch |
212 |
+ git-r3_checkout |
213 |
+ else |
214 |
+ unpack ${P}.tar.gz |
215 |
+ fi |
216 |
+ |
217 |
+ if use doc; then |
218 |
+ if [[ ${PV} == "9999" ]]; then |
219 |
+ local _EGIT_BRANCH= |
220 |
+ if [[ -n "${EGIT_BRANCH}" ]]; then |
221 |
+ # Cannot use rsyslog commits/branches for documentation repository |
222 |
+ _EGIT_BRANCH=${EGIT_BRANCH} |
223 |
+ unset EGIT_BRANCH |
224 |
+ fi |
225 |
+ |
226 |
+ git-r3_fetch "${DOC_REPO_URI}" |
227 |
+ git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs |
228 |
+ |
229 |
+ if [[ -n "${_EGIT_BRANCH}" ]]; then |
230 |
+ # Restore previous EGIT_BRANCH information |
231 |
+ EGIT_BRANCH=${_EGIT_BRANCH} |
232 |
+ fi |
233 |
+ else |
234 |
+ cd "${S}" || die "Cannot change dir into '${S}'" |
235 |
+ mkdir docs || die "Failed to create docs directory" |
236 |
+ cd docs || die "Failed to change dir into '${S}/docs'" |
237 |
+ unpack ${MY_FILENAME_DOCS} |
238 |
+ fi |
239 |
+ fi |
240 |
+} |
241 |
+ |
242 |
+src_prepare() { |
243 |
+ default |
244 |
+ |
245 |
+ eautoreconf |
246 |
+} |
247 |
+ |
248 |
+src_configure() { |
249 |
+ # Maintainer notes: |
250 |
+ # * Guardtime support is missing because libgt isn't yet available |
251 |
+ # in portage. |
252 |
+ # * Hadoop's HDFS file system output module is currently not |
253 |
+ # supported in Gentoo because nobody is able to test it |
254 |
+ # (JAVA dependency). |
255 |
+ # * dev-libs/hiredis doesn't provide pkg-config (see #504614, |
256 |
+ # upstream PR 129 and 136) so we need to export HIREDIS_* |
257 |
+ # variables because rsyslog's build system depends on pkg-config. |
258 |
+ |
259 |
+ if use redis; then |
260 |
+ export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" |
261 |
+ export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" |
262 |
+ fi |
263 |
+ |
264 |
+ local myeconfargs=( |
265 |
+ --disable-debug-symbols |
266 |
+ --disable-generate-man-pages |
267 |
+ --without-valgrind-testbench |
268 |
+ --disable-liblogging-stdlog |
269 |
+ $(use_enable test testbench) |
270 |
+ # Input Plugins without depedencies |
271 |
+ --enable-imdiag |
272 |
+ --enable-imfile |
273 |
+ --enable-impstats |
274 |
+ --enable-imptcp |
275 |
+ # Message Modificiation Plugins without depedencies |
276 |
+ --enable-mmanon |
277 |
+ --enable-mmaudit |
278 |
+ --enable-mmcount |
279 |
+ --enable-mmfields |
280 |
+ --enable-mmjsonparse |
281 |
+ --enable-mmpstrucdata |
282 |
+ --enable-mmrm1stspace |
283 |
+ --enable-mmsequence |
284 |
+ --enable-mmutf8fix |
285 |
+ # Output Modification Plugins without dependencies |
286 |
+ --enable-mail |
287 |
+ --enable-omprog |
288 |
+ --enable-omruleset |
289 |
+ --enable-omstdout |
290 |
+ --enable-omuxsock |
291 |
+ # Misc |
292 |
+ --enable-fmhash |
293 |
+ $(use_enable xxhash fmhash-xxhash) |
294 |
+ --enable-pmaixforwardedfrom |
295 |
+ --enable-pmciscoios |
296 |
+ --enable-pmcisconames |
297 |
+ --enable-pmlastmsg |
298 |
+ --enable-pmsnare |
299 |
+ # DB |
300 |
+ $(use_enable dbi libdbi) |
301 |
+ $(use_enable mongodb ommongodb) |
302 |
+ $(use_enable mysql) |
303 |
+ $(use_enable postgres pgsql) |
304 |
+ $(use_enable redis omhiredis) |
305 |
+ # Debug |
306 |
+ $(use_enable debug) |
307 |
+ $(use_enable debug diagtools) |
308 |
+ $(use_enable debug memcheck) |
309 |
+ $(use_enable debug valgrind) |
310 |
+ # Misc |
311 |
+ $(use_enable curl fmhttp) |
312 |
+ $(use_enable elasticsearch) |
313 |
+ $(use_enable gcrypt libgcrypt) |
314 |
+ $(use_enable jemalloc) |
315 |
+ $(use_enable kafka imkafka) |
316 |
+ $(use_enable kafka omkafka) |
317 |
+ $(use_enable kerberos gssapi-krb5) |
318 |
+ $(use_enable kubernetes mmkubernetes) |
319 |
+ $(use_enable normalize mmnormalize) |
320 |
+ $(use_enable mdblookup mmdblookup) |
321 |
+ $(use_enable grok mmgrok) |
322 |
+ $(use_enable omhttpfs) |
323 |
+ $(use_enable omudpspoof) |
324 |
+ $(use_enable rabbitmq omrabbitmq) |
325 |
+ $(use_enable relp) |
326 |
+ $(use_enable rfc3195) |
327 |
+ $(use_enable rfc5424hmac mmrfc5424addhmac) |
328 |
+ $(use_enable snmp) |
329 |
+ $(use_enable snmp mmsnmptrapd) |
330 |
+ $(use_enable gnutls) |
331 |
+ $(use_enable openssl) |
332 |
+ $(use_enable systemd imjournal) |
333 |
+ $(use_enable systemd omjournal) |
334 |
+ $(use_enable usertools) |
335 |
+ $(use_enable uuid) |
336 |
+ $(use_enable zeromq imczmq) |
337 |
+ $(use_enable zeromq omczmq) |
338 |
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
339 |
+ ) |
340 |
+ |
341 |
+ econf "${myeconfargs[@]}" |
342 |
+} |
343 |
+ |
344 |
+src_compile() { |
345 |
+ default |
346 |
+ |
347 |
+ if use doc && [[ "${PV}" == "9999" ]]; then |
348 |
+ einfo "Building documentation ..." |
349 |
+ local doc_dir="${S}/docs" |
350 |
+ cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" |
351 |
+ sphinx-build -b html source build || die "Building documentation failed!" |
352 |
+ fi |
353 |
+} |
354 |
+ |
355 |
+src_test() { |
356 |
+ local _has_increased_ulimit= |
357 |
+ |
358 |
+ # Sometimes tests aren't executable (i.e. when added via patch) |
359 |
+ einfo "Adjusting permissions of test scripts ..." |
360 |
+ find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \ |
361 |
+ die "Failed to adjust test scripts permission" |
362 |
+ |
363 |
+ if ulimit -n 3072; then |
364 |
+ _has_increased_ulimit="true" |
365 |
+ fi |
366 |
+ |
367 |
+ if ! emake --jobs 1 check; then |
368 |
+ eerror "Test suite failed! :(" |
369 |
+ |
370 |
+ if [[ -z "${_has_increased_ulimit}" ]]; then |
371 |
+ eerror "Probably because open file limit couldn't be set to 3072." |
372 |
+ fi |
373 |
+ |
374 |
+ if has userpriv ${FEATURES}; then |
375 |
+ eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \ |
376 |
+ "before you submit a bug report." |
377 |
+ fi |
378 |
+ |
379 |
+ fi |
380 |
+} |
381 |
+ |
382 |
+src_install() { |
383 |
+ local DOCS=( |
384 |
+ AUTHORS |
385 |
+ ChangeLog |
386 |
+ "${FILESDIR}"/${BRANCH}/README.gentoo |
387 |
+ ) |
388 |
+ |
389 |
+ use doc && local HTML_DOCS=( "${S}/docs/build/." ) |
390 |
+ |
391 |
+ default |
392 |
+ |
393 |
+ newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN} |
394 |
+ newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN} |
395 |
+ |
396 |
+ keepdir /var/empty/dev |
397 |
+ keepdir /var/spool/${PN} |
398 |
+ keepdir /etc/ssl/${PN} |
399 |
+ keepdir /etc/${PN}.d |
400 |
+ |
401 |
+ insinto /etc |
402 |
+ newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf |
403 |
+ |
404 |
+ insinto /etc/rsyslog.d/ |
405 |
+ newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf |
406 |
+ |
407 |
+ insinto /etc/logrotate.d/ |
408 |
+ newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN} |
409 |
+ |
410 |
+ if use mysql; then |
411 |
+ insinto /usr/share/doc/${PF}/scripts/mysql |
412 |
+ doins plugins/ommysql/createDB.sql |
413 |
+ fi |
414 |
+ |
415 |
+ if use postgres; then |
416 |
+ insinto /usr/share/doc/${PF}/scripts/pgsql |
417 |
+ doins plugins/ompgsql/createDB.sql |
418 |
+ fi |
419 |
+ |
420 |
+ prune_libtool_files --modules |
421 |
+} |
422 |
+ |
423 |
+pkg_postinst() { |
424 |
+ local advertise_readme=0 |
425 |
+ |
426 |
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then |
427 |
+ # This is a new installation |
428 |
+ |
429 |
+ advertise_readme=1 |
430 |
+ |
431 |
+ if use mysql || use postgres; then |
432 |
+ echo |
433 |
+ elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" |
434 |
+ elog " /usr/share/doc/${PF}/scripts" |
435 |
+ fi |
436 |
+ |
437 |
+ if use ssl; then |
438 |
+ echo |
439 |
+ elog "To create a default CA and certificates for your server and clients, run:" |
440 |
+ elog " emerge --config =${PF}" |
441 |
+ elog "on your logging server. You can run it several times," |
442 |
+ elog "once for each logging client. The client certificates will be signed" |
443 |
+ elog "using the CA certificate generated during the first run." |
444 |
+ fi |
445 |
+ fi |
446 |
+ |
447 |
+ if [[ ${advertise_readme} -gt 0 ]]; then |
448 |
+ # We need to show the README file location |
449 |
+ |
450 |
+ echo "" |
451 |
+ elog "Please read" |
452 |
+ elog "" |
453 |
+ elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" |
454 |
+ elog "" |
455 |
+ elog "for more details." |
456 |
+ fi |
457 |
+} |
458 |
+ |
459 |
+pkg_config() { |
460 |
+ if ! use ssl ; then |
461 |
+ einfo "There is nothing to configure for rsyslog unless you" |
462 |
+ einfo "used USE=ssl to build it." |
463 |
+ return 0 |
464 |
+ fi |
465 |
+ |
466 |
+ # Make sure the certificates directory exists |
467 |
+ local CERTDIR="${EROOT}/etc/ssl/${PN}" |
468 |
+ if [[ ! -d "${CERTDIR}" ]]; then |
469 |
+ mkdir "${CERTDIR}" || die |
470 |
+ fi |
471 |
+ einfo "Your certificates will be stored in ${CERTDIR}" |
472 |
+ |
473 |
+ # Create a default CA if needed |
474 |
+ if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then |
475 |
+ einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." |
476 |
+ certtool --generate-privkey \ |
477 |
+ --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null |
478 |
+ chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
479 |
+ |
480 |
+ cat > "${T}/${PF}.$$" <<- _EOF |
481 |
+ cn = Portage automated CA |
482 |
+ ca |
483 |
+ cert_signing_key |
484 |
+ expiration_days = 3650 |
485 |
+ _EOF |
486 |
+ |
487 |
+ certtool --generate-self-signed \ |
488 |
+ --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
489 |
+ --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ |
490 |
+ --template "${T}/${PF}.$$" &>/dev/null |
491 |
+ chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
492 |
+ |
493 |
+ # Create the server certificate |
494 |
+ echo |
495 |
+ einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " |
496 |
+ read -r CN |
497 |
+ |
498 |
+ einfo "Creating private key and certificate for server ${CN}..." |
499 |
+ certtool --generate-privkey \ |
500 |
+ --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
501 |
+ chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
502 |
+ |
503 |
+ cat > "${T}/${PF}.$$" <<- _EOF |
504 |
+ cn = ${CN} |
505 |
+ tls_www_server |
506 |
+ dns_name = ${CN} |
507 |
+ expiration_days = 3650 |
508 |
+ _EOF |
509 |
+ |
510 |
+ certtool --generate-certificate \ |
511 |
+ --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
512 |
+ --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
513 |
+ --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
514 |
+ --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
515 |
+ --template "${T}/${PF}.$$" &>/dev/null |
516 |
+ chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
517 |
+ |
518 |
+ else |
519 |
+ einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." |
520 |
+ fi |
521 |
+ |
522 |
+ # Create a client certificate |
523 |
+ echo |
524 |
+ einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " |
525 |
+ read -r CN |
526 |
+ |
527 |
+ einfo "Creating private key and certificate for client ${CN}..." |
528 |
+ certtool --generate-privkey \ |
529 |
+ --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
530 |
+ chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
531 |
+ |
532 |
+ cat > "${T}/${PF}.$$" <<- _EOF |
533 |
+ cn = ${CN} |
534 |
+ tls_www_client |
535 |
+ dns_name = ${CN} |
536 |
+ expiration_days = 3650 |
537 |
+ _EOF |
538 |
+ |
539 |
+ certtool --generate-certificate \ |
540 |
+ --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
541 |
+ --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
542 |
+ --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
543 |
+ --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
544 |
+ --template "${T}/${PF}.$$" &>/dev/null |
545 |
+ chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
546 |
+ |
547 |
+ rm -f "${T}/${PF}.$$" |
548 |
+ |
549 |
+ echo |
550 |
+ einfo "Here is the documentation on how to encrypt your log traffic:" |
551 |
+ einfo " https://www.rsyslog.com/doc/rsyslog_tls.html" |
552 |
+} |
553 |
|
554 |
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask |
555 |
index 5b2605e0970..ed5b4ebf574 100644 |
556 |
--- a/profiles/arch/arm/package.use.mask |
557 |
+++ b/profiles/arch/arm/package.use.mask |
558 |
@@ -1,6 +1,10 @@ |
559 |
# Copyright 1999-2018 Gentoo Foundation |
560 |
# Distributed under the terms of the GNU General Public License v2 |
561 |
|
562 |
+# Thomas Deutschmann <whissi@g.o> (04 Jul 2018) |
563 |
+# dev-libs/xxhash not keyworded for arm |
564 |
+app-admin/rsyslog xxhash |
565 |
+ |
566 |
# Andreas Sturmlechner <asturm@g.o> (18 May 2018) |
567 |
# kde-plasma/plasma-browser-integration not yet keyworded, bug #659936 |
568 |
kde-plasma/plasma-meta browser-integration |
569 |
|
570 |
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask |
571 |
index 39ef1e73ab5..88dbd0dff5f 100644 |
572 |
--- a/profiles/arch/arm64/package.use.mask |
573 |
+++ b/profiles/arch/arm64/package.use.mask |
574 |
@@ -1,6 +1,10 @@ |
575 |
# Copyright 1999-2018 Gentoo Foundation |
576 |
# Distributed under the terms of the GNU General Public License v2 |
577 |
|
578 |
+# Thomas Deutschmann <whissi@g.o> (04 Jul 2018) |
579 |
+# dev-libs/xxhash not keyworded for arm64 |
580 |
+app-admin/rsyslog xxhash |
581 |
+ |
582 |
# Tomáš Mózes <hydrapolic@×××××.com> (19 Jun 2018) |
583 |
# Needs dev-libs/libmaxminddb which isn't keyworded |
584 |
www-servers/nginx nginx_modules_http_geoip2 nginx_modules_stream_geoip2 |
585 |
|
586 |
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask |
587 |
index f7b6072c7a5..f240bc4fdb4 100644 |
588 |
--- a/profiles/arch/hppa/package.use.mask |
589 |
+++ b/profiles/arch/hppa/package.use.mask |
590 |
@@ -4,6 +4,10 @@ |
591 |
# NOTE: When masking a USE flag due to missing keywords, please file a keyword |
592 |
# request bug for the hppa arch. |
593 |
|
594 |
+# Thomas Deutschmann <whissi@g.o> (04 Jul 2018) |
595 |
+# dev-libs/xxhash not keyworded for hppa |
596 |
+app-admin/rsyslog xxhash |
597 |
+ |
598 |
# Jeroen Roovers (jer@g.o) (22 Mar 2018) |
599 |
# dev-ruby/capybara depends on www-client/firefox which has not been ported to |
600 |
# HPPA |