Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nepenthes/files/, profiles/, net-analyzer/nepenthes/
Date: Mon, 14 Aug 2017 20:00:29
Message-Id: 1502740815.256286b39c19741012748038cd572a29723ba780.mgorny@gentoo
1 commit: 256286b39c19741012748038cd572a29723ba780
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 14 19:56:57 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 14 20:00:15 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=256286b3
7
8 net-analyzer/nepenthes: Remove last-rited pkg, #594390
9
10 net-analyzer/nepenthes/Manifest | 2 -
11 .../nepenthes/files/nepenthes-0.2.2-Werror.patch | 649 ---------------------
12 .../nepenthes/files/nepenthes-0.2.2-cachedir.patch | 11 -
13 .../files/nepenthes-0.2.2-curl_types_h.patch | 70 ---
14 .../nepenthes/files/nepenthes-0.2.2-gcc4.patch | 26 -
15 .../nepenthes/files/nepenthes-0.2.2-libdir.patch | 16 -
16 .../files/nepenthes-0.2.2-sysconfdir.patch | 77 ---
17 net-analyzer/nepenthes/files/nepenthes.confd | 5 -
18 net-analyzer/nepenthes/files/nepenthes.initd | 20 -
19 net-analyzer/nepenthes/metadata.xml | 15 -
20 net-analyzer/nepenthes/nepenthes-0.2.2-r1.ebuild | 74 ---
21 net-analyzer/nepenthes/nepenthes-0.2.2.ebuild | 81 ---
22 profiles/package.mask | 5 -
23 13 files changed, 1051 deletions(-)
24
25 diff --git a/net-analyzer/nepenthes/Manifest b/net-analyzer/nepenthes/Manifest
26 deleted file mode 100644
27 index fed5a4b2498..00000000000
28 --- a/net-analyzer/nepenthes/Manifest
29 +++ /dev/null
30 @@ -1,2 +0,0 @@
31 -DIST nepenthes-0.2.2-gcc44.patch.bz2 1786 SHA256 2e8ecf67df2f90273a8b29a3dae0e7f9afef7ddd279a5e7981362dc1d4c12e83 SHA512 d77ea31971bcbff261e28242a59f1e2351136aae6c3e809dc827045ce8e4cfe5b67b9c12a1e3b3a04868bdbcdbd37e5bc7aaeee334838a8f485500914b3b0c6e WHIRLPOOL 33d149aae88bccc5c8d595641462654d5bc915e4c6d853ee507a28719275ac8dd2bdc885ae3181eefed229d747fdeab78bdc4eb39d77007179b7c9f494178901
32 -DIST nepenthes-0.2.2.tar.bz2 580491 SHA256 70d4ec64a3651eba18e2aa623326c27d888d588f75525fe87577a5eb28ae6a12 SHA512 b22d139a22aef2648a3d9e87e425f1d02404e30126eb7265ef2d584e1b5db62cc8cb92027212394576bedf53b3692ded7a2b6b3544c03f0828faf94c9553b70d WHIRLPOOL 769f4c4a561465c7baf82afd12d7f862ad4faea82c436bf81aeb947d215a4e36ccbc73aedef396945647972234a0ab949d2f02b0874bc3c570a88a5181ca40a9
33
34 diff --git a/net-analyzer/nepenthes/files/nepenthes-0.2.2-Werror.patch b/net-analyzer/nepenthes/files/nepenthes-0.2.2-Werror.patch
35 deleted file mode 100644
36 index 3037e85e875..00000000000
37 --- a/net-analyzer/nepenthes/files/nepenthes-0.2.2-Werror.patch
38 +++ /dev/null
39 @@ -1,649 +0,0 @@
40 ---- a/nepenthes-core/src/Makefile.am
41 -+++ b/nepenthes-core/src/Makefile.am
42 -@@ -4,7 +4,7 @@
43 -
44 - AUTOMAKE_OPTIONS = foreign
45 -
46 --AM_CPPFLAGS = -I../include -I ../.. -Wall -Werror
47 -+AM_CPPFLAGS = -I../include -I ../.. -Wall
48 - AM_LDFLAGS = ${LIB_MAGIC} ${LIB_CAP} ${LIB_DL}
49 -
50 - bin_PROGRAMS = nepenthes
51 ---- a/modules/x-3/Makefile.am
52 -+++ b/modules/x-3/Makefile.am
53 -@@ -5,7 +5,7 @@
54 - AUTOMAKE_OPTIONS = foreign
55 -
56 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
57 --AM_CXXFLAGS = -Wall -Werror
58 -+AM_CXXFLAGS = -Wall
59 -
60 -
61 - pkglib_LTLIBRARIES = x3.la
62 ---- a/modules/vuln-ftpd/Makefile.am
63 -+++ b/modules/vuln-ftpd/Makefile.am
64 -@@ -5,7 +5,7 @@
65 - AUTOMAKE_OPTIONS = foreign
66 -
67 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
68 --AM_CXXFLAGS = -Wall -Werror
69 -+AM_CXXFLAGS = -Wall
70 -
71 -
72 - pkglib_LTLIBRARIES = vulnftpd.la
73 ---- a/modules/download-link/Makefile.am
74 -+++ b/modules/download-link/Makefile.am
75 -@@ -5,7 +5,7 @@
76 - AUTOMAKE_OPTIONS = foreign
77 -
78 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
79 --AM_CXXFLAGS = -Wall -Werror
80 -+AM_CXXFLAGS = -Wall
81 -
82 -
83 - pkglib_LTLIBRARIES = downloadlink.la
84 ---- a/modules/vuln-netbiosname/Makefile.am
85 -+++ b/modules/vuln-netbiosname/Makefile.am
86 -@@ -5,7 +5,7 @@
87 - AUTOMAKE_OPTIONS = foreign
88 -
89 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
90 --AM_CXXFLAGS = -Wall -Werror
91 -+AM_CXXFLAGS = -Wall
92 -
93 -
94 - pkglib_LTLIBRARIES = vulnnetbiosname.la
95 ---- a/modules/submit-http/Makefile.am
96 -+++ b/modules/submit-http/Makefile.am
97 -@@ -1,7 +1,7 @@
98 - AUTOMAKE_OPTIONS = foreign
99 -
100 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
101 --AM_CXXFLAGS = -Wall -Werror
102 -+AM_CXXFLAGS = -Wall
103 -
104 - AM_LDFLAGS = $(LIB_CURL)
105 -
106 ---- a/modules/download-creceive/Makefile.am
107 -+++ b/modules/download-creceive/Makefile.am
108 -@@ -5,7 +5,7 @@
109 - AUTOMAKE_OPTIONS = foreign
110 -
111 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
112 --AM_CXXFLAGS = -Wall -Werror
113 -+AM_CXXFLAGS = -Wall
114 -
115 -
116 - pkglib_LTLIBRARIES = downloadcreceive.la
117 ---- a/modules/module-bridge/Makefile.am
118 -+++ b/modules/module-bridge/Makefile.am
119 -@@ -5,7 +5,7 @@
120 - AUTOMAKE_OPTIONS = foreign
121 -
122 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
123 --AM_CXXFLAGS = -Wall -Werror
124 -+AM_CXXFLAGS = -Wall
125 -
126 -
127 - pkglib_LTLIBRARIES = modulebridge.la
128 ---- a/modules/vuln-sub7/Makefile.am
129 -+++ b/modules/vuln-sub7/Makefile.am
130 -@@ -5,7 +5,7 @@
131 - AUTOMAKE_OPTIONS = foreign
132 -
133 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
134 --AM_CXXFLAGS = -Wall -Werror
135 -+AM_CXXFLAGS = -Wall
136 -
137 -
138 - pkglib_LTLIBRARIES = vulnsub7.la
139 ---- a/modules/x-9/Makefile.am
140 -+++ b/modules/x-9/Makefile.am
141 -@@ -5,7 +5,7 @@
142 - AUTOMAKE_OPTIONS = foreign
143 -
144 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
145 --AM_CXXFLAGS = -Wall -Werror
146 -+AM_CXXFLAGS = -Wall
147 -
148 -
149 - pkglib_LTLIBRARIES = x9.la
150 ---- a/modules/module-honeytrap/Makefile.am
151 -+++ b/modules/module-honeytrap/Makefile.am
152 -@@ -5,7 +5,7 @@
153 - AUTOMAKE_OPTIONS = foreign
154 -
155 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE -I/usr/include/libipq
156 --AM_CXXFLAGS = -Wall -Werror
157 -+AM_CXXFLAGS = -Wall
158 - AM_LDFLAGS = ${LIB_PCAP} ${LIB_IPQ}
159 -
160 - pkglib_LTLIBRARIES = modulehoneytrap.la
161 ---- a/modules/x-6/Makefile.am
162 -+++ b/modules/x-6/Makefile.am
163 -@@ -5,7 +5,7 @@
164 - AUTOMAKE_OPTIONS = foreign
165 -
166 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
167 --AM_CXXFLAGS = -Wall -Werror
168 -+AM_CXXFLAGS = -Wall
169 -
170 -
171 - pkglib_LTLIBRARIES = x6.la
172 ---- a/modules/log-hexdump/Makefile.am
173 -+++ b/modules/log-hexdump/Makefile.am
174 -@@ -5,7 +5,7 @@
175 - AUTOMAKE_OPTIONS = foreign
176 -
177 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
178 --AM_CXXFLAGS = -Wall -Werror
179 -+AM_CXXFLAGS = -Wall
180 -
181 -
182 - pkglib_LTLIBRARIES = loghexdump.la
183 ---- a/modules/submit-gotek/Makefile.am
184 -+++ b/modules/submit-gotek/Makefile.am
185 -@@ -5,7 +5,7 @@
186 - AUTOMAKE_OPTIONS = foreign
187 -
188 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
189 --AM_CXXFLAGS = -Wall -Werror
190 -+AM_CXXFLAGS = -Wall
191 -
192 -
193 - pkglib_LTLIBRARIES = submitgotek.la
194 ---- a/modules/dnsresolve-adns/Makefile.am
195 -+++ b/modules/dnsresolve-adns/Makefile.am
196 -@@ -5,7 +5,7 @@
197 - AUTOMAKE_OPTIONS = foreign
198 -
199 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
200 --AM_CXXFLAGS = -Wall -Werror
201 -+AM_CXXFLAGS = -Wall
202 - AM_LDFLAGS = ${LIB_ADNS}
203 -
204 - pkglib_LTLIBRARIES = dnsresolveadns.la
205 ---- a/modules/download-ftp/Makefile.am
206 -+++ b/modules/download-ftp/Makefile.am
207 -@@ -5,7 +5,7 @@
208 - AUTOMAKE_OPTIONS = foreign
209 -
210 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
211 --AM_CXXFLAGS = -Wall -Werror
212 -+AM_CXXFLAGS = -Wall
213 -
214 -
215 - pkglib_LTLIBRARIES = downloadftp.la
216 ---- a/modules/vuln-realvnc/Makefile.am
217 -+++ b/modules/vuln-realvnc/Makefile.am
218 -@@ -5,7 +5,7 @@
219 - AUTOMAKE_OPTIONS = foreign
220 -
221 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
222 --AM_CXXFLAGS = -Wall -Werror
223 -+AM_CXXFLAGS = -Wall
224 -
225 -
226 - pkglib_LTLIBRARIES = vulnrealvnc.la
227 ---- a/modules/module-peiros/Makefile.am
228 -+++ b/modules/module-peiros/Makefile.am
229 -@@ -5,7 +5,7 @@
230 - AUTOMAKE_OPTIONS = foreign
231 -
232 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
233 --AM_CXXFLAGS = -Wall -Werror
234 -+AM_CXXFLAGS = -Wall
235 -
236 -
237 - pkglib_LTLIBRARIES = modulepeiros.la
238 ---- a/modules/submit-postgres/Makefile.am
239 -+++ b/modules/submit-postgres/Makefile.am
240 -@@ -5,7 +5,7 @@
241 - AUTOMAKE_OPTIONS = foreign
242 -
243 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
244 --AM_CXXFLAGS = -Wall -Werror
245 -+AM_CXXFLAGS = -Wall
246 -
247 -
248 - pkglib_LTLIBRARIES = submitpostgres.la
249 ---- a/modules/download-curl/Makefile.am
250 -+++ b/modules/download-curl/Makefile.am
251 -@@ -5,7 +5,7 @@
252 - AUTOMAKE_OPTIONS = foreign
253 -
254 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
255 --AM_CXXFLAGS = -Wall -Werror
256 -+AM_CXXFLAGS = -Wall
257 - AM_LDFLAGS = ${LIB_CURL}
258 -
259 - pkglib_LTLIBRARIES = downloadcurl.la
260 ---- a/modules/download-http/Makefile.am
261 -+++ b/modules/download-http/Makefile.am
262 -@@ -5,7 +5,7 @@
263 - AUTOMAKE_OPTIONS = foreign
264 -
265 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
266 --AM_CXXFLAGS = -Wall -Werror
267 -+AM_CXXFLAGS = -Wall
268 -
269 -
270 - pkglib_LTLIBRARIES = downloadhttp.la
271 ---- a/modules/log-surfnet/Makefile.am
272 -+++ b/modules/log-surfnet/Makefile.am
273 -@@ -5,7 +5,7 @@
274 - AUTOMAKE_OPTIONS = foreign
275 -
276 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -I/usr/include/postgresql -pipe -D _GNU_SOURCE
277 --AM_CXXFLAGS = -Wall -Werror
278 -+AM_CXXFLAGS = -Wall
279 -
280 - pkglib_LTLIBRARIES = logsurfnet.la
281 -
282 ---- a/modules/log-download/Makefile.am
283 -+++ b/modules/log-download/Makefile.am
284 -@@ -5,7 +5,7 @@
285 - AUTOMAKE_OPTIONS = foreign
286 -
287 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
288 --AM_CXXFLAGS = -Wall -Werror
289 -+AM_CXXFLAGS = -Wall
290 -
291 -
292 - pkglib_LTLIBRARIES = logdownload.la
293 ---- a/modules/download-csend/Makefile.am
294 -+++ b/modules/download-csend/Makefile.am
295 -@@ -5,7 +5,7 @@
296 - AUTOMAKE_OPTIONS = foreign
297 -
298 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
299 --AM_CXXFLAGS = -Wall -Werror
300 -+AM_CXXFLAGS = -Wall
301 -
302 -
303 - pkglib_LTLIBRARIES = downloadcsend.la
304 ---- a/modules/submit-mwserv/Makefile.am
305 -+++ b/modules/submit-mwserv/Makefile.am
306 -@@ -5,7 +5,7 @@
307 - AUTOMAKE_OPTIONS = foreign
308 -
309 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
310 --AM_CXXFLAGS = -Wall -Werror
311 -+AM_CXXFLAGS = -Wall
312 -
313 - AM_LDFLAGS = $(LIB_CURL)
314 -
315 ---- a/modules/vuln-wins/Makefile.am
316 -+++ b/modules/vuln-wins/Makefile.am
317 -@@ -5,7 +5,7 @@
318 - AUTOMAKE_OPTIONS = foreign
319 -
320 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
321 --AM_CXXFLAGS = -Wall -Werror
322 -+AM_CXXFLAGS = -Wall
323 -
324 -
325 - pkglib_LTLIBRARIES = vulnwins.la
326 ---- a/modules/x-2/Makefile.am
327 -+++ b/modules/x-2/Makefile.am
328 -@@ -5,7 +5,7 @@
329 - AUTOMAKE_OPTIONS = foreign
330 -
331 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
332 --AM_CXXFLAGS = -Wall -Werror
333 -+AM_CXXFLAGS = -Wall
334 -
335 -
336 - pkglib_LTLIBRARIES = x2.la
337 ---- a/modules/vuln-pnp/Makefile.am
338 -+++ b/modules/vuln-pnp/Makefile.am
339 -@@ -5,7 +5,7 @@
340 - AUTOMAKE_OPTIONS = foreign
341 -
342 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
343 --AM_CXXFLAGS = -Wall -Werror
344 -+AM_CXXFLAGS = -Wall
345 -
346 -
347 - pkglib_LTLIBRARIES = vulnpnp.la
348 ---- a/modules/vuln-upnp/Makefile.am
349 -+++ b/modules/vuln-upnp/Makefile.am
350 -@@ -5,7 +5,7 @@
351 - AUTOMAKE_OPTIONS = foreign
352 -
353 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
354 --AM_CXXFLAGS = -Wall -Werror
355 -+AM_CXXFLAGS = -Wall
356 -
357 -
358 - pkglib_LTLIBRARIES = vulnupnp.la
359 ---- a/modules/vuln-msmq/Makefile.am
360 -+++ b/modules/vuln-msmq/Makefile.am
361 -@@ -5,7 +5,7 @@
362 - AUTOMAKE_OPTIONS = foreign
363 -
364 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
365 --AM_CXXFLAGS = -Wall -Werror
366 -+AM_CXXFLAGS = -Wall
367 -
368 -
369 - pkglib_LTLIBRARIES = vulnmsmq.la
370 ---- a/modules/vuln-dcom/Makefile.am
371 -+++ b/modules/vuln-dcom/Makefile.am
372 -@@ -5,7 +5,7 @@
373 - AUTOMAKE_OPTIONS = foreign
374 -
375 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
376 --AM_CXXFLAGS = -Wall -Werror
377 -+AM_CXXFLAGS = -Wall
378 -
379 -
380 - pkglib_LTLIBRARIES = vulndcom.la
381 ---- a/modules/vuln-mydoom/Makefile.am
382 -+++ b/modules/vuln-mydoom/Makefile.am
383 -@@ -5,7 +5,7 @@
384 - AUTOMAKE_OPTIONS = foreign
385 -
386 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
387 --AM_CXXFLAGS = -Wall -Werror
388 -+AM_CXXFLAGS = -Wall
389 -
390 -
391 - pkglib_LTLIBRARIES = vulnmydoom.la
392 ---- a/modules/submit-norman/Makefile.am
393 -+++ b/modules/submit-norman/Makefile.am
394 -@@ -5,7 +5,7 @@
395 - AUTOMAKE_OPTIONS = foreign
396 -
397 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
398 --AM_CXXFLAGS = -Wall -Werror
399 -+AM_CXXFLAGS = -Wall
400 - AM_LDFLAGS = ${LIB_CURL}
401 -
402 - pkglib_LTLIBRARIES = submitnorman.la
403 ---- a/modules/vuln-asn1/Makefile.am
404 -+++ b/modules/vuln-asn1/Makefile.am
405 -@@ -5,7 +5,7 @@
406 - AUTOMAKE_OPTIONS = foreign
407 -
408 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
409 --AM_CXXFLAGS = -Wall -Werror
410 -+AM_CXXFLAGS = -Wall
411 -
412 -
413 - pkglib_LTLIBRARIES = vulnasn1.la
414 ---- a/modules/vuln-lsass/Makefile.am
415 -+++ b/modules/vuln-lsass/Makefile.am
416 -@@ -5,7 +5,7 @@
417 - AUTOMAKE_OPTIONS = foreign
418 -
419 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
420 --AM_CXXFLAGS = -Wall -Werror
421 -+AM_CXXFLAGS = -Wall
422 -
423 -
424 - pkglib_LTLIBRARIES = vulnlsass.la
425 ---- a/modules/log-irc/Makefile.am
426 -+++ b/modules/log-irc/Makefile.am
427 -@@ -5,7 +5,7 @@
428 - AUTOMAKE_OPTIONS = foreign
429 -
430 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
431 --AM_CXXFLAGS = -Wall -Werror
432 -+AM_CXXFLAGS = -Wall
433 -
434 -
435 - pkglib_LTLIBRARIES = logirc.la
436 ---- a/modules/vuln-netdde/Makefile.am
437 -+++ b/modules/vuln-netdde/Makefile.am
438 -@@ -5,7 +5,7 @@
439 - AUTOMAKE_OPTIONS = foreign
440 -
441 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
442 --AM_CXXFLAGS = -Wall -Werror
443 -+AM_CXXFLAGS = -Wall
444 -
445 -
446 - pkglib_LTLIBRARIES = vulnnetdde.la
447 ---- a/modules/vuln-optix/Makefile.am
448 -+++ b/modules/vuln-optix/Makefile.am
449 -@@ -5,7 +5,7 @@
450 - AUTOMAKE_OPTIONS = foreign
451 -
452 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
453 --AM_CXXFLAGS = -Wall -Werror
454 -+AM_CXXFLAGS = -Wall
455 - AM_LDFLAGS = ${LIB_PCRE}
456 -
457 - pkglib_LTLIBRARIES = vulnoptix.la
458 ---- a/modules/vuln-sav/Makefile.am
459 -+++ b/modules/vuln-sav/Makefile.am
460 -@@ -5,7 +5,7 @@
461 - AUTOMAKE_OPTIONS = foreign
462 -
463 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
464 --AM_CXXFLAGS = -Wall -Werror
465 -+AM_CXXFLAGS = -Wall
466 -
467 - pkglib_LTLIBRARIES = vulnsav.la
468 -
469 ---- a/modules/vuln-sasserftpd/Makefile.am
470 -+++ b/modules/vuln-sasserftpd/Makefile.am
471 -@@ -5,7 +5,7 @@
472 - AUTOMAKE_OPTIONS = foreign
473 -
474 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
475 --AM_CXXFLAGS = -Wall -Werror
476 -+AM_CXXFLAGS = -Wall
477 -
478 -
479 - pkglib_LTLIBRARIES = vulnsasserftpd.la
480 ---- a/modules/submit-file/Makefile.am
481 -+++ b/modules/submit-file/Makefile.am
482 -@@ -5,7 +5,7 @@
483 - AUTOMAKE_OPTIONS = foreign
484 -
485 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
486 --AM_CXXFLAGS = -Wall -Werror
487 -+AM_CXXFLAGS = -Wall
488 -
489 -
490 - pkglib_LTLIBRARIES = submitfile.la
491 ---- a/modules/vuln-bagle/Makefile.am
492 -+++ b/modules/vuln-bagle/Makefile.am
493 -@@ -5,7 +5,7 @@
494 - AUTOMAKE_OPTIONS = foreign
495 -
496 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
497 --AM_CXXFLAGS = -Wall -Werror
498 -+AM_CXXFLAGS = -Wall
499 -
500 - pkglib_LTLIBRARIES = vulnbagle.la
501 -
502 ---- a/modules/vuln-ssh/Makefile.am
503 -+++ b/modules/vuln-ssh/Makefile.am
504 -@@ -5,7 +5,7 @@
505 - AUTOMAKE_OPTIONS = foreign
506 -
507 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
508 --AM_CXXFLAGS = -Wall -Werror
509 -+AM_CXXFLAGS = -Wall
510 - AM_LDFLAGS = ${LIB_SSH}
511 -
512 - pkglib_LTLIBRARIES = vulnssh.la
513 ---- a/modules/vuln-kuang2/Makefile.am
514 -+++ b/modules/vuln-kuang2/Makefile.am
515 -@@ -5,7 +5,7 @@
516 - AUTOMAKE_OPTIONS = foreign
517 -
518 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
519 --AM_CXXFLAGS = -Wall -Werror
520 -+AM_CXXFLAGS = -Wall
521 -
522 -
523 - pkglib_LTLIBRARIES = vulnkuang2.la
524 ---- a/modules/vuln-msdtc/Makefile.am
525 -+++ b/modules/vuln-msdtc/Makefile.am
526 -@@ -5,7 +5,7 @@
527 - AUTOMAKE_OPTIONS = foreign
528 -
529 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
530 --AM_CXXFLAGS = -Wall -Werror
531 -+AM_CXXFLAGS = -Wall
532 -
533 -
534 - pkglib_LTLIBRARIES = vulnmsdtc.la
535 ---- a/modules/x-5/Makefile.am
536 -+++ b/modules/x-5/Makefile.am
537 -@@ -5,7 +5,7 @@
538 - AUTOMAKE_OPTIONS = foreign
539 -
540 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
541 --AM_CXXFLAGS = -Wall -Werror
542 -+AM_CXXFLAGS = -Wall
543 -
544 -
545 - pkglib_LTLIBRARIES = x5.la
546 ---- a/modules/shellemu-winnt/Makefile.am
547 -+++ b/modules/shellemu-winnt/Makefile.am
548 -@@ -5,7 +5,7 @@
549 - AUTOMAKE_OPTIONS = foreign
550 -
551 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
552 --AM_CXXFLAGS = -Wall -Werror
553 -+AM_CXXFLAGS = -Wall
554 -
555 -
556 - pkglib_LTLIBRARIES = shellemuwinnt.la
557 ---- a/modules/x-1/Makefile.am
558 -+++ b/modules/x-1/Makefile.am
559 -@@ -5,7 +5,7 @@
560 - AUTOMAKE_OPTIONS = foreign
561 -
562 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
563 --AM_CXXFLAGS = -Wall -Werror
564 -+AM_CXXFLAGS = -Wall
565 -
566 -
567 - pkglib_LTLIBRARIES = x1.la
568 ---- a/modules/x-4/Makefile.am
569 -+++ b/modules/x-4/Makefile.am
570 -@@ -5,7 +5,7 @@
571 - AUTOMAKE_OPTIONS = foreign
572 -
573 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
574 --AM_CXXFLAGS = -Wall -Werror
575 -+AM_CXXFLAGS = -Wall
576 -
577 -
578 - pkglib_LTLIBRARIES = x4.la
579 ---- a/modules/vuln-mssql/Makefile.am
580 -+++ b/modules/vuln-mssql/Makefile.am
581 -@@ -5,7 +5,7 @@
582 - AUTOMAKE_OPTIONS = foreign
583 -
584 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
585 --AM_CXXFLAGS = -Wall -Werror
586 -+AM_CXXFLAGS = -Wall
587 -
588 - pkglib_LTLIBRARIES = vulnmssql.la
589 -
590 ---- a/modules/shellcode-signatures/Makefile.am
591 -+++ b/modules/shellcode-signatures/Makefile.am
592 -@@ -5,7 +5,7 @@
593 - AUTOMAKE_OPTIONS = foreign
594 -
595 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
596 --AM_CXXFLAGS = -Wall -Werror
597 -+AM_CXXFLAGS = -Wall
598 - AM_CFLAGS = -Wall
599 - AM_LDFLAGS = ${LIB_PCRE} @LEXLIB@ ${LIB_LIBY}
600 -
601 ---- a/modules/download-rcp/Makefile.am
602 -+++ b/modules/download-rcp/Makefile.am
603 -@@ -5,7 +5,7 @@
604 - AUTOMAKE_OPTIONS = foreign
605 -
606 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
607 --AM_CXXFLAGS = -Wall -Werror
608 -+AM_CXXFLAGS = -Wall
609 -
610 -
611 - pkglib_LTLIBRARIES = downloadrcp.la
612 ---- a/modules/shellcode-generic/Makefile.am
613 -+++ b/modules/shellcode-generic/Makefile.am
614 -@@ -5,7 +5,7 @@
615 - AUTOMAKE_OPTIONS = foreign
616 -
617 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
618 --AM_CXXFLAGS = -Wall -Werror
619 -+AM_CXXFLAGS = -Wall
620 - AM_LDFLAGS = ${LIB_PCRE}
621 -
622 - pkglib_LTLIBRARIES = shellcodegeneric.la
623 ---- a/modules/module-portwatch/Makefile.am
624 -+++ b/modules/module-portwatch/Makefile.am
625 -@@ -5,7 +5,7 @@
626 - AUTOMAKE_OPTIONS = foreign
627 -
628 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
629 --AM_CXXFLAGS = -Wall -Werror
630 -+AM_CXXFLAGS = -Wall
631 -
632 -
633 - pkglib_LTLIBRARIES = moduleportwatch.la
634 ---- a/modules/vuln-dameware/Makefile.am
635 -+++ b/modules/vuln-dameware/Makefile.am
636 -@@ -5,7 +5,7 @@
637 - AUTOMAKE_OPTIONS = foreign
638 -
639 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
640 --AM_CXXFLAGS = -Wall -Werror
641 -+AM_CXXFLAGS = -Wall
642 -
643 -
644 - pkglib_LTLIBRARIES = vulndameware.la
645 ---- a/modules/sqlhandler-postgres/Makefile.am
646 -+++ b/modules/sqlhandler-postgres/Makefile.am
647 -@@ -5,7 +5,7 @@
648 - AUTOMAKE_OPTIONS = foreign
649 -
650 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
651 --AM_CXXFLAGS = -Wall -Werror
652 -+AM_CXXFLAGS = -Wall
653 - AM_LDFLAGS = ${LIB_POSTGRES}
654 -
655 - pkglib_LTLIBRARIES = sqlhandlerpostgres.la
656 ---- a/modules/vuln-iis/Makefile.am
657 -+++ b/modules/vuln-iis/Makefile.am
658 -@@ -5,7 +5,7 @@
659 - AUTOMAKE_OPTIONS = foreign
660 -
661 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
662 --AM_CXXFLAGS = -Wall -Werror
663 -+AM_CXXFLAGS = -Wall
664 -
665 -
666 - pkglib_LTLIBRARIES = vulniis.la
667 ---- a/modules/download-tftp/Makefile.am
668 -+++ b/modules/download-tftp/Makefile.am
669 -@@ -5,7 +5,7 @@
670 - AUTOMAKE_OPTIONS = foreign
671 -
672 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
673 --AM_CXXFLAGS = -Wall -Werror
674 -+AM_CXXFLAGS = -Wall
675 -
676 -
677 - pkglib_LTLIBRARIES = downloadtftp.la
678 ---- a/modules/vuln-veritas/Makefile.am
679 -+++ b/modules/vuln-veritas/Makefile.am
680 -@@ -5,7 +5,7 @@
681 - AUTOMAKE_OPTIONS = foreign
682 -
683 - AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
684 --AM_CXXFLAGS = -Wall -Werror
685 -+AM_CXXFLAGS = -Wall
686 -
687 -
688 - pkglib_LTLIBRARIES = vulnveritas.la
689
690 diff --git a/net-analyzer/nepenthes/files/nepenthes-0.2.2-cachedir.patch b/net-analyzer/nepenthes/files/nepenthes-0.2.2-cachedir.patch
691 deleted file mode 100644
692 index dfebe3b33f6..00000000000
693 --- a/net-analyzer/nepenthes/files/nepenthes-0.2.2-cachedir.patch
694 +++ /dev/null
695 @@ -1,11 +0,0 @@
696 ---- a/modules/shellcode-signatures/shellcode-signatures.cpp
697 -+++ b/modules/shellcode-signatures/shellcode-signatures.cpp
698 -@@ -80,7 +80,7 @@
699 - m_ModuleManager = m_Nepenthes->getModuleMgr();
700 -
701 - g_Nepenthes->getShellcodeMgr()->registerShellcodeHandler(new EngineUnicode());
702 -- return loadSignaturesFromFile(string("var/cache/nepenthes/signatures/shellcode-signatures.sc"));
703 -+ return loadSignaturesFromFile(string("/var/lib/nepenthes/cache/signatures/shellcode-signatures.sc"));
704 - }
705 -
706 - bool SignatureShellcodeHandler::Exit()
707
708 diff --git a/net-analyzer/nepenthes/files/nepenthes-0.2.2-curl_types_h.patch b/net-analyzer/nepenthes/files/nepenthes-0.2.2-curl_types_h.patch
709 deleted file mode 100644
710 index 39a6026010a..00000000000
711 --- a/net-analyzer/nepenthes/files/nepenthes-0.2.2-curl_types_h.patch
712 +++ /dev/null
713 @@ -1,70 +0,0 @@
714 ---- a/modules/submit-http/submit-http.hpp
715 -+++ b/modules/submit-http/submit-http.hpp
716 -@@ -29,7 +29,6 @@
717 - /* $Id$ */
718 -
719 - #include <curl/curl.h>
720 --#include <curl/types.h> /* new for v7 */
721 - #include <curl/easy.h> /* new for v7 */
722 -
723 - #include "Nepenthes.hpp"
724 ---- a/modules/submit-http/HTTPSession.cpp
725 -+++ b/modules/submit-http/HTTPSession.cpp
726 -@@ -28,7 +28,6 @@
727 -
728 -
729 - #include <curl/curl.h>
730 --#include <curl/types.h> /* new for v7 */
731 - #include <curl/easy.h> /* new for v7 */
732 - #include <sstream>
733 - #include <netinet/in.h>
734 ---- a/modules/submit-http/HTTPSession.hpp
735 -+++ b/modules/submit-http/HTTPSession.hpp
736 -@@ -29,7 +29,6 @@
737 - /* $Id$ */
738 -
739 - #include <curl/curl.h>
740 --#include <curl/types.h>
741 -
742 - #include "Download.hpp"
743 -
744 ---- a/modules/download-curl/download-curl.hpp
745 -+++ b/modules/download-curl/download-curl.hpp
746 -@@ -28,7 +28,6 @@
747 - /* $Id$ */
748 -
749 - #include <curl/curl.h>
750 --#include <curl/types.h> /* new for v7 */
751 - #include <curl/easy.h> /* new for v7 */
752 -
753 - #include "Module.hpp"
754 ---- a/modules/submit-mwserv/submit-mwserv.hpp
755 -+++ b/modules/submit-mwserv/submit-mwserv.hpp
756 -@@ -27,7 +27,6 @@
757 - *******************************************************************************/
758 -
759 - #include <curl/curl.h>
760 --#include <curl/types.h>
761 - #include <curl/easy.h>
762 -
763 - #include "Nepenthes.hpp"
764 ---- a/modules/submit-mwserv/TransferSession.hpp
765 -+++ b/modules/submit-mwserv/TransferSession.hpp
766 -@@ -27,7 +27,6 @@
767 - *******************************************************************************/
768 -
769 - #include <curl/curl.h>
770 --#include <curl/types.h>
771 - #include <curl/easy.h>
772 -
773 - #include <string>
774 ---- a/modules/submit-norman/submit-norman.hpp
775 -+++ b/modules/submit-norman/submit-norman.hpp
776 -@@ -29,7 +29,6 @@
777 -
778 -
779 - #include <curl/curl.h>
780 --#include <curl/types.h> /* new for v7 */
781 - #include <curl/easy.h> /* new for v7 */
782 -
783 - #include "Module.hpp"
784
785 diff --git a/net-analyzer/nepenthes/files/nepenthes-0.2.2-gcc4.patch b/net-analyzer/nepenthes/files/nepenthes-0.2.2-gcc4.patch
786 deleted file mode 100644
787 index 621907b6414..00000000000
788 --- a/net-analyzer/nepenthes/files/nepenthes-0.2.2-gcc4.patch
789 +++ /dev/null
790 @@ -1,26 +0,0 @@
791 -=== modified file 'nepenthes-core/include/Config.hpp'
792 ---- a/nepenthes-core/include/Config.hpp
793 -+++ b/nepenthes-core/include/Config.hpp
794 -@@ -32,6 +32,8 @@
795 -
796 - #include <vector>
797 - #include <map>
798 -+#include <cstring>
799 -+#include <stdlib.h>
800 -
801 - // mmap()
802 - #ifdef WIN32
803 -
804 -=== modified file 'nepenthes-core/include/Nepenthes.hpp'
805 ---- a/nepenthes-core/include/Nepenthes.hpp
806 -+++ b/nepenthes-core/include/Nepenthes.hpp
807 -@@ -40,6 +40,8 @@
808 -
809 - #include <stdint.h>
810 - #include <string>
811 -+#include <cstring>
812 -+#include <cstdlib>
813 -
814 - typedef unsigned char byte;
815 -
816 -
817
818 diff --git a/net-analyzer/nepenthes/files/nepenthes-0.2.2-libdir.patch b/net-analyzer/nepenthes/files/nepenthes-0.2.2-libdir.patch
819 deleted file mode 100644
820 index 30b88f3d7d3..00000000000
821 --- a/net-analyzer/nepenthes/files/nepenthes-0.2.2-libdir.patch
822 +++ /dev/null
823 @@ -1,16 +0,0 @@
824 ---- a/configure.ac
825 -+++ b/configure.ac
826 -@@ -27,11 +27,11 @@
827 - *-*-freebsd*)
828 - # FreeBSD forgot to install magic.h in a sane location. Bug or Feature?
829 - CPPFLAGS="$CPPFLAGS -I/usr/local/include -I/usr/src/contrib/file/"
830 -- LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib"
831 -+ LDFLAGS="$LDFLAGS -L/usr/local/lib "
832 - ;;
833 - *-*-linux*)
834 - CPPFLAGS="$CPPFLAGS -D _GNU_SOURCE -I/usr/local/include"
835 -- LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib"
836 -+ LDFLAGS="$LDFLAGS -L/usr/local/lib "
837 - ;;
838 - *-*-darwin*)
839 - CPPFLAGS="$CPPFLAGS -I/opt/local/include"
840
841 diff --git a/net-analyzer/nepenthes/files/nepenthes-0.2.2-sysconfdir.patch b/net-analyzer/nepenthes/files/nepenthes-0.2.2-sysconfdir.patch
842 deleted file mode 100644
843 index d86bf31c0a0..00000000000
844 --- a/net-analyzer/nepenthes/files/nepenthes-0.2.2-sysconfdir.patch
845 +++ /dev/null
846 @@ -1,77 +0,0 @@
847 ---- a/modules/module-honeytrap/module-honeytrap.conf.dist
848 -+++ b/modules/module-honeytrap/module-honeytrap.conf.dist
849 -@@ -20,7 +20,7 @@
850 - pcap_dump_options
851 - {
852 - min_packets "3"; // minimum of packets, else the dump gets removed
853 -- path "var/log/pcap/"; // path for pcap files relative to basedir
854 -+ path "/var/log/nepenthes/pcap/"; // path for pcap files relative to basedir
855 - };
856 -
857 - };
858 ---- a/modules/log-download/log-download.conf.dist
859 -+++ b/modules/log-download/log-download.conf.dist
860 -@@ -1,5 +1,5 @@
861 - log-download
862 - {
863 -- downloadfile "var/log/logged_downloads"; // log download attempts
864 -- submitfile "var/log/logged_submissions"; // log successfull downloads
865 -+ downloadfile "/var/log/nepenthes/logged_downloads"; // log download attempts
866 -+ submitfile "/var/log/nepenthes/logged_submissions"; // log successfull downloads
867 - };
868 ---- a/modules/submit-file/submit-file.conf.dist
869 -+++ b/modules/submit-file/submit-file.conf.dist
870 -@@ -1,5 +1,5 @@
871 - submit-file
872 - {
873 -- path "var/binaries/";
874 -+ path "/var/lib/nepenthes/binaries/";
875 - };
876 -
877 ---- a/conf/nepenthes.conf.dist
878 -+++ b/conf/nepenthes.conf.dist
879 -@@ -3,8 +3,8 @@
880 -
881 - nepenthes
882 - {
883 -- moduledir "lib/nepenthes"; // relative to workdir
884 -- moduleconfigdir "etc/nepenthes"; // relative to workdir
885 -+ moduledir "/usr/lib/nepenthes"; // relative to workdir
886 -+ moduleconfigdir "/etc/nepenthes"; // relative to workdir
887 -
888 - modules(
889 - // module name (in moduledir) config file (in moduleconfigdir)
890 -@@ -90,8 +90,8 @@
891 -
892 - logmanager
893 - {
894 -- ring_logging_file "var/log/nepenthes.%d.log";
895 -- file_logging_file "var/log/nepenthes.log";
896 -+ ring_logging_file "/var/log/nepenthes/nepenthes.%d.log";
897 -+ file_logging_file "/var/log/nepenthes/nepenthes.log";
898 - };
899 -
900 - modulemanager
901 -@@ -103,7 +103,7 @@
902 - {
903 - strictfiletype "1";
904 - // where does submit-file write to? set this to the same dir
905 -- filesdir "var/binaries/";
906 -+ filesdir "/var/lib/nepenthes/binaries/";
907 - };
908 -
909 - downloadmanager
910 -@@ -122,11 +122,11 @@
911 -
912 - utilities
913 - {
914 -- hexdump_path "var/hexdumps/";
915 -+ hexdump_path "/var/lib/nepenthes/hexdumps/";
916 - };
917 -
918 - geolocationmanager
919 - {
920 -- cache_path "var/cache/nepenthes/geolocation/";
921 -+ cache_path "/var/lib/nepenthes/cache/geolocation/";
922 - };
923 - };
924
925 diff --git a/net-analyzer/nepenthes/files/nepenthes.confd b/net-analyzer/nepenthes/files/nepenthes.confd
926 deleted file mode 100644
927 index d5ccb515940..00000000000
928 --- a/net-analyzer/nepenthes/files/nepenthes.confd
929 +++ /dev/null
930 @@ -1,5 +0,0 @@
931 -# Config file for /etc/init.d/nepenthes
932 -
933 -# Set preferred options here
934 -NEPENTHES_OPTS="--user nepenthes --group nepenthes"
935 -
936
937 diff --git a/net-analyzer/nepenthes/files/nepenthes.initd b/net-analyzer/nepenthes/files/nepenthes.initd
938 deleted file mode 100644
939 index 4cc2f7d1ff3..00000000000
940 --- a/net-analyzer/nepenthes/files/nepenthes.initd
941 +++ /dev/null
942 @@ -1,20 +0,0 @@
943 -#!/sbin/openrc-run
944 -# Copyright 1999-2005 Gentoo Foundation
945 -# Distributed under the terms of the GNU General Public License v2
946 -
947 -depend() {
948 - need net
949 -}
950 -
951 -start() {
952 - ebegin "Starting nepenthes"
953 - start-stop-daemon --start --quiet --background --exec /usr/sbin/nepenthes -- ${NEPENTHES_OPTS}
954 - eend $?
955 -}
956 -
957 -stop() {
958 - ebegin "Stopping nepenthes"
959 - start-stop-daemon --stop --quiet --retry 5 --exec /usr/sbin/nepenthes
960 - eend $?
961 -}
962 -
963
964 diff --git a/net-analyzer/nepenthes/metadata.xml b/net-analyzer/nepenthes/metadata.xml
965 deleted file mode 100644
966 index c9e6deb2a32..00000000000
967 --- a/net-analyzer/nepenthes/metadata.xml
968 +++ /dev/null
969 @@ -1,15 +0,0 @@
970 -<?xml version="1.0" encoding="UTF-8"?>
971 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
972 -<pkgmetadata>
973 - <maintainer type="project">
974 - <email>netmon@g.o</email>
975 - <name>Gentoo network monitoring and analysis project</name>
976 - </maintainer>
977 - <longdescription lang="en">
978 - Nepenthes is a low interaction honeypot that captures worms by emulating
979 - known vulnerabilities.
980 - </longdescription>
981 - <upstream>
982 - <remote-id type="sourceforge">nepenthes</remote-id>
983 - </upstream>
984 -</pkgmetadata>
985
986 diff --git a/net-analyzer/nepenthes/nepenthes-0.2.2-r1.ebuild b/net-analyzer/nepenthes/nepenthes-0.2.2-r1.ebuild
987 deleted file mode 100644
988 index a253f1013de..00000000000
989 --- a/net-analyzer/nepenthes/nepenthes-0.2.2-r1.ebuild
990 +++ /dev/null
991 @@ -1,74 +0,0 @@
992 -# Copyright 1999-2014 Gentoo Foundation
993 -# Distributed under the terms of the GNU General Public License v2
994 -
995 -EAPI=5
996 -inherit autotools eutils user
997 -
998 -DESCRIPTION="Nepenthes is a low interaction honeypot that captures worms by emulating known vulnerabilities"
999 -HOMEPAGE="http://nepenthes.sourceforge.net"
1000 -SRC_URI="
1001 - mirror://sourceforge/${PN}/${P}.tar.bz2
1002 - https://dev.gentoo.org/~jer/${P}-gcc44.patch.bz2
1003 -"
1004 -# The gcc44 patch includes CVS headers so we do not put it in the tree
1005 -
1006 -LICENSE="GPL-2"
1007 -SLOT="0"
1008 -KEYWORDS="~amd64 ~ppc ~x86"
1009 -
1010 -RDEPEND="
1011 - >=net-misc/curl-7.22.0
1012 - dev-libs/libpcre
1013 - net-libs/adns
1014 - sys-apps/file
1015 -"
1016 -DEPEND="${RDEPEND}"
1017 -
1018 -pkg_setup() {
1019 - enewgroup nepenthes
1020 - enewuser nepenthes -1 -1 /dev/null nepenthes
1021 -}
1022 -
1023 -src_prepare() {
1024 - epatch \
1025 - "${FILESDIR}"/${P}-Werror.patch \
1026 - "${FILESDIR}"/${P}-cachedir.patch \
1027 - "${FILESDIR}"/${P}-curl_types_h.patch \
1028 - "${FILESDIR}"/${P}-gcc4.patch \
1029 - "${FILESDIR}"/${P}-libdir.patch \
1030 - "${FILESDIR}"/${P}-sysconfdir.patch \
1031 - "${WORKDIR}"/${P}-gcc44.patch
1032 -
1033 - eautoreconf
1034 -}
1035 -
1036 -src_configure() {
1037 - econf \
1038 - --disable-static \
1039 - --enable-capabilities \
1040 - --localstatedir=/var/lib/nepenthes \
1041 - --sysconfdir=/etc
1042 -}
1043 -
1044 -src_install() {
1045 - default
1046 -
1047 - dodoc doc/README.VFS AUTHORS
1048 - dosbin nepenthes-core/src/nepenthes
1049 - rm "${D}"/usr/bin/nepenthes
1050 - rm "${D}"/usr/share/doc/README.VFS
1051 - rm "${D}"/usr/share/doc/logo-shaded.svg
1052 -
1053 - newinitd "${FILESDIR}/${PN}.initd" "${PN}"
1054 - newconfd "${FILESDIR}/${PN}.confd" "${PN}"
1055 -
1056 - diropts -m 755 -o nepenthes -g nepenthes
1057 - keepdir /var/log/nepenthes
1058 - keepdir /var/lib/nepenthes
1059 - keepdir /var/lib/nepenthes/binaries
1060 - keepdir /var/lib/nepenthes/hexdumps
1061 - keepdir /var/lib/nepenthes/cache
1062 - keepdir /var/lib/nepenthes/cache/geolocation
1063 -
1064 - prune_libtool_files
1065 -}
1066
1067 diff --git a/net-analyzer/nepenthes/nepenthes-0.2.2.ebuild b/net-analyzer/nepenthes/nepenthes-0.2.2.ebuild
1068 deleted file mode 100644
1069 index f9944901bcb..00000000000
1070 --- a/net-analyzer/nepenthes/nepenthes-0.2.2.ebuild
1071 +++ /dev/null
1072 @@ -1,81 +0,0 @@
1073 -# Copyright 1999-2012 Gentoo Foundation
1074 -# Distributed under the terms of the GNU General Public License v2
1075 -
1076 -EAPI="2"
1077 -inherit autotools eutils user
1078 -
1079 -DESCRIPTION="Nepenthes is a low interaction honeypot that captures worms by emulating known vulnerabilities"
1080 -HOMEPAGE="http://nepenthes.sourceforge.net"
1081 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
1082 - mirror://gentoo/${P}-gcc44.patch.bz2"
1083 -
1084 -LICENSE="GPL-2"
1085 -SLOT="0"
1086 -KEYWORDS="~amd64 ~ppc ~x86"
1087 -IUSE=""
1088 -# selinux
1089 -
1090 -DEPEND="net-misc/curl
1091 - sys-apps/file
1092 - dev-libs/libpcre
1093 - net-libs/adns"
1094 -
1095 -RDEPEND=""
1096 -#RDEPEND=" selinux? ( sec-policy/selinux-nepenthes )"
1097 -
1098 -pkg_setup() {
1099 - enewgroup nepenthes
1100 - enewuser nepenthes -1 -1 /dev/null nepenthes
1101 -}
1102 -
1103 -src_prepare() {
1104 - epatch "${FILESDIR}"/${P}-gcc4.patch
1105 - epatch "${WORKDIR}"/${P}-gcc44.patch
1106 - sed -i modules/shellcode-signatures/shellcode-signatures.cpp \
1107 - -e 's|var/cache|/var/lib/cache|' || die
1108 - sed -i configure.ac \
1109 - -e 's|-R/usr/local/lib||g' || die
1110 - find . -name Makefile.am -exec sed 's: -Werror::' -i '{}' \;
1111 -
1112 - # fix for bug #426482
1113 - has_version ">=net-misc/curl-7.22.0" && find . -type f -exec sed '/#include <curl\/types.h>/d' -i '{}' \;
1114 -
1115 - eautoreconf
1116 -}
1117 -
1118 -src_configure() {
1119 - econf --sysconfdir=/etc \
1120 - --localstatedir=/var/lib/nepenthes \
1121 - --enable-capabilities
1122 -}
1123 -
1124 -src_install() {
1125 - einstall || die "make install failed"
1126 -
1127 - for i in "${D}"/etc/nepenthes/*; do
1128 - sed -i \
1129 - -e 's|"var/binaries|"/var/lib/nepenthes/binaries|' \
1130 - -e 's|"var/hexdumps|"/var/lib/nepenthes/hexdumps|' \
1131 - -e 's|"var/cache/nepenthes|"/var/lib/nepenthes/cache|' \
1132 - -e 's|"var/log|"/var/log/nepenthes|' \
1133 - -e 's|"lib/nepenthes|"/usr/lib/nepenthes|' \
1134 - -e 's|"etc|"/etc|' $i
1135 - done
1136 -
1137 - dodoc doc/README.VFS AUTHORS
1138 - dosbin nepenthes-core/src/nepenthes || die "dosbin failed"
1139 - rm "${D}"/usr/bin/nepenthes
1140 - rm "${D}"/usr/share/doc/README.VFS
1141 - rm "${D}"/usr/share/doc/logo-shaded.svg
1142 -
1143 - newinitd "${FILESDIR}/${PN}.initd" "${PN}"
1144 - newconfd "${FILESDIR}/${PN}.confd" "${PN}"
1145 -
1146 - diropts -m 755 -o nepenthes -g nepenthes
1147 - keepdir /var/log/nepenthes
1148 - keepdir /var/lib/nepenthes
1149 - keepdir /var/lib/nepenthes/binaries
1150 - keepdir /var/lib/nepenthes/hexdumps
1151 - keepdir /var/lib/nepenthes/cache
1152 - keepdir /var/lib/nepenthes/cache/geolocation
1153 -}
1154
1155 diff --git a/profiles/package.mask b/profiles/package.mask
1156 index 3e6e59e21d4..20634e0c125 100644
1157 --- a/profiles/package.mask
1158 +++ b/profiles/package.mask
1159 @@ -298,11 +298,6 @@ sci-mathematics/cado-nfs
1160 dev-libs/mozldap
1161
1162 # Pacho Ramos <pacho@g.o> (14 Jul 2017)
1163 -# Not compatible with gcc6 (#594390), also removed from other distributions
1164 -# due it being unmaintained and buggy. Removal in a month.
1165 -net-analyzer/nepenthes
1166 -
1167 -# Pacho Ramos <pacho@g.o> (14 Jul 2017)
1168 # Multiple unresolved bugs (#600680), need major version bumps and a
1169 # maintainer, removal in 2 months.
1170 dev-libs/libRocket