6 files changed, 18 insertions, 81 deletions

diff --git a/net/hping/Makefile b/net/hping/Makefile
index f61dd0afb4b2..33c46420abbc 100644
--- a/net/hping/Makefile
+++ b/net/hping/Makefile
@@ -6,18 +6,17 @@
 #
 
 PORTNAME=	hping
-PORTVERSION=	2b54
-PORTREVISION=	1
+PORTVERSION=	2.0.0r1
 CATEGORIES=	security net
-MASTER_SITES=	http://www.kyuzz.org/antirez/hping2-src/
-DISTNAME=	hping2-beta54
+MASTER_SITES=	http://www.hping.org/
+DISTNAME=	hping2.0.0-rc1
 
-MAINTAINER=	roman@xpert.com
-
-BROKEN=		See PR 28974
+MAINTAINER=	Nicolas.Jombart@hsc-labs.com
 
+WRKSRC=		${WRKDIR}/hping2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--force-libpcap
+USE_GMAKE= 	yes
 
 MAN8=	hping.8
 
diff --git a/net/hping/distinfo b/net/hping/distinfo
index 06733487e4a6..5038a93c1263 100644
--- a/net/hping/distinfo
+++ b/net/hping/distinfo
@@ -1 +1 @@
-MD5 (hping2-beta54.tar.gz) = 703f2102b948f214d59d89b41bca9923
+MD5 (hping2.0.0-rc1.tar.gz) = f915af241bfac510d1a51b7113503a17
diff --git a/net/hping/files/patch-aa b/net/hping/files/patch-aa
deleted file mode 100644
index f60706776698..000000000000
--- a/net/hping/files/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.orig	Thu Jul  6 20:06:10 2000
-+++ configure	Thu Oct  5 15:33:45 2000
-@@ -65,8 +65,8 @@
- 			;;
- 		*"--force-libpcap")
- 			FORCE_LIBPCAP="-DFORCE_LIBPCAP"
--			PCAP="PCAP=libpcap/libpcap.a"
--			PCAP_INCLUDE="-I./libpcap"
-+			PCAP="PCAP=-lpcap"
-+			PCAP_INCLUDE=""
- 			;;
- 		*"--dont-use-proc")
- 			HAVE_PROC=""
-@@ -92,7 +92,7 @@
- 			-e s/@FORCE_LIBPCAP@/"$FORCE_LIBPCAP"/g \
- 			-e s/@HAVE_PROC@/"$HAVE_PROC"/g \
- 			-e s^@PCAP@^"$PCAP"^g \
--			-e s^@PCAP_INCLUDE@^"$PCAP_INCLUDE$"^g \
-+			-e s^@PCAP_INCLUDE@^"$PCAP_INCLUDE"^g \
- 			-e s^@MANPATH@^"$INSTALL_MANPATH"^g \
- 			> Makefile
- 
diff --git a/net/hping/files/patch-ab b/net/hping/files/patch-ab
deleted file mode 100644
index fcc4cad3fa43..000000000000
--- a/net/hping/files/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.in.orig	Thu Oct  5 15:22:25 2000
-+++ Makefile.in	Thu Oct  5 15:25:28 2000
-@@ -6,8 +6,8 @@
- # $date: Sun Jul 25 17:56:15 MET DST 1999$ 
- # $rev: 3$ 
- 
--CC= gcc
--CCOPT= -O2 -Wall @PCAP_INCLUDE@
-+CC?= gcc
-+CCOPT= $(CFLAGS) -Wall @PCAP_INCLUDE@
- DEBUG= -g
- #uncomment the following if you need libpcap based build under linux
- #(not raccomanded)
diff --git a/net/hping/files/patch-ac b/net/hping/files/patch-ac
deleted file mode 100644
index ca68c8d0719b..000000000000
--- a/net/hping/files/patch-ac
+++ /dev/null
@@ -1,28 +0,0 @@
---- getlhs.c.orig	Mon Jun  4 16:17:30 2001
-+++ getlhs.c	Mon Jun  4 16:17:32 2001
-@@ -73,6 +73,7 @@
- 	else if ( strstr(ifname, "eth") /* ? */
- 	     ||   strstr(ifname, "ed")
- 	     ||   strstr(ifname, "ne")
-+             ||   strstr(ifname, "xe")  /* Xircom */
- 	     ||   strstr(ifname, "xl")	/* 3com */
- 	     ||   strstr(ifname, "vx")	/* 3com (older model) */
- 	     ||   strstr(ifname, "ep")  /* 3com 3c589 */
-@@ -85,6 +86,17 @@
- 	     ||   strstr(ifname, "sk")	/* SysKonnect SK-984x */
- 	     ||   strstr(ifname, "tl")	/* Compaq Netelligent 10/10+TNETE100 */
- 	     ||   strstr(ifname, "tx")	/* SMC 9432TX */
-+             ||   strstr(ifname, "an")  /* Aironet 4500/4800 */
-+             ||   strstr(ifname, "awi") /* PRISM I IEEE 802.11b wireless NIC */
-+             ||   strstr(ifname, "dc")  /* DEC/Intel 21143 and workalikes */
-+             ||   strstr(ifname, "de")  /* Digital Equipment DC21040 */
-+             ||   strstr(ifname, "pcn") /* AMD Am79C79x */\
-+             ||   strstr(ifname, "sis") /* SiS 900/SiS 7016 */
-+             ||   strstr(ifname, "ste") /* Sundance ST201 */
-+             ||   strstr(ifname, "vr")  /* VIA Rhine, Rhine II */
-+             ||   strstr(ifname, "vx")  /* 3com (older model) */
-+             ||   strstr(ifname, "wi")  /* WaveLAN/IEEE 802.11 wireless NICs */
-+             ||   strstr(ifname, "wx")  /* Intel Gigabit "Wiseman" */
- 	     ||   strstr(ifname, "wb"))	/* Winbond W89C840F chip */
- 	{
- 		linkhdr_size = ETHHDR_SIZE;
diff --git a/net/hping/pkg-descr b/net/hping/pkg-descr
index 3ea23af55788..3767afa3bbe9 100644
--- a/net/hping/pkg-descr
+++ b/net/hping/pkg-descr
@@ -1,10 +1,12 @@
-hping2 is a network tool able to send custom ICMP/UDP/TCP
-packets and to display target replies like ping do with
-ICMP replies. hping2 handle fragmentation, arbitrary packet
-body and size and can be used in order to transfer files
-under supported protocols. Using hping2 you are able at
-least to perform the following jobs:
-
+hping is a command-line oriented TCP/IP packet assembler/analyzer. 
+The interface is inspired to the ping(8) unix command, but hping isn't 
+only able to send ICMP echo requests. It supports TCP, UDP, ICMP and 
+RAW-IP protocols, has a traceroute mode, the ability to send files 
+between a covered channel, and many other features. 
+While hping was mainly used as a security tool in the past, it can be 
+used in many ways by people that don't care about security to test 
+networks and hosts. A subset of the stuff you can do using hping:
+ 
 	- Test firewall rules
 	- [spoofed] port scanning
 	- Test net performance using different protocols,
@@ -15,8 +17,7 @@ least to perform the following jobs:
 	- Firewalk like usage.
 	- Remote OS fingerprint.
 	- TCP/IP stack auditing.
-	- A lot of others. 
 
-WWW: http://www.kyuzz.org/antirez/hping/
+WWW: http://www.hping.org/
 
--- Roman Shterenzon <roman@xpert.com>
+-- Nicolas Jombart <Nicolas.Jombart@hsc-labs.com>