1 |
commit: 56767f1e73755bc229834f9f719ad5501a218029 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Apr 20 08:07:39 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 20 08:07:39 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56767f1e |
7 |
|
8 |
net-analyzer/postal: Remove last-rited pkg |
9 |
|
10 |
Closes: https://bugs.gentoo.org/677478 |
11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
12 |
|
13 |
net-analyzer/postal/Manifest | 1 - |
14 |
.../postal/files/01_postal-0.70-gcc43.patch | 11 - |
15 |
.../postal/files/02_postal-0.72-nossl.patch | 72 ------ |
16 |
.../files/03_postal-0.70-c++0x-integrated.patch | 270 --------------------- |
17 |
.../postal/files/04_postal-0.70-warnings.patch | 17 -- |
18 |
.../postal/files/05_postal-0.70-openssl-1.patch | 30 --- |
19 |
.../postal/files/06_postal-0.70-ldflags.patch | 27 --- |
20 |
net-analyzer/postal/metadata.xml | 5 - |
21 |
net-analyzer/postal/postal-0.72.ebuild | 37 --- |
22 |
profiles/package.mask | 2 - |
23 |
10 files changed, 472 deletions(-) |
24 |
|
25 |
diff --git a/net-analyzer/postal/Manifest b/net-analyzer/postal/Manifest |
26 |
deleted file mode 100644 |
27 |
index 05862a38f1b..00000000000 |
28 |
--- a/net-analyzer/postal/Manifest |
29 |
+++ /dev/null |
30 |
@@ -1 +0,0 @@ |
31 |
-DIST postal-0.72.tgz 106720 BLAKE2B 31374e36c0437dd7ebdf5e26ded159d9cfb22d4a97858de058b58ecebd2e31ae18ef9bdda5d61c06c89b1f05a903904ed9cc424918a66ead168be3af6786b994 SHA512 858d5a3ec452e868d6026d631d59260eab83e90c64ce185bf9c6cecd3494c591ba7cb1455f35a5f003acbbe33f4974669e6820750e4d4ce9432d72b350263c99 |
32 |
|
33 |
diff --git a/net-analyzer/postal/files/01_postal-0.70-gcc43.patch b/net-analyzer/postal/files/01_postal-0.70-gcc43.patch |
34 |
deleted file mode 100644 |
35 |
index fe577603ad3..00000000000 |
36 |
--- a/net-analyzer/postal/files/01_postal-0.70-gcc43.patch |
37 |
+++ /dev/null |
38 |
@@ -1,11 +0,0 @@ |
39 |
---- rabid.cpp.orig 2008-06-15 14:05:19.776258513 +0200 |
40 |
-+++ rabid.cpp 2008-06-15 14:05:47.927250506 +0200 |
41 |
-@@ -12,6 +12,8 @@ |
42 |
- #include <strings.h> |
43 |
- #include "postal.h" |
44 |
- #include "logit.h" |
45 |
-+#include <cstring> |
46 |
-+ |
47 |
- #ifdef USE_GNUTLS |
48 |
- #include <errno.h> |
49 |
- #include <gcrypt.h> |
50 |
|
51 |
diff --git a/net-analyzer/postal/files/02_postal-0.72-nossl.patch b/net-analyzer/postal/files/02_postal-0.72-nossl.patch |
52 |
deleted file mode 100644 |
53 |
index 238dbdbb783..00000000000 |
54 |
--- a/net-analyzer/postal/files/02_postal-0.72-nossl.patch |
55 |
+++ /dev/null |
56 |
@@ -1,72 +0,0 @@ |
57 |
-diff -NrU5 postal-0.69.orig/configure.in postal-0.69/configure.in |
58 |
---- configure.in 2008-04-09 03:08:28.000000000 +0200 |
59 |
-+++ configure.in 2008-04-23 22:37:41.000000000 +0200 |
60 |
-@@ -13,15 +13,28 @@ |
61 |
- else |
62 |
- stripping="-s" |
63 |
- fi |
64 |
- |
65 |
- AC_ARG_ENABLE(openssl, |
66 |
-- [ --disable-openssl disables openssl support], |
67 |
-- DISABLEOPENSSL=$opensslval, DISABLEOPENSSL=no) |
68 |
-+ [ --disable-openssl disable openssl support], |
69 |
-+ [ if test $enableval = yes; then |
70 |
-+ DISABLEOPENSSL=no |
71 |
-+ else |
72 |
-+ DISABLEOPENSSL=yes |
73 |
-+ fi ] |
74 |
-+ , |
75 |
-+ [ DISABLEOPENSSL=no ]) |
76 |
-+ |
77 |
- AC_ARG_ENABLE(gnutls, |
78 |
-- [ --disable-gnutls disables gnutls support], |
79 |
-- DISABLEGNUTLS=$gnutlsval, DISABLEGNUTLS=no) |
80 |
-+ [ --disable-gnutls disables gnutls support], |
81 |
-+ [if test $enableval = yes; then |
82 |
-+ DISABLEGNUTLS=no |
83 |
-+ else |
84 |
-+ DISABLEGNUTLS=yes |
85 |
-+ fi] |
86 |
-+ , |
87 |
-+ [ DISABLEGNUTLS=no ]) |
88 |
- |
89 |
- dnl Checks for programs. |
90 |
- AC_LANG_CPLUSPLUS |
91 |
- AC_PROG_CC |
92 |
- AC_PROG_CXX |
93 |
-@@ -118,17 +131,17 @@ |
94 |
- crypt_ldflags= |
95 |
- if [[ "$GNUTLS" = "no" ]]; then |
96 |
- gnutls="" |
97 |
- else |
98 |
- gnutls="#define USE_GNUTLS" |
99 |
-- crypt_ldflags="$extra_ldflags -lgnutls -lgcrypt" |
100 |
-+ crypt_ldflags=" -lgnutls -lgcrypt" |
101 |
- fi |
102 |
- if [[ "$OPENSSL" = "no" ]]; then |
103 |
- openssl="" |
104 |
- else |
105 |
- openssl="#define USE_OPENSSL" |
106 |
-- crypt_ldflags="$extra_ldflags -lssl -lcrypto" |
107 |
-+ crypt_ldflags=" -lssl -lcrypto" |
108 |
- fi |
109 |
- |
110 |
- AC_SUBST(large_file) |
111 |
- large_file="" |
112 |
- |
113 |
-diff -NrU5 postal-0.69.orig/Makefile.in postal-0.69/Makefile.in |
114 |
---- Makefile.in 2008-04-10 03:19:34.000000000 +0200 |
115 |
-+++ Makefile.in 2008-04-23 22:37:13.000000000 +0200 |
116 |
-@@ -16,11 +16,11 @@ |
117 |
- INSTALL=@INSTALL@ |
118 |
- |
119 |
- TESTEXE=ex-test |
120 |
- BASEOBJS=userlist.o thread.o results.o address.o tcp.o cmd5.o mutex.o logit.o expand.o @extra_objs@ |
121 |
- LFLAGS=-lstdc++ @extra_ldflags@ |
122 |
--CRYPTLFLAGS=-lstdc++ @crypt_ldflags@ |
123 |
-+CRYPTLFLAGS=-lstdc++ @extra_ldflags@ @crypt_ldflags@ |
124 |
- |
125 |
- |
126 |
- ALLOBJS=$(BASEOBJS) smtp.o client.o basictcp.o bhmusers.o smtpserver.o |
127 |
- |
128 |
- postal: postal.cpp $(BASEOBJS) postal.h smtp.o |
129 |
|
130 |
diff --git a/net-analyzer/postal/files/03_postal-0.70-c++0x-integrated.patch b/net-analyzer/postal/files/03_postal-0.70-c++0x-integrated.patch |
131 |
deleted file mode 100644 |
132 |
index 448af31a896..00000000000 |
133 |
--- a/net-analyzer/postal/files/03_postal-0.70-c++0x-integrated.patch |
134 |
+++ /dev/null |
135 |
@@ -1,270 +0,0 @@ |
136 |
-diff -NrU5 postal-0.69.orig/bhm.cpp postal-0.69/bhm.cpp |
137 |
---- postal-0.69.orig/bhm.cpp 2008-04-23 22:39:01.000000000 +0200 |
138 |
-+++ postal-0.69/bhm.cpp 2008-04-24 01:31:54.000000000 +0200 |
139 |
-@@ -7,10 +7,11 @@ |
140 |
- #include <ctype.h> |
141 |
- #include <unistd.h> |
142 |
- #include <sys/wait.h> |
143 |
- #include <signal.h> |
144 |
- #include <stdio.h> |
145 |
-+#include <cstdlib> |
146 |
- #include <sys/poll.h> |
147 |
- #include <sys/types.h> |
148 |
- #include <sys/socket.h> |
149 |
- #include <arpa/inet.h> |
150 |
- #include <netinet/ip.h> |
151 |
-diff -NrU5 postal-0.69.orig/bhmusers.cpp postal-0.69/bhmusers.cpp |
152 |
---- postal-0.69.orig/bhmusers.cpp 2008-04-10 03:36:27.000000000 +0200 |
153 |
-+++ postal-0.69/bhmusers.cpp 2008-04-24 00:04:07.000000000 +0200 |
154 |
-@@ -1,9 +1,10 @@ |
155 |
- #include "bhmusers.h" |
156 |
- #include <stdio.h> |
157 |
- #include <cstring> |
158 |
- #include "expand.h" |
159 |
-+#include <cstdlib> |
160 |
- |
161 |
- BHMUsers::BHMUsers(const char *userListFile) |
162 |
- { |
163 |
- char buf[1024]; |
164 |
- FILE *fp = fopen(userListFile, "r"); |
165 |
-diff -NrU5 postal-0.69.orig/bhmusers.h postal-0.69/bhmusers.h |
166 |
---- postal-0.69.orig/bhmusers.h 2006-09-28 17:20:28.000000000 +0200 |
167 |
-+++ postal-0.69/bhmusers.h 2008-04-24 00:14:05.000000000 +0200 |
168 |
-@@ -4,16 +4,21 @@ |
169 |
- using namespace std; |
170 |
- |
171 |
- #include <string> |
172 |
- #include "conf.h" |
173 |
- |
174 |
-+#if (defined HAVE_STDCXX_0X) || (__cplusplus >= 201103L) |
175 |
-+#include <unordered_map> |
176 |
-+#include <tr1/functional_hash.h> |
177 |
-+#else |
178 |
- #ifdef HAVE_EXT_HASH_MAP |
179 |
- using namespace __gnu_cxx; |
180 |
- #include <ext/hash_map> |
181 |
- #else |
182 |
- #include <hash_map.h> |
183 |
- #endif |
184 |
-+#endif |
185 |
- |
186 |
- #include "postal.h" |
187 |
- |
188 |
- typedef enum { eNone = 0, eDefer, eReject, eBounce, eGrey } USER_SMTP_ACTION; |
189 |
- |
190 |
-@@ -21,10 +26,13 @@ |
191 |
- { |
192 |
- USER_SMTP_ACTION action; |
193 |
- int sync_time; |
194 |
- } BHM_DATA; |
195 |
- |
196 |
-+#if (defined HAVE_STDCXX_0X) || (__cplusplus >= 201103L) |
197 |
-+typedef unordered_map<string, BHM_DATA , hash<string> > NAME_MAP; |
198 |
-+#else |
199 |
- namespace __gnu_cxx |
200 |
- { |
201 |
- template<> struct hash< std::string > |
202 |
- { |
203 |
- size_t operator() ( const std::string &x ) const |
204 |
-@@ -33,10 +41,11 @@ |
205 |
- } |
206 |
- }; |
207 |
- } |
208 |
- |
209 |
- typedef hash_map<string, BHM_DATA , hash<string> > NAME_MAP; |
210 |
-+#endif |
211 |
- |
212 |
- class BHMUsers |
213 |
- { |
214 |
- public: |
215 |
- BHMUsers(const char *userListFile); |
216 |
-diff -NrU5 postal-0.69.orig/configure.in postal-0.69/configure.in |
217 |
---- postal-0.69.orig/configure.in 2008-04-23 22:39:01.000000000 +0200 |
218 |
-+++ postal-0.69/configure.in 2008-04-24 01:20:35.000000000 +0200 |
219 |
-@@ -155,6 +155,98 @@ |
220 |
- |
221 |
- AC_CHECK_HEADERS(vector ext/hash_map) |
222 |
- |
223 |
- dnl Checks for library functions. |
224 |
- |
225 |
-+AC_DEFUN([AC_COMPILE_STDCXX_0X], [ |
226 |
-+ AC_CACHE_CHECK(if g++ supports C++0x features without additional flags, |
227 |
-+ ac_cv_cxx_compile_cxx0x_native, |
228 |
-+ [AC_LANG_SAVE |
229 |
-+ AC_LANG_CPLUSPLUS |
230 |
-+ AC_TRY_COMPILE([ |
231 |
-+ template <typename T> |
232 |
-+ struct check |
233 |
-+ { |
234 |
-+ static_assert(sizeof(int) <= sizeof(T), "not big enough"); |
235 |
-+ }; |
236 |
-+ |
237 |
-+ typedef check<check<bool>> right_angle_brackets; |
238 |
-+ |
239 |
-+ int a; |
240 |
-+ decltype(a) b; |
241 |
-+ |
242 |
-+ typedef check<int> check_type; |
243 |
-+ check_type c; |
244 |
-+ check_type&& cr = c;],, |
245 |
-+ ac_cv_cxx_compile_cxx0x_native=yes, ac_cv_cxx_compile_cxx0x_native=no) |
246 |
-+ AC_LANG_RESTORE |
247 |
-+ ]) |
248 |
-+ |
249 |
-+ AC_CACHE_CHECK(if g++ supports C++0x features with -std=c++0x, |
250 |
-+ ac_cv_cxx_compile_cxx0x_cxx, |
251 |
-+ [AC_LANG_SAVE |
252 |
-+ AC_LANG_CPLUSPLUS |
253 |
-+ ac_save_CXXFLAGS="$CXXFLAGS" |
254 |
-+ CXXFLAGS="$CXXFLAGS -std=c++0x" |
255 |
-+ AC_TRY_COMPILE([ |
256 |
-+ template <typename T> |
257 |
-+ struct check |
258 |
-+ { |
259 |
-+ static_assert(sizeof(int) <= sizeof(T), "not big enough"); |
260 |
-+ }; |
261 |
-+ |
262 |
-+ typedef check<check<bool>> right_angle_brackets; |
263 |
-+ |
264 |
-+ int a; |
265 |
-+ decltype(a) b; |
266 |
-+ |
267 |
-+ typedef check<int> check_type; |
268 |
-+ check_type c; |
269 |
-+ check_type&& cr = c;],, |
270 |
-+ ac_cv_cxx_compile_cxx0x_cxx=yes, ac_cv_cxx_compile_cxx0x_cxx=no) |
271 |
-+ CXXFLAGS="$ac_save_CXXFLAGS" |
272 |
-+ AC_LANG_RESTORE |
273 |
-+ ]) |
274 |
-+ |
275 |
-+ AC_CACHE_CHECK(if g++ supports C++0x features with -std=gnu++0x, |
276 |
-+ ac_cv_cxx_compile_cxx0x_gxx, |
277 |
-+ [AC_LANG_SAVE |
278 |
-+ AC_LANG_CPLUSPLUS |
279 |
-+ ac_save_CXXFLAGS="$CXXFLAGS" |
280 |
-+ CXXFLAGS="$CXXFLAGS -std=gnu++0x" |
281 |
-+ AC_TRY_COMPILE([ |
282 |
-+ template <typename T> |
283 |
-+ struct check |
284 |
-+ { |
285 |
-+ static_assert(sizeof(int) <= sizeof(T), "not big enough"); |
286 |
-+ }; |
287 |
-+ |
288 |
-+ typedef check<check<bool>> right_angle_brackets; |
289 |
-+ |
290 |
-+ int a; |
291 |
-+ decltype(a) b; |
292 |
-+ |
293 |
-+ typedef check<int> check_type; |
294 |
-+ check_type c; |
295 |
-+ check_type&& cr = c;],, |
296 |
-+ ac_cv_cxx_compile_cxx0x_gxx=yes, ac_cv_cxx_compile_cxx0x_gxx=no) |
297 |
-+ CXXFLAGS="$ac_save_CXXFLAGS" |
298 |
-+ AC_LANG_RESTORE |
299 |
-+ ]) |
300 |
-+ |
301 |
-+ if test "$ac_cv_cxx_compile_cxx0x_native" = yes || |
302 |
-+ test "$ac_cv_cxx_compile_cxx0x_cxx" = yes || |
303 |
-+ test "$ac_cv_cxx_compile_cxx0x_gxx" = yes; then |
304 |
-+ AC_DEFINE(HAVE_STDCXX_0X,,[Define if g++ supports C++0x features. ]) |
305 |
-+ fi |
306 |
-+]) |
307 |
-+ |
308 |
-+AC_COMPILE_STDCXX_0X |
309 |
-+ |
310 |
-+AC_SUBST(cstd) |
311 |
-+cstd= |
312 |
-+if test "$ac_cv_cxx_compile_cxx0x_cxx" = yes; then |
313 |
-+ cstd=-std=c++0x |
314 |
-+fi |
315 |
-+ |
316 |
- AC_OUTPUT(Makefile postal.h port.h postal.spec sun/pkginfo) |
317 |
-+ |
318 |
-diff -NrU5 postal-0.69.orig/Makefile.in postal-0.69/Makefile.in |
319 |
---- postal-0.69.orig/Makefile.in 2008-04-23 22:39:01.000000000 +0200 |
320 |
-+++ postal-0.69/Makefile.in 2008-04-24 00:29:40.000000000 +0200 |
321 |
-@@ -8,12 +8,12 @@ |
322 |
- prefix=@prefix@ |
323 |
- eprefix=@exec_prefix@ |
324 |
- WFLAGS=-Wall -W -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wcast-qual -pedantic |
325 |
- WPLUS=-Woverloaded-virtual -ffor-scope |
326 |
- |
327 |
--CXX=@CXX@ $(CFLAGS) -O2 -g $(WFLAGS) $(WPLUS) |
328 |
--CC=@CC@ $(CFLAGS) -O2 -g $(WFLAGS) |
329 |
-+CXX=@CXX@ @cstd@ $(CFLAGS) $(WFLAGS) $(WPLUS) |
330 |
-+CC=@CC@ $(CFLAGS) $(WFLAGS) |
331 |
- |
332 |
- INSTALL=@INSTALL@ |
333 |
- |
334 |
- TESTEXE=ex-test |
335 |
- BASEOBJS=userlist.o thread.o results.o address.o tcp.o cmd5.o mutex.o logit.o expand.o @extra_objs@ |
336 |
-diff -NrU5 postal-0.69.orig/postal.cpp postal-0.69/postal.cpp |
337 |
---- postal-0.69.orig/postal.cpp 2007-01-14 05:40:23.000000000 +0100 |
338 |
-+++ postal-0.69/postal.cpp 2008-04-24 01:30:49.000000000 +0200 |
339 |
-@@ -6,10 +6,11 @@ |
340 |
- #include "smtp.h" |
341 |
- #include <unistd.h> |
342 |
- #include <sys/wait.h> |
343 |
- #include <signal.h> |
344 |
- #include <stdio.h> |
345 |
-+#include <cstdlib> |
346 |
- #include "postal.h" |
347 |
- #include "logit.h" |
348 |
- #ifdef USE_GNUTLS |
349 |
- #include <errno.h> |
350 |
- #include <gcrypt.h> |
351 |
-diff -NrU5 postal-0.69.orig/smtp.cpp postal-0.69/smtp.cpp |
352 |
---- postal-0.69.orig/smtp.cpp 2008-04-19 00:01:39.000000000 +0200 |
353 |
-+++ postal-0.69/smtp.cpp 2008-04-24 00:14:49.000000000 +0200 |
354 |
-@@ -7,10 +7,11 @@ |
355 |
- #include <time.h> |
356 |
- #include "userlist.h" |
357 |
- #include "logit.h" |
358 |
- #include "results.h" |
359 |
- #include <cstring> |
360 |
-+#include <cstdlib> |
361 |
- |
362 |
- smtpData::smtpData() |
363 |
- : m_quit("QUIT\r\n") |
364 |
- , m_randomLetters("abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ 1234567890 `~!@#$%^&*()-_=+[]{};:'\"|/?<>,") |
365 |
- , m_randomLen(strlen(m_randomLetters)) |
366 |
-diff -NrU5 postal-0.69.orig/smtp.h postal-0.69/smtp.h |
367 |
---- postal-0.69.orig/smtp.h 2008-04-19 00:01:23.000000000 +0200 |
368 |
-+++ postal-0.69/smtp.h 2008-04-24 00:18:03.000000000 +0200 |
369 |
-@@ -4,16 +4,20 @@ |
370 |
- using namespace std; |
371 |
- #include <string> |
372 |
- #include <cstring> |
373 |
- #include <time.h> |
374 |
- #include "conf.h" |
375 |
-+#if (defined HAVE_STDCXX_0X) || (__cplusplus >= 201103L) |
376 |
-+#include <unordered_map> |
377 |
-+#else |
378 |
- #ifdef HAVE_EXT_HASH_MAP |
379 |
- using namespace __gnu_cxx; |
380 |
- #include <ext/hash_map> |
381 |
- #else |
382 |
- #include <hash_map.h> |
383 |
- #endif |
384 |
-+#endif |
385 |
- #include "tcp.h" |
386 |
- #include "mutex.h" |
387 |
- |
388 |
- class results; |
389 |
- |
390 |
-@@ -28,11 +32,15 @@ |
391 |
- { |
392 |
- return (l1 == l2); |
393 |
- } |
394 |
- }; |
395 |
- |
396 |
-+#if (defined HAVE_STDCXX_0X) || (__cplusplus >= 201103L) |
397 |
-+typedef unordered_map<unsigned long, string *, hash<unsigned long>, eqlng> NAME_MAP; |
398 |
-+#else |
399 |
- typedef hash_map<unsigned long, string *, hash<unsigned long>, eqlng> NAME_MAP; |
400 |
-+#endif |
401 |
- |
402 |
- class smtpData |
403 |
- { |
404 |
- public: |
405 |
- smtpData(); |
406 |
|
407 |
diff --git a/net-analyzer/postal/files/04_postal-0.70-warnings.patch b/net-analyzer/postal/files/04_postal-0.70-warnings.patch |
408 |
deleted file mode 100644 |
409 |
index 066cf972cdf..00000000000 |
410 |
--- a/net-analyzer/postal/files/04_postal-0.70-warnings.patch |
411 |
+++ /dev/null |
412 |
@@ -1,17 +0,0 @@ |
413 |
-diff -NrU5 postal-0.69.orig/bhm.cpp postal-0.69/bhm.cpp |
414 |
---- postal-0.69.orig/bhm.cpp 2008-04-23 01:47:25.000000000 +0200 |
415 |
-+++ postal-0.69/bhm.cpp 2008-04-23 02:10:17.000000000 +0200 |
416 |
-@@ -67,11 +67,11 @@ |
417 |
- Logit *debug; |
418 |
- } thread_data; |
419 |
- |
420 |
- enum { eFree = 0, eUsed, eFinished }; |
421 |
- |
422 |
--int check_sender(CPCCHAR addr) |
423 |
-+int check_sender(CPCCHAR) |
424 |
- { |
425 |
- return 0; |
426 |
- } |
427 |
- |
428 |
- int readCommand(base_tcp &t, char *buf, int bufSize, bool stripCR, int timeout = 60); |
429 |
- |
430 |
|
431 |
diff --git a/net-analyzer/postal/files/05_postal-0.70-openssl-1.patch b/net-analyzer/postal/files/05_postal-0.70-openssl-1.patch |
432 |
deleted file mode 100644 |
433 |
index 5b5c054ac98..00000000000 |
434 |
--- a/net-analyzer/postal/files/05_postal-0.70-openssl-1.patch |
435 |
+++ /dev/null |
436 |
@@ -1,30 +0,0 @@ |
437 |
-http://bugs.gentoo.org/327937 |
438 |
- |
439 |
---- basictcp.h |
440 |
-+++ basictcp.h |
441 |
-@@ -89,7 +89,11 @@ |
442 |
- |
443 |
- #ifdef USE_SSL |
444 |
- #ifdef USE_OPENSSL |
445 |
-+ #if OPENSSL_VERSION_NUMBER >= 0x10000000L |
446 |
-+ const SSL_METHOD *m_sslMeth; |
447 |
-+ #else |
448 |
- SSL_METHOD *m_sslMeth; |
449 |
-+ #endif |
450 |
- SSL_CTX* m_sslCtx; |
451 |
- SSL *m_ssl; |
452 |
- #else |
453 |
---- tcp.h |
454 |
-+++ tcp.h |
455 |
-@@ -100,7 +100,11 @@ |
456 |
- |
457 |
- #ifdef USE_SSL |
458 |
- #ifdef USE_OPENSSL |
459 |
-+ #if OPENSSL_VERSION_NUMBER >= 0x10000000L |
460 |
-+ const SSL_METHOD *m_sslMeth; |
461 |
-+ #else |
462 |
- SSL_METHOD *m_sslMeth; |
463 |
-+ #endif |
464 |
- SSL_CTX* m_sslCtx; |
465 |
- SSL *m_ssl; |
466 |
- #else |
467 |
|
468 |
diff --git a/net-analyzer/postal/files/06_postal-0.70-ldflags.patch b/net-analyzer/postal/files/06_postal-0.70-ldflags.patch |
469 |
deleted file mode 100644 |
470 |
index 7bfb92de7f0..00000000000 |
471 |
--- a/net-analyzer/postal/files/06_postal-0.70-ldflags.patch |
472 |
+++ /dev/null |
473 |
@@ -1,27 +0,0 @@ |
474 |
---- Makefile.in~ 2011-06-08 11:38:59.123333174 +0300 |
475 |
-+++ Makefile.in 2011-06-08 11:46:02.000000000 +0300 |
476 |
-@@ -24,19 +24,19 @@ |
477 |
- ALLOBJS=$(BASEOBJS) smtp.o client.o basictcp.o bhmusers.o smtpserver.o |
478 |
- |
479 |
- postal: postal.cpp $(BASEOBJS) postal.h smtp.o |
480 |
-- $(CXX) postal.cpp $(BASEOBJS) smtp.o -o postal $(CRYPTLFLAGS) |
481 |
-+ $(CXX) $(LDFLAGS) postal.cpp $(BASEOBJS) smtp.o -o postal $(CRYPTLFLAGS) |
482 |
- |
483 |
- rabid: rabid.cpp $(BASEOBJS) postal.h client.o |
484 |
-- $(CXX) rabid.cpp $(BASEOBJS) client.o -o rabid $(CRYPTLFLAGS) |
485 |
-+ $(CXX) $(LDFLAGS) rabid.cpp $(BASEOBJS) client.o -o rabid $(CRYPTLFLAGS) |
486 |
- |
487 |
- bhm: bhm.cpp userlist.o basictcp.o logit.o results.o mutex.o bhmusers.o postal.h |
488 |
-- $(CXX) bhm.cpp userlist.o basictcp.o logit.o results.o mutex.o bhmusers.o -o bhm $(CRYPTLFLAGS) |
489 |
-+ $(CXX) $(LDFLAGS) bhm.cpp userlist.o basictcp.o logit.o results.o mutex.o bhmusers.o -o bhm $(CRYPTLFLAGS) |
490 |
- |
491 |
- ex-test: ex-test.cpp expand.o |
492 |
-- $(CXX) ex-test.cpp expand.o -o ex-test $(LFLAGS) |
493 |
-+ $(CXX) $(LDFLAGS) ex-test.cpp expand.o -o ex-test $(LFLAGS) |
494 |
- |
495 |
- postal-list: postal-list.cpp expand.o |
496 |
-- $(CXX) postal-list.cpp expand.o -o postal-list $(LFLAGS) |
497 |
-+ $(CXX) $(LDFLAGS) postal-list.cpp expand.o -o postal-list $(LFLAGS) |
498 |
- |
499 |
- install-bin: $(EXE) $(SEXE) |
500 |
- mkdir -p $(DESTDIR)$(eprefix)/sbin $(DESTDIR)$(eprefix)/bin |
501 |
|
502 |
diff --git a/net-analyzer/postal/metadata.xml b/net-analyzer/postal/metadata.xml |
503 |
deleted file mode 100644 |
504 |
index 7a38bb90096..00000000000 |
505 |
--- a/net-analyzer/postal/metadata.xml |
506 |
+++ /dev/null |
507 |
@@ -1,5 +0,0 @@ |
508 |
-<?xml version="1.0" encoding="UTF-8"?> |
509 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
510 |
-<pkgmetadata> |
511 |
- <!-- maintainer-needed --> |
512 |
-</pkgmetadata> |
513 |
|
514 |
diff --git a/net-analyzer/postal/postal-0.72.ebuild b/net-analyzer/postal/postal-0.72.ebuild |
515 |
deleted file mode 100644 |
516 |
index 82e1541dd2e..00000000000 |
517 |
--- a/net-analyzer/postal/postal-0.72.ebuild |
518 |
+++ /dev/null |
519 |
@@ -1,37 +0,0 @@ |
520 |
-# Copyright 1999-2014 Gentoo Foundation |
521 |
-# Distributed under the terms of the GNU General Public License v2 |
522 |
- |
523 |
-EAPI=4 |
524 |
-inherit autotools eutils |
525 |
- |
526 |
-DESCRIPTION="SMTP and POP mailserver benchmark. Supports SSL, randomized user accounts and more" |
527 |
-HOMEPAGE="http://www.coker.com.au/postal/" |
528 |
-SRC_URI="http://www.coker.com.au/postal/${P}.tgz" |
529 |
-LICENSE="GPL-3" |
530 |
-SLOT="0" |
531 |
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" |
532 |
-IUSE="ssl gnutls" |
533 |
-#ssl is an alias for openssl. If both ssl and gnutls are enabled, automagic will |
534 |
-#enable only gnutls. |
535 |
-DEPEND="ssl? ( |
536 |
- !gnutls? ( >=dev-libs/openssl-0.9.8g ) |
537 |
- gnutls? ( >=net-libs/gnutls-2.2.2 ) |
538 |
- )" |
539 |
-RDEPEND="${DEPEND}" |
540 |
- |
541 |
-src_prepare() { |
542 |
- epatch "${FILESDIR}/01_${PN}-0.70-gcc43.patch" |
543 |
- epatch "${FILESDIR}/02_${PN}-0.72-nossl.patch" |
544 |
- epatch "${FILESDIR}/03_${PN}-0.70-c++0x-integrated.patch" |
545 |
- epatch "${FILESDIR}/04_${PN}-0.70-warnings.patch" |
546 |
- epatch "${FILESDIR}/05_${PN}-0.70-openssl-1.patch" |
547 |
- epatch "${FILESDIR}/06_${PN}-0.70-ldflags.patch" |
548 |
- eautoreconf |
549 |
-} |
550 |
- |
551 |
-src_configure() { |
552 |
- econf \ |
553 |
- --disable-stripping \ |
554 |
- $(use_enable ssl openssl) \ |
555 |
- $(use_enable gnutls) |
556 |
-} |
557 |
|
558 |
diff --git a/profiles/package.mask b/profiles/package.mask |
559 |
index 991342f3baf..87a517b9ac6 100644 |
560 |
--- a/profiles/package.mask |
561 |
+++ b/profiles/package.mask |
562 |
@@ -615,7 +615,6 @@ x11-libs/hippo-canvas |
563 |
# net-analyzer/bro: #675014, needs bump, current version is from 2015 |
564 |
# net-analyzer/ffp: #674244, dead homepage, current version added 2005 |
565 |
# net-analyzer/nodebrain: #674796, last commits in 2015 |
566 |
-# net-analyzer/postal: #677478, last release in 2012 |
567 |
# |
568 |
# Removal in 30 days. |
569 |
app-crypt/keynote |
570 |
@@ -628,7 +627,6 @@ mail-filter/libdkim |
571 |
net-analyzer/bro |
572 |
net-analyzer/ffp |
573 |
net-analyzer/nodebrain |
574 |
-net-analyzer/postal |
575 |
|
576 |
# Miroslav Šulc <fordfrog@g.o> (19 Mar 2019) |
577 |
# Depends on >=virtual/{jdk,jre}-11 which is masked |