From 8116b90016e0027a6494aa50aca42b7eaf3395ee Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Tue, 1 Oct 2013 15:08:49 +0000 Subject: Clean up patches. Add dev-lang/tcl-8.6 support (maybe bug #486664). (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A792A613) --- net-analyzer/hping/ChangeLog | 13 +++- .../hping/files/hping-3_pre20051105-ldflags.patch | 4 +- .../hping/files/hping-3_pre20051105-libtcl.patch | 4 +- .../files/hping-3_pre20051105-scan-overflow.patch | 4 +- .../hping/files/hping-3_pre20051105-tcl.patch | 6 +- net-analyzer/hping/files/hping-3_pre20051105.patch | 16 ++--- net-analyzer/hping/hping-3_pre20051105-r4.ebuild | 75 ++++++++++++++++++++++ 7 files changed, 103 insertions(+), 19 deletions(-) create mode 100644 net-analyzer/hping/hping-3_pre20051105-r4.ebuild (limited to 'net-analyzer/hping') diff --git a/net-analyzer/hping/ChangeLog b/net-analyzer/hping/ChangeLog index 09ceac8eccfa..b0171dabd54a 100644 --- a/net-analyzer/hping/ChangeLog +++ b/net-analyzer/hping/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-analyzer/hping -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/ChangeLog,v 1.58 2012/03/02 17:45:39 jer Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/ChangeLog,v 1.59 2013/10/01 15:08:49 jer Exp $ + +*hping-3_pre20051105-r4 (01 Oct 2013) + + 01 Oct 2013; Jeroen Roovers +hping-3_pre20051105-r4.ebuild, + files/hping-3_pre20051105-ldflags.patch, + files/hping-3_pre20051105-libtcl.patch, + files/hping-3_pre20051105-scan-overflow.patch, + files/hping-3_pre20051105-tcl.patch, files/hping-3_pre20051105.patch: + Clean up patches. Add dev-lang/tcl-8.6 support (maybe bug #486664). 02 Mar 2012; Jeroen Roovers -hping-2.0.0_rc3-r1.ebuild, -hping-2.0.0_rc3-r2.ebuild, -files/hping-2.0.0_rc3-gentoo.patch, diff --git a/net-analyzer/hping/files/hping-3_pre20051105-ldflags.patch b/net-analyzer/hping/files/hping-3_pre20051105-ldflags.patch index 125db3345e02..39814bff0d8c 100644 --- a/net-analyzer/hping/files/hping-3_pre20051105-ldflags.patch +++ b/net-analyzer/hping/files/hping-3_pre20051105-ldflags.patch @@ -1,5 +1,5 @@ ---- Makefile.in.org 2009-12-22 21:06:55.000000000 +0100 -+++ Makefile.in 2009-12-22 21:09:17.000000000 +0100 +--- a/Makefile.in ++++ b/Makefile.in @@ -50,11 +50,11 @@ $(RANLIB) $@ diff --git a/net-analyzer/hping/files/hping-3_pre20051105-libtcl.patch b/net-analyzer/hping/files/hping-3_pre20051105-libtcl.patch index 4d374cf06eaf..807399cb553c 100644 --- a/net-analyzer/hping/files/hping-3_pre20051105-libtcl.patch +++ b/net-analyzer/hping/files/hping-3_pre20051105-libtcl.patch @@ -2,8 +2,8 @@ When anything libtcl (bug #247282) this will fail, and we're only finding out the version of the library anyway, so why not use TCL_VER, which is found using a slightly less fishy method. -JeR ---- configure.org 2009-12-23 14:53:34.000000000 +0100 -+++ configure 2009-12-23 14:56:34.000000000 +0100 +--- a/configure ++++ b/configure @@ -98,8 +98,7 @@ fi if [ -n $USE_TCL ] diff --git a/net-analyzer/hping/files/hping-3_pre20051105-scan-overflow.patch b/net-analyzer/hping/files/hping-3_pre20051105-scan-overflow.patch index 003424b609a0..2c3e01bf697a 100644 --- a/net-analyzer/hping/files/hping-3_pre20051105-scan-overflow.patch +++ b/net-analyzer/hping/files/hping-3_pre20051105-scan-overflow.patch @@ -1,5 +1,5 @@ ---- a/scan.c 2003-10-22 12:41:00.000000000 +0200 -+++ b/scan.c 2010-11-30 22:19:23.000000000 +0100 +--- a/scan.c ++++ b/scan.c @@ -456,7 +456,7 @@ continue; /* time to copy headers in a safe place */ diff --git a/net-analyzer/hping/files/hping-3_pre20051105-tcl.patch b/net-analyzer/hping/files/hping-3_pre20051105-tcl.patch index ae1525b64fa4..1fb734e349b4 100644 --- a/net-analyzer/hping/files/hping-3_pre20051105-tcl.patch +++ b/net-analyzer/hping/files/hping-3_pre20051105-tcl.patch @@ -1,11 +1,11 @@ ---- configure.org 2009-12-22 21:05:11.000000000 +0100 -+++ configure 2009-12-22 21:06:07.000000000 +0100 +--- a/configure ++++ b/configure @@ -63,7 +63,7 @@ # for TCLPATH_TRY in "/usr/bin/" "/usr/local/bin/" "/bin/" do - for TCLVER_TRY in "8.4" "8.3" "8.2" "8.1" "8.0" -+ for TCLVER_TRY in "8.5" "8.4" "8.3" "8.2" "8.1" "8.0" ++ for TCLVER_TRY in "8.6" "8.5" "8.4" "8.3" "8.2" "8.1" "8.0" do if [ -z $TCLSH ] then diff --git a/net-analyzer/hping/files/hping-3_pre20051105.patch b/net-analyzer/hping/files/hping-3_pre20051105.patch index 154237931f3f..e3133f2b6b42 100644 --- a/net-analyzer/hping/files/hping-3_pre20051105.patch +++ b/net-analyzer/hping/files/hping-3_pre20051105.patch @@ -1,5 +1,5 @@ ---- libpcap_stuff.c.old 2004-06-15 18:38:08.062799704 +1200 -+++ libpcap_stuff.c 2004-06-15 18:38:22.515602544 +1200 +--- a/libpcap_stuff.c ++++ b/libpcap_stuff.c @@ -17,7 +17,7 @@ #include #include @@ -9,8 +9,8 @@ #include "globals.h" ---- script.c.old 2004-06-15 18:38:59.135035544 +1200 -+++ script.c 2004-06-15 18:39:11.210199840 +1200 +--- a/script.c ++++ b/script.c @@ -24,7 +24,7 @@ #include @@ -20,8 +20,8 @@ #include "release.h" #include "hping2.h" ---- configure.old 2004-06-15 19:00:55.992842728 +1200 -+++ configure 2004-06-15 19:00:04.961600656 +1200 +--- a/configure ++++ b/configure @@ -93,7 +93,7 @@ else USE_TCL="" @@ -31,8 +31,8 @@ fi fi if [ -n $USE_TCL ] ---- Makefile.in.orig 2006-10-31 01:21:53.000000000 +0100 -+++ Makefile.in 2006-10-31 01:22:08.000000000 +0100 +--- a/Makefile.in ++++ b/Makefile.in @@ -52,9 +52,6 @@ hping3: byteorder.h $(OBJ) $(CC) -o hping3 $(CCOPT) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@ diff --git a/net-analyzer/hping/hping-3_pre20051105-r4.ebuild b/net-analyzer/hping/hping-3_pre20051105-r4.ebuild new file mode 100644 index 000000000000..7316c5474233 --- /dev/null +++ b/net-analyzer/hping/hping-3_pre20051105-r4.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/hping-3_pre20051105-r4.ebuild,v 1.1 2013/10/01 15:08:49 jer Exp $ + +EAPI=5 + +inherit eutils multilib toolchain-funcs + +MY_P="${PN}${PV//_pre/-}" +DESCRIPTION="A ping-like TCP/IP packet assembler/analyzer" +HOMEPAGE="http://www.hping.org" +SRC_URI="http://www.hping.org/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86" +IUSE="tcl" + +S="${WORKDIR}/${MY_P}" + +DEPEND="net-libs/libpcap + tcl? ( dev-lang/tcl )" +RDEPEND="${DEPEND}" + +src_prepare() { + epatch \ + "${FILESDIR}"/${P}.patch \ + "${FILESDIR}"/bytesex.h.patch \ + "${FILESDIR}"/${P}-tcl.patch \ + "${FILESDIR}"/${P}-ldflags.patch \ + "${FILESDIR}"/${P}-libtcl.patch \ + "${FILESDIR}"/${P}-scan-overflow.patch + + # Correct hard coded values + sed -i Makefile.in \ + -e '/^CC=/d' \ + -e '/^AR=/d' \ + -e '/^RANLIB=/d' \ + -e 's:/usr/local/lib:/usr/$(LIBDIR):g' \ + -e 's:-O2:$(CFLAGS):' \ + || die "sed Makefile.in failed" + + # Change name from hping2 to hping3 + sed -i docs/hping3.8 \ + -e 's|HPING2|HPING|g' \ + -e 's|hping2|hping|g' \ + || die "sed hping3.8 failed" +} + +src_configure() { + tc-export CC + + # Not an autotools type configure: + sh configure $(use tcl || echo --no-tcl) || die "configure failed" +} + +src_compile() { + emake \ + DEBUG="" \ + "CFLAGS=${CFLAGS}" \ + "AR=$(tc-getAR)" \ + "RANLIB=$(tc-getRANLIB)" \ + "LIBDIR=$(get_libdir)" \ + || die "emake failed" +} + +src_install () { + dosbin hping3 + dosym /usr/sbin/hping3 /usr/sbin/hping + dosym /usr/sbin/hping3 /usr/sbin/hping2 + + newman docs/hping3.8 hping.8 + + dodoc INSTALL NEWS README TODO AUTHORS BUGS CHANGES +} -- cgit v1.2.3-65-gdbad