1 |
commit: 998f0b24fde487bbc25b69222dc9b3d65cc9fdca |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 31 16:56:51 2020 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 31 16:57:15 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=998f0b24 |
7 |
|
8 |
net-analyzer/echoping: Fix CFLAGS=-fno-common |
9 |
|
10 |
Package-Manager: Portage-2.3.86, Repoman-2.3.20 |
11 |
Closes: https://bugs.gentoo.org/show_bug.cgi?id=707400 |
12 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
13 |
|
14 |
.../echoping/echoping-6.0.2_p434-r4.ebuild | 65 ++++++++++++ |
15 |
.../files/echoping-6.0.2_p434-fno-common.patch | 111 +++++++++++++++++++++ |
16 |
2 files changed, 176 insertions(+) |
17 |
|
18 |
diff --git a/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild b/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild |
19 |
new file mode 100644 |
20 |
index 00000000000..17e0727353a |
21 |
--- /dev/null |
22 |
+++ b/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild |
23 |
@@ -0,0 +1,65 @@ |
24 |
+# Copyright 1999-2020 Gentoo Authors |
25 |
+# Distributed under the terms of the GNU General Public License v2 |
26 |
+ |
27 |
+EAPI=7 |
28 |
+inherit autotools |
29 |
+ |
30 |
+DESCRIPTION="Small program to test performances of remote servers" |
31 |
+HOMEPAGE="http://echoping.sourceforge.net/" |
32 |
+SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz" |
33 |
+LICENSE="GPL-2" |
34 |
+ |
35 |
+SLOT="0" |
36 |
+KEYWORDS="~amd64 ~hppa ~x86" |
37 |
+IUSE="libressl gnutls http icp idn priority smtp ssl tos postgres ldap" |
38 |
+RESTRICT="test" |
39 |
+ |
40 |
+RDEPEND=" |
41 |
+ idn? ( net-dns/libidn ) |
42 |
+ ldap? ( net-nds/openldap ) |
43 |
+ postgres? ( dev-db/postgresql:* ) |
44 |
+ ssl? ( |
45 |
+ gnutls? ( >=net-libs/gnutls-3.3:= ) |
46 |
+ !gnutls? ( |
47 |
+ !libressl? ( dev-libs/openssl:0= ) |
48 |
+ libressl? ( dev-libs/libressl:0= ) |
49 |
+ ) |
50 |
+ ) |
51 |
+" |
52 |
+DEPEND=" |
53 |
+ ${RDEPEND} |
54 |
+ >=sys-devel/libtool-2 |
55 |
+" |
56 |
+ |
57 |
+REQUIRED_USE="gnutls? ( ssl )" |
58 |
+DOCS=( AUTHORS ChangeLog DETAILS NEWS README TODO ) |
59 |
+PATCHES=( |
60 |
+ "${FILESDIR}"/${PN}-6.0.2_p434-fix_implicit_declarations.patch |
61 |
+ "${FILESDIR}"/${PN}-6.0.2_p434-gnutls_certificate_type_set_priority.patch |
62 |
+ "${FILESDIR}"/${PN}-6.0.2_p434-gnutls_session.patch |
63 |
+ "${FILESDIR}"/${PN}-6.0.2_p434-fno-common.patch |
64 |
+) |
65 |
+ |
66 |
+src_prepare() { |
67 |
+ default |
68 |
+ eautoreconf |
69 |
+} |
70 |
+ |
71 |
+src_configure() { |
72 |
+ econf \ |
73 |
+ $(use_enable http) \ |
74 |
+ $(use_enable icp) \ |
75 |
+ $(use_enable priority) \ |
76 |
+ $(use_enable smtp) \ |
77 |
+ $(use_enable tos) \ |
78 |
+ $(use_with idn libidn) \ |
79 |
+ $(usex gnutls $(use_with gnutls) $(use_with ssl)) \ |
80 |
+ --config-cache \ |
81 |
+ --disable-static \ |
82 |
+ --disable-ttcp |
83 |
+} |
84 |
+ |
85 |
+src_install() { |
86 |
+ default |
87 |
+ find "${ED}" -name '*.la' -delete || die |
88 |
+} |
89 |
|
90 |
diff --git a/net-analyzer/echoping/files/echoping-6.0.2_p434-fno-common.patch b/net-analyzer/echoping/files/echoping-6.0.2_p434-fno-common.patch |
91 |
new file mode 100644 |
92 |
index 00000000000..5eafb8a401d |
93 |
--- /dev/null |
94 |
+++ b/net-analyzer/echoping/files/echoping-6.0.2_p434-fno-common.patch |
95 |
@@ -0,0 +1,111 @@ |
96 |
+--- a/echoping.c |
97 |
++++ b/echoping.c |
98 |
+@@ -38,6 +38,25 @@ |
99 |
+ struct timeval good_results[MAX_ITERATIONS]; |
100 |
+ extern int tvcmp(); |
101 |
+ |
102 |
++char *server; |
103 |
++#ifdef LIBIDN |
104 |
++char *locale_server, *ace_server, *utf8_server; |
105 |
++#endif |
106 |
++ |
107 |
++#ifndef IN_PLUGIN |
108 |
++init_f plugin_init; |
109 |
++start_f plugin_start; |
110 |
++start_raw_f plugin_raw_start; |
111 |
++execute_f plugin_execute; |
112 |
++terminate_f plugin_terminate; |
113 |
++#endif |
114 |
++ |
115 |
++struct timeval null_timeval; |
116 |
++struct timeval max_timeval; |
117 |
++ |
118 |
++boolean timeout_flag; |
119 |
++char big_recvline[MAXTOREAD]; |
120 |
++ |
121 |
+ int |
122 |
+ main(argc, argv) |
123 |
+ int argc; |
124 |
+--- a/echoping.h |
125 |
++++ b/echoping.h |
126 |
+@@ -118,7 +118,6 @@ |
127 |
+ struct timeval timevalue; |
128 |
+ }; |
129 |
+ |
130 |
+-boolean timeout_flag; |
131 |
+ struct echoping_struct { |
132 |
+ boolean udp; /* Use the UDP protocol (TCP is the default) */ |
133 |
+ boolean ttcp; |
134 |
+@@ -132,21 +131,21 @@ |
135 |
+ /* Initializes the plugin with its arguments. Returns the port name or number or NULL if the plugin wants to use the raw interface. */ |
136 |
+ typedef char *(*init_f) (const int argc, const char **argv, |
137 |
+ const echoping_options global_options); |
138 |
+-init_f plugin_init; |
139 |
++extern init_f plugin_init; |
140 |
+ typedef void (*start_f) (struct addrinfo *); |
141 |
+-start_f plugin_start; |
142 |
++extern start_f plugin_start; |
143 |
+ typedef void (*start_raw_f) (); |
144 |
+-start_raw_f plugin_raw_start; |
145 |
++extern start_raw_f plugin_raw_start; |
146 |
+ typedef int (*execute_f) (); |
147 |
+-execute_f plugin_execute; |
148 |
++extern execute_f plugin_execute; |
149 |
+ typedef void (*terminate_f) (); |
150 |
+-terminate_f plugin_terminate; |
151 |
++extern terminate_f plugin_terminate; |
152 |
+ #endif |
153 |
+ |
154 |
+ #endif |
155 |
+ |
156 |
+-struct timeval null_timeval; |
157 |
+-struct timeval max_timeval; |
158 |
++extern struct timeval null_timeval; |
159 |
++extern struct timeval max_timeval; |
160 |
+ |
161 |
+ #define ECHO_TCP_PORT "echo" |
162 |
+ #define DISCARD_TCP_PORT "discard" |
163 |
+@@ -169,9 +168,9 @@ |
164 |
+ |
165 |
+ #define CHARGENERATED " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefg"; |
166 |
+ |
167 |
+-char *server; |
168 |
++extern char *server; |
169 |
+ #ifdef LIBIDN |
170 |
+-char *locale_server, *ace_server, *utf8_server; |
171 |
++extern char *locale_server, *ace_server, *utf8_server; |
172 |
+ #endif |
173 |
+ |
174 |
+ /* My functions */ |
175 |
+@@ -230,6 +229,9 @@ |
176 |
+ |
177 |
+ extern boolean timeout_flag; |
178 |
+ |
179 |
++extern char big_recvline[MAXTOREAD]; |
180 |
++ |
181 |
++ |
182 |
+ #include "compilation.h" |
183 |
+ |
184 |
+ #ifndef HEADER_INCLUDED |
185 |
+--- a/http.c |
186 |
++++ b/http.c |
187 |
+@@ -6,8 +6,6 @@ |
188 |
+ #include "HTParse.h" |
189 |
+ |
190 |
+ |
191 |
+-char big_recvline[MAXTOREAD]; |
192 |
+- |
193 |
+ char * |
194 |
+ make_http_sendline(char *url, char *host, int port, int nocache) |
195 |
+ { |
196 |
+--- a/smtp.c |
197 |
++++ b/smtp.c |
198 |
+@@ -8,8 +8,6 @@ |
199 |
+ |
200 |
+ #ifdef SMTP |
201 |
+ |
202 |
+-char big_recvline[MAXTOREAD]; |
203 |
+- |
204 |
+ int |
205 |
+ smtp_read_response_from_server(FILE * fs) |
206 |
+ { |