1 |
commit: ee742bfb61f11e52b80d3bd5da1863d7c0d32864 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 7 11:20:01 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 7 11:33:14 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee742bfb |
7 |
|
8 |
mail-filter/mapson: 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 |
mail-filter/mapson/Manifest | 1 - |
14 |
mail-filter/mapson/files/mapson-3.3-gcc6.patch | 287 ------------------------- |
15 |
mail-filter/mapson/mapson-3.3-r1.ebuild | 54 ----- |
16 |
3 files changed, 342 deletions(-) |
17 |
|
18 |
diff --git a/mail-filter/mapson/Manifest b/mail-filter/mapson/Manifest |
19 |
index 0bbcc99dc50..b2e1eed7caf 100644 |
20 |
--- a/mail-filter/mapson/Manifest |
21 |
+++ b/mail-filter/mapson/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
DIST mapson-3.3.1.tar.gz 553101 BLAKE2B 5100029e4b650b63cf868de48d9c709ac9fa8dcf773adb9ab70061756604116d69a20421d96ca769e19047efbe806cfc63432269cc83133f7f7f54f71b627d45 SHA512 07ecfdd2f9857a8b3818d065e4c342fda5089b77074ea153f9a380fe655716a214ff06f79eebe768b2470724e11a6ee819c1e457a47670c07537d6fd226dc1db |
24 |
-DIST mapson-3.3.tar.gz 421820 BLAKE2B e12c358113452a426cd5b55b945b77a303b595362064f6c84fe8bd8799502dd72872ca46cf54ce04022c3d27be52a849e337ae149521ce6ca35e990be73c1e98 SHA512 208d3b21d59689465a5c46619a53b3342c3ca96575d681b9ad01b1b6ffa05f05f56ab6e7ae38a8b2161e3f8d42b90b559baf8ff9db4ab4c83238d7adcb645fd0 |
25 |
|
26 |
diff --git a/mail-filter/mapson/files/mapson-3.3-gcc6.patch b/mail-filter/mapson/files/mapson-3.3-gcc6.patch |
27 |
deleted file mode 100644 |
28 |
index d43c2cb95ea..00000000000 |
29 |
--- a/mail-filter/mapson/files/mapson-3.3-gcc6.patch |
30 |
+++ /dev/null |
31 |
@@ -1,287 +0,0 @@ |
32 |
---- a/accept-confirmation.cpp |
33 |
-+++ b/accept-confirmation.cpp |
34 |
-@@ -52,7 +52,7 @@ |
35 |
- for (rc = read(fd, tmp, sizeof(tmp)); rc > 0; rc = read(fd, tmp, sizeof(tmp))) |
36 |
- mail.append(tmp, rc); |
37 |
- if (rc < 0) |
38 |
-- throw system_error(string("Failed to read mail file '") + filename + "'"); |
39 |
-+ throw mapson_system_error(string("Failed to read mail file '") + filename + "'"); |
40 |
- deliver(mail); |
41 |
- unlink(filename.c_str()); |
42 |
- } |
43 |
---- a/address-db.cpp |
44 |
-+++ b/address-db.cpp |
45 |
-@@ -26,7 +26,7 @@ |
46 |
- |
47 |
- fd = open(filename.c_str(), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR); |
48 |
- if (fd < 0) |
49 |
-- throw system_error(string("Can't open address db '") + |
50 |
-+ throw mapson_system_error(string("Can't open address db '") + |
51 |
- filename + "' for reading"); |
52 |
- fd_sentry sentry(fd); |
53 |
- |
54 |
-@@ -36,7 +36,7 @@ |
55 |
- lock.l_start = 0; |
56 |
- lock.l_len = 0; |
57 |
- if (fcntl(fd, F_SETLKW, &lock) != 0) |
58 |
-- throw system_error(string("Can't lock file '") + filename + "'"); |
59 |
-+ throw mapson_system_error(string("Can't lock file '") + filename + "'"); |
60 |
- |
61 |
- // Read the file into memory. |
62 |
- |
63 |
-@@ -47,7 +47,7 @@ |
64 |
- rc = read(fd, buffer, sizeof(buffer))) |
65 |
- data.append(buffer, rc); |
66 |
- if (rc < 0) |
67 |
-- throw system_error(string("Failed to read address db '") + |
68 |
-+ throw mapson_system_error(string("Failed to read address db '") + |
69 |
- filename + "' into memory"); |
70 |
- |
71 |
- // Success. Don't close the file descriptor. |
72 |
-@@ -107,7 +107,7 @@ |
73 |
- { |
74 |
- ssize_t rc = write(fd, data.data()+len, data.size()-len); |
75 |
- if (rc < 0) |
76 |
-- throw system_error(string("Failed writing to the address db '") + filename + "'"); |
77 |
-+ throw mapson_system_error(string("Failed writing to the address db '") + filename + "'"); |
78 |
- else |
79 |
- len += rc; |
80 |
- } |
81 |
---- a/config.cpp |
82 |
-+++ b/config.cpp |
83 |
-@@ -70,9 +70,9 @@ |
84 |
- string tmp = string(name) + "=" + value; |
85 |
- char* env = strdup(tmp.c_str()); |
86 |
- if (env == 0) |
87 |
-- throw system_error("strdup() failed"); |
88 |
-+ throw mapson_system_error("strdup() failed"); |
89 |
- if (putenv(env) != 0) |
90 |
-- throw system_error("putenv() failed"); |
91 |
-+ throw mapson_system_error("putenv() failed"); |
92 |
- } |
93 |
- } |
94 |
- |
95 |
-@@ -84,7 +84,7 @@ |
96 |
- |
97 |
- pwd_sentry sentry(getpwuid(getuid())); |
98 |
- if (sentry.pwd == 0) |
99 |
-- throw system_error("Can't get my user name"); |
100 |
-+ throw mapson_system_error("Can't get my user name"); |
101 |
- log_file.assign(sentry.pwd->pw_dir).append("/.mapson/log"); |
102 |
- spool_dir.assign(sentry.pwd->pw_dir).append("/.mapson/spool"); |
103 |
- address_db.assign(sentry.pwd->pw_dir).append("/.mapson/address-db"); |
104 |
---- a/deliver.cpp |
105 |
-+++ b/deliver.cpp |
106 |
-@@ -31,11 +31,11 @@ |
107 |
- |
108 |
- FILE* fh = popen(config->mailbox.c_str()+1, "w"); |
109 |
- if (fh == NULL) |
110 |
-- throw system_error(string("Can't start delivery pipe '") + config->mailbox + "'"); |
111 |
-+ throw mapson_system_error(string("Can't start delivery pipe '") + config->mailbox + "'"); |
112 |
- int len = fwrite(mail.data(), mail.size(), 1, fh); |
113 |
- pclose(fh); |
114 |
- if (len != 1) |
115 |
-- throw system_error(string("Failed to pipe to MTA process '") + config->mailbox + "'"); |
116 |
-+ throw mapson_system_error(string("Failed to pipe to MTA process '") + config->mailbox + "'"); |
117 |
- } |
118 |
- else |
119 |
- { |
120 |
-@@ -43,7 +43,7 @@ |
121 |
- |
122 |
- int fd = open(config->mailbox.c_str(), O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR); |
123 |
- if (fd < 0) |
124 |
-- throw system_error(string("Can't open mailbox file '") + config->mailbox + "' for writing"); |
125 |
-+ throw mapson_system_error(string("Can't open mailbox file '") + config->mailbox + "' for writing"); |
126 |
- fd_sentry sentry(fd); |
127 |
- |
128 |
- struct flock lock; |
129 |
-@@ -52,13 +52,13 @@ |
130 |
- lock.l_start = 0; |
131 |
- lock.l_len = 0; |
132 |
- if (fcntl(fd, F_SETLKW, &lock) != 0) |
133 |
-- throw system_error(string("Can't lock file '") + config->mailbox + "'"); |
134 |
-+ throw mapson_system_error(string("Can't lock file '") + config->mailbox + "'"); |
135 |
- |
136 |
- for (size_t len = 0; len < mail.size(); ) |
137 |
- { |
138 |
- ssize_t rc = write(fd, mail.data()+len, mail.size()-len); |
139 |
- if (rc < 0) |
140 |
-- throw system_error(string("Failed writing to the mailbox file '") + config->mailbox + "'"); |
141 |
-+ throw mapson_system_error(string("Failed writing to the mailbox file '") + config->mailbox + "'"); |
142 |
- else |
143 |
- len += rc; |
144 |
- } |
145 |
---- a/lines2regex.cpp |
146 |
-+++ b/lines2regex.cpp |
147 |
-@@ -29,7 +29,7 @@ |
148 |
- if (errno == ENOENT) |
149 |
- return ""; |
150 |
- else |
151 |
-- throw system_error(string("Can't open regex db '") + |
152 |
-+ throw mapson_system_error(string("Can't open regex db '") + |
153 |
- filename + "' for reading"); |
154 |
- } |
155 |
- fd_sentry sentry(fd); |
156 |
-@@ -40,7 +40,7 @@ |
157 |
- lock.l_start = 0; |
158 |
- lock.l_len = 0; |
159 |
- if (fcntl(fd, F_SETLKW, &lock) != 0) |
160 |
-- throw system_error(string("Can't lock file '") + filename + "'"); |
161 |
-+ throw mapson_system_error(string("Can't lock file '") + filename + "'"); |
162 |
- |
163 |
- // Read the file into memory. |
164 |
- |
165 |
-@@ -52,7 +52,7 @@ |
166 |
- rc = read(fd, buffer, sizeof(buffer))) |
167 |
- data.append(buffer, rc); |
168 |
- if (rc < 0) |
169 |
-- throw system_error(string("Failed to read regex db '") + |
170 |
-+ throw mapson_system_error(string("Failed to read regex db '") + |
171 |
- filename + "' into memory"); |
172 |
- |
173 |
- // Walk through the lines and compile the regexes. |
174 |
---- a/log.cpp |
175 |
-+++ b/log.cpp |
176 |
-@@ -30,10 +30,10 @@ |
177 |
- char buf[64]; |
178 |
- time_t tstamp = time(0); |
179 |
- if (tstamp == static_cast<time_t>(-1)) |
180 |
-- throw system_error("time(2) failed"); |
181 |
-+ throw mapson_system_error("time(2) failed"); |
182 |
- struct tm* tmtime = localtime(&tstamp); |
183 |
- if (tmtime == 0) |
184 |
-- throw system_error("localtime(3) failed"); |
185 |
-+ throw mapson_system_error("localtime(3) failed"); |
186 |
- strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", tmtime); |
187 |
- return buf; |
188 |
- } |
189 |
-@@ -42,7 +42,7 @@ |
190 |
- { |
191 |
- fileh.file = fopen(file, "a"); |
192 |
- if (fileh.file == 0) |
193 |
-- throw system_error(string("Could not open log file ") + file); |
194 |
-+ throw mapson_system_error(string("Could not open log file ") + file); |
195 |
- |
196 |
- struct flock lock; |
197 |
- lock.l_type = F_WRLCK; |
198 |
-@@ -50,7 +50,7 @@ |
199 |
- lock.l_start = 0; |
200 |
- lock.l_len = 0; |
201 |
- if (fcntl(fileno(fileh.file), F_SETLKW, &lock) != 0) |
202 |
-- throw system_error(string("Can't lock file '") + file + "'"); |
203 |
-+ throw mapson_system_error(string("Can't lock file '") + file + "'"); |
204 |
- } |
205 |
- |
206 |
- void _debug(const char* fmt, ...) |
207 |
---- a/mapson.cpp |
208 |
-+++ b/mapson.cpp |
209 |
-@@ -62,7 +62,7 @@ |
210 |
- |
211 |
- fd = open(argv[i], O_RDONLY, 0); |
212 |
- if (fd < 0) |
213 |
-- throw system_error("Can't open file for reading"); |
214 |
-+ throw mapson_system_error("Can't open file for reading"); |
215 |
- fd_sentry sentry(fd); |
216 |
- string mail; |
217 |
- for (rc = read(fd, buffer, sizeof(buffer)); |
218 |
-@@ -72,7 +72,7 @@ |
219 |
- mail.append(buffer, rc); |
220 |
- } |
221 |
- if (rc < 0) |
222 |
-- throw system_error("Failed to read from file"); |
223 |
-+ throw mapson_system_error("Failed to read from file"); |
224 |
- |
225 |
- // Extract the mail addresses. |
226 |
- |
227 |
-@@ -196,7 +196,7 @@ |
228 |
- mail.append(buffer, rc); |
229 |
- } |
230 |
- if (rc < 0) |
231 |
-- throw system_error("Failed to read mail from standard input"); |
232 |
-+ throw mapson_system_error("Failed to read mail from standard input"); |
233 |
- |
234 |
- // Check whether the mail contains a valid cookie. If it does, |
235 |
- // mail will be replaced with the original e-mail, that was |
236 |
---- a/parse-config-file.cpp |
237 |
-+++ b/parse-config-file.cpp |
238 |
-@@ -55,7 +55,7 @@ |
239 |
- |
240 |
- std::ifstream file(filename); |
241 |
- if (!file) |
242 |
-- throw system_error(std::string("parse_config_file() failed to open '") + filename + "'"); |
243 |
-+ throw mapson_system_error(std::string("parse_config_file() failed to open '") + filename + "'"); |
244 |
- |
245 |
- // Now we read line by line and process each one seperately. |
246 |
- |
247 |
---- a/request-confirmation.cpp |
248 |
-+++ b/request-confirmation.cpp |
249 |
-@@ -157,7 +157,7 @@ |
250 |
- string filename = config->request_for_confirmation_file; |
251 |
- int fd = multi_open(filename, O_RDONLY, S_IRUSR | S_IWUSR); |
252 |
- if (fd < 0) |
253 |
-- throw system_error(string("Can't open request-mail template file '") + filename + "' for reading"); |
254 |
-+ throw mapson_system_error(string("Can't open request-mail template file '") + filename + "' for reading"); |
255 |
- fd_sentry sentry(fd); |
256 |
- |
257 |
- // Read the file into memory. |
258 |
-@@ -167,7 +167,7 @@ |
259 |
- for (rc = read(fd, buffer, sizeof(buffer)); rc > 0; rc = read(fd, buffer, sizeof(buffer))) |
260 |
- mail_template.append(buffer, rc); |
261 |
- if (rc < 0) |
262 |
-- throw system_error(string("Failed to read request-mail template file '") + filename + "' into memory"); |
263 |
-+ throw mapson_system_error(string("Failed to read request-mail template file '") + filename + "' into memory"); |
264 |
- |
265 |
- // Expand variables in the template. |
266 |
- |
267 |
-@@ -180,11 +180,11 @@ |
268 |
- debug(("Executing mail transport agent '%s'.", config->mta.c_str())); |
269 |
- FILE* fh = popen(config->mta.c_str(), "w"); |
270 |
- if (fh == NULL) |
271 |
-- throw system_error(string("Can't start MTA '") + config->mta + "'"); |
272 |
-+ throw mapson_system_error(string("Can't start MTA '") + config->mta + "'"); |
273 |
- if (fwrite(mail_template.data(), mail_template.size(), 1, fh) != 1) |
274 |
- { |
275 |
- pclose(fh); |
276 |
-- throw system_error(string("Failed to pipe to MTA process '") + config->mta + "'"); |
277 |
-+ throw mapson_system_error(string("Failed to pipe to MTA process '") + config->mta + "'"); |
278 |
- } |
279 |
- pclose(fh); |
280 |
- } |
281 |
---- a/spool.cpp |
282 |
-+++ b/spool.cpp |
283 |
-@@ -44,13 +44,13 @@ |
284 |
- info("Spooling e-mail '%s' as '%s'.", config->message_id.c_str(), filename.c_str()); |
285 |
- int fd = open(filename.c_str(), O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR); |
286 |
- if (fd < 0) |
287 |
-- throw system_error(string("Can't open spool file '") + filename + "' for writing"); |
288 |
-+ throw mapson_system_error(string("Can't open spool file '") + filename + "' for writing"); |
289 |
- fd_sentry sentry(fd); |
290 |
- for (size_t len = 0; len < mail.size(); ) |
291 |
- { |
292 |
- ssize_t rc = write(fd, mail.data()+len, mail.size()-len); |
293 |
- if (rc < 0) |
294 |
-- throw system_error(string("Failed writing to the spool file '") + filename + "'"); |
295 |
-+ throw mapson_system_error(string("Failed writing to the spool file '") + filename + "'"); |
296 |
- else |
297 |
- len += rc; |
298 |
- } |
299 |
---- a/system-error.hpp |
300 |
-+++ b/system-error.hpp |
301 |
-@@ -23,14 +23,14 @@ |
302 |
- #include <string> |
303 |
- #include <cstring> |
304 |
- |
305 |
--class system_error : public std::runtime_error |
306 |
-+class mapson_system_error : public std::runtime_error |
307 |
- { |
308 |
- public: |
309 |
-- system_error() : runtime_error(str()) |
310 |
-+ mapson_system_error() : runtime_error(str()) |
311 |
- { |
312 |
- } |
313 |
- |
314 |
-- explicit system_error(std::string const & msg) |
315 |
-+ explicit mapson_system_error(std::string const & msg) |
316 |
- : runtime_error(msg + ": " + str()) |
317 |
- { |
318 |
- } |
319 |
|
320 |
diff --git a/mail-filter/mapson/mapson-3.3-r1.ebuild b/mail-filter/mapson/mapson-3.3-r1.ebuild |
321 |
deleted file mode 100644 |
322 |
index 9903dbb7f78..00000000000 |
323 |
--- a/mail-filter/mapson/mapson-3.3-r1.ebuild |
324 |
+++ /dev/null |
325 |
@@ -1,54 +0,0 @@ |
326 |
-# Copyright 1999-2020 Gentoo Authors |
327 |
-# Distributed under the terms of the GNU General Public License v2 |
328 |
- |
329 |
-EAPI=7 |
330 |
- |
331 |
-inherit autotools |
332 |
- |
333 |
-DESCRIPTION="A challenge/response-based white-list spam filter" |
334 |
-HOMEPAGE="http://mapson.sourceforge.net/" |
335 |
-SRC_URI="mirror://sourceforge/mapson/${P}.tar.gz" |
336 |
- |
337 |
-LICENSE="GPL-2" |
338 |
-SLOT="0" |
339 |
-KEYWORDS="amd64 ppc x86" |
340 |
-IUSE="debug" |
341 |
- |
342 |
-RDEPEND=" |
343 |
- acct-user/mail |
344 |
- virtual/mta |
345 |
-" |
346 |
-DEPEND="${RDEPEND}" |
347 |
- |
348 |
-PATCHES=( |
349 |
- "${FILESDIR}"/${PN}-3.3-gcc6.patch |
350 |
- "${FILESDIR}"/${PN}-3.3-respect-AR.patch |
351 |
-) |
352 |
- |
353 |
-src_prepare() { |
354 |
- default |
355 |
- eautoreconf |
356 |
-} |
357 |
- |
358 |
-src_configure() { |
359 |
- econf $(use_with debug) |
360 |
-} |
361 |
- |
362 |
-src_install() { |
363 |
- emake DESTDIR="${ED}" install |
364 |
- |
365 |
- dodoc AUTHORS INSTALL NEWS README |
366 |
- doman doc/mapson.1 |
367 |
- |
368 |
- docinto html |
369 |
- dodoc doc/mapson.html |
370 |
- |
371 |
- insinto /etc/mapson |
372 |
- newins sample-config mapson.config |
373 |
- |
374 |
- insinto /usr/share/mapson |
375 |
- newins sample-challenge-template challenge-template |
376 |
- |
377 |
- rm -f "${ED}"/etc/sample-config || die |
378 |
- rm -f "${ED}"/usr/share/{mapson.html,sample-challenge-template} || die |
379 |
-} |