Fixed build issue with newer compiler, bug #251437, thank Diego E. 'Flameeyes' Pettenò for report and Michael Mair-Keimberger for making us reopen and finally fix bug.

Package-Manager: portage-2.2_rc23/cvs/Linux i686

4 files changed, 53 insertions, 14 deletions

diff --git a/net-analyzer/nepenthes/ChangeLog b/net-analyzer/nepenthes/ChangeLog
index f9998c7028d7..61b807cf2684 100644
--- a/net-analyzer/nepenthes/ChangeLog
+++ b/net-analyzer/nepenthes/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nepenthes
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nepenthes/ChangeLog,v 1.17 2008/08/27 20:54:36 darkside Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nepenthes/ChangeLog,v 1.18 2009/02/03 10:03:53 pva Exp $
+
+  03 Feb 2009; Peter Volkov <pva@gentoo.org>
+  +files/nepenthes-0.2.2-gcc4.patch, nepenthes-0.2.2.ebuild:
+  Fixed build issue with newer compiler, bug #251437, thank Diego E.
+  'Flameeyes' Pettenò for report and Michael Mair-Keimberger for making us
+  reopen and finally fix bug.
 
   27 Aug 2008; Jeremy Olexa <darkside@gentoo.org> -nepenthes-0.2.0.ebuild:
   remove old, bug #199168
diff --git a/net-analyzer/nepenthes/Manifest b/net-analyzer/nepenthes/Manifest
index 3f8c0c94216e..f26a5e6e887c 100644
--- a/net-analyzer/nepenthes/Manifest
+++ b/net-analyzer/nepenthes/Manifest
@@ -1,6 +1,7 @@
+AUX nepenthes-0.2.2-gcc4.patch 631 RMD160 9d24c55b532b10ff2f1edf4b16f7580c22e9596b SHA1 9dc2dfb9abf3fe59bc3091baf5ab75724c00aba0 SHA256 cf0da53aea77bab574382a7335264b7424010e6667de1a3cfe0c7f974cf2c26b
 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.tar.bz2 580491 RMD160 415aed260a44a1d40bc575e12092af392ff02d74 SHA1 e38901e53e4b1c6d6d8a4d2ac769021f470de05c SHA256 70d4ec64a3651eba18e2aa623326c27d888d588f75525fe87577a5eb28ae6a12
-EBUILD nepenthes-0.2.2.ebuild 1989 RMD160 305878ae6023f172be6dbb80ebac2e7f7ebf7f79 SHA1 70674b173dbc4062adeb8e1a0c8b667799336843 SHA256 9691f2f9747bc52ba16e2f3feab30f23c9da752dba0db7679d172f659a17cc25
-MISC ChangeLog 2979 RMD160 d33ccae32c235b225b36ce5c8b9bff012308489c SHA1 27382475c7b79249695ba2f19865d4f8f63d0118 SHA256 13fc9df9792c61e86f169c83bc85696227b32c89099baf91851daaf70d143fa7
+EBUILD nepenthes-0.2.2.ebuild 2032 RMD160 cadf793ffb1a79e19455632974c3be4cff6aed17 SHA1 310bde9a01761e3bb139484b8852bb74942f8153 SHA256 b9f037d7f872a0f3733b781eee766edb85e615301faa1b7b4f9c790aefbf3d74
+MISC ChangeLog 3256 RMD160 f2493dd967de1999212aa44bca982dc1fae09a9d SHA1 c1c7c80031e9bcebd702c2ea0cae1a86acfd2c38 SHA256 a53d7204d5d9b371d4fad893cc270e9fdea04b2e7dd34085afe6c0a973c4565c
 MISC metadata.xml 309 RMD160 a059ad3a00629c996521e77e7d1f58add6779569 SHA1 7b9bcc760d2b4a196dedebb90cee0570bcc4ce78 SHA256 17f07d21fe72fc1d0d3deb2f0e5e9782e8a65088e6b31b6432440a5782a5b7ad
diff --git a/net-analyzer/nepenthes/files/nepenthes-0.2.2-gcc4.patch b/net-analyzer/nepenthes/files/nepenthes-0.2.2-gcc4.patch
new file mode 100644
index 000000000000..bb4401754805
--- /dev/null
+++ b/net-analyzer/nepenthes/files/nepenthes-0.2.2-gcc4.patch
@@ -0,0 +1,26 @@
+=== 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
+@@ -32,6 +32,8 @@
+ 
+ #include <vector>
+ #include <map>
++#include <cstring>
++#include <stdlib.h>
+ 
+ // mmap()
+ #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
+@@ -40,6 +40,8 @@
+ 
+ #include <stdint.h>
+ #include <string>
++#include <cstring>
++#include <cstdlib>
+ 
+ typedef unsigned char byte;
+ 
+
diff --git a/net-analyzer/nepenthes/nepenthes-0.2.2.ebuild b/net-analyzer/nepenthes/nepenthes-0.2.2.ebuild
index b6202ac8882d..9c2f53a91dcb 100644
--- a/net-analyzer/nepenthes/nepenthes-0.2.2.ebuild
+++ b/net-analyzer/nepenthes/nepenthes-0.2.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.1 2008/05/14 02:41:32 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nepenthes/nepenthes-0.2.2.ebuild,v 1.2 2009/02/03 10:03:53 pva Exp $
 
-inherit eutils
+EAPI="2"
+inherit eutils autotools
 
 DESCRIPTION="Nepenthes is a low interaction honeypot that captures worms by emulating known vulnerabilities"
 HOMEPAGE="http://nepenthes.sourceforge.net"
@@ -26,11 +27,17 @@ pkg_setup() {
 	enewuser nepenthes -1 -1 /dev/null nepenthes
 }
 
-src_compile() {
-	local myconf="--sysconfdir=/etc --localstatedir=/var/lib/nepenthes --enable-capabilities"
-	econf "${myconf}" || die
-	sed -i 's|var/cache|/var/lib/cache|' "${S}"/modules/shellcode-signatures/shellcode-signatures.cpp
-	emake || die "make failed"
+src_prepare() {
+	epatch ${FILESDIR}/${P}-gcc4.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
+}
+
+src_configure() {
+	econf --sysconfdir=/etc \
+		  --localstatedir=/var/lib/nepenthes \
+		  --enable-capabilities
 }
 
 src_install() {
@@ -47,10 +54,9 @@ src_install() {
 			-e 's|"etc|"/etc|' $i
 	done
 
-	dodoc doc/README doc/README.VFS AUTHORS
+	dodoc doc/README.VFS AUTHORS
 	dosbin nepenthes-core/src/nepenthes || die "dosbin failed"
 	rm "${D}"/usr/bin/nepenthes
-	rm "${D}"/usr/share/doc/README
 	rm "${D}"/usr/share/doc/README.VFS
 	rm "${D}"/usr/share/doc/logo-shaded.svg