Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/
Date: Sat, 03 Nov 2018 22:44:04
Message-Id: 1541285033.97bc562729abf141e95bdf2a35abab5f89736ab5.whissi@gentoo
1 commit: 97bc562729abf141e95bdf2a35abab5f89736ab5
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 3 22:43:53 2018 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 3 22:43:53 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97bc5627
7
8 app-admin/rsyslog: drop old
9
10 Package-Manager: Portage-2.3.51, Repoman-2.3.11
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 app-admin/rsyslog/Manifest | 4 -
14 app-admin/rsyslog/rsyslog-8.36.0-r1.ebuild | 451 ----------------------------
15 app-admin/rsyslog/rsyslog-8.37.0.ebuild | 454 -----------------------------
16 3 files changed, 909 deletions(-)
17
18 diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
19 index 0b8817b7a28..05b6f702c77 100644
20 --- a/app-admin/rsyslog/Manifest
21 +++ b/app-admin/rsyslog/Manifest
22 @@ -1,10 +1,6 @@
23 DIST rsyslog-8.35.0.tar.gz 2590108 BLAKE2B e201c1366b8ab96c070829d51de079212e82216a793eb7622aa91c66e2330981de8be547b1ee7f102ed7d8c8de054d58ba151e95238146a61fba8fe908c5f929 SHA512 3b8845fc057147c2dd740b3bb432e7fb101ad60be5c6bc86a2c2796bcd3f3526c617d45b9e8301388d51047a125ca18ba4ac54f8be2a13eabbbe8fb9361beecc
24 -DIST rsyslog-8.36.0.tar.gz 2639477 BLAKE2B 9c7343d853f79e2955a8999e2871a2a9b008cb3ef75b94e2381a3a0ff3e49445593d852d7de3819851dc0d4c17a91d966ca2fbfd52e8215ebdbaf6b7ccd68bdf SHA512 b0c8689374b5b0fb5ad9675ad8983ce67bd04d34ad07d39cf8f91498fd2fd21a173f1077e5fa1b66a89a9d93ab011fc6345ac1a3be9961f4794fc9e152c32a50
25 -DIST rsyslog-8.37.0.tar.gz 2697435 BLAKE2B d88a06e8a5da15ed88d0d6c92032f71be10c2b77970e26b8fe5258e116f8f635c2e359408260b8e486401b8d9ea0e234e22070f520d42bb7884923df4f216ee3 SHA512 2989eb7ed3333151e979a720fa0e95e330bda9b40f65009f7969069bcbbeee8f493c6a3189f67bbbc2529d3a2ac14a022d7e8c4f2d0dae42b67d7508d7611fa0
26 DIST rsyslog-8.38.0.tar.gz 2721798 BLAKE2B 578bc9eefce4893a9c1eb54ee7360cd9fa51b3c87ffe07a0fd5b122987f991835f603417243084de0b59286e993ad1c84237e61c44bc18457b3660668421101b SHA512 9dc3bdc4ef01c2af433478e182704694cb50849d811d476a03e4ce03b3c5aecfb506e7f1c1e51fadcd63da60b067d8011b92b8c9354a688fe66f7b6ffd8f9254
27 DIST rsyslog-8.39.0.tar.gz 2721560 BLAKE2B 0680cb31d0a07e5676a5c5626e46fa174b8df08ceec49b514624ff8ffeb750bbf199f73af1d89b9dfad121a292084d75b0a1218fb33138f1d7a149fd730cb3d9 SHA512 f46ead433f703df4af6ddc4bbb178ea145d7d2a35ee7749c32b9889f299ba20c83ed76c246530608198e84fef1f2bf10097344c31d5df38b9e0ae47cf4bee479
28 DIST rsyslog-doc-8.35.0.tar.gz 7427270 BLAKE2B 5441080c07a8398cd5d513ba6abe0335f62762f105354105549f0440c0429c62a4f28a4cc84a71d049bc8134cd64bda2c2210a2f30fd5b94f53e0bc783e7c8d1 SHA512 f78d0451eef789d60f7c5ae1eed46c4a9f7a6ade73b829f65aa2373aa786b00e84e8957089532b1b652838bd9f62b41d92530276a0d27e21b8e94d5f0e4728a6
29 -DIST rsyslog-doc-8.36.0.tar.gz 7570338 BLAKE2B 031f94b88fb97e6c8b01d224279138c371a5f54ecc5d7a9298b4ec6351c5d380065877888ab1969386b76b9e715937b7335bee59c3d5b8ddd4910392a58d08cb SHA512 a93f56c9c9464a9ca87f61169c6fcfaa94608f31210eaac77e882e64bf5f514c887765db6bb57e4defafeb2a6e552506f0274c1ed275306efc1656f5520b5efa
30 -DIST rsyslog-doc-8.37.0.tar.gz 7587722 BLAKE2B 266e5be77e4ca91e3777ee4f2c999986ee7318287546c1fb84ee21f1f4995907fa8caac84ef47cec2665ef29f34151b4b22ed6c35ea1ffe0c4ddff8d05e23136 SHA512 827ac6762ad9257d9499201d5dc3d110c65f11891ab58d36dce568ffa5f8b57fe10505bc2c7b0743dcca319f294ba6418a880b7ca787eb19dcc1f262ba0f3b59
31 DIST rsyslog-doc-8.38.0.tar.gz 7662314 BLAKE2B 57a121950a3f6630e4736a1ff998e93b543389107d146ddb148ecd2702bb208d21a7f4d77f2fd958f2a56e092341fc6a24ed1cc80a910cb1adb54c65b5b2da04 SHA512 e28a09ae2fcddc711d2cfd31207c9862192598e49964a47b41fc8fa3ae5b1e08b7e2589fb5af859d58d4bf028574eb56cac6514401aa56cb482fa1166863e6a5
32 DIST rsyslog-doc-8.39.0.tar.gz 7674833 BLAKE2B 1526e0637c3ab9846f447dcea48efbfd17aa517c2fc875c46ac190428db6aa2a0f81f8aaed6e5b0b6991a5c13f45bc818be76c0fe4444c0eb45628ebf48b4956 SHA512 a6d09d384616a264fdf6e09fa0f61bd82a42340bac426d93119e11158f293dd58f894623aca30f2137e51bf701531f07938d014c9b8ec97d0a796447de3089de
33
34 diff --git a/app-admin/rsyslog/rsyslog-8.36.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.36.0-r1.ebuild
35 deleted file mode 100644
36 index 0dedd07fd39..00000000000
37 --- a/app-admin/rsyslog/rsyslog-8.36.0-r1.ebuild
38 +++ /dev/null
39 @@ -1,451 +0,0 @@
40 -# Copyright 1999-2018 Gentoo Authors
41 -# Distributed under the terms of the GNU General Public License v2
42 -
43 -EAPI="6"
44 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
45 -
46 -inherit autotools eutils linux-info python-any-r1 systemd
47 -
48 -DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
49 -HOMEPAGE="https://www.rsyslog.com/"
50 -
51 -if [[ ${PV} == "9999" ]]; then
52 - EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
53 -
54 - DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
55 -
56 - inherit git-r3
57 -else
58 - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
59 -
60 - SRC_URI="
61 - https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
62 - doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
63 - "
64 -
65 - PATCHES=()
66 -fi
67 -
68 -LICENSE="GPL-3 LGPL-3 Apache-2.0"
69 -SLOT="0"
70 -IUSE="curl dbi debug doc elasticsearch +gcrypt grok gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
71 -IUSE+=" mongodb mysql normalize omhttpfs omudpspoof openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac"
72 -IUSE+=" snmp ssl systemd test usertools +uuid xxhash zeromq"
73 -
74 -RDEPEND="
75 - >=dev-libs/libfastjson-0.99.8:=
76 - >=dev-libs/libestr-0.1.9
77 - >=sys-libs/zlib-1.2.5
78 - curl? ( >=net-misc/curl-7.35.0 )
79 - dbi? ( >=dev-db/libdbi-0.8.3 )
80 - elasticsearch? ( >=net-misc/curl-7.35.0 )
81 - gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
82 - grok? ( >=dev-libs/grok-0.9.2 )
83 - jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
84 - kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
85 - kerberos? ( virtual/krb5 )
86 - kubernetes? ( >=net-misc/curl-7.35.0 )
87 - mdblookup? ( dev-libs/libmaxminddb:= )
88 - mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
89 - mysql? ( virtual/libmysqlclient:= )
90 - normalize? (
91 - >=dev-libs/libee-0.4.0
92 - >=dev-libs/liblognorm-2.0.3:=
93 - )
94 - omhttpfs? ( >=net-misc/curl-7.35.0 )
95 - omudpspoof? ( >=net-libs/libnet-1.1.6 )
96 - postgres? ( >=dev-db/postgresql-8.4.20:= )
97 - rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
98 - redis? ( >=dev-libs/hiredis-0.11.0:= )
99 - relp? ( >=dev-libs/librelp-1.2.14:= )
100 - rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
101 - rfc5424hmac? (
102 - !libressl? ( >=dev-libs/openssl-0.9.8y:0= )
103 - libressl? ( dev-libs/libressl:= )
104 - )
105 - snmp? ( >=net-analyzer/net-snmp-5.7.2 )
106 - ssl? (
107 - gnutls? ( >=net-libs/gnutls-2.12.23:0= )
108 - openssl? (
109 - !libressl? ( dev-libs/openssl:0= )
110 - libressl? ( dev-libs/libressl:0= )
111 - )
112 - )
113 - systemd? ( >=sys-apps/systemd-234 )
114 - uuid? ( sys-apps/util-linux:0= )
115 - xxhash? ( dev-libs/xxhash:= )
116 - zeromq? (
117 - >=net-libs/czmq-3.0.2
118 - )"
119 -DEPEND="${RDEPEND}
120 - >=sys-devel/autoconf-archive-2015.02.24
121 - virtual/pkgconfig
122 - test? (
123 - jemalloc? ( <sys-libs/libfaketime-0.9.7 )
124 - !jemalloc? ( sys-libs/libfaketime )
125 - ${PYTHON_DEPS}
126 - )"
127 -
128 -REQUIRED_USE="
129 - kubernetes? ( normalize )
130 - ssl? ( || ( gnutls openssl ) )
131 -"
132 -
133 -if [[ ${PV} == "9999" ]]; then
134 - DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
135 - DEPEND+=" >=sys-devel/flex-2.5.39-r1"
136 - DEPEND+=" >=sys-devel/bison-2.4.3"
137 - DEPEND+=" >=dev-python/docutils-0.12"
138 -fi
139 -
140 -CONFIG_CHECK="~INOTIFY_USER"
141 -WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
142 -
143 -pkg_setup() {
144 - use test && python-any-r1_pkg_setup
145 -}
146 -
147 -src_unpack() {
148 - if [[ ${PV} == "9999" ]]; then
149 - git-r3_fetch
150 - git-r3_checkout
151 - else
152 - unpack ${P}.tar.gz
153 - fi
154 -
155 - if use doc; then
156 - if [[ ${PV} == "9999" ]]; then
157 - local _EGIT_BRANCH=
158 - if [[ -n "${EGIT_BRANCH}" ]]; then
159 - # Cannot use rsyslog commits/branches for documentation repository
160 - _EGIT_BRANCH=${EGIT_BRANCH}
161 - unset EGIT_BRANCH
162 - fi
163 -
164 - git-r3_fetch "${DOC_REPO_URI}"
165 - git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
166 -
167 - if [[ -n "${_EGIT_BRANCH}" ]]; then
168 - # Restore previous EGIT_BRANCH information
169 - EGIT_BRANCH=${_EGIT_BRANCH}
170 - fi
171 - else
172 - cd "${S}" || die "Cannot change dir into '${S}'"
173 - mkdir docs || die "Failed to create docs directory"
174 - cd docs || die "Failed to change dir into '${S}/docs'"
175 - unpack ${PN}-doc-${PV}.tar.gz
176 - fi
177 - fi
178 -}
179 -
180 -src_prepare() {
181 - default
182 -
183 - eautoreconf
184 -}
185 -
186 -src_configure() {
187 - # Maintainer notes:
188 - # * Guardtime support is missing because libgt isn't yet available
189 - # in portage.
190 - # * Hadoop's HDFS file system output module is currently not
191 - # supported in Gentoo because nobody is able to test it
192 - # (JAVA dependency).
193 - # * dev-libs/hiredis doesn't provide pkg-config (see #504614,
194 - # upstream PR 129 and 136) so we need to export HIREDIS_*
195 - # variables because rsyslog's build system depends on pkg-config.
196 -
197 - if use redis; then
198 - export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
199 - export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
200 - fi
201 -
202 - local myeconfargs=(
203 - --disable-debug-symbols
204 - --disable-generate-man-pages
205 - --without-valgrind-testbench
206 - --disable-liblogging-stdlog
207 - $(use_enable test testbench)
208 - # Input Plugins without depedencies
209 - --enable-imdiag
210 - --enable-imfile
211 - --enable-impstats
212 - --enable-imptcp
213 - # Message Modificiation Plugins without depedencies
214 - --enable-mmanon
215 - --enable-mmaudit
216 - --enable-mmcount
217 - --enable-mmfields
218 - --enable-mmjsonparse
219 - --enable-mmpstrucdata
220 - --enable-mmrm1stspace
221 - --enable-mmsequence
222 - --enable-mmutf8fix
223 - # Output Modification Plugins without dependencies
224 - --enable-mail
225 - --enable-omprog
226 - --enable-omruleset
227 - --enable-omstdout
228 - --enable-omuxsock
229 - # Misc
230 - --enable-fmhash
231 - $(use_enable xxhash fmhash-xxhash)
232 - --enable-pmaixforwardedfrom
233 - --enable-pmciscoios
234 - --enable-pmcisconames
235 - --enable-pmlastmsg
236 - --enable-pmsnare
237 - # DB
238 - $(use_enable dbi libdbi)
239 - $(use_enable mongodb ommongodb)
240 - $(use_enable mysql)
241 - $(use_enable postgres pgsql)
242 - $(use_enable redis omhiredis)
243 - # Debug
244 - $(use_enable debug)
245 - $(use_enable debug diagtools)
246 - $(use_enable debug memcheck)
247 - $(use_enable debug valgrind)
248 - # Misc
249 - $(use_enable curl fmhttp)
250 - $(use_enable elasticsearch)
251 - $(use_enable gcrypt libgcrypt)
252 - $(use_enable jemalloc)
253 - $(use_enable kafka imkafka)
254 - $(use_enable kafka omkafka)
255 - $(use_enable kerberos gssapi-krb5)
256 - $(use_enable kubernetes mmkubernetes)
257 - $(use_enable normalize mmnormalize)
258 - $(use_enable mdblookup mmdblookup)
259 - $(use_enable grok mmgrok)
260 - $(use_enable omhttpfs)
261 - $(use_enable omudpspoof)
262 - $(use_enable rabbitmq omrabbitmq)
263 - $(use_enable relp)
264 - $(use_enable rfc3195)
265 - $(use_enable rfc5424hmac mmrfc5424addhmac)
266 - $(use_enable snmp)
267 - $(use_enable snmp mmsnmptrapd)
268 - $(use_enable gnutls)
269 - $(use_enable openssl)
270 - $(use_enable systemd imjournal)
271 - $(use_enable systemd omjournal)
272 - $(use_enable usertools)
273 - $(use_enable uuid)
274 - $(use_enable zeromq imczmq)
275 - $(use_enable zeromq omczmq)
276 - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
277 - )
278 -
279 - econf "${myeconfargs[@]}"
280 -}
281 -
282 -src_compile() {
283 - default
284 -
285 - if use doc && [[ "${PV}" == "9999" ]]; then
286 - einfo "Building documentation ..."
287 - local doc_dir="${S}/docs"
288 - cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
289 - sphinx-build -b html source build || die "Building documentation failed!"
290 - fi
291 -}
292 -
293 -src_test() {
294 - local _has_increased_ulimit=
295 -
296 - # Sometimes tests aren't executable (i.e. when added via patch)
297 - einfo "Adjusting permissions of test scripts ..."
298 - find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
299 - die "Failed to adjust test scripts permission"
300 -
301 - if ulimit -n 3072; then
302 - _has_increased_ulimit="true"
303 - fi
304 -
305 - if ! emake --jobs 1 check; then
306 - eerror "Test suite failed! :("
307 -
308 - if [[ -z "${_has_increased_ulimit}" ]]; then
309 - eerror "Probably because open file limit couldn't be set to 3072."
310 - fi
311 -
312 - if has userpriv ${FEATURES}; then
313 - eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
314 - "before you submit a bug report."
315 - fi
316 -
317 - fi
318 -}
319 -
320 -src_install() {
321 - local DOCS=(
322 - AUTHORS
323 - ChangeLog
324 - "${FILESDIR}"/README.gentoo
325 - )
326 -
327 - use doc && local HTML_DOCS=( "${S}/docs/build/." )
328 -
329 - default
330 -
331 - newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
332 - newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
333 -
334 - keepdir /var/empty/dev
335 - keepdir /var/spool/${PN}
336 - keepdir /etc/ssl/${PN}
337 - keepdir /etc/${PN}.d
338 -
339 - insinto /etc
340 - newins "${FILESDIR}/${PN}.conf" ${PN}.conf
341 -
342 - insinto /etc/rsyslog.d/
343 - newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
344 -
345 - insinto /etc/logrotate.d/
346 - newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
347 -
348 - if use mysql; then
349 - insinto /usr/share/doc/${PF}/scripts/mysql
350 - doins plugins/ommysql/createDB.sql
351 - fi
352 -
353 - if use postgres; then
354 - insinto /usr/share/doc/${PF}/scripts/pgsql
355 - doins plugins/ompgsql/createDB.sql
356 - fi
357 -
358 - prune_libtool_files --modules
359 -}
360 -
361 -pkg_postinst() {
362 - local advertise_readme=0
363 -
364 - if [[ -z "${REPLACING_VERSIONS}" ]]; then
365 - # This is a new installation
366 -
367 - advertise_readme=1
368 -
369 - if use mysql || use postgres; then
370 - echo
371 - elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
372 - elog " /usr/share/doc/${PF}/scripts"
373 - fi
374 -
375 - if use ssl; then
376 - echo
377 - elog "To create a default CA and certificates for your server and clients, run:"
378 - elog " emerge --config =${PF}"
379 - elog "on your logging server. You can run it several times,"
380 - elog "once for each logging client. The client certificates will be signed"
381 - elog "using the CA certificate generated during the first run."
382 - fi
383 - fi
384 -
385 - if [[ ${advertise_readme} -gt 0 ]]; then
386 - # We need to show the README file location
387 -
388 - echo ""
389 - elog "Please read"
390 - elog ""
391 - elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
392 - elog ""
393 - elog "for more details."
394 - fi
395 -}
396 -
397 -pkg_config() {
398 - if ! use ssl ; then
399 - einfo "There is nothing to configure for rsyslog unless you"
400 - einfo "used USE=ssl to build it."
401 - return 0
402 - fi
403 -
404 - # Make sure the certificates directory exists
405 - local CERTDIR="${EROOT}/etc/ssl/${PN}"
406 - if [[ ! -d "${CERTDIR}" ]]; then
407 - mkdir "${CERTDIR}" || die
408 - fi
409 - einfo "Your certificates will be stored in ${CERTDIR}"
410 -
411 - # Create a default CA if needed
412 - if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
413 - einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
414 - certtool --generate-privkey \
415 - --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
416 - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
417 -
418 - cat > "${T}/${PF}.$$" <<- _EOF
419 - cn = Portage automated CA
420 - ca
421 - cert_signing_key
422 - expiration_days = 3650
423 - _EOF
424 -
425 - certtool --generate-self-signed \
426 - --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
427 - --outfile "${CERTDIR}/${PN}_ca.cert.pem" \
428 - --template "${T}/${PF}.$$" &>/dev/null
429 - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
430 -
431 - # Create the server certificate
432 - echo
433 - einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
434 - read -r CN
435 -
436 - einfo "Creating private key and certificate for server ${CN}..."
437 - certtool --generate-privkey \
438 - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
439 - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
440 -
441 - cat > "${T}/${PF}.$$" <<- _EOF
442 - cn = ${CN}
443 - tls_www_server
444 - dns_name = ${CN}
445 - expiration_days = 3650
446 - _EOF
447 -
448 - certtool --generate-certificate \
449 - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
450 - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
451 - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
452 - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
453 - --template "${T}/${PF}.$$" &>/dev/null
454 - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
455 -
456 - else
457 - einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
458 - fi
459 -
460 - # Create a client certificate
461 - echo
462 - einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
463 - read -r CN
464 -
465 - einfo "Creating private key and certificate for client ${CN}..."
466 - certtool --generate-privkey \
467 - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
468 - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
469 -
470 - cat > "${T}/${PF}.$$" <<- _EOF
471 - cn = ${CN}
472 - tls_www_client
473 - dns_name = ${CN}
474 - expiration_days = 3650
475 - _EOF
476 -
477 - certtool --generate-certificate \
478 - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
479 - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
480 - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
481 - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
482 - --template "${T}/${PF}.$$" &>/dev/null
483 - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
484 -
485 - rm -f "${T}/${PF}.$$"
486 -
487 - echo
488 - einfo "Here is the documentation on how to encrypt your log traffic:"
489 - einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
490 -}
491
492 diff --git a/app-admin/rsyslog/rsyslog-8.37.0.ebuild b/app-admin/rsyslog/rsyslog-8.37.0.ebuild
493 deleted file mode 100644
494 index 0bcf74d9b8a..00000000000
495 --- a/app-admin/rsyslog/rsyslog-8.37.0.ebuild
496 +++ /dev/null
497 @@ -1,454 +0,0 @@
498 -# Copyright 1999-2018 Gentoo Authors
499 -# Distributed under the terms of the GNU General Public License v2
500 -
501 -EAPI="6"
502 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
503 -
504 -inherit autotools eutils linux-info python-any-r1 systemd
505 -
506 -DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
507 -HOMEPAGE="https://www.rsyslog.com/"
508 -
509 -if [[ ${PV} == "9999" ]]; then
510 - EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
511 -
512 - DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
513 -
514 - inherit git-r3
515 -else
516 - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
517 -
518 - SRC_URI="
519 - https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
520 - doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
521 - "
522 -
523 - PATCHES=()
524 -fi
525 -
526 -LICENSE="GPL-3 LGPL-3 Apache-2.0"
527 -SLOT="0"
528 -IUSE="curl dbi debug doc elasticsearch +gcrypt grok gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
529 -IUSE+=" mongodb mysql normalize omhttpfs omudpspoof openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac"
530 -IUSE+=" snmp ssl systemd test usertools +uuid xxhash zeromq"
531 -RESTRICT="!test? ( test )"
532 -
533 -RDEPEND="
534 - >=dev-libs/libfastjson-0.99.8:=
535 - >=dev-libs/libestr-0.1.9
536 - >=sys-libs/zlib-1.2.5
537 - curl? ( >=net-misc/curl-7.35.0 )
538 - dbi? ( >=dev-db/libdbi-0.8.3 )
539 - elasticsearch? ( >=net-misc/curl-7.35.0 )
540 - gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
541 - grok? ( >=dev-libs/grok-0.9.2 )
542 - jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
543 - kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
544 - kerberos? ( virtual/krb5 )
545 - kubernetes? ( >=net-misc/curl-7.35.0 )
546 - mdblookup? ( dev-libs/libmaxminddb:= )
547 - mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
548 - mysql? ( virtual/libmysqlclient:= )
549 - normalize? (
550 - >=dev-libs/libee-0.4.0
551 - >=dev-libs/liblognorm-2.0.3:=
552 - )
553 - omhttpfs? ( >=net-misc/curl-7.35.0 )
554 - omudpspoof? ( >=net-libs/libnet-1.1.6 )
555 - postgres? ( >=dev-db/postgresql-8.4.20:= )
556 - rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
557 - redis? ( >=dev-libs/hiredis-0.11.0:= )
558 - relp? ( >=dev-libs/librelp-1.2.14:= )
559 - rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
560 - rfc5424hmac? (
561 - !libressl? ( >=dev-libs/openssl-0.9.8y:0= )
562 - libressl? ( dev-libs/libressl:= )
563 - )
564 - snmp? ( >=net-analyzer/net-snmp-5.7.2 )
565 - ssl? (
566 - gnutls? ( >=net-libs/gnutls-2.12.23:0= )
567 - openssl? (
568 - !libressl? ( dev-libs/openssl:0= )
569 - libressl? ( dev-libs/libressl:0= )
570 - )
571 - )
572 - systemd? ( >=sys-apps/systemd-234 )
573 - uuid? ( sys-apps/util-linux:0= )
574 - xxhash? ( dev-libs/xxhash:= )
575 - zeromq? (
576 - >=net-libs/czmq-3.0.2
577 - )"
578 -DEPEND="${RDEPEND}
579 - >=sys-devel/autoconf-archive-2015.02.24
580 - virtual/pkgconfig
581 - test? (
582 - jemalloc? ( <sys-libs/libfaketime-0.9.7 )
583 - !jemalloc? ( sys-libs/libfaketime )
584 - ${PYTHON_DEPS}
585 - )"
586 -
587 -REQUIRED_USE="
588 - kubernetes? ( normalize )
589 - ssl? ( || ( gnutls openssl ) )
590 -"
591 -
592 -if [[ ${PV} == "9999" ]]; then
593 - DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
594 - DEPEND+=" >=sys-devel/flex-2.5.39-r1"
595 - DEPEND+=" >=sys-devel/bison-2.4.3"
596 - DEPEND+=" >=dev-python/docutils-0.12"
597 -fi
598 -
599 -CONFIG_CHECK="~INOTIFY_USER"
600 -WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
601 -
602 -pkg_setup() {
603 - use test && python-any-r1_pkg_setup
604 -}
605 -
606 -src_unpack() {
607 - if [[ ${PV} == "9999" ]]; then
608 - git-r3_fetch
609 - git-r3_checkout
610 - else
611 - unpack ${P}.tar.gz
612 - fi
613 -
614 - if use doc; then
615 - if [[ ${PV} == "9999" ]]; then
616 - local _EGIT_BRANCH=
617 - if [[ -n "${EGIT_BRANCH}" ]]; then
618 - # Cannot use rsyslog commits/branches for documentation repository
619 - _EGIT_BRANCH=${EGIT_BRANCH}
620 - unset EGIT_BRANCH
621 - fi
622 -
623 - git-r3_fetch "${DOC_REPO_URI}"
624 - git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
625 -
626 - if [[ -n "${_EGIT_BRANCH}" ]]; then
627 - # Restore previous EGIT_BRANCH information
628 - EGIT_BRANCH=${_EGIT_BRANCH}
629 - fi
630 - else
631 - cd "${S}" || die "Cannot change dir into '${S}'"
632 - mkdir docs || die "Failed to create docs directory"
633 - cd docs || die "Failed to change dir into '${S}/docs'"
634 - unpack ${PN}-doc-${PV}.tar.gz
635 - fi
636 - fi
637 -}
638 -
639 -src_prepare() {
640 - default
641 -
642 - eautoreconf
643 -}
644 -
645 -src_configure() {
646 - # Maintainer notes:
647 - # * Guardtime support is missing because libgt isn't yet available
648 - # in portage.
649 - # * Hadoop's HDFS file system output module is currently not
650 - # supported in Gentoo because nobody is able to test it
651 - # (JAVA dependency).
652 - # * dev-libs/hiredis doesn't provide pkg-config (see #504614,
653 - # upstream PR 129 and 136) so we need to export HIREDIS_*
654 - # variables because rsyslog's build system depends on pkg-config.
655 -
656 - if use redis; then
657 - export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
658 - export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
659 - fi
660 -
661 - local myeconfargs=(
662 - --disable-debug-symbols
663 - --disable-generate-man-pages
664 - --without-valgrind-testbench
665 - --disable-liblogging-stdlog
666 - $(use_enable test testbench)
667 - $(use_enable test libfaketime)
668 - $(use_enable test extended-tests)
669 - # Input Plugins without depedencies
670 - --enable-imdiag
671 - --enable-imfile
672 - --enable-impstats
673 - --enable-imptcp
674 - # Message Modificiation Plugins without depedencies
675 - --enable-mmanon
676 - --enable-mmaudit
677 - --enable-mmcount
678 - --enable-mmfields
679 - --enable-mmjsonparse
680 - --enable-mmpstrucdata
681 - --enable-mmrm1stspace
682 - --enable-mmsequence
683 - --enable-mmutf8fix
684 - # Output Modification Plugins without dependencies
685 - --enable-mail
686 - --enable-omprog
687 - --enable-omruleset
688 - --enable-omstdout
689 - --enable-omuxsock
690 - # Misc
691 - --enable-fmhash
692 - $(use_enable xxhash fmhash-xxhash)
693 - --enable-pmaixforwardedfrom
694 - --enable-pmciscoios
695 - --enable-pmcisconames
696 - --enable-pmlastmsg
697 - --enable-pmsnare
698 - # DB
699 - $(use_enable dbi libdbi)
700 - $(use_enable mongodb ommongodb)
701 - $(use_enable mysql)
702 - $(use_enable postgres pgsql)
703 - $(use_enable redis omhiredis)
704 - # Debug
705 - $(use_enable debug)
706 - $(use_enable debug diagtools)
707 - $(use_enable debug memcheck)
708 - $(use_enable debug valgrind)
709 - # Misc
710 - $(use_enable curl fmhttp)
711 - $(use_enable elasticsearch)
712 - $(use_enable gcrypt libgcrypt)
713 - $(use_enable jemalloc)
714 - $(use_enable kafka imkafka)
715 - $(use_enable kafka omkafka)
716 - $(use_enable kerberos gssapi-krb5)
717 - $(use_enable kubernetes mmkubernetes)
718 - $(use_enable normalize mmnormalize)
719 - $(use_enable mdblookup mmdblookup)
720 - $(use_enable grok mmgrok)
721 - $(use_enable omhttpfs)
722 - $(use_enable omudpspoof)
723 - $(use_enable rabbitmq omrabbitmq)
724 - $(use_enable relp)
725 - $(use_enable rfc3195)
726 - $(use_enable rfc5424hmac mmrfc5424addhmac)
727 - $(use_enable snmp)
728 - $(use_enable snmp mmsnmptrapd)
729 - $(use_enable gnutls)
730 - $(use_enable openssl)
731 - $(use_enable systemd imjournal)
732 - $(use_enable systemd omjournal)
733 - $(use_enable usertools)
734 - $(use_enable uuid)
735 - $(use_enable zeromq imczmq)
736 - $(use_enable zeromq omczmq)
737 - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
738 - )
739 -
740 - econf "${myeconfargs[@]}"
741 -}
742 -
743 -src_compile() {
744 - default
745 -
746 - if use doc && [[ "${PV}" == "9999" ]]; then
747 - einfo "Building documentation ..."
748 - local doc_dir="${S}/docs"
749 - cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
750 - sphinx-build -b html source build || die "Building documentation failed!"
751 - fi
752 -}
753 -
754 -src_test() {
755 - local _has_increased_ulimit=
756 -
757 - # Sometimes tests aren't executable (i.e. when added via patch)
758 - einfo "Adjusting permissions of test scripts ..."
759 - find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
760 - die "Failed to adjust test scripts permission"
761 -
762 - if ulimit -n 3072; then
763 - _has_increased_ulimit="true"
764 - fi
765 -
766 - if ! emake --jobs 1 check; then
767 - eerror "Test suite failed! :("
768 -
769 - if [[ -z "${_has_increased_ulimit}" ]]; then
770 - eerror "Probably because open file limit couldn't be set to 3072."
771 - fi
772 -
773 - if has userpriv ${FEATURES}; then
774 - eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
775 - "before you submit a bug report."
776 - fi
777 -
778 - fi
779 -}
780 -
781 -src_install() {
782 - local DOCS=(
783 - AUTHORS
784 - ChangeLog
785 - "${FILESDIR}"/README.gentoo
786 - )
787 -
788 - use doc && local HTML_DOCS=( "${S}/docs/build/." )
789 -
790 - default
791 -
792 - newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
793 - newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
794 -
795 - keepdir /var/empty/dev
796 - keepdir /var/spool/${PN}
797 - keepdir /etc/ssl/${PN}
798 - keepdir /etc/${PN}.d
799 -
800 - insinto /etc
801 - newins "${FILESDIR}/${PN}.conf" ${PN}.conf
802 -
803 - insinto /etc/rsyslog.d/
804 - newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
805 -
806 - insinto /etc/logrotate.d/
807 - newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
808 -
809 - if use mysql; then
810 - insinto /usr/share/doc/${PF}/scripts/mysql
811 - doins plugins/ommysql/createDB.sql
812 - fi
813 -
814 - if use postgres; then
815 - insinto /usr/share/doc/${PF}/scripts/pgsql
816 - doins plugins/ompgsql/createDB.sql
817 - fi
818 -
819 - prune_libtool_files --modules
820 -}
821 -
822 -pkg_postinst() {
823 - local advertise_readme=0
824 -
825 - if [[ -z "${REPLACING_VERSIONS}" ]]; then
826 - # This is a new installation
827 -
828 - advertise_readme=1
829 -
830 - if use mysql || use postgres; then
831 - echo
832 - elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
833 - elog " /usr/share/doc/${PF}/scripts"
834 - fi
835 -
836 - if use ssl; then
837 - echo
838 - elog "To create a default CA and certificates for your server and clients, run:"
839 - elog " emerge --config =${PF}"
840 - elog "on your logging server. You can run it several times,"
841 - elog "once for each logging client. The client certificates will be signed"
842 - elog "using the CA certificate generated during the first run."
843 - fi
844 - fi
845 -
846 - if [[ ${advertise_readme} -gt 0 ]]; then
847 - # We need to show the README file location
848 -
849 - echo ""
850 - elog "Please read"
851 - elog ""
852 - elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
853 - elog ""
854 - elog "for more details."
855 - fi
856 -}
857 -
858 -pkg_config() {
859 - if ! use ssl ; then
860 - einfo "There is nothing to configure for rsyslog unless you"
861 - einfo "used USE=ssl to build it."
862 - return 0
863 - fi
864 -
865 - # Make sure the certificates directory exists
866 - local CERTDIR="${EROOT}/etc/ssl/${PN}"
867 - if [[ ! -d "${CERTDIR}" ]]; then
868 - mkdir "${CERTDIR}" || die
869 - fi
870 - einfo "Your certificates will be stored in ${CERTDIR}"
871 -
872 - # Create a default CA if needed
873 - if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
874 - einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
875 - certtool --generate-privkey \
876 - --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
877 - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
878 -
879 - cat > "${T}/${PF}.$$" <<- _EOF
880 - cn = Portage automated CA
881 - ca
882 - cert_signing_key
883 - expiration_days = 3650
884 - _EOF
885 -
886 - certtool --generate-self-signed \
887 - --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
888 - --outfile "${CERTDIR}/${PN}_ca.cert.pem" \
889 - --template "${T}/${PF}.$$" &>/dev/null
890 - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
891 -
892 - # Create the server certificate
893 - echo
894 - einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
895 - read -r CN
896 -
897 - einfo "Creating private key and certificate for server ${CN}..."
898 - certtool --generate-privkey \
899 - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
900 - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
901 -
902 - cat > "${T}/${PF}.$$" <<- _EOF
903 - cn = ${CN}
904 - tls_www_server
905 - dns_name = ${CN}
906 - expiration_days = 3650
907 - _EOF
908 -
909 - certtool --generate-certificate \
910 - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
911 - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
912 - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
913 - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
914 - --template "${T}/${PF}.$$" &>/dev/null
915 - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
916 -
917 - else
918 - einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
919 - fi
920 -
921 - # Create a client certificate
922 - echo
923 - einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
924 - read -r CN
925 -
926 - einfo "Creating private key and certificate for client ${CN}..."
927 - certtool --generate-privkey \
928 - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
929 - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
930 -
931 - cat > "${T}/${PF}.$$" <<- _EOF
932 - cn = ${CN}
933 - tls_www_client
934 - dns_name = ${CN}
935 - expiration_days = 3650
936 - _EOF
937 -
938 - certtool --generate-certificate \
939 - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
940 - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
941 - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
942 - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
943 - --template "${T}/${PF}.$$" &>/dev/null
944 - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
945 -
946 - rm -f "${T}/${PF}.$$"
947 -
948 - echo
949 - einfo "Here is the documentation on how to encrypt your log traffic:"
950 - einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
951 -}