1 |
dertobi123 08/12/31 10:05:33 |
2 |
|
3 |
Modified: metadata.xml ChangeLog snort-2.8.3.1.ebuild |
4 |
Log: |
5 |
Various QA fixes, as requested by Mr_Bones_. Also describe local use-flags (and switch pthreads to just threads), though those local use-flags do need some better descriptions. Hey, at least I do care ... |
6 |
(Portage version: 2.2_rc20/cvs/Linux 2.6.25-gentoo-r7 x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.6 net-analyzer/snort/metadata.xml |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/snort/metadata.xml?rev=1.6&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/snort/metadata.xml?rev=1.6&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/snort/metadata.xml?r1=1.5&r2=1.6 |
14 |
|
15 |
Index: metadata.xml |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/snort/metadata.xml,v |
18 |
retrieving revision 1.5 |
19 |
retrieving revision 1.6 |
20 |
diff -u -r1.5 -r1.6 |
21 |
--- metadata.xml 4 Aug 2008 20:12:12 -0000 1.5 |
22 |
+++ metadata.xml 31 Dec 2008 10:05:32 -0000 1.6 |
23 |
@@ -4,16 +4,26 @@ |
24 |
<herd>netmon</herd> |
25 |
<longdescription>Libpcap-based packet sniffer/logger/lightweight IDS</longdescription> |
26 |
<use> |
27 |
+<flag name='aruba'>Enable Aruba support</flag> |
28 |
+<flag name='community-rules'>Include Community rules</flag> |
29 |
+<flag name='decoder-preprocessor-rules'></flag> |
30 |
<flag name='dynamicplugin'>Enable ability to dynamically load preprocessors, detection engine, and rules library</flag> |
31 |
<flag name='flexresp'>Enable new connection tearing (not recommended)</flag> |
32 |
<flag name='flexresp2'>Enable new connection tearing</flag> |
33 |
<flag name='gre'>Enable GRE support</flag> |
34 |
<flag name='inline'>Enable snort-inline for accepting packets from <pkg>net-firewall/iptables</pkg>, via libipq, rather than <pkg>net-libs/libpcap</pkg>.</flag> |
35 |
+<flag name='inline-init-failopen'>Enable inline-init-failopen support</flag> |
36 |
<flag name='linux-smp-stats'>Enable statistics reporting through proc on smp systems</flag> |
37 |
+<flag name='memory-cleanup'>Enable memory-cleanup support</flag> |
38 |
+<flag name='mpls'>Enable support for mpls networks</flag> |
39 |
<flag name='perfprofiling'>Enable preprocessor and rule performance profiling</flag> |
40 |
+<flag name='ppm'>Enable ppm support</flag> |
41 |
<flag name='react'>Enable interception and termination of offending HTTP accesses</flag> |
42 |
+<flag name='ruleperf'>Enable ruleperf support</flag> |
43 |
<flag name='sguil'>Enable sguil (The Analyst Console for Network Security Monitoring) support</flag> |
44 |
<flag name='snortsam'>patches <pkg>net-analyzer/snort</pkg> for use with <pkg>net-analyzer/snortsam</pkg></flag> |
45 |
+<flag name='stream4udp'>Enable stream4udp support</flag> |
46 |
+<flag name='targetbased'>Enable targetbased support</flag> |
47 |
<flag name='timestats'>Enable TimeStats functionality</flag> |
48 |
</use> |
49 |
</pkgmetadata> |
50 |
|
51 |
|
52 |
|
53 |
1.136 net-analyzer/snort/ChangeLog |
54 |
|
55 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/snort/ChangeLog?rev=1.136&view=markup |
56 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/snort/ChangeLog?rev=1.136&content-type=text/plain |
57 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/snort/ChangeLog?r1=1.135&r2=1.136 |
58 |
|
59 |
Index: ChangeLog |
60 |
=================================================================== |
61 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v |
62 |
retrieving revision 1.135 |
63 |
retrieving revision 1.136 |
64 |
diff -u -r1.135 -r1.136 |
65 |
--- ChangeLog 23 Nov 2008 15:29:38 -0000 1.135 |
66 |
+++ ChangeLog 31 Dec 2008 10:05:32 -0000 1.136 |
67 |
@@ -1,6 +1,12 @@ |
68 |
# ChangeLog for net-analyzer/snort |
69 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
70 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.135 2008/11/23 15:29:38 vanquirius Exp $ |
71 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.136 2008/12/31 10:05:32 dertobi123 Exp $ |
72 |
+ |
73 |
+ 31 Dec 2008; Tobias Scherbaum <dertobi123@g.o> metadata.xml, |
74 |
+ snort-2.8.3.1.ebuild: |
75 |
+ Various QA fixes, as requested by Mr_Bones_. Also describe local use-flags |
76 |
+ (and switch pthreads to just threads), though those local use-flags do need |
77 |
+ some better descriptions. Hey, at least I do care ... |
78 |
|
79 |
*snort-2.8.3.1 (23 Nov 2008) |
80 |
|
81 |
|
82 |
|
83 |
|
84 |
1.2 net-analyzer/snort/snort-2.8.3.1.ebuild |
85 |
|
86 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/snort/snort-2.8.3.1.ebuild?rev=1.2&view=markup |
87 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/snort/snort-2.8.3.1.ebuild?rev=1.2&content-type=text/plain |
88 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/snort/snort-2.8.3.1.ebuild?r1=1.1&r2=1.2 |
89 |
|
90 |
Index: snort-2.8.3.1.ebuild |
91 |
=================================================================== |
92 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.8.3.1.ebuild,v |
93 |
retrieving revision 1.1 |
94 |
retrieving revision 1.2 |
95 |
diff -u -r1.1 -r1.2 |
96 |
--- snort-2.8.3.1.ebuild 23 Nov 2008 15:29:38 -0000 1.1 |
97 |
+++ snort-2.8.3.1.ebuild 31 Dec 2008 10:05:32 -0000 1.2 |
98 |
@@ -1,6 +1,6 @@ |
99 |
# Copyright 1999-2008 Gentoo Foundation |
100 |
# Distributed under the terms of the GNU General Public License v2 |
101 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.8.3.1.ebuild,v 1.1 2008/11/23 15:29:38 vanquirius Exp $ |
102 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.8.3.1.ebuild,v 1.2 2008/12/31 10:05:32 dertobi123 Exp $ |
103 |
|
104 |
WANT_AUTOCONF="latest" |
105 |
WANT_AUTOMAKE="latest" |
106 |
@@ -15,22 +15,21 @@ |
107 |
LICENSE="GPL-2" |
108 |
SLOT="0" |
109 |
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 -sparc ~x86" |
110 |
-IUSE="static debug pthreads prelude stream4udp memory-cleanup decoder-preprocessor-rules ipv6 targetbased dynamicplugin timestats ruleperf ppm perfprofiling linux-smp-stats inline inline-init-failopen flexresp flexresp2 react aruba gre mpls pic postgres mysql odbc selinux community-rules" |
111 |
+IUSE="static debug threads prelude stream4udp memory-cleanup decoder-preprocessor-rules ipv6 targetbased dynamicplugin timestats ruleperf ppm perfprofiling linux-smp-stats inline inline-init-failopen flexresp flexresp2 react aruba gre mpls pic postgres mysql odbc selinux community-rules" |
112 |
|
113 |
#flexresp, react, and inline _ONLY_ work with net-libs/libnet-1.0.2a |
114 |
DEPEND="virtual/libc |
115 |
virtual/libpcap |
116 |
>=sys-devel/libtool-1.4 |
117 |
>=dev-libs/libpcre-6.0 |
118 |
- flexresp2? ( dev-libs/libdnet ) |
119 |
+ flexresp2? ( dev-libs/libdnet ) |
120 |
flexresp? ( ~net-libs/libnet-1.0.2a ) |
121 |
react? ( ~net-libs/libnet-1.0.2a ) |
122 |
- postgres? ( || ( dev-db/postgresql dev-db/libpq ) ) |
123 |
- mysql? ( virtual/mysql ) |
124 |
- odbc? ( dev-db/unixODBC ) |
125 |
+ postgres? ( || ( dev-db/postgresql dev-db/libpq ) ) |
126 |
+ mysql? ( virtual/mysql ) |
127 |
+ odbc? ( dev-db/unixODBC ) |
128 |
prelude? ( >=dev-libs/libprelude-0.9.0 ) |
129 |
- inline? ( ~net-libs/libnet-1.0.2a |
130 |
- net-firewall/iptables )" |
131 |
+ inline? ( ~net-libs/libnet-1.0.2a net-firewall/iptables )" |
132 |
|
133 |
RDEPEND="${DEPEND} |
134 |
dev-lang/perl |
135 |
@@ -65,30 +64,29 @@ |
136 |
epause |
137 |
fi |
138 |
|
139 |
- if use ruleperf && ! use dynamicplugin; then |
140 |
- ewarn |
141 |
+ if use ruleperf && ! use dynamicplugin; then |
142 |
ewarn |
143 |
- ewarn "You have enabled 'ruleperf' but not 'dynamicplugin'." |
144 |
- ewarn "'ruleperf' requires 'dynamicplugin' to compile." |
145 |
- ewarn |
146 |
- ewarn "Enabling dynamicplugin..." |
147 |
+ ewarn |
148 |
+ ewarn "You have enabled 'ruleperf' but not 'dynamicplugin'." |
149 |
+ ewarn "'ruleperf' requires 'dynamicplugin' to compile." |
150 |
+ ewarn |
151 |
+ ewarn "Enabling dynamicplugin..." |
152 |
ewarn |
153 |
ewarn |
154 |
epause |
155 |
- fi |
156 |
+ fi |
157 |
|
158 |
- if use inline-init-failopen && ! use inline; then |
159 |
- ewarn |
160 |
+ if use inline-init-failopen && ! use inline; then |
161 |
ewarn |
162 |
- ewarn "You have enabled 'inline-init-failopen' but not 'inline'." |
163 |
- ewarn "'inline-init-failopen' is an 'inline' only function." |
164 |
- ewarn |
165 |
- ewarn "Enabling inline mode..." |
166 |
+ ewarn |
167 |
+ ewarn "You have enabled 'inline-init-failopen' but not 'inline'." |
168 |
+ ewarn "'inline-init-failopen' is an 'inline' only function." |
169 |
+ ewarn |
170 |
+ ewarn "Enabling inline mode..." |
171 |
ewarn |
172 |
ewarn |
173 |
epause |
174 |
- fi |
175 |
- |
176 |
+ fi |
177 |
} |
178 |
|
179 |
|
180 |
@@ -110,8 +108,7 @@ |
181 |
} |
182 |
|
183 |
src_compile() { |
184 |
- |
185 |
- local myconf |
186 |
+ local myconf |
187 |
|
188 |
#Both shared and static are enable by defaut so we need to be specific |
189 |
if use static; then |
190 |
@@ -144,57 +141,57 @@ |
191 |
myconf="${myconf} --disable-dynamicplugin" |
192 |
fi |
193 |
|
194 |
- # USE flages 'targetbased' and 'inline-init-failopen' require pthreads |
195 |
- #Only 'pthreads' is set here. 'targetbased' and 'inline-init-failopen' are set below via econf. |
196 |
- if use targetbased || use inline-init-failopen || use pthreads; then |
197 |
- myconf="${myconf} --enable-pthread" |
198 |
- else |
199 |
- myconf="${myconf} --disable-pthread" |
200 |
- fi |
201 |
+ # USE flages 'targetbased' and 'inline-init-failopen' require threads |
202 |
+ #Only 'threads' is set here. 'targetbased' and 'inline-init-failopen' are set below via econf. |
203 |
+ if use targetbased || use inline-init-failopen || use threads; then |
204 |
+ myconf="${myconf} --enable-pthread" |
205 |
+ else |
206 |
+ myconf="${myconf} --disable-pthread" |
207 |
+ fi |
208 |
|
209 |
#Only needed if... |
210 |
- if use flexresp || use react || use inline; then |
211 |
+ if use flexresp || use react || use inline; then |
212 |
myconf="${myconf} --with-libipq-includes=/usr/include/libipq" |
213 |
fi |
214 |
|
215 |
- #'inline-init-failopen' requires 'inline' |
216 |
- if use inline-init-failopen || use inline; then |
217 |
- myconf="${myconf} --enable-inline" |
218 |
+ #'inline-init-failopen' requires 'inline' |
219 |
+ if use inline-init-failopen || use inline; then |
220 |
+ myconf="${myconf} --enable-inline" |
221 |
else |
222 |
myconf="${myconf} --disable-inline" |
223 |
- fi |
224 |
+ fi |
225 |
|
226 |
|
227 |
-#The --enable-<feature> options... 'static' 'dynamicplugin' 'pthreads' 'flexresp' 'flexresp2' 'inline' |
228 |
+#The --enable-<feature> options... 'static' 'dynamicplugin' 'threads' 'flexresp' 'flexresp2' 'inline' |
229 |
# are configured above due to dependancy/conflict issues. |
230 |
#All others are handled the standard ebuild way via econf |
231 |
|
232 |
econf \ |
233 |
--without-oracle \ |
234 |
- $(use_with postgres postgresql) \ |
235 |
- $(use_with mysql) \ |
236 |
- $(use_with odbc) \ |
237 |
- $(use_with pic) \ |
238 |
+ $(use_with postgres postgresql) \ |
239 |
+ $(use_with mysql) \ |
240 |
+ $(use_with odbc) \ |
241 |
+ $(use_with pic) \ |
242 |
--disable-ipfw \ |
243 |
--disable-profile \ |
244 |
--disable-ppm-test \ |
245 |
$(use_enable debug) \ |
246 |
- $(use_enable prelude) \ |
247 |
- $(use_enable stream4udp) \ |
248 |
- $(use_enable memory-cleanup) \ |
249 |
- $(use_enable decoder-preprocessor-rules) \ |
250 |
+ $(use_enable prelude) \ |
251 |
+ $(use_enable stream4udp) \ |
252 |
+ $(use_enable memory-cleanup) \ |
253 |
+ $(use_enable decoder-preprocessor-rules) \ |
254 |
$(use_enable ipv6) \ |
255 |
$(use_enable targetbased) \ |
256 |
- $(use_enable timestats) \ |
257 |
- $(use_enable ruleperf) \ |
258 |
- $(use_enable ppm) \ |
259 |
- $(use_enable perfprofiling) \ |
260 |
- $(use_enable linux-smp-stats) \ |
261 |
- $(use_enable inline-init-failopen) \ |
262 |
- $(use_enable react) \ |
263 |
- $(use_enable aruba) \ |
264 |
- $(use_enable gre) \ |
265 |
- $(use_enable mpls) \ |
266 |
+ $(use_enable timestats) \ |
267 |
+ $(use_enable ruleperf) \ |
268 |
+ $(use_enable ppm) \ |
269 |
+ $(use_enable perfprofiling) \ |
270 |
+ $(use_enable linux-smp-stats) \ |
271 |
+ $(use_enable inline-init-failopen) \ |
272 |
+ $(use_enable react) \ |
273 |
+ $(use_enable aruba) \ |
274 |
+ $(use_enable gre) \ |
275 |
+ $(use_enable mpls) \ |
276 |
${myconf} || die "econf failed" |
277 |
|
278 |
# limit to single as reported by jforman on irc |
279 |
@@ -227,7 +224,7 @@ |
280 |
etc/snort.conf > "${D}"/etc/snort/snort.conf.distrib |
281 |
fi |
282 |
|
283 |
- sed -i -e "s:RULE_PATH ../rules:RULE_PATH /etc/snort/rules:g" \ |
284 |
+ sed -i -e "s:RULE_PATH ../rules:RULE_PATH /etc/snort/rules:g" \ |
285 |
"${D}"/etc/snort/snort.conf.distrib |
286 |
|
287 |
sed -i -e "s:PREPROC_RULE_PATH ../preproc_rules:PREPROC_RULE_PATH /etc/snort/preproc_rules:g" \ |
288 |
@@ -283,9 +280,9 @@ |
289 |
elog "The COMMUNITY ruleset has been installed." |
290 |
elog |
291 |
else |
292 |
- elog |
293 |
- elog "The COMMUNITY ruleset has NOT been installed." |
294 |
- elog |
295 |
+ elog |
296 |
+ elog "The COMMUNITY ruleset has NOT been installed." |
297 |
+ elog |
298 |
fi |
299 |
elog "To learn how to manage updates to your rulesets please visit..." |
300 |
elog |