1 |
ultrabug 13/07/29 22:00:38 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: rsyslog-7.4.3.ebuild |
5 |
Removed: rsyslog-5.8.5.ebuild rsyslog-6.2.2.ebuild |
6 |
rsyslog-7.2.5.ebuild rsyslog-7.2.2-r1.ebuild |
7 |
Log: |
8 |
Version bump fix #472484, drop old fix #454564 |
9 |
|
10 |
(Portage version: 2.1.12.13/cvs/Linux x86_64, signed Manifest commit with key B658FA13) |
11 |
|
12 |
Revision Changes Path |
13 |
1.96 app-admin/rsyslog/ChangeLog |
14 |
|
15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/ChangeLog?rev=1.96&view=markup |
16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/ChangeLog?rev=1.96&content-type=text/plain |
17 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/ChangeLog?r1=1.95&r2=1.96 |
18 |
|
19 |
Index: ChangeLog |
20 |
=================================================================== |
21 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v |
22 |
retrieving revision 1.95 |
23 |
retrieving revision 1.96 |
24 |
diff -u -r1.95 -r1.96 |
25 |
--- ChangeLog 27 Jun 2013 18:09:14 -0000 1.95 |
26 |
+++ ChangeLog 29 Jul 2013 22:00:38 -0000 1.96 |
27 |
@@ -1,6 +1,14 @@ |
28 |
# ChangeLog for app-admin/rsyslog |
29 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
30 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.95 2013/06/27 18:09:14 ago Exp $ |
31 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.96 2013/07/29 22:00:38 ultrabug Exp $ |
32 |
+ |
33 |
+*rsyslog-7.4.3 (29 Jul 2013) |
34 |
+ |
35 |
+ 29 Jul 2013; Ultrabug <ultrabug@g.o> -rsyslog-5.8.5.ebuild, |
36 |
+ -rsyslog-6.2.2.ebuild, -rsyslog-7.2.2-r1.ebuild, -rsyslog-7.2.5.ebuild, |
37 |
+ +rsyslog-7.4.3.ebuild, +files/7-stable/rsyslog-7.4.3-fix-runtime.patch, |
38 |
+ +files/7-stable/rsyslog-7.4.3-json-c-pkgconfig.patch: |
39 |
+ Version bump fix #472484, drop old fix #454564 |
40 |
|
41 |
27 Jun 2013; Agostino Sarubbo <ago@g.o> rsyslog-7.2.7.ebuild: |
42 |
Stable for x86, wrt bug #472564 |
43 |
|
44 |
|
45 |
|
46 |
1.1 app-admin/rsyslog/rsyslog-7.4.3.ebuild |
47 |
|
48 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.3.ebuild?rev=1.1&view=markup |
49 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.3.ebuild?rev=1.1&content-type=text/plain |
50 |
|
51 |
Index: rsyslog-7.4.3.ebuild |
52 |
=================================================================== |
53 |
# Copyright 1999-2013 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.3.ebuild,v 1.1 2013/07/29 22:00:38 ultrabug Exp $ |
56 |
|
57 |
EAPI=4 |
58 |
AUTOTOOLS_AUTORECONF=yes |
59 |
|
60 |
inherit autotools-utils eutils systemd |
61 |
|
62 |
DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" |
63 |
HOMEPAGE="http://www.rsyslog.com/" |
64 |
SRC_URI="http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz" |
65 |
|
66 |
LICENSE="GPL-3 LGPL-3 Apache-2.0" |
67 |
KEYWORDS="~amd64 ~arm ~hppa ~x86" |
68 |
SLOT="0" |
69 |
IUSE="dbi debug doc extras kerberos mysql oracle postgres relp snmp ssl static-libs zeromq zlib" |
70 |
|
71 |
RDEPEND=" |
72 |
dev-libs/json-c |
73 |
dev-libs/libee |
74 |
>=dev-libs/libestr-0.1.5 |
75 |
dev-libs/liblognorm |
76 |
net-misc/curl |
77 |
dbi? ( dev-db/libdbi ) |
78 |
extras? ( net-libs/libnet ) |
79 |
kerberos? ( virtual/krb5 ) |
80 |
mysql? ( virtual/mysql ) |
81 |
postgres? ( dev-db/postgresql-base ) |
82 |
oracle? ( dev-db/oracle-instantclient-basic ) |
83 |
relp? ( >=dev-libs/librelp-1.0.1 ) |
84 |
snmp? ( net-analyzer/net-snmp ) |
85 |
ssl? ( net-libs/gnutls dev-libs/libgcrypt ) |
86 |
zeromq? ( net-libs/czmq ) |
87 |
zlib? ( sys-libs/zlib )" |
88 |
DEPEND="${RDEPEND} |
89 |
virtual/pkgconfig" |
90 |
|
91 |
BRANCH="7-stable" |
92 |
|
93 |
# need access to certain device nodes |
94 |
RESTRICT="test" |
95 |
|
96 |
# Maitainer note : open a bug to upstream |
97 |
# showing that building in a separate dir fails |
98 |
AUTOTOOLS_IN_SOURCE_BUILD=1 |
99 |
|
100 |
DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf) |
101 |
|
102 |
PATCHES=( |
103 |
"${FILESDIR}"/${BRANCH}/${PN}-7.4.3-json-c-pkgconfig.patch |
104 |
"${FILESDIR}"/${BRANCH}/${PN}-7.4.3-fix-runtime.patch |
105 |
) |
106 |
|
107 |
src_configure() { |
108 |
# Maintainer notes: |
109 |
# * rfc3195 needs a library and development of that library |
110 |
# is suspended, so we disable it |
111 |
# * About the java GUI: |
112 |
# The maintainer says there is no real installation support |
113 |
# for the java GUI, so we disable it for now. |
114 |
# * mongodb : doesnt work with mongo-c-driver ? |
115 |
local myeconfargs=( |
116 |
--enable-cached-man-pages |
117 |
--disable-gui |
118 |
--disable-rfc3195 |
119 |
--enable-imdiag |
120 |
--enable-imfile |
121 |
--enable-impstats |
122 |
--enable-imptcp |
123 |
--enable-largefile |
124 |
--enable-mail |
125 |
--enable-mmnormalize |
126 |
--enable-mmjsonparse |
127 |
--enable-mmaudit |
128 |
--enable-mmanon |
129 |
--enable-omprog |
130 |
--enable-omstdout |
131 |
--enable-omuxsock |
132 |
--enable-pmlastmsg |
133 |
--enable-pmrfc3164sd |
134 |
--enable-pmcisconames |
135 |
--enable-pmaixforwardedfrom |
136 |
--enable-pmsnare |
137 |
--enable-sm_cust_bindcdr |
138 |
--enable-unlimited-select |
139 |
--enable-uuid |
140 |
$(use_enable dbi libdbi) |
141 |
$(use_enable debug) |
142 |
$(use_enable debug rtinst) |
143 |
$(use_enable debug diagtools) |
144 |
$(use_enable debug memcheck) |
145 |
$(use_enable debug valgrind) |
146 |
$(use_enable extras omudpspoof) |
147 |
$(use_enable kerberos gssapi-krb5) |
148 |
$(use_enable mysql) |
149 |
$(use_enable oracle) |
150 |
$(use_enable postgres pgsql) |
151 |
$(use_enable relp) |
152 |
$(use_enable snmp) |
153 |
$(use_enable snmp mmsnmptrapd) |
154 |
$(use_enable ssl gnutls) |
155 |
$(use_enable zlib) |
156 |
$(use_enable zeromq imzmq3) |
157 |
$(use_enable zeromq omzmq3) |
158 |
) |
159 |
systemd_to_myeconfargs |
160 |
autotools-utils_src_configure |
161 |
} |
162 |
|
163 |
src_install() { |
164 |
use doc && HTML_DOCS=(doc/) |
165 |
autotools-utils_src_install |
166 |
|
167 |
insinto /etc |
168 |
newins "${FILESDIR}/${BRANCH}/${PN}-gentoo.conf" ${PN}.conf |
169 |
newconfd "${FILESDIR}/${BRANCH}/${PN}.confd" ${PN} |
170 |
newinitd "${FILESDIR}/${BRANCH}/${PN}.initd" ${PN} |
171 |
keepdir /var/spool/${PN} |
172 |
keepdir /etc/ssl/${PN} |
173 |
keepdir /etc/${PN}.d |
174 |
|
175 |
use static-libs || find "${D}" -name '*.la' -delete || die |
176 |
|
177 |
if use mysql; then |
178 |
insinto /usr/share/doc/${PF}/scripts/mysql |
179 |
doins plugins/ommysql/{createDB.sql,contrib/delete_mysql} |
180 |
fi |
181 |
|
182 |
if use postgres; then |
183 |
insinto /usr/share/doc/${PF}/scripts/pgsql |
184 |
doins plugins/ompgsql/createDB.sql |
185 |
fi |
186 |
|
187 |
insinto /etc/logrotate.d/ |
188 |
newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN} |
189 |
} |
190 |
|
191 |
pkg_postinst() { |
192 |
if use mysql || use postgres; then |
193 |
echo |
194 |
elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" |
195 |
elog " /usr/share/doc/${PF}/scripts" |
196 |
fi |
197 |
|
198 |
if use ssl; then |
199 |
echo |
200 |
elog "To create a default CA and certificates for your server and clients, run:" |
201 |
elog " emerge --config =${PF}" |
202 |
elog "on your logging server. You can run it several times," |
203 |
elog "once for each logging client. The client certificates will be signed" |
204 |
elog "using the CA certificate generated during the first run." |
205 |
fi |
206 |
} |
207 |
|
208 |
pkg_config() { |
209 |
if ! use ssl ; then |
210 |
einfo "There is nothing to configure for rsyslog unless you" |
211 |
einfo "used USE=ssl to build it." |
212 |
return 0 |
213 |
fi |
214 |
|
215 |
# Make sure the certificates directory exists |
216 |
CERTDIR="${ROOT}/etc/ssl/${PN}" |
217 |
if [ ! -d "${CERTDIR}" ]; then |
218 |
mkdir "${CERTDIR}" || die |
219 |
fi |
220 |
einfo "Your certificates will be stored in ${CERTDIR}" |
221 |
|
222 |
# Create a default CA if needed |
223 |
if [ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]; then |
224 |
einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." |
225 |
certtool --generate-privkey \ |
226 |
--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null |
227 |
chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
228 |
|
229 |
cat > "${T}/${PF}.$$" <<- _EOF |
230 |
cn = Portage automated CA |
231 |
ca |
232 |
cert_signing_key |
233 |
expiration_days = 3650 |
234 |
_EOF |
235 |
|
236 |
certtool --generate-self-signed \ |
237 |
--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
238 |
--outfile "${CERTDIR}/${PN}_ca.cert.pem" \ |
239 |
--template "${T}/${PF}.$$" &>/dev/null |
240 |
chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
241 |
|
242 |
# Create the server certificate |
243 |
echo |
244 |
einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " |
245 |
read -r CN |
246 |
|
247 |
einfo "Creating private key and certificate for server ${CN}..." |
248 |
certtool --generate-privkey \ |
249 |
--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
250 |
chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
251 |
|
252 |
cat > "${T}/${PF}.$$" <<- _EOF |
253 |
cn = ${CN} |
254 |
tls_www_server |
255 |
dns_name = ${CN} |
256 |
expiration_days = 3650 |
257 |
_EOF |
258 |
|
259 |
certtool --generate-certificate \ |
260 |
--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
261 |
--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
262 |
--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
263 |
--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
264 |
--template "${T}/${PF}.$$" &>/dev/null |
265 |
chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
266 |
|
267 |
else |
268 |
einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." |
269 |
fi |
270 |
|
271 |
# Create a client certificate |
272 |
echo |
273 |
einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " |
274 |
read -r CN |
275 |
|
276 |
einfo "Creating private key and certificate for client ${CN}..." |
277 |
certtool --generate-privkey \ |
278 |
--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
279 |
chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
280 |
|
281 |
cat > "${T}/${PF}.$$" <<- _EOF |
282 |
cn = ${CN} |
283 |
tls_www_client |
284 |
dns_name = ${CN} |
285 |
expiration_days = 3650 |
286 |
_EOF |
287 |
|
288 |
certtool --generate-certificate \ |
289 |
--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
290 |
--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
291 |
--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
292 |
--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
293 |
--template "${T}/${PF}.$$" &>/dev/null |
294 |
chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
295 |
|
296 |
rm -f "${T}/${PF}.$$" |
297 |
|
298 |
echo |
299 |
einfo "Here is the documentation on how to encrypt your log traffic:" |
300 |
einfo " http://www.rsyslog.com/doc/rsyslog_tls.html" |
301 |
} |