Revision bump: fix escaping in configure script wrt bug #486664. Drop old revision

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

3 files changed, 40 insertions, 6 deletions

diff --git a/net-analyzer/hping/ChangeLog b/net-analyzer/hping/ChangeLog
index d7ede46614da..58cd57256f19 100644
--- a/net-analyzer/hping/ChangeLog
+++ b/net-analyzer/hping/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/hping
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/ChangeLog,v 1.60 2013/10/01 15:10:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/ChangeLog,v 1.61 2013/11/11 14:53:16 pinkbyte Exp $
+
+*hping-3_pre20051105-r5 (11 Nov 2013)
+
+  11 Nov 2013; Sergey Popov <pinkbyte@gentoo.org>
+  -hping-3_pre20051105-r4.ebuild, +hping-3_pre20051105-r5.ebuild,
+  +files/hping-3_pre20051105-tclsh-proper-escaping.patch:
+  Revision bump: fix escaping in configure script wrt bug #486664. Drop old
+  revision
 
   01 Oct 2013; Jeroen Roovers <jer@gentoo.org> files/bytesex.h.patch:
   Clean up one more patch.
diff --git a/net-analyzer/hping/files/hping-3_pre20051105-tclsh-proper-escaping.patch b/net-analyzer/hping/files/hping-3_pre20051105-tclsh-proper-escaping.patch
new file mode 100644
index 000000000000..f31e76597a66
--- /dev/null
+++ b/net-analyzer/hping/files/hping-3_pre20051105-tclsh-proper-escaping.patch
@@ -0,0 +1,26 @@
+Fix for https://bugs.gentoo.org/show_bug.cgi?id=486664
+
+--- configure.orig	2013-11-11 18:42:29.343333615 +0400
++++ configure	2013-11-11 18:43:04.869336711 +0400
+@@ -65,10 +65,10 @@
+ do
+ 	for TCLVER_TRY in "8.6" "8.5" "8.4" "8.3" "8.2" "8.1" "8.0"
+ 	do
+-		if [ -z $TCLSH ]
++		if [ -z "$TCLSH" ]
+ 		then
+ 			TCLSH_TRY=${TCLPATH_TRY}tclsh${TCLVER_TRY}
+-			if [ -f $TCLSH_TRY ]
++			if [ -f "$TCLSH_TRY" ]
+ 			then
+ 				TCLSH=$TCLSH_TRY
+ 				echo "===> Found Tclsh in: $TCLSH"
+@@ -76,7 +76,7 @@
+ 		fi
+ 	done
+ done
+-if [ -f $TCLSH ]
++if [ -f "$TCLSH" ]
+ then
+ 	TCL_VER=`echo puts \\$tcl_version | $TCLSH -`
+ 	USE_TCL='-DUSE_TCL'
diff --git a/net-analyzer/hping/hping-3_pre20051105-r4.ebuild b/net-analyzer/hping/hping-3_pre20051105-r5.ebuild
index 7316c5474233..be4a310cc8b8 100644
--- a/net-analyzer/hping/hping-3_pre20051105-r4.ebuild
+++ b/net-analyzer/hping/hping-3_pre20051105-r5.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/hping-3_pre20051105-r5.ebuild,v 1.1 2013/11/11 14:53:16 pinkbyte Exp $
 
 EAPI=5
 
@@ -29,7 +29,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-tcl.patch \
 		"${FILESDIR}"/${P}-ldflags.patch \
 		"${FILESDIR}"/${P}-libtcl.patch \
-		"${FILESDIR}"/${P}-scan-overflow.patch
+		"${FILESDIR}"/${P}-scan-overflow.patch \
+		"${FILESDIR}"/${P}-tclsh-proper-escaping.patch # bug #486664
 
 	# Correct hard coded values
 	sed -i Makefile.in \
@@ -60,8 +61,7 @@ src_compile() {
 		"CFLAGS=${CFLAGS}" \
 		"AR=$(tc-getAR)" \
 		"RANLIB=$(tc-getRANLIB)" \
-		"LIBDIR=$(get_libdir)" \
-		|| die "emake failed"
+		"LIBDIR=$(get_libdir)"
 }
 
 src_install () {
@@ -71,5 +71,5 @@ src_install () {
 
 	newman docs/hping3.8 hping.8
 
-	dodoc INSTALL NEWS README TODO AUTHORS BUGS CHANGES
+	dodoc AUTHORS BUGS CHANGES INSTALL NEWS README TODO
 }