1 |
commit: 69cb945b638721fddbc41d4940caf7672d959504 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 9 14:11:13 2015 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 9 14:12:04 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69cb945b |
7 |
|
8 |
app-admin/rsyslog: Removed old. |
9 |
|
10 |
Package-Manager: portage-2.2.23 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
app-admin/rsyslog/Manifest | 2 - |
14 |
.../rsyslog/files/8-stable/10-respect_CFLAGS.patch | 11 - |
15 |
app-admin/rsyslog/rsyslog-8.12.0.ebuild | 414 --------------------- |
16 |
app-admin/rsyslog/rsyslog-8.9.0.ebuild | 409 -------------------- |
17 |
4 files changed, 836 deletions(-) |
18 |
|
19 |
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest |
20 |
index 3af7b48..fcdb484 100644 |
21 |
--- a/app-admin/rsyslog/Manifest |
22 |
+++ b/app-admin/rsyslog/Manifest |
23 |
@@ -1,8 +1,6 @@ |
24 |
DIST rsyslog-8.12.0.tar.gz 2091620 SHA256 466bfeac8296e89de1eb9029880998ba7b5fc25694143197bb47167df6cb7e20 SHA512 7735f15f8a843ee41530d180d00ab3a6854ef28e9036db7ecfe0525549b3ab2b184149c2edc4553240dd4e3003ee12ebcdf47719669daa3cc6915d5a30888c72 WHIRLPOOL b96faab541fd8b53558738b7bd71d3b6acc7d66da4fb0552d781f0e214c00a11b4a74464f7b9c9a1d62bc359658f93d380a490ee78afc11d1702975a6edc6823 |
25 |
DIST rsyslog-8.13.0.tar.gz 2077267 SHA256 b182bd0a7686bef093be570bfb850417191292522fb58e0ad32f2c824f754a33 SHA512 a3245e5b10ae96e6df981291f55a43fa9a8258db213e33a36d7b5a620ea7daaac04a1f93a56304105c4fd10e546f92789831f5b2188b418b4b3b248a4e7795c9 WHIRLPOOL 8473e2c272182d84c629175aafd185cfa6fcafad8a028fd212de118f2e9abf458e062c6065dc5ebb1df27e81546a37387944ad1b3f0d16a38ee25a409b51b1c7 |
26 |
DIST rsyslog-8.7.0.tar.gz 2003365 SHA256 c77125b67a623569c9bdca8136b9aac013f1c6fd82fb8595e3ea267e61800f9c SHA512 53feac42c14134d76f5592ee491bb56fb2c4c33822a7a5609a5267b6911a5c5c4e73c5d66a913a666967d8826ee3077b91d8d2a1d1b60bcb3d425b35ec4677b0 WHIRLPOOL c74c401de68bb59310e307a0d9859d2f58bcbf8126d637d23d4f3979a0d6c69bce8ca850c2942b43f311ea83f47c9554f34e5dc10623d32324da1b18023d357d |
27 |
-DIST rsyslog-8.9.0.tar.gz 2022294 SHA256 eab00e8e758cd9dd33b3e2cf6af80297d1951dc7db37bd723a6488a35d577adc SHA512 942cccc2cbe147572cc2d346ac330d80c86915757b2b7a380829f0b40294d7e4afd4887d5066821af1e059cd78cdb38520fc9d28b55daa7afcd0e5b2e6bd9a5d WHIRLPOOL cc072a64364f38d98187e7102e5be0277011071ce90a510a641aea6a5b3573a436e6539c5688b24d12a9654786892070c1518093e0176e5a40bea57f7dded133 |
28 |
DIST rsyslog-doc-8.12.0.tar.gz 4212441 SHA256 f88517c1e5ae3a8ba129d531b5b4bb79e80f70898a8a5b72a0abd7a8a0feb8f0 SHA512 a1b3907e1a474076dd11e76b267eff35dadbd5abaf3ab802a187ce045eecc6028c854ed8e661650e10c74c79408c6ded341d16af94a05f10c529faaa8f606afb WHIRLPOOL aa21ea93536bab4c9761bdbe2e6c67f650bf181f64cb7c4a78c646d319a5472895be2a118c90d7c42548575b76f62e5dc6b0c4103cf373ab9e3704a6999c6c1b |
29 |
DIST rsyslog-doc-8.13.0.tar.gz 4147364 SHA256 3da9a1446686d1cfa82c123a610f2c30f4dc1cbfa608f44ded2baf168e86b67b SHA512 6676533b1e4884f18e583be19c5a50b8f12017ecc2c6860d54dcc72d64e7eafe20a2af3a22817226df123a7a193c7090097502f287455488dd8806b7aac0a5cd WHIRLPOOL 1231580f2bf8af42a7dd34f0a88315ff56324eb64d1259a281a5266fdbe7a472f596d66a5b6d1f5cbf19fdb6f76a2083753e0de224a07653454178128de4fead |
30 |
DIST rsyslog-doc-8.7.0.tar.gz 4105507 SHA256 f131bfb963eed4fe74d7336ee5261876b436004b78994d47523a82c0f7d666a8 SHA512 9b5b6f28a55b58c956ca614301fc9667243d02c321f8b4071264e4040dd8fe79ba7eb5a08912e2a229bdcf12f68eec24f1c65ba7b82ccd60c8e70d34267b8405 WHIRLPOOL 386ad5164768a5a4919ba5acda29f3ef670b78cc9d6845e3c8ee252b43d6622c19c7f8ec1edd7d0f1d111bf2c06d29fb5dbf9af6b46c426932ae6caa0e63c30c |
31 |
-DIST rsyslog-doc-8.9.0.tar.gz 4100654 SHA256 d3c6747439fabbfa976922ca26ffa695778668e757261e00103f2444cf153afa SHA512 dbc6dfc43f3a75ba671969d2fd59080d96e411a62a2ac91444d076acba548b2c87000f9822fa0af82f22b4f5c098273d407c1e665ce4b24a52dbddfdc9ab981f WHIRLPOOL 550d499ec556a75344d25331aa1df1855f6f70e2e702c086a8ecbf1817eb1f4bc3b94224b77491f3bc1f6c758a22475c248f8afdfc25816132dfedd81c6dfee0 |
32 |
|
33 |
diff --git a/app-admin/rsyslog/files/8-stable/10-respect_CFLAGS.patch b/app-admin/rsyslog/files/8-stable/10-respect_CFLAGS.patch |
34 |
deleted file mode 100644 |
35 |
index c74279b..0000000 |
36 |
--- a/app-admin/rsyslog/files/8-stable/10-respect_CFLAGS.patch |
37 |
+++ /dev/null |
38 |
@@ -1,11 +0,0 @@ |
39 |
---- configure.old 2014-10-02 15:41:45.692471540 +0200 |
40 |
-+++ configure.ac 2014-10-02 15:42:11.122743182 +0200 |
41 |
-@@ -835,7 +835,7 @@ |
42 |
- AM_CONDITIONAL(ENABLE_RSYSLOGRT, test x$enable_rsyslogrt = xyes) |
43 |
- RSRT_CFLAGS="\$(RSRT_CFLAGS1) \$(LIBESTR_CFLAGS) \$(JSON_C_CFLAGS)" |
44 |
- if test "$GCC" = "yes" |
45 |
--then RSRT_CFLAGS="$RSRT_CFLAGS -W -std=c99 -Wall -Wformat-security -Wshadow -Wcast-align -Wpointer-arith -Wmissing-format-attribute -g" |
46 |
-+then RSRT_CFLAGS="$RSRT_CFLAGS -W -std=c99 -Wall -Wformat-security -Wshadow -Wcast-align -Wpointer-arith -Wmissing-format-attribute" |
47 |
- fi |
48 |
- RSRT_LIBS="\$(RSRT_LIBS1) \$(LIBESTR_LIBS) \$(JSON_C_LIBS)" |
49 |
- AC_SUBST(RSRT_CFLAGS1) |
50 |
|
51 |
diff --git a/app-admin/rsyslog/rsyslog-8.12.0.ebuild b/app-admin/rsyslog/rsyslog-8.12.0.ebuild |
52 |
deleted file mode 100644 |
53 |
index 81f79c4..0000000 |
54 |
--- a/app-admin/rsyslog/rsyslog-8.12.0.ebuild |
55 |
+++ /dev/null |
56 |
@@ -1,414 +0,0 @@ |
57 |
-# Copyright 1999-2015 Gentoo Foundation |
58 |
-# Distributed under the terms of the GNU General Public License v2 |
59 |
-# $Id$ |
60 |
- |
61 |
-EAPI=5 |
62 |
-AUTOTOOLS_AUTORECONF=1 |
63 |
- |
64 |
-inherit autotools-utils eutils systemd |
65 |
- |
66 |
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" |
67 |
-HOMEPAGE="http://www.rsyslog.com/" |
68 |
- |
69 |
-BRANCH="8-stable" |
70 |
- |
71 |
-PATCHES=() |
72 |
- |
73 |
-if [[ ${PV} == "9999" ]]; then |
74 |
- EGIT_REPO_URI=" |
75 |
- git://github.com/rsyslog/${PN}.git |
76 |
- https://github.com/rsyslog/${PN}.git |
77 |
- " |
78 |
- |
79 |
- DOC_REPO_URI=" |
80 |
- git://github.com/rsyslog/${PN}-doc.git |
81 |
- https://github.com/rsyslog/${PN}-doc.git |
82 |
- " |
83 |
- |
84 |
- inherit git-r3 |
85 |
-else |
86 |
- SRC_URI=" |
87 |
- http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz |
88 |
- doc? ( http://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz ) |
89 |
- " |
90 |
- KEYWORDS="~amd64 ~arm ~hppa ~x86" |
91 |
- |
92 |
- PATCHES+=( "${FILESDIR}"/8-stable/40-rsyslog-fix-parallel-build-issue-479.patch ) |
93 |
-fi |
94 |
- |
95 |
-LICENSE="GPL-3 LGPL-3 Apache-2.0" |
96 |
-SLOT="0" |
97 |
-IUSE="dbi debug doc elasticsearch +gcrypt jemalloc kerberos mongodb mysql normalize omudpspoof |
98 |
-postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq" |
99 |
- |
100 |
-RDEPEND=" |
101 |
- >=dev-libs/json-c-0.11:= |
102 |
- >=dev-libs/libestr-0.1.9 |
103 |
- >=dev-libs/liblogging-1.0.1:=[stdlog] |
104 |
- >=sys-libs/zlib-1.2.5 |
105 |
- dbi? ( >=dev-db/libdbi-0.8.3 ) |
106 |
- elasticsearch? ( >=net-misc/curl-7.35.0 ) |
107 |
- gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) |
108 |
- jemalloc? ( >=dev-libs/jemalloc-3.3.1 ) |
109 |
- kerberos? ( virtual/krb5 ) |
110 |
- mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) |
111 |
- mysql? ( virtual/mysql ) |
112 |
- normalize? ( |
113 |
- >=dev-libs/libee-0.4.0 |
114 |
- >=dev-libs/liblognorm-1.1.0:= |
115 |
- ) |
116 |
- omudpspoof? ( >=net-libs/libnet-1.1.6 ) |
117 |
- postgres? ( >=dev-db/postgresql-8.4.20:= ) |
118 |
- rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0 ) |
119 |
- redis? ( >=dev-libs/hiredis-0.11.0 ) |
120 |
- relp? ( >=dev-libs/librelp-1.2.5 ) |
121 |
- rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) |
122 |
- rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:= ) |
123 |
- snmp? ( >=net-analyzer/net-snmp-5.7.2 ) |
124 |
- ssl? ( >=net-libs/gnutls-2.12.23 ) |
125 |
- systemd? ( >=sys-apps/systemd-208 ) |
126 |
- zeromq? ( >=net-libs/czmq-1.2.0 )" |
127 |
-DEPEND="${RDEPEND} |
128 |
- virtual/pkgconfig" |
129 |
- |
130 |
-if [[ ${PV} == "9999" ]]; then |
131 |
- DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" |
132 |
- DEPEND+=" >=sys-devel/flex-2.5.39-r1" |
133 |
- DEPEND+=" >=sys-devel/bison-2.4.3" |
134 |
- DEPEND+=" >=dev-python/docutils-0.12" |
135 |
-fi |
136 |
- |
137 |
-# Maitainer note : open a bug to upstream |
138 |
-# showing that building in a separate dir fails |
139 |
-AUTOTOOLS_IN_SOURCE_BUILD=1 |
140 |
- |
141 |
-AUTOTOOLS_PRUNE_LIBTOOL_FILES="modules" |
142 |
- |
143 |
-DOCS=( |
144 |
- AUTHORS |
145 |
- ChangeLog |
146 |
- "${FILESDIR}"/${BRANCH}/README.gentoo |
147 |
-) |
148 |
- |
149 |
-src_unpack() { |
150 |
- if [[ ${PV} == "9999" ]]; then |
151 |
- git-r3_fetch |
152 |
- git-r3_checkout |
153 |
- else |
154 |
- unpack ${P}.tar.gz |
155 |
- fi |
156 |
- |
157 |
- if use doc; then |
158 |
- if [[ ${PV} == "9999" ]]; then |
159 |
- local _EGIT_BRANCH= |
160 |
- if [ -n "${EGIT_BRANCH}" ]; then |
161 |
- # Cannot use rsyslog commits/branches for documentation repository |
162 |
- _EGIT_BRANCH=${EGIT_BRANCH} |
163 |
- unset EGIT_BRANCH |
164 |
- fi |
165 |
- |
166 |
- git-r3_fetch "${DOC_REPO_URI}" |
167 |
- git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs |
168 |
- |
169 |
- if [ -n "${_EGIT_BRANCH}" ]; then |
170 |
- # Restore previous EGIT_BRANCH information |
171 |
- EGIT_BRANCH=${_EGIT_BRANCH} |
172 |
- fi |
173 |
- else |
174 |
- local doc_tarball="${PN}-doc-${PV}.tar.gz" |
175 |
- |
176 |
- cd "${S}" || die "Cannot change dir into '$S'" |
177 |
- mkdir docs || die "Failed to create docs directory" |
178 |
- cd docs || die "Failed to change dir into '${S}/docs'" |
179 |
- unpack ${doc_tarball} |
180 |
- fi |
181 |
- fi |
182 |
-} |
183 |
- |
184 |
-src_configure() { |
185 |
- # Maintainer notes: |
186 |
- # * Guardtime support is missing because libgt isn't yet available |
187 |
- # in portage. |
188 |
- # * Hadoop's HDFS file system output module is currently not |
189 |
- # supported in Gentoo because nobody is able to test it |
190 |
- # (JAVA dependency). |
191 |
- # * dev-libs/hiredis doesn't provide pkg-config (see #504614, |
192 |
- # upstream PR 129 and 136) so we need to export HIREDIS_* |
193 |
- # variables because rsyslog's build system depends on pkg-config. |
194 |
- |
195 |
- if use redis; then |
196 |
- export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" |
197 |
- export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" |
198 |
- fi |
199 |
- |
200 |
- local myeconfargs=( |
201 |
- --disable-debug-symbols |
202 |
- --disable-generate-man-pages |
203 |
- --without-valgrind-testbench |
204 |
- $(use_enable test testbench) |
205 |
- # Input Plugins without depedencies |
206 |
- --enable-imdiag |
207 |
- --enable-imfile |
208 |
- --enable-impstats |
209 |
- --enable-imptcp |
210 |
- # Message Modificiation Plugins without depedencies |
211 |
- --enable-mmanon |
212 |
- --enable-mmaudit |
213 |
- --enable-mmfields |
214 |
- --enable-mmjsonparse |
215 |
- --enable-mmpstrucdata |
216 |
- --enable-mmsequence |
217 |
- --enable-mmutf8fix |
218 |
- # Output Modification Plugins without dependencies |
219 |
- --enable-mail |
220 |
- --enable-omprog |
221 |
- --enable-omruleset |
222 |
- --enable-omstdout |
223 |
- --enable-omuxsock |
224 |
- # Misc |
225 |
- --enable-pmaixforwardedfrom |
226 |
- --enable-pmciscoios |
227 |
- --enable-pmcisconames |
228 |
- --enable-pmlastmsg |
229 |
- --enable-pmsnare |
230 |
- # DB |
231 |
- $(use_enable dbi libdbi) |
232 |
- $(use_enable mongodb ommongodb) |
233 |
- $(use_enable mysql) |
234 |
- $(use_enable postgres pgsql) |
235 |
- $(use_enable redis omhiredis) |
236 |
- # Debug |
237 |
- $(use_enable debug) |
238 |
- $(use_enable debug diagtools) |
239 |
- $(use_enable debug memcheck) |
240 |
- $(use_enable debug rtinst) |
241 |
- $(use_enable debug valgrind) |
242 |
- # Misc |
243 |
- $(use_enable elasticsearch) |
244 |
- $(use_enable gcrypt libgcrypt) |
245 |
- $(use_enable jemalloc) |
246 |
- $(use_enable kerberos gssapi-krb5) |
247 |
- $(use_enable normalize mmnormalize) |
248 |
- $(use_enable omudpspoof) |
249 |
- $(use_enable rabbitmq omrabbitmq) |
250 |
- $(use_enable relp) |
251 |
- $(use_enable rfc3195) |
252 |
- $(use_enable rfc5424hmac mmrfc5424addhmac) |
253 |
- $(use_enable snmp) |
254 |
- $(use_enable snmp mmsnmptrapd) |
255 |
- $(use_enable ssl gnutls) |
256 |
- $(use_enable systemd imjournal) |
257 |
- $(use_enable systemd omjournal) |
258 |
- $(use_enable usertools) |
259 |
- $(use_enable zeromq imzmq3) |
260 |
- $(use_enable zeromq omzmq3) |
261 |
- "$(systemd_with_unitdir)" |
262 |
- ) |
263 |
- |
264 |
- autotools-utils_src_configure |
265 |
-} |
266 |
- |
267 |
-src_compile() { |
268 |
- autotools-utils_src_compile |
269 |
- |
270 |
- if use doc && [[ "${PV}" == "9999" ]]; then |
271 |
- einfo "Building documentation ..." |
272 |
- local doc_dir="${S}/docs" |
273 |
- cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" |
274 |
- sphinx-build -b html source build || die "Building documentation failed!" |
275 |
- fi |
276 |
-} |
277 |
- |
278 |
-src_test() { |
279 |
- local _has_increased_ulimit= |
280 |
- |
281 |
- if ulimit -n 3072; then |
282 |
- _has_increased_ulimit="true" |
283 |
- fi |
284 |
- |
285 |
- if ! emake --jobs 1 check; then |
286 |
- eerror "Test suite failed! :(" |
287 |
- |
288 |
- if [ -z "${_has_increased_ulimit}" ]; then |
289 |
- eerror "Probably because open file limit couldn't be set to 3072." |
290 |
- fi |
291 |
- |
292 |
- if has userpriv $FEATURES; then |
293 |
- eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \ |
294 |
- "before you submit a bug report." |
295 |
- fi |
296 |
- |
297 |
- fi |
298 |
-} |
299 |
- |
300 |
-src_install() { |
301 |
- use doc && HTML_DOCS=( "${S}/docs/build/" ) |
302 |
- autotools-utils_src_install |
303 |
- |
304 |
- newconfd "${FILESDIR}/${BRANCH}/${PN}.confd" ${PN} |
305 |
- newinitd "${FILESDIR}/${BRANCH}/${PN}.initd" ${PN} |
306 |
- |
307 |
- keepdir /var/empty/dev |
308 |
- keepdir /var/spool/${PN} |
309 |
- keepdir /etc/ssl/${PN} |
310 |
- keepdir /etc/${PN}.d |
311 |
- |
312 |
- insinto /etc |
313 |
- newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf |
314 |
- |
315 |
- insinto /etc/rsyslog.d/ |
316 |
- doins "${FILESDIR}/${BRANCH}/50-default.conf" |
317 |
- |
318 |
- insinto /etc/logrotate.d/ |
319 |
- newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN} |
320 |
- |
321 |
- if use mysql; then |
322 |
- insinto /usr/share/doc/${PF}/scripts/mysql |
323 |
- doins plugins/ommysql/createDB.sql |
324 |
- fi |
325 |
- |
326 |
- if use postgres; then |
327 |
- insinto /usr/share/doc/${PF}/scripts/pgsql |
328 |
- doins plugins/ompgsql/createDB.sql |
329 |
- fi |
330 |
-} |
331 |
- |
332 |
-pkg_postinst() { |
333 |
- local advertise_readme=0 |
334 |
- |
335 |
- if [[ -z "${REPLACING_VERSIONS}" ]]; then |
336 |
- # This is a new installation |
337 |
- |
338 |
- advertise_readme=1 |
339 |
- |
340 |
- if use mysql || use postgres; then |
341 |
- echo |
342 |
- elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" |
343 |
- elog " /usr/share/doc/${PF}/scripts" |
344 |
- fi |
345 |
- |
346 |
- if use ssl; then |
347 |
- echo |
348 |
- elog "To create a default CA and certificates for your server and clients, run:" |
349 |
- elog " emerge --config =${PF}" |
350 |
- elog "on your logging server. You can run it several times," |
351 |
- elog "once for each logging client. The client certificates will be signed" |
352 |
- elog "using the CA certificate generated during the first run." |
353 |
- fi |
354 |
- fi |
355 |
- |
356 |
- if [[ -z "${REPLACING_VERSIONS}" ]] || [[ ${REPLACING_VERSIONS} < 8.0 ]]; then |
357 |
- # Show this message until rsyslog-8.x |
358 |
- echo |
359 |
- elog "Since ${PN}-7.6.3 we no longer use the catch-all log target" |
360 |
- elog "\"/var/log/syslog\" due to its redundancy to the other log targets." |
361 |
- |
362 |
- advertise_readme=1 |
363 |
- fi |
364 |
- |
365 |
- if [[ ${advertise_readme} -gt 0 ]]; then |
366 |
- # We need to show the README file location |
367 |
- |
368 |
- echo "" |
369 |
- elog "Please read" |
370 |
- elog "" |
371 |
- elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" |
372 |
- elog "" |
373 |
- elog "for more details." |
374 |
- fi |
375 |
-} |
376 |
- |
377 |
-pkg_config() { |
378 |
- if ! use ssl ; then |
379 |
- einfo "There is nothing to configure for rsyslog unless you" |
380 |
- einfo "used USE=ssl to build it." |
381 |
- return 0 |
382 |
- fi |
383 |
- |
384 |
- # Make sure the certificates directory exists |
385 |
- CERTDIR="${EROOT}/etc/ssl/${PN}" |
386 |
- if [ ! -d "${CERTDIR}" ]; then |
387 |
- mkdir "${CERTDIR}" || die |
388 |
- fi |
389 |
- einfo "Your certificates will be stored in ${CERTDIR}" |
390 |
- |
391 |
- # Create a default CA if needed |
392 |
- if [ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]; then |
393 |
- einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." |
394 |
- certtool --generate-privkey \ |
395 |
- --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null |
396 |
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
397 |
- |
398 |
- cat > "${T}/${PF}.$$" <<- _EOF |
399 |
- cn = Portage automated CA |
400 |
- ca |
401 |
- cert_signing_key |
402 |
- expiration_days = 3650 |
403 |
- _EOF |
404 |
- |
405 |
- certtool --generate-self-signed \ |
406 |
- --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
407 |
- --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ |
408 |
- --template "${T}/${PF}.$$" &>/dev/null |
409 |
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
410 |
- |
411 |
- # Create the server certificate |
412 |
- echo |
413 |
- einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " |
414 |
- read -r CN |
415 |
- |
416 |
- einfo "Creating private key and certificate for server ${CN}..." |
417 |
- certtool --generate-privkey \ |
418 |
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
419 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
420 |
- |
421 |
- cat > "${T}/${PF}.$$" <<- _EOF |
422 |
- cn = ${CN} |
423 |
- tls_www_server |
424 |
- dns_name = ${CN} |
425 |
- expiration_days = 3650 |
426 |
- _EOF |
427 |
- |
428 |
- certtool --generate-certificate \ |
429 |
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
430 |
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
431 |
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
432 |
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
433 |
- --template "${T}/${PF}.$$" &>/dev/null |
434 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
435 |
- |
436 |
- else |
437 |
- einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." |
438 |
- fi |
439 |
- |
440 |
- # Create a client certificate |
441 |
- echo |
442 |
- einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " |
443 |
- read -r CN |
444 |
- |
445 |
- einfo "Creating private key and certificate for client ${CN}..." |
446 |
- certtool --generate-privkey \ |
447 |
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
448 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
449 |
- |
450 |
- cat > "${T}/${PF}.$$" <<- _EOF |
451 |
- cn = ${CN} |
452 |
- tls_www_client |
453 |
- dns_name = ${CN} |
454 |
- expiration_days = 3650 |
455 |
- _EOF |
456 |
- |
457 |
- certtool --generate-certificate \ |
458 |
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
459 |
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
460 |
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
461 |
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
462 |
- --template "${T}/${PF}.$$" &>/dev/null |
463 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
464 |
- |
465 |
- rm -f "${T}/${PF}.$$" |
466 |
- |
467 |
- echo |
468 |
- einfo "Here is the documentation on how to encrypt your log traffic:" |
469 |
- einfo " http://www.rsyslog.com/doc/rsyslog_tls.html" |
470 |
-} |
471 |
|
472 |
diff --git a/app-admin/rsyslog/rsyslog-8.9.0.ebuild b/app-admin/rsyslog/rsyslog-8.9.0.ebuild |
473 |
deleted file mode 100644 |
474 |
index eca7028..0000000 |
475 |
--- a/app-admin/rsyslog/rsyslog-8.9.0.ebuild |
476 |
+++ /dev/null |
477 |
@@ -1,409 +0,0 @@ |
478 |
-# Copyright 1999-2015 Gentoo Foundation |
479 |
-# Distributed under the terms of the GNU General Public License v2 |
480 |
-# $Id$ |
481 |
- |
482 |
-EAPI=5 |
483 |
-AUTOTOOLS_AUTORECONF=1 |
484 |
- |
485 |
-inherit autotools-utils eutils systemd |
486 |
- |
487 |
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" |
488 |
-HOMEPAGE="http://www.rsyslog.com/" |
489 |
- |
490 |
-BRANCH="8-stable" |
491 |
- |
492 |
-PATCHES=( |
493 |
- "${FILESDIR}"/${BRANCH}/10-respect_CFLAGS-r1.patch |
494 |
-) |
495 |
- |
496 |
-if [[ ${PV} == "9999" ]]; then |
497 |
- EGIT_REPO_URI=" |
498 |
- git://github.com/rsyslog/${PN}.git |
499 |
- https://github.com/rsyslog/${PN}.git |
500 |
- " |
501 |
- |
502 |
- DOC_REPO_URI=" |
503 |
- git://github.com/rsyslog/${PN}-doc.git |
504 |
- https://github.com/rsyslog/${PN}-doc.git |
505 |
- " |
506 |
- |
507 |
- inherit git-r3 |
508 |
-else |
509 |
- SRC_URI=" |
510 |
- http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz |
511 |
- doc? ( http://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz ) |
512 |
- " |
513 |
- KEYWORDS="~amd64 ~arm ~hppa ~x86" |
514 |
-fi |
515 |
- |
516 |
-LICENSE="GPL-3 LGPL-3 Apache-2.0" |
517 |
-SLOT="0" |
518 |
-IUSE="dbi debug doc elasticsearch +gcrypt jemalloc kerberos mongodb mysql normalize omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq" |
519 |
- |
520 |
-RDEPEND=" |
521 |
- >=dev-libs/json-c-0.11:= |
522 |
- >=dev-libs/libestr-0.1.9 |
523 |
- >=dev-libs/liblogging-1.0.1:=[stdlog] |
524 |
- >=sys-libs/zlib-1.2.5 |
525 |
- dbi? ( >=dev-db/libdbi-0.8.3 ) |
526 |
- elasticsearch? ( >=net-misc/curl-7.35.0 ) |
527 |
- gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) |
528 |
- jemalloc? ( >=dev-libs/jemalloc-3.3.1 ) |
529 |
- kerberos? ( virtual/krb5 ) |
530 |
- mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) |
531 |
- mysql? ( virtual/mysql ) |
532 |
- normalize? ( |
533 |
- >=dev-libs/libee-0.4.0 |
534 |
- >=dev-libs/liblognorm-1.1.0:= |
535 |
- ) |
536 |
- omudpspoof? ( >=net-libs/libnet-1.1.6 ) |
537 |
- postgres? ( >=dev-db/postgresql-8.4.20:= ) |
538 |
- rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0 ) |
539 |
- redis? ( >=dev-libs/hiredis-0.11.0 ) |
540 |
- relp? ( >=dev-libs/librelp-1.2.5 ) |
541 |
- rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) |
542 |
- rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:= ) |
543 |
- snmp? ( >=net-analyzer/net-snmp-5.7.2 ) |
544 |
- ssl? ( >=net-libs/gnutls-2.12.23 ) |
545 |
- systemd? ( >=sys-apps/systemd-208 ) |
546 |
- zeromq? ( >=net-libs/czmq-1.2.0 )" |
547 |
-DEPEND="${RDEPEND} |
548 |
- virtual/pkgconfig" |
549 |
- |
550 |
-if [[ ${PV} == "9999" ]]; then |
551 |
- DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" |
552 |
-fi |
553 |
- |
554 |
-# Maitainer note : open a bug to upstream |
555 |
-# showing that building in a separate dir fails |
556 |
-AUTOTOOLS_IN_SOURCE_BUILD=1 |
557 |
- |
558 |
-AUTOTOOLS_PRUNE_LIBTOOL_FILES="modules" |
559 |
- |
560 |
-DOCS=( |
561 |
- AUTHORS |
562 |
- ChangeLog |
563 |
- "${FILESDIR}"/${BRANCH}/README.gentoo |
564 |
-) |
565 |
- |
566 |
-src_unpack() { |
567 |
- if [[ ${PV} == "9999" ]]; then |
568 |
- git-r3_fetch |
569 |
- git-r3_checkout |
570 |
- else |
571 |
- unpack ${P}.tar.gz |
572 |
- fi |
573 |
- |
574 |
- if use doc; then |
575 |
- if [[ ${PV} == "9999" ]]; then |
576 |
- local _EGIT_BRANCH= |
577 |
- if [ -n "${EGIT_BRANCH}" ]; then |
578 |
- # Cannot use rsyslog commits/branches for documentation repository |
579 |
- _EGIT_BRANCH=${EGIT_BRANCH} |
580 |
- unset EGIT_BRANCH |
581 |
- fi |
582 |
- |
583 |
- git-r3_fetch "${DOC_REPO_URI}" |
584 |
- git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs |
585 |
- |
586 |
- if [ -n "${_EGIT_BRANCH}" ]; then |
587 |
- # Restore previous EGIT_BRANCH information |
588 |
- EGIT_BRANCH=${_EGIT_BRANCH} |
589 |
- fi |
590 |
- else |
591 |
- local doc_tarball="${PN}-doc-${PV}.tar.gz" |
592 |
- |
593 |
- cd "${S}" || die "Cannot change dir into '$S'" |
594 |
- mkdir docs || die "Failed to create docs directory" |
595 |
- cd docs || die "Failed to change dir into '${S}/docs'" |
596 |
- unpack ${doc_tarball} |
597 |
- fi |
598 |
- fi |
599 |
-} |
600 |
- |
601 |
-src_configure() { |
602 |
- # Maintainer notes: |
603 |
- # * Guardtime support is missing because libgt isn't yet available |
604 |
- # in portage. |
605 |
- # * Hadoop's HDFS file system output module is currently not |
606 |
- # supported in Gentoo because nobody is able to test it |
607 |
- # (JAVA dependency). |
608 |
- # * dev-libs/hiredis doesn't provide pkg-config (see #504614, |
609 |
- # upstream PR 129 and 136) so we need to export HIREDIS_* |
610 |
- # variables because rsyslog's build system depends on pkg-config. |
611 |
- |
612 |
- if use redis; then |
613 |
- export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" |
614 |
- export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" |
615 |
- fi |
616 |
- |
617 |
- local myeconfargs=( |
618 |
- --disable-generate-man-pages |
619 |
- --without-valgrind-testbench |
620 |
- $(use_enable test testbench) |
621 |
- # Input Plugins without depedencies |
622 |
- --enable-imdiag |
623 |
- --enable-imfile |
624 |
- --enable-impstats |
625 |
- --enable-imptcp |
626 |
- # Message Modificiation Plugins without depedencies |
627 |
- --enable-mmanon |
628 |
- --enable-mmaudit |
629 |
- --enable-mmfields |
630 |
- --enable-mmjsonparse |
631 |
- --enable-mmpstrucdata |
632 |
- --enable-mmsequence |
633 |
- --enable-mmutf8fix |
634 |
- # Output Modification Plugins without dependencies |
635 |
- --enable-mail |
636 |
- --enable-omprog |
637 |
- --enable-omruleset |
638 |
- --enable-omstdout |
639 |
- --enable-omuxsock |
640 |
- # Misc |
641 |
- --enable-pmaixforwardedfrom |
642 |
- --enable-pmciscoios |
643 |
- --enable-pmcisconames |
644 |
- --enable-pmlastmsg |
645 |
- --enable-pmsnare |
646 |
- # DB |
647 |
- $(use_enable dbi libdbi) |
648 |
- $(use_enable mongodb ommongodb) |
649 |
- $(use_enable mysql) |
650 |
- $(use_enable postgres pgsql) |
651 |
- $(use_enable redis omhiredis) |
652 |
- # Debug |
653 |
- $(use_enable debug) |
654 |
- $(use_enable debug diagtools) |
655 |
- $(use_enable debug memcheck) |
656 |
- $(use_enable debug rtinst) |
657 |
- $(use_enable debug valgrind) |
658 |
- # Misc |
659 |
- $(use_enable elasticsearch) |
660 |
- $(use_enable gcrypt libgcrypt) |
661 |
- $(use_enable jemalloc) |
662 |
- $(use_enable kerberos gssapi-krb5) |
663 |
- $(use_enable normalize mmnormalize) |
664 |
- $(use_enable omudpspoof) |
665 |
- $(use_enable rabbitmq omrabbitmq) |
666 |
- $(use_enable relp) |
667 |
- $(use_enable rfc3195) |
668 |
- $(use_enable rfc5424hmac mmrfc5424addhmac) |
669 |
- $(use_enable snmp) |
670 |
- $(use_enable snmp mmsnmptrapd) |
671 |
- $(use_enable ssl gnutls) |
672 |
- $(use_enable systemd imjournal) |
673 |
- $(use_enable systemd omjournal) |
674 |
- $(use_enable usertools) |
675 |
- $(use_enable zeromq imzmq3) |
676 |
- $(use_enable zeromq omzmq3) |
677 |
- "$(systemd_with_unitdir)" |
678 |
- ) |
679 |
- |
680 |
- autotools-utils_src_configure |
681 |
-} |
682 |
- |
683 |
-src_compile() { |
684 |
- autotools-utils_src_compile |
685 |
- |
686 |
- if use doc && [[ "${PV}" == "9999" ]]; then |
687 |
- einfo "Building documentation ..." |
688 |
- local doc_dir="${S}/docs" |
689 |
- cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" |
690 |
- sphinx-build -b html source build || die "Building documentation failed!" |
691 |
- fi |
692 |
-} |
693 |
- |
694 |
-src_test() { |
695 |
- local _has_increased_ulimit= |
696 |
- |
697 |
- if ulimit -n 3072; then |
698 |
- _has_increased_ulimit="true" |
699 |
- fi |
700 |
- |
701 |
- if ! emake --jobs 1 check; then |
702 |
- eerror "Test suite failed! :(" |
703 |
- |
704 |
- if [ -z "${_has_increased_ulimit}" ]; then |
705 |
- eerror "Probably because open file limit couldn't be set to 3072." |
706 |
- fi |
707 |
- |
708 |
- if has userpriv $FEATURES; then |
709 |
- eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \ |
710 |
- "before you submit a bug report." |
711 |
- fi |
712 |
- |
713 |
- fi |
714 |
-} |
715 |
- |
716 |
-src_install() { |
717 |
- use doc && HTML_DOCS=( "${S}/docs/build/" ) |
718 |
- autotools-utils_src_install |
719 |
- |
720 |
- newconfd "${FILESDIR}/${BRANCH}/${PN}.confd" ${PN} |
721 |
- newinitd "${FILESDIR}/${BRANCH}/${PN}.initd" ${PN} |
722 |
- |
723 |
- keepdir /var/empty/dev |
724 |
- keepdir /var/spool/${PN} |
725 |
- keepdir /etc/ssl/${PN} |
726 |
- keepdir /etc/${PN}.d |
727 |
- |
728 |
- insinto /etc |
729 |
- newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf |
730 |
- |
731 |
- insinto /etc/rsyslog.d/ |
732 |
- doins "${FILESDIR}/${BRANCH}/50-default.conf" |
733 |
- |
734 |
- insinto /etc/logrotate.d/ |
735 |
- newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN} |
736 |
- |
737 |
- if use mysql; then |
738 |
- insinto /usr/share/doc/${PF}/scripts/mysql |
739 |
- doins plugins/ommysql/createDB.sql |
740 |
- fi |
741 |
- |
742 |
- if use postgres; then |
743 |
- insinto /usr/share/doc/${PF}/scripts/pgsql |
744 |
- doins plugins/ompgsql/createDB.sql |
745 |
- fi |
746 |
-} |
747 |
- |
748 |
-pkg_postinst() { |
749 |
- local advertise_readme=0 |
750 |
- |
751 |
- if [[ -z "${REPLACING_VERSIONS}" ]]; then |
752 |
- # This is a new installation |
753 |
- |
754 |
- advertise_readme=1 |
755 |
- |
756 |
- if use mysql || use postgres; then |
757 |
- echo |
758 |
- elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" |
759 |
- elog " /usr/share/doc/${PF}/scripts" |
760 |
- fi |
761 |
- |
762 |
- if use ssl; then |
763 |
- echo |
764 |
- elog "To create a default CA and certificates for your server and clients, run:" |
765 |
- elog " emerge --config =${PF}" |
766 |
- elog "on your logging server. You can run it several times," |
767 |
- elog "once for each logging client. The client certificates will be signed" |
768 |
- elog "using the CA certificate generated during the first run." |
769 |
- fi |
770 |
- fi |
771 |
- |
772 |
- if [[ -z "${REPLACING_VERSIONS}" ]] || [[ ${REPLACING_VERSIONS} < 8.0 ]]; then |
773 |
- # Show this message until rsyslog-8.x |
774 |
- echo |
775 |
- elog "Since ${PN}-7.6.3 we no longer use the catch-all log target" |
776 |
- elog "\"/var/log/syslog\" due to its redundancy to the other log targets." |
777 |
- |
778 |
- advertise_readme=1 |
779 |
- fi |
780 |
- |
781 |
- if [[ ${advertise_readme} -gt 0 ]]; then |
782 |
- # We need to show the README file location |
783 |
- |
784 |
- echo "" |
785 |
- elog "Please read" |
786 |
- elog "" |
787 |
- elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" |
788 |
- elog "" |
789 |
- elog "for more details." |
790 |
- fi |
791 |
-} |
792 |
- |
793 |
-pkg_config() { |
794 |
- if ! use ssl ; then |
795 |
- einfo "There is nothing to configure for rsyslog unless you" |
796 |
- einfo "used USE=ssl to build it." |
797 |
- return 0 |
798 |
- fi |
799 |
- |
800 |
- # Make sure the certificates directory exists |
801 |
- CERTDIR="${EROOT}/etc/ssl/${PN}" |
802 |
- if [ ! -d "${CERTDIR}" ]; then |
803 |
- mkdir "${CERTDIR}" || die |
804 |
- fi |
805 |
- einfo "Your certificates will be stored in ${CERTDIR}" |
806 |
- |
807 |
- # Create a default CA if needed |
808 |
- if [ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]; then |
809 |
- einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." |
810 |
- certtool --generate-privkey \ |
811 |
- --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null |
812 |
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
813 |
- |
814 |
- cat > "${T}/${PF}.$$" <<- _EOF |
815 |
- cn = Portage automated CA |
816 |
- ca |
817 |
- cert_signing_key |
818 |
- expiration_days = 3650 |
819 |
- _EOF |
820 |
- |
821 |
- certtool --generate-self-signed \ |
822 |
- --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
823 |
- --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ |
824 |
- --template "${T}/${PF}.$$" &>/dev/null |
825 |
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
826 |
- |
827 |
- # Create the server certificate |
828 |
- echo |
829 |
- einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " |
830 |
- read -r CN |
831 |
- |
832 |
- einfo "Creating private key and certificate for server ${CN}..." |
833 |
- certtool --generate-privkey \ |
834 |
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
835 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
836 |
- |
837 |
- cat > "${T}/${PF}.$$" <<- _EOF |
838 |
- cn = ${CN} |
839 |
- tls_www_server |
840 |
- dns_name = ${CN} |
841 |
- expiration_days = 3650 |
842 |
- _EOF |
843 |
- |
844 |
- certtool --generate-certificate \ |
845 |
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
846 |
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
847 |
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
848 |
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
849 |
- --template "${T}/${PF}.$$" &>/dev/null |
850 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
851 |
- |
852 |
- else |
853 |
- einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." |
854 |
- fi |
855 |
- |
856 |
- # Create a client certificate |
857 |
- echo |
858 |
- einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " |
859 |
- read -r CN |
860 |
- |
861 |
- einfo "Creating private key and certificate for client ${CN}..." |
862 |
- certtool --generate-privkey \ |
863 |
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
864 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
865 |
- |
866 |
- cat > "${T}/${PF}.$$" <<- _EOF |
867 |
- cn = ${CN} |
868 |
- tls_www_client |
869 |
- dns_name = ${CN} |
870 |
- expiration_days = 3650 |
871 |
- _EOF |
872 |
- |
873 |
- certtool --generate-certificate \ |
874 |
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
875 |
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
876 |
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
877 |
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
878 |
- --template "${T}/${PF}.$$" &>/dev/null |
879 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
880 |
- |
881 |
- rm -f "${T}/${PF}.$$" |
882 |
- |
883 |
- echo |
884 |
- einfo "Here is the documentation on how to encrypt your log traffic:" |
885 |
- einfo " http://www.rsyslog.com/doc/rsyslog_tls.html" |
886 |
-} |