1 |
idella4 15/05/30 09:38:29 |
2 |
|
3 |
Modified: ChangeLog metadata.xml |
4 |
Added: ulogd-2.0.5.ebuild ulogd-2.0.4-r1.ebuild |
5 |
Removed: ulogd-2.0.3.ebuild |
6 |
Log: |
7 |
revbump; upgrade -2.0.4 with support of systemd via new system files listed. bump; additional support as for revbump, all files and patches by maintainer from bug #550330, add use flag ulog to metadata, rm old version -2.0.3 |
8 |
|
9 |
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D) |
10 |
|
11 |
Revision Changes Path |
12 |
1.98 app-admin/ulogd/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/ulogd/ChangeLog?rev=1.98&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/ulogd/ChangeLog?rev=1.98&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/ulogd/ChangeLog?r1=1.97&r2=1.98 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v |
21 |
retrieving revision 1.97 |
22 |
retrieving revision 1.98 |
23 |
diff -u -r1.97 -r1.98 |
24 |
--- ChangeLog 28 Jan 2015 10:26:01 -0000 1.97 |
25 |
+++ ChangeLog 30 May 2015 09:38:29 -0000 1.98 |
26 |
@@ -1,6 +1,18 @@ |
27 |
# ChangeLog for app-admin/ulogd |
28 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.97 2015/01/28 10:26:01 ago Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.98 2015/05/30 09:38:29 idella4 Exp $ |
31 |
+ |
32 |
+*ulogd-2.0.4-r1 (30 May 2015) |
33 |
+*ulogd-2.0.5 (30 May 2015) |
34 |
+ |
35 |
+ 30 May 2015; Ian Delaney <idella4@g.o> |
36 |
+ +files/ulogd-2.0.5-remove-db-automagic.patch, +files/ulogd.init, |
37 |
+ +files/ulogd.logrotate, +files/ulogd.service, +ulogd-2.0.4-r1.ebuild, |
38 |
+ +ulogd-2.0.5.ebuild, -files/ulogd-2-ng.init, -files/ulogd-2.logrotate, |
39 |
+ -ulogd-2.0.3.ebuild, metadata.xml: |
40 |
+ revbump; upgrade -2.0.4 with support of systemd via new system files listed. |
41 |
+ bump; additional support as for revbump, all files and patches by maintainer |
42 |
+ from bug #550330, add use flag ulog to metadata, rm old version -2.0.3 |
43 |
|
44 |
28 Jan 2015; Agostino Sarubbo <ago@g.o> ulogd-2.0.4.ebuild: |
45 |
Stable for ppc, wrt bug #534240 |
46 |
|
47 |
|
48 |
|
49 |
1.14 app-admin/ulogd/metadata.xml |
50 |
|
51 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/ulogd/metadata.xml?rev=1.14&view=markup |
52 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/ulogd/metadata.xml?rev=1.14&content-type=text/plain |
53 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/ulogd/metadata.xml?r1=1.13&r2=1.14 |
54 |
|
55 |
Index: metadata.xml |
56 |
=================================================================== |
57 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/ulogd/metadata.xml,v |
58 |
retrieving revision 1.13 |
59 |
retrieving revision 1.14 |
60 |
diff -u -r1.13 -r1.14 |
61 |
--- metadata.xml 26 Apr 2014 11:34:06 -0000 1.13 |
62 |
+++ metadata.xml 30 May 2015 09:38:29 -0000 1.14 |
63 |
@@ -14,5 +14,6 @@ |
64 |
<flag name='nflog'>Build NFLOG input plugin to support stateless packet-based logging via nfnetlink_queue.</flag> |
65 |
<flag name='nfct'>Build NFCT input plugin to support stateful flow-based via nf_conntrack_netlink.</flag> |
66 |
<flag name='nfacct'>Build NFACCT input plugin to support traffic accounting via nfnetlink_acct.</flag> |
67 |
+ <flag name='ulog'>Build ULOG input plugin to support deprecated packet-based logging via ULOG target.</flag> |
68 |
</use> |
69 |
</pkgmetadata> |
70 |
|
71 |
|
72 |
|
73 |
1.1 app-admin/ulogd/ulogd-2.0.5.ebuild |
74 |
|
75 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/ulogd/ulogd-2.0.5.ebuild?rev=1.1&view=markup |
76 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/ulogd/ulogd-2.0.5.ebuild?rev=1.1&content-type=text/plain |
77 |
|
78 |
Index: ulogd-2.0.5.ebuild |
79 |
=================================================================== |
80 |
# Copyright 1999-2015 Gentoo Foundation |
81 |
# Distributed under the terms of the GNU General Public License v2 |
82 |
# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-2.0.5.ebuild,v 1.1 2015/05/30 09:38:29 idella4 Exp $ |
83 |
|
84 |
EAPI=5 |
85 |
|
86 |
AUTOTOOLS_AUTORECONF=1 |
87 |
AUTOTOOLS_IN_SOURCE_BUILD=1 |
88 |
|
89 |
inherit autotools-utils eutils linux-info readme.gentoo systemd user |
90 |
|
91 |
DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging" |
92 |
HOMEPAGE="http://netfilter.org/projects/ulogd/index.html" |
93 |
SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2 |
94 |
http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2" |
95 |
|
96 |
LICENSE="GPL-2" |
97 |
SLOT="0" |
98 |
KEYWORDS="~amd64 ~ia64 ~ppc ~x86" |
99 |
IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite -ulog" |
100 |
|
101 |
RDEPEND=" |
102 |
net-firewall/iptables |
103 |
>=net-libs/libnfnetlink-1.0.1 |
104 |
dbi? ( dev-db/libdbi ) |
105 |
json? ( dev-libs/jansson ) |
106 |
nfacct? ( |
107 |
>=net-libs/libmnl-1.0.3 |
108 |
>=net-libs/libnetfilter_acct-1.0.1 |
109 |
) |
110 |
nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 ) |
111 |
nflog? ( >=net-libs/libnetfilter_log-1.0.0 ) |
112 |
mysql? ( virtual/mysql ) |
113 |
pcap? ( net-libs/libpcap ) |
114 |
postgres? ( dev-db/postgresql:= ) |
115 |
sqlite? ( dev-db/sqlite:3 )" |
116 |
|
117 |
DEPEND="${RDEPEND} |
118 |
doc? ( |
119 |
app-text/linuxdoc-tools |
120 |
app-text/texlive-core |
121 |
virtual/latex-base |
122 |
)" |
123 |
|
124 |
PATCHES=( "${FILESDIR}/${P}-remove-db-automagic.patch" ) |
125 |
|
126 |
DOCS=( AUTHORS README TODO ) |
127 |
DOC_CONTENTS="You must have at least one logging stack enabled to make ulogd work. |
128 |
Please edit example configuration located at /etc/ulogd.conf" |
129 |
|
130 |
pkg_setup() { |
131 |
enewgroup ulogd |
132 |
enewuser ulogd -1 -1 /var/log/ulogd ulogd |
133 |
|
134 |
linux-info_pkg_setup |
135 |
|
136 |
if kernel_is lt 2 6 14; then |
137 |
die "ulogd2 requires kernel newer than 2.6.14" |
138 |
fi |
139 |
|
140 |
if kernel_is lt 2 6 18; then |
141 |
ewarn "You are using kernel older than 2.6.18" |
142 |
ewarn "Some ulogd2 features may be unavailable" |
143 |
fi |
144 |
|
145 |
if use nfacct && kernel_is lt 3 3 0; then |
146 |
ewarn "NFACCT input plugin requires kernel newer than 3.3.0" |
147 |
fi |
148 |
|
149 |
if use ulog && kernel_is gt 3 17 0; then |
150 |
ewarn "ULOG target was removed since 3.17.0 kernel release" |
151 |
ewarn "Consider enabling NFACCT, NFCT or NFLOG support" |
152 |
fi |
153 |
} |
154 |
|
155 |
src_prepare() { |
156 |
# - make all logs to be kept in a single dir /var/log/ulogd |
157 |
# - place sockets in /run instead of /tmp |
158 |
sed -i \ |
159 |
-e 's:var/log:var/log/ulogd:g' \ |
160 |
-e 's:tmp:run:g' \ |
161 |
ulogd.conf.in || die 'sed on ulogd.conf.in failed' |
162 |
|
163 |
autotools-utils_src_prepare |
164 |
} |
165 |
|
166 |
src_configure() { |
167 |
local myeconfargs=( |
168 |
$(use_with dbi) |
169 |
$(use_with json jansson) |
170 |
$(use_enable nfacct) |
171 |
$(use_enable nfct) |
172 |
$(use_enable nflog) |
173 |
$(use_with mysql) |
174 |
$(use_with pcap) |
175 |
$(use_with postgres pgsql) |
176 |
$(use_with sqlite) |
177 |
$(use_enable ulog) |
178 |
) |
179 |
autotools-utils_src_configure |
180 |
} |
181 |
|
182 |
src_compile() { |
183 |
autotools-utils_src_compile |
184 |
|
185 |
if use doc; then |
186 |
# prevent access violations from generation of bitmap font files |
187 |
export VARTEXFONTS="${T}"/fonts |
188 |
emake -C doc |
189 |
fi |
190 |
} |
191 |
|
192 |
src_install() { |
193 |
autotools-utils_src_install |
194 |
readme.gentoo_create_doc |
195 |
prune_libtool_files --modules |
196 |
|
197 |
if use doc; then |
198 |
dohtml doc/${PN}.html |
199 |
dodoc doc/${PN}.dvi doc/${PN}.txt doc/${PN}.ps |
200 |
fi |
201 |
|
202 |
use sqlite && dodoc doc/sqlite3.table |
203 |
use mysql && dodoc doc/mysql-*.sql |
204 |
use postgres && dodoc doc/pgsql-*.sql |
205 |
doman ${PN}.8 |
206 |
|
207 |
insinto /etc |
208 |
doins ${PN}.conf |
209 |
fowners root:ulogd /etc/ulogd.conf |
210 |
fperms 640 /etc/ulogd.conf |
211 |
|
212 |
newinitd "${FILESDIR}/${PN}.init" ${PN} |
213 |
systemd_dounit "${FILESDIR}/${PN}.service" |
214 |
|
215 |
insinto /etc/logrotate.d |
216 |
newins "${FILESDIR}/${PN}.logrotate" ${PN} |
217 |
|
218 |
diropts -o ulogd -g ulogd |
219 |
keepdir /var/log/ulogd |
220 |
} |
221 |
|
222 |
|
223 |
|
224 |
1.1 app-admin/ulogd/ulogd-2.0.4-r1.ebuild |
225 |
|
226 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/ulogd/ulogd-2.0.4-r1.ebuild?rev=1.1&view=markup |
227 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/ulogd/ulogd-2.0.4-r1.ebuild?rev=1.1&content-type=text/plain |
228 |
|
229 |
Index: ulogd-2.0.4-r1.ebuild |
230 |
=================================================================== |
231 |
# Copyright 1999-2015 Gentoo Foundation |
232 |
# Distributed under the terms of the GNU General Public License v2 |
233 |
# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-2.0.4-r1.ebuild,v 1.1 2015/05/30 09:38:29 idella4 Exp $ |
234 |
|
235 |
EAPI="5" |
236 |
|
237 |
AUTOTOOLS_AUTORECONF=1 |
238 |
AUTOTOOLS_IN_SOURCE_BUILD=1 |
239 |
inherit autotools-utils eutils linux-info readme.gentoo systemd user |
240 |
|
241 |
DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging" |
242 |
HOMEPAGE="http://netfilter.org/projects/ulogd/index.html" |
243 |
SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2 |
244 |
http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2" |
245 |
|
246 |
LICENSE="GPL-2" |
247 |
SLOT="0" |
248 |
KEYWORDS="~amd64 ~ia64 ~ppc ~x86" |
249 |
IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite" |
250 |
|
251 |
RDEPEND="net-firewall/iptables |
252 |
>=net-libs/libnfnetlink-1.0.1 |
253 |
dbi? ( dev-db/libdbi ) |
254 |
json? ( dev-libs/jansson ) |
255 |
nfacct? ( |
256 |
>=net-libs/libmnl-1.0.3 |
257 |
>=net-libs/libnetfilter_acct-1.0.1 |
258 |
) |
259 |
nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 ) |
260 |
nflog? ( >=net-libs/libnetfilter_log-1.0.0 ) |
261 |
mysql? ( virtual/mysql ) |
262 |
pcap? ( net-libs/libpcap ) |
263 |
postgres? ( dev-db/postgresql:= ) |
264 |
sqlite? ( dev-db/sqlite:3 )" |
265 |
|
266 |
DEPEND="${RDEPEND} |
267 |
doc? ( |
268 |
app-text/linuxdoc-tools |
269 |
app-text/texlive-core |
270 |
virtual/latex-base |
271 |
)" |
272 |
|
273 |
PATCHES=( "${FILESDIR}/${P}-linux-headers-3.17-ipt_ulog.patch" ) |
274 |
|
275 |
DOCS=( AUTHORS README TODO ) |
276 |
DOC_CONTENTS="You must have at least one logging stack enabled to make ulogd work. |
277 |
Please edit example configuration located at /etc/ulogd.conf" |
278 |
|
279 |
pkg_setup() { |
280 |
enewgroup ulogd |
281 |
enewuser ulogd -1 -1 /var/log/ulogd ulogd |
282 |
|
283 |
linux-info_pkg_setup |
284 |
|
285 |
if kernel_is lt 2 6 14; then |
286 |
die "ulogd2 requires kernel newer than 2.6.14" |
287 |
fi |
288 |
|
289 |
if kernel_is lt 2 6 18; then |
290 |
ewarn |
291 |
ewarn "You are using kernel older than 2.6.18" |
292 |
ewarn "Some ulogd2 features may be unavailable" |
293 |
ewarn |
294 |
fi |
295 |
|
296 |
if use nfacct && kernel_is lt 3 3 0; then |
297 |
ewarn "NFACCT input plugin requires kernel newer than 3.3.0" |
298 |
fi |
299 |
|
300 |
if ! use nfacct && ! use nfct && ! use nflog && kernel_is gt 3 17 0; then |
301 |
ewarn "ULOG target was removed since 3.17.0 kernel release" |
302 |
ewarn "Consider enabling NFACCT, NFCT or NFLOG support" |
303 |
fi |
304 |
} |
305 |
|
306 |
src_prepare() { |
307 |
# - make all logs to be kept in a single dir /var/log/ulogd |
308 |
# - place sockets in /run instead of /tmp |
309 |
sed -i \ |
310 |
-e 's:var/log:var/log/ulogd:g' \ |
311 |
-e 's:tmp:run:g' \ |
312 |
ulogd.conf.in || die 'sed on ulogd.conf.in failed' |
313 |
|
314 |
autotools-utils_src_prepare |
315 |
} |
316 |
|
317 |
src_configure() { |
318 |
local myeconfargs=( |
319 |
$(use_with dbi) |
320 |
$(use_with json jansson) |
321 |
$(use_enable nfacct) |
322 |
$(use_enable nfct) |
323 |
$(use_enable nflog) |
324 |
$(use_with mysql) |
325 |
$(use_with pcap) |
326 |
$(use_with postgres pgsql) |
327 |
$(use_with sqlite) |
328 |
) |
329 |
autotools-utils_src_configure |
330 |
} |
331 |
|
332 |
src_compile() { |
333 |
autotools-utils_src_compile |
334 |
|
335 |
if use doc; then |
336 |
# prevent access violations from generation of bitmap font files |
337 |
export VARTEXFONTS="${T}"/fonts |
338 |
emake -C doc |
339 |
fi |
340 |
} |
341 |
|
342 |
src_install() { |
343 |
autotools-utils_src_install |
344 |
readme.gentoo_create_doc |
345 |
prune_libtool_files --modules |
346 |
|
347 |
if use doc; then |
348 |
dohtml doc/${PN}.html |
349 |
dodoc doc/${PN}.dvi doc/${PN}.txt doc/${PN}.ps |
350 |
fi |
351 |
|
352 |
use sqlite && dodoc doc/sqlite3.table |
353 |
use mysql && dodoc doc/mysql-*.sql |
354 |
use postgres && dodoc doc/pgsql-*.sql |
355 |
doman ${PN}.8 |
356 |
|
357 |
insinto /etc |
358 |
doins ${PN}.conf |
359 |
fowners root:ulogd /etc/ulogd.conf |
360 |
fperms 640 /etc/ulogd.conf |
361 |
|
362 |
newinitd "${FILESDIR}/${PN}.init" ${PN} |
363 |
systemd_dounit "${FILESDIR}/${PN}.service" |
364 |
|
365 |
insinto /etc/logrotate.d |
366 |
newins "${FILESDIR}/${PN}.logrotate" ${PN} |
367 |
|
368 |
diropts -o ulogd -g ulogd |
369 |
keepdir /var/log/ulogd |
370 |
} |