1 |
commit: 6860d33861e30d5cce2c81297ca3988b1b0e7f29 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 26 23:45:58 2020 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 26 23:46:33 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6860d338 |
7 |
|
8 |
net-analyzer/packit: 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=706520 |
12 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
13 |
|
14 |
.../packit/files/packit-1.0-fno-common.patch | 251 +++++++++++++++++++++ |
15 |
net-analyzer/packit/packit-1.6.1.ebuild | 1 + |
16 |
2 files changed, 252 insertions(+) |
17 |
|
18 |
diff --git a/net-analyzer/packit/files/packit-1.0-fno-common.patch b/net-analyzer/packit/files/packit-1.0-fno-common.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..f4813d868ab |
21 |
--- /dev/null |
22 |
+++ b/net-analyzer/packit/files/packit-1.0-fno-common.patch |
23 |
@@ -0,0 +1,251 @@ |
24 |
+--- a/src/capture_defs.h |
25 |
++++ b/src/capture_defs.h |
26 |
+@@ -30,12 +30,12 @@ |
27 |
+ #define READ_TIMEOUT 500 |
28 |
+ #define SNAPLEN_DEFAULT 68 |
29 |
+ |
30 |
+-u_int16_t g_display; |
31 |
+-u_int16_t g_link_layer; |
32 |
+-u_int16_t g_dump_pkt; |
33 |
+-u_int16_t g_time_gmt; |
34 |
+-u_int16_t g_t_rst; |
35 |
+-u_int16_t g_snap_len; |
36 |
+-u_int32_t g_pkt_rst; |
37 |
++extern u_int16_t g_display; |
38 |
++extern u_int16_t g_link_layer; |
39 |
++extern u_int16_t g_dump_pkt; |
40 |
++extern u_int16_t g_time_gmt; |
41 |
++extern u_int16_t g_t_rst; |
42 |
++extern u_int16_t g_snap_len; |
43 |
++extern u_int32_t g_pkt_rst; |
44 |
+ |
45 |
+ #endif /* __CAPTURE_DEFS_H */ |
46 |
+--- a/src/error.c |
47 |
++++ b/src/error.c |
48 |
+@@ -26,6 +26,8 @@ |
49 |
+ |
50 |
+ #include "error.h" |
51 |
+ |
52 |
++char error_buf[ERRBUF_MAXLEN]; |
53 |
++ |
54 |
+ void |
55 |
+ fatal_error(char *err,...) |
56 |
+ { |
57 |
+--- a/src/error.h |
58 |
++++ b/src/error.h |
59 |
+@@ -33,7 +33,7 @@ |
60 |
+ #define SUCCESS 1 |
61 |
+ #define FAILURE -1 |
62 |
+ |
63 |
+-char error_buf[ERRBUF_MAXLEN]; |
64 |
++extern char error_buf[ERRBUF_MAXLEN]; |
65 |
+ |
66 |
+ void fatal_error(char *,...); |
67 |
+ |
68 |
+--- a/src/globals.h |
69 |
++++ b/src/globals.h |
70 |
+@@ -138,20 +138,20 @@ |
71 |
+ #define P_INT64 0x7FFFFFFFFFFFFFFF |
72 |
+ #define P_UINT64 0xFFFFFFFFFFFFFFFF |
73 |
+ |
74 |
+-char g_w_file[OPT_MAXLEN]; |
75 |
+-char g_r_file[OPT_MAXLEN]; |
76 |
++extern char g_w_file[OPT_MAXLEN]; |
77 |
++extern char g_r_file[OPT_MAXLEN]; |
78 |
+ |
79 |
+-pcap_t *g_pkt; |
80 |
+-u_int8_t g_tr_fin; |
81 |
+-char *g_filter; |
82 |
+-char *g_device; |
83 |
+-u_int16_t g_hdr_len; |
84 |
+-u_int16_t g_pkt_len; |
85 |
+-u_int16_t g_verbose; |
86 |
+-u_int16_t g_resolve; |
87 |
+-u_int16_t g_p_mode; |
88 |
+-u_int64_t g_cnt; |
89 |
+-u_int64_t g_inj_cnt; |
90 |
+-u_int64_t g_cap_cnt; |
91 |
++extern pcap_t *g_pkt; |
92 |
++extern u_int8_t g_tr_fin; |
93 |
++extern char *g_filter; |
94 |
++extern char *g_device; |
95 |
++extern u_int16_t g_hdr_len; |
96 |
++extern u_int16_t g_pkt_len; |
97 |
++extern u_int16_t g_verbose; |
98 |
++extern u_int16_t g_resolve; |
99 |
++extern u_int16_t g_p_mode; |
100 |
++extern u_int64_t g_cnt; |
101 |
++extern u_int64_t g_inj_cnt; |
102 |
++extern u_int64_t g_cap_cnt; |
103 |
+ |
104 |
+ #endif /* __GLOBALS_H */ |
105 |
+--- a/src/inject_defs.h |
106 |
++++ b/src/inject_defs.h |
107 |
+@@ -30,7 +30,7 @@ |
108 |
+ #ifndef __INJECTION_STRUCTS_H |
109 |
+ #define __INJECTION_STRUCTS_H |
110 |
+ |
111 |
+-struct ip4hdr_opts |
112 |
++extern struct ip4hdr_opts |
113 |
+ { |
114 |
+ u_int16_t p; /* protocol type */ |
115 |
+ u_int16_t rand_p; |
116 |
+@@ -59,7 +59,7 @@ |
117 |
+ u_int16_t rand_d_addr; |
118 |
+ } g_ip4hdr_o; |
119 |
+ |
120 |
+-struct tcphdr_opts |
121 |
++extern struct tcphdr_opts |
122 |
+ { |
123 |
+ u_int16_t s_port; /* tcp source port */ |
124 |
+ u_int16_t d_port; /* tcp destination port */ |
125 |
+@@ -82,7 +82,7 @@ |
126 |
+ |
127 |
+ } g_thdr_o; |
128 |
+ |
129 |
+-struct udphdr_opts |
130 |
++extern struct udphdr_opts |
131 |
+ { |
132 |
+ u_int16_t s_port; /* udp source port */ |
133 |
+ u_int16_t d_port; /* udp destination port */ |
134 |
+@@ -90,7 +90,7 @@ |
135 |
+ u_int16_t sum; /* udp checksum */ |
136 |
+ } g_uhdr_o; |
137 |
+ |
138 |
+-struct icmp4hdr_opts |
139 |
++extern struct icmp4hdr_opts |
140 |
+ { |
141 |
+ u_int16_t type; /* icmp4 type */ |
142 |
+ u_int16_t code; /* icmp4 code */ |
143 |
+@@ -132,7 +132,7 @@ |
144 |
+ u_int32_t ttime; /* transmit timestamp */ |
145 |
+ } g_i4hdr_o; |
146 |
+ |
147 |
+-struct enethdr_opts |
148 |
++extern struct enethdr_opts |
149 |
+ { |
150 |
+ u_int16_t rand_s_addr; |
151 |
+ u_int16_t rand_d_addr; |
152 |
+@@ -143,7 +143,7 @@ |
153 |
+ u_int8_t dhw_addr[18]; |
154 |
+ } g_ehdr_o; |
155 |
+ |
156 |
+-struct arphdr_opts |
157 |
++extern struct arphdr_opts |
158 |
+ { |
159 |
+ u_int16_t op_type; /* arp operation */ |
160 |
+ |
161 |
+@@ -163,28 +163,28 @@ |
162 |
+ u_int8_t rhw_addr[18]; |
163 |
+ } g_ahdr_o; |
164 |
+ |
165 |
+-libnet_t *g_pkt_d; |
166 |
++extern libnet_t *g_pkt_d; |
167 |
+ |
168 |
+-u_int16_t g_init_type; |
169 |
+-u_int16_t g_rand_d_port; |
170 |
+-u_int16_t g_rand_s_port; |
171 |
+-u_int16_t g_s_port; |
172 |
+-u_int16_t g_d_port; |
173 |
+-u_int16_t g_port_range; |
174 |
+-u_int16_t g_interval_sec; |
175 |
+-u_int16_t g_interval_usec; |
176 |
+-u_int16_t g_injection_type; |
177 |
+-u_int16_t g_r_timeout; |
178 |
+-u_int16_t g_burst_rate; |
179 |
+-u_int16_t g_payload_len; |
180 |
+-u_int8_t *g_payload; |
181 |
+-u_int8_t g_hex_payload; |
182 |
+-u_int8_t *g_s_d_port; |
183 |
+-u_int8_t g_hwaddr_p[18]; |
184 |
+-u_int8_t g_rawip; |
185 |
++extern u_int16_t g_init_type; |
186 |
++extern u_int16_t g_rand_d_port; |
187 |
++extern u_int16_t g_rand_s_port; |
188 |
++extern u_int16_t g_s_port; |
189 |
++extern u_int16_t g_d_port; |
190 |
++extern u_int16_t g_port_range; |
191 |
++extern u_int16_t g_interval_sec; |
192 |
++extern u_int16_t g_interval_usec; |
193 |
++extern u_int16_t g_injection_type; |
194 |
++extern u_int16_t g_r_timeout; |
195 |
++extern u_int16_t g_burst_rate; |
196 |
++extern u_int16_t g_payload_len; |
197 |
++extern u_int8_t *g_payload; |
198 |
++extern u_int8_t g_hex_payload; |
199 |
++extern u_int8_t *g_s_d_port; |
200 |
++extern u_int8_t g_hwaddr_p[18]; |
201 |
++extern u_int8_t g_rawip; |
202 |
+ |
203 |
+-struct timeval g_bf_pcap; |
204 |
+-struct timeval g_af_pcap; |
205 |
++extern struct timeval g_bf_pcap; |
206 |
++extern struct timeval g_af_pcap; |
207 |
+ |
208 |
+ |
209 |
+ #endif /* __INJECTION_STRUCTS_H */ |
210 |
+--- a/src/main.c |
211 |
++++ b/src/main.c |
212 |
+@@ -30,6 +30,62 @@ |
213 |
+ |
214 |
+ #include "main.h" |
215 |
+ |
216 |
++char g_w_file[OPT_MAXLEN]; |
217 |
++char g_r_file[OPT_MAXLEN]; |
218 |
++ |
219 |
++pcap_t *g_pkt; |
220 |
++u_int8_t g_tr_fin; |
221 |
++char *g_filter; |
222 |
++char *g_device; |
223 |
++u_int16_t g_hdr_len; |
224 |
++u_int16_t g_pkt_len; |
225 |
++u_int16_t g_verbose; |
226 |
++u_int16_t g_resolve; |
227 |
++u_int16_t g_p_mode; |
228 |
++u_int64_t g_cnt; |
229 |
++u_int64_t g_inj_cnt; |
230 |
++u_int64_t g_cap_cnt; |
231 |
++ |
232 |
++/* capture_defs.h */ |
233 |
++u_int16_t g_display; |
234 |
++u_int16_t g_link_layer; |
235 |
++u_int16_t g_dump_pkt; |
236 |
++u_int16_t g_time_gmt; |
237 |
++u_int16_t g_t_rst; |
238 |
++u_int16_t g_snap_len; |
239 |
++u_int32_t g_pkt_rst; |
240 |
++ |
241 |
++/* inject_defs.h */ |
242 |
++u_int16_t g_init_type; |
243 |
++u_int16_t g_rand_d_port; |
244 |
++u_int16_t g_rand_s_port; |
245 |
++u_int16_t g_s_port; |
246 |
++u_int16_t g_d_port; |
247 |
++u_int16_t g_port_range; |
248 |
++u_int16_t g_interval_sec; |
249 |
++u_int16_t g_interval_usec; |
250 |
++u_int16_t g_injection_type; |
251 |
++u_int16_t g_r_timeout; |
252 |
++u_int16_t g_burst_rate; |
253 |
++u_int16_t g_payload_len; |
254 |
++u_int8_t *g_payload; |
255 |
++u_int8_t g_hex_payload; |
256 |
++u_int8_t *g_s_d_port; |
257 |
++u_int8_t g_hwaddr_p[18]; |
258 |
++u_int8_t g_rawip; |
259 |
++ |
260 |
++struct timeval g_bf_pcap; |
261 |
++struct timeval g_af_pcap; |
262 |
++ |
263 |
++struct arphdr_opts g_ahdr_o; |
264 |
++struct enethdr_opts g_ehdr_o; |
265 |
++struct icmp4hdr_opts g_i4hdr_o; |
266 |
++struct ip4hdr_opts g_ip4hdr_o; |
267 |
++struct tcphdr_opts g_thdr_o; |
268 |
++struct udphdr_opts g_uhdr_o; |
269 |
++ |
270 |
++libnet_t *g_pkt_d; |
271 |
++ |
272 |
+ void |
273 |
+ parse_capture_options(int argc, char *argv[]) |
274 |
+ { |
275 |
|
276 |
diff --git a/net-analyzer/packit/packit-1.6.1.ebuild b/net-analyzer/packit/packit-1.6.1.ebuild |
277 |
index ddeeeb77d2b..9a88e995d22 100644 |
278 |
--- a/net-analyzer/packit/packit-1.6.1.ebuild |
279 |
+++ b/net-analyzer/packit/packit-1.6.1.ebuild |
280 |
@@ -18,6 +18,7 @@ DEPEND=" |
281 |
" |
282 |
RDEPEND="${DEPEND}" |
283 |
PATCHES=( |
284 |
+ "${FILESDIR}"/${PN}-1.0-fno-common.patch |
285 |
"${FILESDIR}"/${PN}-1.0-noopt.patch |
286 |
) |