Use a remote patch to work around CVS header changes.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 13 insertions, 331 deletions

diff --git a/net-analyzer/nepenthes/ChangeLog b/net-analyzer/nepenthes/ChangeLog
index 5ce3ba0ac5c8..21057a1da6bd 100644
--- a/net-analyzer/nepenthes/ChangeLog
+++ b/net-analyzer/nepenthes/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nepenthes
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nepenthes/ChangeLog,v 1.25 2014/10/25 11:50:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nepenthes/ChangeLog,v 1.26 2014/10/25 12:09:09 jer Exp $
+
+  25 Oct 2014; Jeroen Roovers <jer@gentoo.org> nepenthes-0.2.2-r1.ebuild,
+  -files/nepenthes-0.2.2-gcc44.patch:
+  Use a remote patch to work around CVS header changes.
 
 *nepenthes-0.2.2-r1 (25 Oct 2014)
 
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 5607248c55d6..000000000000
--- a/net-analyzer/nepenthes/files/nepenthes-0.2.2-gcc44.patch
+++ /dev/null
@@ -1,326 +0,0 @@
---- a/modules/download-creceive/CReceiveDialogue.cpp
-+++ b/modules/download-creceive/CReceiveDialogue.cpp
-@@ -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
- 
---- a/modules/download-http/HTTPDialogue.cpp
-+++ b/modules/download-http/HTTPDialogue.cpp
-@@ -27,10 +27,11 @@
- 
-  /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.3 2014/10/25 11:50:22 jer Exp $ */
- 
- #include "HTTPDialogue.hpp"
- 
-+#include <cstdio>
- 
- #include "Message.hpp"
- #include "Nepenthes.hpp"
- #include "LogManager.hpp"
- 
---- a/modules/shellcode-generic/sch_generic_connect_trans.cpp
-+++ b/modules/shellcode-generic/sch_generic_connect_trans.cpp
-@@ -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"
---- a/modules/shellcode-generic/sch_generic_createprocess.cpp
-+++ b/modules/shellcode-generic/sch_generic_createprocess.cpp
-@@ -36,11 +36,11 @@
-  *
-  */
- 
- /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.3 2014/10/25 11:50:22 jer Exp $ */
- 
--
-+#include <cstdio>
- 
- #include "sch_generic_createprocess.hpp"
- 
- #include "Nepenthes.hpp"
- #include "Message.hpp"
---- a/modules/shellcode-generic/sch_generic_link_bind_trans.cpp
-+++ b/modules/shellcode-generic/sch_generic_link_bind_trans.cpp
-@@ -25,10 +25,12 @@
-  *
-  *******************************************************************************/
- 
-  /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.3 2014/10/25 11:50:22 jer Exp $ */
- 
-+#include <cstdio>
-+
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- 
---- a/modules/shellcode-generic/sch_generic_link_trans.cpp
-+++ b/modules/shellcode-generic/sch_generic_link_trans.cpp
-@@ -25,10 +25,11 @@
-  *
-  *******************************************************************************/
- 
-  /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.3 2014/10/25 11:50:22 jer Exp $ */
- 

-+#include <cstdio>
- 
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
---- a/modules/shellcode-generic/sch_generic_stuttgart.cpp
-+++ b/modules/shellcode-generic/sch_generic_stuttgart.cpp
-@@ -24,11 +24,13 @@
-  *             contact nepenthesdev@users.sourceforge.net  
-  *
-  *******************************************************************************/
- 
-  /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.3 2014/10/25 11:50:22 jer Exp $ */
-- 
-+
-+#include <cstdio>
-+
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- 
---- a/modules/shellcode-generic/sch_generic_url.cpp
-+++ b/modules/shellcode-generic/sch_generic_url.cpp
-@@ -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"
---- a/modules/shellcode-generic/sch_generic_wuerzburg.cpp
-+++ b/modules/shellcode-generic/sch_generic_wuerzburg.cpp
-@@ -25,10 +25,12 @@
-  *
-  *******************************************************************************/
- 
-  /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.3 2014/10/25 11:50:22 jer Exp $ */
- 

-+#include <cstdio>
-+
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- 
---- a/modules/shellcode-generic/sch_generic_xor.cpp
-+++ b/modules/shellcode-generic/sch_generic_xor.cpp
-@@ -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"
---- a/modules/shellcode-signatures/sch_namespace_bindfiletransfer.cpp
-+++ b/modules/shellcode-signatures/sch_namespace_bindfiletransfer.cpp
-@@ -25,10 +25,12 @@
-  *
-  *******************************************************************************/
- 
- /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.3 2014/10/25 11:50:22 jer Exp $ */
- 
-+#include <cstdio>
-+
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- 
---- a/modules/shellcode-signatures/sch_namespace_connectbackfiletransfer.cpp
-+++ b/modules/shellcode-signatures/sch_namespace_connectbackfiletransfer.cpp
-@@ -25,10 +25,12 @@
-  *
-  *******************************************************************************/
- 
- /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.3 2014/10/25 11:50:22 jer Exp $ */
- 
-+#include <cstdio>
-+
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- 
---- a/modules/shellemu-winnt/VFS.cpp
-+++ b/modules/shellemu-winnt/VFS.cpp
-@@ -20,10 +20,11 @@
-  *
-  *******************************************************************************/
- 
- 
- #include <ctype.h>
-+#include <cstdio>
- 
- #include "VFS.hpp"
- #include "VFSNode.hpp"
- #include "VFSDir.hpp"
- #include "VFSFile.hpp"
---- a/modules/shellemu-winnt/VFSCommand.hpp
-+++ b/modules/shellemu-winnt/VFSCommand.hpp
-@@ -28,10 +28,11 @@
-  /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.3 2014/10/25 11:50:22 jer Exp $ */
- 
- #ifndef HAVE_VFSCOMMANDECHO
- #define HAVE_VFSCOMMANDECHO
- 
-+#include <stdint.h>
- #include <list>
- #include <string>
- #include <vector>
- 
- #include "VFSNode.hpp"
---- a/modules/shellemu-winnt/VFSCommandRCP.cpp
-+++ b/modules/shellemu-winnt/VFSCommandRCP.cpp
-@@ -24,11 +24,13 @@
-  *             contact nepenthesdev@users.sourceforge.net  
-  *
-  *******************************************************************************/
- 
- /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.3 2014/10/25 11:50:22 jer Exp $ */
-- 
-+
-+#include <cstdio>
-+
- #include "VFSCommandRCP.hpp"
- #include "VFSNode.hpp"
- #include "VFSDir.hpp"
- #include "VFSFile.hpp"
- #include "Nepenthes.hpp"
---- a/modules/submit-file/submit-file.cpp
-+++ b/modules/submit-file/submit-file.cpp
-@@ -28,10 +28,11 @@
-  /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.3 2014/10/25 11:50:22 jer 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"
---- a/modules/submit-postgres/PGDownloadContext.cpp
-+++ b/modules/submit-postgres/PGDownloadContext.cpp
-@@ -25,10 +25,11 @@
-  *
-  *******************************************************************************/
- 
- /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.3 2014/10/25 11:50:22 jer Exp $ */
- 
-+#include <cstdio> 
- 
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
---- a/nepenthes-core/src/DownloadManager.cpp
-+++ b/nepenthes-core/src/DownloadManager.cpp
-@@ -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 
---- a/nepenthes-core/src/ModuleManager.cpp
-+++ b/nepenthes-core/src/ModuleManager.cpp
-@@ -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 
---- a/nepenthes-core/src/ShellcodeManager.cpp
-+++ b/nepenthes-core/src/ShellcodeManager.cpp
-@@ -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
---- a/nepenthes-core/src/Socket.cpp
-+++ b/nepenthes-core/src/Socket.cpp
-@@ -27,10 +27,11 @@
- 
- /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.3 2014/10/25 11:50:22 jer Exp $ */
- 
- #include <string>
- #include <sstream>
-+#include <cstdio>
- 
- #include <time.h>
- 
- #include <sys/types.h>
- #include <sys/socket.h>
---- a/nepenthes-core/src/Utilities.cpp
-+++ b/nepenthes-core/src/Utilities.cpp
-@@ -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-r1.ebuild b/net-analyzer/nepenthes/nepenthes-0.2.2-r1.ebuild
index 5d57dce45507..86cf922f9407 100644
--- a/net-analyzer/nepenthes/nepenthes-0.2.2-r1.ebuild
+++ b/net-analyzer/nepenthes/nepenthes-0.2.2-r1.ebuild
@@ -1,13 +1,17 @@
 # Copyright 1999-2014 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-r1.ebuild,v 1.1 2014/10/25 11:50:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nepenthes/nepenthes-0.2.2-r1.ebuild,v 1.2 2014/10/25 12:09:09 jer Exp $
 
 EAPI=5
 inherit autotools eutils user
 
 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
+	https://dev.gentoo.org/~jer/${P}-gcc44.patch.bz2
+"
+# The gcc44 patch includes CVS headers so we do not put it in the tree
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -32,9 +36,9 @@ src_prepare() {
 		"${FILESDIR}"/${P}-cachedir.patch \
 		"${FILESDIR}"/${P}-curl_types_h.patch \
 		"${FILESDIR}"/${P}-gcc4.patch \
-		"${FILESDIR}"/${P}-gcc44.patch \
 		"${FILESDIR}"/${P}-libdir.patch \
-		"${FILESDIR}"/${P}-sysconfdir.patch
+		"${FILESDIR}"/${P}-sysconfdir.patch \
+		"${WORKDIR}"/${P}-gcc44.patch
 
 	eautoreconf
 }