Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/hping/files/
Date: Thu, 07 Jan 2021 11:33:39
Message-Id: 1610019202.9096ebebeb09dcf200144e255374186d7d260ab9.sam@gentoo
1 commit: 9096ebebeb09dcf200144e255374186d7d260ab9
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 7 11:31:07 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 7 11:33:22 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9096ebeb
7
8 net-analyzer/hping: cleanup old
9
10 Package-Manager: Portage-3.0.12, Repoman-3.0.2
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 .../hping/files/hping-3_pre20051105-ldflags.patch | 16 --------
14 .../files/hping-3_pre20051105-scan-overflow.patch | 11 ------
15 .../hping/files/hping-3_pre20051105-strlen.patch | 11 ------
16 net-analyzer/hping/files/hping-3_pre20051105.patch | 45 ----------------------
17 4 files changed, 83 deletions(-)
18
19 diff --git a/net-analyzer/hping/files/hping-3_pre20051105-ldflags.patch b/net-analyzer/hping/files/hping-3_pre20051105-ldflags.patch
20 deleted file mode 100644
21 index 39814bff0d8..00000000000
22 --- a/net-analyzer/hping/files/hping-3_pre20051105-ldflags.patch
23 +++ /dev/null
24 @@ -1,16 +0,0 @@
25 ---- a/Makefile.in
26 -+++ b/Makefile.in
27 -@@ -50,11 +50,11 @@
28 - $(RANLIB) $@
29 -
30 - hping3: byteorder.h $(OBJ)
31 -- $(CC) -o hping3 $(CCOPT) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@
32 -+ $(CC) -o hping3 $(CCOPT) $(LDFLAGS) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@
33 - @echo
34 -
35 - hping3-static: byteorder.h $(OBJ)
36 -- $(CC) -static -o hping3-static $(CCOPT) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@ -ldl
37 -+ $(CC) -static -o hping3-static $(CCOPT) $(LDFLAGS) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@ -ldl
38 -
39 - byteorder.h:
40 - ./configure
41
42 diff --git a/net-analyzer/hping/files/hping-3_pre20051105-scan-overflow.patch b/net-analyzer/hping/files/hping-3_pre20051105-scan-overflow.patch
43 deleted file mode 100644
44 index 2c3e01bf697..00000000000
45 --- a/net-analyzer/hping/files/hping-3_pre20051105-scan-overflow.patch
46 +++ /dev/null
47 @@ -1,11 +0,0 @@
48 ---- a/scan.c
49 -+++ b/scan.c
50 -@@ -456,7 +456,7 @@
51 - continue;
52 - /* time to copy headers in a safe place */
53 - p = packet+linkhdr_size+iphdrlen;
54 -- memcpy(&icmp, p, sizeof(subtcp));
55 -+ memcpy(&icmp, p, sizeof(icmp));
56 - p += sizeof(icmp);
57 - memcpy(&subip, p, sizeof(ip));
58 - p += sizeof(ip);
59
60 diff --git a/net-analyzer/hping/files/hping-3_pre20051105-strlen.patch b/net-analyzer/hping/files/hping-3_pre20051105-strlen.patch
61 deleted file mode 100644
62 index 692cd93102f..00000000000
63 --- a/net-analyzer/hping/files/hping-3_pre20051105-strlen.patch
64 +++ /dev/null
65 @@ -1,11 +0,0 @@
66 ---- a/ip_opt_build.c
67 -+++ b/ip_opt_build.c
68 -@@ -25,7 +25,7 @@
69 - unsigned char optlen = 0;
70 - unsigned long ip;
71 -
72 -- memset(ip_opt, 1, sizeof(ip_opt));
73 -+ memset(ip_opt, 1, strlen(ip_opt));
74 -
75 - if (opt_lsrr)
76 - {
77
78 diff --git a/net-analyzer/hping/files/hping-3_pre20051105.patch b/net-analyzer/hping/files/hping-3_pre20051105.patch
79 deleted file mode 100644
80 index e3133f2b6b4..00000000000
81 --- a/net-analyzer/hping/files/hping-3_pre20051105.patch
82 +++ /dev/null
83 @@ -1,45 +0,0 @@
84 ---- a/libpcap_stuff.c
85 -+++ b/libpcap_stuff.c
86 -@@ -17,7 +17,7 @@
87 - #include <stdlib.h>
88 - #include <sys/ioctl.h>
89 - #include <pcap.h>
90 --#include <net/bpf.h>
91 -+#include <pcap-bpf.h>
92 -
93 - #include "globals.h"
94 -
95 ---- a/script.c
96 -+++ b/script.c
97 -@@ -24,7 +24,7 @@
98 -
99 - #include <sys/ioctl.h>
100 - #include <pcap.h>
101 --#include <net/bpf.h>
102 -+#include <pcap-bpf.h>
103 -
104 - #include "release.h"
105 - #include "hping2.h"
106 ---- a/configure
107 -+++ b/configure
108 -@@ -93,7 +93,7 @@
109 - else
110 - USE_TCL=""
111 - TCL_LIB=""
112 -- echo "==> WARNING: no Tcl header files found!"
113 -+ echo "==> WARNING: no Tcl header files found."
114 - fi
115 - fi
116 - if [ -n $USE_TCL ]
117 ---- a/Makefile.in
118 -+++ b/Makefile.in
119 -@@ -52,9 +52,6 @@
120 - hping3: byteorder.h $(OBJ)
121 - $(CC) -o hping3 $(CCOPT) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@
122 - @echo
123 -- ./hping3 -v
124 -- @echo "use \`make strip' to strip hping3 binary"
125 -- @echo "use \`make install' to install hping3"
126 -
127 - hping3-static: byteorder.h $(OBJ)
128 - $(CC) -static -o hping3-static $(CCOPT) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@ -ldl