From d282574dcbb9fd65ab0394d91214a4dd42284d9e Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Fri, 7 Aug 2009 14:02:49 +0000 Subject: Move patch to mirrors because CVS commit breaks it wrt #273845. (Portage version: 2.2_rc36/cvs/Linux x86_64) --- net-analyzer/nepenthes/ChangeLog | 6 +- .../nepenthes/files/nepenthes-0.2.2-gcc44.patch | 348 --------------------- net-analyzer/nepenthes/nepenthes-0.2.2.ebuild | 13 +- 3 files changed, 12 insertions(+), 355 deletions(-) delete mode 100644 net-analyzer/nepenthes/files/nepenthes-0.2.2-gcc44.patch (limited to 'net-analyzer/nepenthes') diff --git a/net-analyzer/nepenthes/ChangeLog b/net-analyzer/nepenthes/ChangeLog index 22756bb3f02a..edb5a686f15e 100644 --- a/net-analyzer/nepenthes/ChangeLog +++ b/net-analyzer/nepenthes/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/nepenthes # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nepenthes/ChangeLog,v 1.19 2009/07/25 02:18:43 halcy0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nepenthes/ChangeLog,v 1.20 2009/08/07 14:02:48 ssuominen Exp $ + + 07 Aug 2009; Samuli Suominen + nepenthes-0.2.2.ebuild, -files/nepenthes-0.2.2-gcc44.patch: + Move patch to mirrors because CVS commit breaks it wrt #273845. 25 Jul 2009; Mark Loeser nepenthes-0.2.2.ebuild, +files/nepenthes-0.2.2-gcc44.patch: diff --git a/net-analyzer/nepenthes/files/nepenthes-0.2.2-gcc44.patch b/net-analyzer/nepenthes/files/nepenthes-0.2.2-gcc44.patch deleted file mode 100644 index 3a16f85a5207..000000000000 --- a/net-analyzer/nepenthes/files/nepenthes-0.2.2-gcc44.patch +++ /dev/null @@ -1,348 +0,0 @@ -diff -NrU5 nepenthes-0.2.2.orig/modules/download-creceive/CReceiveDialogue.cpp nepenthes-0.2.2/modules/download-creceive/CReceiveDialogue.cpp ---- nepenthes-0.2.2.orig/modules/download-creceive/CReceiveDialogue.cpp 2009-06-13 15:32:10.000000000 -0600 -+++ nepenthes-0.2.2/modules/download-creceive/CReceiveDialogue.cpp 2009-06-13 15:44:07.000000000 -0600 -@@ -51,10 +51,12 @@ - #include "DownloadUrl.cpp" - #include "DownloadBuffer.cpp" - - #include "SubmitManager.hpp" - -+#include -+ - #ifdef STDTAGS - #undef STDTAGS - #endif - #define STDTAGS l_dl | l_dia | l_hlr - -diff -NrU5 nepenthes-0.2.2.orig/modules/download-http/HTTPDialogue.cpp nepenthes-0.2.2/modules/download-http/HTTPDialogue.cpp ---- nepenthes-0.2.2.orig/modules/download-http/HTTPDialogue.cpp 2009-06-13 15:32:10.000000000 -0600 -+++ nepenthes-0.2.2/modules/download-http/HTTPDialogue.cpp 2009-06-13 15:44:52.000000000 -0600 -@@ -27,10 +27,11 @@ - - /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.1 2009/07/25 02:18:43 halcy0n Exp $ */ - - #include "HTTPDialogue.hpp" - -+#include - - #include "Message.hpp" - #include "Nepenthes.hpp" - #include "LogManager.hpp" - -diff -NrU5 nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_connect_trans.cpp nepenthes-0.2.2/modules/shellcode-generic/sch_generic_connect_trans.cpp ---- nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_connect_trans.cpp 2009-06-13 15:32:10.000000000 -0600 -+++ nepenthes-0.2.2/modules/shellcode-generic/sch_generic_connect_trans.cpp 2009-06-13 15:34:15.000000000 -0600 -@@ -29,10 +29,11 @@ - - #include - #include - #include - #include -+#include - - #include "LogManager.hpp" - #include "Message.hpp" - #include "sch_generic_connect_trans.hpp" - #include "Socket.hpp" -diff -NrU5 nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_createprocess.cpp nepenthes-0.2.2/modules/shellcode-generic/sch_generic_createprocess.cpp ---- nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_createprocess.cpp 2009-06-13 15:32:10.000000000 -0600 -+++ nepenthes-0.2.2/modules/shellcode-generic/sch_generic_createprocess.cpp 2009-06-13 15:36:08.000000000 -0600 -@@ -36,11 +36,11 @@ - * - */ - - /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.1 2009/07/25 02:18:43 halcy0n Exp $ */ - -- -+#include - - #include "sch_generic_createprocess.hpp" - - #include "Nepenthes.hpp" - #include "Message.hpp" -diff -NrU5 nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_link_bind_trans.cpp nepenthes-0.2.2/modules/shellcode-generic/sch_generic_link_bind_trans.cpp ---- nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_link_bind_trans.cpp 2009-06-13 15:32:10.000000000 -0600 -+++ nepenthes-0.2.2/modules/shellcode-generic/sch_generic_link_bind_trans.cpp 2009-06-13 15:37:03.000000000 -0600 -@@ -25,10 +25,12 @@ - * - *******************************************************************************/ - - /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.1 2009/07/25 02:18:43 halcy0n Exp $ */ - -+#include -+ - #include - #include - #include - #include - -diff -NrU5 nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_link_trans.cpp nepenthes-0.2.2/modules/shellcode-generic/sch_generic_link_trans.cpp ---- nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_link_trans.cpp 2009-06-13 15:32:10.000000000 -0600 -+++ nepenthes-0.2.2/modules/shellcode-generic/sch_generic_link_trans.cpp 2009-06-13 15:37:47.000000000 -0600 -@@ -25,10 +25,11 @@ - * - *******************************************************************************/ - - /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.1 2009/07/25 02:18:43 halcy0n Exp $ */ - -+#include - - #include - #include - #include - #include -diff -NrU5 nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_stuttgart.cpp nepenthes-0.2.2/modules/shellcode-generic/sch_generic_stuttgart.cpp ---- nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_stuttgart.cpp 2009-06-13 15:32:10.000000000 -0600 -+++ nepenthes-0.2.2/modules/shellcode-generic/sch_generic_stuttgart.cpp 2009-06-13 15:39:10.000000000 -0600 -@@ -24,11 +24,13 @@ - * contact nepenthesdev@users.sourceforge.net - * - *******************************************************************************/ - - /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.1 2009/07/25 02:18:43 halcy0n Exp $ */ -- -+ -+#include -+ - #include - #include - #include - #include - -diff -NrU5 nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_url.cpp nepenthes-0.2.2/modules/shellcode-generic/sch_generic_url.cpp ---- nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_url.cpp 2009-06-13 15:32:10.000000000 -0600 -+++ nepenthes-0.2.2/modules/shellcode-generic/sch_generic_url.cpp 2009-06-13 15:40:23.000000000 -0600 -@@ -36,11 +36,11 @@ - * wikipedia states bsd code can be relicensed on to gpl, but we got no information what has to be done - * - * - */ - -- -+#include - - #include "sch_generic_url.hpp" - #include "LogManager.hpp" - #include "Message.hpp" - #include "DownloadManager.hpp" -diff -NrU5 nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_wuerzburg.cpp nepenthes-0.2.2/modules/shellcode-generic/sch_generic_wuerzburg.cpp ---- nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_wuerzburg.cpp 2009-06-13 15:32:10.000000000 -0600 -+++ nepenthes-0.2.2/modules/shellcode-generic/sch_generic_wuerzburg.cpp 2009-06-13 15:41:02.000000000 -0600 -@@ -25,10 +25,12 @@ - * - *******************************************************************************/ - - /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.1 2009/07/25 02:18:43 halcy0n Exp $ */ - -+#include -+ - #include - #include - #include - #include - -diff -NrU5 nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_xor.cpp nepenthes-0.2.2/modules/shellcode-generic/sch_generic_xor.cpp ---- nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_xor.cpp 2009-06-13 15:32:10.000000000 -0600 -+++ nepenthes-0.2.2/modules/shellcode-generic/sch_generic_xor.cpp 2009-06-13 15:41:47.000000000 -0600 -@@ -40,10 +40,12 @@ - - - - #include "sch_generic_xor.hpp" - -+#include -+ - #include "Nepenthes.hpp" - #include "Message.hpp" - #include "Message.cpp" - #include "LogManager.hpp" - #include "Utilities.hpp" -diff -NrU5 nepenthes-0.2.2.orig/modules/shellcode-signatures/sch_namespace_bindfiletransfer.cpp nepenthes-0.2.2/modules/shellcode-signatures/sch_namespace_bindfiletransfer.cpp ---- nepenthes-0.2.2.orig/modules/shellcode-signatures/sch_namespace_bindfiletransfer.cpp 2009-06-13 15:32:10.000000000 -0600 -+++ nepenthes-0.2.2/modules/shellcode-signatures/sch_namespace_bindfiletransfer.cpp 2009-06-13 15:42:56.000000000 -0600 -@@ -25,10 +25,12 @@ - * - *******************************************************************************/ - - /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.1 2009/07/25 02:18:43 halcy0n Exp $ */ - -+#include -+ - #include - #include - #include - #include - -diff -NrU5 nepenthes-0.2.2.orig/modules/shellcode-signatures/sch_namespace_connectbackfiletransfer.cpp nepenthes-0.2.2/modules/shellcode-signatures/sch_namespace_connectbackfiletransfer.cpp ---- nepenthes-0.2.2.orig/modules/shellcode-signatures/sch_namespace_connectbackfiletransfer.cpp 2009-06-13 15:32:10.000000000 -0600 -+++ nepenthes-0.2.2/modules/shellcode-signatures/sch_namespace_connectbackfiletransfer.cpp 2009-06-13 15:42:24.000000000 -0600 -@@ -25,10 +25,12 @@ - * - *******************************************************************************/ - - /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.1 2009/07/25 02:18:43 halcy0n Exp $ */ - -+#include -+ - #include - #include - #include - #include - -diff -NrU5 nepenthes-0.2.2.orig/modules/shellemu-winnt/VFS.cpp nepenthes-0.2.2/modules/shellemu-winnt/VFS.cpp ---- nepenthes-0.2.2.orig/modules/shellemu-winnt/VFS.cpp 2009-06-13 15:32:10.000000000 -0600 -+++ nepenthes-0.2.2/modules/shellemu-winnt/VFS.cpp 2009-06-13 15:45:28.000000000 -0600 -@@ -20,10 +20,11 @@ - * - *******************************************************************************/ - - - #include -+#include - - #include "VFS.hpp" - #include "VFSNode.hpp" - #include "VFSDir.hpp" - #include "VFSFile.hpp" -diff -NrU5 nepenthes-0.2.2.orig/modules/shellemu-winnt/VFSCommand.hpp nepenthes-0.2.2/modules/shellemu-winnt/VFSCommand.hpp ---- nepenthes-0.2.2.orig/modules/shellemu-winnt/VFSCommand.hpp 2009-06-13 15:32:10.000000000 -0600 -+++ nepenthes-0.2.2/modules/shellemu-winnt/VFSCommand.hpp 2009-06-13 15:46:21.000000000 -0600 -@@ -28,10 +28,11 @@ - /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.1 2009/07/25 02:18:43 halcy0n Exp $ */ - - #ifndef HAVE_VFSCOMMANDECHO - #define HAVE_VFSCOMMANDECHO - -+#include - #include - #include - #include - - #include "VFSNode.hpp" -diff -NrU5 nepenthes-0.2.2.orig/modules/shellemu-winnt/VFSCommandRCP.cpp nepenthes-0.2.2/modules/shellemu-winnt/VFSCommandRCP.cpp ---- nepenthes-0.2.2.orig/modules/shellemu-winnt/VFSCommandRCP.cpp 2009-06-13 15:32:10.000000000 -0600 -+++ nepenthes-0.2.2/modules/shellemu-winnt/VFSCommandRCP.cpp 2009-06-13 15:46:53.000000000 -0600 -@@ -24,11 +24,13 @@ - * contact nepenthesdev@users.sourceforge.net - * - *******************************************************************************/ - - /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.1 2009/07/25 02:18:43 halcy0n Exp $ */ -- -+ -+#include -+ - #include "VFSCommandRCP.hpp" - #include "VFSNode.hpp" - #include "VFSDir.hpp" - #include "VFSFile.hpp" - #include "Nepenthes.hpp" -diff -NrU5 nepenthes-0.2.2.orig/modules/submit-file/submit-file.cpp nepenthes-0.2.2/modules/submit-file/submit-file.cpp ---- nepenthes-0.2.2.orig/modules/submit-file/submit-file.cpp 2009-06-13 15:32:10.000000000 -0600 -+++ nepenthes-0.2.2/modules/submit-file/submit-file.cpp 2009-06-13 15:43:26.000000000 -0600 -@@ -28,10 +28,11 @@ - /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.1 2009/07/25 02:18:43 halcy0n Exp $ */ - #include - #include - #include - #include -+#include - - #include "submit-file.hpp" - #include "Download.hpp" - #include "DownloadBuffer.hpp" - #include "Utilities.hpp" -diff -NrU5 nepenthes-0.2.2.orig/modules/submit-postgres/PGDownloadContext.cpp nepenthes-0.2.2/modules/submit-postgres/PGDownloadContext.cpp ---- nepenthes-0.2.2.orig/modules/submit-postgres/PGDownloadContext.cpp 2009-06-13 15:32:10.000000000 -0600 -+++ nepenthes-0.2.2/modules/submit-postgres/PGDownloadContext.cpp 2009-06-13 16:33:01.000000000 -0600 -@@ -25,10 +25,11 @@ - * - *******************************************************************************/ - - /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.1 2009/07/25 02:18:43 halcy0n Exp $ */ - -+#include - - #include - #include - #include - #include -diff -NrU5 nepenthes-0.2.2.orig/nepenthes-core/src/DownloadManager.cpp nepenthes-0.2.2/nepenthes-core/src/DownloadManager.cpp ---- nepenthes-0.2.2.orig/nepenthes-core/src/DownloadManager.cpp 2009-06-13 15:32:10.000000000 -0600 -+++ nepenthes-0.2.2/nepenthes-core/src/DownloadManager.cpp 2009-06-13 15:47:38.000000000 -0600 -@@ -40,10 +40,12 @@ - #include "Config.hpp" - - #include "SubmitEvent.hpp" - #include "EventManager.hpp" - -+#include -+ - using namespace std; - using namespace nepenthes; - - #ifdef STDTAGS - #undef STDTAGS -diff -NrU5 nepenthes-0.2.2.orig/nepenthes-core/src/ModuleManager.cpp nepenthes-0.2.2/nepenthes-core/src/ModuleManager.cpp ---- nepenthes-0.2.2.orig/nepenthes-core/src/ModuleManager.cpp 2009-06-13 15:32:10.000000000 -0600 -+++ nepenthes-0.2.2/nepenthes-core/src/ModuleManager.cpp 2009-06-13 15:48:19.000000000 -0600 -@@ -33,10 +33,12 @@ - #include "Module.hpp" - #include "Config.hpp" - #include "Nepenthes.hpp" - #include "LogManager.hpp" - -+#include -+ - using namespace nepenthes; - using namespace std; - - #ifdef STDTAGS - #undef STDTAGS -diff -NrU5 nepenthes-0.2.2.orig/nepenthes-core/src/ShellcodeManager.cpp nepenthes-0.2.2/nepenthes-core/src/ShellcodeManager.cpp ---- nepenthes-0.2.2.orig/nepenthes-core/src/ShellcodeManager.cpp 2009-06-13 15:32:10.000000000 -0600 -+++ nepenthes-0.2.2/nepenthes-core/src/ShellcodeManager.cpp 2009-06-13 16:00:35.000000000 -0600 -@@ -33,10 +33,12 @@ - #include "LogManager.hpp" - #include "Message.hpp" - #include "SocketEvent.hpp" - #include "EventManager.hpp" - -+#include -+ - using namespace nepenthes; - - #ifdef STDTAGS - #undef STDTAGS - #endif -diff -NrU5 nepenthes-0.2.2.orig/nepenthes-core/src/Socket.cpp nepenthes-0.2.2/nepenthes-core/src/Socket.cpp ---- nepenthes-0.2.2.orig/nepenthes-core/src/Socket.cpp 2009-06-13 15:32:10.000000000 -0600 -+++ nepenthes-0.2.2/nepenthes-core/src/Socket.cpp 2009-06-13 15:49:04.000000000 -0600 -@@ -27,10 +27,11 @@ - - /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.1 2009/07/25 02:18:43 halcy0n Exp $ */ - - #include - #include -+#include - - #include - - #include - #include -diff -NrU5 nepenthes-0.2.2.orig/nepenthes-core/src/Utilities.cpp nepenthes-0.2.2/nepenthes-core/src/Utilities.cpp ---- nepenthes-0.2.2.orig/nepenthes-core/src/Utilities.cpp 2009-06-13 15:32:10.000000000 -0600 -+++ nepenthes-0.2.2/nepenthes-core/src/Utilities.cpp 2009-06-13 16:01:09.000000000 -0600 -@@ -36,10 +36,12 @@ - #include - #include - #include - #include - -+#include -+ - #include "Utilities.hpp" - #include "LogManager.hpp" - #include "Config.hpp" - - using namespace nepenthes; diff --git a/net-analyzer/nepenthes/nepenthes-0.2.2.ebuild b/net-analyzer/nepenthes/nepenthes-0.2.2.ebuild index 3a85d3489036..550d04c04440 100644 --- a/net-analyzer/nepenthes/nepenthes-0.2.2.ebuild +++ b/net-analyzer/nepenthes/nepenthes-0.2.2.ebuild @@ -1,18 +1,21 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nepenthes/nepenthes-0.2.2.ebuild,v 1.3 2009/07/25 02:18:43 halcy0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nepenthes/nepenthes-0.2.2.ebuild,v 1.4 2009/08/07 14:02:48 ssuominen Exp $ EAPI="2" inherit eutils autotools DESCRIPTION="Nepenthes is a low interaction honeypot that captures worms by emulating known vulnerabilities" HOMEPAGE="http://nepenthes.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2 + http://dev.gentoo.org/~ssuominen/${P}-gcc44.patch.bz2 + mirror://gentoo/~ssuominen/${P}-gcc44.patch.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="selinux" +IUSE="" +# selinux DEPEND="net-misc/curl sys-apps/file @@ -29,7 +32,7 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/${P}-gcc4.patch - epatch "${FILESDIR}"/${P}-gcc44.patch + epatch "${WORKDIR}"/${P}-gcc44.patch sed 's|var/cache|/var/lib/cache|' -i modules/shellcode-signatures/shellcode-signatures.cpp find . -name Makefile.am -exec sed 's: -Werror::' -i '{}' \; eautoreconf @@ -42,7 +45,6 @@ src_configure() { } src_install() { - einstall || die "make install failed" for i in "${D}"/etc/nepenthes/*; do @@ -71,5 +73,4 @@ src_install() { keepdir /var/lib/nepenthes/hexdumps keepdir /var/lib/nepenthes/cache keepdir /var/lib/nepenthes/cache/geolocation - } -- cgit v1.2.3-65-gdbad