1 |
commit: d57f3215d422f2a10d7a1ad8307d22ebabed75c8 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Mar 1 22:18:41 2017 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 1 22:19:03 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d57f3215 |
7 |
|
8 |
app-admin/rsyslog: Drop old versions for cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
app-admin/rsyslog/Manifest | 6 - |
13 |
....15.0-imfile-readmode2-vg-test-workaround.patch | 30 -- |
14 |
...8.15.0-imtcp-tls-basic-vg-test-workaround.patch | 12 - |
15 |
.../50-rsyslog-8.16.0-fix-leap-year-handling.patch | 86 ---- |
16 |
...rsyslog-8.16.0-fix-queue-engine-issue-262.patch | 51 --- |
17 |
.../50-rsyslog-8.16.0-restrict-build-deps.patch | 55 --- |
18 |
app-admin/rsyslog/rsyslog-8.16.0-r1.ebuild | 423 ------------------- |
19 |
app-admin/rsyslog/rsyslog-8.22.0.ebuild | 451 --------------------- |
20 |
app-admin/rsyslog/rsyslog-8.23.0.ebuild | 451 --------------------- |
21 |
9 files changed, 1565 deletions(-) |
22 |
|
23 |
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest |
24 |
index 6611ae0e83b..e62b3f2e103 100644 |
25 |
--- a/app-admin/rsyslog/Manifest |
26 |
+++ b/app-admin/rsyslog/Manifest |
27 |
@@ -1,12 +1,6 @@ |
28 |
-DIST rsyslog-8.16.0.tar.gz 2132012 SHA256 4fe4f97c10899086d98b9401d7e8d2bcff61c7c3f7cde8627891e36fc6ec1b76 SHA512 e45acc16078d83937edd7e22f916fe050b62aa057ca4dd980823850f2195213c12db36f759c528b5fe6f1b061a61e2117fca6086245bc248392cc4e61b2383dc WHIRLPOOL 809035873565645cea5896fb19882239a0d70776ea0b948739440f7a28baf6df4bf4e958de7506d289355eadc26e1fba7e9cd8df315339f18f89acaecc462eaa |
29 |
DIST rsyslog-8.19.0.tar.gz 2279714 SHA256 3379b30f2e6ef05a0f1c7327c73923fa5877a80b984506cdf48ed068c94a575e SHA512 77c40c9d76591ed3561ec76242be2c647848533df5599320ea988cbc200614c47930e0b63f190d31a0c1cec2443d57ca374f07e0909f11eba8a4bd4b8eee0e44 WHIRLPOOL 3f7d7134a0c6a475453828440a87d0fa68e7afc583ef12556f3b60f3e07621011b4f48e8c4dfbe46cef2bf2decee3827c42bd4ba481611e7cb76a695dcec5c7b |
30 |
-DIST rsyslog-8.22.0.tar.gz 2259652 SHA256 06e2884181333dccecceaca82827ae24ca7a258b4fbf7b1e07a80d4caae640ca SHA512 105c7a81bd96c6b68b9e9f4d1ae06e63bf531afe4dfd91efb73b2a96e8264270579ccacc6a1bf77ad284913fb7f4bac55f83c5b38f7fa7675f6c4a6fa9b2f3ca WHIRLPOOL 22cb36592654adf67124f31417ad332163d72c852b7d6e471d58f3a45aa8123d1ce701c4853b4e884927587e26dac3645cbe6ffcf291b22c7f789f9513df81a5 |
31 |
-DIST rsyslog-8.23.0.tar.gz 2338318 SHA256 244e79552d37a5729f3f53786062828adc16fd080eeb0de6507bff55ed21693b SHA512 4e4832287f02d4b0435b3711241d58cad9f393ce14318bbccce7b89dceeed01205960e7df4b2629831429e550c0865407374eb6a5548ecb47a3aea90c7d7df2d WHIRLPOOL a4ac676faa6ad09b3e7cf0fbc9c6f827d96a4c14106c3692b523ffc9b90f74745bab7edff2b0c914c160db1f3f83c5f5589203ad8c7cec718c7be8dc2fd0ab66 |
32 |
DIST rsyslog-8.24.0.tar.gz 2374240 SHA256 37f32ce33e32a88e1bea0511e8e557d90b7378b81520e3236a9af5ba6ea993d7 SHA512 b25b8ae72133376f732f54863c97aea3c8dfbf37c62c6a61840932996913c9d4e63155a24ffc577db48a18514f3e35b6fb109b1864380ba93ddf3fa6d84d728d WHIRLPOOL c5895d50143c21d446d760f5179b47fdae4ec34867711c942cd671b88789588e7244fb8511745efdb701954f7bc390403d30736a1e54af13dca4876f989928df |
33 |
DIST rsyslog-8.25.0.tar.gz 2386720 SHA256 c756f16a083e5d4081fb9bfb236303a839cdca0a2c00017bd770b2e2e9677427 SHA512 0e97db84cc8fe9fd6e3ffb5a78b32fd213e22833c6ed605329c579132d127b7d65b3f66c64e6bddeb1967aa9ed90645a7c24b9d5e643f95bdaf48ed9fc82cb5f WHIRLPOOL 2c4925fda01e49f95ed3d2f43898cdf8f6d679ace5c2a1d1d330dfc422936ae7751cfefa480359b26d2cb782a8217865336f5e04e65e81ffce565b3388c2ff01 |
34 |
-DIST rsyslog-doc-8.16.0.tar.gz 4174347 SHA256 03033d264b29fd791299d5d618bd061853c008ac8087f3b6c4870e1b8f6abc39 SHA512 746e4de102f15ea10085ca21eeed74dd8264742ba7029cb54caf87b72070ab6a73e79af46d97717323be1e68d9d1fa78807d5d4446d15524aa4c565650f7b0d0 WHIRLPOOL ff8dfcc3dd7e87a7316f94a3b8f199cd902cbf99772bb97147b9af37b8c6941f13341438450b3dbf3139d5518488e74df6b77c1eec3182e92a9476ccb951ec5b |
35 |
DIST rsyslog-docs-8.19.0.tar.gz 4271094 SHA256 f76958d2fbcbb3a2db531ec3878d6d9a8c4a622e457b9c97b7c7dcca0ddd6512 SHA512 120f229a641119649fc897948fb0934039a95d0ef63e68b10ab635620d84988d794fd5dc33617353028e786513a86b3a1cd0c4fef9c755dab5bedd8e0246532e WHIRLPOOL fc0642eef4e686fc653db6a654f96fd9037e083a02e06d64b7b2a2e0292d745ca6e24821df3b9825e0eba2c4808b2755dfaeb90b62a49662ab22a171ffe2e63b |
36 |
-DIST rsyslog-docs-8.22.0.tar.gz 4307880 SHA256 4367e52dddcaca111c40585aa632a9dc68f27ae2e5a51685a08dbabf4e1d2c59 SHA512 e1d09182d564985ede4826b7366e183d75abf67b24e3aa65d607fc080cf6901612dbbb32188c640b69a4562b2bee2018b4116c6d0fa18ceb1575b9b700e85481 WHIRLPOOL 0f5aa06ce8b4c1c5aabbe378c67052ca54c730709736025b70c553cb4caaf7c9e257ea4146f3cc40d59ec3d3f34ef38df2683421fcffb89dc95fd65644eb2ee2 |
37 |
-DIST rsyslog-docs-8.23.0.tar.gz 4316852 SHA256 c2b23952e5878af334a7b71de76fc6bd432e90dff968da545d3bd73f8a4a147f SHA512 5c57159e17c728e0fcada5cd03dfe45edca2f9b6554628729387eedb94936c0ef16254f5b0e3524dd6ce732d57e42994e1293478bd28b51747a49f725f148bc0 WHIRLPOOL 8cb566131a9ae491a2839450b58a67ad3dd2fda41aad93d265b11dc1d33b7f765f65ef82166c79f2588fc4543f1aac570921242b61c226849218649bf6b943b3 |
38 |
DIST rsyslog-docs-8.24.0.tar.gz 4344877 SHA256 f5e3c27c5b65abdd600b8ad8d99d1f2fe9f0ffca02d6af3c12db5fc10dd889b2 SHA512 b55cde1485a7baec6d4c4928107c22a078cf412a2994c0dfcbb12c47b49c3b263af8a64011b1329567cf86e04927b9e383581dc868eaea81d554adada6b3786b WHIRLPOOL e8b2d10b0de3c33189f859f08db58e319730e709e5a5008909f2166a061952290b0bf96163cdf6e0b3829896916f712ba5d8a2a98f02d796e9174d8919190f8d |
39 |
DIST rsyslog-docs-8.25.0.tar.gz 4359583 SHA256 3fa96f85ca31b09b16dcc4b184f9beeb5fb06ba463b0ced7046ec2a471b7d3ad SHA512 e0068ec00bbda2d1cf7f14105ad83e82bea9291ed5d5fda3ffcff2db32747b65e7b6d65743a3221aeca03be9c6efcee1db7f03c2da115a3aed60848556befa71 WHIRLPOOL 8c2ae0afe5fb1f81b33ecb83df420a7bbc8c147eac5854a57ba1c5341bb42d9dd4a3976a472445d19a45eb09258bc3be1b9065d79fd679095cbf24cbfddb1756 |
40 |
|
41 |
diff --git a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.15.0-imfile-readmode2-vg-test-workaround.patch b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.15.0-imfile-readmode2-vg-test-workaround.patch |
42 |
deleted file mode 100644 |
43 |
index 99e2d364298..00000000000 |
44 |
--- a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.15.0-imfile-readmode2-vg-test-workaround.patch |
45 |
+++ /dev/null |
46 |
@@ -1,30 +0,0 @@ |
47 |
-Workaround for https://github.com/rsyslog/rsyslog/issues/746 |
48 |
- |
49 |
---- rsyslog-9999/tests/imfile-readmode2-vg.sh 2016-01-20 12:35:20.368238216 +0100 |
50 |
-+++ rsyslog-9999/tests/imfile-readmode2-vg.sh 2016-01-20 12:36:14.357031527 +0100 |
51 |
-@@ -11,7 +11,7 @@ echo 'msgnum:0 |
52 |
- echo 'msgnum:2' >> rsyslog.input |
53 |
- |
54 |
- # sleep a little to give rsyslog a chance to begin processing |
55 |
--sleep 1 |
56 |
-+sleep 10 |
57 |
- |
58 |
- # write some more lines (see https://github.com/rsyslog/rsyslog/issues/144) |
59 |
- echo 'msgnum:3 |
60 |
-@@ -19,14 +19,14 @@ echo 'msgnum:3 |
61 |
- echo 'msgnum:5' >> rsyslog.input # this one shouldn't be written to the output file because of ReadMode 2 |
62 |
- |
63 |
- # give it time to finish |
64 |
--sleep 1 |
65 |
-+sleep 10 |
66 |
- |
67 |
- . $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages |
68 |
- . $srcdir/diag.sh wait-shutdown-vg # we need to wait until rsyslogd is finished! |
69 |
- . $srcdir/diag.sh check-exit-vg |
70 |
- |
71 |
- # give it time to write the output file |
72 |
--sleep 1 |
73 |
-+sleep 10 |
74 |
- |
75 |
- ## check if we have the correct number of messages |
76 |
- |
77 |
|
78 |
diff --git a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.15.0-imtcp-tls-basic-vg-test-workaround.patch b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.15.0-imtcp-tls-basic-vg-test-workaround.patch |
79 |
deleted file mode 100644 |
80 |
index 2157607e60d..00000000000 |
81 |
--- a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.15.0-imtcp-tls-basic-vg-test-workaround.patch |
82 |
+++ /dev/null |
83 |
@@ -1,12 +0,0 @@ |
84 |
-Workaround for https://github.com/rsyslog/rsyslog/issues/688 |
85 |
- |
86 |
---- rsyslog-9999/tests/imtcp-tls-basic-vg.sh 2016-01-20 12:01:44.493617917 +0100 |
87 |
-+++ rsyslog-9999/tests/imtcp-tls-basic-vg.sh 2016-01-20 12:04:18.394711527 +0100 |
88 |
-@@ -9,6 +9,7 @@ echo \$DefaultNetstreamDriverCertFile $s |
89 |
- echo \$DefaultNetstreamDriverKeyFile $srcdir/tls-certs/key.pem >>rsyslog.conf.tlscert |
90 |
- . $srcdir/diag.sh startup-vg-noleak imtcp-tls-basic.conf |
91 |
- . $srcdir/diag.sh tcpflood -p13514 -m50000 -Ttls -Z$srcdir/tls-certs/cert.pem -z$srcdir/tls-certs/key.pem |
92 |
-+sleep 10 |
93 |
- . $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages |
94 |
- . $srcdir/diag.sh wait-shutdown-vg |
95 |
- . $srcdir/diag.sh check-exit-vg |
96 |
|
97 |
diff --git a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.16.0-fix-leap-year-handling.patch b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.16.0-fix-leap-year-handling.patch |
98 |
deleted file mode 100644 |
99 |
index 6cf8fa667f3..00000000000 |
100 |
--- a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.16.0-fix-leap-year-handling.patch |
101 |
+++ /dev/null |
102 |
@@ -1,86 +0,0 @@ |
103 |
-From ffb321f1698a971e0acda48cafa97bb344cf0829 Mon Sep 17 00:00:00 2001 |
104 |
-From: Rainer Gerhards <rgerhards@×××××××.com> |
105 |
-Date: Wed, 2 Mar 2016 11:43:09 +0100 |
106 |
-Subject: [PATCH] bugfix: unixtimestamp was incorrectly computed |
107 |
- |
108 |
-The problem happened in leap year from March til then end |
109 |
-of year and healed itself at the begining of the next year. |
110 |
-During the problem period, the timestamp was 24 hours too |
111 |
-low. |
112 |
- |
113 |
-This is primarily a simple fix that can also be applied to |
114 |
-older rsyslog versions. However, we will see if we can |
115 |
-refactor the code to make use of mktime(). Originally, that |
116 |
-was not done for some issues seen, which may no longer |
117 |
-apply. |
118 |
- |
119 |
-fixes https://github.com/rsyslog/rsyslog/issues/830 |
120 |
---- |
121 |
- runtime/datetime.c | 7 ++++++- |
122 |
- 1 file changed, 6 insertions(+), 1 deletion(-) |
123 |
- |
124 |
-diff --git a/runtime/datetime.c b/runtime/datetime.c |
125 |
-index efb4c81..a07c1b7 100644 |
126 |
---- a/runtime/datetime.c |
127 |
-+++ b/runtime/datetime.c |
128 |
-@@ -1054,6 +1054,11 @@ time_t syslogTime2time_t(struct syslogTime *ts) |
129 |
- MonthInDays = 0; /* any value fits ;) */ |
130 |
- break; |
131 |
- } |
132 |
-+ /* adjust for leap years */ |
133 |
-+ if((ts->year % 100 != 0 && ts->year % 4 == 0) || (ts->year == 2000)) { |
134 |
-+ if(ts->month > 2) |
135 |
-+ MonthInDays++; |
136 |
-+ } |
137 |
- |
138 |
- |
139 |
- /* 1) Counting how many Years have passed since 1970 |
140 |
-@@ -1064,7 +1069,7 @@ time_t syslogTime2time_t(struct syslogTime *ts) |
141 |
- |
142 |
- NumberOfYears = ts->year - yearInSec_startYear - 1; |
143 |
- NumberOfDays = MonthInDays + ts->day - 1; |
144 |
-- TimeInUnixFormat = yearInSecs[NumberOfYears] + NumberOfDays * 86400; |
145 |
-+ TimeInUnixFormat = (yearInSecs[NumberOfYears] + 1) + NumberOfDays * 86400; |
146 |
- |
147 |
- /*Add Hours, minutes and seconds */ |
148 |
- TimeInUnixFormat += ts->hour*60*60; |
149 |
-From 5cb41f748329986d5e2aa8d5e87f224bb9cb8234 Mon Sep 17 00:00:00 2001 |
150 |
-From: Rainer Gerhards <rgerhards@×××××××.com> |
151 |
-Date: Wed, 2 Mar 2016 15:58:18 +0100 |
152 |
-Subject: [PATCH] timestamp handling: guard against invalid dates |
153 |
- |
154 |
-We do not permit dates outside of the year 1970..2100 |
155 |
-interval. Note that network-receivers do already guard |
156 |
-against this, so the new guard only guards against invalid |
157 |
-system time. Still good to have (especially when things are |
158 |
-extended...) |
159 |
---- |
160 |
- runtime/datetime.c | 8 ++++++++ |
161 |
- 1 file changed, 8 insertions(+) |
162 |
- |
163 |
-diff --git a/runtime/datetime.c b/runtime/datetime.c |
164 |
-index 9641363..87290c9 100644 |
165 |
---- a/runtime/datetime.c |
166 |
-+++ b/runtime/datetime.c |
167 |
-@@ -1023,6 +1023,13 @@ time_t syslogTime2time_t(struct syslogTime *ts) |
168 |
- int utcOffset; |
169 |
- time_t TimeInUnixFormat; |
170 |
- |
171 |
-+ if(ts->year < 1970 || ts->year > 2100) { |
172 |
-+ TimeInUnixFormat = 0; |
173 |
-+ errmsg.LogError(0, RS_RET_ERR, "syslogTime2time_t: invalid year %d " |
174 |
-+ "in timestamp - returning 1970-01-01 instead", ts->year); |
175 |
-+ goto done; |
176 |
-+ } |
177 |
-+ |
178 |
- /* Counting how many Days have passed since the 01.01 of the |
179 |
- * selected Year (Month level), according to the selected Month*/ |
180 |
- |
181 |
-@@ -1096,6 +1103,7 @@ time_t syslogTime2time_t(struct syslogTime *ts) |
182 |
- if(ts->OffsetMode == '+') |
183 |
- utcOffset *= -1; /* if timestamp is ahead, we need to "go back" to UTC */ |
184 |
- TimeInUnixFormat += utcOffset; |
185 |
-+done: |
186 |
- return TimeInUnixFormat; |
187 |
- } |
188 |
- |
189 |
|
190 |
diff --git a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.16.0-fix-queue-engine-issue-262.patch b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.16.0-fix-queue-engine-issue-262.patch |
191 |
deleted file mode 100644 |
192 |
index c906c05f0e5..00000000000 |
193 |
--- a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.16.0-fix-queue-engine-issue-262.patch |
194 |
+++ /dev/null |
195 |
@@ -1,51 +0,0 @@ |
196 |
-From b435f4e7d2ece7f2ea0a7b42826498e224be3f23 Mon Sep 17 00:00:00 2001 |
197 |
-From: Rainer Gerhards <rgerhards@×××××××.com> |
198 |
-Date: Wed, 3 Feb 2016 16:32:07 +0100 |
199 |
-Subject: [PATCH] bugfix: queue engine can loose one message during queue |
200 |
- shutdown |
201 |
- |
202 |
-... due to improper checking of return states. |
203 |
- |
204 |
-closes https://github.com/rsyslog/rsyslog/issues/262 |
205 |
---- |
206 |
- runtime/ruleset.c | 17 +++++++++++------ |
207 |
- 1 file changed, 11 insertions(+), 6 deletions(-) |
208 |
- |
209 |
-diff --git a/runtime/ruleset.c b/runtime/ruleset.c |
210 |
-index ae5a9bd..6ca97e8 100644 |
211 |
---- a/runtime/ruleset.c |
212 |
-+++ b/runtime/ruleset.c |
213 |
-@@ -495,6 +495,7 @@ processBatch(batch_t *pBatch, wti_t *pWti) |
214 |
- int i; |
215 |
- msg_t *pMsg; |
216 |
- ruleset_t *pRuleset; |
217 |
-+ rsRetVal localRet; |
218 |
- DEFiRet; |
219 |
- |
220 |
- DBGPRINTF("processBATCH: batch of %d elements must be processed\n", pBatch->nElem); |
221 |
-@@ -506,15 +507,19 @@ processBatch(batch_t *pBatch, wti_t *pWti) |
222 |
- pMsg = pBatch->pElem[i].pMsg; |
223 |
- DBGPRINTF("processBATCH: next msg %d: %.128s\n", i, pMsg->pszRawMsg); |
224 |
- pRuleset = (pMsg->pRuleset == NULL) ? ourConf->rulesets.pDflt : pMsg->pRuleset; |
225 |
-- scriptExec(pRuleset->root, pMsg, pWti); |
226 |
-- // TODO: think if we need a return state of scriptExec - most probably |
227 |
-- // the answer is "no", as we need to process the batch in any case! |
228 |
-- // TODO: we must refactor this! flag messages as committed |
229 |
-- batchSetElemState(pBatch, i, BATCH_STATE_COMM); |
230 |
-+ localRet = scriptExec(pRuleset->root, pMsg, pWti); |
231 |
-+ /* the most important case here is that processing may be aborted |
232 |
-+ * due to pbShutdownImmediate, in which case we MUST NOT flag this |
233 |
-+ * message as committed. If we would do so, the message would |
234 |
-+ * potentially be lost. |
235 |
-+ */ |
236 |
-+ if(localRet == RS_RET_OK) |
237 |
-+ batchSetElemState(pBatch, i, BATCH_STATE_COMM); |
238 |
- } |
239 |
- |
240 |
- /* commit phase */ |
241 |
-- dbgprintf("END batch execution phase, entering to commit phase\n"); |
242 |
-+ DBGPRINTF("END batch execution phase, entering to commit phase " |
243 |
-+ "[processed %d of %d messages]\n", i, batchNumMsgs(pBatch)); |
244 |
- actionCommitAllDirect(pWti); |
245 |
- |
246 |
- DBGPRINTF("processBATCH: batch of %d elements has been processed\n", pBatch->nElem); |
247 |
|
248 |
diff --git a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.16.0-restrict-build-deps.patch b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.16.0-restrict-build-deps.patch |
249 |
deleted file mode 100644 |
250 |
index b28fbed062b..00000000000 |
251 |
--- a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.16.0-restrict-build-deps.patch |
252 |
+++ /dev/null |
253 |
@@ -1,55 +0,0 @@ |
254 |
-From ac9acbd9297cf986873e972968aca98d65377dab Mon Sep 17 00:00:00 2001 |
255 |
-From: Thomas Deutschmann |
256 |
-Date: Sun, 28 Aug 2016 20:08:58 +0200 |
257 |
-Subject: [PATCH 1/2] configure: Restrict to json-c usage |
258 |
- |
259 |
---- |
260 |
- configure.ac | 6 ++---- |
261 |
- 1 file changed, 2 insertions(+), 4 deletions(-) |
262 |
- |
263 |
-diff --git a/configure.ac b/configure.ac |
264 |
-index 4551c46..6789ab2 100644 |
265 |
---- a/configure.ac |
266 |
-+++ b/configure.ac |
267 |
-@@ -26,10 +26,8 @@ PKG_PROG_PKG_CONFIG |
268 |
- |
269 |
- # modules we require |
270 |
- PKG_CHECK_MODULES(LIBESTR, libestr >= 0.1.9) |
271 |
--PKG_CHECK_MODULES([JSON_C], [libfastjson],, [ |
272 |
-- PKG_CHECK_MODULES([JSON_C], [json],, [ |
273 |
-- PKG_CHECK_MODULES([JSON_C], [json-c],,) |
274 |
-- ]) |
275 |
-+PKG_CHECK_MODULES([JSON_C], [json],, [ |
276 |
-+ PKG_CHECK_MODULES([JSON_C], [json-c],,) |
277 |
- ]) |
278 |
- |
279 |
- save_CFLAGS="$CFLAGS" |
280 |
--- |
281 |
-2.9.3 |
282 |
- |
283 |
- |
284 |
-From 7eed92763725244a53c50110fbe7419ba90d41a6 Mon Sep 17 00:00:00 2001 |
285 |
-From: Thomas Deutschmann |
286 |
-Date: Sun, 28 Aug 2016 20:15:32 +0200 |
287 |
-Subject: [PATCH 2/2] configure: Restrict to liblognorm-1.1.2 usage |
288 |
- |
289 |
---- |
290 |
- configure.ac | 2 +- |
291 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
292 |
- |
293 |
-diff --git a/configure.ac b/configure.ac |
294 |
-index 6789ab2..5f29106 100644 |
295 |
---- a/configure.ac |
296 |
-+++ b/configure.ac |
297 |
-@@ -927,7 +927,7 @@ AC_ARG_ENABLE(mmnormalize, |
298 |
- [enable_mmnormalize=no] |
299 |
- ) |
300 |
- if test "x$enable_mmnormalize" = "xyes"; then |
301 |
-- PKG_CHECK_MODULES(LIBLOGNORM, lognorm >= 1.1.2) |
302 |
-+ PKG_CHECK_MODULES(LIBLOGNORM, lognorm = 1.1.2) |
303 |
- |
304 |
- save_CFLAGS="$CFLAGS" |
305 |
- save_LIBS="$LIBS" |
306 |
--- |
307 |
-2.9.3 |
308 |
- |
309 |
|
310 |
diff --git a/app-admin/rsyslog/rsyslog-8.16.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.16.0-r1.ebuild |
311 |
deleted file mode 100644 |
312 |
index cb3230fa90e..00000000000 |
313 |
--- a/app-admin/rsyslog/rsyslog-8.16.0-r1.ebuild |
314 |
+++ /dev/null |
315 |
@@ -1,423 +0,0 @@ |
316 |
-# Copyright 1999-2017 Gentoo Foundation |
317 |
-# Distributed under the terms of the GNU General Public License v2 |
318 |
- |
319 |
-EAPI=6 |
320 |
- |
321 |
-inherit autotools eutils systemd |
322 |
- |
323 |
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" |
324 |
-HOMEPAGE="http://www.rsyslog.com/" |
325 |
- |
326 |
-BRANCH="8-stable" |
327 |
- |
328 |
-PATCHES=( |
329 |
- "${FILESDIR}"/8-stable/50-rsyslog-8.15.0-imtcp-tls-basic-vg-test-workaround.patch |
330 |
- "${FILESDIR}"/8-stable/50-rsyslog-8.15.0-imfile-readmode2-vg-test-workaround.patch |
331 |
- "${FILESDIR}"/8-stable/50-rsyslog-8.16.0-fix-queue-engine-issue-262.patch |
332 |
- "${FILESDIR}"/8-stable/50-rsyslog-8.16.0-fix-leap-year-handling.patch |
333 |
- "${FILESDIR}"/8-stable/50-rsyslog-8.16.0-restrict-build-deps.patch |
334 |
-) |
335 |
- |
336 |
-if [[ ${PV} == "9999" ]]; then |
337 |
- EGIT_REPO_URI=" |
338 |
- git://github.com/rsyslog/${PN}.git |
339 |
- https://github.com/rsyslog/${PN}.git |
340 |
- " |
341 |
- |
342 |
- DOC_REPO_URI=" |
343 |
- git://github.com/rsyslog/${PN}-doc.git |
344 |
- https://github.com/rsyslog/${PN}-doc.git |
345 |
- " |
346 |
- |
347 |
- inherit git-r3 |
348 |
-else |
349 |
- SRC_URI=" |
350 |
- http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz |
351 |
- doc? ( http://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz ) |
352 |
- " |
353 |
- KEYWORDS="amd64 ~arm hppa x86" |
354 |
-fi |
355 |
- |
356 |
-LICENSE="GPL-3 LGPL-3 Apache-2.0" |
357 |
-SLOT="0" |
358 |
-IUSE="dbi debug doc elasticsearch +gcrypt jemalloc kerberos libressl mongodb mysql normalize omudpspoof" |
359 |
-IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq" |
360 |
- |
361 |
-RDEPEND=" |
362 |
- >=dev-libs/json-c-0.11:= |
363 |
- >=dev-libs/libestr-0.1.9 |
364 |
- >=dev-libs/liblogging-1.0.1:=[stdlog] |
365 |
- >=sys-libs/zlib-1.2.5 |
366 |
- dbi? ( >=dev-db/libdbi-0.8.3 ) |
367 |
- elasticsearch? ( >=net-misc/curl-7.35.0 ) |
368 |
- gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) |
369 |
- jemalloc? ( >=dev-libs/jemalloc-3.3.1 ) |
370 |
- kerberos? ( virtual/krb5 ) |
371 |
- mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) |
372 |
- mysql? ( virtual/mysql ) |
373 |
- normalize? ( |
374 |
- >=dev-libs/libee-0.4.0 |
375 |
- =dev-libs/liblognorm-1.1.2*:= |
376 |
- ) |
377 |
- omudpspoof? ( >=net-libs/libnet-1.1.6 ) |
378 |
- postgres? ( >=dev-db/postgresql-8.4.20:= ) |
379 |
- rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0 ) |
380 |
- redis? ( >=dev-libs/hiredis-0.11.0:= ) |
381 |
- relp? ( >=dev-libs/librelp-1.2.5 ) |
382 |
- rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) |
383 |
- rfc5424hmac? ( |
384 |
- !libressl? ( dev-libs/openssl:0= ) |
385 |
- libressl? ( dev-libs/libressl:0= ) |
386 |
- ) |
387 |
- snmp? ( >=net-analyzer/net-snmp-5.7.2 ) |
388 |
- ssl? ( >=net-libs/gnutls-2.12.23:0= ) |
389 |
- systemd? ( >=sys-apps/systemd-208 ) |
390 |
- zeromq? ( >=net-libs/czmq-1.2.0 )" |
391 |
-DEPEND="${RDEPEND} |
392 |
- virtual/pkgconfig" |
393 |
- |
394 |
-if [[ ${PV} == "9999" ]]; then |
395 |
- DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" |
396 |
- DEPEND+=" >=sys-devel/flex-2.5.39-r1" |
397 |
- DEPEND+=" >=sys-devel/bison-2.4.3" |
398 |
- DEPEND+=" >=dev-python/docutils-0.12" |
399 |
-fi |
400 |
- |
401 |
-# Maitainer note : open a bug to upstream |
402 |
-# showing that building in a separate dir fails |
403 |
-AUTOTOOLS_IN_SOURCE_BUILD=1 |
404 |
- |
405 |
-AUTOTOOLS_PRUNE_LIBTOOL_FILES="modules" |
406 |
- |
407 |
-DOCS=( |
408 |
- AUTHORS |
409 |
- ChangeLog |
410 |
- "${FILESDIR}"/${BRANCH}/README.gentoo |
411 |
-) |
412 |
- |
413 |
-src_unpack() { |
414 |
- if [[ ${PV} == "9999" ]]; then |
415 |
- git-r3_fetch |
416 |
- git-r3_checkout |
417 |
- else |
418 |
- unpack ${P}.tar.gz |
419 |
- fi |
420 |
- |
421 |
- if use doc; then |
422 |
- if [[ ${PV} == "9999" ]]; then |
423 |
- local _EGIT_BRANCH= |
424 |
- if [ -n "${EGIT_BRANCH}" ]; then |
425 |
- # Cannot use rsyslog commits/branches for documentation repository |
426 |
- _EGIT_BRANCH=${EGIT_BRANCH} |
427 |
- unset EGIT_BRANCH |
428 |
- fi |
429 |
- |
430 |
- git-r3_fetch "${DOC_REPO_URI}" |
431 |
- git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs |
432 |
- |
433 |
- if [ -n "${_EGIT_BRANCH}" ]; then |
434 |
- # Restore previous EGIT_BRANCH information |
435 |
- EGIT_BRANCH=${_EGIT_BRANCH} |
436 |
- fi |
437 |
- else |
438 |
- local doc_tarball="${PN}-doc-${PV}.tar.gz" |
439 |
- |
440 |
- cd "${S}" || die "Cannot change dir into '$S'" |
441 |
- mkdir docs || die "Failed to create docs directory" |
442 |
- cd docs || die "Failed to change dir into '${S}/docs'" |
443 |
- unpack ${doc_tarball} |
444 |
- fi |
445 |
- fi |
446 |
-} |
447 |
- |
448 |
-src_prepare() { |
449 |
- default |
450 |
- |
451 |
- eautoreconf |
452 |
-} |
453 |
- |
454 |
-src_configure() { |
455 |
- # Maintainer notes: |
456 |
- # * Guardtime support is missing because libgt isn't yet available |
457 |
- # in portage. |
458 |
- # * Hadoop's HDFS file system output module is currently not |
459 |
- # supported in Gentoo because nobody is able to test it |
460 |
- # (JAVA dependency). |
461 |
- # * dev-libs/hiredis doesn't provide pkg-config (see #504614, |
462 |
- # upstream PR 129 and 136) so we need to export HIREDIS_* |
463 |
- # variables because rsyslog's build system depends on pkg-config. |
464 |
- |
465 |
- if use redis; then |
466 |
- export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" |
467 |
- export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" |
468 |
- fi |
469 |
- |
470 |
- local myeconfargs=( |
471 |
- --disable-debug-symbols |
472 |
- --disable-generate-man-pages |
473 |
- --without-valgrind-testbench |
474 |
- $(use_enable test testbench) |
475 |
- # Input Plugins without depedencies |
476 |
- --enable-imdiag |
477 |
- --enable-imfile |
478 |
- --enable-impstats |
479 |
- --enable-imptcp |
480 |
- # Message Modificiation Plugins without depedencies |
481 |
- --enable-mmanon |
482 |
- --enable-mmaudit |
483 |
- --enable-mmfields |
484 |
- --enable-mmjsonparse |
485 |
- --enable-mmpstrucdata |
486 |
- --enable-mmsequence |
487 |
- --enable-mmutf8fix |
488 |
- # Output Modification Plugins without dependencies |
489 |
- --enable-mail |
490 |
- --enable-omprog |
491 |
- --enable-omruleset |
492 |
- --enable-omstdout |
493 |
- --enable-omuxsock |
494 |
- # Misc |
495 |
- --disable-omkafka |
496 |
- --enable-pmaixforwardedfrom |
497 |
- --enable-pmciscoios |
498 |
- --enable-pmcisconames |
499 |
- --enable-pmlastmsg |
500 |
- --enable-pmsnare |
501 |
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
502 |
- # DB |
503 |
- $(use_enable dbi libdbi) |
504 |
- $(use_enable mongodb ommongodb) |
505 |
- $(use_enable mysql) |
506 |
- $(use_enable postgres pgsql) |
507 |
- $(use_enable redis omhiredis) |
508 |
- # Debug |
509 |
- $(use_enable debug) |
510 |
- $(use_enable debug diagtools) |
511 |
- $(use_enable debug memcheck) |
512 |
- $(use_enable debug rtinst) |
513 |
- $(use_enable debug valgrind) |
514 |
- # Misc |
515 |
- $(use_enable elasticsearch) |
516 |
- $(use_enable gcrypt libgcrypt) |
517 |
- $(use_enable jemalloc) |
518 |
- $(use_enable kerberos gssapi-krb5) |
519 |
- $(use_enable normalize mmnormalize) |
520 |
- $(use_enable omudpspoof) |
521 |
- $(use_enable rabbitmq omrabbitmq) |
522 |
- $(use_enable relp) |
523 |
- $(use_enable rfc3195) |
524 |
- $(use_enable rfc5424hmac mmrfc5424addhmac) |
525 |
- $(use_enable snmp) |
526 |
- $(use_enable snmp mmsnmptrapd) |
527 |
- $(use_enable ssl gnutls) |
528 |
- $(use_enable systemd imjournal) |
529 |
- $(use_enable systemd omjournal) |
530 |
- $(use_enable usertools) |
531 |
- $(use_enable zeromq imzmq3) |
532 |
- $(use_enable zeromq omzmq3) |
533 |
- ) |
534 |
- |
535 |
- econf ${myeconfargs[@]} |
536 |
-} |
537 |
- |
538 |
-src_compile() { |
539 |
- default |
540 |
- |
541 |
- if use doc && [[ "${PV}" == "9999" ]]; then |
542 |
- einfo "Building documentation ..." |
543 |
- local doc_dir="${S}/docs" |
544 |
- cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" |
545 |
- sphinx-build -b html source build || die "Building documentation failed!" |
546 |
- fi |
547 |
-} |
548 |
- |
549 |
-src_test() { |
550 |
- local _has_increased_ulimit= |
551 |
- |
552 |
- # When adding new tests via patches we have to make them executable |
553 |
- einfo "Adjusting permissions of test scripts ..." |
554 |
- find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \ |
555 |
- die "Failed to adjust test scripts permission" |
556 |
- |
557 |
- if ulimit -n 3072; then |
558 |
- _has_increased_ulimit="true" |
559 |
- fi |
560 |
- |
561 |
- if ! emake --jobs 1 check; then |
562 |
- eerror "Test suite failed! :(" |
563 |
- |
564 |
- if [ -z "${_has_increased_ulimit}" ]; then |
565 |
- eerror "Probably because open file limit couldn't be set to 3072." |
566 |
- fi |
567 |
- |
568 |
- if has userpriv $FEATURES; then |
569 |
- eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \ |
570 |
- "before you submit a bug report." |
571 |
- fi |
572 |
- |
573 |
- fi |
574 |
-} |
575 |
- |
576 |
-src_install() { |
577 |
- default |
578 |
- |
579 |
- newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN} |
580 |
- newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN} |
581 |
- |
582 |
- keepdir /var/empty/dev |
583 |
- keepdir /var/spool/${PN} |
584 |
- keepdir /etc/ssl/${PN} |
585 |
- keepdir /etc/${PN}.d |
586 |
- |
587 |
- insinto /etc |
588 |
- newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf |
589 |
- |
590 |
- insinto /etc/rsyslog.d/ |
591 |
- doins "${FILESDIR}/${BRANCH}/50-default.conf" |
592 |
- |
593 |
- insinto /etc/logrotate.d/ |
594 |
- newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN} |
595 |
- |
596 |
- if use mysql; then |
597 |
- insinto /usr/share/doc/${PF}/scripts/mysql |
598 |
- doins plugins/ommysql/createDB.sql |
599 |
- fi |
600 |
- |
601 |
- if use postgres; then |
602 |
- insinto /usr/share/doc/${PF}/scripts/pgsql |
603 |
- doins plugins/ompgsql/createDB.sql |
604 |
- fi |
605 |
- |
606 |
- use doc && dohtml -r "${S}/docs/build/" |
607 |
-} |
608 |
- |
609 |
-pkg_postinst() { |
610 |
- local advertise_readme=0 |
611 |
- |
612 |
- if [[ -z "${REPLACING_VERSIONS}" ]]; then |
613 |
- # This is a new installation |
614 |
- |
615 |
- advertise_readme=1 |
616 |
- |
617 |
- if use mysql || use postgres; then |
618 |
- echo |
619 |
- elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" |
620 |
- elog " /usr/share/doc/${PF}/scripts" |
621 |
- fi |
622 |
- |
623 |
- if use ssl; then |
624 |
- echo |
625 |
- elog "To create a default CA and certificates for your server and clients, run:" |
626 |
- elog " emerge --config =${PF}" |
627 |
- elog "on your logging server. You can run it several times," |
628 |
- elog "once for each logging client. The client certificates will be signed" |
629 |
- elog "using the CA certificate generated during the first run." |
630 |
- fi |
631 |
- fi |
632 |
- |
633 |
- if [[ ${advertise_readme} -gt 0 ]]; then |
634 |
- # We need to show the README file location |
635 |
- |
636 |
- echo "" |
637 |
- elog "Please read" |
638 |
- elog "" |
639 |
- elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" |
640 |
- elog "" |
641 |
- elog "for more details." |
642 |
- fi |
643 |
-} |
644 |
- |
645 |
-pkg_config() { |
646 |
- if ! use ssl ; then |
647 |
- einfo "There is nothing to configure for rsyslog unless you" |
648 |
- einfo "used USE=ssl to build it." |
649 |
- return 0 |
650 |
- fi |
651 |
- |
652 |
- # Make sure the certificates directory exists |
653 |
- CERTDIR="${EROOT}/etc/ssl/${PN}" |
654 |
- if [ ! -d "${CERTDIR}" ]; then |
655 |
- mkdir "${CERTDIR}" || die |
656 |
- fi |
657 |
- einfo "Your certificates will be stored in ${CERTDIR}" |
658 |
- |
659 |
- # Create a default CA if needed |
660 |
- if [ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]; then |
661 |
- einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." |
662 |
- certtool --generate-privkey \ |
663 |
- --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null |
664 |
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
665 |
- |
666 |
- cat > "${T}/${PF}.$$" <<- _EOF |
667 |
- cn = Portage automated CA |
668 |
- ca |
669 |
- cert_signing_key |
670 |
- expiration_days = 3650 |
671 |
- _EOF |
672 |
- |
673 |
- certtool --generate-self-signed \ |
674 |
- --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
675 |
- --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ |
676 |
- --template "${T}/${PF}.$$" &>/dev/null |
677 |
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
678 |
- |
679 |
- # Create the server certificate |
680 |
- echo |
681 |
- einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " |
682 |
- read -r CN |
683 |
- |
684 |
- einfo "Creating private key and certificate for server ${CN}..." |
685 |
- certtool --generate-privkey \ |
686 |
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
687 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
688 |
- |
689 |
- cat > "${T}/${PF}.$$" <<- _EOF |
690 |
- cn = ${CN} |
691 |
- tls_www_server |
692 |
- dns_name = ${CN} |
693 |
- expiration_days = 3650 |
694 |
- _EOF |
695 |
- |
696 |
- certtool --generate-certificate \ |
697 |
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
698 |
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
699 |
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
700 |
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
701 |
- --template "${T}/${PF}.$$" &>/dev/null |
702 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
703 |
- |
704 |
- else |
705 |
- einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." |
706 |
- fi |
707 |
- |
708 |
- # Create a client certificate |
709 |
- echo |
710 |
- einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " |
711 |
- read -r CN |
712 |
- |
713 |
- einfo "Creating private key and certificate for client ${CN}..." |
714 |
- certtool --generate-privkey \ |
715 |
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
716 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
717 |
- |
718 |
- cat > "${T}/${PF}.$$" <<- _EOF |
719 |
- cn = ${CN} |
720 |
- tls_www_client |
721 |
- dns_name = ${CN} |
722 |
- expiration_days = 3650 |
723 |
- _EOF |
724 |
- |
725 |
- certtool --generate-certificate \ |
726 |
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
727 |
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
728 |
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
729 |
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
730 |
- --template "${T}/${PF}.$$" &>/dev/null |
731 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
732 |
- |
733 |
- rm -f "${T}/${PF}.$$" |
734 |
- |
735 |
- echo |
736 |
- einfo "Here is the documentation on how to encrypt your log traffic:" |
737 |
- einfo " http://www.rsyslog.com/doc/rsyslog_tls.html" |
738 |
-} |
739 |
|
740 |
diff --git a/app-admin/rsyslog/rsyslog-8.22.0.ebuild b/app-admin/rsyslog/rsyslog-8.22.0.ebuild |
741 |
deleted file mode 100644 |
742 |
index 05b81bde1cc..00000000000 |
743 |
--- a/app-admin/rsyslog/rsyslog-8.22.0.ebuild |
744 |
+++ /dev/null |
745 |
@@ -1,451 +0,0 @@ |
746 |
-# Copyright 1999-2017 Gentoo Foundation |
747 |
-# Distributed under the terms of the GNU General Public License v2 |
748 |
- |
749 |
-EAPI=6 |
750 |
- |
751 |
-inherit autotools eutils linux-info systemd |
752 |
- |
753 |
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" |
754 |
-HOMEPAGE="http://www.rsyslog.com/" |
755 |
- |
756 |
-BRANCH="8-stable" |
757 |
- |
758 |
-if [[ ${PV} == "9999" ]]; then |
759 |
- EGIT_REPO_URI=" |
760 |
- git://github.com/rsyslog/${PN}.git |
761 |
- https://github.com/rsyslog/${PN}.git |
762 |
- " |
763 |
- |
764 |
- DOC_REPO_URI=" |
765 |
- git://github.com/rsyslog/${PN}-doc.git |
766 |
- https://github.com/rsyslog/${PN}-doc.git |
767 |
- " |
768 |
- |
769 |
- inherit git-r3 |
770 |
-else |
771 |
- MY_PV=${PV%_rc*} |
772 |
- MY_FILENAME="${PN}-${PV}.tar.gz" |
773 |
- MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz" |
774 |
- S="${WORKDIR}/${PN}-${MY_PV}" |
775 |
- |
776 |
- # Upstream URL schema: |
777 |
- # RC: http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz |
778 |
- # http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz |
779 |
- # Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz |
780 |
- |
781 |
- MY_URL_PREFIX= |
782 |
- if [[ ${PV} = *_rc* ]]; then |
783 |
- _tmp_last_index=$(($(get_last_version_component_index ${PV})+1)) |
784 |
- _tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV}) |
785 |
- if [[ ${_tmp_suffix} = *rc* ]]; then |
786 |
- MY_URL_PREFIX="${_tmp_suffix}/" |
787 |
- fi |
788 |
- |
789 |
- # Cleaning up temporary variables |
790 |
- unset _tmp_last_index |
791 |
- unset _tmp_suffix |
792 |
- else |
793 |
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" |
794 |
- fi |
795 |
- |
796 |
- SRC_URI=" |
797 |
- http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME} |
798 |
- doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} ) |
799 |
- " |
800 |
-fi |
801 |
- |
802 |
-LICENSE="GPL-3 LGPL-3 Apache-2.0" |
803 |
-SLOT="0" |
804 |
-IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mongodb mysql normalize omhttpfs" |
805 |
-IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq" |
806 |
- |
807 |
-RDEPEND=" |
808 |
- >=dev-libs/libfastjson-0.99.2:= |
809 |
- >=dev-libs/libestr-0.1.9 |
810 |
- >=dev-libs/liblogging-1.0.1:=[stdlog] |
811 |
- >=sys-libs/zlib-1.2.5 |
812 |
- dbi? ( >=dev-db/libdbi-0.8.3 ) |
813 |
- elasticsearch? ( >=net-misc/curl-7.35.0 ) |
814 |
- gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) |
815 |
- grok? ( >=dev-libs/grok-0.9.2 ) |
816 |
- jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) |
817 |
- kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) |
818 |
- kerberos? ( virtual/krb5 ) |
819 |
- mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) |
820 |
- mysql? ( virtual/mysql ) |
821 |
- normalize? ( |
822 |
- >=dev-libs/libee-0.4.0 |
823 |
- >=dev-libs/liblognorm-2.0.1:= |
824 |
- ) |
825 |
- omhttpfs? ( >=net-misc/curl-7.35.0 ) |
826 |
- omudpspoof? ( >=net-libs/libnet-1.1.6 ) |
827 |
- postgres? ( >=dev-db/postgresql-8.4.20:= ) |
828 |
- rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) |
829 |
- redis? ( >=dev-libs/hiredis-0.11.0:= ) |
830 |
- relp? ( >=dev-libs/librelp-1.2.12:= ) |
831 |
- rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) |
832 |
- rfc5424hmac? ( |
833 |
- !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) |
834 |
- libressl? ( dev-libs/libressl:= ) |
835 |
- ) |
836 |
- snmp? ( >=net-analyzer/net-snmp-5.7.2 ) |
837 |
- ssl? ( >=net-libs/gnutls-2.12.23:0= ) |
838 |
- systemd? ( >=sys-apps/systemd-208 ) |
839 |
- uuid? ( sys-apps/util-linux:0= ) |
840 |
- zeromq? ( |
841 |
- >=net-libs/zeromq-4.1.1:= |
842 |
- >=net-libs/czmq-3.0.0 |
843 |
- )" |
844 |
-DEPEND="${RDEPEND} |
845 |
- >=sys-devel/autoconf-archive-2015.02.24 |
846 |
- virtual/pkgconfig |
847 |
- test? ( sys-libs/libfaketime )" |
848 |
- |
849 |
-if [[ ${PV} == "9999" ]]; then |
850 |
- DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" |
851 |
- DEPEND+=" >=sys-devel/flex-2.5.39-r1" |
852 |
- DEPEND+=" >=sys-devel/bison-2.4.3" |
853 |
- DEPEND+=" >=dev-python/docutils-0.12" |
854 |
-fi |
855 |
- |
856 |
-CONFIG_CHECK="~INOTIFY_USER" |
857 |
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" |
858 |
- |
859 |
-src_unpack() { |
860 |
- if [[ ${PV} == "9999" ]]; then |
861 |
- git-r3_fetch |
862 |
- git-r3_checkout |
863 |
- else |
864 |
- unpack ${P}.tar.gz |
865 |
- fi |
866 |
- |
867 |
- if use doc; then |
868 |
- if [[ ${PV} == "9999" ]]; then |
869 |
- local _EGIT_BRANCH= |
870 |
- if [[ -n "${EGIT_BRANCH}" ]]; then |
871 |
- # Cannot use rsyslog commits/branches for documentation repository |
872 |
- _EGIT_BRANCH=${EGIT_BRANCH} |
873 |
- unset EGIT_BRANCH |
874 |
- fi |
875 |
- |
876 |
- git-r3_fetch "${DOC_REPO_URI}" |
877 |
- git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs |
878 |
- |
879 |
- if [[ -n "${_EGIT_BRANCH}" ]]; then |
880 |
- # Restore previous EGIT_BRANCH information |
881 |
- EGIT_BRANCH=${_EGIT_BRANCH} |
882 |
- fi |
883 |
- else |
884 |
- cd "${S}" || die "Cannot change dir into '${S}'" |
885 |
- mkdir docs || die "Failed to create docs directory" |
886 |
- cd docs || die "Failed to change dir into '${S}/docs'" |
887 |
- unpack ${MY_FILENAME_DOCS} |
888 |
- fi |
889 |
- fi |
890 |
-} |
891 |
- |
892 |
-src_prepare() { |
893 |
- default |
894 |
- |
895 |
- eautoreconf |
896 |
-} |
897 |
- |
898 |
-src_configure() { |
899 |
- # Maintainer notes: |
900 |
- # * Guardtime support is missing because libgt isn't yet available |
901 |
- # in portage. |
902 |
- # * Hadoop's HDFS file system output module is currently not |
903 |
- # supported in Gentoo because nobody is able to test it |
904 |
- # (JAVA dependency). |
905 |
- # * dev-libs/hiredis doesn't provide pkg-config (see #504614, |
906 |
- # upstream PR 129 and 136) so we need to export HIREDIS_* |
907 |
- # variables because rsyslog's build system depends on pkg-config. |
908 |
- |
909 |
- if use redis; then |
910 |
- export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" |
911 |
- export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" |
912 |
- fi |
913 |
- |
914 |
- local myeconfargs=( |
915 |
- --disable-debug-symbols |
916 |
- --disable-generate-man-pages |
917 |
- --without-valgrind-testbench |
918 |
- $(use_enable test testbench) |
919 |
- # Input Plugins without depedencies |
920 |
- --enable-imdiag |
921 |
- --enable-imfile |
922 |
- --enable-impstats |
923 |
- --enable-imptcp |
924 |
- # Message Modificiation Plugins without depedencies |
925 |
- --enable-mmanon |
926 |
- --enable-mmaudit |
927 |
- --enable-mmcount |
928 |
- --enable-mmfields |
929 |
- --enable-mmjsonparse |
930 |
- --enable-mmpstrucdata |
931 |
- --enable-mmsequence |
932 |
- --enable-mmutf8fix |
933 |
- # Output Modification Plugins without dependencies |
934 |
- --enable-mail |
935 |
- --enable-omprog |
936 |
- --enable-omruleset |
937 |
- --enable-omstdout |
938 |
- --enable-omuxsock |
939 |
- # Misc |
940 |
- --enable-pmaixforwardedfrom |
941 |
- --enable-pmciscoios |
942 |
- --enable-pmcisconames |
943 |
- --enable-pmlastmsg |
944 |
- --enable-pmsnare |
945 |
- # DB |
946 |
- $(use_enable dbi libdbi) |
947 |
- $(use_enable mongodb ommongodb) |
948 |
- $(use_enable mysql) |
949 |
- $(use_enable postgres pgsql) |
950 |
- $(use_enable redis omhiredis) |
951 |
- # Debug |
952 |
- $(use_enable debug) |
953 |
- $(use_enable debug diagtools) |
954 |
- $(use_enable debug memcheck) |
955 |
- $(use_enable debug rtinst) |
956 |
- $(use_enable debug valgrind) |
957 |
- # Misc |
958 |
- $(use_enable elasticsearch) |
959 |
- $(use_enable gcrypt libgcrypt) |
960 |
- $(use_enable jemalloc) |
961 |
- $(use_enable kafka omkafka) |
962 |
- $(use_enable kerberos gssapi-krb5) |
963 |
- $(use_enable normalize mmnormalize) |
964 |
- $(use_enable grok mmgrok) |
965 |
- $(use_enable omhttpfs) |
966 |
- $(use_enable omudpspoof) |
967 |
- $(use_enable rabbitmq omrabbitmq) |
968 |
- $(use_enable relp) |
969 |
- $(use_enable rfc3195) |
970 |
- $(use_enable rfc5424hmac mmrfc5424addhmac) |
971 |
- $(use_enable snmp) |
972 |
- $(use_enable snmp mmsnmptrapd) |
973 |
- $(use_enable ssl gnutls) |
974 |
- $(use_enable systemd imjournal) |
975 |
- $(use_enable systemd omjournal) |
976 |
- $(use_enable usertools) |
977 |
- $(use_enable uuid) |
978 |
- $(use_enable zeromq imczmq) |
979 |
- $(use_enable zeromq imzmq3) |
980 |
- $(use_enable zeromq omczmq) |
981 |
- $(use_enable zeromq omzmq3) |
982 |
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
983 |
- ) |
984 |
- |
985 |
- econf "${myeconfargs[@]}" |
986 |
-} |
987 |
- |
988 |
-src_compile() { |
989 |
- default |
990 |
- |
991 |
- if use doc && [[ "${PV}" == "9999" ]]; then |
992 |
- einfo "Building documentation ..." |
993 |
- local doc_dir="${S}/docs" |
994 |
- cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" |
995 |
- sphinx-build -b html source build || die "Building documentation failed!" |
996 |
- fi |
997 |
-} |
998 |
- |
999 |
-src_test() { |
1000 |
- local _has_increased_ulimit= |
1001 |
- |
1002 |
- # Sometimes tests aren't executable (i.e. when added via patch) |
1003 |
- einfo "Adjusting permissions of test scripts ..." |
1004 |
- find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \ |
1005 |
- die "Failed to adjust test scripts permission" |
1006 |
- |
1007 |
- if ulimit -n 3072; then |
1008 |
- _has_increased_ulimit="true" |
1009 |
- fi |
1010 |
- |
1011 |
- if ! emake --jobs 1 check; then |
1012 |
- eerror "Test suite failed! :(" |
1013 |
- |
1014 |
- if [[ -z "${_has_increased_ulimit}" ]]; then |
1015 |
- eerror "Probably because open file limit couldn't be set to 3072." |
1016 |
- fi |
1017 |
- |
1018 |
- if has userpriv ${FEATURES}; then |
1019 |
- eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \ |
1020 |
- "before you submit a bug report." |
1021 |
- fi |
1022 |
- |
1023 |
- fi |
1024 |
-} |
1025 |
- |
1026 |
-src_install() { |
1027 |
- local DOCS=( |
1028 |
- AUTHORS |
1029 |
- ChangeLog |
1030 |
- "${FILESDIR}"/${BRANCH}/README.gentoo |
1031 |
- ) |
1032 |
- |
1033 |
- use doc && local HTML_DOCS=( "${S}/docs/build/." ) |
1034 |
- |
1035 |
- default |
1036 |
- |
1037 |
- newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN} |
1038 |
- newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN} |
1039 |
- |
1040 |
- keepdir /var/empty/dev |
1041 |
- keepdir /var/spool/${PN} |
1042 |
- keepdir /etc/ssl/${PN} |
1043 |
- keepdir /etc/${PN}.d |
1044 |
- |
1045 |
- insinto /etc |
1046 |
- newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf |
1047 |
- |
1048 |
- insinto /etc/rsyslog.d/ |
1049 |
- doins "${FILESDIR}/${BRANCH}/50-default.conf" |
1050 |
- |
1051 |
- insinto /etc/logrotate.d/ |
1052 |
- newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN} |
1053 |
- |
1054 |
- if use mysql; then |
1055 |
- insinto /usr/share/doc/${PF}/scripts/mysql |
1056 |
- doins plugins/ommysql/createDB.sql |
1057 |
- fi |
1058 |
- |
1059 |
- if use postgres; then |
1060 |
- insinto /usr/share/doc/${PF}/scripts/pgsql |
1061 |
- doins plugins/ompgsql/createDB.sql |
1062 |
- fi |
1063 |
- |
1064 |
- prune_libtool_files --modules |
1065 |
-} |
1066 |
- |
1067 |
-pkg_postinst() { |
1068 |
- local advertise_readme=0 |
1069 |
- |
1070 |
- if [[ -z "${REPLACING_VERSIONS}" ]]; then |
1071 |
- # This is a new installation |
1072 |
- |
1073 |
- advertise_readme=1 |
1074 |
- |
1075 |
- if use mysql || use postgres; then |
1076 |
- echo |
1077 |
- elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" |
1078 |
- elog " /usr/share/doc/${PF}/scripts" |
1079 |
- fi |
1080 |
- |
1081 |
- if use ssl; then |
1082 |
- echo |
1083 |
- elog "To create a default CA and certificates for your server and clients, run:" |
1084 |
- elog " emerge --config =${PF}" |
1085 |
- elog "on your logging server. You can run it several times," |
1086 |
- elog "once for each logging client. The client certificates will be signed" |
1087 |
- elog "using the CA certificate generated during the first run." |
1088 |
- fi |
1089 |
- fi |
1090 |
- |
1091 |
- if [[ ${advertise_readme} -gt 0 ]]; then |
1092 |
- # We need to show the README file location |
1093 |
- |
1094 |
- echo "" |
1095 |
- elog "Please read" |
1096 |
- elog "" |
1097 |
- elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" |
1098 |
- elog "" |
1099 |
- elog "for more details." |
1100 |
- fi |
1101 |
-} |
1102 |
- |
1103 |
-pkg_config() { |
1104 |
- if ! use ssl ; then |
1105 |
- einfo "There is nothing to configure for rsyslog unless you" |
1106 |
- einfo "used USE=ssl to build it." |
1107 |
- return 0 |
1108 |
- fi |
1109 |
- |
1110 |
- # Make sure the certificates directory exists |
1111 |
- local CERTDIR="${EROOT}/etc/ssl/${PN}" |
1112 |
- if [[ ! -d "${CERTDIR}" ]]; then |
1113 |
- mkdir "${CERTDIR}" || die |
1114 |
- fi |
1115 |
- einfo "Your certificates will be stored in ${CERTDIR}" |
1116 |
- |
1117 |
- # Create a default CA if needed |
1118 |
- if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then |
1119 |
- einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." |
1120 |
- certtool --generate-privkey \ |
1121 |
- --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null |
1122 |
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
1123 |
- |
1124 |
- cat > "${T}/${PF}.$$" <<- _EOF |
1125 |
- cn = Portage automated CA |
1126 |
- ca |
1127 |
- cert_signing_key |
1128 |
- expiration_days = 3650 |
1129 |
- _EOF |
1130 |
- |
1131 |
- certtool --generate-self-signed \ |
1132 |
- --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
1133 |
- --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ |
1134 |
- --template "${T}/${PF}.$$" &>/dev/null |
1135 |
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
1136 |
- |
1137 |
- # Create the server certificate |
1138 |
- echo |
1139 |
- einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " |
1140 |
- read -r CN |
1141 |
- |
1142 |
- einfo "Creating private key and certificate for server ${CN}..." |
1143 |
- certtool --generate-privkey \ |
1144 |
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
1145 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
1146 |
- |
1147 |
- cat > "${T}/${PF}.$$" <<- _EOF |
1148 |
- cn = ${CN} |
1149 |
- tls_www_server |
1150 |
- dns_name = ${CN} |
1151 |
- expiration_days = 3650 |
1152 |
- _EOF |
1153 |
- |
1154 |
- certtool --generate-certificate \ |
1155 |
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
1156 |
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
1157 |
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
1158 |
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
1159 |
- --template "${T}/${PF}.$$" &>/dev/null |
1160 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
1161 |
- |
1162 |
- else |
1163 |
- einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." |
1164 |
- fi |
1165 |
- |
1166 |
- # Create a client certificate |
1167 |
- echo |
1168 |
- einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " |
1169 |
- read -r CN |
1170 |
- |
1171 |
- einfo "Creating private key and certificate for client ${CN}..." |
1172 |
- certtool --generate-privkey \ |
1173 |
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
1174 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
1175 |
- |
1176 |
- cat > "${T}/${PF}.$$" <<- _EOF |
1177 |
- cn = ${CN} |
1178 |
- tls_www_client |
1179 |
- dns_name = ${CN} |
1180 |
- expiration_days = 3650 |
1181 |
- _EOF |
1182 |
- |
1183 |
- certtool --generate-certificate \ |
1184 |
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
1185 |
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
1186 |
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
1187 |
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
1188 |
- --template "${T}/${PF}.$$" &>/dev/null |
1189 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
1190 |
- |
1191 |
- rm -f "${T}/${PF}.$$" |
1192 |
- |
1193 |
- echo |
1194 |
- einfo "Here is the documentation on how to encrypt your log traffic:" |
1195 |
- einfo " http://www.rsyslog.com/doc/rsyslog_tls.html" |
1196 |
-} |
1197 |
|
1198 |
diff --git a/app-admin/rsyslog/rsyslog-8.23.0.ebuild b/app-admin/rsyslog/rsyslog-8.23.0.ebuild |
1199 |
deleted file mode 100644 |
1200 |
index 95c92c9ba6a..00000000000 |
1201 |
--- a/app-admin/rsyslog/rsyslog-8.23.0.ebuild |
1202 |
+++ /dev/null |
1203 |
@@ -1,451 +0,0 @@ |
1204 |
-# Copyright 1999-2017 Gentoo Foundation |
1205 |
-# Distributed under the terms of the GNU General Public License v2 |
1206 |
- |
1207 |
-EAPI=6 |
1208 |
- |
1209 |
-inherit autotools eutils linux-info systemd |
1210 |
- |
1211 |
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" |
1212 |
-HOMEPAGE="http://www.rsyslog.com/" |
1213 |
- |
1214 |
-BRANCH="8-stable" |
1215 |
- |
1216 |
-if [[ ${PV} == "9999" ]]; then |
1217 |
- EGIT_REPO_URI=" |
1218 |
- git://github.com/rsyslog/${PN}.git |
1219 |
- https://github.com/rsyslog/${PN}.git |
1220 |
- " |
1221 |
- |
1222 |
- DOC_REPO_URI=" |
1223 |
- git://github.com/rsyslog/${PN}-doc.git |
1224 |
- https://github.com/rsyslog/${PN}-doc.git |
1225 |
- " |
1226 |
- |
1227 |
- inherit git-r3 |
1228 |
-else |
1229 |
- MY_PV=${PV%_rc*} |
1230 |
- MY_FILENAME="${PN}-${PV}.tar.gz" |
1231 |
- MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz" |
1232 |
- S="${WORKDIR}/${PN}-${MY_PV}" |
1233 |
- |
1234 |
- # Upstream URL schema: |
1235 |
- # RC: http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz |
1236 |
- # http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz |
1237 |
- # Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz |
1238 |
- |
1239 |
- MY_URL_PREFIX= |
1240 |
- if [[ ${PV} = *_rc* ]]; then |
1241 |
- _tmp_last_index=$(($(get_last_version_component_index ${PV})+1)) |
1242 |
- _tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV}) |
1243 |
- if [[ ${_tmp_suffix} = *rc* ]]; then |
1244 |
- MY_URL_PREFIX="${_tmp_suffix}/" |
1245 |
- fi |
1246 |
- |
1247 |
- # Cleaning up temporary variables |
1248 |
- unset _tmp_last_index |
1249 |
- unset _tmp_suffix |
1250 |
- else |
1251 |
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" |
1252 |
- fi |
1253 |
- |
1254 |
- SRC_URI=" |
1255 |
- http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME} |
1256 |
- doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} ) |
1257 |
- " |
1258 |
-fi |
1259 |
- |
1260 |
-LICENSE="GPL-3 LGPL-3 Apache-2.0" |
1261 |
-SLOT="0" |
1262 |
-IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mongodb mysql normalize omhttpfs" |
1263 |
-IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq" |
1264 |
- |
1265 |
-RDEPEND=" |
1266 |
- >=dev-libs/libfastjson-0.99.3:= |
1267 |
- >=dev-libs/libestr-0.1.9 |
1268 |
- >=dev-libs/liblogging-1.0.1:=[stdlog] |
1269 |
- >=sys-libs/zlib-1.2.5 |
1270 |
- dbi? ( >=dev-db/libdbi-0.8.3 ) |
1271 |
- elasticsearch? ( >=net-misc/curl-7.35.0 ) |
1272 |
- gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) |
1273 |
- grok? ( >=dev-libs/grok-0.9.2 ) |
1274 |
- jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) |
1275 |
- kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) |
1276 |
- kerberos? ( virtual/krb5 ) |
1277 |
- mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) |
1278 |
- mysql? ( virtual/mysql ) |
1279 |
- normalize? ( |
1280 |
- >=dev-libs/libee-0.4.0 |
1281 |
- >=dev-libs/liblognorm-2.0.1:= |
1282 |
- ) |
1283 |
- omhttpfs? ( >=net-misc/curl-7.35.0 ) |
1284 |
- omudpspoof? ( >=net-libs/libnet-1.1.6 ) |
1285 |
- postgres? ( >=dev-db/postgresql-8.4.20:= ) |
1286 |
- rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) |
1287 |
- redis? ( >=dev-libs/hiredis-0.11.0:= ) |
1288 |
- relp? ( >=dev-libs/librelp-1.2.12:= ) |
1289 |
- rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) |
1290 |
- rfc5424hmac? ( |
1291 |
- !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) |
1292 |
- libressl? ( dev-libs/libressl:= ) |
1293 |
- ) |
1294 |
- snmp? ( >=net-analyzer/net-snmp-5.7.2 ) |
1295 |
- ssl? ( >=net-libs/gnutls-2.12.23:0= ) |
1296 |
- systemd? ( >=sys-apps/systemd-208 ) |
1297 |
- uuid? ( sys-apps/util-linux:0= ) |
1298 |
- zeromq? ( |
1299 |
- >=net-libs/zeromq-4.1.1:= |
1300 |
- >=net-libs/czmq-3.0.0 |
1301 |
- )" |
1302 |
-DEPEND="${RDEPEND} |
1303 |
- >=sys-devel/autoconf-archive-2015.02.24 |
1304 |
- virtual/pkgconfig |
1305 |
- test? ( sys-libs/libfaketime )" |
1306 |
- |
1307 |
-if [[ ${PV} == "9999" ]]; then |
1308 |
- DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" |
1309 |
- DEPEND+=" >=sys-devel/flex-2.5.39-r1" |
1310 |
- DEPEND+=" >=sys-devel/bison-2.4.3" |
1311 |
- DEPEND+=" >=dev-python/docutils-0.12" |
1312 |
-fi |
1313 |
- |
1314 |
-CONFIG_CHECK="~INOTIFY_USER" |
1315 |
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" |
1316 |
- |
1317 |
-src_unpack() { |
1318 |
- if [[ ${PV} == "9999" ]]; then |
1319 |
- git-r3_fetch |
1320 |
- git-r3_checkout |
1321 |
- else |
1322 |
- unpack ${P}.tar.gz |
1323 |
- fi |
1324 |
- |
1325 |
- if use doc; then |
1326 |
- if [[ ${PV} == "9999" ]]; then |
1327 |
- local _EGIT_BRANCH= |
1328 |
- if [[ -n "${EGIT_BRANCH}" ]]; then |
1329 |
- # Cannot use rsyslog commits/branches for documentation repository |
1330 |
- _EGIT_BRANCH=${EGIT_BRANCH} |
1331 |
- unset EGIT_BRANCH |
1332 |
- fi |
1333 |
- |
1334 |
- git-r3_fetch "${DOC_REPO_URI}" |
1335 |
- git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs |
1336 |
- |
1337 |
- if [[ -n "${_EGIT_BRANCH}" ]]; then |
1338 |
- # Restore previous EGIT_BRANCH information |
1339 |
- EGIT_BRANCH=${_EGIT_BRANCH} |
1340 |
- fi |
1341 |
- else |
1342 |
- cd "${S}" || die "Cannot change dir into '${S}'" |
1343 |
- mkdir docs || die "Failed to create docs directory" |
1344 |
- cd docs || die "Failed to change dir into '${S}/docs'" |
1345 |
- unpack ${MY_FILENAME_DOCS} |
1346 |
- fi |
1347 |
- fi |
1348 |
-} |
1349 |
- |
1350 |
-src_prepare() { |
1351 |
- default |
1352 |
- |
1353 |
- eautoreconf |
1354 |
-} |
1355 |
- |
1356 |
-src_configure() { |
1357 |
- # Maintainer notes: |
1358 |
- # * Guardtime support is missing because libgt isn't yet available |
1359 |
- # in portage. |
1360 |
- # * Hadoop's HDFS file system output module is currently not |
1361 |
- # supported in Gentoo because nobody is able to test it |
1362 |
- # (JAVA dependency). |
1363 |
- # * dev-libs/hiredis doesn't provide pkg-config (see #504614, |
1364 |
- # upstream PR 129 and 136) so we need to export HIREDIS_* |
1365 |
- # variables because rsyslog's build system depends on pkg-config. |
1366 |
- |
1367 |
- if use redis; then |
1368 |
- export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" |
1369 |
- export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" |
1370 |
- fi |
1371 |
- |
1372 |
- local myeconfargs=( |
1373 |
- --disable-debug-symbols |
1374 |
- --disable-generate-man-pages |
1375 |
- --without-valgrind-testbench |
1376 |
- $(use_enable test testbench) |
1377 |
- # Input Plugins without depedencies |
1378 |
- --enable-imdiag |
1379 |
- --enable-imfile |
1380 |
- --enable-impstats |
1381 |
- --enable-imptcp |
1382 |
- # Message Modificiation Plugins without depedencies |
1383 |
- --enable-mmanon |
1384 |
- --enable-mmaudit |
1385 |
- --enable-mmcount |
1386 |
- --enable-mmfields |
1387 |
- --enable-mmjsonparse |
1388 |
- --enable-mmpstrucdata |
1389 |
- --enable-mmsequence |
1390 |
- --enable-mmutf8fix |
1391 |
- # Output Modification Plugins without dependencies |
1392 |
- --enable-mail |
1393 |
- --enable-omprog |
1394 |
- --enable-omruleset |
1395 |
- --enable-omstdout |
1396 |
- --enable-omuxsock |
1397 |
- # Misc |
1398 |
- --enable-pmaixforwardedfrom |
1399 |
- --enable-pmciscoios |
1400 |
- --enable-pmcisconames |
1401 |
- --enable-pmlastmsg |
1402 |
- --enable-pmsnare |
1403 |
- # DB |
1404 |
- $(use_enable dbi libdbi) |
1405 |
- $(use_enable mongodb ommongodb) |
1406 |
- $(use_enable mysql) |
1407 |
- $(use_enable postgres pgsql) |
1408 |
- $(use_enable redis omhiredis) |
1409 |
- # Debug |
1410 |
- $(use_enable debug) |
1411 |
- $(use_enable debug diagtools) |
1412 |
- $(use_enable debug memcheck) |
1413 |
- $(use_enable debug rtinst) |
1414 |
- $(use_enable debug valgrind) |
1415 |
- # Misc |
1416 |
- $(use_enable elasticsearch) |
1417 |
- $(use_enable gcrypt libgcrypt) |
1418 |
- $(use_enable jemalloc) |
1419 |
- $(use_enable kafka omkafka) |
1420 |
- $(use_enable kerberos gssapi-krb5) |
1421 |
- $(use_enable normalize mmnormalize) |
1422 |
- $(use_enable grok mmgrok) |
1423 |
- $(use_enable omhttpfs) |
1424 |
- $(use_enable omudpspoof) |
1425 |
- $(use_enable rabbitmq omrabbitmq) |
1426 |
- $(use_enable relp) |
1427 |
- $(use_enable rfc3195) |
1428 |
- $(use_enable rfc5424hmac mmrfc5424addhmac) |
1429 |
- $(use_enable snmp) |
1430 |
- $(use_enable snmp mmsnmptrapd) |
1431 |
- $(use_enable ssl gnutls) |
1432 |
- $(use_enable systemd imjournal) |
1433 |
- $(use_enable systemd omjournal) |
1434 |
- $(use_enable usertools) |
1435 |
- $(use_enable uuid) |
1436 |
- $(use_enable zeromq imczmq) |
1437 |
- $(use_enable zeromq imzmq3) |
1438 |
- $(use_enable zeromq omczmq) |
1439 |
- $(use_enable zeromq omzmq3) |
1440 |
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
1441 |
- ) |
1442 |
- |
1443 |
- econf "${myeconfargs[@]}" |
1444 |
-} |
1445 |
- |
1446 |
-src_compile() { |
1447 |
- default |
1448 |
- |
1449 |
- if use doc && [[ "${PV}" == "9999" ]]; then |
1450 |
- einfo "Building documentation ..." |
1451 |
- local doc_dir="${S}/docs" |
1452 |
- cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" |
1453 |
- sphinx-build -b html source build || die "Building documentation failed!" |
1454 |
- fi |
1455 |
-} |
1456 |
- |
1457 |
-src_test() { |
1458 |
- local _has_increased_ulimit= |
1459 |
- |
1460 |
- # Sometimes tests aren't executable (i.e. when added via patch) |
1461 |
- einfo "Adjusting permissions of test scripts ..." |
1462 |
- find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \ |
1463 |
- die "Failed to adjust test scripts permission" |
1464 |
- |
1465 |
- if ulimit -n 3072; then |
1466 |
- _has_increased_ulimit="true" |
1467 |
- fi |
1468 |
- |
1469 |
- if ! emake --jobs 1 check; then |
1470 |
- eerror "Test suite failed! :(" |
1471 |
- |
1472 |
- if [[ -z "${_has_increased_ulimit}" ]]; then |
1473 |
- eerror "Probably because open file limit couldn't be set to 3072." |
1474 |
- fi |
1475 |
- |
1476 |
- if has userpriv ${FEATURES}; then |
1477 |
- eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \ |
1478 |
- "before you submit a bug report." |
1479 |
- fi |
1480 |
- |
1481 |
- fi |
1482 |
-} |
1483 |
- |
1484 |
-src_install() { |
1485 |
- local DOCS=( |
1486 |
- AUTHORS |
1487 |
- ChangeLog |
1488 |
- "${FILESDIR}"/${BRANCH}/README.gentoo |
1489 |
- ) |
1490 |
- |
1491 |
- use doc && local HTML_DOCS=( "${S}/docs/build/." ) |
1492 |
- |
1493 |
- default |
1494 |
- |
1495 |
- newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN} |
1496 |
- newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN} |
1497 |
- |
1498 |
- keepdir /var/empty/dev |
1499 |
- keepdir /var/spool/${PN} |
1500 |
- keepdir /etc/ssl/${PN} |
1501 |
- keepdir /etc/${PN}.d |
1502 |
- |
1503 |
- insinto /etc |
1504 |
- newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf |
1505 |
- |
1506 |
- insinto /etc/rsyslog.d/ |
1507 |
- doins "${FILESDIR}/${BRANCH}/50-default.conf" |
1508 |
- |
1509 |
- insinto /etc/logrotate.d/ |
1510 |
- newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN} |
1511 |
- |
1512 |
- if use mysql; then |
1513 |
- insinto /usr/share/doc/${PF}/scripts/mysql |
1514 |
- doins plugins/ommysql/createDB.sql |
1515 |
- fi |
1516 |
- |
1517 |
- if use postgres; then |
1518 |
- insinto /usr/share/doc/${PF}/scripts/pgsql |
1519 |
- doins plugins/ompgsql/createDB.sql |
1520 |
- fi |
1521 |
- |
1522 |
- prune_libtool_files --modules |
1523 |
-} |
1524 |
- |
1525 |
-pkg_postinst() { |
1526 |
- local advertise_readme=0 |
1527 |
- |
1528 |
- if [[ -z "${REPLACING_VERSIONS}" ]]; then |
1529 |
- # This is a new installation |
1530 |
- |
1531 |
- advertise_readme=1 |
1532 |
- |
1533 |
- if use mysql || use postgres; then |
1534 |
- echo |
1535 |
- elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" |
1536 |
- elog " /usr/share/doc/${PF}/scripts" |
1537 |
- fi |
1538 |
- |
1539 |
- if use ssl; then |
1540 |
- echo |
1541 |
- elog "To create a default CA and certificates for your server and clients, run:" |
1542 |
- elog " emerge --config =${PF}" |
1543 |
- elog "on your logging server. You can run it several times," |
1544 |
- elog "once for each logging client. The client certificates will be signed" |
1545 |
- elog "using the CA certificate generated during the first run." |
1546 |
- fi |
1547 |
- fi |
1548 |
- |
1549 |
- if [[ ${advertise_readme} -gt 0 ]]; then |
1550 |
- # We need to show the README file location |
1551 |
- |
1552 |
- echo "" |
1553 |
- elog "Please read" |
1554 |
- elog "" |
1555 |
- elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" |
1556 |
- elog "" |
1557 |
- elog "for more details." |
1558 |
- fi |
1559 |
-} |
1560 |
- |
1561 |
-pkg_config() { |
1562 |
- if ! use ssl ; then |
1563 |
- einfo "There is nothing to configure for rsyslog unless you" |
1564 |
- einfo "used USE=ssl to build it." |
1565 |
- return 0 |
1566 |
- fi |
1567 |
- |
1568 |
- # Make sure the certificates directory exists |
1569 |
- local CERTDIR="${EROOT}/etc/ssl/${PN}" |
1570 |
- if [[ ! -d "${CERTDIR}" ]]; then |
1571 |
- mkdir "${CERTDIR}" || die |
1572 |
- fi |
1573 |
- einfo "Your certificates will be stored in ${CERTDIR}" |
1574 |
- |
1575 |
- # Create a default CA if needed |
1576 |
- if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then |
1577 |
- einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." |
1578 |
- certtool --generate-privkey \ |
1579 |
- --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null |
1580 |
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
1581 |
- |
1582 |
- cat > "${T}/${PF}.$$" <<- _EOF |
1583 |
- cn = Portage automated CA |
1584 |
- ca |
1585 |
- cert_signing_key |
1586 |
- expiration_days = 3650 |
1587 |
- _EOF |
1588 |
- |
1589 |
- certtool --generate-self-signed \ |
1590 |
- --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
1591 |
- --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ |
1592 |
- --template "${T}/${PF}.$$" &>/dev/null |
1593 |
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
1594 |
- |
1595 |
- # Create the server certificate |
1596 |
- echo |
1597 |
- einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " |
1598 |
- read -r CN |
1599 |
- |
1600 |
- einfo "Creating private key and certificate for server ${CN}..." |
1601 |
- certtool --generate-privkey \ |
1602 |
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
1603 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
1604 |
- |
1605 |
- cat > "${T}/${PF}.$$" <<- _EOF |
1606 |
- cn = ${CN} |
1607 |
- tls_www_server |
1608 |
- dns_name = ${CN} |
1609 |
- expiration_days = 3650 |
1610 |
- _EOF |
1611 |
- |
1612 |
- certtool --generate-certificate \ |
1613 |
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
1614 |
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
1615 |
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
1616 |
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
1617 |
- --template "${T}/${PF}.$$" &>/dev/null |
1618 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
1619 |
- |
1620 |
- else |
1621 |
- einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." |
1622 |
- fi |
1623 |
- |
1624 |
- # Create a client certificate |
1625 |
- echo |
1626 |
- einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " |
1627 |
- read -r CN |
1628 |
- |
1629 |
- einfo "Creating private key and certificate for client ${CN}..." |
1630 |
- certtool --generate-privkey \ |
1631 |
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
1632 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
1633 |
- |
1634 |
- cat > "${T}/${PF}.$$" <<- _EOF |
1635 |
- cn = ${CN} |
1636 |
- tls_www_client |
1637 |
- dns_name = ${CN} |
1638 |
- expiration_days = 3650 |
1639 |
- _EOF |
1640 |
- |
1641 |
- certtool --generate-certificate \ |
1642 |
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
1643 |
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
1644 |
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
1645 |
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
1646 |
- --template "${T}/${PF}.$$" &>/dev/null |
1647 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
1648 |
- |
1649 |
- rm -f "${T}/${PF}.$$" |
1650 |
- |
1651 |
- echo |
1652 |
- einfo "Here is the documentation on how to encrypt your log traffic:" |
1653 |
- einfo " http://www.rsyslog.com/doc/rsyslog_tls.html" |
1654 |
-} |