summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-08-07 14:02:49 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-08-07 14:02:49 +0000
commitbfaf6f87a57be2bbb858ee0df92660e5ebf3eec5 (patch)
tree678143cd7ad53bce10b285d2f583536859b66063 /net-analyzer
parentRemoved the EAPI2 check for -truetype and added explicit error logic. (diff)
downloadhistorical-bfaf6f87a57be2bbb858ee0df92660e5ebf3eec5.tar.gz
historical-bfaf6f87a57be2bbb858ee0df92660e5ebf3eec5.tar.bz2
historical-bfaf6f87a57be2bbb858ee0df92660e5ebf3eec5.zip
Move patch to mirrors because CVS commit breaks it wrt #273845.
Package-Manager: portage-2.2_rc36/cvs/Linux x86_64
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/nepenthes/ChangeLog6
-rw-r--r--net-analyzer/nepenthes/Manifest16
-rw-r--r--net-analyzer/nepenthes/files/nepenthes-0.2.2-gcc44.patch348
-rw-r--r--net-analyzer/nepenthes/nepenthes-0.2.2.ebuild13
4 files changed, 15 insertions, 368 deletions
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 <ssuominen@gentoo.org>
+ 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 <halcy0n@gentoo.org> nepenthes-0.2.2.ebuild,
+files/nepenthes-0.2.2-gcc44.patch:
diff --git a/net-analyzer/nepenthes/Manifest b/net-analyzer/nepenthes/Manifest
index 6d4dde92d914..a8a056dcd0fe 100644
--- a/net-analyzer/nepenthes/Manifest
+++ b/net-analyzer/nepenthes/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX nepenthes-0.2.2-gcc4.patch 631 RMD160 9d24c55b532b10ff2f1edf4b16f7580c22e9596b SHA1 9dc2dfb9abf3fe59bc3091baf5ab75724c00aba0 SHA256 cf0da53aea77bab574382a7335264b7424010e6667de1a3cfe0c7f974cf2c26b
-AUX nepenthes-0.2.2-gcc44.patch 13719 RMD160 4679531bb649edac56024f219e8a98b07fa5deb6 SHA1 8fc30452ba704dac9ae88e8bae0b0a0fa831dd67 SHA256 e44a14bb171a19a8e1f9bab3d55602ccaedd376ba312c7e073241ec19e27218b
AUX nepenthes.confd 123 RMD160 cf0d9d018fddd90a432bcb4be845fb48cd5fd087 SHA1 ced059f312cd571f2c4d1664c51544593f85d436 SHA256 cbad703767de5e5832789dd15c32ee79fc63b188c195f86e481edac1d9fb5ddb
AUX nepenthes.initd 538 RMD160 337ecc7d8c9dafab1d6c99af1eeb30a2ef2b0133 SHA1 d36d26438ac4d690ce39be7642acfcf3e3738a73 SHA256 8f0c79f9b261f59aa203d5cae3d73856ab1173fcc7f58c98b01fe9c2c864f744
+DIST nepenthes-0.2.2-gcc44.patch.bz2 1786 RMD160 419c31a733f6e30b957c0713f766414481740c71 SHA1 edce1b8a9874db38f9ccd46ba3f1389c2a76e8af SHA256 2e8ecf67df2f90273a8b29a3dae0e7f9afef7ddd279a5e7981362dc1d4c12e83
DIST nepenthes-0.2.2.tar.bz2 580491 RMD160 415aed260a44a1d40bc575e12092af392ff02d74 SHA1 e38901e53e4b1c6d6d8a4d2ac769021f470de05c SHA256 70d4ec64a3651eba18e2aa623326c27d888d588f75525fe87577a5eb28ae6a12
-EBUILD nepenthes-0.2.2.ebuild 2077 RMD160 6ee5b0a0a899f7bb06f0a2dc82ee17bfc746f526 SHA1 e6661ef39a3b2df0e48dc76475a6b2306e003e8c SHA256 a775f70dedd283b0e8586c93624b0131363f6acf8d586904929da2d5b20a88c7
-MISC ChangeLog 3472 RMD160 964d3fcb2bcf5845339fcdcbece20285eecd0046 SHA1 7327033e90b798d32ed21a715e2135cc39176a35 SHA256 8f2f5fe6b4aa9dd096669cd92a9bb804f8feee2464846460495028bb7f15842f
+EBUILD nepenthes-0.2.2.ebuild 2183 RMD160 0565b675fe8a61fa25bc002a0ccbe2bad5b221fa SHA1 6a761982861734e1c42ffd9a454c7611d6f56b82 SHA256 22a2917479c70971084666063201f0332853cc6db26aa53dee65de50bb2d1584
+MISC ChangeLog 3657 RMD160 01feb767015bd5f10a495d73d4321438d96aff2a SHA1 f391d309ec51510d64f68c667959ad4852db8caf SHA256 8904a01aa76d9d42637a50fbac13e130c6acc35c055f317be0142deb6ccd8df0
MISC metadata.xml 309 RMD160 a059ad3a00629c996521e77e7d1f58add6779569 SHA1 7b9bcc760d2b4a196dedebb90cee0570bcc4ce78 SHA256 17f07d21fe72fc1d0d3deb2f0e5e9782e8a65088e6b31b6432440a5782a5b7ad
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpqa5AACgkQCRZPokWLroQk3ACdFSDV5O4jnoTeltf6OVwLXSbU
-9t8AoOaSFiohT2dZGJxqvPHyaUbo07XE
-=fyyk
------END PGP SIGNATURE-----
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 <cstdio>
-+
- #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 <cstdio>
-
- #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 <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-+#include <cstdio>
-
- #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 <cstdio>
-
- #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 <cstdio>
-+
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-
-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 <cstdio>
-
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-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 <cstdio>
-+
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-
-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 <cstdio>
-
- #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 <cstdio>
-+
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-
-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 <cstdio>
-+
- #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 <cstdio>
-+
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-
-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 <cstdio>
-+
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-
-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 <ctype.h>
-+#include <cstdio>
-
- #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 <stdint.h>
- #include <list>
- #include <string>
- #include <vector>
-
- #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 <cstdio>
-+
- #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 <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
- #include <errno.h>
-+#include <cstdio>
-
- #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 <cstdio>
-
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-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 <cstdio>
-+
- 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 <cstdio>
-+
- 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 <cstdio>
-+
- 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 <string>
- #include <sstream>
-+#include <cstdio>
-
- #include <time.h>
-
- #include <sys/types.h>
- #include <sys/socket.h>
-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 <string.h>
- #include <sys/types.h>
- #include <inttypes.h>
- #include <ctype.h>
-
-+#include <cstdio>
-+
- #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
-
}