1 |
ultrabug 13/12/24 12:21:31 |
2 |
|
3 |
Modified: rsyslog-7.2.7.ebuild rsyslog-7.4.4.ebuild ChangeLog |
4 |
rsyslog-7.4.6.ebuild rsyslog-7.4.3.ebuild |
5 |
metadata.xml |
6 |
Added: rsyslog-7.4.7.ebuild |
7 |
Log: |
8 |
Fix #490992, #494150, #492442, #494532, #494268. Version bump. |
9 |
|
10 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B658FA13) |
11 |
|
12 |
Revision Changes Path |
13 |
1.8 app-admin/rsyslog/rsyslog-7.2.7.ebuild |
14 |
|
15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.2.7.ebuild?rev=1.8&view=markup |
16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.2.7.ebuild?rev=1.8&content-type=text/plain |
17 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.2.7.ebuild?r1=1.7&r2=1.8 |
18 |
|
19 |
Index: rsyslog-7.2.7.ebuild |
20 |
=================================================================== |
21 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.2.7.ebuild,v |
22 |
retrieving revision 1.7 |
23 |
retrieving revision 1.8 |
24 |
diff -u -r1.7 -r1.8 |
25 |
--- rsyslog-7.2.7.ebuild 24 Dec 2013 11:33:12 -0000 1.7 |
26 |
+++ rsyslog-7.2.7.ebuild 24 Dec 2013 12:21:31 -0000 1.8 |
27 |
@@ -1,6 +1,6 @@ |
28 |
# Copyright 1999-2013 Gentoo Foundation |
29 |
# Distributed under the terms of the GNU General Public License v2 |
30 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.2.7.ebuild,v 1.7 2013/12/24 11:33:12 ultrabug Exp $ |
31 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.2.7.ebuild,v 1.8 2013/12/24 12:21:31 ultrabug Exp $ |
32 |
|
33 |
EAPI=4 |
34 |
AUTOTOOLS_AUTORECONF=yes |
35 |
@@ -20,6 +20,7 @@ |
36 |
dev-libs/json-c |
37 |
dev-libs/libee |
38 |
>=dev-libs/libestr-0.1.5 |
39 |
+ dev-libs/libgcrypt |
40 |
dev-libs/liblognorm |
41 |
dbi? ( dev-db/libdbi ) |
42 |
extras? ( net-libs/libnet ) |
43 |
@@ -29,7 +30,7 @@ |
44 |
oracle? ( dev-db/oracle-instantclient-basic ) |
45 |
relp? ( >=dev-libs/librelp-1.0.1 ) |
46 |
snmp? ( net-analyzer/net-snmp ) |
47 |
- ssl? ( net-libs/gnutls dev-libs/libgcrypt ) |
48 |
+ ssl? ( net-libs/gnutls ) |
49 |
zeromq? ( >=net-libs/zeromq-3 <net-libs/czmq-2 ) |
50 |
zlib? ( sys-libs/zlib )" |
51 |
DEPEND="${RDEPEND} |
52 |
|
53 |
|
54 |
|
55 |
1.8 app-admin/rsyslog/rsyslog-7.4.4.ebuild |
56 |
|
57 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.4.ebuild?rev=1.8&view=markup |
58 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.4.ebuild?rev=1.8&content-type=text/plain |
59 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.4.ebuild?r1=1.7&r2=1.8 |
60 |
|
61 |
Index: rsyslog-7.4.4.ebuild |
62 |
=================================================================== |
63 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.4.ebuild,v |
64 |
retrieving revision 1.7 |
65 |
retrieving revision 1.8 |
66 |
diff -u -r1.7 -r1.8 |
67 |
--- rsyslog-7.4.4.ebuild 24 Dec 2013 11:33:12 -0000 1.7 |
68 |
+++ rsyslog-7.4.4.ebuild 24 Dec 2013 12:21:31 -0000 1.8 |
69 |
@@ -1,6 +1,6 @@ |
70 |
# Copyright 1999-2013 Gentoo Foundation |
71 |
# Distributed under the terms of the GNU General Public License v2 |
72 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.4.ebuild,v 1.7 2013/12/24 11:33:12 ultrabug Exp $ |
73 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.4.ebuild,v 1.8 2013/12/24 12:21:31 ultrabug Exp $ |
74 |
|
75 |
EAPI=4 |
76 |
AUTOTOOLS_AUTORECONF=yes |
77 |
@@ -20,6 +20,7 @@ |
78 |
dev-libs/json-c |
79 |
dev-libs/libee |
80 |
>=dev-libs/libestr-0.1.5 |
81 |
+ dev-libs/libgcrypt |
82 |
dev-libs/liblognorm |
83 |
dbi? ( dev-db/libdbi ) |
84 |
extras? ( net-libs/libnet ) |
85 |
@@ -29,7 +30,7 @@ |
86 |
oracle? ( dev-db/oracle-instantclient-basic ) |
87 |
relp? ( >=dev-libs/librelp-1.0.3 ) |
88 |
snmp? ( net-analyzer/net-snmp ) |
89 |
- ssl? ( net-libs/gnutls dev-libs/libgcrypt ) |
90 |
+ ssl? ( net-libs/gnutls ) |
91 |
systemd? ( sys-apps/systemd ) |
92 |
zeromq? ( >=net-libs/zeromq-3 <net-libs/czmq-2 ) |
93 |
zlib? ( sys-libs/zlib )" |
94 |
|
95 |
|
96 |
|
97 |
1.106 app-admin/rsyslog/ChangeLog |
98 |
|
99 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/ChangeLog?rev=1.106&view=markup |
100 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/ChangeLog?rev=1.106&content-type=text/plain |
101 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/ChangeLog?r1=1.105&r2=1.106 |
102 |
|
103 |
Index: ChangeLog |
104 |
=================================================================== |
105 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v |
106 |
retrieving revision 1.105 |
107 |
retrieving revision 1.106 |
108 |
diff -u -r1.105 -r1.106 |
109 |
--- ChangeLog 24 Dec 2013 11:33:12 -0000 1.105 |
110 |
+++ ChangeLog 24 Dec 2013 12:21:31 -0000 1.106 |
111 |
@@ -1,6 +1,15 @@ |
112 |
# ChangeLog for app-admin/rsyslog |
113 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
114 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.105 2013/12/24 11:33:12 ultrabug Exp $ |
115 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.106 2013/12/24 12:21:31 ultrabug Exp $ |
116 |
+ |
117 |
+*rsyslog-7.4.7 (24 Dec 2013) |
118 |
+ |
119 |
+ 24 Dec 2013; Ultrabug <ultrabug@g.o> rsyslog-7.2.7.ebuild, |
120 |
+ rsyslog-7.4.3.ebuild, rsyslog-7.4.4.ebuild, rsyslog-7.4.6.ebuild, |
121 |
+ +rsyslog-7.4.7.ebuild, metadata.xml: |
122 |
+ Fix #490992, #494150 thx to Marcin Mirosław & Andrey Volkov. Fix #492442, |
123 |
+ #494532 using slot operators thx to Thomas D. Add mongodb to IUSE fix #494268 |
124 |
+ thx to Vadim Kuznetsov. Version bump. |
125 |
|
126 |
24 Dec 2013; Ultrabug <ultrabug@g.o> rsyslog-7.2.7.ebuild, |
127 |
rsyslog-7.4.3.ebuild, rsyslog-7.4.4.ebuild, rsyslog-7.4.6.ebuild: |
128 |
|
129 |
|
130 |
|
131 |
1.4 app-admin/rsyslog/rsyslog-7.4.6.ebuild |
132 |
|
133 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.6.ebuild?rev=1.4&view=markup |
134 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.6.ebuild?rev=1.4&content-type=text/plain |
135 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.6.ebuild?r1=1.3&r2=1.4 |
136 |
|
137 |
Index: rsyslog-7.4.6.ebuild |
138 |
=================================================================== |
139 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.6.ebuild,v |
140 |
retrieving revision 1.3 |
141 |
retrieving revision 1.4 |
142 |
diff -u -r1.3 -r1.4 |
143 |
--- rsyslog-7.4.6.ebuild 24 Dec 2013 11:33:12 -0000 1.3 |
144 |
+++ rsyslog-7.4.6.ebuild 24 Dec 2013 12:21:31 -0000 1.4 |
145 |
@@ -1,6 +1,6 @@ |
146 |
# Copyright 1999-2013 Gentoo Foundation |
147 |
# Distributed under the terms of the GNU General Public License v2 |
148 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.6.ebuild,v 1.3 2013/12/24 11:33:12 ultrabug Exp $ |
149 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.6.ebuild,v 1.4 2013/12/24 12:21:31 ultrabug Exp $ |
150 |
|
151 |
EAPI=4 |
152 |
AUTOTOOLS_AUTORECONF=yes |
153 |
@@ -20,6 +20,7 @@ |
154 |
dev-libs/json-c |
155 |
dev-libs/libee |
156 |
>=dev-libs/libestr-0.1.9 |
157 |
+ dev-libs/libgcrypt |
158 |
dev-libs/liblognorm |
159 |
dbi? ( dev-db/libdbi ) |
160 |
extras? ( net-libs/libnet ) |
161 |
@@ -29,7 +30,7 @@ |
162 |
oracle? ( dev-db/oracle-instantclient-basic ) |
163 |
relp? ( >=dev-libs/librelp-1.0.3 ) |
164 |
snmp? ( net-analyzer/net-snmp ) |
165 |
- ssl? ( net-libs/gnutls dev-libs/libgcrypt ) |
166 |
+ ssl? ( net-libs/gnutls ) |
167 |
systemd? ( sys-apps/systemd ) |
168 |
zeromq? ( >=net-libs/zeromq-3 <net-libs/czmq-2 ) |
169 |
zlib? ( sys-libs/zlib )" |
170 |
|
171 |
|
172 |
|
173 |
1.6 app-admin/rsyslog/rsyslog-7.4.3.ebuild |
174 |
|
175 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.3.ebuild?rev=1.6&view=markup |
176 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.3.ebuild?rev=1.6&content-type=text/plain |
177 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.3.ebuild?r1=1.5&r2=1.6 |
178 |
|
179 |
Index: rsyslog-7.4.3.ebuild |
180 |
=================================================================== |
181 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.3.ebuild,v |
182 |
retrieving revision 1.5 |
183 |
retrieving revision 1.6 |
184 |
diff -u -r1.5 -r1.6 |
185 |
--- rsyslog-7.4.3.ebuild 24 Dec 2013 11:33:12 -0000 1.5 |
186 |
+++ rsyslog-7.4.3.ebuild 24 Dec 2013 12:21:31 -0000 1.6 |
187 |
@@ -1,6 +1,6 @@ |
188 |
# Copyright 1999-2013 Gentoo Foundation |
189 |
# Distributed under the terms of the GNU General Public License v2 |
190 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.3.ebuild,v 1.5 2013/12/24 11:33:12 ultrabug Exp $ |
191 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.3.ebuild,v 1.6 2013/12/24 12:21:31 ultrabug Exp $ |
192 |
|
193 |
EAPI=4 |
194 |
AUTOTOOLS_AUTORECONF=yes |
195 |
@@ -20,6 +20,7 @@ |
196 |
dev-libs/json-c |
197 |
dev-libs/libee |
198 |
>=dev-libs/libestr-0.1.5 |
199 |
+ dev-libs/libgcrypt |
200 |
dev-libs/liblognorm |
201 |
dbi? ( dev-db/libdbi ) |
202 |
extras? ( net-libs/libnet ) |
203 |
@@ -29,7 +30,7 @@ |
204 |
oracle? ( dev-db/oracle-instantclient-basic ) |
205 |
relp? ( >=dev-libs/librelp-1.0.3 ) |
206 |
snmp? ( net-analyzer/net-snmp ) |
207 |
- ssl? ( net-libs/gnutls dev-libs/libgcrypt ) |
208 |
+ ssl? ( net-libs/gnutls ) |
209 |
zeromq? ( >=net-libs/zeromq-3 <net-libs/czmq-2 ) |
210 |
zlib? ( sys-libs/zlib )" |
211 |
DEPEND="${RDEPEND} |
212 |
|
213 |
|
214 |
|
215 |
1.14 app-admin/rsyslog/metadata.xml |
216 |
|
217 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/metadata.xml?rev=1.14&view=markup |
218 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/metadata.xml?rev=1.14&content-type=text/plain |
219 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/metadata.xml?r1=1.13&r2=1.14 |
220 |
|
221 |
Index: metadata.xml |
222 |
=================================================================== |
223 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/rsyslog/metadata.xml,v |
224 |
retrieving revision 1.13 |
225 |
retrieving revision 1.14 |
226 |
diff -u -r1.13 -r1.14 |
227 |
--- metadata.xml 5 Jun 2013 00:05:02 -0000 1.13 |
228 |
+++ metadata.xml 24 Dec 2013 12:21:31 -0000 1.14 |
229 |
@@ -3,11 +3,12 @@ |
230 |
<pkgmetadata> |
231 |
<maintainer> |
232 |
<email>ultrabug@g.o</email> |
233 |
- <name>Alexys Jacob</name> |
234 |
+ <name>Ultrabug</name> |
235 |
<description>Primary Maintainer</description> |
236 |
</maintainer> |
237 |
<use> |
238 |
<flag name="extras">Add support for the UDP spoofing module (omudpspoof) using <pkg>net-libs/libnet</pkg></flag> |
239 |
+ <flag name="mongodb">Add support for the MongoDB output template module using <pkg>dev-libs/libmongo-client</pkg></flag> |
240 |
<flag name="relp">Add support for the Reliable Event Logging Protocol using <pkg>dev-libs/librelp</pkg></flag> |
241 |
<flag name="zeromq">Add support for the ZeroMQ input and output plugins using <pkg>net-libs/zeromq</pkg></flag> |
242 |
</use> |
243 |
|
244 |
|
245 |
|
246 |
1.1 app-admin/rsyslog/rsyslog-7.4.7.ebuild |
247 |
|
248 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.7.ebuild?rev=1.1&view=markup |
249 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.7.ebuild?rev=1.1&content-type=text/plain |
250 |
|
251 |
Index: rsyslog-7.4.7.ebuild |
252 |
=================================================================== |
253 |
# Copyright 1999-2013 Gentoo Foundation |
254 |
# Distributed under the terms of the GNU General Public License v2 |
255 |
# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.7.ebuild,v 1.1 2013/12/24 12:21:31 ultrabug Exp $ |
256 |
|
257 |
EAPI=5 |
258 |
AUTOTOOLS_AUTORECONF=yes |
259 |
|
260 |
inherit autotools-utils eutils systemd |
261 |
|
262 |
DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" |
263 |
HOMEPAGE="http://www.rsyslog.com/" |
264 |
SRC_URI="http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz" |
265 |
|
266 |
LICENSE="GPL-3 LGPL-3 Apache-2.0" |
267 |
KEYWORDS="~amd64 ~x86" |
268 |
SLOT="0" |
269 |
IUSE="dbi debug doc extras kerberos mongodb mysql oracle postgres relp snmp ssl static-libs systemd zeromq zlib" |
270 |
|
271 |
RDEPEND=" |
272 |
dev-libs/json-c:= |
273 |
dev-libs/libee |
274 |
>=dev-libs/libestr-0.1.9 |
275 |
dev-libs/libgcrypt:= |
276 |
dev-libs/liblognorm |
277 |
dbi? ( dev-db/libdbi ) |
278 |
extras? ( net-libs/libnet ) |
279 |
kerberos? ( virtual/krb5 ) |
280 |
mongodb? ( dev-libs/libmongo-client ) |
281 |
mysql? ( virtual/mysql ) |
282 |
postgres? ( dev-db/postgresql-base ) |
283 |
oracle? ( dev-db/oracle-instantclient-basic ) |
284 |
relp? ( >=dev-libs/librelp-1.0.3 ) |
285 |
snmp? ( net-analyzer/net-snmp ) |
286 |
ssl? ( net-libs/gnutls ) |
287 |
systemd? ( sys-apps/systemd ) |
288 |
zeromq? ( >=net-libs/zeromq-3 <net-libs/czmq-2 ) |
289 |
zlib? ( sys-libs/zlib )" |
290 |
DEPEND="${RDEPEND} |
291 |
virtual/pkgconfig" |
292 |
|
293 |
BRANCH="7-stable" |
294 |
|
295 |
# need access to certain device nodes |
296 |
RESTRICT="test" |
297 |
|
298 |
# Maitainer note : open a bug to upstream |
299 |
# showing that building in a separate dir fails |
300 |
AUTOTOOLS_IN_SOURCE_BUILD=1 |
301 |
|
302 |
DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf) |
303 |
|
304 |
src_configure() { |
305 |
# Maintainer notes: |
306 |
# * rfc3195 needs a library and development of that library |
307 |
# is suspended, so we disable it |
308 |
# * About the java GUI: |
309 |
# The maintainer says there is no real installation support |
310 |
# for the java GUI, so we disable it for now. |
311 |
# * mongodb : doesnt work with mongo-c-driver ? |
312 |
local myeconfargs=( |
313 |
--enable-cached-man-pages |
314 |
--disable-gui |
315 |
--disable-rfc3195 |
316 |
--enable-imdiag |
317 |
--enable-imfile |
318 |
--enable-impstats |
319 |
--enable-imptcp |
320 |
--enable-largefile |
321 |
--enable-mail |
322 |
--enable-mmnormalize |
323 |
--enable-mmjsonparse |
324 |
--enable-mmaudit |
325 |
--enable-mmanon |
326 |
--enable-omprog |
327 |
--enable-omstdout |
328 |
--enable-omuxsock |
329 |
--enable-pmlastmsg |
330 |
--enable-pmrfc3164sd |
331 |
--enable-pmcisconames |
332 |
--enable-pmaixforwardedfrom |
333 |
--enable-pmsnare |
334 |
--enable-sm_cust_bindcdr |
335 |
--enable-unlimited-select |
336 |
--enable-uuid |
337 |
$(use_enable dbi libdbi) |
338 |
$(use_enable debug) |
339 |
$(use_enable debug rtinst) |
340 |
$(use_enable debug diagtools) |
341 |
$(use_enable debug memcheck) |
342 |
$(use_enable debug valgrind) |
343 |
$(use_enable extras omudpspoof) |
344 |
$(use_enable kerberos gssapi-krb5) |
345 |
$(use_enable mongodb ommongodb) |
346 |
$(use_enable mysql) |
347 |
$(use_enable oracle) |
348 |
$(use_enable postgres pgsql) |
349 |
$(use_enable relp) |
350 |
$(use_enable snmp) |
351 |
$(use_enable snmp mmsnmptrapd) |
352 |
$(use_enable ssl gnutls) |
353 |
$(use_enable systemd omjournal) |
354 |
$(use_enable zlib) |
355 |
$(use_enable zeromq imzmq3) |
356 |
$(use_enable zeromq omzmq3) |
357 |
"$(systemd_with_unitdir)" |
358 |
) |
359 |
autotools-utils_src_configure |
360 |
} |
361 |
|
362 |
src_install() { |
363 |
use doc && HTML_DOCS=(doc/) |
364 |
autotools-utils_src_install |
365 |
|
366 |
insinto /etc |
367 |
newins "${FILESDIR}/${BRANCH}/${PN}-gentoo.conf" ${PN}.conf |
368 |
newconfd "${FILESDIR}/${BRANCH}/${PN}.confd" ${PN} |
369 |
newinitd "${FILESDIR}/${BRANCH}/${PN}.initd" ${PN} |
370 |
keepdir /var/spool/${PN} |
371 |
keepdir /etc/ssl/${PN} |
372 |
keepdir /etc/${PN}.d |
373 |
|
374 |
use static-libs || find "${D}" -name '*.la' -delete || die |
375 |
|
376 |
if use mysql; then |
377 |
insinto /usr/share/doc/${PF}/scripts/mysql |
378 |
doins plugins/ommysql/{createDB.sql,contrib/delete_mysql} |
379 |
fi |
380 |
|
381 |
if use postgres; then |
382 |
insinto /usr/share/doc/${PF}/scripts/pgsql |
383 |
doins plugins/ompgsql/createDB.sql |
384 |
fi |
385 |
|
386 |
insinto /etc/logrotate.d/ |
387 |
newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN} |
388 |
} |
389 |
|
390 |
pkg_postinst() { |
391 |
if use mysql || use postgres; then |
392 |
echo |
393 |
elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" |
394 |
elog " /usr/share/doc/${PF}/scripts" |
395 |
fi |
396 |
|
397 |
if use ssl; then |
398 |
echo |
399 |
elog "To create a default CA and certificates for your server and clients, run:" |
400 |
elog " emerge --config =${PF}" |
401 |
elog "on your logging server. You can run it several times," |
402 |
elog "once for each logging client. The client certificates will be signed" |
403 |
elog "using the CA certificate generated during the first run." |
404 |
fi |
405 |
} |
406 |
|
407 |
pkg_config() { |
408 |
if ! use ssl ; then |
409 |
einfo "There is nothing to configure for rsyslog unless you" |
410 |
einfo "used USE=ssl to build it." |
411 |
return 0 |
412 |
fi |
413 |
|
414 |
# Make sure the certificates directory exists |
415 |
CERTDIR="${ROOT}/etc/ssl/${PN}" |
416 |
if [ ! -d "${CERTDIR}" ]; then |
417 |
mkdir "${CERTDIR}" || die |
418 |
fi |
419 |
einfo "Your certificates will be stored in ${CERTDIR}" |
420 |
|
421 |
# Create a default CA if needed |
422 |
if [ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]; then |
423 |
einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." |
424 |
certtool --generate-privkey \ |
425 |
--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null |
426 |
chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
427 |
|
428 |
cat > "${T}/${PF}.$$" <<- _EOF |
429 |
cn = Portage automated CA |
430 |
ca |
431 |
cert_signing_key |
432 |
expiration_days = 3650 |
433 |
_EOF |
434 |
|
435 |
certtool --generate-self-signed \ |
436 |
--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
437 |
--outfile "${CERTDIR}/${PN}_ca.cert.pem" \ |
438 |
--template "${T}/${PF}.$$" &>/dev/null |
439 |
chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
440 |
|
441 |
# Create the server certificate |
442 |
echo |
443 |
einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " |
444 |
read -r CN |
445 |
|
446 |
einfo "Creating private key and certificate for server ${CN}..." |
447 |
certtool --generate-privkey \ |
448 |
--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
449 |
chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
450 |
|
451 |
cat > "${T}/${PF}.$$" <<- _EOF |
452 |
cn = ${CN} |
453 |
tls_www_server |
454 |
dns_name = ${CN} |
455 |
expiration_days = 3650 |
456 |
_EOF |
457 |
|
458 |
certtool --generate-certificate \ |
459 |
--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
460 |
--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
461 |
--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
462 |
--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
463 |
--template "${T}/${PF}.$$" &>/dev/null |
464 |
chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
465 |
|
466 |
else |
467 |
einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." |
468 |
fi |
469 |
|
470 |
# Create a client certificate |
471 |
echo |
472 |
einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " |
473 |
read -r CN |
474 |
|
475 |
einfo "Creating private key and certificate for client ${CN}..." |
476 |
certtool --generate-privkey \ |
477 |
--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
478 |
chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
479 |
|
480 |
cat > "${T}/${PF}.$$" <<- _EOF |
481 |
cn = ${CN} |
482 |
tls_www_client |
483 |
dns_name = ${CN} |
484 |
expiration_days = 3650 |
485 |
_EOF |
486 |
|
487 |
certtool --generate-certificate \ |
488 |
--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
489 |
--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
490 |
--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
491 |
--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
492 |
--template "${T}/${PF}.$$" &>/dev/null |
493 |
chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
494 |
|
495 |
rm -f "${T}/${PF}.$$" |
496 |
|
497 |
echo |
498 |
einfo "Here is the documentation on how to encrypt your log traffic:" |
499 |
einfo " http://www.rsyslog.com/doc/rsyslog_tls.html" |
500 |
} |