commit: d268b7d634bb013cf5599ab3a5daacd5a5a28f7c
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Sep 18 15:40:22 2018 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Sep 18 15:40:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d268b7d6
net-analyzer/hping: Merge sed scripts/patches into patches
Package-Manager: Portage-2.3.49, Repoman-2.3.10
.../hping/files/hping-3_pre20141226-compile.patch | 31 +++
.../files/hping-3_pre20141226-cross-compile.patch | 12 --
.../files/hping-3_pre20141226-hping2-2-hping.patch | 240 +
.../hping/files/hping-3_pre20141226-ldflags.patch | 11 -
net-analyzer/hping/hping-3_pre20141226.ebuild | 23 +-
5 files changed, 273 insertions(+), 44 deletions(-)
diff --git a/net-analyzer/hping/files/hping-3_pre20141226-compile.patch
b/net-analyzer/hping/files/hping-3_pre20141226-compile.patch
new file mode 100644
index 000..14b6eacdae4
--- /dev/null
+++ b/net-analyzer/hping/files/hping-3_pre20141226-compile.patch
@@ -0,0 +1,31 @@
+--- a/Makefile.in
b/Makefile.in
+@@ -6,10 +6,7 @@
+ # $date: Sun Jul 25 17:56:15 MET DST 1999$
+ # $rev: 3$
+
+-CC= gcc
+-AR=/usr/bin/ar
+-RANLIB=/usr/bin/ranlib
+-CCOPT= -O2 -Wall @PCAP_INCLUDE@ @TCL_INC@ @USE_TCL@
++CCOPT= $(CFLAGS) -Wall @PCAP_INCLUDE@ @TCL_INC@ @USE_TCL@
+ DEBUG= -g
+ #uncomment the following if you need libpcap based build under linux
+ #(not raccomanded)
+@@ -50,14 +47,11 @@
+ $(RANLIB) $@
+
+ hping3: byteorder.h $(OBJ)
+- $(CC) -o hping3 $(CCOPT) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP)
@SOLARISLIB@ @TCL_LIB@
++ $(CC) -o hping3 $(CCOPT) $(LDFLAGS) $(DEBUG) $(OBJ) -L/usr/$(LIBDIR)
$(PCAP) @SOLARISLIB@ @TCL_LIB@
+ @echo
+- ./hping3 -v
+- @echo "use \`make strip' to strip hping3 binary"
+- @echo "use \`make install' to install hping3"
+
+ hping3-static: byteorder.h $(OBJ)
+- $(CC) -static -o hping3-static $(CCOPT) $(DEBUG) $(OBJ)
-L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@ -ldl
++ $(CC) -static -o hping3-static $(CCOPT) $(DEBUG) $(OBJ)
-L/usr/$(LIBDIR) $(PCAP) @SOLARISLIB@ @TCL_LIB@ -ldl
+
+ byteorder.h:
+ ./configure
diff --git a/net-analyzer/hping/files/hping-3_pre20141226-cross-compile.patch
b/net-analyzer/hping/files/hping-3_pre20141226-cross-compile.patch
deleted file mode 100644
index 94dbfed9709..000
--- a/net-analyzer/hping/files/hping-3_pre20141226-cross-compile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
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@
- @echo
-- ./hping3 -v
-- @echo "use \`make strip' to strip hping3 binary"
-- @echo "use \`make install' to install hping3"
-
- hping3-static: byteorder.h $(OBJ)
- $(CC) -static -o hping3-static $(CCOPT) $(DEBUG) $(OBJ)
-L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@ -ldl
diff --git a/net-analyzer/hping/files/hping-3_pre20141226-hping2-2-hping.patch
b/net-analyzer/hping/files/hping-3_pre20141226-hping2-2-hping.patch
new file mode 100644
index 000..7ceaac921a0
--- /dev/null
+++ b/net-analyzer/hping/files/hping-3_pre20141226-hping2-2-hping.patch
@@ -0,0 +1,240 @@
+--- a/docs/hping3.8
b/docs/hping3.8
+@@ -1,8 +1,8 @@
+-.TH HPING2 8 "2001 Aug 14"
++.TH HPING 8 "2001 Aug 14"
+ .SH NAME
+-hping2 \- send (almost) arbitrary TCP/IP packets to network hosts
++hping \- send (almost) arbitrary TCP/IP packets to network hosts
+ .SH SYNOPSIS
+-.B hping2
++.B hping
+ [
+ .B \-hvnqVDzZ012WrfxykQbFSRPAUXYjJBuTG
+ ] [
+@@ -116,11 +116,11 @@
+ .br
+ .ad
+ .SH DESCRIPTION
+-hping2 is a network tool able to send custom TCP/IP packets and to
+-display target replies like ping program does with ICMP replies. hping2
++hping is a network tool able to send custom TCP/IP packets and to
++display target replies like ping program does with ICMP replies. hping
+ handle fragmentation, arbitrary packets body and size and can be used in
+ order to transfer files encapsulated under supported protocols. Using
+-hping2 you are able to perform at least the following stuff:
++hping you are able to perform at least the following stuff:
+
+ - Test firewall rules
+ - Advanced port scanning
+@@ -136,7 +136,7 @@
+ - A lot of others.
+
+ .IR "It's also a good didactic tool to learn TCP/IP" .
+-hping2 is developed and maintained by anti...@invece.org and is
++hping is developed and maintained by anti...@invece.org and is
+ licensed under GPL version 2. Development is open so you can send
+ me patches, suggestion and affronts without inhibitions.
+ .SH HPING SITE
+@@ -158,9 +158,9 @@
+ .I -c --count count
+ Stop after sending (and receiving)
+ .I count
+-response packets. After last packet was send hping2 wait COUNTREACHED_TIMEOUT
++response packets. After last packet was send hping wait COUNTREACHED_TIMEOUT
+ seconds target host replies. You are able to tune
