Fix building with GCC 4.3 wrt #219629. Thanks to Peter Alfredsen. Also prevent pre-stripping with simple sed.

Package-Manager: portage-2.1.5_rc6

4 files changed, 61 insertions, 12 deletions

diff --git a/net-analyzer/xprobe/ChangeLog b/net-analyzer/xprobe/ChangeLog
index 55d0aea56bc4..5a5dfcd84b13 100644
--- a/net-analyzer/xprobe/ChangeLog
+++ b/net-analyzer/xprobe/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/xprobe
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/xprobe/ChangeLog,v 1.23 2007/04/01 17:48:50 vanquirius Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/xprobe/ChangeLog,v 1.24 2008/05/03 12:04:37 drac Exp $
+
+  03 May 2008; Samuli Suominen <drac@gentoo.org>
+  +files/xprobe-0.3-gcc43.patch, xprobe-0.3.ebuild:
+  Fix building with GCC 4.3 wrt #219629. Thanks to Peter Alfredsen. Also
+  prevent pre-stripping with simple sed.
 
   01 Apr 2007; Marcelo Goes <vanquirius@gentoo.org> -xprobe-0.2.2.ebuild:
   Remove old ebuild.
diff --git a/net-analyzer/xprobe/Manifest b/net-analyzer/xprobe/Manifest
index 2fb063adc89c..f3f08c7cb2bb 100644
--- a/net-analyzer/xprobe/Manifest
+++ b/net-analyzer/xprobe/Manifest
@@ -1,4 +1,5 @@
+AUX xprobe-0.3-gcc43.patch 1248 RMD160 9e702b16c2f1dcaa55f555cbd33c0cda020fcaf3 SHA1 9c1dc23459c5e91b21904564617a1b7a98378e40 SHA256 2165b620c834648f2c63cc2a7a6bd61f310ab287d57929ba67edd9f5639673d1
 DIST xprobe2-0.3.tar.gz 533636 RMD160 1818f41069c1df26d8a02cb22d92d30429c37018 SHA1 c28d48823c1b953f73fd1b1fbced5c77a63d2bf0 SHA256 12a9d0a2f38da8bb74c9e1cd96b2019802632cf55f8948384aafd417bb79a164
-EBUILD xprobe-0.3.ebuild 640 RMD160 24017d108cb2f0a989f8de127e847cfd944d4fbd SHA1 47b60ccea72ff147ab3025db1494c7815ff02c1f SHA256 07f15a4d9d8cda8129a7d6df3e5edaef231437208d14d60e39a85839dc56b071
-MISC ChangeLog 3077 RMD160 d36087b70ffe42796dfcb1662ffbdf725776271e SHA1 bd1165ee6ce623da4c50f0b0838f82736e2b02cf SHA256 efe49c1c8d4a2f1cbe76d5179455caa201b6d94ebecbcb1bf41b05b8e953133d
+EBUILD xprobe-0.3.ebuild 819 RMD160 40ddf0395770068712e17e9c76031c93507199c1 SHA1 e7596db4f968f5dcac2e2cd6460a1b88980c258f SHA256 2ebf947ad645604f9876b712d94a29a03da41879e19293c23777dd0df134bd37
+MISC ChangeLog 3287 RMD160 03c8ed612eb445ce7dfb5635e3a489cb50ce7ef4 SHA1 670c3e0c4c9ff0dbcc84c0d5b37426643f9c5fff SHA256 960079aa47a06e99b7fd3c92df11d07c999909aa28501030b33c62e4ef41726c
 MISC metadata.xml 478 RMD160 ff529d78190caa8c4714703174b4975cf69728ff SHA1 48f2330fa9e23221c7c8ac1b0e17f3328779f1a0 SHA256 d799ffda332044a2f4d19776ea04d34c3d79e4f03df63f77a78bffa52766a836
diff --git a/net-analyzer/xprobe/files/xprobe-0.3-gcc43.patch b/net-analyzer/xprobe/files/xprobe-0.3-gcc43.patch
new file mode 100644
index 000000000000..1b34690411b2
--- /dev/null
+++ b/net-analyzer/xprobe/files/xprobe-0.3-gcc43.patch
@@ -0,0 +1,32 @@
+diff -ur xprobe2-0.3.orig/libs-external/USI++/src/ip.cc xprobe2-0.3/libs-external/USI++/src/ip.cc
+--- xprobe2-0.3.orig/libs-external/USI++/src/ip.cc	2005-07-27 11:38:15.000000000 +0300
++++ xprobe2-0.3/libs-external/USI++/src/ip.cc	2008-05-03 14:54:03.000000000 +0300
+@@ -13,6 +13,7 @@
+ #include "usi++/ip.h"
+ 
+ #include "config.h"
++#include <cstdlib>
+ #include <iostream>
+ #include <string.h>
+ #include <errno.h>
+diff -ur xprobe2-0.3.orig/libs-external/USI++/src/misc.cc xprobe2-0.3/libs-external/USI++/src/misc.cc
+--- xprobe2-0.3.orig/libs-external/USI++/src/misc.cc	2005-07-27 11:38:15.000000000 +0300
++++ xprobe2-0.3/libs-external/USI++/src/misc.cc	2008-05-03 14:54:03.000000000 +0300
+@@ -1,5 +1,6 @@
+ #include "usi++/usi++"
+ #include "usi++/usi-structs.h"
++#include <cstdlib>
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/ioctl.h>
+diff -ur xprobe2-0.3.orig/libs-external/USI++/usi++/tcp.h xprobe2-0.3/libs-external/USI++/usi++/tcp.h
+--- xprobe2-0.3.orig/libs-external/USI++/usi++/tcp.h	2005-07-27 11:38:14.000000000 +0300
++++ xprobe2-0.3/libs-external/USI++/usi++/tcp.h	2008-05-03 14:54:03.000000000 +0300
+@@ -15,6 +15,7 @@
+ #include "usi-structs.h"
+ #include "datalink.h"
+ #include "ip.h"
++#include <cstring>
+ 
+ namespace usipp {
+ 
diff --git a/net-analyzer/xprobe/xprobe-0.3.ebuild b/net-analyzer/xprobe/xprobe-0.3.ebuild
index 42e8e94b8387..17901975cd33 100644
--- a/net-analyzer/xprobe/xprobe-0.3.ebuild
+++ b/net-analyzer/xprobe/xprobe-0.3.ebuild
@@ -1,11 +1,15 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/xprobe/xprobe-0.3.ebuild,v 1.5 2007/03/20 20:37:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/xprobe/xprobe-0.3.ebuild,v 1.6 2008/05/03 12:04:37 drac Exp $
+
+inherit eutils
+
+MY_P=${PN}2-${PV}
 
-MY_P="${PN}2-${PV}"
 DESCRIPTION="Active OS fingerprinting tool - this is Xprobe2"
-HOMEPAGE="http://www.sys-security.com/index.php?page=xprobe"
+HOMEPAGE="http://sys-security.com/blog/xprobe2"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc x86"
@@ -13,9 +17,16 @@ IUSE=""
 
 DEPEND="net-libs/libpcap"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+	sed -i -e 's:strip:true:' src/Makefile.in || die "sed failed."
+}
 
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS CREDITS CHANGELOG TODO README docs/*
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS CHANGELOG CREDITS README TODO docs/*.{txt,pdf}
 }