diff options
author | Samuli Suominen <drac@gentoo.org> | 2008-05-03 12:04:38 +0000 |
---|---|---|
committer | Samuli Suominen <drac@gentoo.org> | 2008-05-03 12:04:38 +0000 |
commit | 38ab7099a33cdf19db4d5130e449c0cb60103039 (patch) | |
tree | eb2f48c75d8637ab259ae626ab5033e04789434c /net-analyzer | |
parent | Adding patch to fix security bug #219754 (diff) | |
download | gentoo-2-38ab7099a33cdf19db4d5130e449c0cb60103039.tar.gz gentoo-2-38ab7099a33cdf19db4d5130e449c0cb60103039.tar.bz2 gentoo-2-38ab7099a33cdf19db4d5130e449c0cb60103039.zip |
Fix building with GCC 4.3 wrt #219629. Thanks to Peter Alfredsen. Also prevent pre-stripping with simple sed.
(Portage version: 2.1.5_rc6)
Diffstat (limited to 'net-analyzer')
-rw-r--r-- | net-analyzer/xprobe/ChangeLog | 9 | ||||
-rw-r--r-- | net-analyzer/xprobe/files/xprobe-0.3-gcc43.patch | 32 | ||||
-rw-r--r-- | net-analyzer/xprobe/xprobe-0.3.ebuild | 27 |
3 files changed, 58 insertions, 10 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/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} } |