Fix overflow in scan.c (bug #340251). Simplify src_configure and export CC there. Set RDEPEND.

Package-Manager: portage-2.2.0_alpha6/cvs/Linux i686

6 files changed, 41 insertions, 72 deletions

diff --git a/net-analyzer/hping/ChangeLog b/net-analyzer/hping/ChangeLog
index 575419ddda0b..947b8ddd8c59 100644
--- a/net-analyzer/hping/ChangeLog
+++ b/net-analyzer/hping/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/hping
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/ChangeLog,v 1.49 2010/05/11 04:08:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/ChangeLog,v 1.50 2010/11/30 21:30:45 jer Exp $
+
+*hping-3_pre20051105-r3 (30 Nov 2010)
+
+  30 Nov 2010; Jeroen Roovers <jer@gentoo.org> -hping-3_pre20051105-r1.ebuild,
+  -hping-3_pre20051105-r2.ebuild, +hping-3_pre20051105-r3.ebuild,
+  +files/hping-3_pre20051105-scan-overflow.patch:
+  Fix overflow in scan.c (bug #340251). Simplify src_configure and export CC
+  there. Set RDEPEND.
 
 *hping-3_pre20051105-r2 (11 May 2010)
 
diff --git a/net-analyzer/hping/Manifest b/net-analyzer/hping/Manifest
index 4dd76c090b99..f5420b26dd17 100644
--- a/net-analyzer/hping/Manifest
+++ b/net-analyzer/hping/Manifest
@@ -2,6 +2,7 @@ AUX bytesex.h.patch 648 RMD160 296cbac7c2923ac58ed0fe3c17ad38825b18872d SHA1 c29
 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-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
 AUX hping-bridge.patch 359 RMD160 9388d69c0b727c1afb7ffb92e3c5b5614c3ccd88 SHA1 1d735253d3e2f0bb560b6ae52badee51d52bc992 SHA256 28ab28f0956874492817378f21c46deef2b9186b804cd71006f0a833600edfa6
@@ -10,7 +11,6 @@ DIST hping2.0.0-rc3.tar.gz 124573 RMD160 345c6b29e48c2f9aea6b8bafb68c258f9ff8b08
 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-2.0.0_rc3-r2.ebuild 1327 RMD160 2ceb0767499314bc99cdb9fc0451c4550550f98f SHA1 2ba1d713706923729fe59b685896b1e386eab4a5 SHA256 3f66deec5bf5ac17f29e59475eb25798c19fa7c58c673a1c9be9eb21701827ff
-EBUILD hping-3_pre20051105-r1.ebuild 1439 RMD160 8434160269260521030dc4294ce2fedb6659b266 SHA1 08ba54de67b0809b3d5f06357304c7b303f1cde7 SHA256 24eb5387dcc543a49cfdb9c277987eb7ed32e9b378b0096256f22d7c3a52c1b3
-EBUILD hping-3_pre20051105-r2.ebuild 1706 RMD160 5f050fd205d44850e4eaa83400af0ba652cc8b59 SHA1 8fa7129d9e5a13346271b12135b77993eabeb79f SHA256 66ec45f1d643878977bc1bf577dbd0892c252777c8e53102f0f01658548a5f10
-MISC ChangeLog 7148 RMD160 1c7bc5a9f8612055704c844ee52fee93a97eaf31 SHA1 a58ef5281f1b936234ac4a326c6665adcfb4bf6a SHA256 83672e7ecb29f5ae6294ce0b868ec7317ccc884933e376f85bfca2417f22ac01
+EBUILD hping-3_pre20051105-r3.ebuild 1733 RMD160 430303b47e971085342cc56a1202b62b517674ff SHA1 e2299c122bc48e4aaf16a24bb6802732377f3057 SHA256 e9e5b4bb5d661cf2388091a6fd240feea063ec1b33a3a604c2643093a8d8263c
+MISC ChangeLog 7482 RMD160 c74a91799e334bf59a423ca5e939463b06b896eb SHA1 4506dff7d624b1723a9cf3c24026d70b88b18103 SHA256 d98a8a122c481c0be643db2e909dbcc9f108695bec5176880011acc9ef45e600
 MISC metadata.xml 160 RMD160 6a040d8b3df8f6ee3b65d0a26b41afb9d252f3e7 SHA1 3d83752be0891265dc3cbf88a33aea6a80b92067 SHA256 c82849713c30b773ed7a8d44e0fb27b0573ca6b756587c9a1a33e8451180a1cf
diff --git a/net-analyzer/hping/files/hping-3_pre20051105-scan-overflow.patch b/net-analyzer/hping/files/hping-3_pre20051105-scan-overflow.patch
new file mode 100644
index 000000000000..003424b609a0
--- /dev/null
+++ b/net-analyzer/hping/files/hping-3_pre20051105-scan-overflow.patch
@@ -0,0 +1,11 @@
+--- a/scan.c	2003-10-22 12:41:00.000000000 +0200
++++ b/scan.c	2010-11-30 22:19:23.000000000 +0100
+@@ -456,7 +456,7 @@
+ 				continue;
+ 			/* time to copy headers in a safe place */
+ 			p = packet+linkhdr_size+iphdrlen;
+-			memcpy(&icmp, p, sizeof(subtcp));
++			memcpy(&icmp, p, sizeof(icmp));
+ 			p += sizeof(icmp);
+ 			memcpy(&subip, p, sizeof(ip));
+ 			p += sizeof(ip);
diff --git a/net-analyzer/hping/hping-3_pre20051105-r1.ebuild b/net-analyzer/hping/hping-3_pre20051105-r1.ebuild
deleted file mode 100644
index b6794bd64ad1..000000000000
--- a/net-analyzer/hping/hping-3_pre20051105-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.3 2009/12/23 14:02:25 jer Exp $
-
-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 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
-IUSE="tcl"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="net-libs/libpcap
-	tcl? ( dev-lang/tcl )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch \
-		"${FILESDIR}"/${P}.patch \
-		"${FILESDIR}"/bytesex.h.patch \
-		"${FILESDIR}"/${P}-tcl.patch \
-		"${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-libtcl.patch
-
-	# Correct hard coded values
-	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" \
-		-e "12s:-O2:${CFLAGS}:"
-}
-
-src_compile() {
-	myconf=""
-	use tcl || myconf="--no-tcl"
-
-	# Not an autotools type configure:
-	sh configure ${myconf} || die "configure failed"
-
-	emake DEBUG="" || die "emake failed"
-}
-
-src_install () {
-	dosbin hping3
-	dosym /usr/sbin/hping3 /usr/sbin/hping
-	dosym /usr/sbin/hping3 /usr/sbin/hping2
-
-	doman docs/hping3.8
-
-	dodoc INSTALL NEWS README TODO AUTHORS BUGS CHANGES
-}
diff --git a/net-analyzer/hping/hping-3_pre20051105-r2.ebuild b/net-analyzer/hping/hping-3_pre20051105-r3.ebuild
index dac37b9a54b4..7467bb10738f 100644
--- a/net-analyzer/hping/hping-3_pre20051105-r2.ebuild
+++ b/net-analyzer/hping/hping-3_pre20051105-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/hping-3_pre20051105-r2.ebuild,v 1.2 2010/05/11 15:43:01 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/hping-3_pre20051105-r3.ebuild,v 1.1 2010/11/30 21:30:45 jer Exp $
 
 EAPI="2"
 
@@ -20,6 +20,7 @@ S="${WORKDIR}/${MY_P}"
 
 DEPEND="net-libs/libpcap
 	tcl? ( dev-lang/tcl )"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	epatch \
@@ -27,7 +28,8 @@ src_prepare() {
 		"${FILESDIR}"/bytesex.h.patch \
 		"${FILESDIR}"/${P}-tcl.patch \
 		"${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-libtcl.patch
+		"${FILESDIR}"/${P}-libtcl.patch \
+		"${FILESDIR}"/${P}-scan-overflow.patch
 
 	# Correct hard coded values
 	sed -i Makefile.in \
@@ -46,18 +48,16 @@ src_prepare() {
 }
 
 src_configure() {
-	myconf=""
-	use tcl || myconf="--no-tcl"
+	tc-export CC
 
 	# Not an autotools type configure:
-	sh configure ${myconf} || die "configure failed"
+	sh configure $(use tcl || echo --no-tcl) || die "configure failed"
 }
 
 src_compile() {
 	emake \
 		DEBUG="" \
 		"CFLAGS=${CFLAGS}" \
-		"CC=$(tc-getCC)" \
 		"AR=$(tc-getAR)" \
 		"RANLIB=$(tc-getRANLIB)" \
 		"LIBDIR=$(get_libdir)" \
diff --git a/net-analyzer/iptraf-ng/Manifest b/net-analyzer/iptraf-ng/Manifest
index 29aa5e7e9b62..921d0d27ec1d 100644
--- a/net-analyzer/iptraf-ng/Manifest
+++ b/net-analyzer/iptraf-ng/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST iptraf-ng-1.0.2.tar.gz 876720 RMD160 0184ab4e2757cb11949d586d8447999a927f9c2a SHA1 bf606a6433e624fc5390fb4cd8ca6c1a8c4c77d9 SHA256 3df2bf83f86084367030a536d124b6a2b516c3531ba558f2c51c1cde99cba550
-EBUILD iptraf-ng-1.0.2.ebuild 881 RMD160 0a0dc877daad60f2a3552754433d1aabfb8888aa SHA1 fab099f8e69132f9b2c40b970d2cfdc41729615e SHA256 5206d378f518185a422be58f680bba41ac47ea19d773deacffd4ae496e89b5da
-MISC ChangeLog 1837 RMD160 70e12cbb3a93addc071d428227732870c0cc1e53 SHA1 5c2b774841c57bf40abfc3d57c21288db3019b3f SHA256 e094ae711800f62dacbfdfc0db89ec1e8ee09b2f33df3b6a5278ee4586369a78
+EBUILD iptraf-ng-1.0.2.ebuild 882 RMD160 52fb9dd6c8f1308b911bc373b0fe64139213fa79 SHA1 bb80383516d70c1574e043c576096d6ebc6557e8 SHA256 9e4de449a72d90d1874b83d31beb36c0b63cf80bcc951aa26b4a7cd74e33dd3b
+MISC ChangeLog 1945 RMD160 5046a43ec299c2de3119eeeb37612d94f577e7a0 SHA1 66f54b55eff683cf6d92ec845db0af22f4d842d0 SHA256 a94c1f075e7f2956ded4dc7baba228ceb38cb71a610b7eb0ec39640355489ed2
 MISC metadata.xml 259 RMD160 3ceeba2f9cb4db2bec31c67c1f4eaa2f6bbd5338 SHA1 2934306d8250cf1cab32319b53765d2fb7ced880 SHA256 c1a418dd2aecd1f45aab6255aa581e7ad597001a2d3ada0928dc46820ebb93e7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkz1bM0ACgkQkKaRLQcq0GIqFACghVqQxyVwyMwPWYZMneLkR8Vx
+3wUAoJSZw7dX9hxYRd+ho0Z6XQa0JScm
+=WhIL
+-----END PGP SIGNATURE-----