jer 14/10/25 11:50:22
Modified: nepenthes-0.2.2-gcc4.patch
Added: nepenthes-0.2.2-libdir.patch
nepenthes-0.2.2-gcc44.patch
nepenthes-0.2.2-cachedir.patch
nepenthes-0.2.2-Werror.patch
nepenthes-0.2.2-sysconfdir.patch
nepenthes-0.2.2-curl_types_h.patch
Log:
EAPI bump. einstall -> default (bug #521574). Replace sed scripts with
patches. Do not install static plugins. Bring sub-20k patch into the tree.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
A792A613)
Revision Changes Path
1.2 net-analyzer/nepenthes/files/nepenthes-0.2.2-gcc4.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nepenthes/files/nepenthes-0.2.2-gcc4.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nepenthes/files/nepenthes-0.2.2-gcc4.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nepenthes/files/nepenthes-0.2.2-gcc4.patch?r1=1.1&r2=1.2
Index: nepenthes-0.2.2-gcc4.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-analyzer/nepenthes/files/nepenthes-0.2.2-gcc4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nepenthes-0.2.2-gcc4.patch 3 Feb 2009 10:03:53 -0000 1.1
+++ nepenthes-0.2.2-gcc4.patch 25 Oct 2014 11:50:22 -0000 1.2
@@ -1,6 +1,6 @@
=== modified file 'nepenthes-core/include/Config.hpp'
---- nepenthes-core/include/Config.hpp 2009-02-03 09:39:19 +0000
-+++ nepenthes-core/include/Config.hpp 2009-02-03 09:40:10 +0000
+--- a/nepenthes-core/include/Config.hpp
++++ b/nepenthes-core/include/Config.hpp
@@ -32,6 +32,8 @@
#include <vector>
@@ -12,8 +12,8 @@
#ifdef WIN32
=== modified file 'nepenthes-core/include/Nepenthes.hpp'
---- nepenthes-core/include/Nepenthes.hpp 2009-02-03 09:39:19 +0000
-+++ nepenthes-core/include/Nepenthes.hpp 2009-02-03 09:40:12 +0000
+--- a/nepenthes-core/include/Nepenthes.hpp
++++ b/nepenthes-core/include/Nepenthes.hpp
@@ -40,6 +40,8 @@
#include <stdint.h>
1.1 net-analyzer/nepenthes/files/nepenthes-0.2.2-libdir.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nepenthes/files/nepenthes-0.2.2-libdir.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nepenthes/files/nepenthes-0.2.2-libdir.patch?rev=1.1&content-type=text/plain
Index: nepenthes-0.2.2-libdir.patch
===================================================================
--- a/configure.ac
+++ b/configure.ac
@@ -27,11 +27,11 @@
*-*-freebsd*)
# FreeBSD forgot to install magic.h in a sane location. Bug or Feature?
CPPFLAGS="$CPPFLAGS -I/usr/local/include -I/usr/src/contrib/file/"
- LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib"
+ LDFLAGS="$LDFLAGS -L/usr/local/lib "
;;
*-*-linux*)
CPPFLAGS="$CPPFLAGS -D _GNU_SOURCE -I/usr/local/include"
- LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib"
+ LDFLAGS="$LDFLAGS -L/usr/local/lib "
;;
*-*-darwin*)
CPPFLAGS="$CPPFLAGS -I/opt/local/include"
1.3 net-analyzer/nepenthes/files/nepenthes-0.2.2-gcc44.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nepenthes/files/nepenthes-0.2.2-gcc44.patch?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nepenthes/files/nepenthes-0.2.2-gcc44.patch?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nepenthes/files/nepenthes-0.2.2-gcc44.patch?r1=1.2&r2=1.3
1.1 net-analyzer/nepenthes/files/nepenthes-0.2.2-cachedir.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nepenthes/files/nepenthes-0.2.2-cachedir.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nepenthes/files/nepenthes-0.2.2-cachedir.patch?rev=1.1&content-type=text/plain
Index: nepenthes-0.2.2-cachedir.patch
===================================================================
--- a/modules/shellcode-signatures/shellcode-signatures.cpp
+++ b/modules/shellcode-signatures/shellcode-signatures.cpp
@@ -80,7 +80,7 @@
m_ModuleManager = m_Nepenthes->getModuleMgr();
g_Nepenthes->getShellcodeMgr()->registerShellcodeHandler(new
EngineUnicode());
- return
loadSignaturesFromFile(string("var/cache/nepenthes/signatures/shellcode-signatures.sc"));
+ return
loadSignaturesFromFile(string("/var/lib/nepenthes/cache/signatures/shellcode-signatures.sc"));
}
bool SignatureShellcodeHandler::Exit()
1.1 net-analyzer/nepenthes/files/nepenthes-0.2.2-Werror.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nepenthes/files/nepenthes-0.2.2-Werror.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nepenthes/files/nepenthes-0.2.2-Werror.patch?rev=1.1&content-type=text/plain
Index: nepenthes-0.2.2-Werror.patch
===================================================================
--- a/nepenthes-core/src/Makefile.am
+++ b/nepenthes-core/src/Makefile.am
@@ -4,7 +4,7 @@
AUTOMAKE_OPTIONS = foreign
-AM_CPPFLAGS = -I../include -I ../.. -Wall -Werror
+AM_CPPFLAGS = -I../include -I ../.. -Wall
AM_LDFLAGS = ${LIB_MAGIC} ${LIB_CAP} ${LIB_DL}
bin_PROGRAMS = nepenthes
--- a/modules/x-3/Makefile.am
+++ b/modules/x-3/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = x3.la
--- a/modules/vuln-ftpd/Makefile.am
+++ b/modules/vuln-ftpd/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = vulnftpd.la
--- a/modules/download-link/Makefile.am
+++ b/modules/download-link/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = downloadlink.la
--- a/modules/vuln-netbiosname/Makefile.am
+++ b/modules/vuln-netbiosname/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = vulnnetbiosname.la
--- a/modules/submit-http/Makefile.am
+++ b/modules/submit-http/Makefile.am
@@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
AM_LDFLAGS = $(LIB_CURL)
--- a/modules/download-creceive/Makefile.am
+++ b/modules/download-creceive/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = downloadcreceive.la
--- a/modules/module-bridge/Makefile.am
+++ b/modules/module-bridge/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = modulebridge.la
--- a/modules/vuln-sub7/Makefile.am
+++ b/modules/vuln-sub7/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = vulnsub7.la
--- a/modules/x-9/Makefile.am
+++ b/modules/x-9/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = x9.la
--- a/modules/module-honeytrap/Makefile.am
+++ b/modules/module-honeytrap/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE -I/usr/include/libipq
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
AM_LDFLAGS = ${LIB_PCAP} ${LIB_IPQ}
pkglib_LTLIBRARIES = modulehoneytrap.la
--- a/modules/x-6/Makefile.am
+++ b/modules/x-6/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = x6.la
--- a/modules/log-hexdump/Makefile.am
+++ b/modules/log-hexdump/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = loghexdump.la
--- a/modules/submit-gotek/Makefile.am
+++ b/modules/submit-gotek/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = submitgotek.la
--- a/modules/dnsresolve-adns/Makefile.am
+++ b/modules/dnsresolve-adns/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
AM_LDFLAGS = ${LIB_ADNS}
pkglib_LTLIBRARIES = dnsresolveadns.la
--- a/modules/download-ftp/Makefile.am
+++ b/modules/download-ftp/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = downloadftp.la
--- a/modules/vuln-realvnc/Makefile.am
+++ b/modules/vuln-realvnc/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = vulnrealvnc.la
--- a/modules/module-peiros/Makefile.am
+++ b/modules/module-peiros/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = modulepeiros.la
--- a/modules/submit-postgres/Makefile.am
+++ b/modules/submit-postgres/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = submitpostgres.la
--- a/modules/download-curl/Makefile.am
+++ b/modules/download-curl/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
AM_LDFLAGS = ${LIB_CURL}
pkglib_LTLIBRARIES = downloadcurl.la
--- a/modules/download-http/Makefile.am
+++ b/modules/download-http/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = downloadhttp.la
--- a/modules/log-surfnet/Makefile.am
+++ b/modules/log-surfnet/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -I/usr/include/postgresql -pipe -D
_GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = logsurfnet.la
--- a/modules/log-download/Makefile.am
+++ b/modules/log-download/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = logdownload.la
--- a/modules/download-csend/Makefile.am
+++ b/modules/download-csend/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = downloadcsend.la
--- a/modules/submit-mwserv/Makefile.am
+++ b/modules/submit-mwserv/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
AM_LDFLAGS = $(LIB_CURL)
--- a/modules/vuln-wins/Makefile.am
+++ b/modules/vuln-wins/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = vulnwins.la
--- a/modules/x-2/Makefile.am
+++ b/modules/x-2/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = x2.la
--- a/modules/vuln-pnp/Makefile.am
+++ b/modules/vuln-pnp/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = vulnpnp.la
--- a/modules/vuln-upnp/Makefile.am
+++ b/modules/vuln-upnp/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = vulnupnp.la
--- a/modules/vuln-msmq/Makefile.am
+++ b/modules/vuln-msmq/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = vulnmsmq.la
--- a/modules/vuln-dcom/Makefile.am
+++ b/modules/vuln-dcom/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = vulndcom.la
--- a/modules/vuln-mydoom/Makefile.am
+++ b/modules/vuln-mydoom/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = vulnmydoom.la
--- a/modules/submit-norman/Makefile.am
+++ b/modules/submit-norman/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
AM_LDFLAGS = ${LIB_CURL}
pkglib_LTLIBRARIES = submitnorman.la
--- a/modules/vuln-asn1/Makefile.am
+++ b/modules/vuln-asn1/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = vulnasn1.la
--- a/modules/vuln-lsass/Makefile.am
+++ b/modules/vuln-lsass/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = vulnlsass.la
--- a/modules/log-irc/Makefile.am
+++ b/modules/log-irc/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = logirc.la
--- a/modules/vuln-netdde/Makefile.am
+++ b/modules/vuln-netdde/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = vulnnetdde.la
--- a/modules/vuln-optix/Makefile.am
+++ b/modules/vuln-optix/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
AM_LDFLAGS = ${LIB_PCRE}
pkglib_LTLIBRARIES = vulnoptix.la
--- a/modules/vuln-sav/Makefile.am
+++ b/modules/vuln-sav/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = vulnsav.la
--- a/modules/vuln-sasserftpd/Makefile.am
+++ b/modules/vuln-sasserftpd/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = vulnsasserftpd.la
--- a/modules/submit-file/Makefile.am
+++ b/modules/submit-file/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = submitfile.la
--- a/modules/vuln-bagle/Makefile.am
+++ b/modules/vuln-bagle/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = vulnbagle.la
--- a/modules/vuln-ssh/Makefile.am
+++ b/modules/vuln-ssh/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
AM_LDFLAGS = ${LIB_SSH}
pkglib_LTLIBRARIES = vulnssh.la
--- a/modules/vuln-kuang2/Makefile.am
+++ b/modules/vuln-kuang2/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = vulnkuang2.la
--- a/modules/vuln-msdtc/Makefile.am
+++ b/modules/vuln-msdtc/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = vulnmsdtc.la
--- a/modules/x-5/Makefile.am
+++ b/modules/x-5/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = x5.la
--- a/modules/shellemu-winnt/Makefile.am
+++ b/modules/shellemu-winnt/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = shellemuwinnt.la
--- a/modules/x-1/Makefile.am
+++ b/modules/x-1/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = x1.la
--- a/modules/x-4/Makefile.am
+++ b/modules/x-4/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = x4.la
--- a/modules/vuln-mssql/Makefile.am
+++ b/modules/vuln-mssql/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = vulnmssql.la
--- a/modules/shellcode-signatures/Makefile.am
+++ b/modules/shellcode-signatures/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
AM_CFLAGS = -Wall
AM_LDFLAGS = ${LIB_PCRE} @LEXLIB@ ${LIB_LIBY}
--- a/modules/download-rcp/Makefile.am
+++ b/modules/download-rcp/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = downloadrcp.la
--- a/modules/shellcode-generic/Makefile.am
+++ b/modules/shellcode-generic/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
AM_LDFLAGS = ${LIB_PCRE}
pkglib_LTLIBRARIES = shellcodegeneric.la
--- a/modules/module-portwatch/Makefile.am
+++ b/modules/module-portwatch/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = moduleportwatch.la
--- a/modules/vuln-dameware/Makefile.am
+++ b/modules/vuln-dameware/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = vulndameware.la
--- a/modules/sqlhandler-postgres/Makefile.am
+++ b/modules/sqlhandler-postgres/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
AM_LDFLAGS = ${LIB_POSTGRES}
pkglib_LTLIBRARIES = sqlhandlerpostgres.la
--- a/modules/vuln-iis/Makefile.am
+++ b/modules/vuln-iis/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = vulniis.la
--- a/modules/download-tftp/Makefile.am
+++ b/modules/download-tftp/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = downloadtftp.la
--- a/modules/vuln-veritas/Makefile.am
+++ b/modules/vuln-veritas/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include
-I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
pkglib_LTLIBRARIES = vulnveritas.la
1.1
net-analyzer/nepenthes/files/nepenthes-0.2.2-sysconfdir.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nepenthes/files/nepenthes-0.2.2-sysconfdir.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nepenthes/files/nepenthes-0.2.2-sysconfdir.patch?rev=1.1&content-type=text/plain
Index: nepenthes-0.2.2-sysconfdir.patch
===================================================================
--- a/modules/module-honeytrap/module-honeytrap.conf.dist
+++ b/modules/module-honeytrap/module-honeytrap.conf.dist
@@ -20,7 +20,7 @@
pcap_dump_options
{
min_packets "3"; // minimum of packets,
else the dump gets removed
- path "var/log/pcap/"; // path for pcap files
relative to basedir
+ path "/var/log/nepenthes/pcap/"; // path for
pcap files relative to basedir
};
};
--- a/modules/log-download/log-download.conf.dist
+++ b/modules/log-download/log-download.conf.dist
@@ -1,5 +1,5 @@
log-download
{
- downloadfile "var/log/logged_downloads"; // log download attempts
- submitfile "var/log/logged_submissions"; // log successfull downloads
+ downloadfile "/var/log/nepenthes/logged_downloads"; // log download
attempts
+ submitfile "/var/log/nepenthes/logged_submissions"; // log successfull
downloads
};
--- a/modules/submit-file/submit-file.conf.dist
+++ b/modules/submit-file/submit-file.conf.dist
@@ -1,5 +1,5 @@
submit-file
{
- path "var/binaries/";
+ path "/var/lib/nepenthes/binaries/";
};
--- a/conf/nepenthes.conf.dist
+++ b/conf/nepenthes.conf.dist
@@ -3,8 +3,8 @@
nepenthes
{
- moduledir "lib/nepenthes"; // relative to workdir
- moduleconfigdir "etc/nepenthes"; // relative to
workdir
+ moduledir "/usr/lib/nepenthes"; // relative to workdir
+ moduleconfigdir "/etc/nepenthes"; // relative to
workdir
modules(
// module name (in moduledir) config file (in moduleconfigdir)
@@ -90,8 +90,8 @@
logmanager
{
- ring_logging_file "var/log/nepenthes.%d.log";
- file_logging_file "var/log/nepenthes.log";
+ ring_logging_file "/var/log/nepenthes/nepenthes.%d.log";
+ file_logging_file "/var/log/nepenthes/nepenthes.log";
};
modulemanager
@@ -103,7 +103,7 @@
{
strictfiletype "1";
// where does submit-file write to? set this to the same dir
- filesdir "var/binaries/";
+ filesdir "/var/lib/nepenthes/binaries/";
};
downloadmanager
@@ -122,11 +122,11 @@
utilities
{
- hexdump_path "var/hexdumps/";
+ hexdump_path "/var/lib/nepenthes/hexdumps/";
};
geolocationmanager
{
- cache_path "var/cache/nepenthes/geolocation/";
+ cache_path "/var/lib/nepenthes/cache/geolocation/";
};
};
1.1
net-analyzer/nepenthes/files/nepenthes-0.2.2-curl_types_h.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nepenthes/files/nepenthes-0.2.2-curl_types_h.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nepenthes/files/nepenthes-0.2.2-curl_types_h.patch?rev=1.1&content-type=text/plain
Index: nepenthes-0.2.2-curl_types_h.patch
===================================================================
--- a/modules/submit-http/submit-http.hpp
+++ b/modules/submit-http/submit-http.hpp
@@ -29,7 +29,6 @@
/* $Id: nepenthes-0.2.2-curl_types_h.patch,v 1.1 2014/10/25 11:50:22 jer Exp
$ */
#include <curl/curl.h>
-#include <curl/types.h> /* new for v7 */
#include <curl/easy.h> /* new for v7 */
#include "Nepenthes.hpp"
--- a/modules/submit-http/HTTPSession.cpp
+++ b/modules/submit-http/HTTPSession.cpp
@@ -28,7 +28,6 @@
#include <curl/curl.h>
-#include <curl/types.h> /* new for v7 */
#include <curl/easy.h> /* new for v7 */
#include <sstream>
#include <netinet/in.h>
--- a/modules/submit-http/HTTPSession.hpp
+++ b/modules/submit-http/HTTPSession.hpp
@@ -29,7 +29,6 @@
/* $Id: nepenthes-0.2.2-curl_types_h.patch,v 1.1 2014/10/25 11:50:22 jer Exp
$ */
#include <curl/curl.h>
-#include <curl/types.h>
#include "Download.hpp"
--- a/modules/download-curl/download-curl.hpp
+++ b/modules/download-curl/download-curl.hpp
@@ -28,7 +28,6 @@
/* $Id: nepenthes-0.2.2-curl_types_h.patch,v 1.1 2014/10/25 11:50:22 jer Exp
$ */
#include <curl/curl.h>
-#include <curl/types.h> /* new for v7 */
#include <curl/easy.h> /* new for v7 */
#include "Module.hpp"
--- a/modules/submit-mwserv/submit-mwserv.hpp
+++ b/modules/submit-mwserv/submit-mwserv.hpp
@@ -27,7 +27,6 @@
*******************************************************************************/
#include <curl/curl.h>
-#include <curl/types.h>
#include <curl/easy.h>
#include "Nepenthes.hpp"
--- a/modules/submit-mwserv/TransferSession.hpp
+++ b/modules/submit-mwserv/TransferSession.hpp
@@ -27,7 +27,6 @@
*******************************************************************************/
#include <curl/curl.h>
-#include <curl/types.h>
#include <curl/easy.h>
#include <string>
--- a/modules/submit-norman/submit-norman.hpp
+++ b/modules/submit-norman/submit-norman.hpp
@@ -29,7 +29,6 @@
#include <curl/curl.h>
-#include <curl/types.h> /* new for v7 */
#include <curl/easy.h> /* new for v7 */
#include "Module.hpp"
