Clean up patches. Add dev-lang/tcl-8.6 support (maybe bug #486664).

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

8 files changed, 119 insertions, 34 deletions

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 <jer@gentoo.org> +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 <jer@gentoo.org> -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/Manifest b/net-analyzer/hping/Manifest
index add644625622..9e14802b96bd 100644
--- a/net-analyzer/hping/Manifest
+++ b/net-analyzer/hping/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX bytesex.h.patch 672 RMD160 fb17eafe3792a8ff113a971cb341fcd5c91c734b SHA1 888e93fd1278f7a7c4a63ef925bc7f462a04c060 SHA256 4d4c4538eb0d3d52295b8ef39f82222b43f2e95338ee64b5ef214c3f4cf7d24e
-AUX hping-3_pre20051105-ldflags.patch 674 RMD160 677cfc3e1e05d760a7740eacd82b3513bb7878de SHA1 92e910de467ee708fce9d39db7bd9d6a12a75015 SHA256 e544623ffae1dbf33617dd572573d82366b14104c683740f63d9d77daaf7fe59
-AUX hping-3_pre20051105-libtcl.patch 579 RMD160 5e25a4f4e75e335287372b87b3667b3cf5a5ee94 SHA1 d7f6ed8789b05f44123d16d07c4d493c74100f78 SHA256 dae42d02d5498fb27e86bf41c47d5bcec960c811ad3c6e8556c40aa84693d914
-AUX hping-3_pre20051105-scan-overflow.patch 371 RMD160 6d0a4b88ecc7717a88a7803e9d23c24eb9f76bef SHA1 97ea7b28214d30864323a289c77c50acfe151a06 SHA256 ada10fb6eb9ff56fb1382b52e8710c37338dfd7b6b746eae026af84af3105986
-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
-DIST hping3-20051105.tar.gz 584001 RMD160 e4ec209228b5cb99e2d561c5a7b1c82ff8abe540 SHA1 e13d27e14e7f90c2148a9b00a480781732fd351e SHA256 f5a671a62a11dc8114fa98eade19542ed1c3aa3c832b0e572ca0eb1a5a4faee8
-EBUILD hping-3_pre20051105-r3.ebuild 1734 RMD160 7348ed7dfeb1f7cfeea61220efebd9d06490ac76 SHA1 eb1f44a630f1430988a95464c5487a4675c8e4dd SHA256 861c33baf903b19fead9715511a0fd17db8fad48c9968580e9579b9f72d35d7e
-MISC ChangeLog 8658 RMD160 6c00fa697ad8c2ebd9e43cd309c32b85b0b56520 SHA1 132d1ee63099b2a9d5b7dca4cbb24ab065ee23a0 SHA256 04470fec0e069feb68dc18ef493fec0b80e6f7bf598abeebc05166e457472d57
-MISC metadata.xml 160 RMD160 6a040d8b3df8f6ee3b65d0a26b41afb9d252f3e7 SHA1 3d83752be0891265dc3cbf88a33aea6a80b92067 SHA256 c82849713c30b773ed7a8d44e0fb27b0573ca6b756587c9a1a33e8451180a1cf
+AUX bytesex.h.patch 672 SHA256 4d4c4538eb0d3d52295b8ef39f82222b43f2e95338ee64b5ef214c3f4cf7d24e SHA512 2e3550ed948eeb9a42349ab1153615eb178218d83bf17611215c5db4691f957cfd447f9441f18a33a3fd55e6567849d8078fd16eb5b37c17758e80ea54efc2ce WHIRLPOOL 6021613d0e7a082d698821320e9c47210e7dd1b9f440b6111004171405440db1e1f532211879c0f7dd8f1a366a4a2c6421e4ec8467252c5f44c9e089ae7abbfc
+AUX hping-3_pre20051105-ldflags.patch 602 SHA256 a1877a57023d64e1b13836b4d37510bf5f3f1c61ce7b6cf9eb2daae7d8fb19ed SHA512 b62df43e88724a168e35c21a394ee128d5b7a1870836be18d6327af850d5025bd3c35464c2b8fc0715c3df692996fc41e95023cbc4a778e6e881e9475d25d058 WHIRLPOOL 9466cfab207088d213ce015845896db995feac30c5b567f014101b85f7991fd67f90b4907de45d8adfd5e7079fc23b9f9f50bc54367f057df0782c65636bdbaf
+AUX hping-3_pre20051105-libtcl.patch 507 SHA256 5e501e0b87142c2b7ba1f978d71df5b494971dd5892cff82838a55fd42bb626e SHA512 282f8934a74ea155596ecdf6f92be5f0c25d535e9b711c32fb015beea746652a7c40444cd1cd03f94b12aeacb0352df304c24153dd11290591143ad7e85ade5a WHIRLPOOL 6e40238d0223eb06ea70dd8e7c2eececab33d88036e599632da9b9e7c729a7cfee27d134ec85cf2907715b1a08bdf9cae0cd8cbef13f944513fbd0d4fa152eac
+AUX hping-3_pre20051105-scan-overflow.patch 299 SHA256 e3f32eaec721ba49a9ac77a42cf6e78cd9b9921c286ac3f5b6e52e4a32915022 SHA512 632fdc5e48b1ef0924f58c5cf463ceaee26692cedab50869e9d58704948f38b9168a9d88b1c2f89e9d4a562d0454fcaeb6ab3480cb1c76a16bbd0f73ac09af98 WHIRLPOOL c957998f544873f1c21190d7000cb961415c31a9363117cd9f60fa50ea8e4610927a94b991c9dd5e6cd6b878b8448a4ed1d0a4fb34f6b0d5693053fffd934e7a
+AUX hping-3_pre20051105-tcl.patch 260 SHA256 2f11c02ad7d0a28359e80269b641494721d554a644a7c92379090ee38aabdbf4 SHA512 67da303e4c4b225607c76cee7cb2b2655b0dce9f2e151dc64f078cc719fcee974566967b1b294c0bab347a58bbfb6f08e3dad91c692dd1c56878c691ef5b7294 WHIRLPOOL 3d01010418027fecb2c80543daeec05cef117e54febf4bb73f6dc7dbbbde3bda9ad5c61b8e2012c05d01911cc714f21cca1625eff6e50ab7b38a4442242d5210
+AUX hping-3_pre20051105.patch 1036 SHA256 1ed8dc0b7b3b3c5336457dfce557f6b82b66b4d49df018f3d934b379fa1ef7e7 SHA512 ab1a6f85d8ba6e91097260b2044502f69033dd7466869cac19d50a1830a9eeea105617ec62e14cebe953b49992a3548c08f243638171de3524cb0058cf6d713e WHIRLPOOL 9ddaea90840c221d272fadffbc1b3d349dd426093f73f37927612e612eff911a148df19316e8f98e590764ba4d9f4a09e9a3e205113fea2c21923b6433c36a3e
+DIST hping3-20051105.tar.gz 584001 SHA256 f5a671a62a11dc8114fa98eade19542ed1c3aa3c832b0e572ca0eb1a5a4faee8 SHA512 3b3faa836e70054c8f9f004d876b7eb5f668b64826a6aaf8ca3685619111d9df4eb494a7d38b83cea6cb5f0bd164956461039bf4f73f7c7e90d80cede639b2b3 WHIRLPOOL 2043ac3d71d795a34abe0fc58f525b54e25ca0b8fadb7b2e88d8a6f5d6f4744bda4471f74c96212a78f58510572c1079683ca57650428924eb6223ee110ea6c1
+EBUILD hping-3_pre20051105-r3.ebuild 1734 SHA256 861c33baf903b19fead9715511a0fd17db8fad48c9968580e9579b9f72d35d7e SHA512 cb671e1193edcdedf768a3c1d10c8d0e1ef5ba86ec426cfc642676ee6d8bb25fd63c7ef0ae751c1070bd750b5c16753b6d64c033ca19e319eee27077a7eb36e2 WHIRLPOOL 99d37d7366e7b14865cf8225467c438411dbab591e1db05958d5db10f1f3a70e681fcdadbc4fd5d3473ecba18c02864329b540a7f018745a93c113b2552dac91
+EBUILD hping-3_pre20051105-r4.ebuild 1736 SHA256 8454c4a0b2ad1f1249f5f65029da76749f478335135f92a6cc9e8ff9930fb416 SHA512 976bc1fbac463bbad6dc84e208fbcb95cb8e7492f2274b6bec022217188f76acfd7b610a6402843268364c538e0180398ddf4a8b60fb73f4d8b3a7ab1418c33a WHIRLPOOL add57585aec3b22c2b6195feb49384d842bbd68f00b681febf3f76b9be01a06347e9706aedd70c2553f7126616ee9898246c3c3fe3e15885d5a6115ba95549b6
+MISC ChangeLog 9053 SHA256 4eb01824226bd7e5eddc4096935069295156d581f77b6d2b0bad65419d2d2300 SHA512 d5f2cc326123ee54ed3b70fa8d743b9a115e5c434009142fd84d7f4444c364b228c2643980110fb961d20129e13148fa20570eb72c8f9f38106d4cc09eeae5c1 WHIRLPOOL 955224b4433f25ae692d8988785fe52fdae1a471dc62da481fa7b0ab58bc68d4e0ce11c2a624ddc57cc0746b8adfd1969dd9bd9f0970065c957903b1ec1273fa
+MISC metadata.xml 160 SHA256 c82849713c30b773ed7a8d44e0fb27b0573ca6b756587c9a1a33e8451180a1cf SHA512 5a1cb8cdf9822ea05e85333c1fed6f489f2d6196b94af205b6a0af2fea8c6ef8626df4842deb22da3ef64d3a46a56ae4cb4246cd2dfa5a5bd2248a1336922894 WHIRLPOOL e78c36b0099b56b84c43d4abfd5f18ad64ef11bc461c58d6eed316de255fe34056ee857408b4c321894bceec1c9f4051b782df31730732ec7ed49cc2fe22136e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEARECAAYFAk9RB0gACgkQVWmRsqeSphNrqACeKsYbtDf8KE3VC23ZUucuvgRO
-374AnAzIDqpGVDGWSs0hAFBLg0CoECbN
-=F3xM
+iEYEAREIAAYFAlJK5YMACgkQVWmRsqeSphNlUgCePy3bj1Rrh9sYV4dY6eaWcoL7
+58MAniE0QmhqGj8aCTAjwkRhobmL1Em4
+=rLlB
 -----END PGP SIGNATURE-----
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 <stdlib.h>
  #include <sys/ioctl.h>
@@ -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 <sys/ioctl.h>
@@ -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
+}