1 |
commit: 1218896cfa1438d0a327d0d21ca9d44763a75f2e |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 27 01:48:21 2020 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 27 01:49:11 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1218896c |
7 |
|
8 |
net-analyzer/ipv6toolkit: Fix CFLAGS=-fno-common |
9 |
|
10 |
Package-Manager: Portage-2.3.85, Repoman-2.3.20 |
11 |
Closes: https://bugs.gentoo.org/show_bug.cgi?id=706312 |
12 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
13 |
|
14 |
.../ipv6toolkit-2.1_p20190919-fno-common.patch | 192 +++++++++++++++++++++ |
15 |
.../ipv6toolkit/ipv6toolkit-2.1_p20190919.ebuild | 3 + |
16 |
.../ipv6toolkit/ipv6toolkit-99999999.ebuild | 3 + |
17 |
3 files changed, 198 insertions(+) |
18 |
|
19 |
diff --git a/net-analyzer/ipv6toolkit/files/ipv6toolkit-2.1_p20190919-fno-common.patch b/net-analyzer/ipv6toolkit/files/ipv6toolkit-2.1_p20190919-fno-common.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..9d4a3dcffe9 |
22 |
--- /dev/null |
23 |
+++ b/net-analyzer/ipv6toolkit/files/ipv6toolkit-2.1_p20190919-fno-common.patch |
24 |
@@ -0,0 +1,192 @@ |
25 |
+--- a/tools/flow6.c |
26 |
++++ b/tools/flow6.c |
27 |
+@@ -85,8 +85,7 @@ |
28 |
+ |
29 |
+ bpf_u_int32 my_netmask; |
30 |
+ bpf_u_int32 my_ip; |
31 |
+-struct bpf_program pcap_filter; |
32 |
+-char dev[64], errbuf[PCAP_ERRBUF_SIZE]; |
33 |
++char dev[64]; |
34 |
+ unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; |
35 |
+ unsigned char *v6buffer, *ptr, *startofprefixes; |
36 |
+ char *pref; |
37 |
+--- a/tools/frag6.c |
38 |
++++ b/tools/frag6.c |
39 |
+@@ -94,8 +94,7 @@ |
40 |
+ |
41 |
+ bpf_u_int32 my_netmask; |
42 |
+ bpf_u_int32 my_ip; |
43 |
+-struct bpf_program pcap_filter; |
44 |
+-char dev[64], errbuf[PCAP_ERRBUF_SIZE]; |
45 |
++char dev[64]; |
46 |
+ unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; |
47 |
+ unsigned char *v6buffer, *ptr, *startofprefixes; |
48 |
+ char *pref; |
49 |
+--- a/tools/icmp6.c |
50 |
++++ b/tools/icmp6.c |
51 |
+@@ -114,8 +114,7 @@ |
52 |
+ |
53 |
+ bpf_u_int32 my_netmask; |
54 |
+ bpf_u_int32 my_ip; |
55 |
+-struct bpf_program pcap_filter; |
56 |
+-char dev[64], errbuf[PCAP_ERRBUF_SIZE]; |
57 |
++char dev[64]; |
58 |
+ unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; |
59 |
+ unsigned char *v6buffer, *ptr, *startofprefixes; |
60 |
+ char *pref; |
61 |
+--- a/tools/ipv6toolkit.h |
62 |
++++ b/tools/ipv6toolkit.h |
63 |
+@@ -2,3 +2,10 @@ |
64 |
+ #define MAX_CMDLINE_OPT_LEN 40 |
65 |
+ #define DATE_STR_LEN 40 |
66 |
+ |
67 |
++#include <pcap.h> |
68 |
++#include <setjmp.h> |
69 |
++ |
70 |
++extern char errbuf[PCAP_ERRBUF_SIZE]; |
71 |
++extern struct bpf_program pcap_filter; |
72 |
++extern sigjmp_buf env; |
73 |
++extern unsigned int canjump; |
74 |
+--- a/tools/jumbo6.c |
75 |
++++ b/tools/jumbo6.c |
76 |
+@@ -80,8 +80,7 @@ |
77 |
+ |
78 |
+ bpf_u_int32 my_netmask; |
79 |
+ bpf_u_int32 my_ip; |
80 |
+-struct bpf_program pcap_filter; |
81 |
+-char dev[64], errbuf[PCAP_ERRBUF_SIZE]; |
82 |
++char dev[64]; |
83 |
+ unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; |
84 |
+ unsigned char *v6buffer, *ptr, *startofprefixes; |
85 |
+ char *pref; |
86 |
+--- a/tools/na6.c |
87 |
++++ b/tools/na6.c |
88 |
+@@ -61,8 +61,7 @@ |
89 |
+ struct in6_addr *pkt_ipv6addr; |
90 |
+ bpf_u_int32 my_netmask; |
91 |
+ bpf_u_int32 my_ip; |
92 |
+-struct bpf_program pcap_filter; |
93 |
+-char dev[64], errbuf[PCAP_ERRBUF_SIZE]; |
94 |
++char dev[64]; |
95 |
+ char all_nodes_addr[]= ALL_NODES_MULTICAST_ADDR; |
96 |
+ unsigned char buffer[65556]; |
97 |
+ unsigned char *v6buffer, *ptr, *startofprefixes; |
98 |
+--- a/tools/ni6.c |
99 |
++++ b/tools/ni6.c |
100 |
+@@ -90,8 +90,7 @@ |
101 |
+ |
102 |
+ bpf_u_int32 my_netmask; |
103 |
+ bpf_u_int32 my_ip; |
104 |
+-struct bpf_program pcap_filter; |
105 |
+-char dev[64], errbuf[PCAP_ERRBUF_SIZE]; |
106 |
++char dev[64]; |
107 |
+ unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; |
108 |
+ char domain[MAX_DOMAIN_LEN]; |
109 |
+ unsigned char *v6buffer, *ptr, *startofprefixes; |
110 |
+--- a/tools/ns6.c |
111 |
++++ b/tools/ns6.c |
112 |
+@@ -59,8 +59,7 @@ |
113 |
+ const u_char *pktdata; |
114 |
+ bpf_u_int32 my_netmask; |
115 |
+ bpf_u_int32 my_ip; |
116 |
+-struct bpf_program pcap_filter; |
117 |
+-char dev[64], errbuf[PCAP_ERRBUF_SIZE]; |
118 |
++char dev[64]; |
119 |
+ |
120 |
+ unsigned char buffer[65556]; |
121 |
+ unsigned char *v6buffer, *ptr, *startofprefixes; |
122 |
+--- a/tools/path6.c |
123 |
++++ b/tools/path6.c |
124 |
+@@ -88,8 +88,7 @@ |
125 |
+ |
126 |
+ bpf_u_int32 my_netmask; |
127 |
+ bpf_u_int32 my_ip; |
128 |
+-struct bpf_program pcap_filter; |
129 |
+-char dev[64], errbuf[PCAP_ERRBUF_SIZE]; |
130 |
++char dev[64]; |
131 |
+ unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; |
132 |
+ unsigned char *v6buffer, *ptr, *startofprefixes; |
133 |
+ char *pref; |
134 |
+--- a/tools/ra6.c |
135 |
++++ b/tools/ra6.c |
136 |
+@@ -64,8 +64,7 @@ |
137 |
+ struct in6_addr *pkt_ipv6addr; |
138 |
+ bpf_u_int32 my_netmask; |
139 |
+ bpf_u_int32 my_ip; |
140 |
+-struct bpf_program pcap_filter; |
141 |
+-char dev[64], errbuf[PCAP_ERRBUF_SIZE]; |
142 |
++char dev[64]; |
143 |
+ char all_nodes_addr[]= ALL_NODES_MULTICAST_ADDR; |
144 |
+ |
145 |
+ unsigned char buffer[ETHER_HDR_LEN+MIN_IPV6_HLEN+MAX_IPV6_PAYLOAD]; |
146 |
+--- a/tools/rd6.c |
147 |
++++ b/tools/rd6.c |
148 |
+@@ -106,8 +106,7 @@ |
149 |
+ |
150 |
+ bpf_u_int32 my_netmask; |
151 |
+ bpf_u_int32 my_ip; |
152 |
+-struct bpf_program pcap_filter; |
153 |
+-char dev[64], errbuf[PCAP_ERRBUF_SIZE]; |
154 |
++char dev[64]; |
155 |
+ unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; |
156 |
+ unsigned char *v6buffer, *ptr, *startofprefixes; |
157 |
+ char *pref; |
158 |
+--- a/tools/rs6.c |
159 |
++++ b/tools/rs6.c |
160 |
+@@ -60,8 +60,7 @@ |
161 |
+ struct in6_addr *pkt_ipv6addr; |
162 |
+ bpf_u_int32 my_netmask; |
163 |
+ bpf_u_int32 my_ip; |
164 |
+-struct bpf_program pcap_filter; |
165 |
+-char dev[64], errbuf[PCAP_ERRBUF_SIZE]; |
166 |
++char dev[64]; |
167 |
+ char all_nodes_addr[]= ALL_NODES_MULTICAST_ADDR; |
168 |
+ |
169 |
+ unsigned char buffer[65556]; |
170 |
+--- a/tools/scan6.c |
171 |
++++ b/tools/scan6.c |
172 |
+@@ -153,8 +153,7 @@ |
173 |
+ |
174 |
+ bpf_u_int32 my_netmask; |
175 |
+ bpf_u_int32 my_ip; |
176 |
+-struct bpf_program pcap_filter; |
177 |
+-char dev[64], errbuf[PCAP_ERRBUF_SIZE]; |
178 |
++char dev[64]; |
179 |
+ unsigned char buffer[BUFFER_SIZE], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; |
180 |
+ char line[LINE_BUFFER_SIZE]; |
181 |
+ unsigned char *v6buffer, *ptr, *startofprefixes; |
182 |
+@@ -269,10 +268,6 @@ |
183 |
+ 443, 547, 993, 995, 1194, 3306, 5060, 5061, 5432, 6446, 8080}; |
184 |
+ |
185 |
+ |
186 |
+-/* IPv6 Address Resolution */ |
187 |
+-sigjmp_buf env; |
188 |
+-unsigned int canjump; |
189 |
+- |
190 |
+ int main(int argc, char **argv){ |
191 |
+ extern char *optarg; |
192 |
+ int r; |
193 |
+--- a/tools/tcp6.c |
194 |
++++ b/tools/tcp6.c |
195 |
+@@ -116,8 +116,7 @@ |
196 |
+ |
197 |
+ bpf_u_int32 my_netmask; |
198 |
+ bpf_u_int32 my_ip; |
199 |
+-struct bpf_program pcap_filter; |
200 |
+-char dev[64], errbuf[PCAP_ERRBUF_SIZE]; |
201 |
++char dev[64]; |
202 |
+ unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; |
203 |
+ unsigned char *v6buffer, *ptr, *startofprefixes; |
204 |
+ char *pref; |
205 |
+--- a/tools/udp6.c |
206 |
++++ b/tools/udp6.c |
207 |
+@@ -99,8 +99,7 @@ |
208 |
+ |
209 |
+ bpf_u_int32 my_netmask; |
210 |
+ bpf_u_int32 my_ip; |
211 |
+-struct bpf_program pcap_filter; |
212 |
+-char dev[64], errbuf[PCAP_ERRBUF_SIZE]; |
213 |
++char dev[64]; |
214 |
+ unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_UDP_HLEN]; |
215 |
+ unsigned char *v6buffer, *ptr, *startofprefixes; |
216 |
+ char *pref; |
217 |
|
218 |
diff --git a/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20190919.ebuild b/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20190919.ebuild |
219 |
index 6a4df21782c..bff5e134fff 100644 |
220 |
--- a/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20190919.ebuild |
221 |
+++ b/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20190919.ebuild |
222 |
@@ -21,6 +21,9 @@ RDEPEND=" |
223 |
${DEPEND} |
224 |
sys-apps/hwids |
225 |
" |
226 |
+PATCHES=( |
227 |
+ "${FILESDIR}"/${PN}-2.1_p20190919-fno-common.patch |
228 |
+) |
229 |
|
230 |
HWIDS_OUI_PATH=/usr/share/misc/oui.txt |
231 |
|
232 |
|
233 |
diff --git a/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild b/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild |
234 |
index 8a862e67718..2248b0b2e75 100644 |
235 |
--- a/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild |
236 |
+++ b/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild |
237 |
@@ -19,6 +19,9 @@ RDEPEND=" |
238 |
${DEPEND} |
239 |
sys-apps/hwids |
240 |
" |
241 |
+PATCHES=( |
242 |
+ "${FILESDIR}"/${PN}-2.1_p20190919-fno-common.patch |
243 |
+) |
244 |
|
245 |
HWIDS_OUI_PATH=/usr/share/misc/oui.txt |