From feb8a64a02a13efbb2bb428c91db676db5a8cbb2 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Tue, 22 Dec 2009 21:17:15 +0000 Subject: Apply the same patches to hping-2 (see previous ChangeLog entry, bar the tcl stuff). Remove useless USE=debug (set -g through CFLAGS instead if you want, both v2 and v3). Package-Manager: portage-2.2_rc60/cvs/Linux i686 --- net-analyzer/hping/ChangeLog | 10 ++++- net-analyzer/hping/Manifest | 6 ++- .../hping/files/hping-2.0.0_rc3-gentoo.patch | 20 +++++++++ net-analyzer/hping/hping-2.0.0_rc3-r2.ebuild | 51 ++++++++++++++++++++++ net-analyzer/hping/hping-3_pre20051105-r1.ebuild | 10 ++--- 5 files changed, 87 insertions(+), 10 deletions(-) create mode 100644 net-analyzer/hping/files/hping-2.0.0_rc3-gentoo.patch create mode 100644 net-analyzer/hping/hping-2.0.0_rc3-r2.ebuild (limited to 'net-analyzer/hping') diff --git a/net-analyzer/hping/ChangeLog b/net-analyzer/hping/ChangeLog index 26e263d10989..f8574526ef6c 100644 --- a/net-analyzer/hping/ChangeLog +++ b/net-analyzer/hping/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-analyzer/hping # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/ChangeLog,v 1.45 2009/12/22 20:26:02 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/ChangeLog,v 1.46 2009/12/22 21:17:15 jer Exp $ + +*hping-2.0.0_rc3-r2 (22 Dec 2009) + + 22 Dec 2009; Jeroen Roovers +hping-2.0.0_rc3-r2.ebuild, + +files/hping-2.0.0_rc3-gentoo.patch, hping-3_pre20051105-r1.ebuild: + Apply the same patches to hping-2 (see previous ChangeLog entry, bar the + tcl stuff). Remove useless USE=debug (set -g through CFLAGS instead if you + want, both v2 and v3). *hping-3_pre20051105-r1 (22 Dec 2009) diff --git a/net-analyzer/hping/Manifest b/net-analyzer/hping/Manifest index 7250b2e29b0e..b4bc1df67dc1 100644 --- a/net-analyzer/hping/Manifest +++ b/net-analyzer/hping/Manifest @@ -1,4 +1,5 @@ AUX bytesex.h.patch 648 RMD160 296cbac7c2923ac58ed0fe3c17ad38825b18872d SHA1 c29be23c05a1abb41c4efe625000de01a947e4f0 SHA256 e994c326fc85928b6cde34eebf3c21fe6597ca3e7fd1d772d629949ddb20bf68 +AUX hping-2.0.0_rc3-gentoo.patch 551 RMD160 47771b28c81b35ea53e336306ff799866be28568 SHA1 e735e877693d22c19c25e420b7246c8d76cda6d1 SHA256 16c409d71f28f9747bb81ab84f5a479685a5857b7f3b39d7cd85643e976b9c13 AUX hping-3_pre20051105-ldflags.patch 674 RMD160 677cfc3e1e05d760a7740eacd82b3513bb7878de SHA1 92e910de467ee708fce9d39db7bd9d6a12a75015 SHA256 e544623ffae1dbf33617dd572573d82366b14104c683740f63d9d77daaf7fe59 AUX hping-3_pre20051105-tcl.patch 326 RMD160 10f4e4cd9f4db4eaed88fde458d7e9d1c3289182 SHA1 5387d407bf0ac765b55188253aba62fb09168426 SHA256 1640cc7e63ddfb27b182e79ca5ebbc8d611926142b7ac3de11d7afefaa11d4cf AUX hping-3_pre20051105.patch 1325 RMD160 d6d53199db63129102ca00497f184b488b25b3ee SHA1 f46d4f8836e39bb7bc817b1b28b1952ad8da258d SHA256 d1f52547424d4f169a809ccf371b2e5e75242054065342c7dc2633a78bfd6586 @@ -7,7 +8,8 @@ AUX wlan-header-fix.patch 848 RMD160 863ba8aa88e7f89508ca508155fc9cc71b74ab1b SH DIST hping2.0.0-rc3.tar.gz 124573 RMD160 345c6b29e48c2f9aea6b8bafb68c258f9ff8b083 SHA1 ec48293ca25e08155bf4b51ad6140b1be576a16f SHA256 f59292de39b9a4010414bd120a494226399767148efa37278bd53d9613167964 DIST hping3-20051105.tar.gz 584001 RMD160 e4ec209228b5cb99e2d561c5a7b1c82ff8abe540 SHA1 e13d27e14e7f90c2148a9b00a480781732fd351e SHA256 f5a671a62a11dc8114fa98eade19542ed1c3aa3c832b0e572ca0eb1a5a4faee8 EBUILD hping-2.0.0_rc3-r1.ebuild 1070 RMD160 9226024f517a806c5ae452364cf92f5615a035dc SHA1 1f58a01a02a461f7719b5b955706261c4c59adbb SHA256 144f1d128fbcddd4394fe346ec1cc744dcba0f71d7c0b1a6998b091ccbb725f2 -EBUILD hping-3_pre20051105-r1.ebuild 1468 RMD160 b512ec23779d0733988730562c8b7b0dbce914ed SHA1 05cfb89a49ed2fb5e4fc7e8865b8d7b1b0f1f032 SHA256 c717b21bfa110f89eeed42130b63a358d8cf59ca16269aeabfc6002108051ede +EBUILD hping-2.0.0_rc3-r2.ebuild 1331 RMD160 bc43ddc9a617dda3b4cfc4934c68c16cf3c0cae5 SHA1 09da225fc1a7eb9f6d8084c5cec1490662d9ce3d SHA256 cb426431aec27979d1a1ed360830e877645abba6272e8a85958b9e52a8c49f82 +EBUILD hping-3_pre20051105-r1.ebuild 1403 RMD160 4eee834297b703198bfe116422fd1cec337ad5f8 SHA1 561ef89358fc654d25b7cc8c2568c2321f862e4c SHA256 b8f2aee254e4e7a2bcbf3d81246450725e0d2fb8e060eb376eb971b21b92e320 EBUILD hping-3_pre20051105.ebuild 1323 RMD160 21b98a4c18325440b2b565df8b90513fd4b91615 SHA1 04b0bb8c0b8e1f45fa83efede58ab48c70ac02eb SHA256 82807e3616b709e8b754d9abd543e18e4fbc57c212d62bc843bd32a23babd2e0 -MISC ChangeLog 6167 RMD160 32dc2ed89e9232aedee72cb3cac2d82e1ed563d3 SHA1 b073e2763a6d1c58e2708204070854151b97886d SHA256 5c2ad045d376d6bbfe5442c454ede0872d697b0fda233abc4d636249d9c6cb82 +MISC ChangeLog 6525 RMD160 df7e2c8c1580c8807259acd67556ccd1e49dcb20 SHA1 a5acd670fc5fa38265980c31442de406629fd6a7 SHA256 fd6906f79dcfc204e80fdd58b2370558e00c0af1a89a18fad76c34a2297636ef MISC metadata.xml 160 RMD160 6a040d8b3df8f6ee3b65d0a26b41afb9d252f3e7 SHA1 3d83752be0891265dc3cbf88a33aea6a80b92067 SHA256 c82849713c30b773ed7a8d44e0fb27b0573ca6b756587c9a1a33e8451180a1cf diff --git a/net-analyzer/hping/files/hping-2.0.0_rc3-gentoo.patch b/net-analyzer/hping/files/hping-2.0.0_rc3-gentoo.patch new file mode 100644 index 000000000000..d8f24bca5e83 --- /dev/null +++ b/net-analyzer/hping/files/hping-2.0.0_rc3-gentoo.patch @@ -0,0 +1,20 @@ +--- Makefile.in.org 2004-05-03 11:29:39.000000000 +0200 ++++ Makefile.in 2009-12-22 21:55:58.000000000 +0100 +@@ -6,7 +6,7 @@ + # $date: Sun Jul 25 17:56:15 MET DST 1999$ + # $rev: 3$ + +-CC= gcc ++CC?= gcc + AR=/usr/bin/ar + RANLIB=/usr/bin/ranlib + CCOPT= -O2 -Wall @PCAP_INCLUDE@ +@@ -43,7 +43,7 @@ + $(RANLIB) $@ + + hping2: byteorder.h $(OBJ) +- $(CC) -o hping2 $(CCOPT) $(DEBUG) $(OBJ) $(PCAP) @SOLARISLIB@ ++ $(CC) -o hping2 $(CCOPT) $(LDFLAGS) $(DEBUG) $(OBJ) $(PCAP) @SOLARISLIB@ + @echo + ./hping2 -v + @echo "use \`make strip' to strip hping2 binary" diff --git a/net-analyzer/hping/hping-2.0.0_rc3-r2.ebuild b/net-analyzer/hping/hping-2.0.0_rc3-r2.ebuild new file mode 100644 index 000000000000..886d56549918 --- /dev/null +++ b/net-analyzer/hping/hping-2.0.0_rc3-r2.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/hping-2.0.0_rc3-r2.ebuild,v 1.1 2009/12/22 21:17:15 jer Exp $ + +inherit eutils toolchain-funcs + +MY_P="${PN}${PV//_/-}" +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 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86" +IUSE="" + +DEPEND="virtual/libpcap" + +S="${WORKDIR}/${MY_P//\.[0-9]}" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch \ + "${FILESDIR}"/bytesex.h.patch \ + "${FILESDIR}"/hping-bridge.patch \ + "${FILESDIR}"/${P}-gentoo.patch + sed -i Makefile.in \ + -e "9s:gcc:$(tc-getCC):" \ + -e "10s:/usr/bin/ar:$(tc-getAR):" \ + -e "11s:/usr/bin/ranlib:$(tc-getRANLIB):" \ + -e "s:/usr/local/lib:/usr/$(get_libdir):g" +} + +src_compile() { + tc-export CC + + # Not an autotools type configure: + sh configure || die "configure failed" + + emake CCOPT="${CFLAGS}" DEBUG="" || die "emake failed" +} + +src_install () { + dodir /usr/sbin + dosbin hping2 + dosym /usr/sbin/hping2 /usr/sbin/hping + + doman docs/hping2.8 + dodoc INSTALL KNOWN-BUGS NEWS README TODO AUTHORS BUGS CHANGES COPYING docs/AS-BACKDOOR docs/HPING2-IS-OPEN docs/MORE-FUN-WITH-IPID docs/*.txt +} diff --git a/net-analyzer/hping/hping-3_pre20051105-r1.ebuild b/net-analyzer/hping/hping-3_pre20051105-r1.ebuild index 29f87150b579..ed31c57c273d 100644 --- a/net-analyzer/hping/hping-3_pre20051105-r1.ebuild +++ b/net-analyzer/hping/hping-3_pre20051105-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/hping-3_pre20051105-r1.ebuild,v 1.1 2009/12/22 20:26:02 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/hping-3_pre20051105-r1.ebuild,v 1.2 2009/12/22 21:17:15 jer Exp $ inherit eutils multilib toolchain-funcs @@ -12,7 +12,7 @@ SRC_URI="http://www.hping.org/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86" -IUSE="tcl debug" +IUSE="tcl" S="${WORKDIR}/${MY_P}" @@ -45,11 +45,7 @@ src_compile() { # Not an autotools type configure: sh configure ${myconf} || die "configure failed" - if use debug; then - emake || die "make failed" - else - emake DEBUG="" || die "make failed" - fi + emake DEBUG="" || die "emake failed" } src_install () { -- cgit v1.2.3-65-gdbad